Merge remote-tracking branch 'origin/master'

zengh

2021-03-23 ba0f00cf00c2a5c693e9608a56d1f7d032f5e216

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

@@ -462,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("扩展模块低电压");
@@ -492,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":
@@ -518,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("远距离无线通讯");
@@ -1359,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("系统故障");
@@ -1371,6 +1375,7 @@
                     else if (fqbm.equals("3")) {
                        alarm.setWaringType("系统故障");
                        alarm.setContent("警号/继电器故障-通讯故障（转发）");

                     }
                     else if (fqbm.equals("4")) {
                        alarm.setWaringType("系统故障");
@@ -1387,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("系统故障-恢复");
@@ -1399,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("系统故障");
@@ -1415,6 +1428,8 @@
                     else if (fqbm.equals("F")) {
                        alarm.setWaringType("系统故障-恢复");
                        alarm.setContent("无线监控故障恢复-通讯故障（转发）");
                        reason="";
                        serverHandler.equipmentService.updateExstate("",reason,devId);
                     }
                     break;
                  case "9B":