设备流量卡充值分页查询

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

@@ -0,0 +1,28 @@
+package com.xy.controller;
+
+import com.xy.dto.DeviceSimChargeDto;
+import com.xy.service.DeviceSimChargeServiceImpl;
+import com.xy.utils.MercAuthUtils;
+import com.xy.utils.PageBean;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Service
+@AllArgsConstructor
+@Api(tags = "设备流量卡充值控制器")
+public class DeviceSimChargeController {
+
+    private DeviceSimChargeServiceImpl deviceSimChargeService;
+
+    @PostMapping("page")
+    @ApiOperation("分页查询")
+    public R<PageBean<DeviceSimChargeDto.Vo>> page(@RequestBody DeviceSimChargeDto.Page page) {
+        page.setMercId(MercAuthUtils.getMercId());
+        return deviceSimChargeService.page(page);
+    }
+}

device-api-service/src/main/java/com/xy/entity/DeviceSim.java

@@ -29,7 +29,7 @@ public class DeviceSim implements Serializable {
     private String id;
 
     @ApiModelProperty(value = "类型")
-    private Integer type;
+    private String type;
 
     @ApiModelProperty(value = "激活时间")
     private LocalDateTime activateTime;

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

@@ -1,11 +1,24 @@
 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.DeviceSimChargeDto;
 import com.xy.entity.DeviceSimCharge;
 import com.xy.mapper.DeviceSimChargeMapper;
+import com.xy.utils.Emptys;
+import com.xy.utils.MybatisPlusQuery;
+import com.xy.utils.PageBean;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import static com.xy.utils.PlusBeans.toIPage;
+import static com.xy.utils.PlusBeans.toPageBean;
 
 
 /**
@@ -21,4 +34,15 @@ import org.springframework.stereotype.Service;
 @Api(tags = "设备流量卡充值表")
 public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMapper, DeviceSimCharge> implements DeviceSimChargeService {
 
+    @PostMapping("page")
+    @ApiOperation("分页查询")
+    public R<PageBean<DeviceSimChargeDto.Vo>> page(@RequestBody DeviceSimChargeDto.Page page) {
+        PageBean pageBean = page.getPage();
+        LambdaQueryWrapper<DeviceSimCharge> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceSimCharge.class)
+                .build()
+                .orderByDesc(!Emptys.check(pageBean.getOrders()), DeviceSimCharge::getCreateTime);
+        IPage<DeviceSimCharge> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
+        return R.ok(toPageBean(DeviceSimChargeDto.Vo.class, iPage));
+    }
+
 }

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

@@ -264,6 +264,10 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         @ExcelProperty(value = "流量卡号")
         private String simId;
 
+        @ColumnWidth(25)
+        @ExcelProperty(value = "类型")
+        private String type;
+
         @ColumnWidth(25)
         @ExcelProperty(value = "激活时间")
         private String activateTime;

device-api/src/main/java/com/xy/dto/DeviceSimChargeDto.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;
@@ -17,6 +18,14 @@ import java.time.LocalDateTime;
  */
 public class DeviceSimChargeDto {
 
+    @Data
+    @Accessors(chain = true)
+    public static class Page extends Vo {
+
+        @ApiModelProperty(value = "分页对象", required = true)
+        private PageBean page;
+    }
+
     @Data
     @Accessors(chain = true)
     public static class Vo {

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

@@ -106,7 +106,7 @@ public class DeviceSimDto {
         private String id;
 
         @ApiModelProperty(value = "类型")
-        private Integer type;
+        private String type;
 
         @ApiModelProperty(value = "激活时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")