From ca71086fa9ab6c50e34ec336af4dc7b276ddd92d Mon Sep 17 00:00:00 2001 From: 25604 Date: Fri, 5 Sep 2025 09:47:02 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81TX60=E5=9B=9E=E6=B0=B4=E6=B8=A9?= =?UTF-8?q?=E6=8E=A7=E3=80=81=E9=98=BF=E4=B8=BD=E5=A1=94=E6=97=B6=E6=8E=A7?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E8=B0=83=E8=AF=95=E5=90=8E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=B9=E5=BA=94=E5=86=85=E5=AE=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mh/user/service/impl/DeviceControlServiceImpl.java | 2 +- .../main/java/com/mh/user/strategy/TimeControlStrategy.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 7d4580c..a435498 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,7 @@ public class DeviceControlServiceImpl implements DeviceControlService { deviceCodeParam.setRegisterAddr("00240001"); } rtData = serialPortSingle.serialPortSend(deviceCodeParam); - } else if (!StringUtils.isBlank(brand) && brand.equals("阿丽塔")) { + } else if (!StringUtils.isBlank(brand) && brand.equals("阿丽塔") && !rtData.equals(Constant.FAIL)) { // 需要继续发送指令 deviceCodeParam.setFunCode("10"); deviceCodeParam.setRegisterAddr("010C"); diff --git a/user-service/src/main/java/com/mh/user/strategy/TimeControlStrategy.java b/user-service/src/main/java/com/mh/user/strategy/TimeControlStrategy.java index e83e862..027932c 100644 --- a/user-service/src/main/java/com/mh/user/strategy/TimeControlStrategy.java +++ b/user-service/src/main/java/com/mh/user/strategy/TimeControlStrategy.java @@ -160,7 +160,8 @@ public class TimeControlStrategy implements DeviceStrategy { // 星期掩码 // 截取时间 data = ExchangeStringUtil.addZeroForNum(ExchangeStringUtil.hexString2binaryString(checkStr.substring(8, 10)), 8); - data = new StringBuilder(data).reverse().toString(); + // 截取七天 + data = new StringBuilder(data).reverse().substring(0, 7); } else if (rec == 18 && isExactlyDivisible("0044", registerAddr)) { // 定时控制继电器路数 // 截取1-8路，低8位 从高到低表示1-8路 1是执行动作。 0是保持