APP接口调整

zengh

2021-05-11 47a458ca867f700ad8dfe8bccdbb6bf59ca2d301

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

@@ -180,8 +180,6 @@
               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")) {
@@ -1735,6 +1733,10 @@
               serverHandler.messageService.save(message);

               if(alarm.getWaringType().equals("紧急求救")){

                  //修改设备状态
                  serverHandler.equipmentService.updateExstate("一键报警",null,(String) list.get(0).get("deviceNumber"));

                  //警情分发测试代码
                  //查询所有闲置的接警员
                  List<User> policeList = serverHandler.alarmService.queryPolice();
@@ -1742,14 +1744,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){