snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/service/impl/MonitorDeviceServiceImpl.java

@@ -342,6 +342,10 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
         List<MonitorDeviceType> deviceTypeList = monitorDeviceTypeService.list(typeQueryWrapper);
         List<String> modelNameList = deviceTypeList.stream().map(MonitorDeviceType::getCode).toList();
 
+        if (modelNameList.isEmpty()) {
+            return null;
+        }
+
         //查询设备列表
         LambdaQueryWrapper<MonitorDevice> deviceQueryWrapper = new LambdaQueryWrapper<>();
         deviceQueryWrapper.in(MonitorDevice::getModelName, modelNameList);

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/impl/MonitorTargetServiceImpl.java

@@ -444,7 +444,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
     private Map<Integer, String[]> ordinarySelect() {
         Map<Integer, String[]> map = new HashMap<>();
 
-        List<TargetRoom> list = targetRoomService.myList();
+        List<TargetRoom> list = targetRoomService.myList(null);
         List<String> billingNameList = list.stream().map(TargetRoom::getName).toList();
         map.put(0, billingNameList.toArray(new String[0]));
         return map;

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/controller/TargetRoomController.java

@@ -126,8 +126,8 @@ public class TargetRoomController {
     @Operation(summary = "获取房间列表")
     @SaCheckPermission("/coldchain/targetroom/list")
     @GetMapping("/coldchain/targetroom/list")
-    public CommonResult<List<TargetRoom>> list() {
-        return CommonResult.data(targetRoomService.myList());
+    public CommonResult<List<TargetRoom>> list(String searchKey) {
+        return CommonResult.data(targetRoomService.myList(searchKey));
     }
 
     /**

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/service/TargetRoomService.java

@@ -78,7 +78,7 @@ public interface TargetRoomService extends IService<TargetRoom> {
      **/
     TargetRoom queryEntity(String id);
 
-    List<TargetRoom> myList();
+    List<TargetRoom> myList(String searchKey);
 
     /**
      * 判断房间名是否重复

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/service/impl/TargetRoomServiceImpl.java

@@ -121,7 +121,7 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
     }
 
     @Override
-    public List<TargetRoom> myList() {
+    public List<TargetRoom> myList(String searchKey) {
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         LambdaQueryWrapper<TargetRoom> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TargetRoom::getCreateOrg,loginUser.getOrgId())
@@ -129,7 +129,7 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
                 .orderByAsc(TargetRoom::getSortCode);
         List<TargetRoom> list = list(queryWrapper);
         list.forEach(targetRoom -> {
-            targetRoom.setRegionCount(monitorTargetService.getTargetCount(null,targetRoom.getId()).getTotal());
+            targetRoom.setRegionCount(monitorTargetService.getTargetCount(searchKey,targetRoom.getId()).getTotal());
         });
         return list;
     }