From 56e1d17db21971c4e78283dec9c1e4813b54d6c4 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Fri, 2 Jun 2023 09:55:56 +0800 Subject: [PATCH] =?UTF-8?q?2023-06-02=2009:55:36=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AD=96=E7=95=A5=E7=AE=A1=E7=90=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/psdc/service/impl/PsdcDeviceServiceImpl.java | 6 +++--- .../java/com/psdc/service/impl/PsdcSceneServiceImpl.java | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java index 578e56b..18503f4 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcDeviceServiceImpl.java @@ -302,7 +302,7 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService { // TODO 发送MQTT指令 // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,controlValue,controlMethod,2,"控制成功",controlBy)); // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,controlValue,controlMethod,3,"等待终端响应超时",controlBy)); - //发送成功 + // 发送成功 psdcControlLogMapper.insert(new PsdcControlLog(deviceId, psdcDevice.getDeviceName(), psdcDevice.getDeviceSn(), controlContext, controlValue, controlMethod, 2, "控制成功", controlBy)); atomicInteger.incrementAndGet(); @@ -336,10 +336,10 @@ public class PsdcDeviceServiceImpl implements IPsdcDeviceService { } - //TODO 发送MQTT指令 + // TODO 发送MQTT指令 // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,value,controlMethod,2,"控制成功",controlBy)); // psdcControlLogMapper.insert(new PsdcControlLog(deviceId,psdcDevice.getDeviceName(),psdcDevice.getDeviceSn(),controlContext,value,controlMethod,3,"等待终端响应超时",controlBy)); - //发送成功 + // 发送成功 return psdcControlLogMapper.insert(new PsdcControlLog(deviceId, psdcDevice.getDeviceName(), psdcDevice.getDeviceSn(), controlContext, value, controlMethod, 2, "控制成功", controlBy)); diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java index b1ca67a..9df5103 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java @@ -199,7 +199,9 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { DeviceVo deviceVo = new DeviceVo(); for (int i = 0; i < listByCode.size(); i++) { SceneVo sv = listByCode.get(i); + // System.out.println("序号 = " + i + "， 元素" + sv + "\n"); if (deviceId == sv.getDeviceId()) { + // System.out.println("上行: " + i + "\n"); deviceVo.setDeviceId(sv.getDeviceId()); deviceVo.setDeviceName(sv.getDeviceName()); deviceVo.setDeviceSn(sv.getDeviceSn()); @@ -214,10 +216,12 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { deviceVo.setTemp(sv.getSceneValue()); break; } - if (1 == listByCode.size()){ + if (1 == listByCode.size() || i == listByCode.size() - 1){ ary.add(deviceVo); } + } else { + // System.out.println("下发: " + i + "\n"); ary.add(deviceVo); deviceId = sv.getDeviceId(); deviceVo = new DeviceVo(); @@ -248,9 +252,11 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { } } } + // System.out.println("终端元素 = " + ary + "\n"); } psr.setDeviceVos(ary); } + // System.out.println("集合：" + sceneRes + "\n"); return sceneRes; }