From 630bd826033ae2c8aebb101fcd7115d9b3cf6791 Mon Sep 17 00:00:00 2001 From: 25604 Date: Tue, 4 Nov 2025 14:25:48 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E9=98=BF=E4=B8=BD?= =?UTF-8?q?=E5=A1=94=E6=97=B6=E6=8E=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mh/user/service/impl/ControlSetServiceImpl.java | 2 +- .../com/mh/user/service/impl/DeviceControlServiceImpl.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/user-service/src/main/java/com/mh/user/service/impl/ControlSetServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/ControlSetServiceImpl.java index 25b5b96..4c46db9 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/ControlSetServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/ControlSetServiceImpl.java @@ -29,7 +29,7 @@ public class ControlSetServiceImpl implements ControlSetService { @Override public ControlSetEntity queryControlSet(String buildingId, String timeName) { if (StringUtils.isBlank(timeName)) { - return null; + timeName = "时控"; } if (timeName.contains("时控")) { timeName = timeName.replaceAll("时控",""); diff --git a/user-service/src/main/java/com/mh/user/service/impl/DeviceControlServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/DeviceControlServiceImpl.java index 772f1ce..2993cb9 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/DeviceControlServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/DeviceControlServiceImpl.java @@ -148,7 +148,8 @@ public class DeviceControlServiceImpl implements DeviceControlService { deviceCodeParam.setRegisterAddr("00240001"); } rtData = serialPortSingle.serialPortSend(deviceCodeParam); - } else if (!StringUtils.isBlank(brand) && brand.equals("阿丽塔") && !rtData.equals(Constant.FAIL)) { + } else if (!StringUtils.isBlank(brand) && brand.equals("阿丽塔") && !rtData.equals(Constant.FAIL) && deviceCodeParam.getRegisterAddr().equals("0108")) { + log.error("进入阿丽塔时控控制指令发送"); // 需要继续发送指令 deviceCodeParam.setFunCode("10"); deviceCodeParam.setRegisterAddr("010C"); @@ -341,8 +342,8 @@ public class DeviceControlServiceImpl implements DeviceControlService { if (Constant.WRITE.equals(type)) { // 实际操作值 - deviceCodeParam.setDataValue(split[1]); - serialPortModel.setDataValue(split[1]); + deviceCodeParam.setDataValue(split[1].replace(":","")); + serialPortModel.setDataValue(split[1].replace(":","")); } // 根据读写类型设置功能码