布控同步(湖南)

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

@@ -195,10 +195,22 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
                         // 获取任务结果  阿里云读取json线上读取接口
                         listResult = skRegionalsResultService.MoreAreaRxInfoThread(params);
                         break;//时空碰撞人像
-                    case "qygk":
-                        // 区域管控
+                    case "qygk_qybk":
+                        // 区域管控-区域布控
                         listResult = skRegionalsResultService.qygkResult(params,taskType);
                         break;
+                    case "qygk_kyfwbsh":
+                        // 区域管控-可疑服务标识号
+                        listResult = skRegionalsResultService.qygkResult(params,taskType);
+                        break;
+                    case "qygk_sssbbk":
+                        // 区域管控-损失设备布控
+                        listResult = skRegionalsResultService.qygkResult(params,taskType);
+                        break;
+                    case "qygk_jghtx":
+                        // 区域管控-结构化图像
+                        listResult = skRegionalsResultService.qygkTxResult(params,taskType);
+                        break;
                     case "skbs":
                         // 时空伴随
                         listResult = skRegionalsResultService.skbsResult(params,taskType);

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

@@ -32,6 +32,8 @@ public interface SkRegionalsResultService extends IService<SkRegionalsResult> {
 
     List<SkRegionalsResultSaveParam> qygkResult(SkRegionalsResultAllParam params,String taskType);
 
+    List<SkRegionalsResultSaveParam> qygkTxResult(SkRegionalsResultAllParam params,String taskType);
+
     List<SkRegionalsResultAll> selecteRegionalsTasksResultsByTaskid(SkRegionalsTaskResultParamAll params);
 
     List<SkRegionalsResultSaveParam> skbsResult(SkRegionalsResultAllParam params, String taskType);

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

@@ -42,6 +42,8 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
     private SkRegionalsTaskMapper skRegionalsTaskMapper;
     @Value("${environment}")
     public  String environment;
+    @Value("${imagesUrl}")
+    public  String imagesUrl;
     @Override
     public List<SkRegionalsResultAll> selecteRegionalsTasksResults(SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll) {
         return skRegionalsResultMapper.selecteRegionalsTasksResults(skRegionalsTaskResultParamAll);
@@ -481,21 +483,49 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
         List<RegionalsParam> regionalsList = skRegionalsTaskMapper.queryRegionalsList(params.getTaskId());
         regionalsList.stream().forEach(p->{
             SkRegionalsResultSaveParam skRegionalsResultSaveParam = new SkRegionalsResultSaveParam();
-            skRegionalsResultSaveParam.setObjectvalue(p.getDeviceId());// 标识号
+            skRegionalsResultSaveParam.setObjectvalue(JSONArray.parseArray(p.getDeviceId()).getString(0));// 标识号
+            skRegionalsResultSaveParam.setTime(createRandomDate(LocalDateTime.parse(sf.format(p.getStartTime()), formatter),LocalDateTime.parse(sf.format(p.getEndTime()), formatter)));// 时间在开始时间和结束时间期间取一个
+            skRegionalsResultSaveParam.setAddress("离开区域");
+            if(Arrays.asList("qygk_kyfwbsh","qygk_sssbbk").contains(taskType)){
+                skRegionalsResultSaveParam.setX("112.9698");
+                skRegionalsResultSaveParam.setY("28.2067");
+            }else{
+                if(null!=p.getGeometry()){
+                    List<Point> geometrys = JSONArray.parseArray(p.getGeometry()).toJavaList(Point.class);
+                    p.setGeometrys(geometrys);
+                    skRegionalsResultSaveParam.setX(p.getGeometrys().get(0).getX());
+                    skRegionalsResultSaveParam.setY(p.getGeometrys().get(0).getY());
+                }
+            }
+            skRegionalsResultSaveParam.setBsobjectvaluetype(p.getBshType());
+            listResult.add(skRegionalsResultSaveParam);
+        });
+        return listResult;
+    }
+    @Override
+    public List<SkRegionalsResultSaveParam> qygkTxResult(SkRegionalsResultAllParam params, String taskType) {
+        List<SkRegionalsResultSaveParam> listResult = new ArrayList<>();
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        List<RegionalsParam> regionalsList = skRegionalsTaskMapper.queryRegionalsList(params.getTaskId());
+        regionalsList.stream().forEach(p->{
+            SkRegionalsResultSaveParam skRegionalsResultSaveParam = new SkRegionalsResultSaveParam();
             skRegionalsResultSaveParam.setTime(createRandomDate(LocalDateTime.parse(sf.format(p.getStartTime()), formatter),LocalDateTime.parse(sf.format(p.getEndTime()), formatter)));// 时间在开始时间和结束时间期间取一个
             skRegionalsResultSaveParam.setAddress("进入区域");
             if(null!=p.getGeometry()){
                 List<Point> geometrys = JSONArray.parseArray(p.getGeometry()).toJavaList(Point.class);
                 p.setGeometrys(geometrys);
             }
-            skRegionalsResultSaveParam.setX(p.getGeometrys().get(0).getX());
-            skRegionalsResultSaveParam.setY(p.getGeometrys().get(0).getY());
-            skRegionalsResultSaveParam.setBsobjectvaluetype(p.getBshType());
+            skRegionalsResultSaveParam.setX("112.9698");
+            skRegionalsResultSaveParam.setY("28.2067");
+            skRegionalsResultSaveParam.setImg(imagesUrl+"4.jpg");
+            skRegionalsResultSaveParam.setFarimg(imagesUrl+"3.jpg");
             listResult.add(skRegionalsResultSaveParam);
         });
         return listResult;
     }
 
+
     @Override
     public List<SkRegionalsResultSaveParam> skbsResult(SkRegionalsResultAllParam params, String taskType) {
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");