hechunping 1 vuosi sitten
vanhempi
commit
aa6b7fcb93

+ 5 - 5
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 com.xy.consumer.disconnect.DisconnectedMqttConfiguration;
 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.DeviceStatusChangeNotifyDTO;
 import com.xy.entity.DeviceCharging;
 import com.xy.entity.DeviceInfo;
 import com.xy.entity.SysDictRedis;
 import com.xy.service.DeviceChargingServiceImpl;
-import com.xy.service.DeviceErrorsRecordServiceImpl;
+ import com.xy.service.DeviceEventMsgServiceImpl;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.utils.SysDictUtils;
 import com.xy.utils.enums.DeviceErrorRecordTypesEnum;
@@ -41,7 +41,7 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
 
     private DeviceInfoServiceImpl deviceInfoService;
 
-    private DeviceErrorsRecordServiceImpl deviceErrorsRecordService;
+    private DeviceEventMsgServiceImpl deviceErrorsRecordService;
 
     private DisconnectedProducer disconnectedProducer;
 
@@ -60,10 +60,10 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
             return;
         }
         //添加设备异常记录
-        DeviceErrorsRecordDto.Save save = new DeviceErrorsRecordDto.Save()
+        DeviceEventMsgDto.Save save = new DeviceEventMsgDto.Save()
                 .setDeviceId(deviceInfo.getDeviceId());
         save.setCode(deviceErrorRecordTypesEnum.getCode());
-        save.setErrorMsg(deviceAlarmNotifyDTO.getFaultMsg());
+        save.setMsg(deviceAlarmNotifyDTO.getFaultMsg());
         deviceErrorsRecordService.save(save);
         //修改设备为离线
         if (deviceErrorRecordTypesEnum.getCode() == DeviceErrorRecordTypesEnum.NET.getCode()) {