流量卡导入每次覆盖

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

@@ -34,4 +34,12 @@ public interface DeviceChargingMapper extends BaseMapper<DeviceCharging> {
      * @return
      */
     IPage<Long> deviceChargingTimeout(IPage page, @Param("query") Map<String, Object> map);
+
+    /**
+     * 查询过期条数
+     *
+     * @param deviceChargingTimeoutCount
+     * @return
+     */
+    DeviceChargingDto.DeviceChargingTimeoutCountVo deviceChargingTimeoutCount(@Param("query") DeviceChargingDto.DeviceChargingTimeoutCount deviceChargingTimeoutCount);
 }

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

@@ -35,18 +35,18 @@
         GROUP BY di.merc_id
     </select>
 
-    <select id="deviceChargingTimeoutCount" resultType="map">
+    <select id="deviceChargingTimeoutCount" resultType="com.xy.dto.DeviceChargingDto$DeviceChargingTimeoutCountVo">
         select
         (select count(*)
         from device_info di
         join device_charging dc on(di.device_id = dc.device_id)
         where
-        di.merc_id = #{query.mercId} and dc.timeout >= #{query.begin1} and dc.timeout &lt;= #{query.end1}) as count1,
+        di.merc_id = #{query.mercId} and dc.timeout >= #{query.begin1} and dc.timeout &lt;= #{query.end1}) as beTimeoutCout,
         (select count(*)
         from device_info di
         join device_charging dc on(di.device_id = dc.device_id)
         where
-        di.merc_id = #{query.mercId} and dc.timeout &lt;= #{query.end2}) as count2
+        di.merc_id = #{query.mercId} and dc.timeout &lt;= #{query.end2}) as timeoutCout
         from dual
     </select>
 </mapper>

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

@@ -94,10 +94,10 @@
             </if>
         </if>
         <if test="queryPage.batchNo != null and queryPage.batchNo != ''">
-            dsim.batch_no = #{queryPage.batchNo}
+            and dsim.batch_no = #{queryPage.batchNo}
         </if>
         <if test="queryPage.waitHandle != null">
-            dsim.wait_handle = #{queryPage.waitHandle}
+            and dsim.wait_handle = #{queryPage.waitHandle}
         </if>
         order by dsim.timeout asc
     </select>
@@ -153,10 +153,10 @@
             </if>
         </if>
         <if test="queryPage.batchNo != null and queryPage.batchNo != ''">
-            dsim.batch_no = #{queryPage.batchNo}
+            and dsim.batch_no = #{queryPage.batchNo}
         </if>
         <if test="queryPage.waitHandle != null">
-            dsim.wait_handle = #{queryPage.waitHandle}
+            and dsim.wait_handle = #{queryPage.waitHandle}
         </if>
     </select>
 

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

@@ -14,6 +14,7 @@ import com.xy.device.*;
 import com.xy.dto.*;
 import com.xy.entity.*;
 import com.xy.mapper.DeviceChargingMapper;
+import com.xy.sys.EnumMercCostMsgConfig;
 import com.xy.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -393,4 +394,18 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
         List<DeviceChargingDto.Vo> copy = copy(DeviceChargingDto.Vo.class, list);
         return R.ok(copy);
     }
+
+    @Override
+    @ApiOperation("查询过期条数")
+    public R<DeviceChargingDto.DeviceChargingTimeoutCountVo> deviceChargingTimeoutCount(DeviceChargingDto.DeviceChargingTimeoutCount deviceChargingTimeoutCount) {
+        Map<String, SysDictRedis> stringSysDictRedisMap = SysDictUtils.get(EnumMercCostMsgConfig.Code.CODE.getCode());
+        String now = DataTime.getSring();
+        int day = Integer.valueOf(stringSysDictRedisMap.get(EnumMercCostMsgConfig.DEVICE_COST_DAY.getCode()).getValue());
+        String end1 = DataTime.getStringAround(0, 0, day, 0, 0, 0, now);
+        deviceChargingTimeoutCount.setBegin1(now)
+                .setEnd1(end1)
+                .setEnd2(now);
+        DeviceChargingDto.DeviceChargingTimeoutCountVo deviceChargingTimeoutCountVo = baseMapper.deviceChargingTimeoutCount(deviceChargingTimeoutCount);
+        return R.ok(deviceChargingTimeoutCountVo);
+    }
 }

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

@@ -213,6 +213,35 @@ public class DeviceChargingDto {
         }
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class DeviceChargingTimeoutCount {
+
+        @NotNull(message = "mercId不能为空")
+        @ApiModelProperty(value = "商户id")
+        private Long mercId;
+
+        @ApiModelProperty(hidden = true)
+        private String begin1;
+
+        @ApiModelProperty(hidden = true)
+        private String end1;
+
+        @ApiModelProperty(hidden = true)
+        private String end2;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class DeviceChargingTimeoutCountVo {
+
+        @ApiModelProperty(value = "即将欠费条数")
+        private Integer beTimeoutCout;
+
+        @ApiModelProperty(value = "欠费条数")
+        private Integer timeoutCout;
+    }
+
     @Data
     @Accessors(chain = true)
     public static class Vo {

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

@@ -45,4 +45,13 @@ public interface DeviceChargingService {
      */
     @PostMapping("list")
     R<List<DeviceChargingDto.Vo>> list(@RequestBody @Validated DeviceChargingDto.SelectList selectList);
+
+    /**
+     * 查询过期条数
+     *
+     * @param deviceChargingTimeoutCount
+     * @return
+     */
+    @PostMapping("deviceChargingTimeoutCount")
+    R<DeviceChargingDto.DeviceChargingTimeoutCountVo> deviceChargingTimeoutCount(@RequestBody @Validated DeviceChargingDto.DeviceChargingTimeoutCount deviceChargingTimeoutCount);
 }