Merge remote-tracking branch 'origin/test' into test

device-api-service/src/main/java/com/xy/service/factory/device/impl/alipay/AliPayOpenDeviceFatoryImpl.java

@@ -58,6 +58,8 @@ public class AliPayOpenDeviceFatoryImpl implements DeviceFactory, SpiDeviceServi
 
     private DeviceMqttSendService deviceMqttSendService;
 
+    private DeviceTempSetServiceImpl deviceTempSetService;
+
     @Override
     public R save(DeviceRegisterDto.Save save) {
         R r = openDeviceFactoryImpl.save(save);
@@ -134,6 +136,33 @@ public class AliPayOpenDeviceFatoryImpl implements DeviceFactory, SpiDeviceServi
                     //温度设置
                     Integer value = data.getInt("target");
                     alipayDeviceService.setAttributes(new DeviceSetAttr().setTerminalId(terminalId).setType("TEMP").setValue(String.valueOf(value)));
+                    //写入记录
+                    try {
+                        DeviceTempSetDto.Save save = new DeviceTempSetDto.Save()
+                                .setDeviceId(commandMqtt.getDeviceId())
+                                .setWorkMode(data.getStr("workModel"))
+                                .setTempValue(data.getInt("target"))
+                                .setTempValue1(data.getInt("target1"))
+                                .setTempValue2(data.getInt("target2"))
+                                .setTempValue3(data.getInt("target3"))
+                                .setJob1StartTime(data.getInt("start1"))
+                                .setJob1EndTime(data.getInt("end1"))
+                                .setJob2StartTime(data.getInt("start2"))
+                                .setJob2EndTime(data.getInt("end2"))
+                                .setJob3StartTime(data.getInt("start3"))
+                                .setJob3EndTime(data.getInt("end3"));
+                        String warningLow = data.getStr("warningLow");
+                        String warningHigh = data.getStr("warningHigh");
+                        if (!warningLow.equals("$warningLow$")) {
+                            save.setWarningLow(Integer.valueOf(warningLow));
+                        }
+                        if (!warningHigh.equals("$warningHigh$")) {
+                            save.setWarningHigh(Integer.valueOf(warningHigh));
+                        }
+                        deviceTempSetService.save(save);
+                    } catch (Exception e) {
+                        log.error("异常{}", templet);
+                    }
                 }
             }
         });