设备流量卡分页查询兼容管理端

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()).setIsB(true));
+        return deviceSimService.page(page.setMercId(MercAuthUtils.getMercId()).setIsActivate(true));
     }
 
 }

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

@@ -44,14 +44,17 @@
         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)
-        <if test="queryPage.isB == true">
-            join device_sim dsim on(dsim.id = dsys.sim_iccid)
-        </if>
-        <if test="queryPage.isB == false">
+        <if test="queryPage.isActivate == null or queryPage.isActivate == false">
             left join device_sim dsim on(dsim.id = dsys.sim_iccid)
         </if>
+        <if test="queryPage.isActivate != null and queryPage.isActivate == true">
+            join device_sim dsim on(dsim.id = dsys.sim_iccid)
+        </if>
         where
         dsys.sim_iccid is not null
+        <if test="queryPage.isActivate != null and queryPage.isActivate == false">
+            and dsim.id is null
+        </if>
         <if test="queryPage.mercId != null">
             and di.merc_id = #{queryPage.mercId}
         </if>

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

@@ -94,8 +94,8 @@ public class DeviceSimDto {
         @ApiModelProperty(hidden = true)
         private LocalDateTime theTime;
 
-        @ApiModelProperty(hidden = true)
-        private Boolean isB = false;
+        @ApiModelProperty("是否激活")
+        private Boolean isActivate;
     }
 
     @Data