Merge branch 'master' into test

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

@@ -22,7 +22,7 @@ public class DeviceSimController {
     @PostMapping("page")
     @ApiOperation("分页查询")
     public R<PageBean<DeviceSimDto.PageVo>> page(@RequestBody DeviceSimDto.Page page) {
-        return deviceSimService.page(page.setMercId(MercAuthUtils.getMercId()));
+        return deviceSimService.page(page.setMercId(MercAuthUtils.getMercId()).setIsB(true));
     }
 
 }

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

@@ -4,6 +4,7 @@ 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.entity.SysDictRedis;
@@ -13,6 +14,7 @@ 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.List;
 import java.util.Map;
@@ -23,6 +25,7 @@ import java.util.Map;
 @Slf4j
 @Component
 @AllArgsConstructor
+@RestMappingController("test")
 public class DeviceChargingJob {
 
     private DeviceChargingMapper deviceChargingMapper;
@@ -32,15 +35,16 @@ public class DeviceChargingJob {
      *
      * @return
      */
+    @GetMapping("test")
     @XxlJob("deviceChargingTimeout")
     public ReturnT<String> deviceChargingTimeout() {
         String now = DataTime.getSring();
         Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(EnumMercCostMsgConfig.Code.CODE.getCode());
-        String tel = stringSysDictRedisMap.get(EnumMercCostMsgConfig.CUSTOM_TEL.getCode()).toString();
+        String tel = stringSysDictRedisMap.get(EnumMercCostMsgConfig.CUSTOM_TEL.getCode()).getValue();
         String mmiTime = DataTime.getStringAround(0, -1, 0, 0, 0, 0, now);
         //即将过期
         FunctionUtils.NoParamsNoResult timeout1 = () -> {
-            int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.DEVICE_COST_DAY.getCode()).toString());
+            int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.DEVICE_COST_DAY.getCode()).getValue());
             String end = DataTime.getStringAround(0, 0, day, 0, 0, 0, now);
             JMap<String, Object> map = new JHashMap<String, Object>()
                     .set("mmiTime", mmiTime)
@@ -51,7 +55,7 @@ public class DeviceChargingJob {
         };
         //欠费
         FunctionUtils.NoParamsNoResult timeout2 = () -> {
-            int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.ARREARAGE_DAY.getCode()).toString());
+            int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.ARREARAGE_DAY.getCode()).getValue());
             String time1 = DataTime.getStringAround(0, 0, day, 0, 0, 0, now);
             JMap<String, Object> map = new JHashMap<String, Object>()
                     .set("mmiTime", mmiTime)
@@ -113,7 +117,7 @@ public class DeviceChargingJob {
         }
         //发送消息
         JMap<String, Object> officialParams = new JHashMap<String, Object>()
-                .set("content", String.format("尊敬的客户，截止%s您的%s已欠费，如您在%d前未完成续费，您的设备将停止交易，客服电话%s", thisTime, "设备管理费", time1, tel));
+                .set("content", String.format("尊敬的客户，截止%s您的%s已欠费，如您在%s前未完成续费，您的设备将停止交易，客服电话%s", thisTime, "设备管理费", time1, tel));
         JMap<String, Object> miniParams = new JHashMap<String, Object>()
                 .set("time0", thisTime)
                 .set("type", "设备管理费")

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

@@ -37,7 +37,7 @@ public class DeviceSimJob {
     public ReturnT<String> deviceSimTimeout() {
         String now = DataTime.getSring();
         Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(EnumMercCostMsgConfig.Code.CODE.getCode());
-        String tel = stringSysDictRedisMap.get(EnumMercCostMsgConfig.CUSTOM_TEL.getCode()).toString();
+        String tel = stringSysDictRedisMap.get(EnumMercCostMsgConfig.CUSTOM_TEL.getCode()).getValue();
         String mmiTime = DataTime.getStringAround(0, -1, 0, 0, 0, 0, now);
         //即将过期
         FunctionUtils.NoParamsNoResult timeout1 = () -> {
@@ -52,7 +52,7 @@ public class DeviceSimJob {
         };
         //欠费
         FunctionUtils.NoParamsNoResult timeout2 = () -> {
-            int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.ARREARAGE_DAY.getCode()).toString());
+            int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.ARREARAGE_DAY.getCode()).getValue());
             String time1 = DataTime.getStringAround(0, 0, day, 0, 0, 0, now);
             JMap<String, Object> map = new JHashMap<String, Object>()
                     .set("mmiTime", mmiTime)

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceChargingMapper.xml

