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

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

@@ -189,13 +189,31 @@
 				join device_sysinfo ds on(di.device_id = ds.device_id)
         join device_sim dsim on(ds.sim_iccid = dsim.id)
         where
-        di.merc_id = #{query.mercId} and dsim.timeout >= #{query.begin1} and dsim.timeout <= #{query.end1}) as beTimeoutCout,
+          dsim.timeout >= #{query.begin1} and dsim.timeout <= #{query.end1}
+        <if test="query.mercId != null">
+         and   di.merc_id = #{query.mercId}
+        </if>
+        ) as beTimeoutCout,
         (select count(*)
         from device_info di
 				join device_sysinfo ds on(di.device_id = ds.device_id)
         join device_sim dsim on(ds.sim_iccid = dsim.id)
         where
-        di.merc_id = #{query.mercId} and dsim.timeout &lt;= #{query.end2}) as timeoutCout
+        dsim.timeout &lt;= #{query.end2}
+        <if test="query.mercId != null">
+           and  di.merc_id = #{query.mercId}
+        </if>
+        ) as timeoutCout,
+        (select count(*)
+        from device_info di
+        join device_sysinfo ds on(di.device_id = ds.device_id)
+        join device_sim dsim on(ds.sim_iccid = dsim.id)
+        <where>
+            <if test="query.mercId != null">
+                and   di.merc_id = #{query.mercId}
+            </if>
+        </where>
+        ) as totalNum
         from dual
     </select>
 </mapper>

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

@@ -76,14 +76,15 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
     @ApiOperation("按故障类型统计设备数")
     public R<List<DeviceFaultInfoDto.CountByDeviceVO>> countByDevice() {
         List<DeviceFaultInfoDto.CountByDeviceVO> list = deviceDataMapper.deviceFaultInfoCount();
-        list.forEach(d->{
+        list.forEach(d -> {
             SysCodeConfigureRedis s = SysCodeConfigureUtils.get(d.getEventCode());
-            if(s!=null){
+            if (s != null) {
                 d.setEventName(s.getTitle());
             }
         });
         return R.ok(list);
     }
+
     @PostMapping("obj")
     @ApiOperation("对象查询")
     public R<DeviceFaultInfoDto.Vo> obj(@RequestBody DeviceFaultInfoDto.Vo vo) {
@@ -117,8 +118,8 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
         Long sysId = AuthorizeUtils.getSysId();
         List<String> roleCodes = AuthorizeUtils.getRoleCodes(sysId);
         //售后角色只看转售后的，其他角色看所有
-        if(roleCodes.contains(CommConsts.MERC_SH_ADMIN)){
-            lambdaQueryWrapper.eq(DeviceFaultInfo::getToAfterSale,true);
+        if (roleCodes.contains(CommConsts.MERC_SH_ADMIN)) {
+            lambdaQueryWrapper.eq(DeviceFaultInfo::getToAfterSale, true);
         }
 
         IPage<DeviceFaultInfo> iPage = page(toIPage(pageBean), lambdaQueryWrapper);
@@ -131,9 +132,9 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
             selectList.setCodes(codes);
             List<SysCodeConfigureDto.Vo> vos = R.feignCheckData(sysCodeConfigureService.list(selectList));
             Map<String, SysCodeConfigureDto.Vo> sysCodeMap = MapUtil.newHashMap();
-            if(CollUtil.isNotEmpty(vos)){
-               sysCodeMap = vos.stream().collect(Collectors.toMap(SysCodeConfigureDto.Vo::getCode, i -> i));
-             }
+            if (CollUtil.isNotEmpty(vos)) {
+                sysCodeMap = vos.stream().collect(Collectors.toMap(SysCodeConfigureDto.Vo::getCode, i -> i));
+            }
             List<MercDto.Vo> mercs = mercService.list(new MercDto.SelectList().setMercIds(mercIds)).getData();
             JMap<Long, MercDto.Vo> longVoJMap = new JArrayList<>(mercs).toMap(MercDto.Vo::getId).cover();
             for (DeviceFaultInfoDto.Vo r : records) {
@@ -142,7 +143,7 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
                     r.setMercName(longVoJMap.get(mercId).getName());
                 }
                 SysCodeConfigureDto.Vo sysCodeInfo = sysCodeMap.get(r.getEventCode());
-                    //故障说明与建议
+                //故障说明与建议
                 if (sysCodeInfo != null) {
                     r.setMsg(sysCodeInfo.getMsg());
                     r.setPropose(sysCodeInfo.getPropose());
@@ -177,8 +178,9 @@ public class DeviceFaultInfoServiceImpl extends ServiceImpl<DeviceFaultInfoMappe
         resolveDone(update);
         return R.ok();
     }
+
     @Transactional(rollbackFor = Exception.class)
-    public void resolveDone( DeviceFaultInfoDto.Update update){
+    public void resolveDone(DeviceFaultInfoDto.Update update) {
         Long faultId = update.getFaultId();
         DeviceFaultInfo deviceFaultInfo = this.getById(faultId);
         if (deviceFaultInfo == null) {

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

@@ -157,7 +157,7 @@ public class DeviceSimDto {
     @Accessors(chain = true)
     public static class DeviceSimTimeoutCount {
 
-        @NotNull(message = "mercId不能为空")
+
         @ApiModelProperty(value = "商户id")
         private Long mercId;
 
@@ -180,6 +180,9 @@ public class DeviceSimDto {
 
         @ApiModelProperty(value = "欠费条数")
         private Integer timeoutCout;
+
+        @ApiModelProperty(value = "总数")
+        private Integer totalNum;
     }
 
     @Data