Merge remote-tracking branch 'origin/master'

tangzy

2021-03-22 439480489111ecb1863e2ad0ceb2ff18150366ef

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

@@ -12,6 +12,8 @@
import org.springblade.jfpt.animalheat.service.AnimalHeatService;
import org.springblade.jfpt.catalog.service.catalogService;
import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.operation.service.IOperationService;
import org.springblade.jfpt.operation.vo.OperationVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -48,6 +50,9 @@

   @Autowired
   private IAlarmService alarmService;

   @Autowired
   private IOperationService operationService;

   private static ServerHandler serverHandler;

@@ -457,28 +462,28 @@
                     } else if (fqbm.equals("3")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("扩展模块故障");
                        reason="扩展模块故障";
                        serverHandler.equipmentService.updateExstate(state,reason,devId);
//                        reason="扩展模块故障";
//                        serverHandler.equipmentService.updateExstate(state,reason,devId);
                     } else if (fqbm.equals("4")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("中继器故障");
                        reason="中继器故障";
                        serverHandler.equipmentService.updateExstate(state,reason,devId);
//                        reason="中继器故障";
//                        serverHandler.equipmentService.updateExstate(state,reason,devId);
                     } else if (fqbm.equals("5")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("打印机缺纸");
                        reason="打印机缺纸";
                        serverHandler.equipmentService.updateExstate(state,reason,devId);
//                        reason="打印机缺纸";
//                        serverHandler.equipmentService.updateExstate(state,reason,devId);
                     } else if (fqbm.equals("6")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("打印机故障");
                        reason="打印机故障";
                        serverHandler.equipmentService.updateExstate(state,reason,devId);
//                        reason="打印机故障";
//                        serverHandler.equipmentService.updateExstate(state,reason,devId);
                     } else if (fqbm.equals("7")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("扩展模块无直流");
                        reason="扩展模块无直流";
                        serverHandler.equipmentService.updateExstate(state,reason,devId);
//                        reason="扩展模块无直流";
//                        serverHandler.equipmentService.updateExstate(state,reason,devId);
                     } else if (fqbm.equals("8")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("扩展模块低电压");
@@ -487,16 +492,16 @@
                     } else if (fqbm.equals("9")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("扩展模块复位");
                        reason="扩展模块复位";
                        serverHandler.equipmentService.updateExstate(state,reason,devId);
//                        reason="扩展模块复位";
//                        serverHandler.equipmentService.updateExstate(state,reason,devId);
                     }
                     break;
                  case "34":
                     if (fqbm.equals("1")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("扩展模块防拆触发");
                        reason="扩展模块防拆触发";
                        serverHandler.equipmentService.updateExstate(state,reason,devId);
//                        reason="扩展模块防拆触发";
//                        serverHandler.equipmentService.updateExstate(state,reason,devId);
                     }
                     break;
                  case "35":
@@ -513,8 +518,8 @@
                     } else if (fqbm.equals("2")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("电话接口2故障");
                        reason="电话接口2故障";
                        serverHandler.equipmentService.updateExstate(state,reason,devId);
//                        reason="电话接口2故障";
//                        serverHandler.equipmentService.updateExstate(state,reason,devId);
                     } else if (fqbm.equals("3")) {
                        alarm.setWaringType("通讯故障");
                        alarm.setContent("远距离无线通讯");
@@ -1354,10 +1359,14 @@
                     if (fqbm.equals("0")) {
                        alarm.setWaringType("系统故障-恢复");
                        alarm.setContent("电话线故障-通讯故障（转发）");
                        reason="";
                        serverHandler.equipmentService.updateExstate("",reason,devId);
                     }
                     else if (fqbm.equals("1")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("交流电故障-通讯故障（转发）");
                        reason="";
                        serverHandler.equipmentService.updateExstate("",reason,devId);
                     }
                     else if (fqbm.equals("2")) {
                        alarm.setWaringType("系统故障");
@@ -1366,6 +1375,7 @@
                     else if (fqbm.equals("3")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("警号/继电器故障-通讯故障（转发）");

                     }
                     else if (fqbm.equals("4")) {
                        alarm.setWaringType("系统故障");
@@ -1382,6 +1392,8 @@
                     else if (fqbm.equals("7")) {
                        alarm.setWaringType("系统故障-恢复");
                        alarm.setContent("交流电故障恢复-通讯故障（转发）");
                        reason="";
                        serverHandler.equipmentService.updateExstate("",reason,devId);
                     }
                     else if (fqbm.equals("8")) {
                        alarm.setWaringType("系统故障-恢复");
@@ -1394,14 +1406,20 @@
                     else if (fqbm.equals("A")) {
                        alarm.setWaringType("系统故障-恢复");
                        alarm.setContent("电话线故障-通讯故障（转发）");
                        reason="";
                        serverHandler.equipmentService.updateExstate("",reason,devId);
                     }
                     else if (fqbm.equals("B")) {
                        alarm.setWaringType("系统故障-恢复");
                        alarm.setContent("回路短路故障恢复-通讯故障（转发）");
                        reason="";
                        serverHandler.equipmentService.updateExstate("",reason,devId);
                     }
                     else if (fqbm.equals("C")) {
                        alarm.setWaringType("系统故障-恢复");
                        alarm.setContent("无线监控恢复-通讯故障（转发）");
                        reason="";
                        serverHandler.equipmentService.updateExstate("",reason,devId);
                     }
                     else if (fqbm.equals("E")) {
                        alarm.setWaringType("系统故障");
@@ -1410,6 +1428,8 @@
                     else if (fqbm.equals("F")) {
                        alarm.setWaringType("系统故障-恢复");
                        alarm.setContent("无线监控故障恢复-通讯故障（转发）");
                        reason="";
                        serverHandler.equipmentService.updateExstate("",reason,devId);
                     }
                     break;
                  case "9B":
@@ -1723,22 +1743,30 @@
               if (police.size() != 0){
                  alarm.setAlarmId( police.get(0).get("alarmId").toString());
                  alarm.setAlarmPeople( police.get(0).get("alarmPeople").toString());
//                  Date date = new Date();
//                  SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//                  alarm.setJjTime(dateFormat.format(date));
                  Date date = new Date();
                  SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                  alarm.setJjTime(dateFormat.format(date));

                  serverHandler.alarmService.updatePoliceStatus( police.get(0).get("alarmId").toString(),"1");
               }else {
                  alarm.setAlarmId( online_police.get(0).get("id").toString());
                  alarm.setAlarmPeople(online_police.get(0).get("name").toString());
//                  Date date = new Date();
//                  SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//                  alarm.setJjTime(dateFormat.format(date));
                  Date date = new Date();
                  SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                  alarm.setJjTime(dateFormat.format(date));

                  serverHandler.alarmService.updatePoliceStatus(online_police.get(0).get("id").toString(),"1");
               }

               serverHandler.alarmService.s(alarm);

               OperationVO operation = new OperationVO();
               operation.setSnumber(alarm.getAlarmId());
               operation.setSname(alarm.getAlarmPeople());
               operation.setJid(alarm.getId().toString());
               operation.setZc("接警");
               operation.setZctime(alarm.getJjTime());
               serverHandler.operationService.save(operation);

               outData.add("LEOK#@");
               long endTime1 = System.currentTimeMillis();    //获取结束时间