增加用户预览位置接口

liusuyi

2024-05-08 c17dc5484bde25d032bf58d114a4f1598a301f31

 ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java

@@ -84,6 +84,7 @@
        List<TreeDeptWell> treeDeptWells = new ArrayList<>();
        if ((int) mapResult.get("code") == 200) {
            List<Map<String, Object>> listResult = (List<Map<String, Object>>) JSON.parse((String) mapResult.get("resdata"));
//            System.out.println(String.valueOf(listResult));
            //循环得到权限下匹配数据
            for (int i = 0; i < listResult.size(); i++) {
                String equipNumber = (String) listResult.get(i).get("EquipNumber");
@@ -164,7 +165,7 @@
                                    //如果该父类集合在结构中已经存在并且不是设备数据就不用重复添加了
                                    Long treeId = treeDeptWells.get(l).getDeptId();
                                    Integer id = treeDeptWells.get(l).getId();
                                    if(ancestor.equals(treeId)){
                                    if(ancestor.equals(treeId) && id==null){
                                        wellTrue = true;
                                    }
                                }
@@ -182,13 +183,17 @@
                    }
                }
            }
            List<TreeDeptWell> tree = sysDeptService.wellTree(treeDeptWells);
            TreeSelectWellJson treeSelectWellJson = new TreeSelectWellJson();
            treeSelectWellJson.setWellList(tree);
            treeSelectWellJson.setCount0(count0);
            treeSelectWellJson.setCount1(count1);
            treeSelectWellJson.setCount2(count2);
            return Results.succeed(treeSelectWellJson);
            if(treeDeptWells.size()>0){
                List<TreeDeptWell> tree = sysDeptService.wellTree(treeDeptWells);
                TreeSelectWellJson treeSelectWellJson = new TreeSelectWellJson();
                treeSelectWellJson.setWellList(tree);
                treeSelectWellJson.setCount0(count0);
                treeSelectWellJson.setCount1(count1);
                treeSelectWellJson.setCount2(count2);
                return Results.succeed(treeSelectWellJson);
            }else {
                return Results.error("无匹配数据");
            }
        } else {
            //错误提示
            return Results.error((String) mapResult.get("errmsg"));