From 21b5737b835cb08dd6070b2eb16fa6881aded3f7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 14 May 2021 17:50:10 +0800
Subject: [PATCH] 海康报文保存
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 701 +++++++++++++++++++++------------------------------------
1 files changed, 260 insertions(+), 441 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
index a7fc985..5f656a0 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
@@ -48,7 +48,7 @@
private org.springblade.jfpt.Netty.service.nettyService nettyService;
@Autowired
- private IMessageService messageService;
+ private IMessageService messageService;
@Autowired
private IEquipmentService equipmentService;
@@ -126,8 +126,11 @@
String body = new String(req, "UTF-8");
String content = body;
System.out.println("接收客户端数据:" + body);
- String state="系统故障"; //设备故障状态
- String reason=null; //故障原因
+ String state = "系统故障"; //设备故障状态
+ String reason = null; //故障原因
+
+ String CSType = content.substring(2, 4);
+
//获取字符串的长度
int length = content.length();
//当字符串长度大于200时,采集体温数据,小于则采集报警数据
@@ -137,6 +140,14 @@
//插入数据
serverHandler.animalHeatService.save(body);
}
+ } else if (CSType.equals("HK")) {
+ //报文内容保存
+ String ChannelName = "";//设备编码
+ Message message = new Message();
+ message.setEnumber(ChannelName);
+ message.setContent(body);
+ message.setTime(df.format(day));
+ serverHandler.messageService.save(message);
} else {
String ChannelName = content.substring(10, 22);//设备编码
String sub = content.substring(23, 27);
@@ -157,18 +168,6 @@
}
List<String> outData = new ArrayList<>();
-
- switch (content.substring(0, 4)) {
- //海康设备报文记录
- case "HK": {
- //报文内容保存
- Message message = new Message();
- message.setEnumber(ChannelName);
- message.setContent(body);
- message.setTime(df.format(day));
- serverHandler.messageService.save(message);
- }
- }
switch (content.substring(0, 2)) {
case "LA": {
@@ -321,8 +320,7 @@
if (fqbm.equals("0")) {
alarm.setWaringType("24小时监察报警");
alarm.setContent("24小时辅助");
- }
- else if (fqbm.equals("1")) {
+ } else if (fqbm.equals("1")) {
alarm.setWaringType("25小时监察报警");
alarm.setContent("瓦斯侦测");
} else if (fqbm.equals("2")) {
@@ -394,56 +392,56 @@
} else if (fqbm.equals("1")) {
alarm.setWaringType("系统故障");
alarm.setContent("交流电故障");
- reason="交流电故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "交流电故障";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
} else if (fqbm.equals("2")) {
alarm.setWaringType("系统故障");
alarm.setContent("备电偏低");
- reason="备电偏低";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "备电偏低";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
} else if (fqbm.equals("3")) {
alarm.setWaringType("系统故障");
alarm.setContent("RAM校验错误");
- reason="RAM校验错误";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "RAM校验错误";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
} else if (fqbm.equals("4")) {
alarm.setWaringType("系统故障");
alarm.setContent("ROM校验错误");
- reason="ROM校验错误";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "ROM校验错误";
+ 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("系统关闭");
- reason="系统关闭";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "系统关闭";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
} 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 "31":
if (fqbm.equals("0")) {
alarm.setWaringType("系统故障");
alarm.setContent("接地故障");
- reason="接地故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "接地故障";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
}
break;
case "32":
@@ -471,18 +469,18 @@
if (fqbm.equals("0")) {
alarm.setWaringType("系统故障");
alarm.setContent("系统周边");
- reason="系统周边";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "系统周边";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
} else if (fqbm.equals("1")) {
alarm.setWaringType("系统故障");
alarm.setContent("回路断开");
- reason="回路断开";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "回路断开";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
} else if (fqbm.equals("2")) {
alarm.setWaringType("系统故障");
alarm.setContent("回路短路");
- reason="回路短路";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "回路短路";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
} else if (fqbm.equals("3")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块故障");
@@ -511,8 +509,8 @@
} else if (fqbm.equals("8")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块低电压");
- reason="扩展模块低电压";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "扩展模块低电压";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
} else if (fqbm.equals("9")) {
alarm.setWaringType("系统故障");
alarm.setContent("扩展模块复位");
@@ -532,13 +530,13 @@
if (fqbm.equals("0")) {
alarm.setWaringType("系统故障");
alarm.setContent("通讯故障");
- reason="通讯故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "通讯故障";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
} else if (fqbm.equals("1")) {
alarm.setWaringType("系统故障");
alarm.setContent("电话线故障");
- reason="电话线故障";
- serverHandler.equipmentService.updateExstate(state,reason,devId);
+ reason = "电话线故障";
+ serverHandler.equipmentService.updateExstate(state, reason, devId);
} else if (fqbm.equals("2")) {
alarm.setWaringType("系统故障");
alarm.setContent("电话接口2故障");
@@ -724,8 +722,7 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("警号/继电器输出禁止");
alarm.setContent("故障继电器禁止");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("警号/继电器输出禁止");
alarm.setContent("回动继电器禁止");
}
@@ -755,8 +752,7 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("旁路操作");
alarm.setContent("局部旁路");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("旁路操作");
alarm.setContent("Swinger Bypass");
}
@@ -777,24 +773,19 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("系统测试");
alarm.setContent("火警回路");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("系统测试");
alarm.setContent("报告跟随");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("系统测试");
alarm.setContent("监听跟随");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("系统测试");
alarm.setContent("步行测试");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("系统测试");
alarm.setContent("OFF normal condition");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("系统测试");
alarm.setContent("视频传输");
}
@@ -821,24 +812,19 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("系统测试");
alarm.setContent("事件缓存已满");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("系统测试");
alarm.setContent("时间/日期调整");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("系统测试");
alarm.setContent("时间/日期丢失");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("系统测试");
alarm.setContent("进入编程模式");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("系统测试");
alarm.setContent("退出编程模式");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("系统测试");
alarm.setContent("24小时未读取事件缓存");
}
@@ -865,20 +851,16 @@
} else if (fqbm.equals("2")) {
alarm.setWaringType("服务请求");
alarm.setContent("医疗");
- }
- else if (fqbm.equals("3")) {
+ } else if (fqbm.equals("3")) {
alarm.setWaringType("服务请求");
alarm.setContent("家政");
- }
- else if (fqbm.equals("4")) {
+ } else if (fqbm.equals("4")) {
alarm.setWaringType("服务请求");
alarm.setContent("金融");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("服务请求");
alarm.setContent("法律");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("服务请求");
alarm.setContent("保险");
}
@@ -899,48 +881,37 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("火警");
alarm.setContent("4防区-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("火警");
alarm.setContent("5防区-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("火警");
alarm.setContent("6防区-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("火警");
alarm.setContent("7防区-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("火警");
alarm.setContent("8防区-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("火警");
alarm.setContent("9防区-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("火警");
alarm.setContent("10防区-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("火警");
alarm.setContent("11防区-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("火警");
alarm.setContent("12防区-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("火警");
alarm.setContent("13防区-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("火警");
alarm.setContent("14防区-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("窃盗");
alarm.setContent("门磁防区-通讯故障(转发)");
}
@@ -961,48 +932,37 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("紧急求救");
alarm.setContent("4防区-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("紧急求救");
alarm.setContent("5防区-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("紧急求救");
alarm.setContent("6防区-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("紧急求救");
alarm.setContent("7防区-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("紧急求救");
alarm.setContent("8防区-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("紧急求救");
alarm.setContent("9防区-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("紧急求救");
alarm.setContent("10防区-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("紧急求救");
alarm.setContent("11防区-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("紧急求救");
alarm.setContent("12防区-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("紧急求救");
alarm.setContent("13防区-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("紧急求救");
alarm.setContent("14防区-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("紧急求救");
alarm.setContent("15防区-通讯故障(转发)");
}
@@ -1023,48 +983,37 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("窃盗");
alarm.setContent("4防区-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("窃盗");
alarm.setContent("5防区-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("窃盗");
alarm.setContent("6防区-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("窃盗");
alarm.setContent("7防区-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("窃盗");
alarm.setContent("8防区-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("窃盗");
alarm.setContent("9防区-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("窃盗");
alarm.setContent("10防区-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("窃盗");
alarm.setContent("11防区-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("窃盗");
alarm.setContent("12防区-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("窃盗");
alarm.setContent("13防区-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("窃盗");
alarm.setContent("14防区-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("窃盗");
alarm.setContent("15防区-通讯故障(转发)");
}
@@ -1085,48 +1034,37 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("医疗求助");
alarm.setContent("4防区-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("医疗求助");
alarm.setContent("5防区-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("医疗求助");
alarm.setContent("6防区-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("医疗求助");
alarm.setContent("7防区-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("医疗求助");
alarm.setContent("8防区-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("医疗求助");
alarm.setContent("9防区-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("医疗求助");
alarm.setContent("10防区-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("医疗求助");
alarm.setContent("11防区-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("医疗求助");
alarm.setContent("12防区-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("医疗求助");
alarm.setContent("13防区-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("医疗求助");
alarm.setContent("14防区-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("医疗求助");
alarm.setContent("15防区-通讯故障(转发)");
}
@@ -1147,48 +1085,37 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("紧急求救");
alarm.setContent("4防区-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("紧急求救");
alarm.setContent("5防区-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("紧急求救");
alarm.setContent("6防区-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("紧急求救");
alarm.setContent("7防区-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("紧急求救");
alarm.setContent("8防区-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("紧急求救");
alarm.setContent("9防区-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("紧急求救");
alarm.setContent("10防区-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("紧急求救");
alarm.setContent("11防区-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("紧急求救");
alarm.setContent("12防区-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("紧急求救");
alarm.setContent("13防区-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("紧急求救");
alarm.setContent("14防区-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("紧急求救");
alarm.setContent("防区-通讯故障(转发)");
}
@@ -1209,48 +1136,37 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("防区故障");
alarm.setContent("4防区-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("防区故障");
alarm.setContent("5防区-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("防区故障");
alarm.setContent("6防区-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("防区故障");
alarm.setContent("7防区-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("防区故障");
alarm.setContent("8防区-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("防区故障");
alarm.setContent("9防区-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("防区故障");
alarm.setContent("10防区-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("防区故障");
alarm.setContent("11防区-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("防区故障");
alarm.setContent("12防区-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("防区故障");
alarm.setContent("13防区-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("防区故障");
alarm.setContent("14防区-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("防区故障");
alarm.setContent("15防区-通讯故障(转发)");
}
@@ -1271,48 +1187,37 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("防区恢复");
alarm.setContent("4防区-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("防区恢复");
alarm.setContent("5防区-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("防区恢复");
alarm.setContent("6防区-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("防区恢复");
alarm.setContent("7防区-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("防区恢复");
alarm.setContent("8防区-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("防区恢复");
alarm.setContent("9防区-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("防区恢复");
alarm.setContent("10防区-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("防区恢复");
alarm.setContent("11防区-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("防区恢复");
alarm.setContent("12防区-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("防区恢复");
alarm.setContent("13防区-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("防区恢复");
alarm.setContent("14防区-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("防区恢复");
alarm.setContent("15防区-通讯故障(转发)");
}
@@ -1333,48 +1238,37 @@
} else if (fqbm.equals("4")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("系统事件");
alarm.setContent("系统事件-通讯故障(转发)");
}
@@ -1383,141 +1277,112 @@
if (fqbm.equals("0")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("电话线故障-通讯故障(转发)");
- reason="";
- serverHandler.equipmentService.updateExstate("",reason,devId);
- }
- else if (fqbm.equals("1")) {
+ 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")) {
+ reason = "";
+ serverHandler.equipmentService.updateExstate("", reason, devId);
+ } else if (fqbm.equals("2")) {
alarm.setWaringType("系统故障");
alarm.setContent("备电偏低-通讯故障(转发)");
- }
- else if (fqbm.equals("3")) {
+ } else if (fqbm.equals("3")) {
alarm.setWaringType("系统故障");
alarm.setContent("警号/继电器故障-通讯故障(转发)");
- }
- else if (fqbm.equals("4")) {
+ } else if (fqbm.equals("4")) {
alarm.setWaringType("系统故障");
alarm.setContent("总线短路故障-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("系统故障");
alarm.setContent("电话线故障-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("备电故障恢复-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("交流电故障恢复-通讯故障(转发)");
- reason="";
- serverHandler.equipmentService.updateExstate("",reason,devId);
- }
- else if (fqbm.equals("8")) {
+ reason = "";
+ serverHandler.equipmentService.updateExstate("", reason, devId);
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("警号/继电器故障恢复-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("系统测试");
alarm.setContent("定期测试-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("电话线故障-通讯故障(转发)");
- reason="";
- serverHandler.equipmentService.updateExstate("",reason,devId);
- }
- else if (fqbm.equals("B")) {
+ 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")) {
+ 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")) {
+ reason = "";
+ serverHandler.equipmentService.updateExstate("", reason, devId);
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("系统故障");
alarm.setContent("无线监控故障-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("系统故障-恢复");
alarm.setContent("无线监控故障恢复-通讯故障(转发)");
- reason="";
- serverHandler.equipmentService.updateExstate("",reason,devId);
+ reason = "";
+ serverHandler.equipmentService.updateExstate("", reason, devId);
}
break;
case "9B":
if (fqbm.equals("0")) {
alarm.setWaringType("布防");
alarm.setContent("快速布防-通讯故障(转发)");
- }
- else if (fqbm.equals("1")) {
+ } else if (fqbm.equals("1")) {
alarm.setWaringType("布防");
alarm.setContent("1用户-通讯故障(转发)");
- }
- else if (fqbm.equals("2")) {
+ } else if (fqbm.equals("2")) {
alarm.setWaringType("布防");
alarm.setContent("2用户-通讯故障(转发)");
- }
- else if (fqbm.equals("3")) {
+ } else if (fqbm.equals("3")) {
alarm.setWaringType("布防");
alarm.setContent("3用户-通讯故障(转发)");
- }
- else if (fqbm.equals("4")) {
+ } else if (fqbm.equals("4")) {
alarm.setWaringType("布防");
alarm.setContent("4用户-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("布防");
alarm.setContent("5用户-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("布防");
alarm.setContent("6用户-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("布防");
alarm.setContent("7用户-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("布防");
alarm.setContent("8用户-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("布防");
alarm.setContent("9用户-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("布防");
alarm.setContent("10用户-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("布防");
alarm.setContent("11用户-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("布防");
alarm.setContent("12用户-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("布防");
alarm.setContent("13用户-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("布防");
alarm.setContent("14用户-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("布防");
alarm.setContent("远程控制-通讯故障(转发)");
}
@@ -1526,64 +1391,49 @@
if (fqbm.equals("0")) {
alarm.setWaringType("撤防");
alarm.setContent("16用户-通讯故障(转发)");
- }
- else if (fqbm.equals("1")) {
+ } else if (fqbm.equals("1")) {
alarm.setWaringType("撤防");
alarm.setContent("1用户-通讯故障(转发)");
- }
- else if (fqbm.equals("2")) {
+ } else if (fqbm.equals("2")) {
alarm.setWaringType("撤防");
alarm.setContent("2用户-通讯故障(转发)");
- }
- else if (fqbm.equals("3")) {
+ } else if (fqbm.equals("3")) {
alarm.setWaringType("撤防");
alarm.setContent("3用户-通讯故障(转发)");
- }
- else if (fqbm.equals("4")) {
+ } else if (fqbm.equals("4")) {
alarm.setWaringType("撤防");
alarm.setContent("4用户-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("撤防");
alarm.setContent("5用户-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("撤防");
alarm.setContent("6用户-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("撤防");
alarm.setContent("7用户-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("撤防");
alarm.setContent("8用户-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("撤防");
alarm.setContent("9用户-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("撤防");
alarm.setContent("10用户-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("撤防");
alarm.setContent("11用户-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("撤防");
alarm.setContent("12用户-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("撤防");
alarm.setContent("13用户-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("撤防");
alarm.setContent("14用户-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("撤防");
alarm.setContent("远程控制-通讯故障(转发)");
}
@@ -1598,60 +1448,46 @@
if (fqbm.equals("1")) {
alarm.setWaringType("警报故障");
alarm.setContent("1防区-通讯故障(转发)");
- }
- else if (fqbm.equals("2")) {
+ } else if (fqbm.equals("2")) {
alarm.setWaringType("警报故障");
alarm.setContent("2防区-通讯故障(转发)");
- }
- else if (fqbm.equals("3")) {
+ } else if (fqbm.equals("3")) {
alarm.setWaringType("警报故障");
alarm.setContent("3防区-通讯故障(转发)");
- }
- else if (fqbm.equals("4")) {
+ } else if (fqbm.equals("4")) {
alarm.setWaringType("警报故障");
alarm.setContent("4防区-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("警报故障");
alarm.setContent("5防区-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("警报故障");
alarm.setContent("6防区-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("警报故障");
alarm.setContent("7防区-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("警报故障");
alarm.setContent("8防区-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("警报故障");
alarm.setContent("9防区-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("警报故障");
alarm.setContent("10防区-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("警报故障");
alarm.setContent("11防区-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("警报故障");
alarm.setContent("12防区-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("警报故障");
alarm.setContent("13防区-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("警报故障");
alarm.setContent("14防区-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("警报故障");
alarm.setContent("15防区-通讯故障(转发)");
}
@@ -1660,64 +1496,49 @@
if (fqbm.equals("0")) {
alarm.setWaringType("警报恢复");
alarm.setContent("系统-通讯故障(转发)");
- }
- else if (fqbm.equals("1")) {
+ } else if (fqbm.equals("1")) {
alarm.setWaringType("警报恢复");
alarm.setContent("1防区-通讯故障(转发)");
- }
- else if (fqbm.equals("2")) {
+ } else if (fqbm.equals("2")) {
alarm.setWaringType("警报恢复");
alarm.setContent("2防区-通讯故障(转发)");
- }
- else if (fqbm.equals("3")) {
+ } else if (fqbm.equals("3")) {
alarm.setWaringType("警报恢复");
alarm.setContent("3防区-通讯故障(转发)");
- }
- else if (fqbm.equals("4")) {
+ } else if (fqbm.equals("4")) {
alarm.setWaringType("警报恢复");
alarm.setContent("4防区-通讯故障(转发)");
- }
- else if (fqbm.equals("5")) {
+ } else if (fqbm.equals("5")) {
alarm.setWaringType("警报恢复");
alarm.setContent("5防区-通讯故障(转发)");
- }
- else if (fqbm.equals("6")) {
+ } else if (fqbm.equals("6")) {
alarm.setWaringType("警报恢复");
alarm.setContent("6防区-通讯故障(转发)");
- }
- else if (fqbm.equals("7")) {
+ } else if (fqbm.equals("7")) {
alarm.setWaringType("警报恢复");
alarm.setContent("7防区-通讯故障(转发)");
- }
- else if (fqbm.equals("8")) {
+ } else if (fqbm.equals("8")) {
alarm.setWaringType("警报恢复");
alarm.setContent("8防区-通讯故障(转发)");
- }
- else if (fqbm.equals("9")) {
+ } else if (fqbm.equals("9")) {
alarm.setWaringType("警报恢复");
alarm.setContent("9防区-通讯故障(转发)");
- }
- else if (fqbm.equals("A")) {
+ } else if (fqbm.equals("A")) {
alarm.setWaringType("警报恢复");
alarm.setContent("10防区-通讯故障(转发)");
- }
- else if (fqbm.equals("B")) {
+ } else if (fqbm.equals("B")) {
alarm.setWaringType("警报恢复");
alarm.setContent("11防区-通讯故障(转发)");
- }
- else if (fqbm.equals("C")) {
+ } else if (fqbm.equals("C")) {
alarm.setWaringType("警报恢复");
alarm.setContent("12防区-通讯故障(转发)");
- }
- else if (fqbm.equals("D")) {
+ } else if (fqbm.equals("D")) {
alarm.setWaringType("警报恢复");
alarm.setContent("13防区-通讯故障(转发)");
- }
- else if (fqbm.equals("E")) {
+ } else if (fqbm.equals("E")) {
alarm.setWaringType("警报恢复");
alarm.setContent("14防区-通讯故障(转发)");
- }
- else if (fqbm.equals("F")) {
+ } else if (fqbm.equals("F")) {
alarm.setWaringType("警报恢复");
alarm.setContent("15防区-通讯故障(转发)");
}
@@ -1726,12 +1547,10 @@
if (fqbm.equals("1")) {
alarm.setWaringType("视频故障");
alarm.setContent("视频遮挡");
- }
- else if (fqbm.equals("2")) {
+ } else if (fqbm.equals("2")) {
alarm.setWaringType("视频故障");
alarm.setContent("视频丢失");
- }
- else if (fqbm.equals("3")) {
+ } else if (fqbm.equals("3")) {
alarm.setWaringType("视频故障");
alarm.setContent("存储错误");
}
@@ -1745,10 +1564,10 @@
message.setTime(df.format(day));
serverHandler.messageService.save(message);
- if(alarm.getWaringType().equals("紧急求救")){
+ if (alarm.getWaringType().equals("紧急求救")) {
//修改设备状态
- serverHandler.equipmentService.updateExstate("一键报警",null,(String) list.get(0).get("deviceNumber"));
+ serverHandler.equipmentService.updateExstate("一键报警", null, (String) list.get(0).get("deviceNumber"));
//警情分发测试代码
//查询所有闲置的接警员
@@ -1757,11 +1576,11 @@
List<User> zx_police = new ArrayList<>();
for (int i = 0; i < policeList.size(); i++) {
//System.out.println(policeList.get(i).get("real_name"));
- if (null!=policeList.get(i).getOnline_status()){
- 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(null!=policeList.get(i).getWork_status()){
- if (policeList.get(i).getWork_status().equals("0")){
+ if (null != policeList.get(i).getWork_status()) {
+ if (policeList.get(i).getWork_status().equals("0")) {
online_police.add(policeList.get(i));
}
}
@@ -1770,13 +1589,13 @@
}
//如果无在线闲置人员
- if (online_police.size() == 0){
+ if (online_police.size() == 0) {
//判断是否有在线人员
- if (zx_police.size() == 0){
+ if (zx_police.size() == 0) {
//无在线人员,选取所有接警员
online_police = policeList;
- }else{
+ } else {
//有在线人员
online_police = zx_police;
}
@@ -1793,31 +1612,31 @@
//通过id计算接警员最后一次接警时间,倒序返回闲置最久的人员,派发任务
List<AlarmVO> police = serverHandler.alarmService.queryPoliceTime(policeIdArr);
- if (police.size() != 0){
- alarm.setAlarmId( police.get(0).getAlarmId().toString());
- alarm.setAlarmPeople( police.get(0).getAlarmPeople().toString());
- alarm.setPhoneNumber( police.get(0).getPhoneNumber().toString());
+ if (police.size() != 0) {
+ alarm.setAlarmId(police.get(0).getAlarmId().toString());
+ alarm.setAlarmPeople(police.get(0).getAlarmPeople().toString());
+ alarm.setPhoneNumber(police.get(0).getPhoneNumber().toString());
Date date = new Date();
- SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
alarm.setJjTime(dateFormat.format(date));
- serverHandler.alarmService.updatePoliceStatus( police.get(0).getAlarmId().toString(),"1");
- }else {
- alarm.setAlarmId( online_police.get(0).getId().toString());
+ serverHandler.alarmService.updatePoliceStatus(police.get(0).getAlarmId().toString(), "1");
+ } else {
+ alarm.setAlarmId(online_police.get(0).getId().toString());
alarm.setAlarmPeople(online_police.get(0).getName().toString());
alarm.setPhoneNumber(online_police.get(0).getPhone().toString());
Date date = new Date();
- SimpleDateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
alarm.setJjTime(dateFormat.format(date));
- serverHandler.alarmService.updatePoliceStatus(online_police.get(0).getId().toString(),"1");
+ serverHandler.alarmService.updatePoliceStatus(online_police.get(0).getId().toString(), "1");
}
}
serverHandler.alarmService.s(alarm);
- if(alarm.getWaringType().equals("紧急求救")){
+ if (alarm.getWaringType().equals("紧急求救")) {
OperationVO operation = new OperationVO();
operation.setSnumber(alarm.getAlarmId());
operation.setSname(alarm.getAlarmPeople());
--
Gitblit v1.9.3