区域回显提交

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRegionalsTaskController.java

@@ -8,9 +8,7 @@ import com.baomidou.mybatisplus.extension.api.ApiController;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.founder.commonutils.model.newPublicEntity.MapRestResult;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
-import com.founder.commonutils.model.vo.param.RegionalsParam;
-import com.founder.commonutils.model.vo.param.RegionalsTaskParams;
-import com.founder.commonutils.model.vo.param.SkRegionalsTaskParam;
+import com.founder.commonutils.model.vo.param.*;
 import com.founder.commonutils.util.KeyUtil;
 import com.founder.commonutils.model.newPublicEntity.SkRegionalsTask;
 import com.founder.servicebase.controller.ExcelControllerInterface;
@@ -253,5 +251,20 @@ public class SkRegionalsTaskController extends ApiController implements ExcelCon
         }
         return MapRestResult.build(200,"发送任务成功","1",regionalsTask.getTaskId());
     }
+
+    @OperLog(message = "区域回显",operation = OperationType.QUERY)
+    @ApiOperation(value = "区域回显")
+    @PostMapping("/queryRegionals")
+    public MapRestResult queryRegionals(@RequestBody RegionalsTaskParams regionalsTask) {
+        // 通过任务编号拿到区域集合 用于回显
+        List<RegionalsParam> regionalsList = skRegionalsTaskService.queryRegionalsList(regionalsTask.getTaskId());
+        regionalsList.stream().forEach(p->{
+            List<Point> geometrys = JSONArray.parseArray(p.getGeometry()).toJavaList(Point.class);
+            p.setGeometrys(geometrys);
+            List<String> deviceIds = JSONArray.parseArray(p.getDeviceId()).toJavaList(String.class);
+            p.setDeviceIds(deviceIds);
+        });
+        return MapRestResult.build(200,"发送任务成功",regionalsList.size(),regionalsList);
+    }
 }
 

service/publicapi/src/main/java/com/founder/publicapi/service/SkRegionalsTaskService.java

@@ -23,5 +23,8 @@ public interface SkRegionalsTaskService extends IService<SkRegionalsTask> {
     List<SkRegionalsTask> queryTaskInfoList(SkRegionalsTaskParam skRegionalsDetailParam);
 
     int queryTaskInfoListCount(SkRegionalsTaskParam skRegionalsDetailParam);
+
+    List<RegionalsParam> queryRegionalsList(String taskId);
+
 }
 

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsTaskServiceImpl.java

@@ -45,6 +45,11 @@ public class SkRegionalsTaskServiceImpl extends ServiceImpl<SkRegionalsTaskMappe
     }
 
     @Override
+    public List<RegionalsParam> queryRegionalsList(String taskId) {
+        return skRegionalsTaskMapper.queryRegionalsList(taskId);
+    }
+
+    @Override
     public List<SkRegionalsTask> queryTaskInfoList(SkRegionalsTaskParam skRegionalsDetailParam) {
         return skRegionalsTaskMapper.queryTaskInfoList(skRegionalsDetailParam);
     }