管控四个类型处理提交

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

@@ -201,10 +201,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);
@@ -611,8 +623,8 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
                         skRegionalsDetail.setAttribution(PhoneUtil.getGeo(p.getObjectvalue(),"86"));// 归属地
                     }
                     boolean savesDetail = skRegionalsDetailService.save(skRegionalsDetail);
-                    if(savesDetail){// 翻译成功通过身份证拿到人员基本信息 人像回溯、徘徊、碰撞不用翻译对应人
-                        if(!"skhs_img".equals(p.getObjecttype())&&!"qypz_img".equals(p.getObjecttype())&&!"skph_img".equals(p.getObjecttype())){
+                    if(savesDetail){// 翻译成功通过身份证拿到人员基本信息 人像回溯、徘徊、碰撞、图像布控不用翻译对应人
+                        if(!Arrays.asList("skhs_img","qypz_img","skph_img","qygk_jghtx").contains(p.getObjecttype())){
                             // 先查看身份证对应人信息是否已存在
                             SkRegionalsPerson skRegionalsPerson=new SkRegionalsPerson();
                             skRegionalsPerson.setSfzhm("430123196510265891");// 证件号码

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);
@@ -483,7 +485,7 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
             SkRegionalsResultSaveParam skRegionalsResultSaveParam = new SkRegionalsResultSaveParam();
             skRegionalsResultSaveParam.setObjectvalue(p.getDeviceId());// 标识号
             skRegionalsResultSaveParam.setTime(createRandomDate(LocalDateTime.parse(sf.format(p.getStartTime()), formatter),LocalDateTime.parse(sf.format(p.getEndTime()), formatter)));// 时间在开始时间和结束时间期间取一个
-            skRegionalsResultSaveParam.setAddress("进入区域");
+            skRegionalsResultSaveParam.setAddress("离开区域");
             if(null!=p.getGeometry()){
                 List<Point> geometrys = JSONArray.parseArray(p.getGeometry()).toJavaList(Point.class);
                 p.setGeometrys(geometrys);
@@ -497,6 +499,29 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
     }
 
     @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("106.3988");
+            skRegionalsResultSaveParam.setY("29.4747");
+            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");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");