From a04e81bb33cf6811b9c0fc0acd2842f2edf388f5 Mon Sep 17 00:00:00 2001 From: Frank <515380148@qq.com> Date: Sun, 13 Aug 2023 17:34:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9C=89=E7=BB=84=E7=BB=87=E5=BA=9F=E6=B0=94?= =?UTF-8?q?=E6=B1=A1=E6=9F=93=E7=89=A9=E6=8E=92=E6=94=BE=E6=B5=93=E5=BA=A6?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E8=A1=A8?= =?UTF-8?q?=202.=E5=BA=9F=E6=B0=B4=E6=B1=A1=E6=9F=93=E7=89=A9=E6=8E=92?= =?UTF-8?q?=E6=94=BE=E6=B5=93=E5=BA=A6=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8=203.=EF=BC=88=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=97=B6=E6=AE=B5=EF=BC=89=E8=B6=85=E6=A0=87?= =?UTF-8?q?=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../month/ExhaustExceedingProcessImpl.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/month/ExhaustExceedingProcessImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/month/ExhaustExceedingProcessImpl.java index 17bf9db..d881eed 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/month/ExhaustExceedingProcessImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/month/ExhaustExceedingProcessImpl.java @@ -48,6 +48,8 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi @Override public void exceededRateProcess() { List queryActionReportsAuditResults = getAuditResultData(); + if(CollUtil.isEmpty(queryActionReportsAuditResults)) return ; + List resultList = Lists.newArrayList(); resultList.addAll(exhaustGasExceededRateProcess(queryActionReportsAuditResults)); resultList.addAll(exhaustWaterExceededRateProcess(queryActionReportsAuditResults)); @@ -59,6 +61,7 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi @Override public void exhaustGasEmissionProcess() { List queryActionReportsAuditResults = getAuditResultData(); + if(CollUtil.isEmpty(queryActionReportsAuditResults)) return; auditResultChange(gasEmissionProcess(queryActionReportsAuditResults)); } @@ -66,15 +69,19 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi List resultList = Lists.newArrayList(); List factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList()); List dataList = getDataList(factoryIdList); + if(CollUtil.isEmpty(dataList)) return Lists.newArrayList(); Set outletCodes = dataList.stream().map(BStatTableZxbgGasEmission::getOutletCode).collect(Collectors.toSet()); List emissionAvgAndMaxes = sEnvGasMonRealMapper.selectEmissionAvgAndMax(DateUtil.format(DateUtil.getFirstDayOfMonth(-1), "yyyy-MM-dd HH:mm:ss") , DateUtil.format(DateUtil.getLastDayOfMonth(-1), "yyyy-MM-dd HH:mm:ss"), outletCodes); + if(CollUtil.isEmpty(emissionAvgAndMaxes)) return Lists.newArrayList(); Map emissionAvgAndMaxMap = emissionAvgAndMaxes.stream().collect(Collectors.toMap(SEnvGasMonRealVo.EmissionAvgAndMax::getOutletId, o -> o)); for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) { checkGasMaxAndAvg(emissionAvgAndMaxMap, dataList, resultList, queryActionReportsAuditResult); } for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) { Map emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList); + if(CollUtil.isEmpty(emissionDataMap))break; + checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据有组织废气污染物超标时段小时均值报表中填报的数据",false); } @@ -156,15 +163,20 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi List resultList = Lists.newArrayList(); List factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList()); List dataList = getDataList(factoryIdList); + if(CollUtil.isEmpty(dataList)) return Lists.newArrayList(); + Set outletCodes = dataList.stream().map(BStatTableZxbgGasEmission::getOutletCode).collect(Collectors.toSet()); List emissionAvgAndMaxes = sEnvWaterMonDayMapper.selectEmissionAvgAndMax(DateUtil.format(DateUtil.getFirstDayOfMonth(-1), "yyyy-MM-dd HH:mm:ss") , DateUtil.format(DateUtil.getLastDayOfMonth(-1), "yyyy-MM-dd HH:mm:ss"), outletCodes); + if(CollUtil.isEmpty(emissionAvgAndMaxes)) return Lists.newArrayList(); + Map emissionAvgAndMaxMap = emissionAvgAndMaxes.stream().collect(Collectors.toMap(FactoryOutletStaticsVo.EmissionAvgAndMax::getOutletId, o -> o)); for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) { checkWaterMaxAndAvg(emissionAvgAndMaxMap, dataList, resultList, queryActionReportsAuditResult); } for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) { Map emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList); + if(CollUtil.isEmpty(emissionDataMap))break; checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据废水污染物超标时段日均值报表中填报的数据",true); } @@ -234,6 +246,7 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi @Override public void exhaustWaterEmissionProcess() { List queryActionReportsAuditResults = getAuditResultData(); + if(CollUtil.isEmpty(queryActionReportsAuditResults)) return; auditResultChange(waterEmissionProcess(queryActionReportsAuditResults)); } @@ -256,7 +269,12 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi private List exhaustWaterExceededRateProcess(List queryActionReportsAuditResults) { List factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList()); List dataList = getDataList(factoryIdList); + if(CollUtil.isEmpty(dataList)) return Lists.newArrayList(); + Map emissionDataMap = getWaterEmissionDataMap(factoryIdList, dataList); + + if(CollUtil.isEmpty(emissionDataMap)) return Lists.newArrayList(); + List resultList = Lists.newArrayList(); for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) { fifterExceedingData(queryActionReportsAuditResult, dataList, resultList, emissionDataMap); @@ -267,7 +285,12 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi private List exhaustGasExceededRateProcess(List queryActionReportsAuditResults) { List factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList()); List dataList = getDataList(factoryIdList); + if(CollUtil.isEmpty(dataList)) return Lists.newArrayList(); + Map emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList); + + if(CollUtil.isEmpty(emissionDataMap)) return Lists.newArrayList(); + List resultList = Lists.newArrayList(); for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) { fifterExceedingData(queryActionReportsAuditResult, dataList, resultList, emissionDataMap);