设备设置记录

device-api-service/src/main/java/com/xy/service/DeviceSetRecordsServiceImpl.java

@@ -41,7 +41,7 @@ public class DeviceSetRecordsServiceImpl extends ServiceImpl<DeviceSetRecordsMap
 
     @PostMapping("lastOne")
     @ApiOperation("返显最后一条记录")
-    public R lastOne(@RequestBody DeviceSetRecordsDto.LastOneDto dto) {
+    public R<List<DeviceSetRecordsDto.LastOneVo>> lastOne(@RequestBody DeviceSetRecordsDto.LastOneDto dto) {
         List<DeviceSetRecordsDto.LastOneVo> voList = new ArrayList<>();
         dto.getTypeList().forEach(type -> {
             LambdaQueryWrapper<DeviceSetRecords> lqw = new LambdaQueryWrapper<DeviceSetRecords>()
@@ -56,7 +56,6 @@ public class DeviceSetRecordsServiceImpl extends ServiceImpl<DeviceSetRecordsMap
                         .setContent(one.getContent());
                 voList.add(vo);
             }
-
         });
         return R.ok(voList);
     }

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

@@ -60,6 +60,8 @@ public class AliPayOpenDeviceFatoryImpl implements DeviceFactory, SpiDeviceServi
 
     private DeviceTempSetServiceImpl deviceTempSetService;
 
+    private DeviceSetRecordsServiceImpl deviceSetRecordsService;
+
     @Override
     public R save(DeviceRegisterDto.Save save) {
         R r = openDeviceFactoryImpl.save(save);
@@ -132,37 +134,38 @@ public class AliPayOpenDeviceFatoryImpl implements DeviceFactory, SpiDeviceServi
                     //声音设置
                     Integer value = data.getInt("alound");
                     alipayDeviceService.setAttributes(new DeviceSetAttr().setTerminalId(terminalId).setType("VOL").setValue(String.valueOf(value)));
+                    DeviceSetRecordsDto.Save save = new DeviceSetRecordsDto.Save();
+                    save.setType("voice")
+                            .setDeviceId(commandMqtt.getDeviceId())
+                            .setContent(data.toString());
+                    deviceSetRecordsService.save(save);
                 } else if (data.getStr("type").equals("temperature")) {
                     //温度设置
                     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);
+                    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);
                 }
             }
         });