Merge branch 'master' into test

device-api-service/src/main/java/com/xy/job/DeviceAlgorithmChargingJob.java

@@ -1,59 +0,0 @@
-package com.xy.job;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import com.xy.entity.DeviceAlgorithmCharging;
-import com.xy.service.DeviceAlgorithmChargingServiceImpl;
-import com.xy.utils.DataTime;
-import com.xy.utils.Emptys;
-import com.xy.utils.PageBean;
-import com.xy.utils.PlusBeans;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 设备算法计费job
- */
-@Slf4j
-@Component
-@AllArgsConstructor
-public class DeviceAlgorithmChargingJob {
-
-    private DeviceAlgorithmChargingServiceImpl deviceAlgorithmChargingService;
-
-    /**
-     * 扣除设备算法计费过期时间
-     *
-     * @return
-     */
-    @XxlJob("deviceAlgorithmChargingTimeout")
-    public ReturnT<String> deviceAlgorithmChargingTimeout() {
-        deviceAlgorithmCharging(1, 50, Integer.valueOf(DataTime.getSring("yyyyMM")));
-        return ReturnT.SUCCESS;
-    }
-
-    public void deviceAlgorithmCharging(int current, int size, Integer beginTime) {
-        log.info("扣除设备算法计费过期时间开始第{}页", current);
-        LambdaQueryWrapper<DeviceAlgorithmCharging> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceAlgorithmCharging>()
-                .gt(DeviceAlgorithmCharging::getTimeout, 0)
-                .le(DeviceAlgorithmCharging::getBeginTime, beginTime);
-        IPage<DeviceAlgorithmCharging> iPage = deviceAlgorithmChargingService.page(PlusBeans.toIPage(new PageBean().setCurrent(current).setSize(size)), lambdaQueryWrapper);
-        List<DeviceAlgorithmCharging> records = iPage.getRecords();
-        if (!Emptys.check(records)) {
-            return;
-        }
-        records.forEach(deviceAlgorithmCharging -> deviceAlgorithmCharging.setTimeout(deviceAlgorithmCharging.getTimeout() - 1));
-        deviceAlgorithmChargingService.updateBatchById(records);
-        //判断是否继续下一页
-        if (iPage.getPages() <= current) {
-            return;
-        } else {
-            deviceAlgorithmCharging(current + 1, size, beginTime);
-        }
-    }
-}

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

@@ -2,6 +2,7 @@ package com.xy.service;
 
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yitter.idgen.YitIdHelper;
 import com.xy.collections.list.JArrayList;
@@ -18,10 +19,7 @@ import com.xy.entity.DeviceAlgorithmChargingHistory;
 import com.xy.entity.SysDictRedis;
 import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceAlgorithmChargingMapper;
-import com.xy.utils.DataTime;
-import com.xy.utils.Emptys;
-import com.xy.utils.R;
-import com.xy.utils.SysDictUtils;
+import com.xy.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -36,6 +34,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import static com.xy.utils.PlusBeans.toPageBean;
+
 
 /**
  * <p>
@@ -54,6 +54,16 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
 
     private DeviceInfoService deviceInfoService;
 
+    @PostMapping("page")
+    @ApiOperation("分页查询")
+    public R<PageBean<DeviceAlgorithmChargingDto.Vo>> page(@RequestBody @Validated DeviceAlgorithmChargingDto.Page page) {
+        LambdaQueryWrapper<DeviceAlgorithmCharging> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceAlgorithmCharging.class)
+                .build()
+                .orderByDesc(DeviceAlgorithmCharging::getTimeout);
+        IPage<DeviceAlgorithmCharging> iPage = page(PlusBeans.toIPage(page.getPage()), lambdaQueryWrapper);
+        return R.ok(toPageBean(DeviceAlgorithmChargingDto.Vo.class, iPage));
+    }
+
     @PostMapping("check")
     @ApiOperation("检查")
     public R check(@RequestBody @Validated DeviceAlgorithmChargingDto.Check check) {

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

@@ -1,6 +1,7 @@
 package com.xy.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xy.utils.PageBean;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -21,6 +22,15 @@ import java.util.List;
  */
 public class DeviceAlgorithmChargingDto {
 
+    @Data
+    @Accessors(chain = true)
+    public static class Page extends Vo {
+
+        @ApiModelProperty("分页对象")
+        private PageBean page;
+
+    }
+
     @Data
     @Accessors(chain = true)
     public static class Check {