1.警情导出bug修复 2.警情统计接口修改 3.一键报警设备接收报文时修改设备状态

Administrator

2021-05-06 c7d05af4e7ebf92b67308df21bde17282c0c50f1

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

@@ -180,6 +180,8 @@
               alarm.setWd((String) list.get(0).get("wd"));//纬度
               alarm.setCid(String.valueOf(a));//警情代码
               alarm.setJtype("0");
               //修改设备状态
               serverHandler.equipmentService.updateExstate("一键报警",null,(String) list.get(0).get("deviceNumber"));
               switch (num) {
                  case "00":
                     if (fqbm.equals("0")) {
@@ -1740,9 +1742,9 @@
                  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(policeList.get(i).getOnline_status().equals("1")){
                           zx_police.add(policeList.get(i));
                        if (policeList.get(i).getWork_status().equals(0)){
                        if (policeList.get(i).getWork_status().equals("0")){
                           online_police.add(policeList.get(i));
                        }
                     }