完成污区图算法编写
This commit is contained in:
@@ -237,7 +237,7 @@ public class ExecutionCenter extends BaseController {
|
||||
@PostMapping("/orgPointExecutor")
|
||||
@Async("asyncExecutor")
|
||||
public void orgPointExecutor(@RequestBody BaseParam baseParam) {
|
||||
String methodDescribe = getMethodDescribe("OrgPointExecutor");
|
||||
String methodDescribe = getMethodDescribe("orgPointExecutor");
|
||||
//手动判断参数是否合法,
|
||||
CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam = judgeExecuteParam(baseParam);
|
||||
// 测点索引
|
||||
|
||||
@@ -3,7 +3,8 @@ package com.njcn.algorithm.serviceimpl.line;
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.date.DatePattern;
|
||||
import cn.hutool.core.date.LocalDateTimeUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.njcn.algorithm.pojo.bo.CalculatedParam;
|
||||
import com.njcn.algorithm.service.line.IPollutionService;
|
||||
import com.njcn.dataProcess.api.*;
|
||||
@@ -57,7 +58,7 @@ public class PollutionServiceImpl implements IPollutionService {
|
||||
public void handleDay(CalculatedParam<String> calculatedParam) {
|
||||
List<DataPollutionD> pollutionList;
|
||||
List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.POLLUTION_STATIS.getCode()).getData();
|
||||
Map<String, DictData> dictData = dictDataList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
|
||||
Map<String, DictData> dictData = dictDataList.stream().collect(Collectors.toMap(DictData::getCode, Function.identity()));
|
||||
LocalDate local = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate());
|
||||
String beginDay = LocalDateTimeUtil.format(LocalDateTimeUtil.beginOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATETIME_PATTERN);
|
||||
String endDay = LocalDateTimeUtil.format(LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.parse(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN)), DatePattern.NORM_DATETIME_PATTERN);
|
||||
@@ -129,19 +130,18 @@ public class PollutionServiceImpl implements IPollutionService {
|
||||
LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
|
||||
lineParam.setStartTime(TimeUtils.getBeginOfMonth(calculatedParam.getDataDate()));
|
||||
lineParam.setEndTime(TimeUtils.getEndOfMonth(calculatedParam.getDataDate()));
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
|
||||
for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) {
|
||||
Collection<LineDevGetDTO> union = CollectionUtils.union
|
||||
(Optional.ofNullable(deptGetChildrenMoreDTO.getLineBaseList()).orElse(new ArrayList<>()),
|
||||
Optional.ofNullable(deptGetChildrenMoreDTO.getPwMonitorIds()).orElse(new ArrayList<>()));
|
||||
List<String> lineIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
|
||||
if (CollUtil.isNotEmpty(lineIds)) {
|
||||
lineParam.setLineId(lineIds);
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
|
||||
for (DeptGetChildrenMoreDTO dto : calculatedParam.getIdList()) {
|
||||
if (ObjectUtil.isNotNull(dto.getUnitId())) {
|
||||
lineParam.setLineId(Arrays.asList(dto.getUnitId()));
|
||||
List<DataPollutionOrgD> data = dataPollutionFeignClient.getRawDataOrgD(lineParam).getData();
|
||||
if (CollUtil.isNotEmpty(data)) {
|
||||
System.out.println(data);
|
||||
}
|
||||
Map<String, List<DataPollutionOrgD>> pollutionMap = data.stream().collect(Collectors.groupingBy(DataPollutionOrgD::getPollutionType));
|
||||
pollutionMap.forEach((key, value) -> {
|
||||
DataPollutionOrgM orgD = new DataPollutionOrgM();
|
||||
orgD.setOrgId(deptGetChildrenMoreDTO.getUnitId());
|
||||
orgD.setOrgId(dto.getUnitId());
|
||||
orgD.setDataDate(localDate);
|
||||
orgD.setPollutionType(key);
|
||||
orgD.setValue(value.stream().max(Comparator.comparing(DataPollutionOrgD::getValue)).get().getValue());
|
||||
@@ -161,19 +161,15 @@ public class PollutionServiceImpl implements IPollutionService {
|
||||
LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
|
||||
lineParam.setStartTime(TimeUtils.getBeginOfQuarter(calculatedParam.getDataDate()));
|
||||
lineParam.setEndTime(TimeUtils.getEndOfQuarter(calculatedParam.getDataDate()));
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
|
||||
for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) {
|
||||
Collection<LineDevGetDTO> union = CollectionUtils.union
|
||||
(Optional.ofNullable(deptGetChildrenMoreDTO.getLineBaseList()).orElse(new ArrayList<>()),
|
||||
Optional.ofNullable(deptGetChildrenMoreDTO.getPwMonitorIds()).orElse(new ArrayList<>()));
|
||||
List<String> lineIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
|
||||
if (CollUtil.isNotEmpty(lineIds)) {
|
||||
lineParam.setLineId(lineIds);
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
|
||||
for (DeptGetChildrenMoreDTO dto : calculatedParam.getIdList()) {
|
||||
if (ObjectUtil.isNotNull(dto.getUnitId())) {
|
||||
lineParam.setLineId(Arrays.asList(dto.getUnitId()));
|
||||
List<DataPollutionOrgM> data = dataPollutionFeignClient.getRawDataOrgM(lineParam).getData();
|
||||
Map<String, List<DataPollutionOrgM>> pollutionMap = data.stream().collect(Collectors.groupingBy(DataPollutionOrgM::getPollutionType));
|
||||
pollutionMap.forEach((key, value) -> {
|
||||
DataPollutionOrgQ orgD = new DataPollutionOrgQ();
|
||||
orgD.setOrgId(deptGetChildrenMoreDTO.getUnitId());
|
||||
orgD.setOrgId(dto.getUnitId());
|
||||
orgD.setDataDate(localDate);
|
||||
orgD.setPollutionType(key);
|
||||
orgD.setValue(value.stream().max(Comparator.comparing(DataPollutionOrgM::getValue)).get().getValue());
|
||||
@@ -193,19 +189,15 @@ public class PollutionServiceImpl implements IPollutionService {
|
||||
LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
|
||||
lineParam.setStartTime(TimeUtils.getBeginOfYear(calculatedParam.getDataDate()));
|
||||
lineParam.setEndTime(TimeUtils.getEndOfYear(calculatedParam.getDataDate()));
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
|
||||
for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) {
|
||||
Collection<LineDevGetDTO> union = CollectionUtils.union
|
||||
(Optional.ofNullable(deptGetChildrenMoreDTO.getLineBaseList()).orElse(new ArrayList<>()),
|
||||
Optional.ofNullable(deptGetChildrenMoreDTO.getPwMonitorIds()).orElse(new ArrayList<>()));
|
||||
List<String> lineIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
|
||||
if (CollUtil.isNotEmpty(lineIds)) {
|
||||
lineParam.setLineId(lineIds);
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
|
||||
for (DeptGetChildrenMoreDTO dto : calculatedParam.getIdList()) {
|
||||
if (ObjectUtil.isNotNull(dto.getUnitId())) {
|
||||
lineParam.setLineId(Arrays.asList(dto.getUnitId()));
|
||||
List<DataPollutionOrgQ> data = dataPollutionFeignClient.getRawDataOrgQ(lineParam).getData();
|
||||
Map<String, List<DataPollutionOrgQ>> pollutionMap = data.stream().collect(Collectors.groupingBy(DataPollutionOrgQ::getPollutionType));
|
||||
pollutionMap.forEach((key, value) -> {
|
||||
DataPollutionOrgY orgD = new DataPollutionOrgY();
|
||||
orgD.setOrgId(deptGetChildrenMoreDTO.getUnitId());
|
||||
orgD.setOrgId(dto.getUnitId());
|
||||
orgD.setDataDate(localDate);
|
||||
orgD.setPollutionType(key);
|
||||
orgD.setValue(value.stream().max(Comparator.comparing(DataPollutionOrgQ::getValue)).get().getValue());
|
||||
@@ -257,14 +249,10 @@ public class PollutionServiceImpl implements IPollutionService {
|
||||
LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
|
||||
lineParam.setStartTime(TimeUtils.getBeginOfMonth(calculatedParam.getDataDate()));
|
||||
lineParam.setEndTime(TimeUtils.getEndOfMonth(calculatedParam.getDataDate()));
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
|
||||
for (String substationId : calculatedParam.getIdList()) {
|
||||
LineDevGetBandDTO data = commTerminalGeneralClient.substationGetLine(substationId).getData();
|
||||
Collection<LineDevGetDTO> union = CollectionUtils.union(Optional.ofNullable(data.getPwList()).orElse(new ArrayList<>()),
|
||||
Optional.ofNullable(data.getZwList()).orElse(new ArrayList<>()));
|
||||
List<String> lindIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
|
||||
if (CollUtil.isNotEmpty(lindIds)) {
|
||||
lineParam.setLineId(lindIds);
|
||||
if (StrUtil.isNotBlank(substationId)) {
|
||||
lineParam.setLineId(Arrays.asList(substationId));
|
||||
List<DataPollutionSubstationD> pollutionDS = dataPollutionFeignClient.getRawDataSubstationD(lineParam).getData();
|
||||
Map<String, List<DataPollutionSubstationD>> pollutionMap = pollutionDS.stream().collect(Collectors.groupingBy(DataPollutionSubstationD::getPollutionType));
|
||||
pollutionMap.forEach((key, value) -> {
|
||||
@@ -289,14 +277,10 @@ public class PollutionServiceImpl implements IPollutionService {
|
||||
LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
|
||||
lineParam.setStartTime(TimeUtils.getBeginOfQuarter(calculatedParam.getDataDate()));
|
||||
lineParam.setEndTime(TimeUtils.getEndOfQuarter(calculatedParam.getDataDate()));
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
|
||||
for (String substationId : calculatedParam.getIdList()) {
|
||||
LineDevGetBandDTO data = commTerminalGeneralClient.substationGetLine(substationId).getData();
|
||||
Collection<LineDevGetDTO> union = CollectionUtils.union(Optional.ofNullable(data.getPwList()).orElse(new ArrayList<>()),
|
||||
Optional.ofNullable(data.getZwList()).orElse(new ArrayList<>()));
|
||||
List<String> lindIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
|
||||
if (CollUtil.isNotEmpty(lindIds)) {
|
||||
lineParam.setLineId(lindIds);
|
||||
if (StrUtil.isNotBlank(substationId)) {
|
||||
lineParam.setLineId(Arrays.asList(substationId));
|
||||
List<DataPollutionSubstationM> pollutionDS = dataPollutionFeignClient.getRawDataSubstationM(lineParam).getData();
|
||||
Map<String, List<DataPollutionSubstationM>> pollutionMap = pollutionDS.stream().collect(Collectors.groupingBy(DataPollutionSubstationM::getPollutionType));
|
||||
pollutionMap.forEach((key, value) -> {
|
||||
@@ -321,14 +305,10 @@ public class PollutionServiceImpl implements IPollutionService {
|
||||
LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
|
||||
lineParam.setStartTime(TimeUtils.getBeginOfYear(calculatedParam.getDataDate()));
|
||||
lineParam.setEndTime(TimeUtils.getEndOfYear(calculatedParam.getDataDate()));
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime());
|
||||
LocalDate localDate = LocalDateTimeUtil.parseDate(lineParam.getStartTime(), DatePattern.NORM_DATETIME_PATTERN);
|
||||
for (String substationId : calculatedParam.getIdList()) {
|
||||
LineDevGetBandDTO data = commTerminalGeneralClient.substationGetLine(substationId).getData();
|
||||
Collection<LineDevGetDTO> union = CollectionUtils.union(Optional.ofNullable(data.getPwList()).orElse(new ArrayList<>()),
|
||||
Optional.ofNullable(data.getZwList()).orElse(new ArrayList<>()));
|
||||
List<String> lindIds = union.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
|
||||
if (CollUtil.isNotEmpty(lindIds)) {
|
||||
lineParam.setLineId(lindIds);
|
||||
if (StrUtil.isNotBlank(substationId)) {
|
||||
lineParam.setLineId(Arrays.asList(substationId));
|
||||
List<DataPollutionSubstationQ> pollutionDS = dataPollutionFeignClient.getRawDataSubstationQ(lineParam).getData();
|
||||
Map<String, List<DataPollutionSubstationQ>> pollutionMap = pollutionDS.stream().collect(Collectors.groupingBy(DataPollutionSubstationQ::getPollutionType));
|
||||
pollutionMap.forEach((key, value) -> {
|
||||
|
||||
Reference in New Issue
Block a user