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是保持