|
@@ -3,15 +3,15 @@ package com.gyee.wisdom.alarm.sharding.biz;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.gyee.wisdom.alarm.sharding.cache.DataDictionaryCache;
|
|
import com.gyee.wisdom.alarm.sharding.cache.DataDictionaryCache;
|
|
-import com.gyee.wisdom.alarm.sharding.entity.Alertrule2;
|
|
|
|
-import com.gyee.wisdom.alarm.sharding.entity.EarlyReport;
|
|
|
|
-import com.gyee.wisdom.alarm.sharding.entity.EarlyReportWindturbine;
|
|
|
|
-import com.gyee.wisdom.alarm.sharding.entity.InspectOrder;
|
|
|
|
|
|
+import com.gyee.wisdom.alarm.sharding.entity.*;
|
|
import com.gyee.wisdom.alarm.sharding.model.InspectOrderDto;
|
|
import com.gyee.wisdom.alarm.sharding.model.InspectOrderDto;
|
|
|
|
+import com.gyee.wisdom.alarm.sharding.service.EarlyReportAlarmService;
|
|
import com.gyee.wisdom.alarm.sharding.service.EarlyReportService;
|
|
import com.gyee.wisdom.alarm.sharding.service.EarlyReportService;
|
|
import com.gyee.wisdom.alarm.sharding.service.EarlyReportWindturbineService;
|
|
import com.gyee.wisdom.alarm.sharding.service.EarlyReportWindturbineService;
|
|
import com.gyee.wisdom.alarm.sharding.service.InspectOrderService;
|
|
import com.gyee.wisdom.alarm.sharding.service.InspectOrderService;
|
|
@@ -44,6 +44,8 @@ public class InspectOrderBiz {
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
private EarlyReportService earlyReportService;
|
|
private EarlyReportService earlyReportService;
|
|
|
|
+ @Resource
|
|
|
|
+ private EarlyReportAlarmService earlyReportAlarmService;
|
|
|
|
|
|
public IPage<InspectOrderDto> getInspectOrderDtoPage(Integer pageNum, Integer pageSize, String windturbineId, Optional<Integer> step, Date startTime, Date endTime) {
|
|
public IPage<InspectOrderDto> getInspectOrderDtoPage(Integer pageNum, Integer pageSize, String windturbineId, Optional<Integer> step, Date startTime, Date endTime) {
|
|
//节点 1-待审核,2-已审核,3-未计划,4-已计划,5-未巡检,6-已巡检
|
|
//节点 1-待审核,2-已审核,3-未计划,4-已计划,5-未巡检,6-已巡检
|
|
@@ -83,7 +85,14 @@ public class InspectOrderBiz {
|
|
Map<String, EarlyReport> collect1 = earlyReportList.stream().collect(Collectors.toMap(EarlyReport::getId, Function.identity()));
|
|
Map<String, EarlyReport> collect1 = earlyReportList.stream().collect(Collectors.toMap(EarlyReport::getId, Function.identity()));
|
|
List<String> collect = earlyReportList.stream().map(s -> s.getId()).collect(Collectors.toList());
|
|
List<String> collect = earlyReportList.stream().map(s -> s.getId()).collect(Collectors.toList());
|
|
List<EarlyReportWindturbine> reportWindturbineList = earlyReportWindturbineService.getReportWindturbineByReportId(collect);
|
|
List<EarlyReportWindturbine> reportWindturbineList = earlyReportWindturbineService.getReportWindturbineByReportId(collect);
|
|
- reportWindturbineList.forEach(erw->erw.setEarlyReport(collect1.get(erw.getReportId())));
|
|
|
|
|
|
+ LambdaQueryWrapper<EarlyReportAlarm> query = Wrappers.lambdaQuery();
|
|
|
|
+ query.in(EarlyReportAlarm::getReportWindturbineId, reportWindturbineList.stream().map(EarlyReportWindturbine::getId).collect(Collectors.toList()));
|
|
|
|
+ List<EarlyReportAlarm> list = earlyReportAlarmService.list(query);
|
|
|
|
+ Map<String, List<EarlyReportAlarm>> collect2 = list.stream().collect(Collectors.groupingBy(EarlyReportAlarm::getReportWindturbineId));
|
|
|
|
+ reportWindturbineList.forEach(erw->{
|
|
|
|
+ erw.setEarlyReport(collect1.get(erw.getReportId()));
|
|
|
|
+ erw.setAlarmInfoList(collect2.get(erw.getId()));
|
|
|
|
+ });
|
|
//筛选出 不是对比数据,且不是全场平局,且没有审核过的数据
|
|
//筛选出 不是对比数据,且不是全场平局,且没有审核过的数据
|
|
reportWindturbineList = reportWindturbineList.stream().filter(s -> s.isVerified() == false && s.isCompared() == false && !s.getWindturbineId().equals("全场平均")).collect(Collectors.toList());
|
|
reportWindturbineList = reportWindturbineList.stream().filter(s -> s.isVerified() == false && s.isCompared() == false && !s.getWindturbineId().equals("全场平均")).collect(Collectors.toList());
|
|
|
|
|