警情查询修改

zengh

2021-07-02 533b39768b9295f3905f04cb581c5072835bd9b1

警情查询修改

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

@@ -109,7 +109,29 @@
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "传入alarm")
    public R<IPage<AlarmVO>> page(AlarmVO alarm, Query query) {
        //获取部门数据
        List<DeptVo> deptVos = deptFeignApi.selDeptList();
        IPage<AlarmVO> pages = alarmService.selectAlarmPage(Condition.getPage(query), alarm);

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

        return R.data(pages);
    }


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

@@ -41,6 +41,7 @@
        <result column="deviceName" property="deviceName"/>
        <result column="baphone" property="baphone"/>
        <result column="manufacturers" property="manufacturers"/>
        <result column="alarmlb" property="alarmlb"/>
    </resultMap>

    <!-- 通用查询映射结果 -->
@@ -209,7 +210,7 @@
        a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
        a.deviceNumber,a.region,e.district,a.vaddress,a.aaddress,
        a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,
        a.securityArr,a.securityId,
        a.securityArr,a.securityId,a.alarmlb,
        e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
        e.stype,
        e.oneId,

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java

@@ -60,5 +60,6 @@
    private String deptName;
    private String deviceName;
    private String manufacturers;
    private String alarmlb;

}