1、美的热泵增加时段3；

user-service/src/main/java/com/mh/user/entity/PumpSetEntity.java

@@ -15,5 +15,7 @@ public class PumpSetEntity {
     private String closeTime1;
     private String startTime2;
     private String closeTime2;
+    private String startTime3;
+    private String closeTime3;
 
 }

user-service/src/main/java/com/mh/user/mapper/PumpSetMapper.java

@@ -23,6 +23,8 @@ public interface PumpSetMapper {
             "  <if test='closeTime1!=null'> , close_time1 = #{closeTime1} </if>" +
             "  <if test='startTime2!=null'> , start_time2 = #{startTime2} </if>" +
             "  <if test='closeTime2!=null'> , close_time2 = #{closeTime2} </if>" +
+            "  <if test='startTime3!=null'> , start_time3 = #{startTime3} </if>" +
+            "  <if test='closeTime3!=null'> , close_time3 = #{closeTime3} </if>" +
             "   where building_id = #{buildingId}  and  pump_id=#{pumpId}" +
             "</script>")
     void updatePumpSet(PumpSetEntity pumpSetEntity);

user-service/src/main/java/com/mh/user/service/impl/DeviceControlServiceImpl.java

@@ -796,7 +796,7 @@ public class DeviceControlServiceImpl implements DeviceControlService {
 
             nowDataService.upTempSet2(deviceCodeParam.getBuildingId(), serialPortModel.getDataValue(), deviceCodeParam.getDeviceAddr());//更新实时状态表
             log.info("楼栋编号：" + deviceCodeParam.getBuildingId() + ",设定温度：" + serialPortModel.getDataValue() + ",热泵编号：" + deviceCodeParam.getDeviceAddr());
-        } else if (deviceCodeParam.getParam().equals("时段1") || deviceCodeParam.getParam().equals("时段2")) {
+        } else if (deviceCodeParam.getParam().equals("时段1") || deviceCodeParam.getParam().equals("时段2") || deviceCodeParam.getParam().equals("时段3")) {
             if (deviceCodeParam.getBrand().equals("美的") || deviceCodeParam.getBrand().equals("瑞星")) {
                 //发送指令
                 if (Constant.READ.equals(type)) {
@@ -808,6 +808,8 @@ public class DeviceControlServiceImpl implements DeviceControlService {
                     deviceCodeParam.setRegisterAddr("0656");    //寄存器地址
                 } else if ("时段2".equals(deviceCodeParam.getParam()) && "美的".equals(deviceCodeParam.getBrand())) {
                     deviceCodeParam.setRegisterAddr("065A");    //寄存器地址
+                } else if ("时段3".equals(deviceCodeParam.getParam()) && "美的".equals(deviceCodeParam.getBrand())) {
+                    deviceCodeParam.setRegisterAddr("065E");    //寄存器地址
                 } else if ("时段1".equals(deviceCodeParam.getParam()) && "瑞星".equals(deviceCodeParam.getBrand())) {
                     deviceCodeParam.setRegisterAddr("0028");    //寄存器地址
                 } else if ("时段2".equals(deviceCodeParam.getParam()) && "瑞星".equals(deviceCodeParam.getBrand())) {
@@ -838,6 +840,9 @@ public class DeviceControlServiceImpl implements DeviceControlService {
                         } else if ("时段2".equals(deviceCodeParam.getParam())) {
                             pumpData.setStartTime2(statTime);
                             pumpData.setCloseTime2(closeTime);
+                        } else if ("时段3".equals(deviceCodeParam.getParam())) {
+                            pumpData.setStartTime3(statTime);
+                            pumpData.setCloseTime3(closeTime);
                         }
                     }
                     pumpSetService.savePumpSet(pumpData);//热泵信息保存数据库

user-service/src/main/java/com/mh/user/strategy/HeatPumpStrategy.java

@@ -79,6 +79,9 @@ public class HeatPumpStrategy implements DeviceStrategy {
                         } else if (registerAddr.equalsIgnoreCase("065A")) {     //读时段2
                             str = str + "03065A0004";
                             param = "时段2";
+                        } else if (registerAddr.equalsIgnoreCase("065E")) {     //读时段2
+                            str = str + "03065E0004";
+                            param = "时段3";
                         }
                     } else {//10
                         if (StringUtils.isBlank(registerAddr) || registerAddr.equalsIgnoreCase("0642")) {//温度设定,写
@@ -93,6 +96,8 @@ public class HeatPumpStrategy implements DeviceStrategy {
                                     str = str + "100656000408" + strData;   //写
                                 } else if (registerAddr.equalsIgnoreCase("065A")) {//时段2
                                     str = str + "10065A000408" + strData;   //写
+                                } else if (registerAddr.equalsIgnoreCase("065E")) {//时段3
+                                    str = str + "10065E000408" + strData;   //写
                                 }
                             }
                         }