Merge remote-tracking branch 'origin/test' into test

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

@@ -1,13 +1,16 @@
 package com.xy.job;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
+import com.xy.annotate.RestMappingController;
 import com.xy.collections.map.JHashMap;
 import com.xy.collections.map.JMap;
 import com.xy.device.EnumSimConfig;
 import com.xy.dto.MercMsgInfoDto;
+import com.xy.entity.DeviceSim;
 import com.xy.mapper.DeviceSimMapper;
 import com.xy.service.MercMsgInfoService;
 import com.xy.sys.EnumMercCostMsgConfig;
@@ -15,7 +18,9 @@ import com.xy.utils.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -24,6 +29,7 @@ import java.util.List;
 @Slf4j
 @Component
 @AllArgsConstructor
+@RestMappingController("test")
 public class DeviceSimJob {
 
     private DeviceSimMapper deviceSimMapper;
@@ -92,4 +98,26 @@ public class DeviceSimJob {
         timeout2.run();
         return ReturnT.SUCCESS;
     }
+
+    /**
+     * 流量卡待缴费消息
+     *
+     * @return
+     */
+    @GetMapping("test")
+    @XxlJob("deviceSimWaitHandle")
+    public ReturnT<String> deviceSimWaitHandle() {
+        Long count = deviceSimMapper.selectCount(new LambdaQueryWrapper<DeviceSim>().eq(DeviceSim::getWaitHandle, true));
+        if (count > 0) {
+            MsgUtils.sendMsg(19L)
+                    .official(() -> {
+                        JMap<String, Object> map = new JHashMap<String, Object>()
+                                .set("thing1", "有需要缴费的流量卡")
+                                .set("thing5", "有需要缴费的流量卡");
+                        return Arrays.asList(new MsgUtils.MsgInfo("oIJ5O5jnmMXg0vRBM3WuASPHJGbE", map));
+                    })
+                    .builder();
+        }
+        return ReturnT.SUCCESS;
+    }
 }

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

@@ -260,13 +260,15 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                 uploadSims.add(uploadSim);
             });
             //修改批次号
-            if (Emptys.check(download.getBatchNo()) && Emptys.check(download.getIsUpdateBatchNo()) && download.getIsUpdateBatchNo()) {
+            String updateBatchNo = download.getUpdateBatchNo();
+            Boolean isUpdateBatchNo = download.getIsUpdateBatchNo();
+            if (Emptys.check(updateBatchNo) && Emptys.check(isUpdateBatchNo) && isUpdateBatchNo) {
                 LocalDateTime now = LocalDateTime.now();
                 List<DeviceSim> deviceSims = new ArrayList<>(uploadSims.size());
                 uploadSims.forEach(uploadSim -> {
                     DeviceSim deviceSim = new DeviceSim()
                             .setId(uploadSim.getSimId())
-                            .setBatchNo(download.getBatchNo())
+                            .setBatchNo(updateBatchNo)
                             .setWaitHandle(false)
                             .setUpdateTime(now);
                     deviceSims.add(deviceSim);

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

@@ -151,6 +151,9 @@ public class DeviceSimDto {
 
         @ApiModelProperty(value = "是否更新批次号以及待续费")
         private Boolean isUpdateBatchNo;
+
+        @ApiModelProperty(value = "更新批次号")
+        private String updateBatchNo;
     }
 
     @Data