南昌市物联网技防平台-后台
zengh
2021-04-29 958ddfcec71043b6b800feaac521e7b22bb15e97
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -80,8 +80,25 @@
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials", "true");
      /*Equipment detail = equipmentService.getOne(Condition.getQueryWrapper(equipment));*/
      return R.data(equipmentService.selectInfo(equipment));
      EquipmentVOS equipmentVOS = equipmentService.selectInfo(equipment);
      //获取部门数据
      List<DeptVo> deptVos = deptFeignApi.selDeptList();
      if (null!=equipmentVOS.getDeptId()){
         String[] split =equipmentVOS.getDeptId().split(",");
         List<String> list = Arrays.asList(split);
         StringBuffer deptNameBuiffer = new StringBuffer();
         //数据匹配封装
         for (String deptId:list) {
            for (DeptVo deptVo:deptVos) {
               if (deptId.equals(deptVo.getId().toString())){
                  deptNameBuiffer.append(deptVo.getDeptName()).append("/");
               }
            }
         }
         //封装部门名称数据
         equipmentVOS.setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
      }
      return R.data(equipmentVOS);
   }
   /**
@@ -137,10 +154,7 @@
         }else{
            pages.get(j).setOnlineStatus("0");
         }
      }
      return R.data(pages);
   }