计费完成

device-api-cloud/src/main/java/com/xy/feign/DeviceChargingHistoryFeign.java

@@ -0,0 +1,10 @@
+package com.xy.feign;
+
+import com.xy.FeignInterceptor;
+import com.xy.consts.ServiceConsts;
+import com.xy.service.DeviceChargingHistoryService;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(value = ServiceConsts.SERVICE_NAME, configuration = FeignInterceptor.class)
+public interface DeviceChargingHistoryFeign extends DeviceChargingHistoryService {
+}

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

@@ -1,11 +1,22 @@
 package com.xy.service;
 
+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.xy.dto.DeviceAlgorithmChargingHistoryDto;
 import com.xy.entity.DeviceAlgorithmChargingHistory;
 import com.xy.mapper.DeviceAlgorithmChargingHistoryMapper;
+import com.xy.utils.MybatisPlusQuery;
+import com.xy.utils.PageBean;
+import com.xy.utils.PlusBeans;
+import com.xy.utils.R;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import static com.xy.utils.PlusBeans.toPageBean;
 
 
 /**
@@ -21,4 +32,11 @@ import org.springframework.stereotype.Service;
 @Api(tags = "设备算法计费历史表")
 public class DeviceAlgorithmChargingHistoryServiceImpl extends ServiceImpl<DeviceAlgorithmChargingHistoryMapper, DeviceAlgorithmChargingHistory> implements DeviceAlgorithmChargingHistoryService {
 
+    @Override
+    @ApiOperation("分页查询")
+    public R<PageBean<DeviceAlgorithmChargingHistoryDto.Vo>> page(@RequestBody DeviceAlgorithmChargingHistoryDto.Page page) {
+        LambdaQueryWrapper<DeviceAlgorithmChargingHistory> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceAlgorithmChargingHistory.class).build();
+        IPage<DeviceAlgorithmChargingHistory> iPage = page(PlusBeans.toIPage(page.getPage()), lambdaQueryWrapper);
+        return R.ok(toPageBean(DeviceAlgorithmChargingHistoryDto.Vo.class, iPage));
+    }
 }

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

@@ -4,10 +4,9 @@ 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.xy.dto.DeviceChargingHistoryDto;
-import com.xy.dto.DeviceInfoDto;
 import com.xy.entity.DeviceChargingHistory;
 import com.xy.mapper.DeviceChargingHistoryMapper;
-import com.xy.utils.Emptys;
+import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.PageBean;
 import com.xy.utils.PlusBeans;
 import com.xy.utils.R;
@@ -15,11 +14,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
 
 import static com.xy.utils.PlusBeans.toPageBean;
 
@@ -36,22 +30,11 @@ import static com.xy.utils.PlusBeans.toPageBean;
 @Api(tags = "设备计费历史表")
 public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceChargingHistoryMapper, DeviceChargingHistory> implements DeviceChargingHistoryService {
 
-    private DeviceInfoServiceImpl deviceInfoService;
-
-    @PostMapping("page")
+    @Override
     @ApiOperation("分页查询")
-    public R<PageBean<DeviceChargingHistoryDto.PageVo>> page(@RequestBody @Validated DeviceChargingHistoryDto.Page page) {
-        //查询设备计费历史
-        LambdaQueryWrapper<DeviceChargingHistory> lambdaQueryWrapper = new LambdaQueryWrapper<DeviceChargingHistory>().eq(DeviceChargingHistory::getDeviceId, page.getDeviceId());
+    public R<PageBean<DeviceChargingHistoryDto.Vo>> page(DeviceChargingHistoryDto.Page page) {
+        LambdaQueryWrapper<DeviceChargingHistory> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceChargingHistory.class).build();
         IPage<DeviceChargingHistory> iPage = page(PlusBeans.toIPage(page.getPage()), lambdaQueryWrapper);
-        PageBean<DeviceChargingHistoryDto.PageVo> pageVoPageBean = toPageBean(DeviceChargingHistoryDto.PageVo.class, iPage);
-        List<DeviceChargingHistoryDto.PageVo> records = pageVoPageBean.getRecords();
-        if (!Emptys.check(records)) {
-            return R.ok(pageVoPageBean);
-        }
-        //查询设备信息
-        DeviceInfoDto.Vo deviceInfo = deviceInfoService.obj(new DeviceInfoDto.Obj().setDeviceId(page.getDeviceId())).getData();
-        records.forEach(pageVo -> pageVo.setDeviceInfo(deviceInfo));
-        return R.ok(pageVoPageBean);
+        return R.ok(toPageBean(DeviceChargingHistoryDto.Vo.class, iPage));
     }
 }

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

@@ -1,10 +1,12 @@
 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;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -17,6 +19,15 @@ import java.time.LocalDateTime;
  */
 public class DeviceAlgorithmChargingHistoryDto {
 
+    @Data
+    @Accessors(chain = true)
+    public static class Page extends Vo {
+
+        @ApiModelProperty("分页对象")
+        private PageBean page;
+
+    }
+
     @Data
     @Accessors(chain = true)
     public static class Vo {

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -56,21 +55,11 @@ public class DeviceChargingHistoryDto {
 
     @Data
     @Accessors(chain = true)
-    public static class Page {
+    public static class Page extends Vo {
 
         @ApiModelProperty("分页对象")
         private PageBean page;
 
-        @NotNull(message = "deviceId不能为空")
-        @ApiModelProperty("设备id")
-        private Long deviceId;
     }
 
-    @Data
-    @Accessors(chain = true)
-    public static class PageVo extends Vo {
-
-        @ApiModelProperty(value = "设备信息")
-        private DeviceInfoDto.Vo deviceInfo;
-    }
 }

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

@@ -1,6 +1,11 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import com.xy.dto.DeviceAlgorithmChargingHistoryDto;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -13,4 +18,12 @@ import com.xy.annotate.RestMappingController;
 @RestMappingController("/device-algorithm-charging-history")
 public interface DeviceAlgorithmChargingHistoryService {
 
+    /**
+     * 分页查询
+     *
+     * @param page
+     * @return
+     */
+    @PostMapping("page")
+    R<PageBean<DeviceAlgorithmChargingHistoryDto.Vo>> page(@RequestBody DeviceAlgorithmChargingHistoryDto.Page page);
 }

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

@@ -1,6 +1,11 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import com.xy.dto.DeviceChargingHistoryDto;
+import com.xy.utils.PageBean;
+import com.xy.utils.R;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -13,4 +18,12 @@ import com.xy.annotate.RestMappingController;
 @RestMappingController("/device-charging-history")
 public interface DeviceChargingHistoryService {
 
+    /**
+     * 分页查询
+     *
+     * @param page
+     * @return
+     */
+    @PostMapping("page")
+    R<PageBean<DeviceChargingHistoryDto.Vo>> page(@RequestBody DeviceChargingHistoryDto.Page page);
 }