From 71b6b716361c52af290493d365a328fc1a3467e2 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 28 Jan 2021 11:15:06 +0800
Subject: [PATCH] 1.统计接口 2.健康码
---
src/main/java/org/springblade/modules/Netty/controller/nettyController.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/Netty/controller/nettyController.java b/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
index 5d7acb3..3b1a114 100644
--- a/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
+++ b/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
@@ -159,22 +159,36 @@
int zT = 0;
+ String arr = "";
+
+
//将得到的设备与查询所得设备进行匹配
for (int i = 0; i < childList.size(); i++) {
for (int j = 0; j < pages.size(); j++) {
if (childList.get(i).get("eqid") != null) {
if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
+ zT = 1;
+ arr += "'" + pages.get(j).getId() + "',";
List<String> outData = new ArrayList<>();
outData.add("LC8109085B#@");
- int code = Integer.parseInt(pages.get(j).getDeviceNumber());
- Channel channel = channelHashMap.get(code);
+ Channel channel = channelHashMap.get(pages.get(j).getDeviceNumber());
+ if (channel == null) {
+ break;
+ }
channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
+ break;
}
}
}
}
+
+ if (!arr.equals("")) {
+ String substring = arr.substring(0, arr.length() - 1);
+ equipmentService.updataType(substring);
+ }
+
if (zT == 0) {
- return R.success("暂无设备撤");
+ return R.success("暂无设备布防");
}
return R.success("设备布防");
}
@@ -202,18 +216,31 @@
int zT = 0;
+ String arr = "";
+
//将得到的设备与查询所得设备进行匹配
for (int i = 0; i < childList.size(); i++) {
for (int j = 0; j < pages.size(); j++) {
if (childList.get(i).get("eqid") != null) {
if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
+ zT = 1;
+ arr += "'" + pages.get(j).getId() + "',";
List<String> outData = new ArrayList<>();
outData.add("LC8109085C#@");
Channel channel = channelHashMap.get(pages.get(j).getDeviceNumber());
+ if (channel == null) {
+ break;
+ }
channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
+ break;
}
}
}
+ }
+
+ if (!arr.equals("")) {
+ String substring = arr.substring(0, arr.length() - 1);
+ equipmentService.updataTypeC(substring);
}
if (zT == 0) {
@@ -248,7 +275,7 @@
*/
@PostMapping("/selectNettyChannelOb")
@ApiOperationSupport(order = 10)
- public R selectNettyChannelOb(String deviceNumber, HttpServletResponse response) {
+ public R selectNettyChannelOb(String deviceNumber,String ID, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials", "true");
@@ -256,7 +283,11 @@
List<String> outData = new ArrayList<>();
outData.add("LC8109085B#@");
Channel channel = channelHashMap.get(deviceNumber);
+ if (channel == null) {
+ return R.success("未查询到设备");
+ }
channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
+ equipmentService.updataType(ID);
return R.success("设备布防");
}
@@ -266,7 +297,7 @@
*/
@PostMapping("/selectNettyChannelOc")
@ApiOperationSupport(order = 11)
- public R selectNettyChannelOc(String deviceNumber, HttpServletResponse response) {
+ public R selectNettyChannelOc(String deviceNumber,String ID, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials", "true");
@@ -274,7 +305,11 @@
List<String> outData = new ArrayList<>();
outData.add("LC8109085C#@");
Channel channel = channelHashMap.get(deviceNumber);
+ if (channel == null) {
+ return R.success("未查询到设备");
+ }
channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
+ equipmentService.updataTypeC(ID);
return R.success("设备撤防");
}
--
Gitblit v1.9.3