Browse Source

feat:小程序搜索,划分为按冰箱/点位名搜索和按传感器编号搜索,并同步所有统计接口

黄渊昊 2 weeks ago
parent
commit
8aaf016e21
13 changed files with 86 additions and 54 deletions
  1. 2 2
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/controller/AppController.java
  2. 2 0
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/param/AppDevicePageParam.java
  3. 3 2
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/service/AppDeviceService.java
  4. 1 1
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/service/impl/MonitorDeviceServiceImpl.java
  5. 3 2
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/mapper/MonitorTargetMapper.java
  6. 22 12
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/mapper/mapping/MonitorTargetMapper.xml
  7. 2 0
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/param/MonitorTargetPageParam.java
  8. 6 1
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/MonitorTargetService.java
  9. 24 13
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/impl/MonitorTargetServiceImpl.java
  10. 2 2
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/controller/TargetRoomController.java
  11. 8 8
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/service/TargetRoomService.java
  12. 10 10
      snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/targetroom/service/impl/TargetRoomServiceImpl.java
  13. 1 1
      snowy-web-app/src/main/resources/logback-spring.xml

+ 2 - 2
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/controller/AppController.java

@@ -44,8 +44,8 @@ public class AppController {
 
     @GetMapping("/device-status")
     @Operation(summary = "设备总缆")
-    public CommonResult<DeviceStatus> getDeviceStatus(String keyword, String roomId) {
-        DeviceStatus deviceStatus = appDeviceService.getDeviceStatus(keyword, roomId);
+    public CommonResult<DeviceStatus> getDeviceStatus(String keyword, String roomId, String type) {
+        DeviceStatus deviceStatus = appDeviceService.getDeviceStatus(keyword, roomId, type);
         return CommonResult.data(deviceStatus);
     }
 

+ 2 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/param/AppDevicePageParam.java

@@ -81,4 +81,6 @@ public class AppDevicePageParam {
     /** 冰箱状态 */
     @Schema(description = "冰箱状态")
     private String status;
+
+    private String type;
 }

+ 3 - 2
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/service/AppDeviceService.java

@@ -114,6 +114,7 @@ public class AppDeviceService {
         monitorTargetPageParam.setRoomId(appDevicePageParam.getRoomId());
         monitorTargetPageParam.setOrgId(StpLoginUserUtil.getLoginUser().getOrgId());
         monitorTargetPageParam.setStatus(appDevicePageParam.getStatus());
+        monitorTargetPageParam.setType(appDevicePageParam.getType());
         // 调用 monitorTargetService 查询当前用户的监控目标数据,分页结果
         Page<MonitorTarget> pageByUser = monitorTargetService.selectMonitorTargetByPage(monitorTargetPageParam);
         // 遍历监控目标分页记录
@@ -329,8 +330,8 @@ public class AppDeviceService {
      * @param roomId
      * @return
      */
-    public DeviceStatus getDeviceStatus(String keyword, String roomId) {
-        TargetStatus targetCount = monitorTargetService.getTargetCount(keyword, roomId);
+    public DeviceStatus getDeviceStatus(String keyword, String roomId, String type) {
+        TargetStatus targetCount = monitorTargetService.getTargetCount(keyword, roomId, type);
         DeviceStatus deviceStatus = new DeviceStatus();
         BeanUtil.copyProperties(targetCount, deviceStatus);
         return deviceStatus;

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

@@ -420,7 +420,7 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
 
     @Override
     public CountEntity getIndexCount() {
-        TargetStatus targetCount = monitorTargetService.getTargetCount(null, null);
+        TargetStatus targetCount = monitorTargetService.getTargetCount(null, null, null);
         CountEntity countEntity = new CountEntity();
         countEntity.setDeviceCount((int) targetCount.getTotal());
 //        LambdaQueryWrapper<MonitorDevice> onlineDeviceQueryWrapper = new LambdaQueryWrapper<>();

+ 3 - 2
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/mapper/MonitorTargetMapper.java

@@ -29,12 +29,13 @@ import java.util.List;
  * @date 2024/11/13 16:56
  **/
 public interface MonitorTargetMapper extends BaseMapper<MonitorTarget> {
-    List<StatusCount> getCountByStatus(String name,String roomId,String orgId);
+    List<StatusCount> getCountByStatus(String name, String roomId, String orgId, String type, String searchFlag);
+
     /**
      * 使用 MonitorTargetPageParam 对象进行分页查询
      *
      * @param monitorTargetPageParam 查询参数对象,封装了所有查询条件
      * @return MonitorTarget 列表
      */
-    IPage<MonitorTarget> selectMonitorTargetByPage(Page<MonitorTarget> page, @Param("param") MonitorTargetPageParam monitorTargetPageParam);
+    IPage<MonitorTarget> selectMonitorTargetByPage(Page<MonitorTarget> page, @Param("param") MonitorTargetPageParam monitorTargetPageParam, String searchFlag);
 }

+ 22 - 12
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/mapper/mapping/MonitorTargetMapper.xml

@@ -12,6 +12,7 @@
         FROM monitor_target t
         LEFT JOIN monitor_target_region r ON r.monitor_target_id = t.id
         WHERE t.DELETE_FLAG = 'NOT_DELETE'
+        AND r.DELETE_FLAG = 'NOT_DELETE'
 <!--        &lt;!&ndash; 动态条件:仅在 r 存在时检查 r 的 DELETE_FLAG &ndash;&gt;-->
 <!--        AND (r.DELETE_FLAG = 'NOT_DELETE' OR r.id IS NULL)-->
         <!-- 动态条件:按房间ID查询 -->
@@ -23,12 +24,16 @@
             AND t.create_org = #{orgId}
         </if>
         <!-- 动态条件:按 sensor_code 或 name 模糊查询 -->
-        <if test="name != null and name.trim() != ''">
-            AND (
-            t.name LIKE CONCAT('%', #{name}, '%')
-            OR r.sensor_code LIKE CONCAT('%', #{name}, '%')
-            OR r.name LIKE CONCAT('%', #{name}, '%')
-            )
+        <if test="type != null and type.trim() != ''">
+            <if test="name != null and name.trim() != '' and searchFlag == null">
+                AND (
+                t.name LIKE CONCAT('%', #{param.name}, '%')
+                OR r.name LIKE CONCAT('%', #{param.name}, '%')
+                )
+            </if>
+            <if test="name != null and name.trim() != '' and searchFlag != null">
+                AND  r.sensor_code LIKE CONCAT('%', #{param.name}, '%')
+            </if>
         </if>
         GROUP BY t.status
     </select>
@@ -42,13 +47,18 @@
         FROM monitor_target t
         LEFT JOIN monitor_target_region r ON r.monitor_target_id = t.id
         WHERE t.DELETE_FLAG = 'NOT_DELETE'
+        AND r.DELETE_FLAG = 'NOT_DELETE'
         <!-- 动态条件:按名称或 sensor_code 或 name 模糊查询 -->
-        <if test="param.searchKey != null and param.searchKey.trim() != ''">
-            AND (
-            t.name LIKE CONCAT('%', #{param.searchKey}, '%')
-            OR r.sensor_code LIKE CONCAT('%', #{param.searchKey}, '%')
-            OR r.name LIKE CONCAT('%', #{param.searchKey}, '%')
-            )
+        <if test="param.type != null and param.type.trim() != ''">
+            <if test="param.name != null and param.name.trim() != '' and searchFlag == null">
+                AND (
+                t.name LIKE CONCAT('%', #{param.name}, '%')
+                OR r.name LIKE CONCAT('%', #{param.name}, '%')
+                )
+            </if>
+            <if test="param.name != null and param.name.trim() != '' and searchFlag != null">
+                AND  r.sensor_code LIKE CONCAT('%', #{param.name}, '%')
+            </if>
         </if>
         <!-- 动态条件:按创建用户查询 -->
         <if test="param.userId != null and param.userId.trim() != ''">

+ 2 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/param/MonitorTargetPageParam.java

@@ -86,6 +86,8 @@ public class MonitorTargetPageParam {
     @Schema(description = "冰箱状态")
     private String status;
 
+    private String type;
+
     // 计算分页偏移量
     public int getOffset() {
         return (current - 1) * size;  // 当前页 - 1 乘以每页条数

+ 6 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/MonitorTargetService.java

@@ -108,7 +108,7 @@ public interface MonitorTargetService extends IService<MonitorTarget> {
     /**
      * 根据设备对象状态统计数据
      */
-    TargetStatus getTargetCount(String name,String roomId);
+    TargetStatus getTargetCount(String name, String roomId, String type);
 
     /**
      * 更新最后一次心跳时间
@@ -122,6 +122,7 @@ public interface MonitorTargetService extends IService<MonitorTarget> {
 
     /**
      * 更新设备状态
+     *
      * @param deviceCode
      * @return
      */
@@ -130,6 +131,7 @@ public interface MonitorTargetService extends IService<MonitorTarget> {
 
     /**
      * 获取监控对象列表
+     *
      * @param isAll
      * @return
      */
@@ -137,6 +139,7 @@ public interface MonitorTargetService extends IService<MonitorTarget> {
 
     /**
      * 带房间的新增监控对象
+     *
      * @param monitorTargetAddWithRoomParam
      */
     void addWithRoom(MonitorTargetAddWithRoomParam monitorTargetAddWithRoomParam);
@@ -156,12 +159,14 @@ public interface MonitorTargetService extends IService<MonitorTarget> {
 
     /**
      * 下载导入模版
+     *
      * @param response
      */
     void downloadTemplate(HttpServletResponse response);
 
     /**
      * 导入数据
+     *
      * @param file
      * @return
      */

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

@@ -138,7 +138,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
     public void add(MonitorTargetAddParam monitorTargetAddParam) {
         MonitorTarget monitorTarget = BeanUtil.toBean(monitorTargetAddParam, MonitorTarget.class);
         this.save(monitorTarget);
-        
+
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -164,7 +164,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
     @Override
     public List<MonitorTarget> getTargetListByRoom(String roomId) {
         LambdaQueryWrapper<MonitorTarget> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(MonitorTarget::getRoomId,roomId).eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
+        queryWrapper.eq(MonitorTarget::getRoomId, roomId).eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         return list(queryWrapper);
     }
 
@@ -173,7 +173,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
     public void addWithRoom(MonitorTargetAddWithRoomParam monitorTargetAddWithRoomParam) {
         MonitorTarget monitorTarget = BeanUtil.toBean(monitorTargetAddWithRoomParam, MonitorTarget.class);
         this.save(monitorTarget);
-        
+
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -182,7 +182,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
         MonitorTarget monitorTarget = this.queryEntity(monitorTargetEditWithRoomParam.getId());
         BeanUtil.copyProperties(monitorTargetEditWithRoomParam, monitorTarget);
         this.updateById(monitorTarget);
-        
+
     }
 
     @Override
@@ -199,6 +199,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
 
     /**
      * 批量更新离线设备
+     *
      * @param allSensorCodes
      */
     @Override
@@ -206,8 +207,8 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
         // 构建查询建大仁科条件
         LambdaQueryWrapper<MonitorTargetRegion> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.likeRight(MonitorTargetRegion::getModelName, "RS");
-        queryWrapper.in(MonitorTargetRegion::getSensorCode,allSensorCodes);
-        queryWrapper.eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
+        queryWrapper.in(MonitorTargetRegion::getSensorCode, allSensorCodes);
+        queryWrapper.eq(MonitorTargetRegion::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         List<MonitorTargetRegion> targetRegions = monitorTargetRegionService.list(queryWrapper);
         Set<String> monitorTargetIds = targetRegions.stream()
                 .filter(monitorTargetRegion -> monitorTargetRegion.getDeviceCode() != null)
@@ -239,7 +240,12 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
             monitorTargetPageParam.setOrgId(StpLoginUserUtil.getLoginUser().getOrgId());
         }
         Page<MonitorTarget> page = new Page<>(monitorTargetPageParam.getCurrent(), monitorTargetPageParam.getSize());
-        Page<MonitorTarget> monitorTargetPage = (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page, monitorTargetPageParam);
+        Page<MonitorTarget> monitorTargetPage;
+        if (StrUtil.isNotBlank(monitorTargetPageParam.getType()) && monitorTargetPageParam.getType().equals("1")) {
+            monitorTargetPage = (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page, monitorTargetPageParam, null);
+        } else {
+            monitorTargetPage = (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page, monitorTargetPageParam, "true");
+        }
         monitorTargetPage.getRecords().forEach(monitorTarget -> {
             monitorTarget.setRoomName(targetRoomService.getById(monitorTarget.getRoomId()).getName());
         });
@@ -293,6 +299,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
 
     /**
      * jackzhou 重写 2025-1-7 新方法 selectMonitorTargetByPage
+     *
      * @param monitorTargetPageParam
      * @return
      */
@@ -333,10 +340,14 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
     }
 
     @Override
-    public TargetStatus getTargetCount(String name, String roomId) {
+    public TargetStatus getTargetCount(String name, String roomId, String type) {
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
-        List<StatusCount> countByStatusList = monitorTargetMapper.getCountByStatus(name, roomId, loginUser.getOrgId());
-        Long total = 0L;
+        List<StatusCount> countByStatusList;
+        if (StrUtil.isNotBlank(type) && type.equals("1")) {
+            countByStatusList = monitorTargetMapper.getCountByStatus(name, roomId, loginUser.getOrgId(), type, null);
+        } else {
+            countByStatusList = monitorTargetMapper.getCountByStatus(name, roomId, loginUser.getOrgId(), type, "true");
+        }
         Long online = 0L;
         Long offline = 0L;
         for (StatusCount statusCount : countByStatusList) {
@@ -346,7 +357,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
                 offline = statusCount.getCount();
             }
         }
-        total = online + offline;
+        long total = online + offline;
         return new TargetStatus(total, online, offline);
     }
 
@@ -393,7 +404,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
                 MonitorTarget monitorTarget = this.getById(monitorTargetId);
                 if (Objects.nonNull(monitorTarget)) {
                     monitorTarget.setStatus(monitorStatusEnum.getCode());
-                    
+
                     return this.updateById(monitorTarget);
                 }
             }
@@ -444,7 +455,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
     private Map<Integer, String[]> ordinarySelect() {
         Map<Integer, String[]> map = new HashMap<>();
 
-        List<TargetRoom> list = targetRoomService.myList(null);
+        List<TargetRoom> list = targetRoomService.myList(null, null);
         List<String> billingNameList = list.stream().map(TargetRoom::getName).toList();
         map.put(0, billingNameList.toArray(new String[0]));
         return map;

+ 2 - 2
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(String searchKey) {
-        return CommonResult.data(targetRoomService.myList(searchKey));
+    public CommonResult<List<TargetRoom>> list(String searchKey, String type) {
+        return CommonResult.data(targetRoomService.myList(searchKey, type));
     }
 
     /**

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

@@ -26,7 +26,7 @@ import java.util.List;
  * 房间配置Service接口
  *
  * @author hyh
- * @date  2024/12/31 00:05
+ * @date 2024/12/31 00:05
  **/
 public interface TargetRoomService extends IService<TargetRoom> {
 
@@ -34,7 +34,7 @@ public interface TargetRoomService extends IService<TargetRoom> {
      * 获取房间配置分页
      *
      * @author hyh
-     * @date  2024/12/31 00:05
+     * @date 2024/12/31 00:05
      */
     Page<TargetRoom> page(TargetRoomPageParam targetRoomPageParam);
 
@@ -42,7 +42,7 @@ public interface TargetRoomService extends IService<TargetRoom> {
      * 添加房间配置
      *
      * @author hyh
-     * @date  2024/12/31 00:05
+     * @date 2024/12/31 00:05
      */
     void add(TargetRoomAddParam targetRoomAddParam);
 
@@ -50,7 +50,7 @@ public interface TargetRoomService extends IService<TargetRoom> {
      * 编辑房间配置
      *
      * @author hyh
-     * @date  2024/12/31 00:05
+     * @date 2024/12/31 00:05
      */
     void edit(TargetRoomEditParam targetRoomEditParam);
 
@@ -58,7 +58,7 @@ public interface TargetRoomService extends IService<TargetRoom> {
      * 删除房间配置
      *
      * @author hyh
-     * @date  2024/12/31 00:05
+     * @date 2024/12/31 00:05
      */
     void delete(List<TargetRoomIdParam> targetRoomIdParamList);
 
@@ -66,7 +66,7 @@ public interface TargetRoomService extends IService<TargetRoom> {
      * 获取房间配置详情
      *
      * @author hyh
-     * @date  2024/12/31 00:05
+     * @date 2024/12/31 00:05
      */
     TargetRoom detail(TargetRoomIdParam targetRoomIdParam);
 
@@ -74,11 +74,11 @@ public interface TargetRoomService extends IService<TargetRoom> {
      * 获取房间配置详情
      *
      * @author hyh
-     * @date  2024/12/31 00:05
+     * @date 2024/12/31 00:05
      **/
     TargetRoom queryEntity(String id);
 
-    List<TargetRoom> myList(String searchKey);
+    List<TargetRoom> myList(String searchKey, String type);
 
     /**
      * 判断房间名是否重复

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

@@ -45,7 +45,7 @@ import java.util.List;
  * 房间配置Service接口实现类
  *
  * @author hyh
- * @date  2024/12/31 00:05
+ * @date 2024/12/31 00:05
  **/
 @Service
 public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetRoom> implements TargetRoomService {
@@ -57,11 +57,11 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
     public Page<TargetRoom> page(TargetRoomPageParam targetRoomPageParam) {
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         QueryWrapper<TargetRoom> queryWrapper = new QueryWrapper<TargetRoom>().checkSqlInjection();
-        if(ObjectUtil.isNotEmpty(targetRoomPageParam.getName())) {
+        if (ObjectUtil.isNotEmpty(targetRoomPageParam.getName())) {
             queryWrapper.lambda().like(TargetRoom::getName, targetRoomPageParam.getName());
         }
         queryWrapper.lambda().eq(TargetRoom::getCreateOrg, loginUser.getOrgId()).eq(TargetRoom::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
-        if(ObjectUtil.isAllNotEmpty(targetRoomPageParam.getSortField(), targetRoomPageParam.getSortOrder())) {
+        if (ObjectUtil.isAllNotEmpty(targetRoomPageParam.getSortField(), targetRoomPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(targetRoomPageParam.getSortOrder());
             queryWrapper.orderBy(true, targetRoomPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(targetRoomPageParam.getSortField()));
@@ -79,7 +79,7 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
             throw new CommonException("该房间名已存在!请重新输入");
         }
         TargetRoom targetRoom = BeanUtil.toBean(targetRoomAddParam, TargetRoom.class);
-         this.save(targetRoom);
+        this.save(targetRoom);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -114,22 +114,22 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
     @Override
     public TargetRoom queryEntity(String id) {
         TargetRoom targetRoom = this.getById(id);
-        if(ObjectUtil.isEmpty(targetRoom)) {
+        if (ObjectUtil.isEmpty(targetRoom)) {
             throw new CommonException("房间配置不存在,id值为:{}", id);
         }
         return targetRoom;
     }
 
     @Override
-    public List<TargetRoom> myList(String searchKey) {
+    public List<TargetRoom> myList(String searchKey, String type) {
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         LambdaQueryWrapper<TargetRoom> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TargetRoom::getCreateOrg,loginUser.getOrgId())
+        queryWrapper.eq(TargetRoom::getCreateOrg, loginUser.getOrgId())
                 .eq(TargetRoom::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE)
                 .orderByAsc(TargetRoom::getSortCode);
         List<TargetRoom> list = list(queryWrapper);
         list.forEach(targetRoom -> {
-            targetRoom.setRegionCount(monitorTargetService.getTargetCount(searchKey,targetRoom.getId()).getTotal());
+            targetRoom.setRegionCount(monitorTargetService.getTargetCount(searchKey, targetRoom.getId(), type).getTotal());
         });
         return list;
     }
@@ -138,7 +138,7 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
     public Boolean ifRoomExist(String roomName) {
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         LambdaQueryWrapper<TargetRoom> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TargetRoom::getCreateOrg,loginUser.getOrgId())
+        queryWrapper.eq(TargetRoom::getCreateOrg, loginUser.getOrgId())
                 .eq(TargetRoom::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE)
                 .eq(TargetRoom::getName, roomName);
         List<TargetRoom> list = list(queryWrapper);
@@ -149,7 +149,7 @@ public class TargetRoomServiceImpl extends ServiceImpl<TargetRoomMapper, TargetR
     public TargetRoom getRoomByName(String roomName) {
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         LambdaQueryWrapper<TargetRoom> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TargetRoom::getCreateOrg,loginUser.getOrgId())
+        queryWrapper.eq(TargetRoom::getCreateOrg, loginUser.getOrgId())
                 .eq(TargetRoom::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE)
                 .eq(TargetRoom::getName, roomName);
         return getOne(queryWrapper);

+ 1 - 1
snowy-web-app/src/main/resources/logback-spring.xml

@@ -107,7 +107,7 @@
         </appender>
 
         <!--记录到文件时,记录两类一类是error日志,一个是所有日志-->
-        <root level="info">
+        <root level="warn">
             <appender-ref ref="STDOUT"/>
             <appender-ref ref="FILE_ERROR"/>
             <appender-ref ref="FILE_ALL"/>