商品清单应用到设备列表，针对质检商户显示未激活设备

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

@@ -138,6 +138,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @ApiOperation("设备列表-管理员")
     public R<List<DeviceInfoDto.ListByAdminName>> listByAdminName(@RequestBody @Validated DeviceInfoDto.GroupByAdminNameDto dto) {
         String noAdmin = "未分配管理员";
+        //是否质检商户
+        boolean isQa = BooleanUtil.isTrue(dto.getIsQaMode());
+
         List<DeviceInfoDto.ListByAdminName> deviceInfoList = baseMapper.listByAdminName(dto);
         deviceInfoList.forEach(i -> {
             SysDictRedis dictDeviceType = SysDictUtils.get(DictConsts.DEVICE_TYPE, String.valueOf(i.getDeviceType()));
@@ -175,37 +178,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     @Override
     @ApiOperation("设备分组-管理员")
     public R<List<DeviceInfoDto.GroupByAdminNameVo>> groupByAdminName(@RequestBody @Validated DeviceInfoDto.GroupByAdminNameDto dto) {
-        String noAdmin = "未分配管理员";
-        List<DeviceInfoDto.ListByAdminName> deviceInfoList = listByAdminName(dto).getData();
-        // 根据管理员名字分组
-        Map<String, List<DeviceInfoDto.ListByAdminName>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(DeviceInfoDto.ListByAdminName::getAdminName));
-        List<DeviceInfoDto.GroupByAdminNameVo> list = new ArrayList<>();
-        // 不包含未分配管理员的
-        deviceMap.forEach(
-                (k, i) -> {
-                    DeviceInfoDto.GroupByAdminNameVo vo = new DeviceInfoDto.GroupByAdminNameVo();
-                    if (!noAdmin.equals(k)) {
-                        vo.setAdminName(k)
-                                .setDeviceNum(i.size())
-                                .setDeviceInfos(i);
-                        list.add(vo);
-                    }
-                }
-        );
-        // 包含分配管理员的
-        List<DeviceInfoDto.ListByAdminName> noAdminNamesList = deviceMap.get(noAdmin);
-        if (Emptys.check(noAdminNamesList)) {
-            DeviceInfoDto.GroupByAdminNameVo vo = new DeviceInfoDto.GroupByAdminNameVo();
-            vo.setAdminName(noAdmin)
-                    .setDeviceNum(noAdminNamesList.size())
-                    .setDeviceInfos(noAdminNamesList);
-            list.add(vo);
-        }
-        return R.ok(list);
-    }
 
 
-    public R<List<DeviceInfoDto.GroupByAdminNameVo>> groupByAdminCount(@RequestBody @Validated DeviceInfoDto.GroupByAdminNameDto dto) {
         String noAdmin = "未分配管理员";
         List<DeviceInfoDto.ListByAdminName> deviceInfoList = listByAdminName(dto).getData();
         // 根据管理员名字分组
@@ -236,6 +210,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     }
 
 
+
+
+
     @PostMapping("eventList")
     @ApiOperation("根据事件编码查询设备")
     public R<PageBean<DeviceInfoDto.EventListVo>> eventList(@RequestBody @Validated DeviceInfoDto.EventList eventList) {

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -106,7 +106,9 @@
         left join merc_place p on p.id = d.place_id
         <where>
             and d.merc_id = #{dto.mercId}
-            and d.active_state = 1
+            <if test="dto.isQaMode != true">
+                and d.active_state = 1
+            </if>
             <if test="dto.deviceIdList != null and dto.deviceIdList.size > 0">
                 and device_id in
                 <foreach collection="dto.deviceIdList" index="index" item="item" open="(" separator="," close=")">

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

@@ -12,6 +12,7 @@ import com.xy.convert.DictConvert;
 import com.xy.utils.DataTime;
 import com.xy.utils.PageBean;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -202,6 +203,10 @@ public class DeviceInfoDto {
 
         @ApiModelProperty("算法ID")
         private Long algorithmId;
+
+        @ApiModelProperty("是否QA模式")
+        private Boolean isQaMode;
+
     }