修改团伙可视化bug

service/publicapi/src/main/java/com/founder/publicapi/controller/ZtypService/ZtypController.java

@@ -301,6 +301,7 @@ public class ZtypController {
                 "\t\t\t\t\t\"target\": \"15754879533\",\n" +
                 "\t\t\t\t\t\"label\": \"机主\",\n" +
                 "\t\t\t\t\t\"properties\": {\n" +
+                "\t\t\t\t\t\t\"time\": \"2022-09-16 09:59:11\",\n" +
                 "\t\t\t\t\t\t\"label\": \"机主\",\n" +
                 "\t\t\t\t\t\t\"source\": \"430123196510265891\",\n" +
                 "\t\t\t\t\t\t\"target\": \"15754879533\"\n" +
@@ -311,6 +312,7 @@ public class ZtypController {
                 "\t\t\t\t\t\"target\": \"蒙AKH824\",\n" +
                 "\t\t\t\t\t\"label\": \"车主\",\n" +
                 "\t\t\t\t\t\"properties\": {\n" +
+                "\t\t\t\t\t\t\"time\": \"2022-09-16 09:59:11\",\n" +
                 "\t\t\t\t\t\t\"label\": \"车主\",\n" +
                 "\t\t\t\t\t\t\"source\": \"430123196510265891\",\n" +
                 "\t\t\t\t\t\t\"target\": \"蒙AKH824\"\n" +
@@ -321,6 +323,7 @@ public class ZtypController {
                 "\t\t\t\t\t\"target\": \"6216625552447663148522\",\n" +
                 "\t\t\t\t\t\"label\": \"卡号\",\n" +
                 "\t\t\t\t\t\"properties\": {\n" +
+                "\t\t\t\t\t\t\"time\": \"2022-09-16 09:59:11\",\n" +
                 "\t\t\t\t\t\t\"label\": \"卡号\",\n" +
                 "\t\t\t\t\t\t\"source\": \"430123196510265891\",\n" +
                 "\t\t\t\t\t\t\"target\": \"6216625552447663148522\"\n" +
@@ -331,6 +334,7 @@ public class ZtypController {
                 "\t\t\t\t\t\"target\": \"A4690035100002025050074\",\n" +
                 "\t\t\t\t\t\"label\": \"人案\",\n" +
                 "\t\t\t\t\t\"properties\": {\n" +
+                "\t\t\t\t\t\t\"time\": \"2022-09-16 09:59:11\",\n" +
                 "\t\t\t\t\t\t\"label\": \"人案\",\n" +
                 "\t\t\t\t\t\t\"source\": \"430123196510265891\",\n" +
                 "\t\t\t\t\t\t\"target\": \"A4690035100002025050074\"\n" +
@@ -341,6 +345,7 @@ public class ZtypController {
                 "\t\t\t\t\t\"target\": \"A4301025100002022020012\",\n" +
                 "\t\t\t\t\t\"label\": \"人案\",\n" +
                 "\t\t\t\t\t\"properties\": {\n" +
+                "\t\t\t\t\t\t\"time\": \"2022-09-16 09:59:11\",\n" +
                 "\t\t\t\t\t\t\"label\": \"人案\",\n" +
                 "\t\t\t\t\t\t\"source\": \"430123196510265891\",\n" +
                 "\t\t\t\t\t\t\"target\": \"A4301025100002022020012\"\n" +

service/publicapi/src/main/java/com/founder/publicapi/controller/hnksh/HnTbStRygxController.java

@@ -93,11 +93,12 @@ public class HnTbStRygxController {
                               @RequestParam(name = "pageSize", defaultValue = "5") Integer pageSize,
                               @RequestParam(name = "lxrxm", required = false) String lxrxm,
                               @RequestParam(name = "lxrsfz", required = false) String lxrsfz,
-                              @RequestParam(name = "blxrXm", required = false) String blxrxm,
-                              @RequestParam(name = "blxrSfz", required = false) String blxrsfz,
+                              @RequestParam(name = "blxrxm", required = false) String blxrxm,
+                              @RequestParam(name = "blxrsfz", required = false) String blxrsfz,
                               @RequestParam(name = "rygx", required = false) String rygx) {
         //计算分页
         int start = PageUtil.getStart(currentPage - 1, pageSize);
+
         int end = PageUtil.getEnd(currentPage - 1, pageSize);
 
         if (teamNum<2){
@@ -232,6 +233,18 @@ public class HnTbStRygxController {
             //更新团伙人数
             getThPeopleCount(conditionSearchFromRythInfoList);
         }
+      /*  List nameset = new ArrayList<>();
+        for (int i = 0; i < conditionSearchFromRythInfoList.size(); i++) {
+            Map<String, Object> conditionMap = conditionSearchFromRythInfoList.get(i);
+            Set<HnTbStRygx> childSet = (Set<HnTbStRygx>) conditionMap.get("children");
+            for (HnTbStRygx name : childSet) {
+                HashMap<String, String> map = new HashMap<>();
+                map.put("sfzh",name.getSfzh());
+                map.put("xm",name.getXm());
+                nameset.add(map);
+            }
+            conditionMap.put("name",nameset);
+        }*/
         List<Map<String, Object>> resultList = CollUtil.sub(conditionSearchFromRythInfoList, start, end);
         return resultList;
     }
@@ -295,6 +308,9 @@ public class HnTbStRygxController {
                                          @RequestParam(name = "lxrSfz", required = false) String lxrSfz,
                                          @RequestParam(name = "bLxrXm", required = false) String bLxrXm,
                                          @RequestParam(name = "bLxrSfz", required = false) String bLxrSfz) {
+        if (teamNum<2){
+            teamNum=2;
+        }
         //团伙信息集合
         List<Map<String, Object>> rythInfoList = (List<Map<String, Object>>) redisTemplate.opsForValue().get(username + ":" + taskId + ":" + TEAM_KEY + teamNum);
 
@@ -318,6 +334,19 @@ public class HnTbStRygxController {
             }
             conditionMap.put("children", childSet);
         }
+//根据人员关系过滤name的值
+        Set nameset = new HashSet();
+            Map<String, Object> conditionMap = rythInfoByIdList.get(0);
+            Set<HnTbStRygx> child = (Set<HnTbStRygx>) conditionMap.get("children");
+        for (HnTbStRygx name : child) {
+            HashMap<String, String> map = new HashMap<>();
+            map.put("sfzh",name.getSfzh());
+            map.put("xm",name.getXm());
+            nameset.add(map);
+        }
+        conditionMap.put("name",nameset);
+
+
         //查询出所有联系人的name
         List<HnTbStRygx> nameList = hnKshService.getGroupNameByRwid(taskId);
         Hnkshresult hnTbStRygxDTOS = packingData(rythInfoByIdList, nameList);