时空伴随提交

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

@@ -362,7 +362,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
         List<SkRegionalsTask>  taskList = skRegionalsTaskService.list(queryWrapper);
         if(taskList.size()>0) {
             String taskType = taskList.get(0).getTasktype();
-            if("skph_car".equals(taskType)||"skph_people".equals(taskType)||"skph_img".equals(taskType)){// 徘徊数据树形结构返回
+            if("skph_car".equals(taskType)||"skph_people".equals(taskType)||"skph_img".equals(taskType)||"skbs".equals(taskType)){// 徘徊/伴随数据树形结构返回
                 // 去重后分页数据
                 List<SkRegionalsResultAll> listResultDistinctPage = new ArrayList<>();
                 // 去重后数据

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

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

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

@@ -483,31 +483,28 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
 
     @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);
-        skRegionalsResultSaveParam.setBsobjectvaluetype("03");
-
-        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);
-        skRegionalsResultSaveParam1.setBsobjectvaluetype("01");
-        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);
-        skRegionalsResultSaveParam2.setBsobjectvaluetype("03");
-        listResult.add(skRegionalsResultSaveParam2);
+        // 阿里云环境 公安网环境使用不同json
+        String path = "";
+        if(environment.equals("dev")){
+            path = "data";
+        }else{
+            path = "dataGaw";
+        }
+        List<SkRegionalsResultSaveParam> listResult = new ArrayList<>();
+        JSONArray jsonArray = null;
+        try {
+            jsonArray = JsonUtils.readJsonFromClassPath(path+"/getSkbs.json", JSONArray.class);
+            listResult = jsonArray.toJavaList(SkRegionalsResultSaveParam.class);
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.out.print("json转换实体异常"+e);
+        }
+        listResult.stream().forEach(p->{
+            p.setTime(createRandomDate(LocalDateTime.parse(sf.format(regionalsList.get(0).getStartTime()), formatter),LocalDateTime.parse(sf.format(regionalsList.get(0).getEndTime()), formatter)));// 时间在开始时间和结束时间期间取一个
+        });
         return listResult;
     }
     /**

service/publicapi/src/main/resources/data/getSkbs.json

+[
+  {
+    "objectvalue": "18754956412",
+    "x": "110.628076",
+    "y": "19.925187",
+    "count": "3",
+    "bsobjectvaluetype":"03",
+    "address": "长沙市达尔登路1"
+  },
+  {
+    "objectvalue": "18754956412",
+    "x": "106.553860",
+    "y": "29.557100",
+    "count": "3",
+    "bsobjectvaluetype":"03",
+    "address": "长沙市达尔登路2"
+  },
+  {
+    "objectvalue": "18754956412",
+    "x": "110.628076",
+    "y": "19.925187",
+    "count": "3",
+    "bsobjectvaluetype":"03",
+    "address": "长沙市达尔登路1"
+  },
+  {
+    "objectvalue": "蒙AKH824",
+    "x": "106.20576",
+    "y": "29.657100",
+    "count": "4",
+    "bsobjectvaluetype":"01",
+    "address": "长沙市达尔登路4"
+  },
+  {
+    "objectvalue": "蒙AKH824",
+    "x": "110.628076",
+    "y": "19.925187",
+    "count": "4",
+    "bsobjectvaluetype":"01",
+    "address": "长沙市达尔登路1"
+  },
+  {
+    "objectvalue": "蒙AKH824",
+    "x": "110.628076",
+    "y": "19.925187",
+    "count": "4",
+    "bsobjectvaluetype":"01",
+    "address": "长沙市达尔登路1"
+  },
+  {
+    "objectvalue": "蒙AKH824",
+    "x": "113.99195",
+    "y": "22.838194",
+    "bsobjectvaluetype":"01",
+    "count": "4",
+    "address": "长沙市达尔登路5"
+  }
+]
\ No newline at end of file

service/publicapi/src/main/resources/dataGaw/getSkbsjson

+[
+  {
+    "objectvalue": "18754956412",
+    "x": "110.628076",
+    "y": "19.925187",
+    "count": "3",
+    "bsobjectvaluetype":"03",
+    "address": "长沙市达尔登路1"
+  },
+  {
+    "objectvalue": "18754956412",
+    "x": "106.553860",
+    "y": "29.557100",
+    "count": "3",
+    "bsobjectvaluetype":"03",
+    "address": "长沙市达尔登路2"
+  },
+  {
+    "objectvalue": "18754956412",
+    "x": "110.628076",
+    "y": "19.925187",
+    "count": "3",
+    "bsobjectvaluetype":"03",
+    "address": "长沙市达尔登路1"
+  },
+  {
+    "objectvalue": "蒙AKH824",
+    "x": "106.20576",
+    "y": "29.657100",
+    "count": "4",
+    "bsobjectvaluetype":"01",
+    "address": "长沙市达尔登路4"
+  },
+  {
+    "objectvalue": "蒙AKH824",
+    "x": "110.628076",
+    "y": "19.925187",
+    "count": "4",
+    "bsobjectvaluetype":"01",
+    "address": "长沙市达尔登路1"
+  },
+  {
+    "objectvalue": "蒙AKH824",
+    "x": "110.628076",
+    "y": "19.925187",
+    "count": "4",
+    "bsobjectvaluetype":"01",
+    "address": "长沙市达尔登路1"
+  },
+  {
+    "objectvalue": "蒙AKH824",
+    "x": "113.99195",
+    "y": "22.838194",
+    "bsobjectvaluetype":"01",
+    "count": "4",
+    "address": "长沙市达尔登路5"
+  }
+]
\ No newline at end of file