1.处警队伍列表接口修改 2.近一周警情接口修改，返回一键求助 3.报警设备报警时bug修复，新增判断接警员的在线状态和工作状态是否为空

Administrator

2021-05-08 284a9a6b482347a9fe65223a3280421d6a65e2e4

1.处警队伍列表接口修改
2.近一周警情接口修改，返回一键求助
3.报警设备报警时bug修复，新增判断接警员的在线状态和工作状态是否为空

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

@@ -397,7 +397,7 @@

    <select id="selectListSe" resultMap="alarmResultMap">
        SELECT
        a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.bz,
        a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,"一键求助" as waringType,a.bz,
        a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
        a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
        e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java

@@ -1742,14 +1742,17 @@
                        List<User> zx_police = new ArrayList<>();
                        for (int i = 0; i < policeList.size(); i++) {
                            //System.out.println(policeList.get(i).get("real_name"));
                            if(policeList.get(i).getOnline_status().equals("1")){
                            if (null!=policeList.get(i).getOnline_status()){
                                if(policeList.get(i).getOnline_status().equals("1")){
                                    zx_police.add(policeList.get(i));
                                if (policeList.get(i).getWork_status().equals("0")){
                                    online_police.add(policeList.get(i));
                                    if(null!=policeList.get(i).getWork_status()){
                                        if (policeList.get(i).getWork_status().equals("0")){
                                            online_police.add(policeList.get(i));
                                        }
                                    }
                                }
                            }
                        }


                        //如果无在线闲置人员
                        if (online_police.size() == 0){

 blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -159,6 +159,7 @@
        bu.role_id=br.id
        where
        br.role_alias ='处警员'
        and bu.is_deleted=0
        <if test="user.realName!=null and user.realName !=''">
            <bind name="realName" value="'%'+user.realName+'%'"/>
            and bu.real_name like #{realName}