@@ -20,9 +20,9 @@
         select di.merc_id
         from device_charging dc
         join device_info di on(dc.device_id = di.device_id)
-        left join merc_msg_info mmi on(di.merc_id = mmi.merc_id and mmi.create_time >= #{query.mmiTime})
+        left join merc_msg_info mmi on(di.merc_id = mmi.merc_id and mmi.create_time >= #{query.mmiTime} and mmi.type = 1 and mmi.work_type = #{query.workType})
         where
-        mmi.id is null and mmi.type = 1 and mmi.work_type = #{query.workType}
+        mmi.id is null
         <if test="query.begin != null">
             and dc.timeout >= #{query.begin}
         </if>

device-api-service/src/main/java/com/xy/mapper/mapper/DeviceSimMapper.xml

@@ -44,9 +44,14 @@
         from device_info di
         join device_status ds on (di.device_id = ds.device_id)
         join device_sysinfo dsys on(di.device_id = dsys.device_id)
-        join device_sim dsim on(dsim.id = dsys.sim_iccid)
+        <if test="queryPage.isB == true">
+            join device_sim dsim on(dsim.id = dsys.sim_iccid)
+        </if>
+        <if test="queryPage.isB == false">
+            left join device_sim dsim on(dsim.id = dsys.sim_iccid)
+        </if>
         where
-        1 = 1
+        dsys.sim_iccid is not null
         <if test="queryPage.mercId != null">
             and di.merc_id = #{queryPage.mercId}
         </if>
@@ -74,9 +79,9 @@
         from device_sysinfo dsi
         join device_info di on(dsi.device_id = di.device_id)
         join device_sim dsim on(dsi.sim_iccid = dsim.id)
-        left join merc_msg_info mmi on(di.merc_id = mmi.merc_id and mmi.create_time >= #{query.mmiTime})
+        left join merc_msg_info mmi on(di.merc_id = mmi.merc_id and mmi.create_time >= #{query.mmiTime} and mmi.type = 2 and mmi.work_type = #{query.workType})
         where
-        mmi.id is null and mmi.type = 2 and mmi.work_type = #{query.workType}
+        mmi.id is null
         <if test="query.begin != null">
             and dsim.timeout >= #{query.begin}
         </if>

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

@@ -127,16 +127,19 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
             Integer money = Integer.valueOf(simConfig.get(EnumSimConfig.money.getCode()).getValue());
             records.forEach(record -> {
                 //封装过期状态说明
-                String timeoutStatus;
                 DeviceSimDto.Vo sim = record.getSim();
-                LocalDateTime timeout = sim.getTimeout();
-                long s = DataTime.diff(page.getThisTime(), timeout, "s");
-                if (s <= 0) {
-                    timeoutStatus = "欠费(" + (~(s / 86400 - 1)) + "天)";
-                } else {
-                    timeoutStatus = s <= value * 86400 ? "即将到期(" + s / 86400 + "天)" : "正常(" + s / 86400 + "天)";
+                if(Emptys.check(sim)) {
+                    String timeoutStatus;
+                    LocalDateTime timeout = sim.getTimeout();
+                    long s = DataTime.diff(page.getThisTime(), timeout, "s");
+                    if (s <= 0) {
+                        timeoutStatus = "欠费(" + (~(s / 86400 - 1)) + "天)";
+                    } else {
+                        timeoutStatus = s <= value * 86400 ? "即将到期(" + s / 86400 + "天)" : "正常(" + s / 86400 + "天)";
+                    }
+                    record.getSim().setTimeoutStatus(timeoutStatus);
                 }
-                record.getSim().setTimeoutStatus(timeoutStatus);
+                //封装计费标准
                 record.setChargingName(name).setChargingMoney(money);
             });
         }

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

@@ -93,6 +93,9 @@ public class DeviceSimDto {
 
         @ApiModelProperty(hidden = true)
         private LocalDateTime theTime;
+
+        @ApiModelProperty(hidden = true)
+        private Boolean isB = false;
     }
 
     @Data