diff --git a/user-service/src/main/java/com/mh/user/constants/Constant.java b/user-service/src/main/java/com/mh/user/constants/Constant.java index c564c6f..4668e55 100644 --- a/user-service/src/main/java/com/mh/user/constants/Constant.java +++ b/user-service/src/main/java/com/mh/user/constants/Constant.java @@ -9,7 +9,7 @@ package com.mh.user.constants; */ public class Constant { - public static final CharSequence CUSTOM_NAME_HUAXIA = "华厦"; + public static final CharSequence CUSTOM_NAME_HUAXIA = "华夏"; public static final CharSequence CUSTOM_NAME_GUANGSHANG = "广商"; public static boolean CONTROL_WEB_FLAG = false; public static boolean SEND_STATUS = false; // 指令发送状态 diff --git a/user-service/src/main/java/com/mh/user/strategy/WaterLevelSwitchStrategy.java b/user-service/src/main/java/com/mh/user/strategy/WaterLevelSwitchStrategy.java index eb6365c..a78c7aa 100644 --- a/user-service/src/main/java/com/mh/user/strategy/WaterLevelSwitchStrategy.java +++ b/user-service/src/main/java/com/mh/user/strategy/WaterLevelSwitchStrategy.java @@ -417,8 +417,9 @@ public class WaterLevelSwitchStrategy implements DeviceStrategy { l8 = checkStr.substring(34, 38); // } } - } else if (checkStr.substring(2, 4).equals("06") || checkStr.substring(2, 4).equals("04")) { + } else if (checkStr.substring(2, 4).equals("06") || checkStr.substring(2, 4).equals("04") || checkStr.substring(2, 4).equals("10")) { log.info("时间:" + dateStr + ",水位开关ID:" + addr + ",操作成功! "); + return Constant.SUCCESS; } } else { log.info("水位开关报文检验失败: " + receiveData);