修改新疆大屏及小助手专家咨询量bug

health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/request/AbnormalEventFilter.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author Junqiang Zhu
@@ -34,4 +35,6 @@ public class AbnormalEventFilter {
     private Date warnTimeEnd;
 
     private String errorType;
+
+    private String orgCodes;
 }

health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchMonitorDataController.java

@@ -103,6 +103,23 @@ public class WatchMonitorDataController extends JeecgController<WatchMonitorData
         return Result.OK(pageList);
     }
 
+    /**
+     * 自定义异常数据列表 - 大屏用
+     *
+     * @param filter   筛选条件
+     * @param pageNo   页码
+     * @param pageSize 条数
+     * @return pageData
+     */
+    @GetMapping(value = "/largeScreen/listCustom")
+    @PermissionData(pageComponent = "healthMonitor/healMonitorManage/monitorToll/abnormalEvents/abnormalEventsList")
+    public Result<IPage<AbnormalEvent>> largeScreenListCustom(AbnormalEventFilter filter,
+                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        IPage<AbnormalEvent> pageList = watchMonitorDataService.largeScreenListCustom(pageNo, pageSize, filter);
+        return Result.OK(pageList);
+    }
+
     /**
      * 蚁熊新血管监测大屏 预警人员数据 查询条件同同类中 /listCustom 接口,不同之处是返回的信息按人员去重,取每人最新一次有定位的告警数据
      * @param filter

health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchMonitorDataService.java

@@ -23,6 +23,8 @@ public interface IWatchMonitorDataService extends IService<WatchMonitorData> {
 
     IPage<AbnormalEvent> pageCustom(int pageNo, int pageSize, AbnormalEventFilter filter);
 
+    IPage<AbnormalEvent> largeScreenListCustom(int pageNo, int pageSize, AbnormalEventFilter filter);
+
     /**
      * 健康终端报警列表
      * @return

health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java

@@ -585,6 +585,28 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
         return resultPage;
     }
 
+    @Override
+    public IPage<AbnormalEvent> largeScreenListCustom(int pageNo, int pageSize, AbnormalEventFilter filter) {
+        // 大屏辐射单位
+        if (ObjUtil.isEmpty(filter.getOrgCodes())){
+            return new Page<>();
+        }
+        List<String> orgCodeList = Arrays.stream(filter.getOrgCodes().split(","))
+                .map(String::trim)
+                .collect(Collectors.toList());
+        if (CollUtil.isEmpty(orgCodeList)) {
+            return new Page<>();
+        }
+        // 条件
+        LambdaQueryWrapper<WatchMonitorData> queryWrapper = getQueryWrapper(filter, orgCodeList);
+        // 数据
+        Page<WatchMonitorData> page = page(new Page<>(pageNo, pageSize), queryWrapper);
+        IPage<AbnormalEvent> resultPage = new Page<>();
+        GlobalUtils.copyPageDataToTarget(page, resultPage);
+        resultPage.setRecords(handleData(page.getRecords()));
+        return resultPage;
+    }
+
     private String getOrgCode(String secondDepartCode, String departCode) {
         if (StrUtil.isBlank(secondDepartCode) && StrUtil.isBlank(departCode)) {
             return null;