1、修复阿丽塔时控问题

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("时控","");

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(":",""));
         }
 
         // 根据读写类型设置功能码