商户设备列表分页-穿梭框用

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

@@ -115,8 +115,21 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
     public R<PageBean<DeviceInfoDto.MyDeviceInfo>> myDeviceList(@RequestBody @Validated DeviceInfoDto.MyDeviceDTO dto) {
         PageBean pageBean = dto.getPage();
         String searchKey = dto.getSearchKey();
+        Long mercId = dto.getMercId();
+        Long strategyId = dto.getStrategyId();
+        List<Long> deviceIds = new ArrayList<>();
+        if (strategyId != null) {
+            GoodsDeviceDto.SelectList selectList = new GoodsDeviceDto.SelectList();
+            selectList.setMercId(mercId).setPriceStrategyId(strategyId);
+            List<GoodsDeviceDto.Vo> goodsDevices = R.feignCheckData(goodsDeviceService.list(selectList));
+            if (CollUtil.isEmpty(goodsDevices)) {
+                return R.ok(new PageBean<>());
+            }
+            deviceIds = goodsDevices.stream().map(GoodsDeviceDto.Vo::getDeviceId).collect(Collectors.toList());
+        }
         LambdaQueryWrapper<DeviceInfo> lqw = new MybatisPlusQuery().eqWrapper(dto, DeviceInfo.class)
                 .build();
+        lqw.in(CollUtil.isNotEmpty(deviceIds), DeviceInfo::getDeviceId, deviceIds);
         lqw.and(StrUtil.isNotEmpty(searchKey), wrapper -> wrapper
                 .eq(DeviceInfo::getDeviceId, searchKey)
                 .or()

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

@@ -47,11 +47,15 @@ public class DeviceInfoDto {
 
         @ApiModelProperty(value = "商户ID", hidden = true)
         private Long mercId;
- 
+
 
         @ApiModelProperty(value = "搜索关键词")
         private String searchKey;
 
+        @ApiModelProperty(value = "策略ID")
+        private Long strategyId;
+        
+
     }