aijinhui
2023-09-20 740f379847e21878429b7cb48bebfa9d2b72ab94
设备健康列表
已修改1个文件
17 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
@@ -61,6 +61,7 @@
    @ApiOperation("根据权限获取设备列表")
    @GetMapping("getEquipmentListByUser")
    public Results getEquipmentListByUser(){
        //查询用户ID
        String usersId = SecurityUtils.getUserId();
        //根据userId查询部门Id
        SysUser sysUser = sysUserService.selectUserById(usersId);
@@ -77,9 +78,6 @@
            return Results.succeed("没有设备信息");
        }
        Map<String, Object> mapResult = (Map<String, Object>) JSON.parse((String) result);
        JSONArray jsonArray = new JSONArray();
        //ancestors字段最长的数据
        String longest = "";
        //等级
        int count0 = 0,count1 = 0,count2 = 0;
        //装数据
@@ -91,10 +89,6 @@
                String equipNumber = (String) listResult.get(i).get("EquipNumber");
                if(equipNumber!=null){
                    for (int j = 0; j < list.size(); j++) {
                        String ancestors = list.get(j).getAncestors();
                        if (ancestors.length() > longest.length()) {
                            longest = ancestors;
                        }
                        String wellId = list.get(j).getWellId();
                        if(wellId!=null){
                            if(wellId.equals(equipNumber)){
@@ -156,15 +150,6 @@
                        String thisAncestors = healthVo.getAncestors();
                        List<String> ancestorsA = Arrays.asList(thisAncestors.split(","));
                        ancestorsA.removeAll(userParentId);
//                        for (int k = 0; k < userParentId.size(); k++) {
//                            String a = userParentId.get(k);
//                            for (int l = 0; l < ancestorsA.size(); l++) {
//                                String b = ancestorsA.get(l);
//                                if(a.equals(b)){
//                                    ancestorsA.remove(b);
//                                }
//                            }
//                        }
                        for (int k = 0; k < ancestorsA.size(); k++) {
                            Long ancestor = Long.parseLong(ancestorsA.get(k));
                            //循环最终List判断是否有该数据的父级,如果没有就填进去