南昌市物联网技防平台-后台
zengh
2021-05-28 9c3a3ac2f9ba5865098b5f19b9b0fedfc409f3d7
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -692,7 +692,30 @@
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      return R.data(alarmService.getAlarming(alarmVO));
      //获取部门数据
      List<DeptVo> deptVos = deptFeignApi.selDeptList();
      List<AlarmVO> page = alarmService.getAlarming(alarmVO);
      for (int j = 0; j < page.size(); j++) {
         if (null!=page.get(j).getDeptId()){
            String[] split = page.get(j).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(",");
                  }
               }
            }
            //封装部门名称数据
            page.get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
         }
      }
      return R.data(page);
   }
   /**