瀏覽代碼

修改设备异常表为消息表

李进 1 年之前
父節點
當前提交
c2466f2876
共有 1 個文件被更改,包括 6 次插入6 次删除
  1. 6 6
      device-api-service/src/main/java/com/xy/alipay/SpiDeviceServiceImpl.java

+ 6 - 6
device-api-service/src/main/java/com/xy/alipay/SpiDeviceServiceImpl.java

@@ -3,14 +3,14 @@ package com.xy.alipay;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
 import com.xy.consumer.disconnect.DisconnectedMqttConfiguration;
 import com.xy.consumer.disconnect.DisconnectedMqttConfiguration;
 import com.xy.consumer.disconnect.DisconnectedProducer;
 import com.xy.consumer.disconnect.DisconnectedProducer;
-import com.xy.dto.DeviceErrorsRecordDto;
+import com.xy.dto.DeviceEventMsgDto;
 import com.xy.dto.spi.DeviceAlarmNotifyDTO;
 import com.xy.dto.spi.DeviceAlarmNotifyDTO;
 import com.xy.dto.spi.DeviceStatusChangeNotifyDTO;
 import com.xy.dto.spi.DeviceStatusChangeNotifyDTO;
 import com.xy.entity.DeviceCharging;
 import com.xy.entity.DeviceCharging;
 import com.xy.entity.DeviceInfo;
 import com.xy.entity.DeviceInfo;
 import com.xy.entity.SysDictRedis;
 import com.xy.entity.SysDictRedis;
 import com.xy.service.DeviceChargingServiceImpl;
 import com.xy.service.DeviceChargingServiceImpl;
-import com.xy.service.DeviceErrorsRecordServiceImpl;
+import com.xy.service.DeviceEventMsgServiceImpl;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.utils.SysDictUtils;
 import com.xy.utils.SysDictUtils;
 import com.xy.utils.enums.DeviceErrorRecordTypesEnum;
 import com.xy.utils.enums.DeviceErrorRecordTypesEnum;
@@ -41,7 +41,7 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
 
 
     private DeviceInfoServiceImpl deviceInfoService;
     private DeviceInfoServiceImpl deviceInfoService;
 
 
-    private DeviceErrorsRecordServiceImpl deviceErrorsRecordService;
+    private DeviceEventMsgServiceImpl deviceEventMsgService;
 
 
     private DisconnectedProducer disconnectedProducer;
     private DisconnectedProducer disconnectedProducer;
 
 
@@ -60,11 +60,11 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
             return;
             return;
         }
         }
         //添加设备异常记录
         //添加设备异常记录
-        DeviceErrorsRecordDto.Save save = new DeviceErrorsRecordDto.Save()
+        DeviceEventMsgDto.Save save = new DeviceEventMsgDto.Save()
                 .setDeviceId(deviceInfo.getDeviceId());
                 .setDeviceId(deviceInfo.getDeviceId());
         save.setCode(deviceErrorRecordTypesEnum.getCode());
         save.setCode(deviceErrorRecordTypesEnum.getCode());
-        save.setErrorMsg(deviceAlarmNotifyDTO.getFaultMsg());
-        deviceErrorsRecordService.save(save);
+        save.setMsg(deviceAlarmNotifyDTO.getFaultMsg());
+        deviceEventMsgService.save(save);
         //修改设备为离线
         //修改设备为离线
         if (deviceErrorRecordTypesEnum.getCode() == DeviceErrorRecordTypesEnum.NET.getCode()) {
         if (deviceErrorRecordTypesEnum.getCode() == DeviceErrorRecordTypesEnum.NET.getCode()) {
             JSONObject jsonObject = new JSONObject().set("clientid", deviceInfo.getDeviceId());
             JSONObject jsonObject = new JSONObject().set("clientid", deviceInfo.getDeviceId());