支付宝设备

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceController.java

@@ -3,6 +3,7 @@ package com.xy.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xy.alipay.AliPay;
 import com.xy.annotate.RestMappingController;
 import com.xy.dto.DeviceBluetoothAuthDto;
 import com.xy.dto.DeviceInfoDto;
@@ -212,6 +213,7 @@ public class MercMiniDeviceController {
 
     @ApiOperation("运营状态修改")
     @PostMapping("modifyBusyStage")
+    @AliPay(AliPay.Type.BUSY_STATE)
     public R modifyBusyStage(@RequestBody @Validated MercMiniDeviceDto.BusySate busySate) {
         Long mercId = MercAuthUtils.getMercId();
         Long deviceId = busySate.getDeviceId();

device-api-service/pom.xml

@@ -87,5 +87,10 @@
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>xy-alipay</artifactId>
+            <version>1.0</version>
+        </dependency>
     </dependencies>
 </project>

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

@@ -0,0 +1,39 @@
+package com.xy.alipay;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.lang.annotation.*;
+
+/**
+ * 支付宝注解
+ *
+ * @author lijin
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface AliPay {
+
+    /**
+     * 类型
+     *
+     * @return
+     */
+    Type value();
+
+
+    @Getter
+    @AllArgsConstructor
+    enum Type {
+
+        RESTART("重启设备"),
+
+        BUSY_STATE("修改运营状态")
+
+        ;
+
+        private String type;
+    }
+
+}

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

@@ -13,7 +13,7 @@ import com.xy.service.DeviceChargingServiceImpl;
 import com.xy.service.DeviceErrorsRecordServiceImpl;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.utils.SysDictUtils;
-import com.xy.utils.enums.DeviceErrorTypesEnum;
+import com.xy.utils.enums.DeviceErrorRecordTypesEnum;
 import com.xy.utils.enums.DictEnum;
 import com.xy.utils.enums.DictSonEnum;
 import com.xy.work.SpiDeviceService;
@@ -53,20 +53,20 @@ public class SpiDeviceServiceImpl implements SpiDeviceService {
         //查询设备信息
         DeviceInfo deviceInfo = deviceInfoService.getById(Long.valueOf(deviceAlarmNotifyDTO.getTerminalId()));
         String faultCode = deviceAlarmNotifyDTO.getFaultCode();
-        DeviceErrorTypesEnum deviceErrorTypesEnum = faultCode.equals("DeviceOffline") ? DeviceErrorTypesEnum.DEVICE_ERROR_TYPES_1
-                : faultCode.equals("DoorOpenedOnNoTrade") ? DeviceErrorTypesEnum.DEVICE_ERROR_TYPES_2
+        DeviceErrorRecordTypesEnum deviceErrorRecordTypesEnum = faultCode.equals("DeviceOffline") ? DeviceErrorRecordTypesEnum.NET
+                : faultCode.equals("DoorOpenedOnNoTrade") ? DeviceErrorRecordTypesEnum.DOOR_LOCK
                 : null;
-        if (deviceErrorTypesEnum == null) {
+        if (deviceErrorRecordTypesEnum == null) {
             return;
         }
         //添加设备异常记录
         DeviceErrorsRecordDto.Save save = new DeviceErrorsRecordDto.Save()
                 .setDeviceId(deviceInfo.getDeviceId());
-        save.setErrorType(deviceErrorTypesEnum.getKey());
-        save.setErrorDescript(deviceErrorTypesEnum.getMsg());
+        save.setCode(deviceErrorRecordTypesEnum.getCode());
+        save.setErrorMsg(deviceAlarmNotifyDTO.getFaultMsg());
         deviceErrorsRecordService.save(save);
         //修改设备为离线
-        if (deviceErrorTypesEnum.getKey() == DeviceErrorTypesEnum.DEVICE_ERROR_TYPES_1.getKey()) {
+        if (deviceErrorRecordTypesEnum.getCode() == DeviceErrorRecordTypesEnum.NET.getCode()) {
             JSONObject jsonObject = new JSONObject().set("clientid", deviceInfo.getDeviceId());
             disconnectedProducer.sendToMqtt(jsonObject.toString(), DisconnectedMqttConfiguration.TOPIC, 1);
         }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.alipay.AliPay;
 import com.xy.annotate.Runners;
 import com.xy.annotate.Timer;
 import com.xy.collections.map.JHashMap;
@@ -125,6 +126,7 @@ public class MqttServiceImpl extends ServiceImpl<MqttCommandMapper, MqttCommand>
 
     @Override
     @ApiOperation("指令发送")
+    @AliPay(AliPay.Type.RESTART)
     public R<List<Tuple.Tuple3<Long, Long, Boolean>>> senCommand(List<CommandMqtt> commandMqtts) {
         //发送指令
         List<MqttDto> mqttDtos = new ArrayList<>();