parent
477fb56289
commit
a04e81bb33
|
@ -48,6 +48,8 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi
|
||||||
@Override
|
@Override
|
||||||
public void exceededRateProcess() {
|
public void exceededRateProcess() {
|
||||||
List<SRaActionReportsAuditResult> queryActionReportsAuditResults = getAuditResultData();
|
List<SRaActionReportsAuditResult> queryActionReportsAuditResults = getAuditResultData();
|
||||||
|
if(CollUtil.isEmpty(queryActionReportsAuditResults)) return ;
|
||||||
|
|
||||||
List<SRaActionReportsAuditResult> resultList = Lists.newArrayList();
|
List<SRaActionReportsAuditResult> resultList = Lists.newArrayList();
|
||||||
resultList.addAll(exhaustGasExceededRateProcess(queryActionReportsAuditResults));
|
resultList.addAll(exhaustGasExceededRateProcess(queryActionReportsAuditResults));
|
||||||
resultList.addAll(exhaustWaterExceededRateProcess(queryActionReportsAuditResults));
|
resultList.addAll(exhaustWaterExceededRateProcess(queryActionReportsAuditResults));
|
||||||
|
@ -59,6 +61,7 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi
|
||||||
@Override
|
@Override
|
||||||
public void exhaustGasEmissionProcess() {
|
public void exhaustGasEmissionProcess() {
|
||||||
List<SRaActionReportsAuditResult> queryActionReportsAuditResults = getAuditResultData();
|
List<SRaActionReportsAuditResult> queryActionReportsAuditResults = getAuditResultData();
|
||||||
|
if(CollUtil.isEmpty(queryActionReportsAuditResults)) return;
|
||||||
auditResultChange(gasEmissionProcess(queryActionReportsAuditResults));
|
auditResultChange(gasEmissionProcess(queryActionReportsAuditResults));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,15 +69,19 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi
|
||||||
List<SRaActionReportsAuditResult> resultList = Lists.newArrayList();
|
List<SRaActionReportsAuditResult> resultList = Lists.newArrayList();
|
||||||
List<String> factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList());
|
List<String> factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList());
|
||||||
List<BStatTableZxbgGasEmission> dataList = getDataList(factoryIdList);
|
List<BStatTableZxbgGasEmission> dataList = getDataList(factoryIdList);
|
||||||
|
if(CollUtil.isEmpty(dataList)) return Lists.newArrayList();
|
||||||
Set<String> outletCodes = dataList.stream().map(BStatTableZxbgGasEmission::getOutletCode).collect(Collectors.toSet());
|
Set<String> outletCodes = dataList.stream().map(BStatTableZxbgGasEmission::getOutletCode).collect(Collectors.toSet());
|
||||||
List<SEnvGasMonRealVo.EmissionAvgAndMax> emissionAvgAndMaxes = sEnvGasMonRealMapper.selectEmissionAvgAndMax(DateUtil.format(DateUtil.getFirstDayOfMonth(-1), "yyyy-MM-dd HH:mm:ss")
|
List<SEnvGasMonRealVo.EmissionAvgAndMax> 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);
|
, DateUtil.format(DateUtil.getLastDayOfMonth(-1), "yyyy-MM-dd HH:mm:ss"), outletCodes);
|
||||||
|
if(CollUtil.isEmpty(emissionAvgAndMaxes)) return Lists.newArrayList();
|
||||||
Map<String, SEnvGasMonRealVo.EmissionAvgAndMax> emissionAvgAndMaxMap = emissionAvgAndMaxes.stream().collect(Collectors.toMap(SEnvGasMonRealVo.EmissionAvgAndMax::getOutletId, o -> o));
|
Map<String, SEnvGasMonRealVo.EmissionAvgAndMax> emissionAvgAndMaxMap = emissionAvgAndMaxes.stream().collect(Collectors.toMap(SEnvGasMonRealVo.EmissionAvgAndMax::getOutletId, o -> o));
|
||||||
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
||||||
checkGasMaxAndAvg(emissionAvgAndMaxMap, dataList, resultList, queryActionReportsAuditResult);
|
checkGasMaxAndAvg(emissionAvgAndMaxMap, dataList, resultList, queryActionReportsAuditResult);
|
||||||
}
|
}
|
||||||
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
||||||
Map<String, BigDecimal> emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList);
|
Map<String, BigDecimal> emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList);
|
||||||
|
if(CollUtil.isEmpty(emissionDataMap))break;
|
||||||
|
|
||||||
checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据有组织废气污染物超标时段小时均值报表中填报的数据",false);
|
checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据有组织废气污染物超标时段小时均值报表中填报的数据",false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -156,15 +163,20 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi
|
||||||
List<SRaActionReportsAuditResult> resultList = Lists.newArrayList();
|
List<SRaActionReportsAuditResult> resultList = Lists.newArrayList();
|
||||||
List<String> factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList());
|
List<String> factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList());
|
||||||
List<BStatTableZxbgGasEmission> dataList = getDataList(factoryIdList);
|
List<BStatTableZxbgGasEmission> dataList = getDataList(factoryIdList);
|
||||||
|
if(CollUtil.isEmpty(dataList)) return Lists.newArrayList();
|
||||||
|
|
||||||
Set<String> outletCodes = dataList.stream().map(BStatTableZxbgGasEmission::getOutletCode).collect(Collectors.toSet());
|
Set<String> outletCodes = dataList.stream().map(BStatTableZxbgGasEmission::getOutletCode).collect(Collectors.toSet());
|
||||||
List<FactoryOutletStaticsVo.EmissionAvgAndMax> emissionAvgAndMaxes = sEnvWaterMonDayMapper.selectEmissionAvgAndMax(DateUtil.format(DateUtil.getFirstDayOfMonth(-1), "yyyy-MM-dd HH:mm:ss")
|
List<FactoryOutletStaticsVo.EmissionAvgAndMax> 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);
|
, DateUtil.format(DateUtil.getLastDayOfMonth(-1), "yyyy-MM-dd HH:mm:ss"), outletCodes);
|
||||||
|
if(CollUtil.isEmpty(emissionAvgAndMaxes)) return Lists.newArrayList();
|
||||||
|
|
||||||
Map<String, FactoryOutletStaticsVo.EmissionAvgAndMax> emissionAvgAndMaxMap = emissionAvgAndMaxes.stream().collect(Collectors.toMap(FactoryOutletStaticsVo.EmissionAvgAndMax::getOutletId, o -> o));
|
Map<String, FactoryOutletStaticsVo.EmissionAvgAndMax> emissionAvgAndMaxMap = emissionAvgAndMaxes.stream().collect(Collectors.toMap(FactoryOutletStaticsVo.EmissionAvgAndMax::getOutletId, o -> o));
|
||||||
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
||||||
checkWaterMaxAndAvg(emissionAvgAndMaxMap, dataList, resultList, queryActionReportsAuditResult);
|
checkWaterMaxAndAvg(emissionAvgAndMaxMap, dataList, resultList, queryActionReportsAuditResult);
|
||||||
}
|
}
|
||||||
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
||||||
Map<String, BigDecimal> emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList);
|
Map<String, BigDecimal> emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList);
|
||||||
|
if(CollUtil.isEmpty(emissionDataMap))break;
|
||||||
checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据废水污染物超标时段日均值报表中填报的数据",true);
|
checkExceededData(dataList, resultList, queryActionReportsAuditResult, emissionDataMap,"根据废水污染物超标时段日均值报表中填报的数据",true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -234,6 +246,7 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi
|
||||||
@Override
|
@Override
|
||||||
public void exhaustWaterEmissionProcess() {
|
public void exhaustWaterEmissionProcess() {
|
||||||
List<SRaActionReportsAuditResult> queryActionReportsAuditResults = getAuditResultData();
|
List<SRaActionReportsAuditResult> queryActionReportsAuditResults = getAuditResultData();
|
||||||
|
if(CollUtil.isEmpty(queryActionReportsAuditResults)) return;
|
||||||
auditResultChange(waterEmissionProcess(queryActionReportsAuditResults));
|
auditResultChange(waterEmissionProcess(queryActionReportsAuditResults));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -256,7 +269,12 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi
|
||||||
private List<SRaActionReportsAuditResult> exhaustWaterExceededRateProcess(List<SRaActionReportsAuditResult> queryActionReportsAuditResults) {
|
private List<SRaActionReportsAuditResult> exhaustWaterExceededRateProcess(List<SRaActionReportsAuditResult> queryActionReportsAuditResults) {
|
||||||
List<String> factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList());
|
List<String> factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList());
|
||||||
List<BStatTableZxbgGasEmission> dataList = getDataList(factoryIdList);
|
List<BStatTableZxbgGasEmission> dataList = getDataList(factoryIdList);
|
||||||
|
if(CollUtil.isEmpty(dataList)) return Lists.newArrayList();
|
||||||
|
|
||||||
Map<String, BigDecimal> emissionDataMap = getWaterEmissionDataMap(factoryIdList, dataList);
|
Map<String, BigDecimal> emissionDataMap = getWaterEmissionDataMap(factoryIdList, dataList);
|
||||||
|
|
||||||
|
if(CollUtil.isEmpty(emissionDataMap)) return Lists.newArrayList();
|
||||||
|
|
||||||
List<SRaActionReportsAuditResult> resultList = Lists.newArrayList();
|
List<SRaActionReportsAuditResult> resultList = Lists.newArrayList();
|
||||||
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
||||||
fifterExceedingData(queryActionReportsAuditResult, dataList, resultList, emissionDataMap);
|
fifterExceedingData(queryActionReportsAuditResult, dataList, resultList, emissionDataMap);
|
||||||
|
@ -267,7 +285,12 @@ public class ExhaustExceedingProcessImpl implements ExhaustExceedingProcessServi
|
||||||
private List<SRaActionReportsAuditResult> exhaustGasExceededRateProcess(List<SRaActionReportsAuditResult> queryActionReportsAuditResults) {
|
private List<SRaActionReportsAuditResult> exhaustGasExceededRateProcess(List<SRaActionReportsAuditResult> queryActionReportsAuditResults) {
|
||||||
List<String> factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList());
|
List<String> factoryIdList = queryActionReportsAuditResults.stream().map(SRaActionReportsAuditResult::getFactoryId).collect(Collectors.toList());
|
||||||
List<BStatTableZxbgGasEmission> dataList = getDataList(factoryIdList);
|
List<BStatTableZxbgGasEmission> dataList = getDataList(factoryIdList);
|
||||||
|
if(CollUtil.isEmpty(dataList)) return Lists.newArrayList();
|
||||||
|
|
||||||
Map<String, BigDecimal> emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList);
|
Map<String, BigDecimal> emissionDataMap = getGasEmissionDataMap(factoryIdList, dataList);
|
||||||
|
|
||||||
|
if(CollUtil.isEmpty(emissionDataMap)) return Lists.newArrayList();
|
||||||
|
|
||||||
List<SRaActionReportsAuditResult> resultList = Lists.newArrayList();
|
List<SRaActionReportsAuditResult> resultList = Lists.newArrayList();
|
||||||
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
for (SRaActionReportsAuditResult queryActionReportsAuditResult : queryActionReportsAuditResults) {
|
||||||
fifterExceedingData(queryActionReportsAuditResult, dataList, resultList, emissionDataMap);
|
fifterExceedingData(queryActionReportsAuditResult, dataList, resultList, emissionDataMap);
|
||||||
|
|
Loading…
Reference in New Issue