Merge branch 'master' into prod

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

@@ -362,6 +362,13 @@ public class MercMiniDeviceController {
         return FactoryUtils.getServiceRoute(DeviceFactory.class, list.get(0).getDeviceType()).active(active);
     }
 
+    @PostMapping("restActive")
+    @ApiOperation("重置设备激活")
+    public R restActive(@RequestBody @Validated MercMiniDeviceDto.RestActive restActive) {
+        DeviceInfo deviceInfo = deviceInfoService.getById(restActive.getDeviceId());
+        return FactoryUtils.getServiceRoute(DeviceFactory.class, deviceInfo.getDeviceType()).restActive(restActive);
+    }
+
     @ApiOperation("运营状态修改")
     @PostMapping("modifyBusyStage")
     public R modifyBusyStage(@RequestBody @Validated MercMiniDeviceDto.BusySate busySate) {

device-api-service/src/main/java/com/xy/service/factory/device/DeviceFactory.java

@@ -27,6 +27,13 @@ public interface DeviceFactory {
      */
     R active(MercMiniDeviceDto.Active2 active);
 
+    /**
+     * 重置激活
+     * @param restActive
+     * @return
+     */
+    R restActive(MercMiniDeviceDto.RestActive restActive);
+
     /**
      * 发送指令
      *

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

@@ -115,6 +115,11 @@ public class AliPayOpenDeviceFatoryImpl implements DeviceFactory, SpiDeviceServi
         return result;
     }
 
+    @Override
+    public R restActive(MercMiniDeviceDto.RestActive restActive) {
+        return openDeviceFactoryImpl.restActive(restActive);
+    }
+
     @Override
     public R<List<Tuple.Tuple3<Long, Long, Boolean>>> senCommand(List<CommandMqtt> commandMqtts) {
         commandMqtts.forEach(commandMqtt -> {

device-api-service/src/main/java/com/xy/service/factory/device/impl/open/OpenDeviceFactoryImpl.java

@@ -201,6 +201,20 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
         return R.ok(result);
     }
 
+    @Override
+    public R restActive(MercMiniDeviceDto.RestActive restActive) {
+        deviceChargingService.removeById(restActive.getDeviceId());
+        deviceAlgorithmChargingService.remove(new LambdaQueryWrapper<DeviceAlgorithmCharging>()
+                .eq(DeviceAlgorithmCharging::getDeviceId, restActive.getDeviceId())
+        );
+        deviceInfoService.update(new LambdaUpdateWrapper<DeviceInfo>()
+                .set(DeviceInfo::getActiveState, 2)
+                .set(DeviceInfo::getActiveTime, null)
+                .eq(DeviceInfo::getDeviceId, restActive.getDeviceId())
+        );
+        return R.ok();
+    }
+
     @Override
     public R<List<Tuple.Tuple3<Long, Long, Boolean>>> senCommand(List<CommandMqtt> commandMqtts) {
         //发送指令

device-api/src/main/java/com/xy/dto/MercMiniDeviceDto.java

@@ -80,6 +80,16 @@ public class MercMiniDeviceDto {
         private Boolean isDeviceAlgorithmCharging = true;
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class RestActive {
+
+        @NotNull(message = "deviceId不能为空")
+        @ApiModelProperty("设备id")
+        private Long deviceId;
+
+    }
+
     @Data
     @Accessors(chain = true)
     public static class ActiveVo {