From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/Netty/controller/nettyController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 8ca2ba0..8def96a 100644
--- a/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
+++ b/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
@@ -140,7 +140,7 @@
response.setHeader("Access-Control-Allow-Credentials","true");
ConcurrentHashMap<String, Channel> channelHashMap = ChannelMap.getChannelHashMap();
System.out.println(channelHashMap);
- String s = catalogService.selectCatalogEqNUmber(pid);
+ String s = "";
if (s==null){
return R.success("暂无设备布防");
}
@@ -167,7 +167,7 @@
response.setHeader("Access-Control-Allow-Credentials","true");
ConcurrentHashMap<String, Channel> channelHashMap = ChannelMap.getChannelHashMap();
System.out.println(channelHashMap);
- String s = catalogService.selectCatalogEqNUmber(pid);
+ String s = "";
if (s==null){
return R.success("暂无设备撤防");
}
@@ -183,4 +183,42 @@
}
}
+
+
+ /**
+ * 对单个设备进行布防
+ */
+ @PostMapping("/selectNettyChannelOb")
+ @ApiOperationSupport(order = 10)
+ public R selectNettyChannelOb(String deviceNumber,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");
+ ConcurrentHashMap<String, Channel> channelHashMap = ChannelMap.getChannelHashMap();
+ List<String> outData = new ArrayList<>();
+ outData.add("LC8109085B#@");
+ Channel channel = channelHashMap.get(deviceNumber);
+ channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
+ return R.success("设备布防");
+
+ }
+
+ /**
+ * 对单个设备进行撤防
+ */
+ @PostMapping("/selectNettyChannelOc")
+ @ApiOperationSupport(order = 11)
+ public R selectNettyChannelOc(String deviceNumber,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");
+ ConcurrentHashMap<String, Channel> channelHashMap = ChannelMap.getChannelHashMap();
+ List<String> outData = new ArrayList<>();
+ outData.add("LC8109085C#@");
+ Channel channel = channelHashMap.get(deviceNumber);
+ channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
+ return R.success("设备撤防");
+
+ }
+
}
--
Gitblit v1.9.3