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 | 16 ++++++++--------
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml | 4 ++--
2 files changed, 10 insertions(+), 10 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 fb8011b..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,11 +168,11 @@
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){
+ if (channel == null) {
break;
}
channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
@@ -182,7 +182,7 @@
}
}
- if (!arr.equals("")){
+ if (!arr.equals("")) {
String substring = arr.substring(0, arr.length() - 1);
equipmentService.updataType(substring);
}
@@ -224,11 +224,11 @@
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){
+ if (channel == null) {
break;
}
channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
@@ -238,7 +238,7 @@
}
}
- if (!arr.equals("")){
+ if (!arr.equals("")) {
String substring = arr.substring(0, arr.length() - 1);
equipmentService.updataTypeC(substring);
}
@@ -283,7 +283,7 @@
List<String> outData = new ArrayList<>();
outData.add("LC8109085B#@");
Channel channel = channelHashMap.get(deviceNumber);
- if(channel == null){
+ if (channel == null) {
return R.success("未查询到设备");
}
channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
@@ -304,7 +304,7 @@
List<String> outData = new ArrayList<>();
outData.add("LC8109085C#@");
Channel channel = channelHashMap.get(deviceNumber);
- if(channel == null){
+ if (channel == null) {
return R.success("未查询到设备");
}
channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
diff --git a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
index acc3021..1c7b361 100644
--- a/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
+++ b/src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -137,11 +137,11 @@
</update>
<update id="updataType">
- update sys_equipment SET devicestate = 1 where id in (#{arr})
+ update sys_equipment SET devicestate = 1 where id in (${arr})
</update>
<update id="updataTypeC">
- update sys_equipment SET devicestate = 0 where id in (#{arr})
+ update sys_equipment SET devicestate = 0 where id in (${arr})
</update>
<update id="updateOnes" parameterType="org.springblade.modules.equipment.entity.Equipment">
--
Gitblit v1.9.3