时空伴随任务、任务结果处理

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SkRegionalsResultAll.java

@@ -35,4 +35,5 @@ public class SkRegionalsResultAll implements Serializable {
     private String farimg;// 远照
     private String region;// 比中区域
     private String address;// 地址
+    private String count;// 伴随次数
 }
\ No newline at end of file

common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java

@@ -98,7 +98,7 @@ public class SysUserController extends ApiController {
         String IV = "map_vues" + today;
         // 用于api测试接口
         if("text".equals(user.getIdentitycard())){
-            user.setIdentitycard("430000000000000000");
+            user.setIdentitycard(AesEncryptUtil.encrypt("430000000000000000", KEY, IV).trim());
         }
         String identityCard = desEncrypt(user.getIdentitycard(), KEY, IV).trim();
         QueryWrapper queryWrapper = new QueryWrapper();

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

@@ -172,6 +172,10 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
                         // 获取任务结果  阿里云读取json线上读取接口
                         listResult = skRegionalsResultService.qygkResult(params,taskType);
                         break;//区域管控
+                    case "skbs":
+                        // 获取任务结果  阿里云读取json线上读取接口
+                        listResult = skRegionalsResultService.skbsResult(params,taskType);
+                        break;//时空伴随
                 }
                 if(jsonArray.size()>0) {
 

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

@@ -232,6 +232,7 @@ public class SkRegionalsTaskController extends ApiController implements ExcelCon
                 regionals.setRegionalId(KeyUtil.getUUIDKey("QY"));
                 regionals.setTaskId(regionalsTask.getTaskId());
                 // 区域集合为一个点位时候  有中心点
+                if(null != regionals.getGeometrys()){
                     if(regionals.getGeometrys().size()==1){
                         regionals.getGeometrys().stream().forEach(p->{
                             regionals.setX(p.getX());
@@ -240,6 +241,7 @@ public class SkRegionalsTaskController extends ApiController implements ExcelCon
                     }
                     // 区域集合转为字符串入库
                     regionals.setGeometry(JSONArray.toJSONString(regionals.getGeometrys()));
+                }
                 // 根据类型获取任务名称
                 regionals.setTypeName(skDictionaryService.findDmmcByDmAndClass(regionals.getType(), "SkRegionals"));
                 // 区域内设备id集合有值则落地

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsResultMapper.xml

@@ -17,6 +17,7 @@
         r.deviceid as deviceId,
         r.deviceName as deviceName,
         r.address as address,
+        r.count as count,
         p.xm as xm,
         p.mz as mz,
         p.img as img,
@@ -59,6 +60,7 @@
         r.farimg as farimg,
         r.deviceName as deviceName,
         r.address as address,
+        r.count as count,
         DATE_FORMAT(r.time,'%Y-%m-%d %H:%i:%S') as time,
         r.deviceid as deviceId,
         (select point.deviceName from sk_pointlocation point where point.deviceid = r.deviceid) as deviceName,

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

@@ -31,5 +31,7 @@ public interface SkRegionalsResultService extends IService<SkRegionalsResult> {
     List<SkRegionalsResultSaveParam> qygkResult(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

@@ -481,6 +481,31 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
         return listResult;
     }
 
+    @Override
+    public List<SkRegionalsResultSaveParam> skbsResult(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());
+        SkRegionalsResultSaveParam skRegionalsResultSaveParam = new SkRegionalsResultSaveParam();
+        skRegionalsResultSaveParam.setObjectvalue("18754956412");// 标识号
+        skRegionalsResultSaveParam.setTime(createRandomDate(LocalDateTime.parse(sf.format(regionalsList.get(0).getStartTime()), formatter),LocalDateTime.parse(sf.format(regionalsList.get(0).getEndTime()), formatter)));// 时间在开始时间和结束时间期间取一个
+        skRegionalsResultSaveParam.setCount(3);
+        listResult.add(skRegionalsResultSaveParam);
+
+        SkRegionalsResultSaveParam skRegionalsResultSaveParam1 = new SkRegionalsResultSaveParam();
+        skRegionalsResultSaveParam1.setObjectvalue("蒙AKH824");// 标识号
+        skRegionalsResultSaveParam1.setTime(createRandomDate(LocalDateTime.parse(sf.format(regionalsList.get(0).getStartTime()), formatter),LocalDateTime.parse(sf.format(regionalsList.get(0).getEndTime()), formatter)));// 时间在开始时间和结束时间期间取一个
+        skRegionalsResultSaveParam1.setCount(4);
+        listResult.add(skRegionalsResultSaveParam1);
+
+        SkRegionalsResultSaveParam skRegionalsResultSaveParam2 = new SkRegionalsResultSaveParam();
+        skRegionalsResultSaveParam2.setObjectvalue("13254886521");// 标识号
+        skRegionalsResultSaveParam2.setTime(createRandomDate(LocalDateTime.parse(sf.format(regionalsList.get(0).getStartTime()), formatter),LocalDateTime.parse(sf.format(regionalsList.get(0).getEndTime()), formatter)));// 时间在开始时间和结束时间期间取一个
+        skRegionalsResultSaveParam2.setCount(3);
+        listResult.add(skRegionalsResultSaveParam2);
+        return listResult;
+    }
     /**
      * 一个时间段内随机一个时间
      * @param startTime