增加修改流量卡信息接口 b端流量卡数据统计

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

@@ -9,6 +9,7 @@ import com.xy.utils.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -25,4 +26,9 @@ public class DeviceSimController {
         return deviceSimService.page(page.setMercId(MercAuthUtils.getMercId()).setIsActivate(true));
     }
 
+    @PostMapping("pageCount")
+    @ApiOperation("分页数量查询")
+    public R<DeviceSimDto.PageCountVo> pageCount(@RequestBody @Validated DeviceSimDto.PageCount pageCount) {
+        return deviceSimService.pageCount(pageCount.setMercId(MercAuthUtils.getMercId()).setIsActivate(true));
+    }
 }

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

@@ -294,6 +294,26 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         return R.ok();
     }
 
+    @PostMapping("update")
+    @ApiOperation("修改流量卡信息")
+    public void update(@RequestBody @Validated DeviceSimDto.Update update) {
+        List<String> ids = update.getId();
+        LocalDateTime now = LocalDateTime.now();
+        List<DeviceSim> deviceSims = new ArrayList<>(ids.size());
+        ids.forEach(id -> {
+            DeviceSim deviceSim = new DeviceSim()
+                    .setId(id)
+                    .setType(update.getType())
+                    .setActivateTime(update.getActivateTime())
+                    .setTimeout(update.getTimeout())
+                    .setLastRenewalTime(update.getLastRenewalTime())
+                    .setBatchNo(update.getBatchNo())
+                    .setUpdateTime(now);
+            deviceSims.add(deviceSim);
+        });
+        updateBatchById(deviceSims);
+    }
+
     @Slf4j
     @RequiredArgsConstructor
     public static class UploadSimListener implements ReadListener<UploadSim> {

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

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -181,6 +182,45 @@ public class DeviceSimDto {
         private Integer timeoutCout;
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class Update {
+
+        @NotEmpty(message = "id不能为空")
+        @ApiModelProperty(value = "id", required = true)
+        private List<String> id;
+
+        @ApiModelProperty(value = "类型")
+        private String type;
+
+        @ApiModelProperty(value = "激活时间")
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        private LocalDate activateTime;
+
+        @ApiModelProperty(value = "过期时间")
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        private LocalDate timeout;
+
+        @ApiModelProperty(value = "最后续费时间")
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        private LocalDate lastRenewalTime;
+
+        @ApiModelProperty(value = "批次号")
+        private String batchNo;
+
+        public LocalDateTime getActivateTime() {
+            return activateTime == null ? null : activateTime.atTime(0,0,0);
+        }
+
+        public LocalDateTime getTimeout() {
+            return timeout == null ? null : timeout.atTime(0,0,0);
+        }
+
+        public LocalDateTime getLastRenewalTime() {
+            return lastRenewalTime == null ? null : lastRenewalTime.atTime(0,0,0);
+        }
+    }
+
     @Data
     @Accessors(chain = true)
     public static class Vo {