Merge branch 'tb-alipay' into test

# Conflicts:
#	device-api-service/src/main/java/com/xy/alipay/SpiDeviceServiceImpl.java

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

@@ -10,7 +10,7 @@ import com.xy.entity.DeviceCharging;
 import com.xy.entity.DeviceInfo;
 import com.xy.entity.SysDictRedis;
 import com.xy.service.DeviceChargingServiceImpl;
- import com.xy.service.DeviceEventMsgServiceImpl;
+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 DeviceEventMsgServiceImpl deviceErrorsRecordService;
+    private DeviceEventMsgServiceImpl deviceEventMsgService;
 
     private DisconnectedProducer disconnectedProducer;
 
@@ -64,7 +64,7 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
                 .setDeviceId(deviceInfo.getDeviceId());
         save.setCode(deviceErrorRecordTypesEnum.getCode());
         save.setMsg(deviceAlarmNotifyDTO.getFaultMsg());
-        deviceErrorsRecordService.save(save);
+        deviceEventMsgService.save(save);
         //修改设备为离线
         if (deviceErrorRecordTypesEnum.getCode() == DeviceErrorRecordTypesEnum.NET.getCode()) {
             JSONObject jsonObject = new JSONObject().set("clientid", deviceInfo.getDeviceId());