From 9042d334589612bb089fa1df3621b304be690a6c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 14 Jan 2021 15:47:39 +0800
Subject: [PATCH] 客户列表接口修改
---
src/main/java/org/springblade/modules/Netty/controller/nettyController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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 e9a0ed8..57b2a5e 100644
--- a/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
+++ b/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
@@ -168,10 +168,13 @@
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() + ",";
+ arr += "'" + pages.get(j).getId() + "',";
List<String> outData = new ArrayList<>();
outData.add("LC8109085B#@");
Channel channel = channelHashMap.get(pages.get(j).getDeviceNumber());
+ if (channel == null) {
+ break;
+ }
channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
break;
}
@@ -179,7 +182,7 @@
}
}
- if (!arr.equals("")){
+ if (!arr.equals("")) {
String substring = arr.substring(0, arr.length() - 1);
equipmentService.updataType(substring);
}
@@ -221,17 +224,21 @@
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() + ",";
+ 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("")){
+ if (!arr.equals("")) {
String substring = arr.substring(0, arr.length() - 1);
equipmentService.updataTypeC(substring);
}
@@ -276,6 +283,9 @@
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));
return R.success("设备布防");
@@ -294,6 +304,9 @@
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));
return R.success("设备撤防");
--
Gitblit v1.9.3