报警接口调整

zengh

2021-07-02 acdba84f280eb095c9d1051d3b5f986ac44da0c5

报警接口调整

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java

@@ -487,6 +487,29 @@
        String time = df.format(new Date());// new Date()为获取当前系统时间
        String pastDate = getPastDate(7);
        List<AlarmVO> alarmVOS = alarmService.selectListSe(pastDate, time);

        //获取部门数据
        List<DeptVo> deptVos = deptFeignApi.selDeptList();

        //遍历数据
        for (int j = 0; j < alarmVOS.size(); j++) {
            if (null!=alarmVOS.get(j).getDeptId()){
                String[] split = alarmVOS.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(",");
                        }
                    }
                }
                //封装部门名称数据
                alarmVOS.get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
            }
        }

        return R.data(alarmVOS);
    }


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml

@@ -410,6 +410,8 @@
        e.twoId,
        e.threeId,
        e.deptId,
        a.alarmlb,
        e.manufacturers,
        e.channelNumber,
        jfpth.blade_region.`name` as addvnm
        FROM