From 1c21c9ce69ee8fb94bedf0b8cc57936a638a4c27 Mon Sep 17 00:00:00 2001 From: hehongyu Date: Sat, 12 Aug 2023 18:25:04 +0800 Subject: [PATCH] init --- .../audit/ExcessiveEmissionsService.java | 43 ++ .../audit/ExecuteReportAuditService.java | 20 +- .../FugitiveExhaustPollutantsService.java | 12 + .../LedgerManagementStatusTableService.java | 21 + .../NotNormalOrgGasPollutantsService.java | 21 + ...antEmissionsCalculationProcessService.java | 21 + .../audit/SelfMonitoringLayoutMapService.java | 56 ++ .../talroad/domain/AmProblemFiVideo.java | 79 +++ .../domain/BMainProductionInorgGas.java | 19 +- .../domain/BMainProductionOrganizGas.java | 23 +- .../talroad/domain/BMainProductionWater.java | 19 +- .../talroad/domain/BMainSolidHazardous.java | 6 +- .../domain/BStatTablePwxkBoilerFuelGas.java | 205 ++++++ .../BStatTablePwxkBoilerFuelSolidLiquid.java | 156 +++++ .../talroad/domain/BStatTablePwxkFuel.java | 137 ++++ ...atTablePwxkProductionFacilitiesParams.java | 10 +- .../domain/BStatTablePwxkRawMaterial.java | 145 ++++ .../BStatTablePwxkWaterTreatmentLine.java | 2 +- .../domain/BStatTableZxbgGasEmission.java | 258 +++++++ .../BStatTableZxbgGasEmissionSpeed.java | 172 +++++ .../BStatTableZxbgGasEmissionStatistics.java | 175 +++++ .../talroad/domain/BStatTableZxbgGtFuel.java | 113 ++++ .../domain/BStatTableZxbgGtProduction.java | 121 ++++ .../domain/BStatTableZxbgHdFuelAnalysis.java | 139 ++++ .../domain/BStatTableZxbgHdGasPollution.java | 219 ++++++ .../domain/BStatTableZxbgHdGtBasic.java | 139 ++++ .../domain/BStatTableZxbgHdGtFuel.java | 157 +++++ .../domain/BStatTableZxbgHdGtInvestment.java | 130 ++++ .../BStatTableZxbgHdWaterPollution.java | 247 +++++++ .../talroad/domain/BStatTableZxbgSnFuel.java | 125 ++++ .../domain/BStatTableZxbgSnProduction.java | 130 ++++ .../domain/BStatTableZxbgWaterEmission.java | 202 ++++++ .../cecep/talroad/domain/BasModelAnalyse.java | 82 +++ .../cecep/talroad/domain/PcLabelFactory.java | 28 +- .../domain/analysis/PcRaProblemType.java | 4 + .../analysis/SRaActionReportsAudit.java | 2 +- .../domain/analysis/SRaPollManTypeChange.java | 93 +++ .../talroad/mapper/AmProblemFiMapper.java | 3 +- .../mapper/AmProblemFiVideoMapper.java | 10 + .../BMainHazardousSolidWasteFaMapper.java | 3 +- .../mapper/BMainPollDisEnforcementMapper.java | 3 +- .../BMainProductionOrganizGasMapper.java | 5 + .../mapper/BMainProductionWaterMapper.java | 4 + .../BStatTablePwxkBoilerFuelGasMapper.java | 21 + ...tTablePwxkBoilerFuelSolidLiquidMapper.java | 22 + .../mapper/BStatTablePwxkFuelMapper.java | 21 + ...atTablePwxkProductionFacilitiesMapper.java | 3 +- .../mapper/BStatTablePwxkProductsMapper.java | 3 +- .../BStatTablePwxkRawMaterialMapper.java | 21 + .../BStatTablePwxkWaterIndustryInMapper.java | 3 +- ...atTablePwxkWaterIndustryInTotalMapper.java | 3 +- .../BStatTablePwxkWaterLifeInMapper.java | 3 +- ...tatTablePwxkWaterTreatmentInAskMapper.java | 8 +- ...StatTablePwxkWaterTreatmentLineMapper.java | 3 +- .../BStatTableZxbgGasEmissionMapper.java | 27 + .../BStatTableZxbgGasEmissionSpeedMapper.java | 27 + ...tTableZxbgGasEmissionStatisticsMapper.java | 27 + .../mapper/BStatTableZxbgGtFuelMapper.java | 27 + .../BStatTableZxbgGtProductionMapper.java | 27 + .../BStatTableZxbgHdFuelAnalysisMapper.java | 27 + .../BStatTableZxbgHdGasPollutionMapper.java | 27 + .../mapper/BStatTableZxbgHdGtBasicMapper.java | 27 + .../mapper/BStatTableZxbgHdGtFuelMapper.java | 27 + .../BStatTableZxbgHdGtInvestmentMapper.java | 27 + .../BStatTableZxbgHdWaterPollutionMapper.java | 27 + .../mapper/BStatTableZxbgJbxxInfoMapper.java | 1 + .../mapper/BStatTableZxbgSnFuelMapper.java | 27 + .../BStatTableZxbgSnProductionMapper.java | 27 + .../BStatTableZxbgWaterEmissionMapper.java | 27 + .../talroad/mapper/BasModelAnalyseMapper.java | 16 + .../mapper/PcControlRequirementsMapper.java | 10 + .../talroad/mapper/PcLabelFactoryMapper.java | 9 + .../cecep/talroad/mapper/PcOutletMapper.java | 17 +- .../mapper/SupermonitorDrainOutletMapper.java | 8 +- .../analysis/SRaPollManTypeChangeMapper.java | 26 + .../BStatTablePwxkWaterAndOtherService.java | 8 + .../talroad/service/IAmProblemFiService.java | 2 +- .../IBMainProductionOrganizGasService.java | 5 + .../service/IBMainProductionWaterService.java | 5 + .../IBStatTableZxbgGasEmissionService.java | 26 + ...BStatTableZxbgGasEmissionSpeedService.java | 26 + ...TableZxbgGasEmissionStatisticsService.java | 26 + .../service/IBStatTableZxbgGtFuelService.java | 26 + .../IBStatTableZxbgGtProductionService.java | 26 + .../IBStatTableZxbgHdFuelAnalysisService.java | 26 + .../IBStatTableZxbgHdGasPollutionService.java | 26 + .../IBStatTableZxbgHdGtBasicService.java | 26 + .../IBStatTableZxbgHdGtFuelService.java | 26 + .../IBStatTableZxbgHdGtInvestmentService.java | 26 + ...BStatTableZxbgHdWaterPollutionService.java | 26 + .../service/IBStatTableZxbgSnFuelService.java | 26 + .../IBStatTableZxbgSnProductionService.java | 26 + .../IBStatTableZxbgWaterEmissionService.java | 26 + .../IPcControlRequirementsService.java | 12 +- .../talroad/service/IPcFactoryService.java | 3 + .../service/IPcLabelFactoryService.java | 13 + .../talroad/service/IPcLabelService.java | 6 + .../talroad/service/IPcLabelValueService.java | 6 + .../talroad/service/IPcOutletService.java | 10 +- .../service/IProductionManageService.java | 3 + .../ISupermonitorDrainOutletService.java | 10 +- .../analysis/BasModelAnalyseService.java | 4 + .../analysis/SRaPollManTypeChangeService.java | 22 + .../service/impl/AmProblemFiServiceImpl.java | 67 +- ...ppVersionAddressManagementServiceImpl.java | 12 +- .../BMainProductionOrganizGasServiceImpl.java | 23 + .../impl/BMainProductionWaterServiceImpl.java | 23 + ...StatTablePwxkWaterAndOtherServiceImpl.java | 82 ++- .../BStatTableZxbgGasEmissionServiceImpl.java | 49 ++ ...tTableZxbgGasEmissionSpeedServiceImpl.java | 49 ++ ...eZxbgGasEmissionStatisticsServiceImpl.java | 49 ++ .../impl/BStatTableZxbgGtFuelServiceImpl.java | 49 ++ ...BStatTableZxbgGtProductionServiceImpl.java | 49 ++ ...tatTableZxbgHdFuelAnalysisServiceImpl.java | 49 ++ ...tatTableZxbgHdGasPollutionServiceImpl.java | 49 ++ .../BStatTableZxbgHdGtBasicServiceImpl.java | 50 ++ .../BStatTableZxbgHdGtFuelServiceImpl.java | 49 ++ ...tatTableZxbgHdGtInvestmentServiceImpl.java | 49 ++ ...tTableZxbgHdWaterPollutionServiceImpl.java | 49 ++ ...StatTableZxbgPflAirSpecialServiceImpl.java | 2 + .../impl/BStatTableZxbgSnFuelServiceImpl.java | 49 ++ ...BStatTableZxbgSnProductionServiceImpl.java | 49 ++ ...StatTableZxbgWaterEmissionServiceImpl.java | 49 ++ .../service/impl/BasDeviceServiceImpl.java | 12 +- .../impl/MonitoringMapServiceImpl.java | 4 +- .../PcControlRequirementsServiceImpl.java | 67 +- .../service/impl/PcFactoryServiceImpl.java | 28 + .../impl/PcLabelFactoryServiceImpl.java | 167 ++++- .../service/impl/PcLabelServiceImpl.java | 99 ++- .../service/impl/PcLabelValueServiceImpl.java | 122 +++- .../service/impl/PcOutletServiceImpl.java | 51 +- .../impl/ProductionManageServiceImpl.java | 14 + .../impl/SEnvGasMonRealServiceImpl.java | 4 +- .../service/impl/SEnvGasRealServiceImpl.java | 4 +- .../impl/SEnvWaterMonRealServiceImpl.java | 4 +- .../SupermonitorDrainOutletServiceImpl.java | 42 +- .../service/impl/TCodStationServiceImpl.java | 4 +- .../analysis/BasDeviceStatusServiceImpl.java | 24 +- .../analysis/BasModelAnalyseServiceImpl.java | 11 + .../analysis/DischargeMathServiceImpl.java | 69 +- ...actoryTransferRateAnalysisServiceImpl.java | 22 +- .../analysis/SRaOverRateGasServiceImpl.java | 23 +- .../SRaPollManTypeChangeServiceImpl.java | 40 ++ .../SRaRealTimeAnalysisCoServiceImpl.java | 55 +- .../strategy/StatusStrategyAdapter.java | 26 +- .../strategy/support/gt/GtGlmqAdapter.java | 2 +- .../cn/cecep/talroad/util/MsgProducer.java | 106 +-- .../cn/cecep/talroad/util/QrCodeUtils.java | 458 ++++++------- .../cn/cecep/talroad/util/StatusConsumer.java | 91 +-- .../cn/cecep/talroad/util/YieldConsumer.java | 104 +-- .../java/cn/cecep/talroad/util/ZipUtils.java | 57 ++ .../cn/cecep/talroad/vo/AmProblemFiVo.java | 5 +- .../vo/BMainHazardousSolidWasteFaVo.java | 2 +- .../vo/BMainHazardousSolidWasteVo.java | 2 +- .../talroad/vo/BMainPollDisEmlRecordVo.java | 2 +- .../talroad/vo/BMainPollDisEnforcementVo.java | 2 +- .../talroad/vo/BMainPollDisInformationVo.java | 2 +- .../vo/BMainPollDisNoiseRegulationVo.java | 2 +- .../vo/BMainProductionOrganizGasVo.java | 89 +++ .../talroad/vo/BMainProductionWaterVo.java | 89 +++ .../vo/BStatTablePwxkBoilerFuelGasVo.java | 42 ++ ...BStatTablePwxkBoilerFuelSolidLiquidVo.java | 43 ++ .../talroad/vo/BStatTablePwxkFuelVo.java | 45 ++ .../BStatTablePwxkProductionFacilitiesVo.java | 46 +- .../talroad/vo/BStatTablePwxkProductsVo.java | 2 +- .../vo/BStatTablePwxkRawMaterialVo.java | 62 ++ .../vo/BStatTableZxbgGasEmissionSpeedVo.java | 95 +++ ...BStatTableZxbgGasEmissionStatisticsVo.java | 87 +++ .../vo/BStatTableZxbgGasEmissionVo.java | 139 ++++ .../talroad/vo/BStatTableZxbgGtFuelVo.java | 60 ++ .../vo/BStatTableZxbgGtProductionVo.java | 64 ++ .../vo/BStatTableZxbgHdFuelAnalysisVo.java | 75 +++ .../vo/BStatTableZxbgHdGasPollutionVo.java | 120 ++++ .../talroad/vo/BStatTableZxbgHdGtBasicVo.java | 75 +++ .../talroad/vo/BStatTableZxbgHdGtFuelVo.java | 83 +++ .../vo/BStatTableZxbgHdGtInvestmentVo.java | 68 ++ .../vo/BStatTableZxbgHdWaterPollutionVo.java | 136 ++++ .../talroad/vo/BStatTableZxbgSnFuelVo.java | 67 ++ .../vo/BStatTableZxbgSnProductionVo.java | 67 ++ .../vo/BStatTableZxbgWaterEmissionVo.java | 111 +++ .../talroad/vo/PcControlRequirementsVo.java | 631 ++++++++++++++++++ .../java/cn/cecep/talroad/vo/PcFactoryVo.java | 6 + .../cn/cecep/talroad/vo/PcLabelFactoryVo.java | 24 + .../java/cn/cecep/talroad/vo/PcOutletVo.java | 235 ++++++- .../cn/cecep/talroad/vo/PwxkFactoryVo.java | 156 +++++ .../talroad/vo/SupermonitorDrainOutletVo.java | 145 ++++ .../vo/analysis/BasModelAnalyseQuery.java | 30 + .../vo/analysis/SRaPollManTypeChangeVo.java | 50 ++ .../query/BMainProductionOrganizGasQuery.java | 30 + .../vo/query/BMainProductionWaterQuery.java | 33 + .../query/BStatTableZxbgGasEmissionQuery.java | 123 ++++ .../BStatTableZxbgGasEmissionSpeedQuery.java | 90 +++ ...atTableZxbgGasEmissionStatisticsQuery.java | 84 +++ .../vo/query/BStatTableZxbgGtFuelQuery.java | 64 ++ .../BStatTableZxbgGtProductionQuery.java | 67 ++ .../BStatTableZxbgHdFuelAnalysisQuery.java | 76 +++ .../BStatTableZxbgHdGasPollutionQuery.java | 109 +++ .../query/BStatTableZxbgHdGtBasicQuery.java | 76 +++ .../vo/query/BStatTableZxbgHdGtFuelQuery.java | 82 +++ .../BStatTableZxbgHdGtInvestmentQuery.java | 70 ++ .../BStatTableZxbgHdWaterPollutionQuery.java | 121 ++++ .../vo/query/BStatTableZxbgSnFuelQuery.java | 70 ++ .../BStatTableZxbgSnProductionQuery.java | 70 ++ .../BStatTableZxbgWaterEmissionQuery.java | 103 +++ .../vo/query/BStatTablepPwxkWaterQuery.java | 128 +++- .../vo/query/PcControlRequirementsQuery.java | 118 ++++ .../talroad/vo/query/PcFactoryQuery.java | 6 + .../talroad/vo/query/PcLabelFactoryQuery.java | 16 +- .../cecep/talroad/vo/query/PcOutletQuery.java | 74 ++ .../query/SupermonitorDrainOutletQuery.java | 42 ++ .../analysis/SRaAbNalysisLowCarQuery.java | 4 + .../analysis/SRaPollManTypeChangeQuery.java | 17 + .../mapper/talroad/AmProblemFiMapper.xml | 26 +- .../mapper/talroad/AmVideoDevFiMapper.xml | 7 +- .../BMainHazardousSolidWasteFaMapper.xml | 12 +- .../BMainHazardousSolidWasteMapper.xml | 1 + .../talroad/BMainPollDisEmlRecordMapper.xml | 1 + .../talroad/BMainPollDisEnforcementMapper.xml | 15 +- .../talroad/BMainPollDisInformationMapper.xml | 5 +- .../BMainPollDisNoiseRegulationMapper.xml | 1 + .../BMainProductionOrganizGasMapper.xml | 80 ++- .../talroad/BMainProductionWaterMapper.xml | 94 +++ .../BStatTablePwxkBoilerFuelGasMapper.xml | 394 +++++++++++ ...atTablePwxkBoilerFuelSolidLiquidMapper.xml | 341 ++++++++++ .../talroad/BStatTablePwxkFuelMapper.xml | 226 +++++++ ...tatTablePwxkProductionFacilitiesMapper.xml | 21 +- .../talroad/BStatTablePwxkProductsMapper.xml | 12 +- .../BStatTablePwxkRawMaterialMapper.xml | 247 +++++++ .../BStatTablePwxkWaterIndustryInMapper.xml | 29 +- ...tatTablePwxkWaterIndustryInTotalMapper.xml | 27 +- .../BStatTablePwxkWaterLifeInMapper.xml | 27 +- ...StatTablePwxkWaterTreatmentInAskMapper.xml | 27 +- ...BStatTablePwxkWaterTreatmentLineMapper.xml | 28 +- .../BStatTableZxbgGasEmissionMapper.xml | 108 +++ .../BStatTableZxbgGasEmissionSpeedMapper.xml | 83 +++ ...atTableZxbgGasEmissionStatisticsMapper.xml | 81 +++ .../talroad/BStatTableZxbgGtFuelMapper.xml | 68 ++ .../BStatTableZxbgGtProductionMapper.xml | 68 ++ .../BStatTableZxbgHdFuelAnalysisMapper.xml | 76 +++ .../BStatTableZxbgHdGasPollutionMapper.xml | 96 +++ .../talroad/BStatTableZxbgHdGtBasicMapper.xml | 73 ++ .../talroad/BStatTableZxbgHdGtFuelMapper.xml | 78 +++ .../BStatTableZxbgHdGtInvestmentMapper.xml | 70 ++ .../BStatTableZxbgHdWaterPollutionMapper.xml | 104 +++ .../talroad/BStatTableZxbgJbxxInfoMapper.xml | 16 +- .../talroad/BStatTableZxbgPflAirMapper.xml | 8 +- .../BStatTableZxbgPflAirOtherMapper.xml | 9 +- .../BStatTableZxbgPflAirOverproofMapper.xml | 12 +- .../BStatTableZxbgPflAirSpecialMapper.xml | 13 +- .../BStatTableZxbgPflAirStatMapper.xml | 9 +- .../talroad/BStatTableZxbgPflWaterMapper.xml | 10 +- .../BStatTableZxbgPflWaterVoerproofMapper.xml | 12 +- .../BStatTableZxbgPflallWaterMapper.xml | 10 +- .../BStatTableZxbgPfltotalWaterMapper.xml | 10 +- .../talroad/BStatTableZxbgSnFuelMapper.xml | 72 ++ .../BStatTableZxbgSnProductionMapper.xml | 70 ++ .../BStatTableZxbgWaterEmissionMapper.xml | 93 +++ .../BStatTableZxbgWrzlAbnormalitiesMapper.xml | 11 +- .../talroad/BStatTableZxbgWrzlTotalMapper.xml | 95 +-- .../mapper/talroad/BasModelAnalyseMapper.xml | 151 +++++ .../mapper/talroad/MonDevBlRealMapper.xml | 4 +- .../mapper/talroad/MonDevRealMapper.xml | 4 +- .../talroad/PcControlRequirementsMapper.xml | 325 +++++++++ .../mapper/talroad/PcFactoryMapper.xml | 20 +- .../mapper/talroad/PcLabelFactoryMapper.xml | 26 + .../mapper/talroad/PcOutletMapper.xml | 148 ++++ .../talroad/SupermonitorDrainOutletMapper.xml | 86 +++ .../SRaActionReportsAuditResultMapper.xml | 25 +- .../analysis/SRaPollManTypeChangeMapper.xml | 184 +++++ .../RectificationEffectEvaluationMapper.xml | 14 +- 270 files changed, 14932 insertions(+), 877 deletions(-) create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/ExcessiveEmissionsService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/LedgerManagementStatusTableService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/NotNormalOrgGasPollutantsService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/PollutantEmissionsCalculationProcessService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/SelfMonitoringLayoutMapService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/AmProblemFiVideo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkBoilerFuelGas.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkBoilerFuelSolidLiquid.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkFuel.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkRawMaterial.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmission.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmissionSpeed.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmissionStatistics.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGtFuel.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGtProduction.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdFuelAnalysis.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGasPollution.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtBasic.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtFuel.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtInvestment.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdWaterPollution.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgSnFuel.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgSnProduction.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgWaterEmission.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BasModelAnalyse.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/SRaPollManTypeChange.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/AmProblemFiVideoMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkBoilerFuelGasMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkBoilerFuelSolidLiquidMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkFuelMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkRawMaterialMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionSpeedMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionStatisticsMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGtFuelMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGtProductionMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdFuelAnalysisMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGasPollutionMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtBasicMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtFuelMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtInvestmentMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdWaterPollutionMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgSnFuelMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgSnProductionMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgWaterEmissionMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BasModelAnalyseMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/analysis/SRaPollManTypeChangeMapper.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionSpeedService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionStatisticsService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGtFuelService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGtProductionService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdFuelAnalysisService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGasPollutionService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtBasicService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtFuelService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtInvestmentService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdWaterPollutionService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgSnFuelService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgSnProductionService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgWaterEmissionService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/analysis/BasModelAnalyseService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/analysis/SRaPollManTypeChangeService.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionSpeedServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionStatisticsServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGtFuelServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGtProductionServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdFuelAnalysisServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGasPollutionServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtBasicServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtFuelServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtInvestmentServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdWaterPollutionServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgSnFuelServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgSnProductionServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgWaterEmissionServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/BasModelAnalyseServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaPollManTypeChangeServiceImpl.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/ZipUtils.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkBoilerFuelGasVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkBoilerFuelSolidLiquidVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkFuelVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkRawMaterialVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionSpeedVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionStatisticsVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGtFuelVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGtProductionVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdFuelAnalysisVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGasPollutionVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtBasicVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtFuelVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtInvestmentVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdWaterPollutionVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgSnFuelVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgSnProductionVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgWaterEmissionVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PwxkFactoryVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/analysis/BasModelAnalyseQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/analysis/SRaPollManTypeChangeVo.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionSpeedQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionStatisticsQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGtFuelQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGtProductionQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdFuelAnalysisQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGasPollutionQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtBasicQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtFuelQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtInvestmentQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdWaterPollutionQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgSnFuelQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgSnProductionQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgWaterEmissionQuery.java create mode 100644 szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/analysis/SRaPollManTypeChangeQuery.java create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkBoilerFuelGasMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkBoilerFuelSolidLiquidMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkFuelMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkRawMaterialMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionSpeedMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionStatisticsMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGtFuelMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGtProductionMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdFuelAnalysisMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGasPollutionMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtBasicMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtFuelMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtInvestmentMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdWaterPollutionMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgSnFuelMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgSnProductionMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgWaterEmissionMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/BasModelAnalyseMapper.xml create mode 100644 szhpt-fixed-task/src/main/resources/mapper/talroad/analysis/SRaPollManTypeChangeMapper.xml diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/ExcessiveEmissionsService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/ExcessiveEmissionsService.java new file mode 100644 index 0000000..cc864c9 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/ExcessiveEmissionsService.java @@ -0,0 +1,43 @@ +package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit; + +import cn.cecep.talroad.domain.BMainActionReports; +import cn.cecep.talroad.mapper.BMainActionReportsMapper; +import cn.cecep.talroad.mapper.analysis.SRaActionReportsAuditResultMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author hehongyu + * @description: 超标排放信息 + * @date 2023/8/12 17:17 + */ +@Slf4j +@Service +public class ExcessiveEmissionsService { + + @Autowired + private SRaActionReportsAuditResultMapper mapper; + + @Autowired + private BMainActionReportsMapper actionReportsMapper; + + + public void execute(List reportIds){ + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() + .in(BMainActionReports::getId, reportIds); + List bMainActionReports = actionReportsMapper.selectList(queryWrapper); + for (BMainActionReports bMainActionReport : bMainActionReports) { + String factoryId = bMainActionReport.getFactoryId(); + String reportsType = bMainActionReport.getReportsType();//EmlTypeEnums + //根据 企业id 加 报告周期 查询到对应报警信息表 是否有超标信息 + + + } + } + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/ExecuteReportAuditService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/ExecuteReportAuditService.java index c259e14..d132944 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/ExecuteReportAuditService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/ExecuteReportAuditService.java @@ -1,6 +1,7 @@ package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit; import com.google.common.collect.Lists; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -13,7 +14,20 @@ import java.util.List; */ @Slf4j @Service +@RequiredArgsConstructor public class ExecuteReportAuditService { + //序号 61 （正常监测时段）无组织废气污染物排放浓度监测数据统计表 + final FugitiveExhaustPollutantsService fugitiveExhaustPollutantsService; + //序号 64 非正常工况/特殊时段有组织废气污染物监测数据统计表 + final NotNormalOrgGasPollutantsService notNormalOrgGasPollutantsService; + //序号 67 超标排放信息 + final ExcessiveEmissionsService excessiveEmissionsService; + //序号 68 附图附件-自行监测布点图 + final SelfMonitoringLayoutMapService selfMonitoringLayoutMapService; + //序号 69 污染物实际排放计算过程 + final PollutantEmissionsCalculationProcessService pollutantEmissionsCalculationProcessService; + //序号 70 台账管理情况表 + final LedgerManagementStatusTableService ledgerManagementStatusTableService; public void audit(List executeReportIds){ //执行报表分批次进行 @@ -21,6 +35,7 @@ public class ExecuteReportAuditService { for (List partitionExecuteReportIds : partitionIds) { //执行所有审核任务 try { + //TODO 性能 可以利用线程池同时执行 策略为CallerRunsPolicy execute(partitionExecuteReportIds); }catch (Exception e){ log.error("执行审核相关任务错误 executeReportIds：{}", executeReportIds, e); @@ -29,7 +44,8 @@ public class ExecuteReportAuditService { } - public void execute(List partitionIds){ + public void execute(List reportIds){ //所有的审核任务 需要将方法手动添加到此处！！！ + selfMonitoringLayoutMapService.execute(reportIds); } -} +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/FugitiveExhaustPollutantsService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/FugitiveExhaustPollutantsService.java index 5b83caa..b9219c6 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/FugitiveExhaustPollutantsService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/FugitiveExhaustPollutantsService.java @@ -1,9 +1,21 @@ package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * @author hehongyu * @description: （正常监测时段）无组织废气污染物排放浓度监测数据统计表 * @date 2023/8/12 17:06 */ +@Slf4j +@Service public class FugitiveExhaustPollutantsService { + + + public void execute(List reportIds){ + + } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/LedgerManagementStatusTableService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/LedgerManagementStatusTableService.java new file mode 100644 index 0000000..84adf4c --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/LedgerManagementStatusTableService.java @@ -0,0 +1,21 @@ +package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author hehongyu + * @description: 台账管理情况表 + * @date 2023/8/12 17:22 + */ +@Slf4j +@Service +public class LedgerManagementStatusTableService { + + + public void execute(List reportIds){ + + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/NotNormalOrgGasPollutantsService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/NotNormalOrgGasPollutantsService.java new file mode 100644 index 0000000..b3be458 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/NotNormalOrgGasPollutantsService.java @@ -0,0 +1,21 @@ +package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author hehongyu + * @description: 非正常工况/特殊时段有组织废气污染物监测数据统计表 + * @date 2023/8/12 17:16 + */ +@Slf4j +@Service +public class NotNormalOrgGasPollutantsService { + + + public void execute(List reportIds){ + + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/PollutantEmissionsCalculationProcessService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/PollutantEmissionsCalculationProcessService.java new file mode 100644 index 0000000..ca74a38 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/PollutantEmissionsCalculationProcessService.java @@ -0,0 +1,21 @@ +package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author hehongyu + * @description: 污染物实际排放计算过程 + * @date 2023/8/12 17:18 + */ +@Slf4j +@Service +public class PollutantEmissionsCalculationProcessService { + + public void execute(List reportIds){ + + } + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/SelfMonitoringLayoutMapService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/SelfMonitoringLayoutMapService.java new file mode 100644 index 0000000..7e4dd50 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/data/analyse/task/execute/report/specifications/audit/SelfMonitoringLayoutMapService.java @@ -0,0 +1,56 @@ +package cn.cecep.talroad.data.analyse.task.execute.report.specifications.audit; + +import cn.cecep.talroad.domain.analysis.SRaActionReportsAuditRecord; +import cn.cecep.talroad.domain.analysis.SRaActionReportsAuditResult; +import cn.cecep.talroad.mapper.analysis.SRaActionReportsAuditRecordMapper; +import cn.cecep.talroad.mapper.analysis.SRaActionReportsAuditResultMapper; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author hehongyu + * @description: 附图附件-自行监测布点图 + * @date 2023/8/12 17:17 + */ +@Slf4j +@Service +public class SelfMonitoringLayoutMapService { + + @Autowired + private SRaActionReportsAuditResultMapper mapper; + + @Autowired + private SRaActionReportsAuditRecordMapper recordMapper; + + public void execute(List reportIds){ + LambdaQueryWrapper recordQueryWrapper = new QueryWrapper() + .lambda() + .select(SRaActionReportsAuditRecord::getId,SRaActionReportsAuditRecord::getReportId) + .in(SRaActionReportsAuditRecord::getReportId, reportIds); + List sRaActionReportsAuditRecords = recordMapper.selectList(recordQueryWrapper); + if (CollectionUtil.isEmpty(sRaActionReportsAuditRecords)){ + log.warn("执行报告审核记录不存在！"); + return; + } + List recordIds = sRaActionReportsAuditRecords.stream().map(SRaActionReportsAuditRecord::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda().in(SRaActionReportsAuditResult::getRecordId, recordIds); + List sRaActionReportsAuditResults = mapper.selectList(queryWrapper); + if (CollectionUtil.isEmpty(sRaActionReportsAuditResults)){ + log.warn("执行报告规范性审核结果记录不存在！"); + return; + } + //TODO 自行监测布点图 未上传 则为不规范 + List updateList = sRaActionReportsAuditResults.stream().filter(data -> StringUtils.isBlank(data.getAttachment())).collect(Collectors.toList()); + updateList.forEach(data -> data.setAttachment("未上报自行监测布点图")); + mapper.batchUpdate(updateList); + } + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/AmProblemFiVideo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/AmProblemFiVideo.java new file mode 100644 index 0000000..1e745cc --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/AmProblemFiVideo.java @@ -0,0 +1,79 @@ +package cn.cecep.talroad.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigInteger; +import java.util.Date; + +@ApiModel(value = "预警报警信息-视频监控数据entity") +@Data +@TableName("m_am_problem_fi_video") +public class AmProblemFiVideo { + + + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private String id; + + @ApiModelProperty(value = "问题表m_am_problem_fi主键") + private String problemId; + + @ApiModelProperty(value = "视频截图时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date videoTime; + + @ApiModelProperty(value = "视频截图路径") + private String videoPath; + + @ApiModelProperty(value = "回放的视频id。关联m_am_video_dev_fi表id") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private BigInteger videoDevFiId; + + @ApiModelProperty(value = "视频回放开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + + @ApiModelProperty(value = "视频回放结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; + + @ApiModelProperty(value = "视频分析结果 1正常、2有人员/有无组织排放（分别对应人员闯入和无组织排放） 、3 黑屏、4白屏、 5花屏 、6无信号") + private String judgeResult; + + @ApiModelProperty(value = "算法名称") + private String modelName; + + @ApiModel(value = "预警报警信息-视频监控数据vo") + @Data + public static class Vo { + @ApiModelProperty(value = "摄像头ID") + private String devId; + + @ApiModelProperty(value = "摄像头名称") + private String devName; + + @ApiModelProperty(value = "设备来源") + private String devSource; + + @ApiModelProperty(value = "视频回放开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date startTime; + + @ApiModelProperty(value = "视频回放结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; + + @ApiModelProperty(value = "视频截图路径") + private String videoPath; + + @ApiModelProperty(value = "视频截图时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date videoTime; + } + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionInorgGas.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionInorgGas.java index f9f0ceb..1127f32 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionInorgGas.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionInorgGas.java @@ -36,47 +36,44 @@ public class BMainProductionInorgGas extends BaseEntity @ApiModelProperty(value = "企业id") /** 企业id */ - @Excel(name = "企业id") private String factoryId; @ApiModelProperty(value = "排放口编号") /** 排放口编号 */ - @Excel(name = "排放口编号") private String outletCode; @ApiModelProperty(value = "许可证无组织监测点位名称") /** 许可证无组织监测点位名称 */ - @Excel(name = "许可证无组织监测点位名称") + @Excel(name = "许可证无组织监测点位名称",sort = 1) private String licenceMonName; @ApiModelProperty(value = "监测类型") /** 监测类型 */ - @Excel(name = "监测类型") + @Excel(name = "监测类型",sort = 6) private String monitoringType; @ApiModelProperty(value = "无组织监测点位") /** 无组织监测点位 */ - @Excel(name = "无组织监测点位") + @Excel(name = "无组织监测点位",sort = 7) private String monitoringInorganization; @ApiModelProperty(value = "主要污染防治措施") /** 主要污染防治措施 */ - @Excel(name = "主要污染防治措施") + @Excel(name = "主要污染防治措施",sort = 5) private String pollutionPrevention; @ApiModelProperty(value = "产污环节") /** 产污环节 */ - @Excel(name = "产污环节") + @Excel(name = "产污环节",sort = 3) private String pollutionProductionLink; @ApiModelProperty(value = "对应生产设施编号") /** 对应生产设施编号 */ - @Excel(name = "对应生产设施编号") private String correspondingProductionCode; @ApiModelProperty(value = "生产设施id, 多个用逗号分隔") @@ -85,25 +82,23 @@ public class BMainProductionInorgGas extends BaseEntity @ApiModelProperty(value = "视频监控") /** 视频监控 */ - @Excel(name = "视频监控") private String devId; @ApiModelProperty(value = "对应生产设施名称") /** 对应生产设施名称 */ - @Excel(name = "对应生产设施名称") + @Excel(name = "对应生产设施名称",sort = 2) private String correspondingProductionName; @ApiModelProperty(value = "生产设施参数") /** 生产设施参数 */ - @Excel(name = "生产设施参数") private String proFacilityParam; @ApiModelProperty(value = "污染物种类") /** 污染物种类 */ - @Excel(name = "污染物种类") + @Excel(name = "污染物种类",sort = 4) private String pollutionType; diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionOrganizGas.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionOrganizGas.java index 4d909e7..79263ad 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionOrganizGas.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionOrganizGas.java @@ -36,85 +36,80 @@ public class BMainProductionOrganizGas extends BaseEntity @ApiModelProperty(value = "企业id") /** 企业id */ - @Excel(name = "企业id") private String factoryId; @ApiModelProperty(value = "排放口编号") /** 排放口编号 */ - @Excel(name = "排放口编号") + @Excel(name = "排放口编号",sort = 8) private String outletCode; @ApiModelProperty(value = "排放口名称") /** 排放口名称 */ - @Excel(name = "排放口名称") + @Excel(name = "排放口名称",sort = 9) private String outletName; @ApiModelProperty(value = "排放口类型") /** 排放口类型 */ - @Excel(name = "排放口类型") private String outletType; @ApiModelProperty(value = "排口监测类型") /** 排口监测类型 */ - @Excel(name = "排口监测类型") + @Excel(name = "监测类型",sort = 5) private String outletMonType; @ApiModelProperty(value = "治理设施编号") /** 治理设施编号 */ - @Excel(name = "治理设施编号") + @Excel(name = "治理设施编号",sort = 6) private String cepFacilityCode; @ApiModelProperty(value = "治理设施名称") /** 治理设施名称 */ - @Excel(name = "治理设施名称") + @Excel(name = "治理设施名称",sort = 7) private String cepFacilityName; @ApiModelProperty(value = "治理设施工艺") /** 治理设施工艺 */ - @Excel(name = "治理设施工艺") private String cepFacilityCraft; @ApiModelProperty(value = "生产设施编号") /** 生产设施编号 */ - @Excel(name = "生产设施编号") + @Excel(name = "生产设施编号",sort = 3) private String proFacilityCode; @ApiModelProperty(value = "生产设施名称") /** 生产设施名称 */ - @Excel(name = "生产设施名称") + @Excel(name = "生产设施名称",sort = 1) private String proFacilityName; @ApiModelProperty(value = "视频监控") /** 视频监控 */ - @Excel(name = "视频监控") private Long devId; @ApiModelProperty(value = "生产设施参数") /** 生产设施参数 */ - @Excel(name = "生产设施参数") private String proFacilityParam; @ApiModelProperty(value = "对应产污环节名称") /** 对应产污环节名称 */ - @Excel(name = "对应产污环节名称") + @Excel(name = "对应产污环节名称",sort = 2) private String pollutionProductionLink; @ApiModelProperty(value = "污染物种类") /** 污染物种类 */ - @Excel(name = "污染物种类") + @Excel(name = "污染物种类",sort = 4) private String pollutionType; @ApiModelProperty(value = "治理设施id, 多个用逗号分隔") diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionWater.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionWater.java index 66e5428..465c395 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionWater.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainProductionWater.java @@ -36,37 +36,36 @@ public class BMainProductionWater extends BaseEntity @ApiModelProperty(value = "企业id") /** 企业id */ - @Excel(name = "企业id") private String factoryId; @ApiModelProperty(value = "排放口编号") /** 排放口编号 */ - @Excel(name = "排放口编号") + @Excel(name = "排放口编号",sort = 7) private String outletCode; @ApiModelProperty(value = "排放口名称") /** 排放口名称 */ - @Excel(name = "排放口名称") + @Excel(name = "排放口名称",sort = 8) private String outletName; @ApiModelProperty(value = "排放口类型") /** 排放口类型 */ - @Excel(name = "排放口类型") + @Excel(name = "排放口类型",sort = 9) private String outletType; @ApiModelProperty(value = "排口监测类型") /** 排口监测类型 */ - @Excel(name = "排口监测类型") + @Excel(name = "排口监测类型",sort = 3) private String outletMonType; @ApiModelProperty(value = "治理设施编号") /** 治理设施编号 */ - @Excel(name = "治理设施编号") + @Excel(name = "治理设施编号",sort = 4) private String cepFacilityCode; @ApiModelProperty("治理设施id, 多个用逗号分隔") @@ -75,25 +74,25 @@ public class BMainProductionWater extends BaseEntity @ApiModelProperty(value = "治理设施名称") /** 治理设施名称 */ - @Excel(name = "治理设施名称") + @Excel(name = "治理设施名称",sort = 5) private String cepFacilityName; @ApiModelProperty(value = "治理设施工艺") /** 治理设施工艺 */ - @Excel(name = "治理设施工艺") + @Excel(name = "治理设施工艺",sort = 6) private String cepFacilityCraft; @ApiModelProperty(value = "污染物种类") /** 污染物种类 */ - @Excel(name = "污染物种类") + @Excel(name = "污染物种类",sort = 2) private String pollutionType; @ApiModelProperty(value = "废水类别") /** 废水类别 */ - @Excel(name = "废水类别") + @Excel(name = "废水类别",sort = 1) private String waterType; diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainSolidHazardous.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainSolidHazardous.java index 40f755f..422b4b0 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainSolidHazardous.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BMainSolidHazardous.java @@ -36,22 +36,22 @@ public class BMainSolidHazardous extends BaseEntity @ApiModelProperty(value = "企业id") /** 企业id */ - @Excel(name = "企业id") private String factoryId; @ApiModelProperty(value = "自行贮存设施名称") /** 自行贮存设施名称 */ - @Excel(name = "自行贮存设施名称") + @Excel(name = "自行贮存设施名称",sort = 2) private String facilityName; @ApiModelProperty(value = "自行贮存设施编号") /** 自行贮存设施编号 */ - @Excel(name = "自行贮存设施编号") + @Excel(name = "自行贮存设施编号",sort = 3) private String facilityCode; @ApiModelProperty(value = "视频id") + @Excel(name = "视频监控",sort = 4) private Long devId; @Override diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkBoilerFuelGas.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkBoilerFuelGas.java new file mode 100644 index 0000000..6035344 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkBoilerFuelGas.java @@ -0,0 +1,205 @@ +package cn.cecep.talroad.domain; + +import cn.cecep.talroad.common.core.annotation.Excel; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.math.BigDecimal; +import lombok.Data; + +/** + * 固定源产治排--排污许可--锅炉行业气体燃料信息 + */ +@ApiModel(description="固定源产治排--排污许可--锅炉行业气体燃料信息") +@Data +@TableName(value = "b_stat_table_pwxk_boiler_fuel_gas") +public class BStatTablePwxkBoilerFuelGas implements Serializable { + /** + * 主键id + */ + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="主键id") + private Long id; + + /** + * 企业id + */ + @TableField(value = "factory_id") + @ApiModelProperty(value="企业id") + private String factoryId; + + /** + * 主要生产单元名称 + */ + @TableField(value = "production_unit_name") + @ApiModelProperty(value="主要生产单元名称") + @Excel(name = "主要生产单元名称") + private String productionUnitName; + + /** + * 生产设施编号 + */ + @TableField(value = "production_facilities_code") + @ApiModelProperty(value="生产设施编号") + @Excel(name = "生产设施编号") + private String productionFacilitiesCode; + + /** + * 生产设施名称 + */ + @TableField(value = "production_facilities_name") + @ApiModelProperty(value="生产设施名称") + @Excel(name = "生产设施名称") + private String productionFacilitiesName; + + /** + * 燃料名称 + */ + @TableField(value = "fuel_name") + @ApiModelProperty(value="燃料名称") + @Excel(name = "燃料名称") + private String fuelName; + + /** + * 甲烷（%） + */ + @TableField(value = "methane") + @ApiModelProperty(value="甲烷（%）") + @Excel(name = "甲烷（%）") + private BigDecimal methane; + + /** + * 乙烷（%） + */ + @TableField(value = "ethane") + @ApiModelProperty(value="乙烷（%）") + @Excel(name = "乙烷（%）") + private BigDecimal ethane; + + /** + * 丙烷（%） + */ + @TableField(value = "propane") + @ApiModelProperty(value="丙烷（%）") + @Excel(name = "丙烷（%）") + private BigDecimal propane; + + /** + * 异/正丁烷（%） + */ + @TableField(value = "butane") + @ApiModelProperty(value="异/正丁烷（%）") + @Excel(name = "异/正丁烷（%）") + private BigDecimal butane; + + /** + * 异/正戊烷（%） + */ + @TableField(value = "pentane") + @ApiModelProperty(value="异/正戊烷（%）") + @Excel(name = "异/正戊烷（%）") + private BigDecimal pentane; + + /** + * 己烷及更重组分（%） + */ + @TableField(value = "hexane_and_heavier") + @ApiModelProperty(value="己烷及更重组分（%）") + @Excel(name = "己烷及更重组分（%）") + private BigDecimal hexaneAndHeavier; + + /** + * 一氧化碳（%） + */ + @TableField(value = "co") + @ApiModelProperty(value="一氧化碳（%）") + @Excel(name = "一氧化碳（%）") + private BigDecimal co; + + /** + * 二氧化碳（%） + */ + @TableField(value = "co2") + @ApiModelProperty(value="二氧化碳（%）") + @Excel(name = "二氧化碳（%）") + private BigDecimal co2; + + /** + * 氢（%） + */ + @TableField(value = "hydrogen") + @ApiModelProperty(value="氢（%）") + @Excel(name = "氢（%）") + private BigDecimal hydrogen; + + /** + * 氧（%） + */ + @TableField(value = "oxygen") + @ApiModelProperty(value="氧（%）") + @Excel(name = "氧（%）") + private BigDecimal oxygen; + + /** + * 氮（%） + */ + @TableField(value = "nitrogen") + @ApiModelProperty(value="氮（%）") + @Excel(name = "氮（%）") + private BigDecimal nitrogen; + + /** + * 硫化氢（%） + */ + @TableField(value = "hydrogen_sulfide") + @ApiModelProperty(value="硫化氢（%）") + @Excel(name = "硫化氢（%）") + private BigDecimal hydrogenSulfide; + + /** + * 其他组分（%） + */ + @TableField(value = "other_components") + @ApiModelProperty(value="其他组分（%）") + @Excel(name = "其他组分（%）") + private BigDecimal otherComponents; + + /** + * 总硫(%或mg/m3) + */ + @TableField(value = "total_sulfur") + @ApiModelProperty(value="总硫(%或mg/m3)") + @Excel(name = "总硫(%或mg/m3)") + private BigDecimal totalSulfur; + + /** + * 低位发热量(MJ/m3) + */ + @TableField(value = "lower_heating") + @ApiModelProperty(value="低位发热量(MJ/m3)") + @Excel(name = "低位发热量(MJ/m3)") + private BigDecimal lowerHeating; + + /** + * 年燃料使用量（万m3/a） + */ + @TableField(value = "year_used") + @ApiModelProperty(value="年燃料使用量（万m3/a）") + @Excel(name = "年燃料使用量（万m3/a）") + private BigDecimal yearUsed; + + @TableField(value = "trade_secrets") + @ApiModelProperty(value="是否涉及商业秘密（0否1是）") + @Excel(name = "是否涉及商业秘密", readConverterExp = "0=否,1=是") + private String tradeSecrets; + + @TableField(value = "other_info") + @ApiModelProperty(value="其他信息") + @Excel(name = "其他信息") + private String otherInfo; + +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkBoilerFuelSolidLiquid.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkBoilerFuelSolidLiquid.java new file mode 100644 index 0000000..414a7c3 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkBoilerFuelSolidLiquid.java @@ -0,0 +1,156 @@ +package cn.cecep.talroad.domain; + +import cn.cecep.talroad.common.core.annotation.Excel; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 固定源产治排--排污许可--锅炉行业固体液体燃料信息 + */ +@ApiModel(description="固定源产治排--排污许可--锅炉行业固体液体燃料信息") +@Data +@TableName(value = "b_stat_table_pwxk_boiler_fuel_solid_liquid") +public class BStatTablePwxkBoilerFuelSolidLiquid implements Serializable { + /** + * 主键id + */ + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="主键id") + private Long id; + /** + * 企业id + */ + @TableField(value = "factory_id") + @ApiModelProperty(value="企业id") + private String factoryId; + /** + * 主要生产单元名称 + */ + @TableField(value = "production_unit_name") + @ApiModelProperty(value="主要生产单元名称") + @Excel(name = "主要生产单元名称") + private String productionUnitName; + /** + * 生产设施编号 + */ + @TableField(value = "production_facilities_code") + @ApiModelProperty(value="生产设施编号") + @Excel(name = "生产设施编号") + private String productionFacilitiesCode; + /** + * 生产设施名称 + */ + @TableField(value = "production_facilities_name") + @ApiModelProperty(value="生产设施名称") + @Excel(name = "生产设施名称") + private String productionFacilitiesName; + /** + * 燃料名称 + */ + @TableField(value = "fuel_name") + @ApiModelProperty(value="燃料名称") + @Excel(name = "燃料名称") + private String fuelName; + /** + * 水分（%） + */ + @TableField(value = "water_content") + @ApiModelProperty(value="水分（%）") + @Excel(name = "水分（%）") + private BigDecimal waterContent; + /** + * 灰分（%） + */ + @TableField(value = "ash_content") + @ApiModelProperty(value="灰分（%）") + @Excel(name = "灰分（%）") + private BigDecimal ashContent; + /** + * 挥发分（%） + */ + @TableField(value = "\"volatile_percentage\"") + @ApiModelProperty(value="挥发分（%）") + @Excel(name = "挥发分（%）") + private BigDecimal volatilePercentage; + /** + * 固定碳（%） + */ + @TableField(value = "fixed_carbon") + @ApiModelProperty(value="固定碳（%）") + @Excel(name = "固定碳（%）") + private BigDecimal fixedCarbon; + /** + * 碳（%） + */ + @TableField(value = "carbon") + @ApiModelProperty(value="碳（%）") + @Excel(name = "碳（%）") + private BigDecimal carbon; + /** + * 氢（%） + */ + @TableField(value = "hydrogen") + @ApiModelProperty(value="氢（%）") + @Excel(name = "氢（%）") + private BigDecimal hydrogen; + /** + * 氧（%） + */ + @TableField(value = "oxygen") + @ApiModelProperty(value="氧（%）") + @Excel(name = "氧（%）") + private BigDecimal oxygen; + /** + * 氮（%） + */ + @TableField(value = "nitrogen") + @ApiModelProperty(value="氮（%）") + @Excel(name = "氮（%）") + private BigDecimal nitrogen; + /** + * 硫（%） + */ + @TableField(value = "sulfur") + @ApiModelProperty(value="硫（%）") + @Excel(name = "硫（%）") + private BigDecimal sulfur; + /** + * 低位发热量(MJ/kg) + */ + @TableField(value = "lower_heating") + @ApiModelProperty(value="低位发热量(MJ/kg)") + @Excel(name = "低位发热量(MJ/kg)") + private BigDecimal lowerHeating; + /** + * 汞含量（μg/g） + */ + @TableField(value = "mercury") + @ApiModelProperty(value="汞含量（μg/g）") + @Excel(name = "汞含量（μg/g）") + private BigDecimal mercury; + /** + * 年燃料使用量（t/a） + */ + @TableField(value = "year_used") + @ApiModelProperty(value="年燃料使用量（t/a）") + @Excel(name = "年燃料使用量（t/a）") + private BigDecimal yearUsed; + + @TableField(value = "trade_secrets") + @ApiModelProperty(value="是否涉及商业秘密（0否1是）") + @Excel(name = "是否涉及商业秘密", readConverterExp = "0=否,1=是") + private String tradeSecrets; + + @TableField(value = "other_info") + @ApiModelProperty(value="其他信息") + @Excel(name = "其他信息") + private String otherInfo; +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkFuel.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkFuel.java new file mode 100644 index 0000000..e1cfcff --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkFuel.java @@ -0,0 +1,137 @@ +package cn.cecep.talroad.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.math.BigDecimal; +import lombok.Data; + +/** + * 固定源产治排--排污许可--燃料 + */ +@ApiModel(description = "固定源产治排--排污许可--燃料") +@Data +@TableName(value = "b_stat_table_pwxk_fuel") +public class BStatTablePwxkFuel implements Serializable { + public static final String COL_VOLATILE = "volatile"; + /** + * 主键id + */ + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value = "主键id") + private Long id; + + /** + * 企业id + */ + @TableField(value = "factory_id") + @ApiModelProperty(value = "企业id") + private String factoryId; + + /** + * 燃料名称 + */ + @TableField(value = "fuel_name") + @ApiModelProperty(value = "燃料名称") + private String fuelName; + + /** + * 设计年使用量 + */ + @TableField(value = "year_plan_used") + @ApiModelProperty(value = "设计年使用量") + private BigDecimal yearPlanUsed; + + /** + * 计量单位 + */ + @TableField(value = "unit") + @ApiModelProperty(value = "计量单位") + private String unit; + + /** + * 灰分（%） + */ + @TableField(value = "ash_content") + @ApiModelProperty(value = "灰分（%）") + private BigDecimal ashContent; + + /** + * 硫分（%） + */ + @TableField(value = "sulfur_content") + @ApiModelProperty(value = "硫分（%）") + private BigDecimal sulfurContent; + + /** + * 挥发分（%） + */ + @TableField(value = "volatile_percentage") + @ApiModelProperty(value = "挥发分（%）") + private BigDecimal volatilePercentage; + + /** + * 低位发热量（kj/kg） + */ + @TableField(value = "lower_heating") + @ApiModelProperty(value = "低位发热量（kj/kg）") + private BigDecimal lowerHeating; + + /** + * 额外数据，json格式： + * { + * // 燃料列表 + * "fuelList": [{ + * "poisonousComponent": "", // 有毒有害成分 + * "ratio": "", // 成分占比（%） + * }] + * } + */ + @TableField(value = "extra") + @ApiModelProperty(value = "额外数据，json格式：,{, // 燃料列表, 'fuelList': [{, 'poisonousComponent': '', // 有毒有害成分, 'ratio': '', // 成分占比（%）, }],}") + private String extra; + + /** + * 其他信息 + */ + @TableField(value = "other_info") + @ApiModelProperty(value = "其他信息") + private String otherInfo; + + /** + * 是否涉及商业秘密（0否1是） + */ + @TableField(value = "trade_secrets") + @ApiModelProperty(value = "是否涉及商业秘密（0否1是）") + private String tradeSecrets; + + private static final long serialVersionUID = 1L; + + public static final String COL_ID = "id"; + + public static final String COL_FACTORY_ID = "factory_id"; + + public static final String COL_FUEL_NAME = "fuel_name"; + + public static final String COL_YEAR_PLAN_USED = "year_plan_used"; + + public static final String COL_UNIT = "unit"; + + public static final String COL_ASH_CONTENT = "ash_content"; + + public static final String COL_SULFUR_CONTENT = "sulfur_content"; + + public static final String COL_VOLATILE_PERCENTAGE = "volatile_percentage"; + + public static final String COL_LOWER_HEATING = "lower_heating"; + + public static final String COL_EXTRA = "extra"; + + public static final String COL_OTHER_INFO = "other_info"; + + public static final String COL_TRADE_SECRETS = "trade_secrets"; +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkProductionFacilitiesParams.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkProductionFacilitiesParams.java index 85f2614..20f383c 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkProductionFacilitiesParams.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkProductionFacilitiesParams.java @@ -1,6 +1,6 @@ package cn.cecep.talroad.domain; -////import cn.cecep.talroad.common.core.annotation.ExcelNew; +import cn.cecep.talroad.common.core.annotation.Excel; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -42,27 +42,27 @@ public class BStatTablePwxkProductionFacilitiesParams implements Serializable { */ @TableField(value = "params_name") @ApiModelProperty(value = "参数名") -// @ExcelNew(needMerge = true,name = "参数名",sort = 2,cellType = ExcelNew.ColumnType.STRING) + @Excel(name = "参数名",sort = 2) private String paramsName; /** * 计量单位 */ @TableField(value = "params_unit") @ApiModelProperty(value = "计量单位") -// @ExcelNew(needMerge = true,name = "计量单位",sort = 3) + @Excel(name = "计量单位",sort = 3) private String paramsUnit; /** * 设计值 */ @TableField(value = "design_values") @ApiModelProperty(value = "设计值") -// @ExcelNew(needMerge = true,name = "设计值",sort = 4) + @Excel(name = "设计值",sort = 4) private String designValues; /** * 其他设施信息 */ @TableField(value = "other_params_info") @ApiModelProperty(value = "其他设施信息") -// @ExcelNew(needMerge = true,name = "其他设施信息",sort = 5) + @Excel(name = "其他设施信息",sort = 5) private String otherParamsInfo; } \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkRawMaterial.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkRawMaterial.java new file mode 100644 index 0000000..575f3cd --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkRawMaterial.java @@ -0,0 +1,145 @@ +package cn.cecep.talroad.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.math.BigDecimal; +import lombok.Data; + +/** + * 固定源产治排--排污许可--原辅料 + */ +@ApiModel(description="固定源产治排--排污许可--原辅料") +@Data +@TableName(value = "b_stat_table_pwxk_raw_material") +public class BStatTablePwxkRawMaterial implements Serializable { + /** + * 主键id + */ + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="主键id") + private Long id; + + /** + * 企业id + */ + @TableField(value = "factory_id") + @ApiModelProperty(value="企业id") + private String factoryId; + + /** + * 种类 + */ + @TableField(value = "raw_material_class") + @ApiModelProperty(value="种类") + private String rawMaterialClass; + + /** + * 类型 + */ + @TableField(value = "raw_material_type") + @ApiModelProperty(value="类型") + private String rawMaterialType; + + /** + * 名称 + */ + @TableField(value = "raw_material_name") + @ApiModelProperty(value="名称") + private String rawMaterialName; + + /** + * 年最大使用量 + */ + @TableField(value = "year_max_used") + @ApiModelProperty(value="年最大使用量") + private BigDecimal yearMaxUsed; + + /** + * 设计年使用量 + */ + @TableField(value = "year_plan_used") + @ApiModelProperty(value="设计年使用量") + private BigDecimal yearPlanUsed; + + /** + * 计量单位 + */ + @TableField(value = "unit") + @ApiModelProperty(value="计量单位") + private String unit; + + /** + * 硫元素占比（%） + */ + @TableField(value = "sulfur_ratio") + @ApiModelProperty(value="硫元素占比（%）") + private BigDecimal sulfurRatio; + + /** + * 有毒有害成分及占比 + */ + @TableField(value = "poisonous_component") + @ApiModelProperty(value="有毒有害成分及占比") + private String poisonousComponent; + + /** + * 额外数据，json格式： +{ + // 辅料列表 + "rawMaterialList": [{ + "poisonousComponent": "", // 有毒有害成分 + "ratio": "", // 成分占比（%） + }] +} + */ + @TableField(value = "extra") + @ApiModelProperty(value="额外数据，json格式：,{, // 辅料列表, 'rawMaterialList': [{, 'poisonousComponent': '', // 有毒有害成分, 'ratio': '', // 成分占比（%）, }],}") + private String extra; + + /** + * 其他信息 + */ + @TableField(value = "other_info") + @ApiModelProperty(value="其他信息") + private String otherInfo; + + /** + * 是否涉及商业秘密（0否1是） + */ + @TableField(value = "trade_secrets") + @ApiModelProperty(value="是否涉及商业秘密（0否1是）") + private String tradeSecrets; + + private static final long serialVersionUID = 1L; + + public static final String COL_ID = "id"; + + public static final String COL_FACTORY_ID = "factory_id"; + + public static final String COL_RAW_MATERIAL_CLASS = "raw_material_class"; + + public static final String COL_RAW_MATERIAL_TYPE = "raw_material_type"; + + public static final String COL_RAW_MATERIAL_NAME = "raw_material_name"; + + public static final String COL_YEAR_MAX_USED = "year_max_used"; + + public static final String COL_YEAR_PLAN_USED = "year_plan_used"; + + public static final String COL_UNIT = "unit"; + + public static final String COL_SULFUR_RATIO = "sulfur_ratio"; + + public static final String COL_POISONOUS_COMPONENT = "poisonous_component"; + + public static final String COL_EXTRA = "extra"; + + public static final String COL_OTHER_INFO = "other_info"; + + public static final String COL_TRADE_SECRETS = "trade_secrets"; +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkWaterTreatmentLine.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkWaterTreatmentLine.java index 99f2495..2930d89 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkWaterTreatmentLine.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTablePwxkWaterTreatmentLine.java @@ -75,7 +75,7 @@ public class BStatTablePwxkWaterTreatmentLine implements Serializable { */ @TableField(value = "belong_to_water_treatment_facilities") @ApiModelProperty(value = "是否属于工业园区配套污水处理设施（0否1是）") - @Excel(name = "是否属于工业园区配套污水处理设施",sort = 13) + @Excel(name = "是否属于工业园区配套污水处理设施",sort = 13,readConverterExp = "0=否,1=是") private String belongToWaterTreatmentFacilities; /** * 生产线类别 diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmission.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmission.java new file mode 100644 index 0000000..59f12ea --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmission.java @@ -0,0 +1,258 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据对象 b_stat_table_zxbg_gas_emission + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--有组织废气污染物排放浓度监测数据") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_gas_emission") +public class BStatTableZxbgGasEmission extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "类型") + /** 类型 */ + @Excel(name = "类型") + private String zxbgPollutantType; + + + + + + + @ApiModelProperty(value = "排放口编码") + /** 排放口编码 */ + @Excel(name = "排放口编码") + private String outletCode; + + + @ApiModelProperty(value = "污染物名称") + /** 污染物名称 */ + @Excel(name = "污染物名称") + private String pollutantName; + + + @ApiModelProperty(value = "监测设施:手工、自动") + /** 监测设施:手工、自动 */ + @Excel(name = "监测设施") + private String monitoringFacilities; + + + @ApiModelProperty(value = "设施名称") + /** 设施名称 */ + @Excel(name = "设施名称") + private String facilityName; + + + @ApiModelProperty(value = "许可排放浓度限值") + /** 许可排放浓度限值 */ + @Excel(name = "许可排放浓度限值") + private String emissionConcentration; + + + @ApiModelProperty(value = "有效监测数据(小时值)数量") + /** 有效监测数据(小时值)数量 */ + @Excel(name = "有效监测数据(小时值)数量") + private String effectivelyHour; + + + @ApiModelProperty(value = "检测结果（小时浓度）最小值mg/m3") + /** 检测结果（小时浓度）最小值mg/m3 */ + @Excel(name = "检测结果（小时浓度）最小值mg/m3") + private String detectionMinHour; + + + @ApiModelProperty(value = "检测结果（小时浓度）最大值mg/m3") + /** 检测结果（小时浓度）最大值mg/m3 */ + @Excel(name = "检测结果（小时浓度）最大值") + private String detectionMaxHour; + + + @ApiModelProperty(value = "检测结果（小时浓度）平均值") + /** 检测结果（小时浓度）平均值 */ + @Excel(name = "检测结果（小时浓度）平均值") + private String detectionAvgHour; + + + @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）最小值") + /** 监测结果（折标，小时浓度,mg/Nm3）最小值 */ + @Excel(name = "监测结果（折标，小时浓度,mg/Nm3）最小值") + private String foldsMinHour; + + + @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）最大值") + /** 监测结果（折标，小时浓度,mg/Nm3）最大值 */ + @Excel(name = "监测结果（折标，小时浓度,mg/Nm3）最大值") + private String foldsMaxHour; + + + @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）平均值") + /** 监测结果（折标，小时浓度,mg/Nm3）平均值 */ + @Excel(name = "监测结果（折标，小时浓度,mg/Nm3）平均值") + private String foldsAvgHour; + + + @ApiModelProperty(value = "超标数据个数") + /** 超标数据个数 */ + @Excel(name = "超标数据个数") + private String exceededData; + + + @ApiModelProperty(value = "超标率（%）") + /** 超标率（%） */ + @Excel(name = "超标率（%）") + private String exceededRate; + + + @ApiModelProperty(value = "实际产生量（吨）") + /** 实际产生量（吨） */ + @Excel(name = "实际产生量（吨）") + private String actualAmount; + + + @ApiModelProperty(value = "实际排放量（吨）") + /** 实际排放量（吨） */ + @Excel(name = "实际排放量（吨）") + private String actualEmissions; + + + @ApiModelProperty(value = "监测仪器名称或型号") + /** 监测仪器名称或型号 */ + @Excel(name = "监测仪器名称或型号") + private String instrumentName; + + + @ApiModelProperty(value = "手工监测采样方法及个数") + /** 手工监测采样方法及个数 */ + @Excel(name = "手工监测采样方法及个数") + private String samplingMethod; + + + @ApiModelProperty(value = "手工测定方法") + /** 手工测定方法 */ + @Excel(name = "手工测定方法") + private String manualMethod; + + + @ApiModelProperty(value = "监测设备测量范围(mg/m3)") + /** 监测设备测量范围(mg/m3) */ + @Excel(name = "监测设备测量范围(mg/m3)") + private String deviceRange; + + + @ApiModelProperty(value = "监测设备准确度") + /** 监测设备准确度 */ + @Excel(name = "监测设备准确度") + private String deviceAccuracy; + + + @ApiModelProperty(value = "监测设备检出下限mg/m3") + /** 监测设备检出下限mg/m3 */ + @Excel(name = "监测设备检出下限mg/m3") + private String deviceCheckout; + + + @ApiModelProperty(value = "备注") + /** 备注 */ + @Excel(name = "备注") + private String remark; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("zxbgPollutantType", getZxbgPollutantType()) + .append("createTime", getCreateTime()) + .append("remark", getRemark()) + .append("outletCode", getOutletCode()) + .append("pollutantName", getPollutantName()) + .append("monitoringFacilities", getMonitoringFacilities()) + .append("facilityName", getFacilityName()) + .append("emissionConcentration", getEmissionConcentration()) + .append("effectivelyHour", getEffectivelyHour()) + .append("detectionMinHour", getDetectionMinHour()) + .append("detectionMaxHour", getDetectionMaxHour()) + .append("detectionAvgHour", getDetectionAvgHour()) + .append("foldsMinHour", getFoldsMinHour()) + .append("foldsMaxHour", getFoldsMaxHour()) + .append("foldsAvgHour", getFoldsAvgHour()) + .append("exceededData", getExceededData()) + .append("exceededRate", getExceededRate()) + .append("actualAmount", getActualAmount()) + .append("actualEmissions", getActualEmissions()) + .append("instrumentName", getInstrumentName()) + .append("samplingMethod", getSamplingMethod()) + .append("manualMethod", getManualMethod()) + .append("deviceRange", getDeviceRange()) + .append("deviceAccuracy", getDeviceAccuracy()) + .append("deviceCheckout", getDeviceCheckout()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmissionSpeed.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmissionSpeed.java new file mode 100644 index 0000000..56e9c4d --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmissionSpeed.java @@ -0,0 +1,172 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--有组织废气污染物排放速率监测对象 b_stat_table_zxbg_gas_emission_speed + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--有组织废气污染物排放速率监测") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_gas_emission_speed") +public class BStatTableZxbgGasEmissionSpeed extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "排放口编码") + /** 排放口编码 */ + @Excel(name = "排放口编码") + private String outletCode; + + + @ApiModelProperty(value = "排放口名称") + /** 排放口名称 */ + @Excel(name = "排放口名称") + private String outletName; + + + + + + + @ApiModelProperty(value = "污染物名称") + /** 污染物名称 */ + @Excel(name = "污染物名称") + private String pollutantName; + + + @ApiModelProperty(value = "污染物编码") + /** 污染物编码 */ + @Excel(name = "污染物编码") + private String pollutantCode; + + @ApiModelProperty(value = "有效监测数据(小时值)数量") + /** 有效监测数据(小时值)数量 */ + @Excel(name = "有效监测数据(小时值)数量") + private String effectivelyHour; + + @ApiModelProperty(value = "许可排放浓度限值") + /** 许可排放浓度限值 */ + @Excel(name = "许可排放浓度限值") + private String emissionConcentration; + + @ApiModelProperty(value = "实际排放速率最小值") + /** 实际排放速率最小值 */ + @Excel(name = "实际排放速率最小值") + private String detectionMinHour; + + + @ApiModelProperty(value = "实际排放速率最大值") + /** 实际排放速率最大值 */ + @Excel(name = "实际排放速率最大值") + private String detectionMaxHour; + + + @ApiModelProperty(value = "实际排放速率平均值") + /** 实际排放速率平均值 */ + @Excel(name = "实际排放速率平均值") + private String detectionAvgHour; + + + @ApiModelProperty(value = "超标数据个数") + /** 超标数据个数 */ + @Excel(name = "超标数据个数") + private String exceededData; + + + @ApiModelProperty(value = "超标率（%）") + /** 超标率（%） */ + @Excel(name = "超标率（%）") + private String exceededRate; + + + @ApiModelProperty(value = "超标原因") + /** 超标原因 */ + @Excel(name = "超标原因") + private String exceededCause; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("outletCode", getOutletCode()) + .append("outletName", getOutletName()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .append("pollutantName", getPollutantName()) + .append("pollutantCode", getPollutantCode()) + .append("emissionConcentration", getEmissionConcentration()) + .append("effectivelyHour", getEffectivelyHour()) + .append("detectionMinHour", getDetectionMinHour()) + .append("detectionMaxHour", getDetectionMaxHour()) + .append("detectionAvgHour", getDetectionAvgHour()) + .append("exceededData", getExceededData()) + .append("exceededRate", getExceededRate()) + .append("exceededCause", getExceededCause()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmissionStatistics.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmissionStatistics.java new file mode 100644 index 0000000..7dca875 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGasEmissionStatistics.java @@ -0,0 +1,175 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计对象 b_stat_table_zxbg_gas_emission_statistics + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_gas_emission_statistics") +public class BStatTableZxbgGasEmissionStatistics extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "类型") + /** 类型 */ + @Excel(name = "类型") + private String zxbgPollutantType; + + + @ApiModelProperty(value = "污染物名称") + /** 污染物名称 */ + @Excel(name = "污染物名称") + private String pollutantName; + + + @ApiModelProperty(value = "设施名称") + /** 设施名称 */ + @Excel(name = "设施名称") + private String facilityName; + + + @ApiModelProperty(value = "生产设施/无组织排放编号") + /** 生产设施/无组织排放编号 */ + @Excel(name = "生产设施/无组织排放编号") + private String facilitiesCode; + + + @ApiModelProperty(value = "监测时间") + /** 监测时间 */ + @Excel(name = "监测时间") + private String monitoringTime; + + + @ApiModelProperty(value = "监测次数") + /** 监测次数 */ + @Excel(name = "监测次数") + private Long monitoringNumber; + + + @ApiModelProperty(value = "许可排放浓度限值") + /** 许可排放浓度限值 */ + @Excel(name = "许可排放浓度限值") + private String emissionConcentration; + + + @ApiModelProperty(value = "浓度监测结果（小时浓度）") + /** 浓度监测结果（小时浓度） */ + @Excel(name = "浓度监测结果（小时浓度）") + private String monitoringResultsHour; + + + @ApiModelProperty(value = "浓度监测结果（折标，小时浓度）") + /** 浓度监测结果（折标，小时浓度） */ + @Excel(name = "浓度监测结果（折标，小时浓度）") + private String monitoringFoldsHour; + + + @ApiModelProperty(value = "是否超标:0否1是") + /** 是否超标:0否1是 */ + @Excel(name = "是否超标") + private String isExceeded; + + @ApiModelProperty(value = "备注") + /** 备注 */ + @Excel(name = "备注") + private String remark; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + public String getIsExceeded() { + return isExceeded; + } + + public void setIsExceeded(String isExceeded) { + if(StringUtils.isNotBlank(isExceeded)){ + if(isExceeded.equals("0")){this.isExceeded = "否";} + if(isExceeded.equals("1")){this.isExceeded = "是";} + }else { + this.isExceeded = isExceeded; + } + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("zxbgPollutantType", getZxbgPollutantType()) + .append("pollutantName", getPollutantName()) + .append("facilityName", getFacilityName()) + .append("facilitiesCode", getFacilitiesCode()) + .append("monitoringTime", getMonitoringTime()) + .append("monitoringNumber", getMonitoringNumber()) + .append("emissionConcentration", getEmissionConcentration()) + .append("monitoringResultsHour", getMonitoringResultsHour()) + .append("monitoringFoldsHour", getMonitoringFoldsHour()) + .append("isExceeded", getIsExceeded()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGtFuel.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGtFuel.java new file mode 100644 index 0000000..e20670b --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGtFuel.java @@ -0,0 +1,113 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.utils.StringUtils; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--钢铁-燃料分析对象 b_stat_table_zxbg_gt_fuel + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--钢铁-燃料分析") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_gt_fuel") +public class BStatTableZxbgGtFuel extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "记录内容") + /** 记录内容 */ + @Excel(name = "记录内容") + private String recordContent; + + + @ApiModelProperty(value = "名称") + /** 名称 */ + @Excel(name = "名称") + private String name; + + + @ApiModelProperty(value = "具体情况") + /** 具体情况 */ + @Excel(name = "具体情况") + private String specificInformation; + + @ApiModelProperty(value = "备注") + /** 备注 */ + @Excel(name = "备注") + private String remark; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("recordContent", getRecordContent()) + .append("name", getName()) + .append("specificInformation", getSpecificInformation()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGtProduction.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGtProduction.java new file mode 100644 index 0000000..75de114 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgGtProduction.java @@ -0,0 +1,121 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.utils.StringUtils; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--钢铁-生产单元运行情况对象 b_stat_table_zxbg_gt_production + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--钢铁-生产单元运行情况") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_gt_production") +public class BStatTableZxbgGtProduction extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "主要生产单元") + /** 主要生产单元 */ + @Excel(name = "主要生产单元") + private String mainProductionUnit; + + + @ApiModelProperty(value = "名称") + /** 名称 */ + @Excel(name = "名称") + private String name; + + + @ApiModelProperty(value = "数量") + /** 数量 */ + @Excel(name = "数量") + private String quantity; + + + @ApiModelProperty(value = "单位") + /** 单位 */ + @Excel(name = "单位") + private String unit; + + @ApiModelProperty(value = "备注") + /** 备注 */ + @Excel(name = "备注") + private String remark; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("mainProductionUnit", getMainProductionUnit()) + .append("name", getName()) + .append("quantity", getQuantity()) + .append("unit", getUnit()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdFuelAnalysis.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdFuelAnalysis.java new file mode 100644 index 0000000..3ed1a8e --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdFuelAnalysis.java @@ -0,0 +1,139 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电燃料分析对象 b_stat_table_zxbg_hd_fuel_analysis + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电燃料分析") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_hd_fuel_analysis") +public class BStatTableZxbgHdFuelAnalysis extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "生产单元") + /** 生产单元 */ + @Excel(name = "生产单元") + private String productionUnit; + + + @ApiModelProperty(value = "燃料名称") + /** 燃料名称 */ + @Excel(name = "燃料名称") + private String fuelName; + + + @ApiModelProperty(value = "使用量（万t/a、万m³/a）") + /** 使用量（万t/a、万m³/a） */ + @Excel(name = "使用量（万t/a、万m³/a）") + private String usage; + + + @ApiModelProperty(value = "灰分（%）") + /** 灰分（%） */ + @Excel(name = "灰分（%）") + private String ashContent; + + + @ApiModelProperty(value = "硫分（%）") + /** 硫分（%） */ + @Excel(name = "硫分（%）") + private String sulfur; + + + @ApiModelProperty(value = "挥发分（%）") + /** 挥发分（%） */ + @Excel(name = "挥发分（%）") + private String volatileContent; + + + @ApiModelProperty(value = "热值（MJ/kg、MJ/m³）") + /** 热值（MJ/kg、MJ/m³） */ + @Excel(name = "热值（MJ/kg、MJ/m³）") + private String caloricValue; + + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("productionUnit", getProductionUnit()) + .append("fuelName", getFuelName()) + .append("usage", getUsage()) + .append("ashContent", getAshContent()) + .append("sulfur", getSulfur()) + .append("volatileContent", getVolatileContent()) + .append("caloricValue", getCaloricValue()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGasPollution.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGasPollution.java new file mode 100644 index 0000000..a7ce091 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGasPollution.java @@ -0,0 +1,219 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.utils.StringUtils; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电废气污染治理设施正常情况对象 b_stat_table_zxbg_hd_gas_pollution + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电废气污染治理设施正常情况") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_hd_gas_pollution") +public class BStatTableZxbgHdGasPollution extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "生产设施名称") + /** 生产设施名称 */ + @Excel(name = "生产设施名称") + private String productionFacilityName; + + + @ApiModelProperty(value = "生产设施编号") + /** 生产设施编号 */ + @Excel(name = "生产设施编号") + private String productionFacilityCode; + + + @ApiModelProperty(value = "治理设施编号") + /** 治理设施编号 */ + @Excel(name = "治理设施编号") + private String governanceFacilityCode; + + + @ApiModelProperty(value = "治理设施名称") + /** 治理设施名称 */ + @Excel(name = "治理设施名称") + private String governanceFacilityName; + + @ApiModelProperty(value = "治理设施运行时间（小时）") + /** 治理设施运行时间（小时） */ + @Excel(name = "治理设施运行时间（小时）") + private String governanceFacilityTime; + + + @ApiModelProperty(value = "粉煤灰产生量（吨）") + /** 粉煤灰产生量（吨） */ + @Excel(name = "粉煤灰产生量（吨）") + private String flyAshProduction; + + + @ApiModelProperty(value = "布袋除尘器清灰周期和换代情况") + /** 布袋除尘器清灰周期和换代情况 */ + @Excel(name = "布袋除尘器清灰周期和换代情况") + private String bagFilter; + + + @ApiModelProperty(value = "除尘效率设计值") + /** 除尘效率设计值 */ + @Excel(name = "除尘效率设计值") + private String dustRemovalEfficiency; + + + @ApiModelProperty(value = "除尘效率实际值") + /** 除尘效率实际值 */ + @Excel(name = "除尘效率实际值") + private String actualValue; + + + @ApiModelProperty(value = "脱硫剂用量（吨）") + /** 脱硫剂用量（吨） */ + @Excel(name = "脱硫剂用量（吨）") + private String desulfurizerDosage; + + + @ApiModelProperty(value = "脱硫副产物产生量（吨）") + /** 脱硫副产物产生量（吨） */ + @Excel(name = "脱硫副产物产生量（吨）") + private String amountProduct; + + + @ApiModelProperty(value = "脱硫效率设计值%") + /** 脱硫效率设计值% */ + @Excel(name = "脱硫效率设计值%") + private String designValues; + + + @ApiModelProperty(value = "脱硫效率实际值%") + /** 脱硫效率实际值% */ + @Excel(name = "脱硫效率实际值%") + private String actualEfficiency; + + + @ApiModelProperty(value = "脱硝还原剂用量（吨）") + /** 脱硝还原剂用量（吨） */ + @Excel(name = "脱硝还原剂用量（吨）") + private String reducingAgentDosage; + + + @ApiModelProperty(value = "脱硝效率设计值") + /** 脱硝效率设计值 */ + @Excel(name = "脱硝效率设计值") + private String denitrationEfficiency; + + + @ApiModelProperty(value = "脱硝效率实际") + /** 脱硝效率实际 */ + @Excel(name = "脱硝效率实际") + private String efficiencyPractical; + + + @ApiModelProperty(value = "污染治理设施运行费用（万元）") + /** 污染治理设施运行费用（万元） */ + @Excel(name = "污染治理设施运行费用（万元）") + private String facilityOperatingCosts; + + + @ApiModelProperty(value = "综合除尘效率设计值") + /** 综合除尘效率设计值 */ + @Excel(name = "综合除尘效率设计值") + private String efficiencyDesignValues; + + + @ApiModelProperty(value = "综合除尘效率实际值") + /** 综合除尘效率实际值 */ + @Excel(name = "综合除尘效率实际值") + private String actualDustRemoval; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("productionFacilityName", getProductionFacilityName()) + .append("productionFacilityCode", getProductionFacilityCode()) + .append("governanceFacilityCode", getGovernanceFacilityCode()) + .append("governanceFacilityName", getGovernanceFacilityName()) + .append("governanceFacilityTime", getGovernanceFacilityTime()) + .append("flyAshProduction", getFlyAshProduction()) + .append("bagFilter", getBagFilter()) + .append("dustRemovalEfficiency", getDustRemovalEfficiency()) + .append("actualValue", getActualValue()) + .append("desulfurizerDosage", getDesulfurizerDosage()) + .append("amountProduct", getAmountProduct()) + .append("designValues", getDesignValues()) + .append("actualEfficiency", getActualEfficiency()) + .append("reducingAgentDosage", getReducingAgentDosage()) + .append("denitrationEfficiency", getDenitrationEfficiency()) + .append("efficiencyPractical", getEfficiencyPractical()) + .append("facilityOperatingCosts", getFacilityOperatingCosts()) + .append("efficiencyDesignValues", getEfficiencyDesignValues()) + .append("actualDustRemoval", getActualDustRemoval()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtBasic.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtBasic.java new file mode 100644 index 0000000..f86aea7 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtBasic.java @@ -0,0 +1,139 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电、钢铁基本信息对象 b_stat_table_zxbg_hd_gt_basic + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电、钢铁基本信息") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_hd_gt_basic") +public class BStatTableZxbgHdGtBasic extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "机组名称") + /** 机组名称 */ + @Excel(name = "机组名称") + private String unitName; + + + @ApiModelProperty(value = "规模（万千瓦）") + /** 规模（万千瓦） */ + @Excel(name = "规模（万千瓦）") + private String scale; + + + @ApiModelProperty(value = "设计运行时间（小时）") + /** 设计运行时间（小时） */ + @Excel(name = "设计运行时间（小时）") + private String runTime; + + + @ApiModelProperty(value = "发电量（万千瓦时）") + /** 发电量（万千瓦时） */ + @Excel(name = "发电量（万千瓦时）") + private String powerGeneration; + + + @ApiModelProperty(value = "供热量（万吉焦）") + /** 供热量（万吉焦） */ + @Excel(name = "供热量（万吉焦）") + private String heatSupply; + + + @ApiModelProperty(value = "实际运行时间（小时）") + /** 实际运行时间（小时） */ + @Excel(name = "实际运行时间（小时）") + private String actualRunningTime; + + + @ApiModelProperty(value = "平均负荷率") + /** 平均负荷率 */ + @Excel(name = "平均负荷率") + private String averageLoadRatio; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("unitName", getUnitName()) + .append("scale", getScale()) + .append("runTime", getRunTime()) + .append("powerGeneration", getPowerGeneration()) + .append("heatSupply", getHeatSupply()) + .append("actualRunningTime", getActualRunningTime()) + .append("averageLoadRatio", getAverageLoadRatio()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtFuel.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtFuel.java new file mode 100644 index 0000000..acd79a6 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtFuel.java @@ -0,0 +1,157 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.utils.StringUtils; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电、钢铁燃料信息对象 b_stat_table_zxbg_hd_gt_fuel + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电、钢铁燃料信息") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_hd_gt_fuel") +public class BStatTableZxbgHdGtFuel extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "机组名称") + /** 机组名称 */ + @Excel(name = "机组名称") + private String unitName; + + + @ApiModelProperty(value = "机组类型") + /** 机组类型 */ + @Excel(name = "机组类型") + private String unitType; + + + @ApiModelProperty(value = "燃料消耗量") + /** 燃料消耗量 */ + @Excel(name = "燃料消耗量") + private String fuelConsumption; + + + @ApiModelProperty(value = "燃料消耗量单位") + /** 燃料消耗量单位 */ + @Excel(name = "燃料消耗量单位") + private String fuelConsumptionUnits; + + + @ApiModelProperty(value = "发电标准煤耗") + /** 发电标准煤耗 */ + @Excel(name = "发电标准煤耗") + private String coalConsumption; + + + @ApiModelProperty(value = "发电标准煤耗单位") + /** 发电标准煤耗单位 */ + @Excel(name = "发电标准煤耗单位") + private String coalConsumptionUnits; + + + @ApiModelProperty(value = "产灰量") + /** 产灰量 */ + @Excel(name = "产灰量") + private String ashProduction; + + + @ApiModelProperty(value = "产灰量单位") + /** 产灰量单位 */ + @Excel(name = "产灰量单位") + private String ashProductionUits; + + + @ApiModelProperty(value = "产渣量") + /** 产渣量 */ + @Excel(name = "产渣量") + private String slagProduction; + + + @ApiModelProperty(value = "产渣量单位") + /** 产渣量单位 */ + @Excel(name = "产渣量单位") + private String slagProductionUnits; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("unitName", getUnitName()) + .append("unitType", getUnitType()) + .append("fuelConsumption", getFuelConsumption()) + .append("fuelConsumptionUnits", getFuelConsumptionUnits()) + .append("coalConsumption", getCoalConsumption()) + .append("coalConsumptionUnits", getCoalConsumptionUnits()) + .append("ashProduction", getAshProduction()) + .append("ashProductionUits", getAshProductionUits()) + .append("slagProduction", getSlagProduction()) + .append("slagProductionUnits", getSlagProductionUnits()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtInvestment.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtInvestment.java new file mode 100644 index 0000000..39f2eb3 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdGtInvestment.java @@ -0,0 +1,130 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.utils.StringUtils; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况对象 b_stat_table_zxbg_hd_gt_investment + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_hd_gt_investment") +public class BStatTableZxbgHdGtInvestment extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "机组名称") + /** 机组名称 */ + @Excel(name = "机组名称") + private String unitName; + + + @ApiModelProperty(value = "治理类型") + /** 治理类型 */ + @Excel(name = "治理类型") + private String governanceType; + + + @ApiModelProperty(value = "开工时间") + /** 开工时间 */ + @Excel(name = "开工时间") + private String startTime; + + + @ApiModelProperty(value = "建成投产时间（拟）") + /** 建成投产时间（拟） */ + @Excel(name = "建成投产时间（拟）") + private String productionTime; + + + @ApiModelProperty(value = "计划总投资") + /** 计划总投资 */ + @Excel(name = "计划总投资") + private String plannedInvestment; + + + @ApiModelProperty(value = "计划周期内完成投资") + /** 计划周期内完成投资 */ + @Excel(name = "计划周期内完成投资") + private String cycleCompleteInvestment; + + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("unitName", getUnitName()) + .append("governanceType", getGovernanceType()) + .append("startTime", getStartTime()) + .append("productionTime", getProductionTime()) + .append("plannedInvestment", getPlannedInvestment()) + .append("cycleCompleteInvestment", getCycleCompleteInvestment()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdWaterPollution.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdWaterPollution.java new file mode 100644 index 0000000..93a1893 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgHdWaterPollution.java @@ -0,0 +1,247 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.utils.StringUtils; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电废水污染治理设施正常情况对象 b_stat_table_zxbg_hd_water_pollution + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电废水污染治理设施正常情况") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_hd_water_pollution") +public class BStatTableZxbgHdWaterPollution extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "废水类别") + /** 废水类别 */ + @Excel(name = "废水类别") + private String waterCategory; + + @ApiModelProperty(value = "治理设施编号") + /** 治理设施编号 */ + @Excel(name = "治理设施编号") + private String governanceFacilityCode; + + + @ApiModelProperty(value = "治理设施名称") + /** 治理设施名称 */ + @Excel(name = "治理设施名称") + private String governanceFacilityName; + + + @ApiModelProperty(value = "治理设施运行时间（小时）") + /** 治理设施运行时间（小时） */ + @Excel(name = "治理设施运行时间（小时）") + private String governanceFacilityTime; + + + @ApiModelProperty(value = "污染治理设施工艺") + /** 污染治理设施工艺 */ + @Excel(name = "污染治理设施工艺") + private String pollutionFacilityTechnology; + + + @ApiModelProperty(value = "污染因子") + /** 污染因子 */ + @Excel(name = "污染因子") + private String contaminateFactor; + + + @ApiModelProperty(value = "排放去向") + /** 排放去向 */ + @Excel(name = "排放去向") + private String emissions; + + + @ApiModelProperty(value = "受纳水体名称") + /** 受纳水体名称 */ + @Excel(name = "受纳水体名称") + private String receivingName; + + + @ApiModelProperty(value = "用电量") + /** 用电量 */ + @Excel(name = "用电量") + private String electricityConsumption; + + + @ApiModelProperty(value = "污水设计处理能力") + /** 污水设计处理能力 */ + @Excel(name = "污水设计处理能力") + private String processingPower; + + + @ApiModelProperty(value = "污水实际处理量") + /** 污水实际处理量 */ + @Excel(name = "污水实际处理量") + private String actualProcessingVolume; + + + @ApiModelProperty(value = "污水实际会用量") + /** 污水实际会用量 */ + @Excel(name = "污水实际会用量") + private String willAmount; + + + @ApiModelProperty(value = "污水实际排放量") + /** 污水实际排放量 */ + @Excel(name = "污水实际排放量") + private String actualEmissions; + + + @ApiModelProperty(value = "废水设计处理能力") + /** 废水设计处理能力 */ + @Excel(name = "废水设计处理能力") + private String designProcessingPower; + + + @ApiModelProperty(value = "废水实际处理量") + /** 废水实际处理量 */ + @Excel(name = "废水实际处理量") + private String waterTreatmentVolume; + + + @ApiModelProperty(value = "废水实际会用量") + /** 废水实际会用量 */ + @Excel(name = "废水实际会用量") + private String waterWillAmount; + + + @ApiModelProperty(value = "废水实际排放量") + /** 废水实际排放量 */ + @Excel(name = "废水实际排放量") + private String waterActualEmissions; + + + @ApiModelProperty(value = "污泥生成量") + /** 污泥生成量 */ + @Excel(name = "污泥生成量") + private String sludgeGeneration; + + + @ApiModelProperty(value = "污泥含水率") + /** 污泥含水率 */ + @Excel(name = "污泥含水率") + private String sludgeMoistureContent; + + + @ApiModelProperty(value = "循环冷却水排放量") + /** 循环冷却水排放量 */ + @Excel(name = "循环冷却水排放量") + private String circulatingCooling; + + + @ApiModelProperty(value = "直流冷却水排水量") + /** 直流冷却水排水量 */ + @Excel(name = "直流冷却水排水量") + private String coolingDischarge; + + + @ApiModelProperty(value = "污泥处置方式") + /** 污泥处置方式 */ + @Excel(name = "污泥处置方式") + private String sludgeDisposalMethod; + + + @ApiModelProperty(value = "污染治理设施运行费用") + /** 污染治理设施运行费用 */ + @Excel(name = "污染治理设施运行费用") + private String facilityOperatingCosts; + + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("waterCategory", getWaterCategory()) + .append("governanceFacilityCode", getGovernanceFacilityCode()) + .append("governanceFacilityName", getGovernanceFacilityName()) + .append("governanceFacilityTime", getGovernanceFacilityTime()) + .append("pollutionFacilityTechnology", getPollutionFacilityTechnology()) + .append("contaminateFactor", getContaminateFactor()) + .append("emissions", getEmissions()) + .append("receivingName", getReceivingName()) + .append("electricityConsumption", getElectricityConsumption()) + .append("processingPower", getProcessingPower()) + .append("actualProcessingVolume", getActualProcessingVolume()) + .append("willAmount", getWillAmount()) + .append("actualEmissions", getActualEmissions()) + .append("designProcessingPower", getDesignProcessingPower()) + .append("waterTreatmentVolume", getWaterTreatmentVolume()) + .append("waterWillAmount", getWaterWillAmount()) + .append("waterActualEmissions", getWaterActualEmissions()) + .append("sludgeGeneration", getSludgeGeneration()) + .append("sludgeMoistureContent", getSludgeMoistureContent()) + .append("circulatingCooling", getCirculatingCooling()) + .append("coolingDischarge", getCoolingDischarge()) + .append("sludgeDisposalMethod", getSludgeDisposalMethod()) + .append("facilityOperatingCosts", getFacilityOperatingCosts()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgSnFuel.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgSnFuel.java new file mode 100644 index 0000000..fd9eabf --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgSnFuel.java @@ -0,0 +1,125 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.utils.StringUtils; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--水泥燃料分析对象 b_stat_table_zxbg_sn_fuel + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--水泥燃料分析") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_sn_fuel") +public class BStatTableZxbgSnFuel extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "参数") + /** 参数 */ + @Excel(name = "参数") + private String parameter; + + + @ApiModelProperty(value = "记录内容") + /** 记录内容 */ + @Excel(name = "记录内容") + private String recordTheContent; + + + @ApiModelProperty(value = "名称") + /** 名称 */ + @Excel(name = "名称") + private String name; + + + + + @ApiModelProperty(value = "类型") + /** 类型 */ + @Excel(name = "类型") + private String type; + + + @ApiModelProperty(value = "使用情况") + /** 使用情况 */ + @Excel(name = "使用情况") + private String usage; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("parameter", getParameter()) + .append("recordTheContent", getRecordTheContent()) + .append("name", getName()) + .append("remark", getRemark()) + .append("type", getType()) + .append("usage", getUsage()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgSnProduction.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgSnProduction.java new file mode 100644 index 0000000..a033add --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgSnProduction.java @@ -0,0 +1,130 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.utils.StringUtils; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--水泥-生产单元运行情况对象 b_stat_table_zxbg_sn_production + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--水泥-生产单元运行情况") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_sn_production") +public class BStatTableZxbgSnProduction extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "主要生产单元") + /** 主要生产单元 */ + @Excel(name = "主要生产单元") + private String mainProductionUnit; + + + @ApiModelProperty(value = "生产设施名称") + /** 生产设施名称 */ + @Excel(name = "生产设施名称") + private String productionFacilities; + + + @ApiModelProperty(value = "名称") + /** 名称 */ + @Excel(name = "名称") + private String name; + + + @ApiModelProperty(value = "数量") + /** 数量 */ + @Excel(name = "数量") + private String quantity; + + + @ApiModelProperty(value = "单位") + /** 单位 */ + @Excel(name = "单位") + private String unit; + + + @ApiModelProperty(value = "备注") + /** 备注 */ + @Excel(name = "备注") + private String remark; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("mainProductionUnit", getMainProductionUnit()) + .append("productionFacilities", getProductionFacilities()) + .append("name", getName()) + .append("quantity", getQuantity()) + .append("unit", getUnit()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgWaterEmission.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgWaterEmission.java new file mode 100644 index 0000000..17cad7f --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BStatTableZxbgWaterEmission.java @@ -0,0 +1,202 @@ +package cn.cecep.talroad.domain; + + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.Version; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--废水污染物排放浓度监测数据对象 b_stat_table_zxbg_water_emission + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--废水污染物排放浓度监测数据") +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("b_stat_table_zxbg_water_emission") +public class BStatTableZxbgWaterEmission extends BStatTableZxbgJbxxInfoFactoryBase +{ + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + @Excel(name = "执行报告类型") + private String zxbgType; + + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + @Excel(name = "报告周期") + private String zxbgPeriod; + + + @ApiModelProperty(value = "类型") + /** 类型 */ + private String zxbgPollutantType; + + @ApiModelProperty(value = "排放口编码") + /** 排放口编码 */ + @Excel(name = "排放口编码") + private String outletCode; + + + @ApiModelProperty(value = "污染物名称") + /** 污染物名称 */ + @Excel(name = "污染物名称") + private String pollutantName; + + + @ApiModelProperty(value = "监测设施") + /** 监测设施 */ + @Excel(name = "监测设施") + private String monitoringFacilities; + + + @ApiModelProperty(value = "设施名称") + /** 设施名称 */ + private String facilityName; + + + @ApiModelProperty(value = "许可排放浓度限值") + /** 许可排放浓度限值 */ + @Excel(name = "许可排放浓度限值") + private String emissionConcentration; + + + @ApiModelProperty(value = "有效监测数据(日)数量") + /** 有效监测数据(日)数量 */ + @Excel(name = "有效监测数据(日)数量") + private String effectivelyDay; + + + @ApiModelProperty(value = "检测结果（日均浓度）最小值mg/m3") + /** 检测结果（日均浓度）最小值mg/m3 */ + @Excel(name = "检测结果（日均浓度）最小值mg/m3") + private String detectionMinDay; + + + @ApiModelProperty(value = "检测结果（日均浓度）最大值mg/m3") + /** 检测结果（日均浓度）最大值mg/m3 */ + @Excel(name = "检测结果（日均浓度）最大值mg/m3") + private String detectionMaxDay; + + + @ApiModelProperty(value = "检测结果（日均浓度）平均值") + /** 检测结果（日均浓度）平均值 */ + @Excel(name = "检测结果（日均浓度）平均值") + private String detectionAvgDay; + + + @ApiModelProperty(value = "超标数据个数") + /** 超标数据个数 */ + @Excel(name = "超标数据个数") + private String exceededData; + + + @ApiModelProperty(value = "超标率（%）") + /** 超标率（%） */ + @Excel(name = "超标率（%）") + private String exceededRate; + + + @ApiModelProperty(value = "实际排放量（吨）") + /** 实际排放量（吨） */ + @Excel(name = "实际排放量（吨）") + private String actualEmissions; + + + @ApiModelProperty(value = "监测仪器名称或型号") + /** 监测仪器名称或型号 */ + @Excel(name = "监测仪器名称或型号") + private String instrumentName; + + + @ApiModelProperty(value = "手工监测采样方法及个数") + /** 手工监测采样方法及个数 */ + @Excel(name = "手工监测采样方法及个数") + private String samplingMethod; + + + @ApiModelProperty(value = "手工测定方法") + /** 手工测定方法 */ + @Excel(name = "手工测定方法") + private String manualMethod; + + @ApiModelProperty(value = "备注") + /** 备注 */ + @Excel(name = "备注") + private String remark; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + //0：月报，1：季报，2：年报 + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("0")){this.zxbgType = "月报";} + if(zxbgType.equals("1")){this.zxbgType = "季报";} + if(zxbgType.equals("2")){this.zxbgType = "年报";} + }else { + this.zxbgType = zxbgType; + } + } + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("factoryId", getFactoryId()) + .append("zxbgType", getZxbgType()) + .append("zxbgPeriod", getZxbgPeriod()) + .append("zxbgPollutantType", getZxbgPollutantType()) + .append("createTime", getCreateTime()) + .append("remark", getRemark()) + .append("outletCode", getOutletCode()) + .append("pollutantName", getPollutantName()) + .append("monitoringFacilities", getMonitoringFacilities()) + .append("facilityName", getFacilityName()) + .append("emissionConcentration", getEmissionConcentration()) + .append("effectivelyDay", getEffectivelyDay()) + .append("detectionMinDay", getDetectionMinDay()) + .append("detectionMaxDay", getDetectionMaxDay()) + .append("detectionAvgDay", getDetectionAvgDay()) + .append("exceededData", getExceededData()) + .append("exceededRate", getExceededRate()) + .append("actualEmissions", getActualEmissions()) + .append("instrumentName", getInstrumentName()) + .append("samplingMethod", getSamplingMethod()) + .append("manualMethod", getManualMethod()) + .toString(); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BasModelAnalyse.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BasModelAnalyse.java new file mode 100644 index 0000000..5888071 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/BasModelAnalyse.java @@ -0,0 +1,82 @@ +package cn.cecep.talroad.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@ApiModel(description="bas_model_analyse") +@Data +@TableName(value = "bas_model_analyse") +public class BasModelAnalyse implements Serializable { + public static final String COL_ID = "id"; + public static final String COL_MODEL_NAME = "model_name"; + public static final String COL_PARAM_NAME = "param_name"; + public static final String COL_PARAM_ABBR = "param_abbr"; + public static final String COL_VALUE = "value"; + public static final String COL_RECOMMEND_VALUE = "recommend_value"; + public static final String COL_REMARKS = "remarks"; + public static final String COL_DELETE_STATUS = "delete_status"; + public static final String COL_CREATE_TIME = "create_time"; + private static final long serialVersionUID = 1L; + /** + * 主键id + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value="主键id") + private Long id; + /** + * 模型名称 + */ + @TableField(value = "model_name") + @ApiModelProperty(value="模型名称") + private String modelName; + /** + * 参数名称 + */ + @TableField(value = "param_name") + @ApiModelProperty(value="参数名称") + private String paramName; + /** + * 参数缩写 + */ + @TableField(value = "param_abbr") + @ApiModelProperty(value="参数缩写") + private String paramAbbr; + /** + * 取值 + */ + @TableField(value = "\"value\"") + @ApiModelProperty(value="取值") + private Double value; + /** + * 推荐取值范围 + */ + @TableField(value = "recommend_value") + @ApiModelProperty(value="推荐取值范围") + private String recommendValue; + /** + * 备注说明 + */ + @TableField(value = "remarks") + @ApiModelProperty(value="备注说明") + private String remarks; + /** + * 删除状态:0--不删除，1--删除 + */ + @TableField(value = "delete_status") + @ApiModelProperty(value="删除状态:0--不删除，1--删除") + private String deleteStatus; + /** + * 创建时间 + */ + @TableField(value = "create_time") + @ApiModelProperty(value="创建时间") + private Date createTime; +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/PcLabelFactory.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/PcLabelFactory.java index a730734..8fa78cc 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/PcLabelFactory.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/PcLabelFactory.java @@ -3,6 +3,8 @@ package cn.cecep.talroad.domain; import cn.cecep.talroad.common.core.annotation.Excel; import cn.cecep.talroad.common.core.web.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -11,12 +13,12 @@ import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import javax.validation.constraints.NotBlank; + /** * 特征标签-与企业关系中间对象 pc_label_factory - * - * @author szhpt - * @date 2023-02-02*/ + */ @ApiModel(value = "特征标签-与企业关系中间") @Data @EqualsAndHashCode(callSuper = false) @@ -25,39 +27,27 @@ public class PcLabelFactory extends BaseEntity { private static final long serialVersionUID = 1L; - + @TableId(value = "id",type = IdType.INPUT) @ApiModelProperty(value = "主键id") - /** 主键id */ private String id; - @ApiModelProperty(value = "企业id") - /** 企业id */ @Excel(name = "企业id") + @NotBlank(message = "企业不可以为空") private String factoryId; @ApiModelProperty(value = "特征标签id") - /** 特征标签id */ @Excel(name = "特征标签id") + @NotBlank(message = "标签不可以为空") private String labelId; @ApiModelProperty(value = "是否是企业重点展示标签") - /** 特征标签id */ @Excel(name = "是否是企业重点展示标签") private String lableUseing; @ApiModelProperty(value = "标签值") + @NotBlank(message = "标签值不能为空") private String labelValue; - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("factoryId", getFactoryId()) - .append("labelId", getLabelId()) - .append("lableUseing", getLableUseing()) - .append("labelValue", getLabelValue()) - .toString(); - } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/PcRaProblemType.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/PcRaProblemType.java index 8c65349..89a6716 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/PcRaProblemType.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/PcRaProblemType.java @@ -54,4 +54,8 @@ public class PcRaProblemType extends BaseEntity { private String problemType; + private String topType; + + private String isStatus; + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/SRaActionReportsAudit.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/SRaActionReportsAudit.java index e87ea06..e07c594 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/SRaActionReportsAudit.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/SRaActionReportsAudit.java @@ -38,7 +38,7 @@ public class SRaActionReportsAudit extends BaseEntity @ApiModelProperty(value = "id") /** id */ - @TableId(value = "id",type = IdType.ASSIGN_UUID) + @TableId(value = "id",type = IdType.AUTO) private String id; diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/SRaPollManTypeChange.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/SRaPollManTypeChange.java new file mode 100644 index 0000000..d7d74c7 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/domain/analysis/SRaPollManTypeChange.java @@ -0,0 +1,93 @@ +package cn.cecep.talroad.domain.analysis; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 关联分析系统-证后监管辅助分析--排污许可管理级别变化统计 + */ +@ApiModel(description="关联分析系统-证后监管辅助分析--排污许可管理级别变化统计") +@Data +@TableName(value = "s_ra_poll_man_type_change") +public class SRaPollManTypeChange implements Serializable { + /** + * 主键 + */ + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value="主键") + private String id; + + /** + * 企业id + */ + @TableField(value = "factory_id") + @ApiModelProperty(value="企业id") + private String factoryId; + + /** + * 上次排污许可证发证日期 + */ + @TableField(value = "last_license_time") + @ApiModelProperty(value="上次排污许可证发证日期") + private Date lastLicenseTime; + + /** + * 上次排污许可证管理级别 + */ + @TableField(value = "last_license_man_type") + @ApiModelProperty(value="上次排污许可证管理级别") + private String lastLicenseManType; + + /** + * 本次排污许可证发证日期 + */ + @TableField(value = "now_license_time") + @ApiModelProperty(value="本次排污许可证发证日期") + private Date nowLicenseTime; + + /** + * 本次排污许可证管理级别 + */ + @TableField(value = "now_license_man_type") + @ApiModelProperty(value="本次排污许可证管理级别") + private String nowLicenseManType; + + /** + * 创建时间 + */ + @TableField(value = "create_time") + @ApiModelProperty(value="创建时间") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + @ApiModelProperty(value="更新时间") + private Date updateTime; + + private static final long serialVersionUID = 1L; + + public static final String COL_ID = "id"; + + public static final String COL_FACTORY_ID = "factory_id"; + + public static final String COL_LAST_LICENSE_TIME = "last_license_time"; + + public static final String COL_LAST_LICENSE_MAN_TYPE = "last_license_man_type"; + + public static final String COL_NOW_LICENSE_TIME = "now_license_time"; + + public static final String COL_NOW_LICENSE_MAN_TYPE = "now_license_man_type"; + + public static final String COL_CREATE_TIME = "create_time"; + + public static final String COL_UPDATE_TIME = "update_time"; +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/AmProblemFiMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/AmProblemFiMapper.java index 68a7938..448a9ef 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/AmProblemFiMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/AmProblemFiMapper.java @@ -1,6 +1,7 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.AmProblemFi; +import cn.cecep.talroad.domain.AmProblemFiVideo; import cn.cecep.talroad.vo.AmProblemFiVo; import cn.cecep.talroad.vo.analysis.FactoryOutletStaticsVo; import cn.cecep.talroad.vo.query.AmProblemFiQuery; @@ -32,7 +33,7 @@ public interface AmProblemFiMapper extends BaseMapper void insertAmProblemFis(List amProblemFis); - List> selectAmProblemFiVideo(String id); + List selectAmProblemFiVideo(String id); List getProblemByTypeAndTime(@Param("problemType") String problemType, @Param("dateStr") String dateStr, @Param("dateStrEnd") String dateStrEnd); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/AmProblemFiVideoMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/AmProblemFiVideoMapper.java new file mode 100644 index 0000000..d970500 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/AmProblemFiVideoMapper.java @@ -0,0 +1,10 @@ +package cn.cecep.talroad.mapper; + +import cn.cecep.talroad.domain.AmProblemFiVideo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AmProblemFiVideoMapper extends BaseMapper +{ +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainHazardousSolidWasteFaMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainHazardousSolidWasteFaMapper.java index d6a0f7c..8702941 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainHazardousSolidWasteFaMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainHazardousSolidWasteFaMapper.java @@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.BMainHazardousSolidWasteFa; import cn.cecep.talroad.vo.BMainHazardousSolidWasteFaVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -23,5 +24,5 @@ public interface BMainHazardousSolidWasteFaMapper extends BaseMapper selectBMainHazardousSolidWasteFaList(BMainHazardousSolidWasteFa bMainHazardousSolidWasteFa); - List selectListAndFactory(List strings); + List selectListAndFactory(BStatTablepPwxkWaterQuery strings); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainPollDisEnforcementMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainPollDisEnforcementMapper.java index 893f84c..1752293 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainPollDisEnforcementMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainPollDisEnforcementMapper.java @@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.BMainPollDisEnforcement; import cn.cecep.talroad.vo.BMainPollDisEnforcementVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -23,5 +24,5 @@ public interface BMainPollDisEnforcementMapper extends BaseMapper selectBMainPollDisEnforcementList(BMainPollDisEnforcement bMainPollDisEnforcement); - List selectListAndFactory(List strings); + List selectListAndFactory(BStatTablepPwxkWaterQuery strings); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainProductionOrganizGasMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainProductionOrganizGasMapper.java index 28d8511..db5d070 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainProductionOrganizGasMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainProductionOrganizGasMapper.java @@ -2,8 +2,11 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.data.analyse.task.entity.MainProductDeviceVo; import cn.cecep.talroad.domain.BMainProductionOrganizGas; +import cn.cecep.talroad.vo.BMainProductionOrganizGasVo; +import cn.cecep.talroad.vo.query.BMainProductionOrganizGasQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -24,4 +27,6 @@ public interface BMainProductionOrganizGasMapper extends BaseMapper selectBMainProductionOrganizGasList(BMainProductionOrganizGas bMainProductionOrganizGas); List selectDeviceIdByPollutantType(String code); + + List selectPwxkList(@Param("factoryIds") List factoryIds, @Param("query") BMainProductionOrganizGasQuery.PwxkCzp query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainProductionWaterMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainProductionWaterMapper.java index 4d68c42..b9a1d46 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainProductionWaterMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BMainProductionWaterMapper.java @@ -1,8 +1,11 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.BMainProductionWater; +import cn.cecep.talroad.vo.BMainProductionWaterVo; +import cn.cecep.talroad.vo.query.BMainProductionWaterQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -22,4 +25,5 @@ public interface BMainProductionWaterMapper extends BaseMapper selectBMainProductionWaterList(BMainProductionWater bMainProductionWater); + List selectPwxkList(@Param("factoryIds") List factoryIds, @Param("query") BMainProductionWaterQuery.PwxkCzp query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkBoilerFuelGasMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkBoilerFuelGasMapper.java new file mode 100644 index 0000000..414614e --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkBoilerFuelGasMapper.java @@ -0,0 +1,21 @@ +package cn.cecep.talroad.mapper; + +import cn.cecep.talroad.domain.BStatTablePwxkBoilerFuelGas; +import cn.cecep.talroad.vo.BStatTablePwxkBoilerFuelGasVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BStatTablePwxkBoilerFuelGasMapper extends BaseMapper { + int updateBatch(List list); + + int updateBatchSelective(List list); + + int batchInsert(@Param("list") List list); + + List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkBoilerFuelSolidLiquidMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkBoilerFuelSolidLiquidMapper.java new file mode 100644 index 0000000..c5faebb --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkBoilerFuelSolidLiquidMapper.java @@ -0,0 +1,22 @@ +package cn.cecep.talroad.mapper; + +import cn.cecep.talroad.domain.BStatTablePwxkBoilerFuelSolidLiquid; +import cn.cecep.talroad.vo.BStatTablePwxkBoilerFuelSolidLiquidVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface BStatTablePwxkBoilerFuelSolidLiquidMapper extends BaseMapper { + int updateBatch(List list); + + int updateBatchSelective(List list); + + int batchInsert(@Param("list") List list); + + List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkFuelMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkFuelMapper.java new file mode 100644 index 0000000..0f0c21d --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkFuelMapper.java @@ -0,0 +1,21 @@ +package cn.cecep.talroad.mapper; + +import cn.cecep.talroad.domain.BStatTablePwxkFuel; +import cn.cecep.talroad.vo.BStatTablePwxkFuelVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BStatTablePwxkFuelMapper extends BaseMapper { + int updateBatch(List list); + + int updateBatchSelective(List list); + + int batchInsert(@Param("list") List list); + + List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkProductionFacilitiesMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkProductionFacilitiesMapper.java index 78e2985..835cb5b 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkProductionFacilitiesMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkProductionFacilitiesMapper.java @@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.BStatTablePwxkProductionFacilities; import cn.cecep.talroad.vo.BStatTablePwxkProductionFacilitiesVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,5 +17,5 @@ public interface BStatTablePwxkProductionFacilitiesMapper extends BaseMapper list); - List selectListAndFactory(List strings); + List selectListAndFactory(BStatTablepPwxkWaterQuery strings); } \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkProductsMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkProductsMapper.java index d120a4e..871f256 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkProductsMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkProductsMapper.java @@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.BStatTablePwxkProducts; import cn.cecep.talroad.vo.BStatTablePwxkProductsVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,5 +17,5 @@ public interface BStatTablePwxkProductsMapper extends BaseMapper list); - List selectListAndFactory(List strings); + List selectListAndFactory(BStatTablepPwxkWaterQuery strings); } \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkRawMaterialMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkRawMaterialMapper.java new file mode 100644 index 0000000..099454a --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkRawMaterialMapper.java @@ -0,0 +1,21 @@ +package cn.cecep.talroad.mapper; + +import cn.cecep.talroad.domain.BStatTablePwxkRawMaterial; +import cn.cecep.talroad.vo.BStatTablePwxkRawMaterialVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BStatTablePwxkRawMaterialMapper extends BaseMapper { + int updateBatch(List list); + + int updateBatchSelective(List list); + + int batchInsert(@Param("list") List list); + + List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterIndustryInMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterIndustryInMapper.java index 1b91e60..de59a20 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterIndustryInMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterIndustryInMapper.java @@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.BStatTablePwxkWaterIndustryIn; import cn.cecep.talroad.vo.BStatTablePwxkWaterIndustryInVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,5 +17,5 @@ public interface BStatTablePwxkWaterIndustryInMapper extends BaseMapper list); - List selectListAndFactory(List strings); + List selectListAndFactory(BStatTablepPwxkWaterQuery strings); } \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterIndustryInTotalMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterIndustryInTotalMapper.java index 144faba..a975156 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterIndustryInTotalMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterIndustryInTotalMapper.java @@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.BStatTablePwxkWaterIndustryInTotal; import cn.cecep.talroad.vo.BStatTablePwxkWaterIndustryInTotalVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,5 +17,5 @@ public interface BStatTablePwxkWaterIndustryInTotalMapper extends BaseMapper list); - List selectListAndFactory(List strings); + List selectListAndFactory(BStatTablepPwxkWaterQuery strings); } \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterLifeInMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterLifeInMapper.java index 8c72af6..6c5dde8 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterLifeInMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterLifeInMapper.java @@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.BStatTablePwxkWaterLifeIn; import cn.cecep.talroad.vo.BStatTablePwxkWaterLifeInVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,5 +17,5 @@ public interface BStatTablePwxkWaterLifeInMapper extends BaseMapper list); - List selectListAndFactory(List strings); + List selectListAndFactory(BStatTablepPwxkWaterQuery strings); } \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterTreatmentInAskMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterTreatmentInAskMapper.java index 6b501dd..dd8fae1 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterTreatmentInAskMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterTreatmentInAskMapper.java @@ -2,13 +2,13 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.BStatTablePwxkWaterTreatmentInAsk; import cn.cecep.talroad.vo.BStatTablePwxkWaterTreatmentInAskVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import java.util.List; - import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface BStatTablePwxkWaterTreatmentInAskMapper extends BaseMapper { int updateBatch(List list); @@ -17,5 +17,5 @@ public interface BStatTablePwxkWaterTreatmentInAskMapper extends BaseMapper list); - List selectListAndFactory(List strings); + List selectListAndFactory(BStatTablepPwxkWaterQuery strings); } \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterTreatmentLineMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterTreatmentLineMapper.java index 948c0e9..96d1564 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterTreatmentLineMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTablePwxkWaterTreatmentLineMapper.java @@ -2,6 +2,7 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.BStatTablePwxkWaterTreatmentLine; import cn.cecep.talroad.vo.BStatTablePwxkWaterTreatmentLineVo; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,5 +17,5 @@ public interface BStatTablePwxkWaterTreatmentLineMapper extends BaseMapper list); - List selectListAndFactory(List factoryIds); + List selectListAndFactory(BStatTablepPwxkWaterQuery query); } \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionMapper.java new file mode 100644 index 0000000..edb1329 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmission; + +/** + * 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgGasEmissionMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--有组织废气污染物排放浓度监测数据列表 + * + * @param bStatTableZxbgGasEmission 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据 + * @return 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据集合 + */ + public List selectBStatTableZxbgGasEmissionList(BStatTableZxbgGasEmission bStatTableZxbgGasEmission); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionSpeedMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionSpeedMapper.java new file mode 100644 index 0000000..14135f2 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionSpeedMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionSpeed; + +/** + * 固定源产排治--执行报告--有组织废气污染物排放速率监测Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgGasEmissionSpeedMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--有组织废气污染物排放速率监测列表 + * + * @param bStatTableZxbgGasEmissionSpeed 固定源产排治--执行报告--有组织废气污染物排放速率监测 + * @return 固定源产排治--执行报告--有组织废气污染物排放速率监测集合 + */ + public List selectBStatTableZxbgGasEmissionSpeedList(BStatTableZxbgGasEmissionSpeed bStatTableZxbgGasEmissionSpeed); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionStatisticsMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionStatisticsMapper.java new file mode 100644 index 0000000..29324c9 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGasEmissionStatisticsMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionStatistics; + +/** + * 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgGasEmissionStatisticsMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计列表 + * + * @param bStatTableZxbgGasEmissionStatistics 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计 + * @return 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计集合 + */ + public List selectBStatTableZxbgGasEmissionStatisticsList(BStatTableZxbgGasEmissionStatistics bStatTableZxbgGasEmissionStatistics); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGtFuelMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGtFuelMapper.java new file mode 100644 index 0000000..9ffa8c9 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGtFuelMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgGtFuel; + +/** + * 固定源产排治--执行报告--钢铁-燃料分析Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgGtFuelMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--钢铁-燃料分析列表 + * + * @param bStatTableZxbgGtFuel 固定源产排治--执行报告--钢铁-燃料分析 + * @return 固定源产排治--执行报告--钢铁-燃料分析集合 + */ + public List selectBStatTableZxbgGtFuelList(BStatTableZxbgGtFuel bStatTableZxbgGtFuel); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGtProductionMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGtProductionMapper.java new file mode 100644 index 0000000..f63d0b8 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgGtProductionMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgGtProduction; + +/** + * 固定源产排治--执行报告--钢铁-生产单元运行情况Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgGtProductionMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--钢铁-生产单元运行情况列表 + * + * @param bStatTableZxbgGtProduction 固定源产排治--执行报告--钢铁-生产单元运行情况 + * @return 固定源产排治--执行报告--钢铁-生产单元运行情况集合 + */ + public List selectBStatTableZxbgGtProductionList(BStatTableZxbgGtProduction bStatTableZxbgGtProduction); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdFuelAnalysisMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdFuelAnalysisMapper.java new file mode 100644 index 0000000..c1cf702 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdFuelAnalysisMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdFuelAnalysis; + +/** + * 固定源产排治--执行报告--火电燃料分析Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgHdFuelAnalysisMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--火电燃料分析列表 + * + * @param bStatTableZxbgHdFuelAnalysis 固定源产排治--执行报告--火电燃料分析 + * @return 固定源产排治--执行报告--火电燃料分析集合 + */ + public List selectBStatTableZxbgHdFuelAnalysisList(BStatTableZxbgHdFuelAnalysis bStatTableZxbgHdFuelAnalysis); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGasPollutionMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGasPollutionMapper.java new file mode 100644 index 0000000..02a6e10 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGasPollutionMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGasPollution; + +/** + * 固定源产排治--执行报告--火电废气污染治理设施正常情况Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgHdGasPollutionMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--火电废气污染治理设施正常情况列表 + * + * @param bStatTableZxbgHdGasPollution 固定源产排治--执行报告--火电废气污染治理设施正常情况 + * @return 固定源产排治--执行报告--火电废气污染治理设施正常情况集合 + */ + public List selectBStatTableZxbgHdGasPollutionList(BStatTableZxbgHdGasPollution bStatTableZxbgHdGasPollution); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtBasicMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtBasicMapper.java new file mode 100644 index 0000000..e1e92c8 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtBasicMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtBasic; + +/** + * 固定源产排治--执行报告--火电、钢铁基本信息Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgHdGtBasicMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--火电、钢铁基本信息列表 + * + * @param bStatTableZxbgHdGtBasic 固定源产排治--执行报告--火电、钢铁基本信息 + * @return 固定源产排治--执行报告--火电、钢铁基本信息集合 + */ + public List selectBStatTableZxbgHdGtBasicList(BStatTableZxbgHdGtBasic bStatTableZxbgHdGtBasic); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtFuelMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtFuelMapper.java new file mode 100644 index 0000000..f459035 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtFuelMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtFuel; + +/** + * 固定源产排治--执行报告--火电、钢铁燃料信息Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgHdGtFuelMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--火电、钢铁燃料信息列表 + * + * @param bStatTableZxbgHdGtFuel 固定源产排治--执行报告--火电、钢铁燃料信息 + * @return 固定源产排治--执行报告--火电、钢铁燃料信息集合 + */ + public List selectBStatTableZxbgHdGtFuelList(BStatTableZxbgHdGtFuel bStatTableZxbgHdGtFuel); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtInvestmentMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtInvestmentMapper.java new file mode 100644 index 0000000..c571aba --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdGtInvestmentMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtInvestment; + +/** + * 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgHdGtInvestmentMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况列表 + * + * @param bStatTableZxbgHdGtInvestment 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况 + * @return 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况集合 + */ + public List selectBStatTableZxbgHdGtInvestmentList(BStatTableZxbgHdGtInvestment bStatTableZxbgHdGtInvestment); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdWaterPollutionMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdWaterPollutionMapper.java new file mode 100644 index 0000000..4142a81 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgHdWaterPollutionMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdWaterPollution; + +/** + * 固定源产排治--执行报告--火电废水污染治理设施正常情况Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgHdWaterPollutionMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--火电废水污染治理设施正常情况列表 + * + * @param bStatTableZxbgHdWaterPollution 固定源产排治--执行报告--火电废水污染治理设施正常情况 + * @return 固定源产排治--执行报告--火电废水污染治理设施正常情况集合 + */ + public List selectBStatTableZxbgHdWaterPollutionList(BStatTableZxbgHdWaterPollution bStatTableZxbgHdWaterPollution); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgJbxxInfoMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgJbxxInfoMapper.java index 6d2bba2..bd31627 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgJbxxInfoMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgJbxxInfoMapper.java @@ -27,6 +27,7 @@ public interface BStatTableZxbgJbxxInfoMapper extends BaseMapper selectListAndFactory(BStatTablepPwxkWaterQuery query); + Integer selectCountByPeriodAndPeriod(@Param("type") String type, @Param("period") String period, @Param("records") List records); List selectByPeriodAndPeriod(@Param("type") String type, @Param("period") String period, diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgSnFuelMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgSnFuelMapper.java new file mode 100644 index 0000000..6c7f53f --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgSnFuelMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgSnFuel; + +/** + * 固定源产排治--执行报告--水泥燃料分析Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgSnFuelMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--水泥燃料分析列表 + * + * @param bStatTableZxbgSnFuel 固定源产排治--执行报告--水泥燃料分析 + * @return 固定源产排治--执行报告--水泥燃料分析集合 + */ + public List selectBStatTableZxbgSnFuelList(BStatTableZxbgSnFuel bStatTableZxbgSnFuel); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgSnProductionMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgSnProductionMapper.java new file mode 100644 index 0000000..eecb1db --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgSnProductionMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgSnProduction; + +/** + * 固定源产排治--执行报告--水泥-生产单元运行情况Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgSnProductionMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--水泥-生产单元运行情况列表 + * + * @param bStatTableZxbgSnProduction 固定源产排治--执行报告--水泥-生产单元运行情况 + * @return 固定源产排治--执行报告--水泥-生产单元运行情况集合 + */ + public List selectBStatTableZxbgSnProductionList(BStatTableZxbgSnProduction bStatTableZxbgSnProduction); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgWaterEmissionMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgWaterEmissionMapper.java new file mode 100644 index 0000000..b9e6a27 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BStatTableZxbgWaterEmissionMapper.java @@ -0,0 +1,27 @@ +package cn.cecep.talroad.mapper; + +import java.util.List; + +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import cn.cecep.talroad.domain.BStatTableZxbgWaterEmission; + +/** + * 固定源产排治--执行报告--废水污染物排放浓度监测数据Mapper接口 + * + * @author szhpt + * @date 2023-08-01*/ +@Mapper +public interface BStatTableZxbgWaterEmissionMapper extends BaseMapper +{ + /** + * 查询固定源产排治--执行报告--废水污染物排放浓度监测数据列表 + * + * @param bStatTableZxbgWaterEmission 固定源产排治--执行报告--废水污染物排放浓度监测数据 + * @return 固定源产排治--执行报告--废水污染物排放浓度监测数据集合 + */ + public List selectBStatTableZxbgWaterEmissionList(BStatTableZxbgWaterEmission bStatTableZxbgWaterEmission); + + public List selectListAndFactory(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BasModelAnalyseMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BasModelAnalyseMapper.java new file mode 100644 index 0000000..9be8b04 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/BasModelAnalyseMapper.java @@ -0,0 +1,16 @@ +package cn.cecep.talroad.mapper; + +import cn.cecep.talroad.domain.BasModelAnalyse; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface BasModelAnalyseMapper extends BaseMapper { + int updateBatch(List list); + + int updateBatchSelective(List list); + + int batchInsert(@Param("list") List list); +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcControlRequirementsMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcControlRequirementsMapper.java index feca697..dead6be 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcControlRequirementsMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcControlRequirementsMapper.java @@ -2,8 +2,10 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.PcControlRequirements; import cn.cecep.talroad.vo.PcControlRequirementsVo; +import cn.cecep.talroad.vo.query.PcControlRequirementsQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,4 +30,12 @@ public interface PcControlRequirementsMapper extends BaseMapper selectLabelOnlineRequirements(); List selectLabelOnlineOutPoll(); + + List selectPwxkGasOrg(@Param("factoryIds") List factoryIds, @Param("query") PcControlRequirementsQuery.PwxkGasOrg query); + + List selectPwxkGasNoOrg(@Param("factoryIds") List factoryIds, @Param("query") PcControlRequirementsQuery.PwxkGasNoOrg query); + + List selectPwxkWaterDirect(@Param("factoryIds") List factoryIds, @Param("query") PcControlRequirementsQuery.PwxkWaterDirect query); + + List selectPwxkWaterIndirect(@Param("factoryIds") List factoryIds, @Param("query") PcControlRequirementsQuery.PwxkWaterIndirect query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcLabelFactoryMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcLabelFactoryMapper.java index 4e6d7a4..3c8557e 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcLabelFactoryMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcLabelFactoryMapper.java @@ -2,11 +2,16 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.EarlyWarning; import cn.cecep.talroad.domain.PcLabelFactory; +import cn.cecep.talroad.domain.PcLabelValue; import cn.cecep.talroad.domain.SEnvGasMonReal; import cn.cecep.talroad.vo.FactoryLicenseVo; +import cn.cecep.talroad.vo.PcLabelFactoryVo; import cn.cecep.talroad.vo.WarningEnvGasMonRealVo; +import cn.cecep.talroad.vo.query.PcLabelFactoryQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.Date; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -91,4 +96,8 @@ public interface PcLabelFactoryMapper extends BaseMapper "GROUP BY f.\"id\",o.factory_id " + "ORDER BY f.\"id\"") List isWzzcbpfExceptionInMonthLabel(@Param("startTime")Date startTime); + + Long selectCountByLableValue(PcLabelValue lableVale); + + List selectFactoryLabelList(@Param("voPage") Page voPage, @Param("query") PcLabelFactoryQuery query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcOutletMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcOutletMapper.java index a08deba..f6b98fb 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcOutletMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/PcOutletMapper.java @@ -1,26 +1,24 @@ package cn.cecep.talroad.mapper; -import cn.cecep.talroad.domain.PcFactoryAccessControl; import cn.cecep.talroad.domain.PcOutlet; import cn.cecep.talroad.domain.analysis.SRaOverWaterPollutionTraceability; import cn.cecep.talroad.domain.analysis.SRaWaterPermittedOnline; -import cn.cecep.talroad.vo.EmissionsStatVo; -import cn.cecep.talroad.vo.GasPEMonitoringPointVO; -import cn.cecep.talroad.vo.MapPointVo; -import cn.cecep.talroad.vo.PcOutletGasVO; +import cn.cecep.talroad.vo.*; import cn.cecep.talroad.vo.analysis.SRaRealTimeAnalysicComsitMonitorVo; import cn.cecep.talroad.vo.query.GasPEMonitoringPointQuery; import cn.cecep.talroad.vo.query.PcOutletGasQuery; +import cn.cecep.talroad.vo.query.PcOutletQuery; import cn.cecep.talroad.vo.query.analysis.SRaOverWaterPollutionTraceabilityQuery; import cn.cecep.talroad.vo.query.analysis.SRaWaterPermittedOnlineQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import java.util.HashMap; -import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; +import java.util.List; + /** * 废气有组织、无组织排口Mapper接口 * @@ -91,4 +89,9 @@ public interface PcOutletMapper extends BaseMapper int updateBatchCoordinate(List pcOutletList); + List selectPwxkList(@Param("factoryIds") List factoryIds, @Param("query") PcOutletQuery.PwxkGas query); + + List selectPwxkWaterDirect(@Param("factoryIds") List factoryIds, @Param("query") PcOutletQuery.PwxkWaterDirect query); + + List selectPwxkWaterIndirect(@Param("factoryIds") List factoryIds, @Param("query") PcOutletQuery.PwxkWaterIndirect query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/SupermonitorDrainOutletMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/SupermonitorDrainOutletMapper.java index 0f29b3e..06be8a1 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/SupermonitorDrainOutletMapper.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/SupermonitorDrainOutletMapper.java @@ -1,8 +1,11 @@ package cn.cecep.talroad.mapper; import cn.cecep.talroad.domain.SupermonitorDrainOutlet; +import cn.cecep.talroad.vo.SupermonitorDrainOutletVo; +import cn.cecep.talroad.vo.query.SupermonitorDrainOutletQuery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,6 +23,9 @@ public interface SupermonitorDrainOutletMapper extends BaseMapper selectSupermonitorDrainOutletList(SupermonitorDrainOutlet supermonitorDrainOutlet); + List selectSupermonitorDrainOutletList(SupermonitorDrainOutlet supermonitorDrainOutlet); + List selectRhPwxkList(@Param("factoryIds") List factoryIds, @Param("query") SupermonitorDrainOutletQuery.PwxkRh query); + + List selectYsPwxkList(@Param("factoryIds") List factoryIds, @Param("query") SupermonitorDrainOutletQuery.PwxkYs query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/analysis/SRaPollManTypeChangeMapper.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/analysis/SRaPollManTypeChangeMapper.java new file mode 100644 index 0000000..1b65e60 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/mapper/analysis/SRaPollManTypeChangeMapper.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.mapper.analysis; + +import cn.cecep.talroad.domain.analysis.SRaPollManTypeChange; +import cn.cecep.talroad.vo.analysis.SRaPollManTypeChangeVo; +import cn.cecep.talroad.vo.query.analysis.SRaPollManTypeChangeQuery; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SRaPollManTypeChangeMapper extends BaseMapper { + int updateBatch(List list); + + int updateBatchSelective(List list); + + int batchInsert(@Param("list") List list); + + IPage selectListInfo(Page page, @Param("query") SRaPollManTypeChangeQuery query); + + List selectIndustryPermissionNameList(SRaPollManTypeChangeQuery query); + +} \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/BStatTablePwxkWaterAndOtherService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/BStatTablePwxkWaterAndOtherService.java index 2323751..cbc6ed2 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/BStatTablePwxkWaterAndOtherService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/BStatTablePwxkWaterAndOtherService.java @@ -36,4 +36,12 @@ public interface BStatTablePwxkWaterAndOtherService { AjaxResults saveQueryContent(@Param("query") BStatTableQueryInfo query); AjaxResults> selectProductionFacilities(BStatTablepPwxkWaterQuery query); + + AjaxResults> selectBoilerFuelGas(BStatTablepPwxkWaterQuery query); + + AjaxResults> selectBoilerFuelSolidLiquid(BStatTablepPwxkWaterQuery query); + + AjaxResults> selectFuel(BStatTablepPwxkWaterQuery query); + + AjaxResults> selectMaterial(BStatTablepPwxkWaterQuery query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IAmProblemFiService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IAmProblemFiService.java index 920f320..283feb0 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IAmProblemFiService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IAmProblemFiService.java @@ -53,7 +53,7 @@ public interface IAmProblemFiService extends IService Object addCause(AmProblemFi param); - List> getAListOfAlerts(); + List> getAListOfAlerts(String type,String topType); List selectStatisDataByMonth(Date startTime, Date endTime); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBMainProductionOrganizGasService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBMainProductionOrganizGasService.java index 6364749..227759c 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBMainProductionOrganizGasService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBMainProductionOrganizGasService.java @@ -1,6 +1,9 @@ package cn.cecep.talroad.service; import cn.cecep.talroad.domain.BMainProductionOrganizGas; +import cn.cecep.talroad.vo.BMainProductionOrganizGasVo; +import cn.cecep.talroad.vo.query.BMainProductionOrganizGasQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -21,4 +24,6 @@ public interface IBMainProductionOrganizGasService extends IService selectBMainProductionOrganizGasList(BMainProductionOrganizGas bMainProductionOrganizGas); IProductionManageService.FrameDataVo getFrameData(String id, String startTime, String endTime, Long pageNum, Long pageSize); + + List selectPwxkList(Page page, BMainProductionOrganizGasQuery.PwxkCzp query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBMainProductionWaterService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBMainProductionWaterService.java index f86be62..e7d6bec 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBMainProductionWaterService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBMainProductionWaterService.java @@ -1,6 +1,9 @@ package cn.cecep.talroad.service; import cn.cecep.talroad.domain.BMainProductionWater; +import cn.cecep.talroad.vo.BMainProductionWaterVo; +import cn.cecep.talroad.vo.query.BMainProductionWaterQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -21,4 +24,6 @@ public interface IBMainProductionWaterService extends IService selectBMainProductionWaterList(BMainProductionWater bMainProductionWater); IProductionManageService.FrameDataVo getFrameData(String id, String startTime, String endTime, Long pageNum, Long pageSize); + + List selectPwxkList(Page page, BMainProductionWaterQuery.PwxkCzp query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionService.java new file mode 100644 index 0000000..ef0ade6 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmission; + +/** + * 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgGasEmissionService extends IService +{ + /** + * 查询固定源产排治--执行报告--有组织废气污染物排放浓度监测数据列表 + * + * @param bStatTableZxbgGasEmission 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据 + * @return 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据集合 + */ + public List selectBStatTableZxbgGasEmissionList(BStatTableZxbgGasEmission bStatTableZxbgGasEmission); + + AjaxResults> selectBStatTableZxbgGasEmissionListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionSpeedService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionSpeedService.java new file mode 100644 index 0000000..58d6c43 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionSpeedService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionSpeed; + +/** + * 固定源产排治--执行报告--有组织废气污染物排放速率监测Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgGasEmissionSpeedService extends IService +{ + /** + * 查询固定源产排治--执行报告--有组织废气污染物排放速率监测列表 + * + * @param bStatTableZxbgGasEmissionSpeed 固定源产排治--执行报告--有组织废气污染物排放速率监测 + * @return 固定源产排治--执行报告--有组织废气污染物排放速率监测集合 + */ + public List selectBStatTableZxbgGasEmissionSpeedList(BStatTableZxbgGasEmissionSpeed bStatTableZxbgGasEmissionSpeed); + + AjaxResults> selectBStatTableZxbgGasEmissionSpeedListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionStatisticsService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionStatisticsService.java new file mode 100644 index 0000000..582c292 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGasEmissionStatisticsService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionStatistics; + +/** + * 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgGasEmissionStatisticsService extends IService +{ + /** + * 查询固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计列表 + * + * @param bStatTableZxbgGasEmissionStatistics 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计 + * @return 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计集合 + */ + public List selectBStatTableZxbgGasEmissionStatisticsList(BStatTableZxbgGasEmissionStatistics bStatTableZxbgGasEmissionStatistics); + + AjaxResults> selectBStatTableZxbgGasEmissionStatisticsListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGtFuelService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGtFuelService.java new file mode 100644 index 0000000..1405127 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGtFuelService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgGtFuel; + +/** + * 固定源产排治--执行报告--钢铁-燃料分析Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgGtFuelService extends IService +{ + /** + * 查询固定源产排治--执行报告--钢铁-燃料分析列表 + * + * @param bStatTableZxbgGtFuel 固定源产排治--执行报告--钢铁-燃料分析 + * @return 固定源产排治--执行报告--钢铁-燃料分析集合 + */ + public List selectBStatTableZxbgGtFuelList(BStatTableZxbgGtFuel bStatTableZxbgGtFuel); + + AjaxResults> selectBStatTableZxbgGtFuelListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGtProductionService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGtProductionService.java new file mode 100644 index 0000000..a705a48 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgGtProductionService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgGtProduction; + +/** + * 固定源产排治--执行报告--钢铁-生产单元运行情况Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgGtProductionService extends IService +{ + /** + * 查询固定源产排治--执行报告--钢铁-生产单元运行情况列表 + * + * @param bStatTableZxbgGtProduction 固定源产排治--执行报告--钢铁-生产单元运行情况 + * @return 固定源产排治--执行报告--钢铁-生产单元运行情况集合 + */ + public List selectBStatTableZxbgGtProductionList(BStatTableZxbgGtProduction bStatTableZxbgGtProduction); + + AjaxResults> selectBStatTableZxbgGtProductionListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdFuelAnalysisService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdFuelAnalysisService.java new file mode 100644 index 0000000..6b1dca1 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdFuelAnalysisService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgHdFuelAnalysis; + +/** + * 固定源产排治--执行报告--火电燃料分析Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgHdFuelAnalysisService extends IService +{ + /** + * 查询固定源产排治--执行报告--火电燃料分析列表 + * + * @param bStatTableZxbgHdFuelAnalysis 固定源产排治--执行报告--火电燃料分析 + * @return 固定源产排治--执行报告--火电燃料分析集合 + */ + public List selectBStatTableZxbgHdFuelAnalysisList(BStatTableZxbgHdFuelAnalysis bStatTableZxbgHdFuelAnalysis); + + AjaxResults> selectBStatTableZxbgHdFuelAnalysisListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGasPollutionService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGasPollutionService.java new file mode 100644 index 0000000..74bec5f --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGasPollutionService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgHdGasPollution; + +/** + * 固定源产排治--执行报告--火电废气污染治理设施正常情况Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgHdGasPollutionService extends IService +{ + /** + * 查询固定源产排治--执行报告--火电废气污染治理设施正常情况列表 + * + * @param bStatTableZxbgHdGasPollution 固定源产排治--执行报告--火电废气污染治理设施正常情况 + * @return 固定源产排治--执行报告--火电废气污染治理设施正常情况集合 + */ + public List selectBStatTableZxbgHdGasPollutionList(BStatTableZxbgHdGasPollution bStatTableZxbgHdGasPollution); + + AjaxResults> selectBStatTableZxbgHdGasPollutionListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtBasicService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtBasicService.java new file mode 100644 index 0000000..f324a4e --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtBasicService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtBasic; + +/** + * 固定源产排治--执行报告--火电、钢铁基本信息Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgHdGtBasicService extends IService +{ + /** + * 查询固定源产排治--执行报告--火电、钢铁基本信息列表 + * + * @param bStatTableZxbgHdGtBasic 固定源产排治--执行报告--火电、钢铁基本信息 + * @return 固定源产排治--执行报告--火电、钢铁基本信息集合 + */ + public List selectBStatTableZxbgHdGtBasicList(BStatTableZxbgHdGtBasic bStatTableZxbgHdGtBasic); + + AjaxResults> selectBStatTableZxbgHdGtBasicListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtFuelService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtFuelService.java new file mode 100644 index 0000000..65762ac --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtFuelService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtFuel; + +/** + * 固定源产排治--执行报告--火电、钢铁燃料信息Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgHdGtFuelService extends IService +{ + /** + * 查询固定源产排治--执行报告--火电、钢铁燃料信息列表 + * + * @param bStatTableZxbgHdGtFuel 固定源产排治--执行报告--火电、钢铁燃料信息 + * @return 固定源产排治--执行报告--火电、钢铁燃料信息集合 + */ + public List selectBStatTableZxbgHdGtFuelList(BStatTableZxbgHdGtFuel bStatTableZxbgHdGtFuel); + + AjaxResults> selectBStatTableZxbgHdGtFuelListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtInvestmentService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtInvestmentService.java new file mode 100644 index 0000000..cccd97c --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdGtInvestmentService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtInvestment; + +/** + * 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgHdGtInvestmentService extends IService +{ + /** + * 查询固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况列表 + * + * @param bStatTableZxbgHdGtInvestment 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况 + * @return 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况集合 + */ + public List selectBStatTableZxbgHdGtInvestmentList(BStatTableZxbgHdGtInvestment bStatTableZxbgHdGtInvestment); + + AjaxResults> selectBStatTableZxbgHdGtInvestmentListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdWaterPollutionService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdWaterPollutionService.java new file mode 100644 index 0000000..f16d078 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgHdWaterPollutionService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgHdWaterPollution; + +/** + * 固定源产排治--执行报告--火电废水污染治理设施正常情况Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgHdWaterPollutionService extends IService +{ + /** + * 查询固定源产排治--执行报告--火电废水污染治理设施正常情况列表 + * + * @param bStatTableZxbgHdWaterPollution 固定源产排治--执行报告--火电废水污染治理设施正常情况 + * @return 固定源产排治--执行报告--火电废水污染治理设施正常情况集合 + */ + public List selectBStatTableZxbgHdWaterPollutionList(BStatTableZxbgHdWaterPollution bStatTableZxbgHdWaterPollution); + + AjaxResults> selectBStatTableZxbgHdWaterPollutionListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgSnFuelService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgSnFuelService.java new file mode 100644 index 0000000..21154ca --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgSnFuelService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgSnFuel; + +/** + * 固定源产排治--执行报告--水泥燃料分析Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgSnFuelService extends IService +{ + /** + * 查询固定源产排治--执行报告--水泥燃料分析列表 + * + * @param bStatTableZxbgSnFuel 固定源产排治--执行报告--水泥燃料分析 + * @return 固定源产排治--执行报告--水泥燃料分析集合 + */ + public List selectBStatTableZxbgSnFuelList(BStatTableZxbgSnFuel bStatTableZxbgSnFuel); + + AjaxResults> selectBStatTableZxbgSnFuelListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgSnProductionService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgSnProductionService.java new file mode 100644 index 0000000..9e42b8c --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgSnProductionService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgSnProduction; + +/** + * 固定源产排治--执行报告--水泥-生产单元运行情况Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgSnProductionService extends IService +{ + /** + * 查询固定源产排治--执行报告--水泥-生产单元运行情况列表 + * + * @param bStatTableZxbgSnProduction 固定源产排治--执行报告--水泥-生产单元运行情况 + * @return 固定源产排治--执行报告--水泥-生产单元运行情况集合 + */ + public List selectBStatTableZxbgSnProductionList(BStatTableZxbgSnProduction bStatTableZxbgSnProduction); + + AjaxResults> selectBStatTableZxbgSnProductionListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgWaterEmissionService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgWaterEmissionService.java new file mode 100644 index 0000000..f8e230d --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IBStatTableZxbgWaterEmissionService.java @@ -0,0 +1,26 @@ +package cn.cecep.talroad.service; +import java.util.List; + +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import cn.cecep.talroad.domain.BStatTableZxbgWaterEmission; + +/** + * 固定源产排治--执行报告--废水污染物排放浓度监测数据Service接口 + * + * @author szhpt + * @date 2023-08-01*/ +public interface IBStatTableZxbgWaterEmissionService extends IService +{ + /** + * 查询固定源产排治--执行报告--废水污染物排放浓度监测数据列表 + * + * @param bStatTableZxbgWaterEmission 固定源产排治--执行报告--废水污染物排放浓度监测数据 + * @return 固定源产排治--执行报告--废水污染物排放浓度监测数据集合 + */ + public List selectBStatTableZxbgWaterEmissionList(BStatTableZxbgWaterEmission bStatTableZxbgWaterEmission); + + AjaxResults> selectBStatTableZxbgWaterEmissionListBy(BStatTablepPwxkWaterQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcControlRequirementsService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcControlRequirementsService.java index 5be029f..d5ce80d 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcControlRequirementsService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcControlRequirementsService.java @@ -1,6 +1,9 @@ package cn.cecep.talroad.service; import cn.cecep.talroad.domain.PcControlRequirements; +import cn.cecep.talroad.vo.PcControlRequirementsVo; +import cn.cecep.talroad.vo.query.PcControlRequirementsQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -19,5 +22,12 @@ public interface IPcControlRequirementsService extends IService selectPcControlRequirementsList(PcControlRequirements pcControlRequirements); - + + List selectPwxkGasOrg(Page page, PcControlRequirementsQuery.PwxkGasOrg query); + + List selectPwxkGasNoOrg(Page page, PcControlRequirementsQuery.PwxkGasNoOrg query); + + List selectPwxkWaterDirect(Page page, PcControlRequirementsQuery.PwxkWaterDirect query); + + List selectPwxkWaterIndirect(Page page, PcControlRequirementsQuery.PwxkWaterIndirect query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcFactoryService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcFactoryService.java index 106e7b9..041e621 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcFactoryService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcFactoryService.java @@ -4,6 +4,7 @@ import cn.cecep.talroad.domain.PcFactory; import cn.cecep.talroad.vo.PcFactoryLicensingStatusVo; import cn.cecep.talroad.vo.PcFactoryVo; import cn.cecep.talroad.vo.PcProfessionLicensingStatusVo; +import cn.cecep.talroad.vo.PwxkFactoryVo; import cn.cecep.talroad.vo.analysis.FactoryOutletVo; import cn.cecep.talroad.vo.query.PcFactoryQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -59,4 +60,6 @@ public interface IPcFactoryService extends IService PcFactoryLicensingStatusVo licenSingStatusList(); PcProfessionLicensingStatusVo professionStatusChart(); + + List selectPwxkList(Page page, PcFactoryQuery.SearchVo searchVo); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelFactoryService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelFactoryService.java index 1c799ac..7ab3cac 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelFactoryService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelFactoryService.java @@ -1,6 +1,9 @@ package cn.cecep.talroad.service; import cn.cecep.talroad.domain.PcLabelFactory; +import cn.cecep.talroad.vo.PcLabelFactoryVo; +import cn.cecep.talroad.vo.query.PcLabelFactoryQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -86,4 +89,14 @@ public interface IPcLabelFactoryService extends IService void isZlssExceptionInMonthLabel(); void isWzzcbpfExceptionInMonthLabel(); + + List selectFactoryLabelList(Page voPage, PcLabelFactoryQuery query); + + void add(PcLabelFactory pcLabelFactory); + + void edit(PcLabelFactory pcLabelFactory); + + void delete(String id); + + void batchAddFactoryLabel(PcLabelFactoryVo.FactoryLabelUpdateForm form); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelService.java index 95ceb11..afedebf 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelService.java @@ -32,4 +32,10 @@ public interface IPcLabelService extends IService List getChildrenLabel(String id); List getPcLabelListByLabelCodes(ListcodeList); + + void add(PcLabel pcLabel); + + void edit(PcLabelVo pcLabelVo); + + void delete(String id); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelValueService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelValueService.java index a7d2e59..09b4f28 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelValueService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcLabelValueService.java @@ -23,4 +23,10 @@ public interface IPcLabelValueService extends IService List manualMonitoringIndustry(String name); List selectListByLabelId(String labelId); + + void add(PcLabelValue pcLabelValue); + + void edit(PcLabelValue pcLabelValue); + + void delete(String id); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcOutletService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcOutletService.java index 91563bf..3b8388f 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcOutletService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IPcOutletService.java @@ -5,10 +5,7 @@ import cn.cecep.talroad.domain.BMainMonitorPointOperationLog; import cn.cecep.talroad.domain.PcOutlet; import cn.cecep.talroad.domain.analysis.SRaOverWaterPollutionTraceability; import cn.cecep.talroad.domain.analysis.SRaWaterPermittedOnline; -import cn.cecep.talroad.vo.DropDownVO; -import cn.cecep.talroad.vo.GasPEMonitoringPointVO; -import cn.cecep.talroad.vo.OutletNameVO; -import cn.cecep.talroad.vo.PcOutletGasVO; +import cn.cecep.talroad.vo.*; import cn.cecep.talroad.vo.analysis.SRaRealTimeAnalysicComsitMonitorVo; import cn.cecep.talroad.vo.query.*; import cn.cecep.talroad.vo.query.analysis.SRaOverWaterPollutionTraceabilityQuery; @@ -86,4 +83,9 @@ public interface IPcOutletService extends IService void editBatchCoordinate(PcOutlet[] pcOutletArr); + List selectPwxkList(Page page, PcOutletQuery.PwxkGas query); + + List selectPwxkWaterDirect(Page page, PcOutletQuery.PwxkWaterDirect query); + + List selectPwxkWaterIndirect(Page page, PcOutletQuery.PwxkWaterIndirect query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IProductionManageService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IProductionManageService.java index d98d22b..e832ca9 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IProductionManageService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/IProductionManageService.java @@ -46,6 +46,9 @@ public interface IProductionManageService { @ApiModelProperty(value = "分表计电设备点位vo列表。获取指定分表计电设备点位的曲线图数据") private List deviceSiteSimpleVo; + @ApiModelProperty(value = "分表计电设备点位（合并图表）") + private List mergeDeviceSiteSimpleVo; + @ApiModelProperty(value = "获取DSC设备和在线监测合并后的图表") private List dcsOnlineVos; diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/ISupermonitorDrainOutletService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/ISupermonitorDrainOutletService.java index e530b78..1ce3f70 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/ISupermonitorDrainOutletService.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/ISupermonitorDrainOutletService.java @@ -1,6 +1,9 @@ package cn.cecep.talroad.service; import cn.cecep.talroad.domain.SupermonitorDrainOutlet; +import cn.cecep.talroad.vo.SupermonitorDrainOutletVo; +import cn.cecep.talroad.vo.query.SupermonitorDrainOutletQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -18,6 +21,9 @@ public interface ISupermonitorDrainOutletService extends IService selectSupermonitorDrainOutletList(SupermonitorDrainOutlet supermonitorDrainOutlet); - + List selectSupermonitorDrainOutletList(SupermonitorDrainOutlet supermonitorDrainOutlet); + + List selectRhPwxkList(Page page, SupermonitorDrainOutletQuery.PwxkRh query); + + List selectYsPwxkList(Page page, SupermonitorDrainOutletQuery.PwxkYs query); } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/analysis/BasModelAnalyseService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/analysis/BasModelAnalyseService.java new file mode 100644 index 0000000..3a300b4 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/analysis/BasModelAnalyseService.java @@ -0,0 +1,4 @@ +package cn.cecep.talroad.service.analysis; + +public interface BasModelAnalyseService { +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/analysis/SRaPollManTypeChangeService.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/analysis/SRaPollManTypeChangeService.java new file mode 100644 index 0000000..f10506c --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/analysis/SRaPollManTypeChangeService.java @@ -0,0 +1,22 @@ +package cn.cecep.talroad.service.analysis; + +import cn.cecep.talroad.domain.analysis.SRaPollManTypeChange; +import cn.cecep.talroad.vo.analysis.SRaPollManTypeChangeVo; +import cn.cecep.talroad.vo.query.analysis.SRaPollManTypeChangeQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; +public interface SRaPollManTypeChangeService extends IService{ + + + int updateBatch(List list); + + int updateBatchSelective(List list); + + int batchInsert(List list); + + IPage selectList(SRaPollManTypeChangeQuery query); + + List selectIndustryPermissionNameList(SRaPollManTypeChangeQuery query); +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/AmProblemFiServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/AmProblemFiServiceImpl.java index 806c503..eb2ee46 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/AmProblemFiServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/AmProblemFiServiceImpl.java @@ -52,8 +52,6 @@ import org.springframework.util.Assert; import java.math.BigDecimal; import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -104,12 +102,12 @@ public class AmProblemFiServiceImpl extends ServiceImpl> removeFalseHave0(List> myList) { List> filteredList = new ArrayList<>(); for (Map item : myList) { @@ -312,12 +310,28 @@ public class AmProblemFiServiceImpl extends ServiceImpl> videoList = baseMapper.selectAmProblemFiVideo(id); - Map>> videoTypeMap = videoList.stream().collect(Collectors.groupingBy(o -> (String) o.get("videoType"))); - List> pictures = videoTypeMap.get("1"); - List> videos = videoTypeMap.get("2"); - vo.setVideos(videos == null ? new ArrayList<>() : videos); - vo.setVideoPictures(pictures == null ? new ArrayList<>() : pictures); + List videoPictures = baseMapper.selectAmProblemFiVideo(id); + + List videos = videoPictures.stream() + // 视频截图按照视频id分组 + .collect(Collectors.groupingBy(AmProblemFiVideo.Vo::getDevId, LinkedHashMap::new, Collectors.toList())) + .entrySet().stream().map(entry -> { + AmProblemFiVideo.Vo vo1 = entry.getValue().get(0); + + // 找到path不为空的作为视频封面 + AmProblemFiVideo.Vo vo2 = entry.getValue().stream() + .filter(o -> o.getVideoPath() != null && !"non-exit".equals(o.getVideoPath())).findFirst().orElse(null); + AmProblemFiVideo.Vo videoVo = new AmProblemFiVideo.Vo(); + videoVo.setDevId(vo1.getDevId()); + videoVo.setDevName(vo1.getDevName()); + videoVo.setDevSource(vo1.getDevSource()); + videoVo.setStartTime(vo1.getStartTime()); + videoVo.setEndTime(vo1.getEndTime()); + videoVo.setVideoPath(vo2 != null ? vo2.getVideoPath() : null); + return videoVo; + }).collect(Collectors.toList()); + vo.setVideos(videos); + vo.setVideoPictures(videoPictures); /* 设置问题状态 @@ -449,7 +463,7 @@ public class AmProblemFiServiceImpl extends ServiceImpl labelMap = new HashMap<>(); + labelMap.put("formatter", "{b}: {c}"); + try { + markLine.getData().add( + new HashMap() {{ + put("name", "标准值"); + put("yAxis", new BigDecimal(problemFi.getPredictUpperLimit()).setScale(6, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString()); + put("label", labelMap); + }} + ); + } catch (Exception e) { + } } else { String markLineName = "001001003".equals(problemFi.getProblemType()) ? "方差" : "均值"; @@ -1011,7 +1038,7 @@ public class AmProblemFiServiceImpl extends ServiceImpl> getAListOfAlerts() { + public List> getAListOfAlerts(String type,String topType) { QueryWrapper sort = new QueryWrapper().orderByAsc("sort"); - sort.ne("problem_type","1"); + if(StringUtils.isNotBlank(type)&&"1".equals(type)) { + sort.ne("problem_type", "0"); + }else if (StringUtils.isNotBlank(type)&&"0".equals(type)){ + sort.ne("problem_type", "1"); + } sort.eq("is_status","1"); List problemTypes = problemTypeService.list(sort); @@ -1288,7 +1319,11 @@ public class AmProblemFiServiceImpl extends ServiceImpl selectPwxkList(Page page, BMainProductionOrganizGasQuery.PwxkCzp query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectPwxkList(factoryIds, query); + return dataList; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BMainProductionWaterServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BMainProductionWaterServiceImpl.java index 22390ae..3ee06ea 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BMainProductionWaterServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BMainProductionWaterServiceImpl.java @@ -1,14 +1,20 @@ package cn.cecep.talroad.service.impl; import cn.cecep.talroad.common.core.utils.StringUtils; +import cn.cecep.talroad.common.security.utils.SecurityUtils; import cn.cecep.talroad.domain.BMainProductionWater; import cn.cecep.talroad.domain.PcOutlet; import cn.cecep.talroad.mapper.BMainProductionWaterMapper; import cn.cecep.talroad.mapper.PcOutletMapper; import cn.cecep.talroad.service.IAmVideoDevFiService; import cn.cecep.talroad.service.IBMainProductionWaterService; +import cn.cecep.talroad.service.IPcFactoryService; import cn.cecep.talroad.service.IProductionManageService; +import cn.cecep.talroad.vo.BMainProductionWaterVo; +import cn.cecep.talroad.vo.PcFactoryVo; +import cn.cecep.talroad.vo.query.BMainProductionWaterQuery; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,6 +22,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** @@ -32,6 +39,9 @@ public class BMainProductionWaterServiceImpl extends ServiceImpl selectPwxkList(Page page, BMainProductionWaterQuery.PwxkCzp query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectPwxkList(factoryIds, query); + return dataList; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTablePwxkWaterAndOtherServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTablePwxkWaterAndOtherServiceImpl.java index 60c5fd1..38f0dd7 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTablePwxkWaterAndOtherServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTablePwxkWaterAndOtherServiceImpl.java @@ -55,34 +55,42 @@ public class BStatTablePwxkWaterAndOtherServiceImpl implements BStatTablePwxkWat private BStatTableQueryInfoMapper queryInfoMapper; @Autowired private BStatTablePwxkProductionFacilitiesMapper productionFacilitiesMapper; + @Autowired + private BStatTablePwxkBoilerFuelGasMapper boilerFuelGasMapper; + @Autowired + private BStatTablePwxkBoilerFuelSolidLiquidMapper boilerFuelSolidLiquidMapper; + @Autowired + private BStatTablePwxkFuelMapper fuelMapper; + @Autowired + private BStatTablePwxkRawMaterialMapper materialMapper; @Override public AjaxResults> selectProductLine(BStatTablepPwxkWaterQuery query) { - return selectData(lineMapper::selectListAndFactory,query); + return selectDataByQuery(lineMapper::selectListAndFactory,query); } @Override public AjaxResults> selectLifeIn(BStatTablepPwxkWaterQuery query) { - return selectData(lifeInMapper::selectListAndFactory,query); + return selectDataByQuery(lifeInMapper::selectListAndFactory,query); } @Override public AjaxResults> selectIndustryIn(BStatTablepPwxkWaterQuery query) { - return selectData(industryInMapper::selectListAndFactory,query); + return selectDataByQuery(industryInMapper::selectListAndFactory,query); } @Override public AjaxResults> selectTreatmentInAsk(BStatTablepPwxkWaterQuery query) { - return selectData(askMapper::selectListAndFactory,query); + return selectDataByQuery(askMapper::selectListAndFactory,query); } @Override public AjaxResults> selectIndustryInTotal(BStatTablepPwxkWaterQuery query) { - return selectData(industryInTotalMapper::selectListAndFactory,query); + return selectDataByQuery(industryInTotalMapper::selectListAndFactory,query); } @Override @@ -93,12 +101,12 @@ public class BStatTablePwxkWaterAndOtherServiceImpl implements BStatTablePwxkWat @Override public AjaxResults> selectHazardousSolidWasteFa(BStatTablepPwxkWaterQuery query) { - return selectData(solidWasteFaMapper::selectListAndFactory,query); + return selectDataByQuery(solidWasteFaMapper::selectListAndFactory,query); } @Override public AjaxResults> selectEnforceComplianceReportingRequirements(BStatTablepPwxkWaterQuery query) { - return selectData(enforcementMapper::selectListAndFactory,query); + return selectDataByQuery(enforcementMapper::selectListAndFactory,query); } @Override @@ -118,7 +126,7 @@ public class BStatTablePwxkWaterAndOtherServiceImpl implements BStatTablePwxkWat @Override public AjaxResults> selectProducts(BStatTablepPwxkWaterQuery query) { - return selectData(pwxkProductsMapper::selectListAndFactory,query); + return selectDataByQuery(pwxkProductsMapper::selectListAndFactory,query); } @Override @@ -130,7 +138,28 @@ public class BStatTablePwxkWaterAndOtherServiceImpl implements BStatTablePwxkWat @Override public AjaxResults> selectProductionFacilities(BStatTablepPwxkWaterQuery query) { - return selectData(productionFacilitiesMapper::selectListAndFactory,query); + return selectDataByQuery(productionFacilitiesMapper::selectListAndFactory,query); + } + + @Override + public AjaxResults> selectBoilerFuelGas(BStatTablepPwxkWaterQuery query) { + + return selectDataByQuery(boilerFuelGasMapper::selectListAndFactory,query); + } + + @Override + public AjaxResults> selectBoilerFuelSolidLiquid(BStatTablepPwxkWaterQuery query) { + return selectDataByQuery(boilerFuelSolidLiquidMapper::selectListAndFactory,query); + } + + @Override + public AjaxResults> selectFuel(BStatTablepPwxkWaterQuery query) { + return selectDataByQuery(fuelMapper::selectListAndFactory,query); + } + + @Override + public AjaxResults> selectMaterial(BStatTablepPwxkWaterQuery query) { + return selectDataByQuery(materialMapper::selectListAndFactory,query); } /** @@ -165,11 +194,6 @@ public class BStatTablePwxkWaterAndOtherServiceImpl implements BStatTablePwxkWat }else { page = new Page<>(1,Integer.MAX_VALUE); } - if(StringUtils.isBlank(query.getFactoryName()) && Collections.isEmpty(query.getLabelMap())&&query.getExportOperate()){ - BeanUtils.copyProperties(page, result); - return result; - - } PcFactoryQuery.SearchVo searchVo=new PcFactoryQuery.SearchVo(); BeanUtils.copyProperties(query,searchVo); @@ -185,24 +209,34 @@ public class BStatTablePwxkWaterAndOtherServiceImpl implements BStatTablePwxkWat public AjaxResults> selectData(Function,List> selectListFunction, BStatTablepPwxkWaterQuery query) { Page page = new Page<>(); - IPage factoryIdList = getFactoryIdList(query); - BeanUtils.copyProperties(factoryIdList, page); - if (factoryIdList.getRecords().size() < 1&&!query.getExportOperate()) { - return AjaxResults.success(page); + if(StringUtils.isBlank(query.getFactoryName()) && Collections.isEmpty(query.getLabelMap())&&query.getExportOperate()){ + + }else { + IPage factoryIdList = getFactoryIdList(query); + BeanUtils.copyProperties(factoryIdList, page); + if (factoryIdList.getRecords().size() < 1&&!query.getExportOperate()) { + return AjaxResults.success(page); + } + query.setFactoryIdList(factoryIdList.getRecords()); } - List result = selectListFunction.apply(factoryIdList.getRecords()); + List result = selectListFunction.apply(query.getFactoryIdList()); page.setRecords(result); return AjaxResults.success(page); } public AjaxResults> selectDataByQuery(Function> selectListFunction, BStatTablepPwxkWaterQuery query) { Page page = new Page<>(); - IPage factoryIdList = getFactoryIdList(query); - BeanUtils.copyProperties(factoryIdList, page); - if (factoryIdList.getRecords().size() < 1&&!query.getExportOperate()) { - return AjaxResults.success(page); + //如果这样通过，说明是导出且是全部企业，之所以不放过查询，是因为mapper方法没有加page参数 + if(StringUtils.isBlank(query.getFactoryName()) && Collections.isEmpty(query.getLabelMap())&&query.getExportOperate()){ + + }else { + IPage factoryIdList = getFactoryIdList(query); + BeanUtils.copyProperties(factoryIdList, page); + if (factoryIdList.getRecords().size() < 1) { + return AjaxResults.success(page); + } + query.setFactoryIdList(factoryIdList.getRecords()); } - query.setFactoryIdList(factoryIdList.getRecords()); List result = selectListFunction.apply(query); page.setRecords(result); return AjaxResults.success(page); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionServiceImpl.java new file mode 100644 index 0000000..32dfdc3 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmission; +import cn.cecep.talroad.mapper.BStatTableZxbgGasEmissionMapper; +import cn.cecep.talroad.service.IBStatTableZxbgGasEmissionService; +import cn.cecep.talroad.mapper.BStatTableZxbgGasEmissionMapper; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmission; +import cn.cecep.talroad.service.IBStatTableZxbgGasEmissionService; + + + + +/** + * 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgGasEmissionServiceImpl extends ServiceImpl implements IBStatTableZxbgGasEmissionService +{ + @Autowired + private BStatTableZxbgGasEmissionMapper bStatTableZxbgGasEmissionMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTablePwxkWaterAndOtherService; + /** + * 查询固定源产排治--执行报告--有组织废气污染物排放浓度监测数据列表 + * + * @param bStatTableZxbgGasEmission 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据 + * @return 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据 + */ + @Override + public List selectBStatTableZxbgGasEmissionList(BStatTableZxbgGasEmission bStatTableZxbgGasEmission) + { + return bStatTableZxbgGasEmissionMapper.selectBStatTableZxbgGasEmissionList(bStatTableZxbgGasEmission); + } + + @Override + public AjaxResults> selectBStatTableZxbgGasEmissionListBy(BStatTablepPwxkWaterQuery query) { + return bStatTablePwxkWaterAndOtherService.selectDataByQuery(bStatTableZxbgGasEmissionMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionSpeedServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionSpeedServiceImpl.java new file mode 100644 index 0000000..9481d1e --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionSpeedServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionSpeed; +import cn.cecep.talroad.mapper.BStatTableZxbgGasEmissionSpeedMapper; +import cn.cecep.talroad.service.IBStatTableZxbgGasEmissionSpeedService; +import cn.cecep.talroad.mapper.BStatTableZxbgGasEmissionSpeedMapper; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionSpeed; +import cn.cecep.talroad.service.IBStatTableZxbgGasEmissionSpeedService; + + + + +/** + * 固定源产排治--执行报告--有组织废气污染物排放速率监测Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgGasEmissionSpeedServiceImpl extends ServiceImpl implements IBStatTableZxbgGasEmissionSpeedService +{ + @Autowired + private BStatTableZxbgGasEmissionSpeedMapper bStatTableZxbgGasEmissionSpeedMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--有组织废气污染物排放速率监测列表 + * + * @param bStatTableZxbgGasEmissionSpeed 固定源产排治--执行报告--有组织废气污染物排放速率监测 + * @return 固定源产排治--执行报告--有组织废气污染物排放速率监测 + */ + @Override + public List selectBStatTableZxbgGasEmissionSpeedList(BStatTableZxbgGasEmissionSpeed bStatTableZxbgGasEmissionSpeed) + { + return bStatTableZxbgGasEmissionSpeedMapper.selectBStatTableZxbgGasEmissionSpeedList(bStatTableZxbgGasEmissionSpeed); + } + + @Override + public AjaxResults> selectBStatTableZxbgGasEmissionSpeedListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgGasEmissionSpeedMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionStatisticsServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionStatisticsServiceImpl.java new file mode 100644 index 0000000..95647a1 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGasEmissionStatisticsServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionStatistics; +import cn.cecep.talroad.mapper.BStatTableZxbgGasEmissionStatisticsMapper; +import cn.cecep.talroad.service.IBStatTableZxbgGasEmissionStatisticsService; +import cn.cecep.talroad.mapper.BStatTableZxbgGasEmissionStatisticsMapper; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionStatistics; +import cn.cecep.talroad.service.IBStatTableZxbgGasEmissionStatisticsService; + + + + +/** + * 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgGasEmissionStatisticsServiceImpl extends ServiceImpl implements IBStatTableZxbgGasEmissionStatisticsService +{ + @Autowired + private BStatTableZxbgGasEmissionStatisticsMapper bStatTableZxbgGasEmissionStatisticsMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计列表 + * + * @param bStatTableZxbgGasEmissionStatistics 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计 + * @return 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计 + */ + @Override + public List selectBStatTableZxbgGasEmissionStatisticsList(BStatTableZxbgGasEmissionStatistics bStatTableZxbgGasEmissionStatistics) + { + return bStatTableZxbgGasEmissionStatisticsMapper.selectBStatTableZxbgGasEmissionStatisticsList(bStatTableZxbgGasEmissionStatistics); + } + + @Override + public AjaxResults> selectBStatTableZxbgGasEmissionStatisticsListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgGasEmissionStatisticsMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGtFuelServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGtFuelServiceImpl.java new file mode 100644 index 0000000..62a9058 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGtFuelServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgGtFuel; +import cn.cecep.talroad.mapper.BStatTableZxbgGtFuelMapper; +import cn.cecep.talroad.service.IBStatTableZxbgGtFuelService; +import cn.cecep.talroad.mapper.BStatTableZxbgGtFuelMapper; +import cn.cecep.talroad.domain.BStatTableZxbgGtFuel; +import cn.cecep.talroad.service.IBStatTableZxbgGtFuelService; + + + + +/** + * 固定源产排治--执行报告--钢铁-燃料分析Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgGtFuelServiceImpl extends ServiceImpl implements IBStatTableZxbgGtFuelService +{ + @Autowired + private BStatTableZxbgGtFuelMapper bStatTableZxbgGtFuelMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--钢铁-燃料分析列表 + * + * @param bStatTableZxbgGtFuel 固定源产排治--执行报告--钢铁-燃料分析 + * @return 固定源产排治--执行报告--钢铁-燃料分析 + */ + @Override + public List selectBStatTableZxbgGtFuelList(BStatTableZxbgGtFuel bStatTableZxbgGtFuel) + { + return bStatTableZxbgGtFuelMapper.selectBStatTableZxbgGtFuelList(bStatTableZxbgGtFuel); + } + + @Override + public AjaxResults> selectBStatTableZxbgGtFuelListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgGtFuelMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGtProductionServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGtProductionServiceImpl.java new file mode 100644 index 0000000..fb6014f --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgGtProductionServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgGtProduction; +import cn.cecep.talroad.mapper.BStatTableZxbgGtProductionMapper; +import cn.cecep.talroad.service.IBStatTableZxbgGtProductionService; +import cn.cecep.talroad.mapper.BStatTableZxbgGtProductionMapper; +import cn.cecep.talroad.domain.BStatTableZxbgGtProduction; +import cn.cecep.talroad.service.IBStatTableZxbgGtProductionService; + + + + +/** + * 固定源产排治--执行报告--钢铁-生产单元运行情况Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgGtProductionServiceImpl extends ServiceImpl implements IBStatTableZxbgGtProductionService +{ + @Autowired + private BStatTableZxbgGtProductionMapper bStatTableZxbgGtProductionMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--钢铁-生产单元运行情况列表 + * + * @param bStatTableZxbgGtProduction 固定源产排治--执行报告--钢铁-生产单元运行情况 + * @return 固定源产排治--执行报告--钢铁-生产单元运行情况 + */ + @Override + public List selectBStatTableZxbgGtProductionList(BStatTableZxbgGtProduction bStatTableZxbgGtProduction) + { + return bStatTableZxbgGtProductionMapper.selectBStatTableZxbgGtProductionList(bStatTableZxbgGtProduction); + } + + @Override + public AjaxResults> selectBStatTableZxbgGtProductionListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgGtProductionMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdFuelAnalysisServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdFuelAnalysisServiceImpl.java new file mode 100644 index 0000000..0b2ebc1 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdFuelAnalysisServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgHdFuelAnalysis; +import cn.cecep.talroad.mapper.BStatTableZxbgHdFuelAnalysisMapper; +import cn.cecep.talroad.service.IBStatTableZxbgHdFuelAnalysisService; +import cn.cecep.talroad.mapper.BStatTableZxbgHdFuelAnalysisMapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdFuelAnalysis; +import cn.cecep.talroad.service.IBStatTableZxbgHdFuelAnalysisService; + + + + +/** + * 固定源产排治--执行报告--火电燃料分析Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgHdFuelAnalysisServiceImpl extends ServiceImpl implements IBStatTableZxbgHdFuelAnalysisService +{ + @Autowired + private BStatTableZxbgHdFuelAnalysisMapper bStatTableZxbgHdFuelAnalysisMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--火电燃料分析列表 + * + * @param bStatTableZxbgHdFuelAnalysis 固定源产排治--执行报告--火电燃料分析 + * @return 固定源产排治--执行报告--火电燃料分析 + */ + @Override + public List selectBStatTableZxbgHdFuelAnalysisList(BStatTableZxbgHdFuelAnalysis bStatTableZxbgHdFuelAnalysis) + { + return bStatTableZxbgHdFuelAnalysisMapper.selectBStatTableZxbgHdFuelAnalysisList(bStatTableZxbgHdFuelAnalysis); + } + + @Override + public AjaxResults> selectBStatTableZxbgHdFuelAnalysisListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgHdFuelAnalysisMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGasPollutionServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGasPollutionServiceImpl.java new file mode 100644 index 0000000..e10199f --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGasPollutionServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgHdGasPollution; +import cn.cecep.talroad.mapper.BStatTableZxbgHdGasPollutionMapper; +import cn.cecep.talroad.service.IBStatTableZxbgHdGasPollutionService; +import cn.cecep.talroad.mapper.BStatTableZxbgHdGasPollutionMapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGasPollution; +import cn.cecep.talroad.service.IBStatTableZxbgHdGasPollutionService; + + + + +/** + * 固定源产排治--执行报告--火电废气污染治理设施正常情况Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgHdGasPollutionServiceImpl extends ServiceImpl implements IBStatTableZxbgHdGasPollutionService +{ + @Autowired + private BStatTableZxbgHdGasPollutionMapper bStatTableZxbgHdGasPollutionMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--火电废气污染治理设施正常情况列表 + * + * @param bStatTableZxbgHdGasPollution 固定源产排治--执行报告--火电废气污染治理设施正常情况 + * @return 固定源产排治--执行报告--火电废气污染治理设施正常情况 + */ + @Override + public List selectBStatTableZxbgHdGasPollutionList(BStatTableZxbgHdGasPollution bStatTableZxbgHdGasPollution) + { + return bStatTableZxbgHdGasPollutionMapper.selectBStatTableZxbgHdGasPollutionList(bStatTableZxbgHdGasPollution); + } + + @Override + public AjaxResults> selectBStatTableZxbgHdGasPollutionListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgHdGasPollutionMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtBasicServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtBasicServiceImpl.java new file mode 100644 index 0000000..7eb84e0 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtBasicServiceImpl.java @@ -0,0 +1,50 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtBasic; +import cn.cecep.talroad.mapper.BStatTableZxbgHdGtBasicMapper; +import cn.cecep.talroad.service.IBStatTableZxbgHdGtBasicService; +import cn.cecep.talroad.mapper.BStatTableZxbgHdGtBasicMapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtBasic; +import cn.cecep.talroad.service.IBStatTableZxbgHdGtBasicService; + + + + +/** + * 固定源产排治--执行报告--火电、钢铁基本信息Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgHdGtBasicServiceImpl extends ServiceImpl implements IBStatTableZxbgHdGtBasicService +{ + @Autowired + private BStatTableZxbgHdGtBasicMapper bStatTableZxbgHdGtBasicMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--火电、钢铁基本信息列表 + * + * @param bStatTableZxbgHdGtBasic 固定源产排治--执行报告--火电、钢铁基本信息 + * @return 固定源产排治--执行报告--火电、钢铁基本信息 + */ + @Override + public List selectBStatTableZxbgHdGtBasicList(BStatTableZxbgHdGtBasic bStatTableZxbgHdGtBasic) + { + return bStatTableZxbgHdGtBasicMapper.selectBStatTableZxbgHdGtBasicList(bStatTableZxbgHdGtBasic); + } + + @Override + public AjaxResults> selectBStatTableZxbgHdGtBasicListBy(BStatTablepPwxkWaterQuery query) { + + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgHdGtBasicMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtFuelServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtFuelServiceImpl.java new file mode 100644 index 0000000..ac07ee2 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtFuelServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtFuel; +import cn.cecep.talroad.mapper.BStatTableZxbgHdGtFuelMapper; +import cn.cecep.talroad.service.IBStatTableZxbgHdGtFuelService; +import cn.cecep.talroad.mapper.BStatTableZxbgHdGtFuelMapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtFuel; +import cn.cecep.talroad.service.IBStatTableZxbgHdGtFuelService; + + + + +/** + * 固定源产排治--执行报告--火电、钢铁燃料信息Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgHdGtFuelServiceImpl extends ServiceImpl implements IBStatTableZxbgHdGtFuelService +{ + @Autowired + private BStatTableZxbgHdGtFuelMapper bStatTableZxbgHdGtFuelMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--火电、钢铁燃料信息列表 + * + * @param bStatTableZxbgHdGtFuel 固定源产排治--执行报告--火电、钢铁燃料信息 + * @return 固定源产排治--执行报告--火电、钢铁燃料信息 + */ + @Override + public List selectBStatTableZxbgHdGtFuelList(BStatTableZxbgHdGtFuel bStatTableZxbgHdGtFuel) + { + return bStatTableZxbgHdGtFuelMapper.selectBStatTableZxbgHdGtFuelList(bStatTableZxbgHdGtFuel); + } + + @Override + public AjaxResults> selectBStatTableZxbgHdGtFuelListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgHdGtFuelMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtInvestmentServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtInvestmentServiceImpl.java new file mode 100644 index 0000000..a91cc1b --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdGtInvestmentServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtInvestment; +import cn.cecep.talroad.mapper.BStatTableZxbgHdGtInvestmentMapper; +import cn.cecep.talroad.service.IBStatTableZxbgHdGtInvestmentService; +import cn.cecep.talroad.mapper.BStatTableZxbgHdGtInvestmentMapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtInvestment; +import cn.cecep.talroad.service.IBStatTableZxbgHdGtInvestmentService; + + + + +/** + * 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgHdGtInvestmentServiceImpl extends ServiceImpl implements IBStatTableZxbgHdGtInvestmentService +{ + @Autowired + private BStatTableZxbgHdGtInvestmentMapper bStatTableZxbgHdGtInvestmentMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况列表 + * + * @param bStatTableZxbgHdGtInvestment 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况 + * @return 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况 + */ + @Override + public List selectBStatTableZxbgHdGtInvestmentList(BStatTableZxbgHdGtInvestment bStatTableZxbgHdGtInvestment) + { + return bStatTableZxbgHdGtInvestmentMapper.selectBStatTableZxbgHdGtInvestmentList(bStatTableZxbgHdGtInvestment); + } + + @Override + public AjaxResults> selectBStatTableZxbgHdGtInvestmentListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgHdGtInvestmentMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdWaterPollutionServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdWaterPollutionServiceImpl.java new file mode 100644 index 0000000..06373f2 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgHdWaterPollutionServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgHdWaterPollution; +import cn.cecep.talroad.mapper.BStatTableZxbgHdWaterPollutionMapper; +import cn.cecep.talroad.service.IBStatTableZxbgHdWaterPollutionService; +import cn.cecep.talroad.mapper.BStatTableZxbgHdWaterPollutionMapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdWaterPollution; +import cn.cecep.talroad.service.IBStatTableZxbgHdWaterPollutionService; + + + + +/** + * 固定源产排治--执行报告--火电废水污染治理设施正常情况Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgHdWaterPollutionServiceImpl extends ServiceImpl implements IBStatTableZxbgHdWaterPollutionService +{ + @Autowired + private BStatTableZxbgHdWaterPollutionMapper bStatTableZxbgHdWaterPollutionMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--火电废水污染治理设施正常情况列表 + * + * @param bStatTableZxbgHdWaterPollution 固定源产排治--执行报告--火电废水污染治理设施正常情况 + * @return 固定源产排治--执行报告--火电废水污染治理设施正常情况 + */ + @Override + public List selectBStatTableZxbgHdWaterPollutionList(BStatTableZxbgHdWaterPollution bStatTableZxbgHdWaterPollution) + { + return bStatTableZxbgHdWaterPollutionMapper.selectBStatTableZxbgHdWaterPollutionList(bStatTableZxbgHdWaterPollution); + } + + @Override + public AjaxResults> selectBStatTableZxbgHdWaterPollutionListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgHdWaterPollutionMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgPflAirSpecialServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgPflAirSpecialServiceImpl.java index f9c5930..b967910 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgPflAirSpecialServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgPflAirSpecialServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import cn.cecep.talroad.common.core.utils.DateUtils; import cn.cecep.talroad.common.core.web.domain.AjaxResults; import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,4 +47,5 @@ public class BStatTableZxbgPflAirSpecialServiceImpl extends ServiceImpl> selectBStatTableZxbgPflAirSpecialListBy(BStatTablepPwxkWaterQuery query) { return bStatTablePwxkWaterAndOtherService.selectDataByQuery(bStatTableZxbgPflAirSpecialMapper::selectListAndFactory,query); } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgSnFuelServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgSnFuelServiceImpl.java new file mode 100644 index 0000000..a5003a0 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgSnFuelServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgSnFuel; +import cn.cecep.talroad.mapper.BStatTableZxbgSnFuelMapper; +import cn.cecep.talroad.service.IBStatTableZxbgSnFuelService; +import cn.cecep.talroad.mapper.BStatTableZxbgSnFuelMapper; +import cn.cecep.talroad.domain.BStatTableZxbgSnFuel; +import cn.cecep.talroad.service.IBStatTableZxbgSnFuelService; + + + + +/** + * 固定源产排治--执行报告--水泥燃料分析Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgSnFuelServiceImpl extends ServiceImpl implements IBStatTableZxbgSnFuelService +{ + @Autowired + private BStatTableZxbgSnFuelMapper bStatTableZxbgSnFuelMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--水泥燃料分析列表 + * + * @param bStatTableZxbgSnFuel 固定源产排治--执行报告--水泥燃料分析 + * @return 固定源产排治--执行报告--水泥燃料分析 + */ + @Override + public List selectBStatTableZxbgSnFuelList(BStatTableZxbgSnFuel bStatTableZxbgSnFuel) + { + return bStatTableZxbgSnFuelMapper.selectBStatTableZxbgSnFuelList(bStatTableZxbgSnFuel); + } + + @Override + public AjaxResults> selectBStatTableZxbgSnFuelListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgSnFuelMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgSnProductionServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgSnProductionServiceImpl.java new file mode 100644 index 0000000..f060bdc --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgSnProductionServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgSnProduction; +import cn.cecep.talroad.mapper.BStatTableZxbgSnProductionMapper; +import cn.cecep.talroad.service.IBStatTableZxbgSnProductionService; +import cn.cecep.talroad.mapper.BStatTableZxbgSnProductionMapper; +import cn.cecep.talroad.domain.BStatTableZxbgSnProduction; +import cn.cecep.talroad.service.IBStatTableZxbgSnProductionService; + + + + +/** + * 固定源产排治--执行报告--水泥-生产单元运行情况Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgSnProductionServiceImpl extends ServiceImpl implements IBStatTableZxbgSnProductionService +{ + @Autowired + private BStatTableZxbgSnProductionMapper bStatTableZxbgSnProductionMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--水泥-生产单元运行情况列表 + * + * @param bStatTableZxbgSnProduction 固定源产排治--执行报告--水泥-生产单元运行情况 + * @return 固定源产排治--执行报告--水泥-生产单元运行情况 + */ + @Override + public List selectBStatTableZxbgSnProductionList(BStatTableZxbgSnProduction bStatTableZxbgSnProduction) + { + return bStatTableZxbgSnProductionMapper.selectBStatTableZxbgSnProductionList(bStatTableZxbgSnProduction); + } + + @Override + public AjaxResults> selectBStatTableZxbgSnProductionListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgSnProductionMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgWaterEmissionServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgWaterEmissionServiceImpl.java new file mode 100644 index 0000000..4923974 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BStatTableZxbgWaterEmissionServiceImpl.java @@ -0,0 +1,49 @@ +package cn.cecep.talroad.service.impl; + +import java.util.List; +import cn.cecep.talroad.common.core.utils.DateUtils; +import cn.cecep.talroad.common.core.web.domain.AjaxResults; +import cn.cecep.talroad.vo.query.BStatTablepPwxkWaterQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import cn.cecep.talroad.domain.BStatTableZxbgWaterEmission; +import cn.cecep.talroad.mapper.BStatTableZxbgWaterEmissionMapper; +import cn.cecep.talroad.service.IBStatTableZxbgWaterEmissionService; +import cn.cecep.talroad.mapper.BStatTableZxbgWaterEmissionMapper; +import cn.cecep.talroad.domain.BStatTableZxbgWaterEmission; +import cn.cecep.talroad.service.IBStatTableZxbgWaterEmissionService; + + + + +/** + * 固定源产排治--执行报告--废水污染物排放浓度监测数据Service业务层处理 + * + * @author szhpt + * @date 2023-08-01*/ +@Service +public class BStatTableZxbgWaterEmissionServiceImpl extends ServiceImpl implements IBStatTableZxbgWaterEmissionService +{ + @Autowired + private BStatTableZxbgWaterEmissionMapper bStatTableZxbgWaterEmissionMapper; + @Autowired + private BStatTablePwxkWaterAndOtherServiceImpl bStatTableWaterService; + /** + * 查询固定源产排治--执行报告--废水污染物排放浓度监测数据列表 + * + * @param bStatTableZxbgWaterEmission 固定源产排治--执行报告--废水污染物排放浓度监测数据 + * @return 固定源产排治--执行报告--废水污染物排放浓度监测数据 + */ + @Override + public List selectBStatTableZxbgWaterEmissionList(BStatTableZxbgWaterEmission bStatTableZxbgWaterEmission) + { + return bStatTableZxbgWaterEmissionMapper.selectBStatTableZxbgWaterEmissionList(bStatTableZxbgWaterEmission); + } + + @Override + public AjaxResults> selectBStatTableZxbgWaterEmissionListBy(BStatTablepPwxkWaterQuery query) { + return bStatTableWaterService.selectDataByQuery(bStatTableZxbgWaterEmissionMapper::selectListAndFactory,query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BasDeviceServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BasDeviceServiceImpl.java index c9abca7..6e36d10 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BasDeviceServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/BasDeviceServiceImpl.java @@ -599,6 +599,9 @@ public class BasDeviceServiceImpl extends ServiceImpl xdata = DateUtils.getRangeTimes(timeType, startTime, endTime); + Page page = new Page(1, 14400); getDeviceDataByType( timeType, @@ -611,9 +614,6 @@ public class BasDeviceServiceImpl extends ServiceImpl> mapList = JSON.parseObject(json, new TypeReference>>() { }.getType()); - // x轴数据 - List xdata = DateUtils.getRangeTimes(timeType, startTime, endTime); - // 以时间为key 转为map，日期格式要保证与x轴格式一样 Map> dataMap = mapList.stream().collect(Collectors.toMap(o -> { Date date = DateUtils.parseDate(o.get("dataTime")); @@ -876,6 +876,9 @@ public class BasDeviceServiceImpl extends ServiceImpl xdata = DateUtils.getRangeTimes("EL".equals(deviceVo.getIndustry()) ? "QH" : "M", startTime, endTime); + List> list = basDeviceMapper.selectDeviceStatusChart(deviceVo.getDeviceId(), startTime, endTime); Map timeStatusMap = list.stream().collect( @@ -898,9 +901,6 @@ public class BasDeviceServiceImpl extends ServiceImpl xdata = DateUtils.getRangeTimes("EL".equals(deviceVo.getIndustry()) ? "QH" : "M", startTime, endTime); - EChartsVO.SeriesObj ser1 = new EChartsVO.SeriesObj(); ser1.setName("运行"); ser1.setProp("1"); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/MonitoringMapServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/MonitoringMapServiceImpl.java index 911efb9..b7e0082 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/MonitoringMapServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/MonitoringMapServiceImpl.java @@ -330,7 +330,7 @@ public class MonitoringMapServiceImpl implements IMonitoringMapService { chartVo.setLegendData(new Object[]{"功率", "用电量"}); // monElecReals.stream().forEach(item -> item.setDataTimeStr(item.getDataTimeStr().substring(11, 16))); // chartVo.setXsxisData(monElecReals.stream().map(MonElecReal::getDataTimeStr).distinct().collect(Collectors.toList()).toArray(new Object[0])); - List qh = null; + List qh = DateUtils.getRangeTimes("QH", d, date); chartVo.setXsxisData(qh.toArray()); Map> hourDataMaps = monElecReals.stream().collect(Collectors.groupingBy(MonElecReal::getDataTimeStr)); hourDataMaps.forEach((month,data)->{ @@ -815,7 +815,7 @@ public class MonitoringMapServiceImpl implements IMonitoringMapService { } Map timeStatusMap = sRaRealTimeAnalysisRuns.stream().filter(o->o.getDiffuseStatus()!=null).collect(Collectors.toMap(o -> DateUtil.format(o.getDiffuseEndTime(),DatePattern.NORM_DATETIME_MINUTE_FORMATTER), o -> o.getDiffuseStatus(), (o1, o2) -> o1)); // x轴数据 - List xdata = null; + List xdata = DateUtils.getRangeTimes("M", d, date); EChartsVO.SeriesObj ser1 = new EChartsVO.SeriesObj(); ser1.setName("正常放散"); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcControlRequirementsServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcControlRequirementsServiceImpl.java index 6d45490..948e3a5 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcControlRequirementsServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcControlRequirementsServiceImpl.java @@ -1,15 +1,21 @@ package cn.cecep.talroad.service.impl; +import cn.cecep.talroad.common.security.utils.SecurityUtils; import cn.cecep.talroad.domain.PcControlRequirements; import cn.cecep.talroad.mapper.PcControlRequirementsMapper; import cn.cecep.talroad.service.IPcControlRequirementsService; +import cn.cecep.talroad.service.IPcFactoryService; +import cn.cecep.talroad.vo.PcControlRequirementsVo; +import cn.cecep.talroad.vo.PcFactoryVo; +import cn.cecep.talroad.vo.query.PcControlRequirementsQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; - - +import java.util.stream.Collectors; /** @@ -23,6 +29,9 @@ public class PcControlRequirementsServiceImpl extends ServiceImpl selectPwxkGasOrg(Page page, PcControlRequirementsQuery.PwxkGasOrg query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectPwxkGasOrg(factoryIds, query); + return dataList; + } + + @Override + public List selectPwxkGasNoOrg(Page page, PcControlRequirementsQuery.PwxkGasNoOrg query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectPwxkGasNoOrg(factoryIds, query); + return dataList; + } + + @Override + public List selectPwxkWaterDirect(Page page, PcControlRequirementsQuery.PwxkWaterDirect query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectPwxkWaterDirect(factoryIds, query); + return dataList; + } + + @Override + public List selectPwxkWaterIndirect(Page page, PcControlRequirementsQuery.PwxkWaterIndirect query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectPwxkWaterIndirect(factoryIds, query); + return dataList; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcFactoryServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcFactoryServiceImpl.java index 2fd3a64..e9be28e 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcFactoryServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcFactoryServiceImpl.java @@ -18,11 +18,14 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections4.ListUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -372,6 +375,30 @@ public class PcFactoryServiceImpl extends ServiceImpl return pcProfessionLicensingStatusVo; } + @Override + public List selectPwxkList(Page page, PcFactoryQuery.SearchVo searchVo) { + Page pcFactoryVoPage = new Page<>(searchVo.getPageNum(), searchVo.getPageSize()); + List list = search(pcFactoryVoPage, searchVo, null, SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + + List collect = list.stream().map(o -> { + PwxkFactoryVo pwxkFactoryVo = new PwxkFactoryVo(); + BeanUtils.copyProperties(o, pwxkFactoryVo); + + if (StringUtils.isNotBlank(pwxkFactoryVo.getEnvironmentalCode())) { + try { + Map extra = JSON.parseObject(pwxkFactoryVo.getEnvironmentalCode(), new TypeReference>() {}); + pwxkFactoryVo.setEnvironmentalCode((String) extra.get("itempfwh")); + } catch (Exception e) { + // 解析失败 + } + } + return pwxkFactoryVo; + }).collect(Collectors.toList()); + + page.setTotal(pcFactoryVoPage.getTotal()); + return collect; + } + // @Transactional(rollbackFor=Exception.class) 数据配置太低 无法支持事务处理方式 暂时去掉 public void disposeAdslFactory(List pcFactories) { Set factoryIds = pcFactories.stream().map(x -> { @@ -407,6 +434,7 @@ public class PcFactoryServiceImpl extends ServiceImpl if (searchVo.getLabelMap() == null || searchVo.getLabelMap().size() == 0) { PcFactoryQuery query = new PcFactoryQuery(); query.setFactoryName(factoryName); + query.setLabelAndValue(searchVo.getLabelAndValue()); if (page == null) { pcFactoryVos = baseMapper.selectPcFactoryVoList(query,home,regionCodes); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelFactoryServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelFactoryServiceImpl.java index b7d1e6f..36f9eb0 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelFactoryServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelFactoryServiceImpl.java @@ -6,25 +6,23 @@ import cn.cecep.talroad.domain.*; import cn.cecep.talroad.enums.LabelFactoryEnum; import cn.cecep.talroad.mapper.*; import cn.cecep.talroad.service.IPcLabelFactoryService; -import cn.cecep.talroad.vo.AmDoorMonitorAccountFiVo; -import cn.cecep.talroad.vo.FactoryLicenseVo; -import cn.cecep.talroad.vo.PcControlRequirementsVo; -import cn.cecep.talroad.vo.WarningEnvGasMonRealVo; +import cn.cecep.talroad.vo.*; +import cn.cecep.talroad.vo.query.PcLabelFactoryQuery; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.lang.reflect.MethodHandleUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.ListUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.lang.reflect.Field; import java.math.BigDecimal; import java.math.BigInteger; import java.time.LocalDateTime; @@ -33,7 +31,6 @@ import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import org.springframework.transaction.annotation.Transactional; /** @@ -1619,6 +1616,160 @@ public class PcLabelFactoryServiceImpl extends ServiceImpl selectFactoryLabelList(Page voPage, PcLabelFactoryQuery query) { + List list = baseMapper.selectFactoryLabelList(voPage, query); + return list; + } + + @Override + public void add(PcLabelFactory pcLabelFactory) { + PcLabel pcLabel = pcLabelMapper.selectById(pcLabelFactory.getLabelId()); + if (StringUtils.isNotEmpty(pcLabel.getFactoryField()) || LabelFactoryEnum.getByCode(pcLabel.getLabelCode()) != null) { + throw new RuntimeException("不支持给企业新增非手工标签值"); + } + + List list = list(new QueryWrapper() + .eq("factory_id", pcLabelFactory.getFactoryId()) + .eq("label_id", pcLabelFactory.getLabelId()) + ); + if (list.size() > 0) { + throw new RuntimeException("企业已存在该标签"); + } + if (StringUtils.isBlank(pcLabelFactory.getLabelValue())) { + pcLabelFactory.setLableUseing("0"); + } + pcLabelFactory.setId(UUID.randomUUID().toString()); + save(pcLabelFactory); + } + + @Override + public void edit(PcLabelFactory pcLabelFactory) { + PcLabelFactory dbLabelFactory = getById(pcLabelFactory.getId()); + if (dbLabelFactory == null) { + return; + } + + // 若修改了标签值 + if (!Objects.equals(dbLabelFactory.getLabelValue(), pcLabelFactory.getLabelValue())) { + PcLabel pcLabel = pcLabelMapper.selectById(dbLabelFactory.getLabelId()); + + if (StringUtils.isNotEmpty(pcLabel.getFactoryField()) || LabelFactoryEnum.getByCode(pcLabel.getLabelCode()) != null) { + throw new RuntimeException("不支持修改企业非手工标签值"); + } else { + if (StringUtils.isBlank(pcLabelFactory.getLabelValue())) { + throw new RuntimeException("标签值不能为空"); + } + } + } + pcLabelFactory.setFactoryId(null); + pcLabelFactory.setLabelId(null); + updateById(pcLabelFactory); + } + + @Override + public void delete(String id) { + PcLabelFactory dbLabelFactory = getById(id); + if (dbLabelFactory == null) { + return; + } + PcLabel pcLabel = pcLabelMapper.selectById(dbLabelFactory.getLabelId()); + if (StringUtils.isNotEmpty(pcLabel.getFactoryField()) || LabelFactoryEnum.getByCode(pcLabel.getLabelCode()) != null) { + throw new RuntimeException("不支持删除企业非手工标签值"); + } + removeById(dbLabelFactory); + } + + @Override + public void batchAddFactoryLabel(PcLabelFactoryVo.FactoryLabelUpdateForm form) { + PcLabel pcLabel = pcLabelMapper.selectById(form.getLabelId()); + if (StringUtils.isNotEmpty(pcLabel.getFactoryField()) || LabelFactoryEnum.getByCode(pcLabel.getLabelCode()) != null) { + throw new RuntimeException("非手工标签，不允许分配企业"); + } + List labelFactories = baseMapper.selectList(new QueryWrapper() + .eq("label_id", form.getLabelId()) + .in("factory_id", form.getFactoryIds()) + ); + // 按照企业分组 + Map> factoryLabelGroup = labelFactories.stream() + .collect(Collectors.groupingBy(PcLabelFactory::getFactoryId)); + + List addList = new ArrayList<>(); // 新增的企业标签 + List updateList = new ArrayList<>(); // 修改的企业标签 + List deleteList = new ArrayList<>(); // 删除的企业标签 + + // 表示需要给指定企业增加标签值 + if (form.getChecked()) { + for (String factoryId : form.getFactoryIds()) { + List list = factoryLabelGroup.get(factoryId); + if (list == null) { + PcLabelFactory lf = new PcLabelFactory(); + lf.setFactoryId(factoryId); + lf.setLabelId(pcLabel.getId()); + lf.setLableUseing("0"); + lf.setLabelValue(form.getLabelValue()); + lf.setId(UUID.randomUUID().toString()); + addList.add(lf); + } else { + // 理论上只会有一个（若有重复数据，随便修改一个即可） + PcLabelFactory labelFactory = list.get(0); + if (StringUtils.isBlank(labelFactory.getLabelValue())) { + labelFactory.setLabelValue(form.getLabelValue()); + updateList.add(labelFactory); + } else { + String[] split = labelFactory.getLabelValue().split(","); + if (!Arrays.asList(split).contains(form.getLabelValue())) { + labelFactory.setLabelValue(labelFactory.getLabelValue() + "," + form.getLabelValue()); + updateList.add(labelFactory); + } + } + } + } + } else {// 否则取消指定企业的标签值 + for (String factoryId : form.getFactoryIds()) { + List list = factoryLabelGroup.get(factoryId); + if (list == null) { + continue; + } + for (PcLabelFactory labelFactory : list) { + if (StringUtils.isBlank(labelFactory.getLabelValue())) { + deleteList.add(labelFactory); // 删除标签值为空的记录 + } else { + String[] split = labelFactory.getLabelValue().split(","); + String value = Arrays.stream(split) + .filter(o -> StringUtils.isNotBlank(o) && !o.equals(form.getLabelValue())) + .collect(Collectors.joining(",")); + if (StringUtils.isBlank(value)) { + deleteList.add(labelFactory); // 删除标签值为空的记录 + } else { + labelFactory.setLabelValue(value); + updateList.add(labelFactory); + } + } + } + } + } + + if (!addList.isEmpty()) { + List> partition = ListUtils.partition(addList, 2000); + for (List pcLabelFactories : partition) { + baseMapper.batchSave(pcLabelFactories); + } + } + if (!updateList.isEmpty()) { + List> partition = ListUtils.partition(updateList, 2000); + for (List pcLabelFactories : partition) { + baseMapper.batchUpdateValue(pcLabelFactories); + } + } + if (!deleteList.isEmpty()) { + List> partition = ListUtils.partition(deleteList, 2000); + for (List pcLabelFactories : partition) { + baseMapper.deleteBatchIds(pcLabelFactories.stream().map(PcLabelFactory::getId).collect(Collectors.toList())); + } + } + } + private void saveLabelData(LabelFactoryEnum factoryEnum, String useing, List data) { PcLabel label = pcLabelMapper.selectOne(new QueryWrapper().lambda().eq(PcLabel::getLabelCode, factoryEnum.getEnumId())); pcLabelFactoryMapper.delete(new QueryWrapper().lambda().eq(PcLabelFactory::getLabelId,label.getId())); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelServiceImpl.java index a0bc3c3..dab3d4f 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelServiceImpl.java @@ -4,25 +4,28 @@ import cn.cecep.talroad.common.core.domain.R; import cn.cecep.talroad.common.core.utils.StringUtils; import cn.cecep.talroad.common.security.utils.SecurityUtils; import cn.cecep.talroad.domain.PcLabel; +import cn.cecep.talroad.domain.PcLabelFactory; import cn.cecep.talroad.domain.PcLabelValue; +import cn.cecep.talroad.enums.LabelFactoryEnum; import cn.cecep.talroad.feign.BaseRegionService; +import cn.cecep.talroad.mapper.PcLabelFactoryMapper; import cn.cecep.talroad.mapper.PcLabelMapper; import cn.cecep.talroad.mapper.PcLabelValueMapper; import cn.cecep.talroad.service.IPcLabelService; import cn.cecep.talroad.vo.PcLabelValueVo; import cn.cecep.talroad.vo.PcLabelVo; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -38,6 +41,10 @@ public class PcLabelServiceImpl extends ServiceImpl imple @Autowired private PcLabelValueMapper labelValueMapper; + + @Autowired + private PcLabelFactoryMapper labelFactoryMapper; + @Autowired @Qualifier("baseRegionService") private BaseRegionService baseRegionService; @@ -178,4 +185,88 @@ public class PcLabelServiceImpl extends ServiceImpl imple } return pcLabelMapper.selectList(new QueryWrapper().in("label_code", codeList)); } + + @Override + public void add(PcLabel pcLabel) { + if (StringUtils.isNotBlank(pcLabel.getLabelCode())) { + List labels = list(new QueryWrapper().eq("label_code", pcLabel.getLabelCode())); + if (labels.size() > 0) { + throw new RuntimeException("标签编码重复"); + } + } + if (StringUtils.isBlank(pcLabel.getLabelVal())) { + throw new RuntimeException("标签名称不可以为空"); + } + List labels = list(new QueryWrapper().eq("label_val", pcLabel.getLabelVal())); + if (labels.size() > 0) { + throw new RuntimeException("标签名称重复"); + } + pcLabel.setLablevalue("1"); + pcLabel.setId(UUID.randomUUID().toString()); + + save(pcLabel); + } + + @Override + public void edit(PcLabelVo vo) { + PcLabel pcLabel = getById(vo.getId()); + + if (!Objects.equals(pcLabel.getLabelCode(), vo.getLabelCode())) { + if (StringUtils.isNotEmpty(pcLabel.getFactoryField()) || LabelFactoryEnum.getByCode(pcLabel.getLabelCode()) != null) { + throw new RuntimeException("非手工标签，标签编码不可以修改"); + } else { + if (StringUtils.isNotBlank(vo.getLabelCode())) { + List labels = list(new QueryWrapper() + .eq("label_code", vo.getLabelCode()) + .ne("id", vo.getId()) // 不包括自己 + ); + if (labels.size() > 0) { + throw new RuntimeException("标签编码重复"); + } + } + } + } + + if (!Objects.equals(pcLabel.getLabelVal(), vo.getLabelVal())) { + if (StringUtils.isNotEmpty(pcLabel.getFactoryField()) || LabelFactoryEnum.getByCode(pcLabel.getLabelCode()) != null) { + throw new RuntimeException("非手工标签，标签名称不可以修改"); + } else { + if (StringUtils.isBlank(vo.getLabelVal())) { + throw new RuntimeException("标签名称不可以为空"); + } + List labels = list(new QueryWrapper() + .eq("label_val", vo.getLabelVal()) + .ne("id", vo.getId()) // 不包括自己 + ); + if (labels.size() > 0) { + throw new RuntimeException("标签名称重复"); + } + } + } + + BeanUtil.copyProperties(vo, pcLabel); + updateById(pcLabel); + } + + @Override + @Transactional + public void delete(String id) { + PcLabel pcLabel = getById(id); + if (pcLabel == null) { + return; + } + + if (StringUtils.isNotEmpty(pcLabel.getFactoryField()) || LabelFactoryEnum.getByCode(pcLabel.getLabelCode()) != null) { + throw new RuntimeException("非手工标签，不支持删除"); + } + + Integer count = labelFactoryMapper.selectCount(new QueryWrapper().eq("label_id", id)); + if (count > 0) { + throw new RuntimeException("存在关联的企业，标签不可以删除"); + } + + // 删除标签值 + labelValueMapper.delete(new UpdateWrapper().eq("label_id", id)); + removeById(pcLabel); + } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelValueServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelValueServiceImpl.java index e1f452e..c5afff0 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelValueServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcLabelValueServiceImpl.java @@ -2,7 +2,10 @@ package cn.cecep.talroad.service.impl; import cn.cecep.talroad.common.core.utils.StringUtils; import cn.cecep.talroad.domain.PcLabel; +import cn.cecep.talroad.domain.PcLabelFactory; import cn.cecep.talroad.domain.PcLabelValue; +import cn.cecep.talroad.enums.LabelFactoryEnum; +import cn.cecep.talroad.mapper.PcLabelFactoryMapper; import cn.cecep.talroad.mapper.PcLabelMapper; import cn.cecep.talroad.mapper.PcLabelValueMapper; import cn.cecep.talroad.service.IPcLabelValueService; @@ -12,8 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; - - +import java.util.Objects; +import java.util.UUID; /** @@ -29,6 +32,9 @@ public class PcLabelValueServiceImpl extends ServiceImpl list = list(new QueryWrapper() + .eq("label_id", pcLabelValue.getLabelId()) + .eq("arguments_code", pcLabelValue.getArgumentsCode())); + if (list.size() > 0) { + throw new RuntimeException("参数编码重复"); + } + + List list2 = list(new QueryWrapper() + .eq("label_id", pcLabelValue.getLabelId()) + .eq("arguments_name", pcLabelValue.getArgumentsName())); + if (list2.size() > 0) { + throw new RuntimeException("参数名称重复"); + } + pcLabelValue.setId(UUID.randomUUID().toString()); + save(pcLabelValue); + } + + @Override + public void edit(PcLabelValue pcLabelValue) { + PcLabelValue dbLableVale = getById(pcLabelValue.getId()); + if (dbLableVale == null) { + return; + } + if (StringUtils.isBlank(pcLabelValue.getArgumentsName())) { + throw new RuntimeException("参数名称不可以为空"); + } + if (StringUtils.isBlank(pcLabelValue.getArgumentsCode())) { + throw new RuntimeException("参数编码不可以为空"); + } + + PcLabel pcLabel = pcLabelMapper.selectById(dbLableVale.getLabelId()); + + // 标签编码被修改 + if (!Objects.equals(dbLableVale.getArgumentsCode(), pcLabelValue.getArgumentsCode())) { + if (StringUtils.isNotEmpty(pcLabel.getFactoryField()) || LabelFactoryEnum.getByCode(pcLabel.getLabelCode()) != null) { + throw new RuntimeException("非手工标签，不支持修改标签参数编码"); + } else { + Long count = labelFactoryMapper.selectCountByLableValue(dbLableVale); + if (count > 0) { + throw new RuntimeException("标签值参数编码已被引用，不可以修改"); + } + + List list = list(new QueryWrapper() + .eq("label_id", pcLabelValue.getLabelId()) + .eq("arguments_code", pcLabelValue.getArgumentsCode()) + .ne("id", pcLabelValue.getId()) + ); + if (list.size() > 0) { + throw new RuntimeException("参数编码重复"); + } + } + } + + // 标签参数名称被修改 + if (!Objects.equals(dbLableVale.getArgumentsName(), pcLabelValue.getArgumentsName())) { + if (StringUtils.isNotEmpty(pcLabel.getFactoryField()) || LabelFactoryEnum.getByCode(pcLabel.getLabelCode()) != null) { + throw new RuntimeException("非手工标签，不支持修改标签参数名称"); + } else { + List list2 = list(new QueryWrapper() + .eq("label_id", pcLabelValue.getLabelId()) + .eq("arguments_name", pcLabelValue.getArgumentsName()) + .ne("id", pcLabelValue.getId()) + ); + if (list2.size() > 0) { + throw new RuntimeException("参数名称重复"); + } + } + } + + // 忽略页面传入的labelId，该属性不可以更新 + pcLabelValue.setLabelId(null); + + updateById(pcLabelValue); + } + + @Override + public void delete(String id) { + PcLabelValue labelValue = getById(id); + if (labelValue == null) { + return; + } + + PcLabel pcLabel = pcLabelMapper.selectById(labelValue.getLabelId()); + if (StringUtils.isNotEmpty(pcLabel.getFactoryField()) || LabelFactoryEnum.getByCode(pcLabel.getLabelCode()) != null) { + throw new RuntimeException("非手工标签，不支持删除标签值"); + } + + Long count = labelFactoryMapper.selectCountByLableValue(labelValue); + if (count > 0) { + throw new RuntimeException("标签值参数编码已被引用，不可以删除"); + } + removeById(labelValue); + } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcOutletServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcOutletServiceImpl.java index a99aa75..04f25a1 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcOutletServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/PcOutletServiceImpl.java @@ -14,12 +14,10 @@ import cn.cecep.talroad.enums.WzzStatusEnum; import cn.cecep.talroad.mapper.BMainMonitorPointOperationLogMapper; import cn.cecep.talroad.mapper.PcLabelFactoryMapper; import cn.cecep.talroad.mapper.PcOutletMapper; +import cn.cecep.talroad.service.IPcFactoryService; import cn.cecep.talroad.service.IPcOutletCoordinateOperationLogService; import cn.cecep.talroad.service.IPcOutletService; -import cn.cecep.talroad.vo.DropDownVO; -import cn.cecep.talroad.vo.GasPEMonitoringPointVO; -import cn.cecep.talroad.vo.OutletNameVO; -import cn.cecep.talroad.vo.PcOutletGasVO; +import cn.cecep.talroad.vo.*; import cn.cecep.talroad.vo.analysis.SRaRealTimeAnalysicComsitMonitorVo; import cn.cecep.talroad.vo.query.*; import cn.cecep.talroad.vo.query.analysis.SRaOverWaterPollutionTraceabilityQuery; @@ -49,13 +47,15 @@ import java.util.stream.Collectors; public class PcOutletServiceImpl extends ServiceImpl implements IPcOutletService { @Autowired private PcOutletMapper pcOutletMapper; - @Autowired - private PcLabelFactoryMapper pcLabelFactoryMapper; + @Autowired private BMainMonitorPointOperationLogMapper bMainMonitorPointOperationLogMapper; @Autowired private IPcOutletCoordinateOperationLogService pcOutletCoordinateOperationLogService; + @Autowired + private IPcFactoryService factoryService; + /** * 查询废气有组织、无组织排口列表 * @@ -526,4 +526,43 @@ public class PcOutletServiceImpl extends ServiceImpl i baseMapper.updateBatchCoordinate(pcOutletList); pcOutletCoordinateOperationLogService.saveBatch(logList); } + + @Override + public List selectPwxkList(Page page, PcOutletQuery.PwxkGas query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectPwxkList(factoryIds, query); + return dataList; + } + + @Override + public List selectPwxkWaterDirect(Page page, PcOutletQuery.PwxkWaterDirect query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectPwxkWaterDirect(factoryIds, query); + return dataList; + } + + @Override + public List selectPwxkWaterIndirect(Page page, PcOutletQuery.PwxkWaterIndirect query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectPwxkWaterIndirect(factoryIds, query); + return dataList; + } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/ProductionManageServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/ProductionManageServiceImpl.java index dd8b8e3..7b7acbf 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/ProductionManageServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/ProductionManageServiceImpl.java @@ -137,6 +137,10 @@ public class ProductionManageServiceImpl implements IProductionManageService { if (searchVo.getDeviceSiteSimpleVo() != null) { objects.addAll(searchVo.getDeviceSiteSimpleVo()); } + // 分表计电监测点位合并到一个图表中，因此将分表计电点位列表作为一个整体添加到objects集合 + if (searchVo.getMergeDeviceSiteSimpleVo() != null && searchVo.getMergeDeviceSiteSimpleVo().size() > 0) { + objects.add(searchVo.getMergeDeviceSiteSimpleVo()); + } if (searchVo.getDeviceSimpleStatusVos() != null) { objects.addAll(searchVo.getDeviceSimpleStatusVos()); } @@ -165,6 +169,16 @@ public class ProductionManageServiceImpl implements IProductionManageService { EChartsVO cepDeviceChart = basDeviceService.getDeviceChart(device.getDeviceId(), startTime, endTime, "R", device.getPollutantVos()); cepDeviceChart.setName("DCS监测数据-" + device.getName()); chartsVOS.add(cepDeviceChart); + } else if (object instanceof List && ((List)object).get(0) instanceof BasDeviceSiteVo.SimpleVo) { + List sites = (List) object; + EChartsVO charData = monElecRealService.getCharData(sites, startTime, endTime); + + if (StringUtils.isBlank(charData.getName())) { + charData.setName("计电监测数据"); + } else { + charData.setName("计电监测数据-" + charData.getName()); + } + chartsVOS.add(charData); } else if (object instanceof BasDeviceSiteVo.SimpleVo) { BasDeviceSiteVo.SimpleVo site = (BasDeviceSiteVo.SimpleVo) object; diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvGasMonRealServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvGasMonRealServiceImpl.java index e9173cd..4861f6d 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvGasMonRealServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvGasMonRealServiceImpl.java @@ -583,11 +583,11 @@ public class SEnvGasMonRealServiceImpl extends ServiceImpl sEnvGasMonReals = sEnvGasMonRealMapper.selectList(SEnvGasMonRealQuery.createLambdaQueryWrapper(query).orderByAsc("monitoring_time")); - List sEnvGasMonReals = sEnvGasMonRealMapper.selectSEnvGasMonRealListEchart(query); - // x轴数据 List xdata = DateUtils.getRangeTimes(query.getDataType(), query.getMonitoringStartTime(), query.getMonitoringEndTime()); + List sEnvGasMonReals = sEnvGasMonRealMapper.selectSEnvGasMonRealListEchart(query); + // 以日期为key,转为map 日期格式要保证与x轴格式一样 Map gasMonRealMap = sEnvGasMonReals.stream().collect(Collectors.toMap(o -> { Date date = DateUtils.parseDate(o.getMonitoringTime()); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvGasRealServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvGasRealServiceImpl.java index f21cb37..515fb59 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvGasRealServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvGasRealServiceImpl.java @@ -63,11 +63,11 @@ public class SEnvGasRealServiceImpl extends ServiceImpl sEnvGasReals = sEnvGasRealMapper.selectList(SEnvGasRealQuery.createLambdaQueryWrapper(sEnvGasReal)); - // x轴数据 List xdata = DateUtils.getRangeTimes(sEnvGasReal.getDataType(), sEnvGasReal.getMonitoringStartTime(), sEnvGasReal.getMonitoringEndTime()); + List sEnvGasReals = sEnvGasRealMapper.selectList(SEnvGasRealQuery.createLambdaQueryWrapper(sEnvGasReal)); + // 以日期为key,转为map 日期格式要保证与x轴格式一样 Map gasRealMap = sEnvGasReals.stream().collect(Collectors.toMap(o -> { Date date = DateUtils.parseDate(o.getMonitoringTime()); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvWaterMonRealServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvWaterMonRealServiceImpl.java index 9fe4f9e..53fd13c 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvWaterMonRealServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SEnvWaterMonRealServiceImpl.java @@ -213,11 +213,11 @@ public class SEnvWaterMonRealServiceImpl extends ServiceImpl xdata = DateUtils.getRangeTimes(query.getDataType(), query.getMonitoringStartTime(), query.getMonitoringEndTime()); List waterMonReals = sEnvWaterMonRealMapper.selectList(SEnvWaterMonRealQuery.createLambdaQueryWrapper(query).orderByAsc("monitoring_time")); - // x轴数据 - List xdata = DateUtils.getRangeTimes(query.getDataType(), query.getMonitoringStartTime(), query.getMonitoringEndTime()); // 以日期为key,转为map 日期格式要保证与x轴格式一样 Map waterMonRealMap = waterMonReals.stream().collect(Collectors.toMap(o -> { diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SupermonitorDrainOutletServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SupermonitorDrainOutletServiceImpl.java index 8530474..a052639 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SupermonitorDrainOutletServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/SupermonitorDrainOutletServiceImpl.java @@ -1,15 +1,21 @@ package cn.cecep.talroad.service.impl; +import cn.cecep.talroad.common.security.utils.SecurityUtils; import cn.cecep.talroad.domain.SupermonitorDrainOutlet; import cn.cecep.talroad.mapper.SupermonitorDrainOutletMapper; +import cn.cecep.talroad.service.IPcFactoryService; import cn.cecep.talroad.service.ISupermonitorDrainOutletService; +import cn.cecep.talroad.vo.PcFactoryVo; +import cn.cecep.talroad.vo.SupermonitorDrainOutletVo; +import cn.cecep.talroad.vo.query.SupermonitorDrainOutletQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; - - +import java.util.stream.Collectors; /** @@ -23,6 +29,9 @@ public class SupermonitorDrainOutletServiceImpl extends ServiceImpl selectRhPwxkList(Page page, SupermonitorDrainOutletQuery.PwxkRh query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectRhPwxkList(factoryIds, query); + return dataList; + + } + + @Override + public List selectYsPwxkList(Page page, SupermonitorDrainOutletQuery.PwxkYs query) { + Page factoryPage = new Page<>(page.getCurrent(), page.getSize()); + List list = factoryService.search(factoryPage, query.getSearchVo(), "list", SecurityUtils.getLoginUser().getSysUser().getRegionCode()); + page.setTotal(factoryPage.getTotal()); + if (list.isEmpty()) { + return new ArrayList<>(); + } + List factoryIds = list.stream().map(PcFactoryVo::getId).collect(Collectors.toList()); + List dataList = baseMapper.selectYsPwxkList(factoryIds, query); + return dataList; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/TCodStationServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/TCodStationServiceImpl.java index 34ce9dd..cb44a3e 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/TCodStationServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/TCodStationServiceImpl.java @@ -122,7 +122,7 @@ public class TCodStationServiceImpl extends ServiceImpl xdata = null; + List xdata = DateUtils.getRangeTimes("H", startTime, endTime); List dataList = stationDataAirMapper.selectList(new QueryWrapper() .eq("station_id", station.getId()) @@ -170,7 +170,7 @@ public class TCodStationServiceImpl extends ServiceImpl xdata = null; + List xdata = DateUtils.getRangeTimes("H", startTime, endTime); List dataList = stationDataWaterMapper.selectList(new QueryWrapper() .eq("station_id", id) diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/BasDeviceStatusServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/BasDeviceStatusServiceImpl.java index 09ce5f2..cf792e5 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/BasDeviceStatusServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/BasDeviceStatusServiceImpl.java @@ -1,21 +1,20 @@ package cn.cecep.talroad.service.impl.analysis; +import cn.cecep.talroad.common.core.text.UUID; import cn.cecep.talroad.common.core.utils.DateUtils; import cn.cecep.talroad.common.core.utils.StringUtils; import cn.cecep.talroad.domain.BasDevice; import cn.cecep.talroad.mapper.BasDeviceMapper; import cn.cecep.talroad.service.analysis.IBasDeviceStatusService; import cn.cecep.talroad.service.strategy.StrategyFactory; +import cn.cecep.talroad.util.MsgProducer; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.text.ParseException; +import java.util.List; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import java.text.ParseException; import java.util.Date; -import java.util.List; - -//import cn.cecep.talroad.util.MsgProducer; /** * @Auther: cjh @@ -32,8 +31,8 @@ public class BasDeviceStatusServiceImpl implements IBasDeviceStatusService { private BasDeviceMapper deviceMapper; @Autowired private StrategyFactory strategyFactory; -// @Autowired -// private MsgProducer msgProducer; + @Autowired + private MsgProducer msgProducer; @Override public void doCheckDeviceStatus(String industry, String deviceType) { @@ -55,10 +54,10 @@ public class BasDeviceStatusServiceImpl implements IBasDeviceStatusService { deviceQueryWrapper.eq("is_status", "1"); List deviceList = deviceMapper.selectList(deviceQueryWrapper); if (deviceList != null && deviceList.size() > 0) { -// // 查询设备类型的参数配置 -// deviceList.forEach(d -> { -// msgProducer.sendYieldStatisticMsg(UUID.randomUUID().toString(),d.getDeviceId()); -// }); + // 查询设备类型的参数配置 + deviceList.forEach(d -> { + msgProducer.sendYieldStatisticMsg(UUID.randomUUID().toString(),d.getDeviceId()); + }); } } @@ -92,8 +91,7 @@ public class BasDeviceStatusServiceImpl implements IBasDeviceStatusService { begin = arr[0]; end = arr[1]; -// List hourList = DateUtils.getRangeTenTimes(begin, end); - List hourList = null; + List hourList = DateUtils.getRangeTenTimes(begin, end); hourList.forEach(h -> { try { log.info("时间:"+h+"策略名称:"+stName); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/BasModelAnalyseServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/BasModelAnalyseServiceImpl.java new file mode 100644 index 0000000..16f2b1d --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/BasModelAnalyseServiceImpl.java @@ -0,0 +1,11 @@ +package cn.cecep.talroad.service.impl.analysis; + +import cn.cecep.talroad.domain.BasModelAnalyse; +import cn.cecep.talroad.mapper.BasModelAnalyseMapper; +import cn.cecep.talroad.service.analysis.BasModelAnalyseService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class BasModelAnalyseServiceImpl extends ServiceImpl implements BasModelAnalyseService { +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/DischargeMathServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/DischargeMathServiceImpl.java index f94017f..ad16415 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/DischargeMathServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/DischargeMathServiceImpl.java @@ -1275,39 +1275,26 @@ public class DischargeMathServiceImpl implements IDischargeMathService { list.add(h); }); } - QueryWrapper gasRealQueryWrapper = new QueryWrapper<>(); - gasRealQueryWrapper.eq("factory_id",s.getFactoryId()); - gasRealQueryWrapper.eq("outlet_id",s.getId()); - gasRealQueryWrapper.eq("data_type","M"); + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("factory_id",s.getFactoryId()); + updateWrapper.eq("outlet_id",s.getId()); + updateWrapper.eq("data_type","M"); if(lastHourBegin.getTime()>real.getStartTime().getTime()) { if(lastHourEnd.getTime()>real.getEndTime().getTime()) { - gasRealQueryWrapper.between("monitoring_time", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",lastHourBegin), DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",real.getEndTime())); + updateWrapper.between("monitoring_time", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",lastHourBegin), DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",real.getEndTime())); }else{ - gasRealQueryWrapper.between("monitoring_time", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",lastHourBegin), DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",lastHourEnd)); + updateWrapper.between("monitoring_time", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",lastHourBegin), DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",lastHourEnd)); } }else{ if(lastHourEnd.getTime()>real.getEndTime().getTime()) { - gasRealQueryWrapper.between("monitoring_time", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",real.getStartTime()), DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",real.getEndTime())); + updateWrapper.between("monitoring_time", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",real.getStartTime()), DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",real.getEndTime())); }else{ - gasRealQueryWrapper.between("monitoring_time", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",real.getStartTime()), DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",lastHourEnd)); + updateWrapper.between("monitoring_time", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",real.getStartTime()), DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",lastHourEnd)); } } - - List gasRealList = isEnvGasMonRealService.list(gasRealQueryWrapper); - log.info("空气监测停产标记站点分钟数量："+gasRealHourList.size()+"站点ID："+s.getId()); - if(gasRealList!=null&&gasRealList.size()>0) { - gasRealList.forEach(h -> { - h.setDataFlag(dataFlag); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",h.getId()); - updateWrapper.eq("factory_id",h.getFactoryId()); - updateWrapper.eq("outlet_id",h.getOutletId()); - updateWrapper.eq("data_type","M"); - updateWrapper.eq("monitoring_time",DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00",h.getDateTime())); - updateWrapper.set("data_flag",dataFlag); - isEnvGasMonRealService.update(updateWrapper); - }); - } + updateWrapper.set("data_flag",dataFlag); + isEnvGasMonRealService.update(updateWrapper); }); }); @@ -1429,38 +1416,26 @@ public class DischargeMathServiceImpl implements IDischargeMathService { list.add(h); }); } - QueryWrapper gasRealQueryWrapper = new QueryWrapper<>(); - gasRealQueryWrapper.eq("factory_id",s.getFactoryId()); - gasRealQueryWrapper.eq("outlet_id",s.getId()); - gasRealQueryWrapper.eq("data_type","M"); + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("factory_id",s.getFactoryId()); + updateWrapper.eq("outlet_id",s.getId()); + updateWrapper.eq("data_type","M"); if(lastHourDate.getTime()>real.getStartTime().getTime()) { if(lastHourEnd.getTime()>real.getEndTime().getTime()) { - gasRealQueryWrapper.between("monitoring_time", lastHourDate, real.getEndTime()); + updateWrapper.between("monitoring_time", lastHourDate, real.getEndTime()); }else{ - gasRealQueryWrapper.between("monitoring_time", lastHourDate, lastHourEnd); + updateWrapper.between("monitoring_time", lastHourDate, lastHourEnd); } }else{ if(lastHourEnd.getTime()>real.getEndTime().getTime()) { - gasRealQueryWrapper.between("monitoring_time", real.getStartTime(), real.getEndTime()); + updateWrapper.between("monitoring_time", real.getStartTime(), real.getEndTime()); }else{ - gasRealQueryWrapper.between("monitoring_time", real.getStartTime(), lastHourEnd); + updateWrapper.between("monitoring_time", real.getStartTime(), lastHourEnd); } } - - List gasRealList = isEnvWaterMonRealService.list(gasRealQueryWrapper); - if(gasRealList!=null&&gasRealList.size()>0) { - gasRealList.forEach(h -> { - h.setDataFlag(dataFlag); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("id",h.getId()); - updateWrapper.eq("factory_id",h.getFactoryId()); - updateWrapper.eq("outlet_id",h.getOutletId()); - updateWrapper.eq("data_type","M"); - updateWrapper.eq("monitoring_time",h.getMonitoringTime()); - updateWrapper.set("data_flag",dataFlag); - isEnvWaterMonRealService.update(updateWrapper); - }); - } + updateWrapper.set("data_flag",dataFlag); + isEnvWaterMonRealService.update(updateWrapper); }); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaFactoryTransferRateAnalysisServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaFactoryTransferRateAnalysisServiceImpl.java index 931c983..d538aa2 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaFactoryTransferRateAnalysisServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaFactoryTransferRateAnalysisServiceImpl.java @@ -3,8 +3,10 @@ package cn.cecep.talroad.service.impl.analysis; import cn.cecep.talroad.common.core.utils.DateUtils; import cn.cecep.talroad.common.core.utils.StringUtils; import cn.cecep.talroad.common.core.utils.bean.BeanUtils; +import cn.cecep.talroad.domain.*; import cn.cecep.talroad.domain.analysis.SRaAreaTransferRateAnalysis; import cn.cecep.talroad.domain.analysis.SRaFactoryTransferRateAnalysis; +import cn.cecep.talroad.enums.EnIndustry; import cn.cecep.talroad.enums.TimeTypeEnum; import cn.cecep.talroad.mapper.analysis.SRaFactoryTransferRateAnalysisMapper; import cn.cecep.talroad.service.*; @@ -15,23 +17,26 @@ import cn.cecep.talroad.vo.analysis.AvgValueVo; import cn.cecep.talroad.vo.analysis.FactoryOutletStaticsVo; import cn.cecep.talroad.vo.analysis.FactoryOutletVo; import cn.cecep.talroad.vo.analysis.FactoryTransferRateParamVo; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; +import java.util.stream.Collectors; +import org.springframework.transaction.annotation.Transactional; /** * 企业传输率分析Service业务层处理 @@ -173,9 +178,8 @@ public class SRaFactoryTransferRateAnalysisServiceImpl extends ServiceImpl dataList = sRaFactoryTransferRateAnalysisMapper.selectStatisticsSeasonData(Arrays.asList(DateUtils.getRangeTimes("N",beginOfSeason,endOfSeason))); + List dataList = sRaFactoryTransferRateAnalysisMapper.selectStatisticsSeasonData(DateUtils.getRangeTimes("N",beginOfSeason,endOfSeason)); List addList = new ArrayList<>(); - List dataList = null; for (SRaFactoryTransferRateAnalysis tmp:dataList) { SRaFactoryTransferRateAnalysis data = new SRaFactoryTransferRateAnalysis(); BeanUtils.copyProperties(tmp,data); @@ -203,8 +207,8 @@ public class SRaFactoryTransferRateAnalysisServiceImpl extends ServiceImpl dataList = sRaFactoryTransferRateAnalysisMapper.selectStatisticsSeasonData(DateUtils.getRangeTimes("N",beginOfYear,endOfYear)); - List dataList = new ArrayList<>(); + List dataList = sRaFactoryTransferRateAnalysisMapper.selectStatisticsSeasonData(DateUtils.getRangeTimes("N",beginOfYear,endOfYear)); + List addList = new ArrayList<>(); for (SRaFactoryTransferRateAnalysis tmp:dataList) { SRaFactoryTransferRateAnalysis data = new SRaFactoryTransferRateAnalysis(); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaOverRateGasServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaOverRateGasServiceImpl.java index 05e2852..09bcaf2 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaOverRateGasServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaOverRateGasServiceImpl.java @@ -1,6 +1,7 @@ package cn.cecep.talroad.service.impl.analysis; import cn.cecep.talroad.common.core.domain.R; +import cn.cecep.talroad.common.core.utils.DateUtils; import cn.cecep.talroad.common.core.utils.StringUtils; import cn.cecep.talroad.common.security.utils.SecurityUtils; import cn.cecep.talroad.data.analyse.task.real.concentration.GasConcentrationEnum; @@ -8,10 +9,11 @@ import cn.cecep.talroad.domain.SEnvGasMonHour; import cn.cecep.talroad.domain.SEnvWaterMonHour; import cn.cecep.talroad.domain.analysis.SRaOverRateGas; import cn.cecep.talroad.domain.analysis.SRaOverRateWater; -import cn.cecep.talroad.enums.StatisticsTypeEnum; import cn.cecep.talroad.enums.TimeTypeEnum; import cn.cecep.talroad.feign.BaseRegionService; +import cn.cecep.talroad.enums.StatisticsTypeEnum; import cn.cecep.talroad.mapper.analysis.SRaOverRateGasMapper; +import cn.cecep.talroad.mapper.analysis.SRaOverRateWaterMapper; import cn.cecep.talroad.service.IAmProblemFiService; import cn.cecep.talroad.service.ISEnvGasMonHourService; import cn.cecep.talroad.service.ISEnvWaterMonHourService; @@ -21,17 +23,26 @@ import cn.cecep.talroad.service.impl.TCodStationServiceImpl.WaterPollutantEnum; import cn.cecep.talroad.vo.analysis.FactoryOutletStaticsVo; import cn.cecep.talroad.vo.analysis.SRaOverRateGasVo; import cn.cecep.talroad.vo.query.analysis.SRaOverRateGasQuery; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.math.RoundingMode; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.*; +import java.util.Date; +import java.util.ArrayList; +import java.util.List; /** @@ -229,9 +240,9 @@ public class SRaOverRateGasServiceImpl extends ServiceImpl monthList = DateUtils.getRangeTimes("N",startTime,endTime); + List monthList = DateUtils.getRangeTimes("N",startTime,endTime); // 统计季度、年度数据 - List rateGasList = sRaOverRateGasMapper.selectByMonthData(null); + List rateGasList = sRaOverRateGasMapper.selectByMonthData(monthList); if(rateGasList!=null&&rateGasList.size()>0){ rateGasList.forEach(gas->{ gas.setId(UUID.randomUUID().toString()); @@ -242,7 +253,7 @@ public class SRaOverRateGasServiceImpl extends ServiceImpl rateWaterList = isRaOverRateWaterService.selectWaterDataByMonth(null); + List rateWaterList = isRaOverRateWaterService.selectWaterDataByMonth(monthList); if(rateWaterList!=null&&rateWaterList.size()>0){ rateWaterList.forEach(gas->{ gas.setId(UUID.randomUUID().toString()); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaPollManTypeChangeServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaPollManTypeChangeServiceImpl.java new file mode 100644 index 0000000..844ce69 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaPollManTypeChangeServiceImpl.java @@ -0,0 +1,40 @@ +package cn.cecep.talroad.service.impl.analysis; + +import cn.cecep.talroad.domain.analysis.SRaPollManTypeChange; +import cn.cecep.talroad.mapper.analysis.SRaPollManTypeChangeMapper; +import cn.cecep.talroad.service.analysis.SRaPollManTypeChangeService; +import cn.cecep.talroad.vo.analysis.SRaPollManTypeChangeVo; +import cn.cecep.talroad.vo.query.analysis.SRaPollManTypeChangeQuery; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +public class SRaPollManTypeChangeServiceImpl extends ServiceImpl implements SRaPollManTypeChangeService{ + + @Override + public int updateBatch(List list) { + return baseMapper.updateBatch(list); + } + @Override + public int updateBatchSelective(List list) { + return baseMapper.updateBatchSelective(list); + } + @Override + public int batchInsert(List list) { + return baseMapper.batchInsert(list); + } + + @Override + public IPage selectList(SRaPollManTypeChangeQuery query) { + Page page=new Page<>(query.getPageNum(),query.getPageSize()); + return baseMapper.selectListInfo(page,query); + } + + @Override + public List selectIndustryPermissionNameList(SRaPollManTypeChangeQuery query) { + return baseMapper.selectIndustryPermissionNameList(query); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaRealTimeAnalysisCoServiceImpl.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaRealTimeAnalysisCoServiceImpl.java index fa581af..b3c1867 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaRealTimeAnalysisCoServiceImpl.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/impl/analysis/SRaRealTimeAnalysisCoServiceImpl.java @@ -405,46 +405,47 @@ public class SRaRealTimeAnalysisCoServiceImpl extends ServiceImpl placeholderValues = new ArrayList<>(); // 根据增加或减少的系列值进行叠加 List incomeValues = new ArrayList<>(); // 增加的系列值 List expensesValues = new ArrayList<>(); // 减少的系列值 - BigDecimal beforeValue = BigDecimal.ZERO; // 用于记录上一个数组中不为null的值，默认为0 + BigDecimal result = BigDecimal.ZERO; // 记录每次增加或减少的结果，初始值为0 // 遍历x轴，保证系列值与x轴一一对应 for (String time : xdata) { + BigDecimal income = null; + BigDecimal expense = null; + BigDecimal placeholder = null; + BigDecimal value = timeStatusMap.get(time); - // 若当前时刻没值，增加和减少系列都填充null，beforeValue保持不变 - if (value == null) { - incomeValues.add(null); - expensesValues.add(null); + if (value != null) { + result = result.add(value); - // 不存在增加或减少，不用叠加 - placeholderValues.add(null); - } else { - // 当前时刻的值与beforeValue的差值 - BigDecimal subtract = value.subtract(beforeValue); - - // 若差值>=0，表示当前时刻的值相较于beforeValue增加了，incomeValues集合中记录相应的增加值，expensesValues填充null - if (subtract.compareTo(BigDecimal.ZERO) >= 0) { - incomeValues.add(subtract); - expensesValues.add(null); - - // 存在增加，叠加值为当前-subtract。（观察echarts demo 得出的规律） - placeholderValues.add(value.subtract(subtract)); - - } else { // 否则表示当前时刻的值相较于beforeValue减少了，incomeValues填充null，expensesValues集合中记录相应的减少值 - incomeValues.add(null); - expensesValues.add(subtract.abs()); - - // 存在减少，叠加值为当前值。（观察echarts demo 得出的规律） - placeholderValues.add(value); + if (value.compareTo(BigDecimal.ZERO) >= 0) { + income = value; + placeholder = result.subtract(income); + } else { + expense = value.abs(); + placeholder = result; } - // 更新beforeValue为当前时刻的值 - beforeValue = value; } + incomeValues.add(income); + expensesValues.add(expense); + placeholderValues.add(placeholder); } EChartsVO.SeriesObj ser1 = new EChartsVO.SeriesObj(); ser1.setName("Placeholder"); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/strategy/StatusStrategyAdapter.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/strategy/StatusStrategyAdapter.java index 3893a77..83efce6 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/strategy/StatusStrategyAdapter.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/strategy/StatusStrategyAdapter.java @@ -17,6 +17,7 @@ import cn.cecep.talroad.service.ISRaRealTimeAnalysisRunOneService; import cn.cecep.talroad.service.analysis.ISRaRealTimeAnalysisCoService; import cn.cecep.talroad.service.analysis.ISRaRealTimeAnalysisRunService; import cn.cecep.talroad.vo.FactoryDeviceVo; +import cn.hutool.core.collection.ListUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.util.ArrayList; @@ -298,7 +299,10 @@ public abstract class StatusStrategyAdapter extends AbstractStrategyAdapter { */ protected void doSaveBatchSRaRealTimeAnalysisCo(List list){ if(list!=null&&list.size()>0){ - sRaRealTimeAnalysisCoService.saveBatch(list); + List> partion = ListUtil.partition(list,1000); + partion.forEach(p->{ + sRaRealTimeAnalysisCoService.saveBatch(p); + }); } } @@ -308,7 +312,10 @@ public abstract class StatusStrategyAdapter extends AbstractStrategyAdapter { */ protected void doSaveOrUpdateBatchDeviceStatus(List list){ if(list!=null&&list.size()>0) { - basDeviceSalAnalysisService.saveOrUpdateBatch(list); + List> partion = ListUtil.partition(list,1000); + partion.forEach(p->{ + basDeviceSalAnalysisService.saveOrUpdateBatch(p); + }); } } @@ -318,7 +325,11 @@ public abstract class StatusStrategyAdapter extends AbstractStrategyAdapter { */ protected void doSaveBatchAnalysisRunStatus(List list){ if(list!=null&&list.size()>0) { - raRealTimeAnalysisRunService.saveBatch(list); + List> partion = ListUtil.partition(list,1000); + partion.forEach(p->{ + raRealTimeAnalysisRunService.saveBatch(p); + }); + } } @@ -328,7 +339,9 @@ public abstract class StatusStrategyAdapter extends AbstractStrategyAdapter { */ protected void doSaveBatchAnalysisRunOneStatus(List list){ if(list!=null&&list.size()>0) { - isRaRealTimeAnalysisRunOneService.saveOrUpdateBatch(list); + list.forEach(t->{ + isRaRealTimeAnalysisRunOneService.saveOrUpdate(t); + }); } } @@ -338,7 +351,10 @@ public abstract class StatusStrategyAdapter extends AbstractStrategyAdapter { */ protected void doSaveBatchAlarm(List list){ if(list!=null&&list.size()>0) { - amProblemFiService.saveBatch(list); + List> partion = ListUtil.partition(list,1000); + partion.forEach(p->{ + amProblemFiService.saveBatch(p); + }); } } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/strategy/support/gt/GtGlmqAdapter.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/strategy/support/gt/GtGlmqAdapter.java index 3dcb7f2..bc0707f 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/strategy/support/gt/GtGlmqAdapter.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/service/strategy/support/gt/GtGlmqAdapter.java @@ -75,7 +75,7 @@ public class GtGlmqAdapter extends GtStatusStrategyAdapter { } }else{ // 放散调节阀状态,开度 - if (Double.valueOf(real.getMq1()).compareTo(10.0)==1) { + if (Double.valueOf(real.getMq1()).compareTo(5.0)==1) { n.getAndIncrement(); } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/MsgProducer.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/MsgProducer.java index b2c2b72..b996f8e 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/MsgProducer.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/MsgProducer.java @@ -1,53 +1,53 @@ -//package cn.cecep.talroad.util; -// -//import cn.cecep.talroad.config.ExchangeConfig; -//import cn.cecep.talroad.config.RabbitmqConfig; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.amqp.rabbit.connection.CorrelationData; -//import org.springframework.amqp.rabbit.core.RabbitTemplate; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Component; -// -///** -// * @Auther: cjh -// * @Date: 2022-05-07 15:27 -// * @Class: MsgProducer -// * @Deseription: -// * @Version V1.0 -// */ -//@Slf4j -//@Component -//public class MsgProducer implements RabbitTemplate.ConfirmCallback { -// -// -// @Autowired -// private RabbitTemplate rabbitTemplate; -// -// /** -// * 发送消息-定时判断设备停限产状态 -// * -// * @param uuid -// * @param message 消息 -// */ -// public void sendStatusMsg(String uuid, Object message) { -// rabbitTemplate.setConfirmCallback(this); -// CorrelationData correlationId = new CorrelationData(uuid); -// rabbitTemplate.convertAndSend(ExchangeConfig.DIRECT_EXCHANGE, RabbitmqConfig.ROUTE_KEY_STATUS,message, correlationId); -// } -// -// /** -// * 发送探查消息 -// * @param uuid -// * @param message -// */ -// public void sendYieldStatisticMsg(String uuid, Object message) { -// rabbitTemplate.setConfirmCallback(this); -// CorrelationData correlationId = new CorrelationData(uuid); -// rabbitTemplate.convertAndSend(ExchangeConfig.DIRECT_EXCHANGE, RabbitmqConfig.ROUTE_KEY_YIELD,message, correlationId); -// } -// -// @Override -// public void confirm(CorrelationData correlationData, boolean b, String s) { -// log.info("消息推送交换机状态{},消息ID{}",b,correlationData.getId()); -// } -//} +package cn.cecep.talroad.util; + +import cn.cecep.talroad.config.ExchangeConfig; +import cn.cecep.talroad.config.RabbitmqConfig; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.connection.CorrelationData; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Auther: cjh + * @Date: 2022-05-07 15:27 + * @Class: MsgProducer + * @Deseription: + * @Version V1.0 + */ +@Slf4j +@Component +public class MsgProducer implements RabbitTemplate.ConfirmCallback { + + + @Autowired + private RabbitTemplate rabbitTemplate; + + /** + * 发送消息-定时判断设备停限产状态 + * + * @param uuid + * @param message 消息 + */ + public void sendStatusMsg(String uuid, Object message) { + rabbitTemplate.setConfirmCallback(this); + CorrelationData correlationId = new CorrelationData(uuid); + rabbitTemplate.convertAndSend(ExchangeConfig.DIRECT_EXCHANGE, RabbitmqConfig.ROUTE_KEY_STATUS,message, correlationId); + } + + /** + * 发送探查消息 + * @param uuid + * @param message + */ + public void sendYieldStatisticMsg(String uuid, Object message) { + rabbitTemplate.setConfirmCallback(this); + CorrelationData correlationId = new CorrelationData(uuid); + rabbitTemplate.convertAndSend(ExchangeConfig.DIRECT_EXCHANGE, RabbitmqConfig.ROUTE_KEY_YIELD,message, correlationId); + } + + @Override + public void confirm(CorrelationData correlationData, boolean b, String s) { + log.info("消息推送交换机状态{},消息ID{}",b,correlationData.getId()); + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/QrCodeUtils.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/QrCodeUtils.java index 2380e1f..a898f5c 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/QrCodeUtils.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/QrCodeUtils.java @@ -1,229 +1,229 @@ -//package cn.cecep.talroad.util; -// -//import com.google.zxing.BarcodeFormat; -//import com.google.zxing.EncodeHintType; -//import com.google.zxing.MultiFormatWriter; -//import com.google.zxing.WriterException; -//import com.google.zxing.common.BitMatrix; -//import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -//import org.springframework.web.client.RestTemplate; -// -//import javax.imageio.ImageIO; -//import java.awt.*; -//import java.awt.geom.RoundRectangle2D; -//import java.awt.image.BufferedImage; -//import java.io.ByteArrayOutputStream; -//import java.io.File; -//import java.util.*; -// -///** -// * @Description：二维码工具类 -// * @PACKAGE_NAME: cn.cecep.talroad.utils -// * @date 2021-12-21 11:10*/ -//public class QrCodeUtils { -// -// private static final int BLACK = 0xFF000000; -// private static final int WHITE = 0xFFFFFFFF; -// private static final String CHARSET = "utf-8"; -// private static final String FORMAT_NAME = "JPG"; -// // 二维码尺寸 -// private static final int QRCODE_SIZE = 300; -// // LOGO宽度 -// private static final int WIDTH = 60; -// // LOGO高度 -// private static final int HEIGHT = 60; -// -// private static RestTemplate restTemplate = new RestTemplate(); -// -// -// /** -// * 生成二维码 -// * 经过base64编码 -// * -// * @param url -// * @return -// */ -// public static BufferedImage createQrCode(String url) throws WriterException { -// Map hints = new HashMap(4); -// hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); -// BitMatrix bitMatrix = new MultiFormatWriter().encode(url, BarcodeFormat.QR_CODE, 500, 500, hints); -// -// return toBufferedImage(bitMatrix); -// } -// -// /** -// * 生成二维码 -// * 经过base64编码 -// * -// * @param url -// * @return -// */ -// public static String createQrCodeBase64(String url) { -// String base64String = ""; -// try { -// Map hints = new HashMap(4); -// hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); -// BitMatrix bitMatrix = new MultiFormatWriter().encode(url, BarcodeFormat.QR_CODE, 400, 400, hints); -// ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); -// -// BufferedImage bufferedImage = toBufferedImage(bitMatrix); -// ImageIO.write(bufferedImage, "jpg", outputStream); -// Base64.Encoder encoder = Base64.getEncoder(); -// base64String = encoder.encodeToString(outputStream.toByteArray()); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// //return "data:image/jpg;base64," + base64String; -// return base64String; -// } -// -// private static BufferedImage toBufferedImage(BitMatrix matrix) { -// int width = matrix.getWidth(); -// int height = matrix.getHeight(); -// BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); -// for (int x = 0; x < width; x++) { -// for (int y = 0; y < height; y++) { -// image.setRGB(x, y, matrix.get(x, y) ? BLACK : WHITE); -// } -// } -// return image; -// } -// -// /** -// * 生成二维码(内嵌LOGO) -// * author zhangpeizhi -// * @param content 内容 -// * @param logoFile LOGO文件 -// * @param needCompress 是否压缩LOGO -// * @throws Exception -// */ -// public static String createQrCodeBase64Encode(String content, File logoFile, -// boolean needCompress) throws Exception { -// BufferedImage image = createImage(content, logoFile, -// needCompress); -// -// ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); -// -// ImageIO.write(image, "jpg", outputStream); -// Base64.Encoder encoder = Base64.getEncoder(); -// String base64String = encoder.encodeToString(outputStream.toByteArray()); -// -// return base64String; -// } -// -// -// /** -// * 生成二维码(内嵌LOGO) -// * -// * @param content 内容 -// * @param logoFile LOGO文件 -// * @param destPath 存放目录 -// * @param needCompress 是否压缩LOGO -// * @throws Exception -// */ -// public static String encode(String content, File logoFile, String destPath, -// boolean needCompress) throws Exception { -// BufferedImage image = createImage(content, logoFile, -// needCompress); -// mkdirs(destPath); -// String file = new Random().nextInt(99999999) + ".jpg"; -// ImageIO.write(image, FORMAT_NAME, new File(destPath + "/" + file)); -// return file; -// } -// -// private static BufferedImage createImage(String content, File logoFile, -// boolean needCompress) throws Exception { -// Hashtable hints = new Hashtable(); -// hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); -// hints.put(EncodeHintType.CHARACTER_SET, CHARSET); -// hints.put(EncodeHintType.MARGIN, 1); -// BitMatrix bitMatrix = new MultiFormatWriter().encode(content, -// BarcodeFormat.QR_CODE, QRCODE_SIZE, QRCODE_SIZE, hints); -// int width = bitMatrix.getWidth(); -// int height = bitMatrix.getHeight(); -// BufferedImage image = new BufferedImage(width, height, -// BufferedImage.TYPE_INT_RGB); -// for (int x = 0; x < width; x++) { -// for (int y = 0; y < height; y++) { -// image.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000 -// : 0xFFFFFFFF); -// } -// } -// if (CmUtil.isEmpty(logoFile)) { -// return image; -// } -// // 插入图片 -// insertImage(image, logoFile, needCompress); -// return image; -// } -// -// /** -// * 当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常) -// * -// * @param destPath 存放目录 -// * @date 2013-12-11 上午10:16:36 -// */ -// public static void mkdirs(String destPath) { -// File file = new File(destPath); -// //当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常) -// if (!file.exists() && !file.isDirectory()) { -// file.mkdirs(); -// } -// } -// -// public static class CmUtil{ -// public static boolean isEmpty(File file){ -// if (null == file || 0 == file.length() || !file.exists()) return true; -// return false; -// } -// } -// -// -// /** -// * 插入LOGO -// * -// * @param source 二维码图片 -// * @param logoFile LOGO图片文件 -// * @param needCompress 是否压缩 -// * @throws Exception -// */ -// private static void insertImage(BufferedImage source, File logoFile, -// boolean needCompress) throws Exception { -// -// if (!logoFile.exists()) { -// System.err.println("" + logoFile + " 该文件不存在！"); -// return; -// } -// Image src = ImageIO.read(logoFile); -// int width = src.getWidth(null); -// int height = src.getHeight(null); -// // 压缩LOGO -// if (needCompress) { -// if (width > WIDTH) { -// width = WIDTH; -// } -// if (height > HEIGHT) { -// height = HEIGHT; -// } -// Image image = src.getScaledInstance(width, height, -// Image.SCALE_SMOOTH); -// BufferedImage tag = new BufferedImage(width, height, -// BufferedImage.TYPE_INT_RGB); -// Graphics g = tag.getGraphics(); -// // 绘制缩小后的图 -// g.drawImage(image, 0, 0, null); -// g.dispose(); -// src = image; -// } -// // 插入LOGO -// Graphics2D graph = source.createGraphics(); -// int x = (QRCODE_SIZE - width) / 2; -// int y = (QRCODE_SIZE - height) / 2; -// graph.drawImage(src, x, y, width, height, null); -// Shape shape = new RoundRectangle2D.Float(x, y, width, width, 6, 6); -// graph.setStroke(new BasicStroke(3f)); -// graph.draw(shape); -// graph.dispose(); -// } -// -//} +package cn.cecep.talroad.util; + +import com.google.zxing.BarcodeFormat; +import com.google.zxing.EncodeHintType; +import com.google.zxing.MultiFormatWriter; +import com.google.zxing.WriterException; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import org.springframework.web.client.RestTemplate; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.geom.RoundRectangle2D; +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.util.*; + +/** + * @Description：二维码工具类 + * @PACKAGE_NAME: cn.cecep.talroad.utils + * @date 2021-12-21 11:10*/ +public class QrCodeUtils { + + private static final int BLACK = 0xFF000000; + private static final int WHITE = 0xFFFFFFFF; + private static final String CHARSET = "utf-8"; + private static final String FORMAT_NAME = "JPG"; + // 二维码尺寸 + private static final int QRCODE_SIZE = 300; + // LOGO宽度 + private static final int WIDTH = 60; + // LOGO高度 + private static final int HEIGHT = 60; + + private static RestTemplate restTemplate = new RestTemplate(); + + + /** + * 生成二维码 + * 经过base64编码 + * + * @param url + * @return + */ + public static BufferedImage createQrCode(String url) throws WriterException { + Map hints = new HashMap(4); + hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); + BitMatrix bitMatrix = new MultiFormatWriter().encode(url, BarcodeFormat.QR_CODE, 500, 500, hints); + + return toBufferedImage(bitMatrix); + } + + /** + * 生成二维码 + * 经过base64编码 + * + * @param url + * @return + */ + public static String createQrCodeBase64(String url) { + String base64String = ""; + try { + Map hints = new HashMap(4); + hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); + BitMatrix bitMatrix = new MultiFormatWriter().encode(url, BarcodeFormat.QR_CODE, 400, 400, hints); + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + + BufferedImage bufferedImage = toBufferedImage(bitMatrix); + ImageIO.write(bufferedImage, "jpg", outputStream); + Base64.Encoder encoder = Base64.getEncoder(); + base64String = encoder.encodeToString(outputStream.toByteArray()); + } catch (Exception e) { + e.printStackTrace(); + } + //return "data:image/jpg;base64," + base64String; + return base64String; + } + + private static BufferedImage toBufferedImage(BitMatrix matrix) { + int width = matrix.getWidth(); + int height = matrix.getHeight(); + BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + for (int x = 0; x < width; x++) { + for (int y = 0; y < height; y++) { + image.setRGB(x, y, matrix.get(x, y) ? BLACK : WHITE); + } + } + return image; + } + + /** + * 生成二维码(内嵌LOGO) + * author zhangpeizhi + * @param content 内容 + * @param logoFile LOGO文件 + * @param needCompress 是否压缩LOGO + * @throws Exception + */ + public static String createQrCodeBase64Encode(String content, File logoFile, + boolean needCompress) throws Exception { + BufferedImage image = createImage(content, logoFile, + needCompress); + + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + + ImageIO.write(image, "jpg", outputStream); + Base64.Encoder encoder = Base64.getEncoder(); + String base64String = encoder.encodeToString(outputStream.toByteArray()); + + return base64String; + } + + + /** + * 生成二维码(内嵌LOGO) + * + * @param content 内容 + * @param logoFile LOGO文件 + * @param destPath 存放目录 + * @param needCompress 是否压缩LOGO + * @throws Exception + */ + public static String encode(String content, File logoFile, String destPath, + boolean needCompress) throws Exception { + BufferedImage image = createImage(content, logoFile, + needCompress); + mkdirs(destPath); + String file = new Random().nextInt(99999999) + ".jpg"; + ImageIO.write(image, FORMAT_NAME, new File(destPath + "/" + file)); + return file; + } + + private static BufferedImage createImage(String content, File logoFile, + boolean needCompress) throws Exception { + Hashtable hints = new Hashtable(); + hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); + hints.put(EncodeHintType.CHARACTER_SET, CHARSET); + hints.put(EncodeHintType.MARGIN, 1); + BitMatrix bitMatrix = new MultiFormatWriter().encode(content, + BarcodeFormat.QR_CODE, QRCODE_SIZE, QRCODE_SIZE, hints); + int width = bitMatrix.getWidth(); + int height = bitMatrix.getHeight(); + BufferedImage image = new BufferedImage(width, height, + BufferedImage.TYPE_INT_RGB); + for (int x = 0; x < width; x++) { + for (int y = 0; y < height; y++) { + image.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000 + : 0xFFFFFFFF); + } + } + if (CmUtil.isEmpty(logoFile)) { + return image; + } + // 插入图片 + insertImage(image, logoFile, needCompress); + return image; + } + + /** + * 当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常) + * + * @param destPath 存放目录 + * @date 2013-12-11 上午10:16:36 + */ + public static void mkdirs(String destPath) { + File file = new File(destPath); + //当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常) + if (!file.exists() && !file.isDirectory()) { + file.mkdirs(); + } + } + + public static class CmUtil{ + public static boolean isEmpty(File file){ + if (null == file || 0 == file.length() || !file.exists()) return true; + return false; + } + } + + + /** + * 插入LOGO + * + * @param source 二维码图片 + * @param logoFile LOGO图片文件 + * @param needCompress 是否压缩 + * @throws Exception + */ + private static void insertImage(BufferedImage source, File logoFile, + boolean needCompress) throws Exception { + + if (!logoFile.exists()) { + System.err.println("" + logoFile + " 该文件不存在！"); + return; + } + Image src = ImageIO.read(logoFile); + int width = src.getWidth(null); + int height = src.getHeight(null); + // 压缩LOGO + if (needCompress) { + if (width > WIDTH) { + width = WIDTH; + } + if (height > HEIGHT) { + height = HEIGHT; + } + Image image = src.getScaledInstance(width, height, + Image.SCALE_SMOOTH); + BufferedImage tag = new BufferedImage(width, height, + BufferedImage.TYPE_INT_RGB); + Graphics g = tag.getGraphics(); + // 绘制缩小后的图 + g.drawImage(image, 0, 0, null); + g.dispose(); + src = image; + } + // 插入LOGO + Graphics2D graph = source.createGraphics(); + int x = (QRCODE_SIZE - width) / 2; + int y = (QRCODE_SIZE - height) / 2; + graph.drawImage(src, x, y, width, height, null); + Shape shape = new RoundRectangle2D.Float(x, y, width, width, 6, 6); + graph.setStroke(new BasicStroke(3f)); + graph.draw(shape); + graph.dispose(); + } + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/StatusConsumer.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/StatusConsumer.java index 99e0292..38d5e79 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/StatusConsumer.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/StatusConsumer.java @@ -1,47 +1,48 @@ -//package cn.cecep.talroad.util; +package cn.cecep.talroad.util; + +import com.rabbitmq.client.Channel; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener; +import org.springframework.stereotype.Component; + +/** + * @Auther: cjh + * @Date: 2023-04-17 11:02 + * @Class: MsgReceiver + * @Deseription: 停限产状态消息消费 + * @Version V1.0 + */ +@Slf4j +@Component +public class StatusConsumer implements ChannelAwareMessageListener { + + + @Override + //@RabbitListener(queues = "status-queue") + public void onMessage(Message message, Channel channel) throws Exception { +// try { +// String deviceId = new String(message.getBody()); +// BasDevice d = deviceMapper.selectById(deviceId); +// PcFactory p = pcFactoryMapper.selectPcFactoryById(d.getFactoryId()); // -//import com.rabbitmq.client.Channel; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.amqp.core.Message; -//import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener; -//import org.springframework.stereotype.Component; +// QueryWrapper paramWrapper = new QueryWrapper<>(); +// paramWrapper.eq("industry", d.getIndustry()); +// paramWrapper.eq("device_id", d.getDeviceId()); +// paramWrapper.eq("device_type",d.getType()); +// List paramList = basDeviceParamMapper.selectList(paramWrapper); +// //拼接策略服务名称 +// String strategyName = StringUtils.upperCase(d.getIndustry() + d.getType()); +// //执行策略，处理设备状态 +// strategyFactory.getByName(strategyName).doCheckProcess(p, d, paramList); // -///** -// * @Auther: cjh -// * @Date: 2023-04-17 11:02 -// * @Class: MsgReceiver -// * @Deseription: 停限产状态消息消费 -// * @Version V1.0 -// */ -//@Slf4j -//@Component -//public class StatusConsumer implements ChannelAwareMessageListener { -// -// -// @Override -// //@RabbitListener(queues = "status-queue") -// public void onMessage(Message message, Channel channel) throws Exception { -//// try { -//// String deviceId = new String(message.getBody()); -//// BasDevice d = deviceMapper.selectById(deviceId); -//// PcFactory p = pcFactoryMapper.selectPcFactoryById(d.getFactoryId()); -//// -//// QueryWrapper paramWrapper = new QueryWrapper<>(); -//// paramWrapper.eq("industry", d.getIndustry()); -//// paramWrapper.eq("device_id", d.getDeviceId()); -//// paramWrapper.eq("device_type",d.getType()); -//// List paramList = basDeviceParamMapper.selectList(paramWrapper); -//// //拼接策略服务名称 -//// String strategyName = StringUtils.upperCase(d.getIndustry() + d.getType()); -//// //执行策略，处理设备状态 -//// strategyFactory.getByName(strategyName).doCheckProcess(p, d, paramList); -//// -//// } catch (Exception e) { -//// log.error("MsgReceiver.onMessage##失败:" + e.getMessage()); -//// } finally { -//// //ACK 手动签收消息，告诉对方消息签收成功,唯一标识ID -//// Long deliverTag = message.getMessageProperties().getDeliveryTag(); -//// channel.basicAck(deliverTag, false); -//// } -// } -//} +// } catch (Exception e) { +// log.error("MsgReceiver.onMessage##失败:" + e.getMessage()); +// } finally { +// //ACK 手动签收消息，告诉对方消息签收成功,唯一标识ID +// Long deliverTag = message.getMessageProperties().getDeliveryTag(); +// channel.basicAck(deliverTag, false); +// } + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/YieldConsumer.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/YieldConsumer.java index 82ab06a..a8d9a83 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/YieldConsumer.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/YieldConsumer.java @@ -1,52 +1,52 @@ -//package cn.cecep.talroad.util; -// -//import cn.cecep.talroad.common.core.utils.StringUtils; -//import cn.cecep.talroad.service.IBasDeviceService; -//import cn.cecep.talroad.service.strategy.StrategyFactory; -//import cn.cecep.talroad.vo.FactoryDeviceVo; -//import com.rabbitmq.client.Channel; -//import lombok.extern.slf4j.Slf4j; -//import org.springframework.amqp.core.Message; -//import org.springframework.amqp.rabbit.annotation.RabbitListener; -//import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Component; -// -///** -// * @Auther: cjh -// * @Date: 2023-04-17 11:02 -// * @Class: MsgReceiver -// * @Deseription: 产量统计消息消费 -// * @Version V1.0 -// */ -//@Slf4j -//@Component -//public class YieldConsumer implements ChannelAwareMessageListener { -// -// @Autowired -// private IBasDeviceService basDeviceService; -// @Autowired -// private StrategyFactory strategyFactory; -// -// @Override -// @RabbitListener(queues = "yield-queue") -// public void onMessage(Message message, Channel channel) throws Exception { -// String deviceId = new String(message.getBody()); -// try { -// FactoryDeviceVo vo = basDeviceService.selectFactoryDeviceVoByDeviceId(deviceId); -// -// //拼接策略服务名称 -// String strategyName = StringUtils.upperCase(vo.getIndustry() + vo.getDeviceType() + vo.getDeviceType()); -// log.info("开始消费者-产量统计-行业："+vo.getIndustry()+",设备类型:"+vo.getDeviceType()); -// //执行策略，处理设备状态 -// strategyFactory.getByName(strategyName).doCheckProcessYield(vo); -// -// } catch (Exception e) { -// log.error("MsgReceiver.onMessage##设备ID:"+ deviceId+"##异常信息:"+ e.getMessage()); -// } finally { -// //ACK 手动签收消息，告诉对方消息签收成功,唯一标识ID -// Long deliverTag = message.getMessageProperties().getDeliveryTag(); -// channel.basicAck(deliverTag, false); -// } -// } -//} +package cn.cecep.talroad.util; + +import cn.cecep.talroad.common.core.utils.StringUtils; +import cn.cecep.talroad.service.IBasDeviceService; +import cn.cecep.talroad.service.strategy.StrategyFactory; +import cn.cecep.talroad.vo.FactoryDeviceVo; +import com.rabbitmq.client.Channel; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Auther: cjh + * @Date: 2023-04-17 11:02 + * @Class: MsgReceiver + * @Deseription: 产量统计消息消费 + * @Version V1.0 + */ +@Slf4j +@Component +public class YieldConsumer implements ChannelAwareMessageListener { + + @Autowired + private IBasDeviceService basDeviceService; + @Autowired + private StrategyFactory strategyFactory; + + @Override + @RabbitListener(queues = "yield-queue") + public void onMessage(Message message, Channel channel) throws Exception { + String deviceId = new String(message.getBody()); + try { + FactoryDeviceVo vo = basDeviceService.selectFactoryDeviceVoByDeviceId(deviceId); + + //拼接策略服务名称 + String strategyName = StringUtils.upperCase(vo.getIndustry() + vo.getDeviceType() + vo.getDeviceType()); + log.info("开始消费者-产量统计-行业："+vo.getIndustry()+",设备类型:"+vo.getDeviceType()); + //执行策略，处理设备状态 + strategyFactory.getByName(strategyName).doCheckProcessYield(vo); + + } catch (Exception e) { + log.error("MsgReceiver.onMessage##设备ID:"+ deviceId+"##异常信息:"+ e.getMessage()); + } finally { + //ACK 手动签收消息，告诉对方消息签收成功,唯一标识ID + Long deliverTag = message.getMessageProperties().getDeliveryTag(); + channel.basicAck(deliverTag, false); + } + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/ZipUtils.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/ZipUtils.java new file mode 100644 index 0000000..fce5c47 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/util/ZipUtils.java @@ -0,0 +1,57 @@ +package cn.cecep.talroad.util; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +/** + * @describe 压缩多个文件 + * @author 张小张 + * @date 2023/07/18 18:10 + */ +public class ZipUtils { + public static void downloadAndZipFiles(HttpServletResponse response, List filePaths, String zipFileName) { + try { + // 设置响应头，告诉浏览器这是一个压缩文件，用于下载 + response.setContentType("application/zip"); + response.setHeader("Content-Disposition", "attachment; filename=" + zipFileName); + + // 创建ZipOutputStream对象 + ZipOutputStream zipOut = new ZipOutputStream(response.getOutputStream()); + + // 将文件逐个添加到压缩包中 + for (String filePath : filePaths) { + File file = new File(filePath); + if (file.exists()) { + addToZip(zipOut, file); + } + } + + // 关闭ZipOutputStream + zipOut.close(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + private static void addToZip(ZipOutputStream zipOut, File file) throws IOException { + FileInputStream fis = new FileInputStream(file); + ZipEntry zipEntry = new ZipEntry(file.getName()); + zipOut.putNextEntry(zipEntry); + + byte[] bytes = new byte[1024]; + int length; + while ((length = fis.read(bytes)) >= 0) { + zipOut.write(bytes, 0, length); + } + + fis.close(); + zipOut.closeEntry(); + } + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/AmProblemFiVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/AmProblemFiVo.java index 797ab33..b6f3494 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/AmProblemFiVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/AmProblemFiVo.java @@ -1,6 +1,7 @@ package cn.cecep.talroad.vo; import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.domain.AmProblemFiVideo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -136,10 +137,10 @@ public class AmProblemFiVo private String modelValidVideo; @ApiModelProperty(value = "监控视频截图") - private List> videoPictures; + private List videoPictures; @ApiModelProperty(value = "监控视频回放") - private List> videos; + private List videos; @ApiModelProperty("AI输入数据开始时间") private String inputStartTime; diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainHazardousSolidWasteFaVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainHazardousSolidWasteFaVo.java index dcbb506..4248cd4 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainHazardousSolidWasteFaVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainHazardousSolidWasteFaVo.java @@ -98,7 +98,7 @@ public class BMainHazardousSolidWasteFaVo @ApiModelProperty(value = "许可管理类别") /** 许可管理类别 */ - @Excel(name = "管理类别",sort = 3) + @Excel(name = "管理类别",sort = 3,readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") private String licenseManType; @ApiModelProperty(value = "是否位于工业园区") /** 是否位于工业园区 */ diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainHazardousSolidWasteVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainHazardousSolidWasteVo.java index 5ada49c..8587151 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainHazardousSolidWasteVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainHazardousSolidWasteVo.java @@ -107,7 +107,7 @@ public class BMainHazardousSolidWasteVo @ApiModelProperty(value = "许可管理类别") /** 许可管理类别 */ - @Excel(name = "管理类别",sort = 3) + @Excel(name = "管理类别",sort = 3,readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") private String licenseManType; @ApiModelProperty(value = "是否位于工业园区") /** 是否位于工业园区 */ diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisEmlRecordVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisEmlRecordVo.java index 4b362de..712e259 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisEmlRecordVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisEmlRecordVo.java @@ -96,7 +96,7 @@ public class BMainPollDisEmlRecordVo @ApiModelProperty(value = "许可管理类别") /** 许可管理类别 */ - @Excel(name = "管理类别",sort = 3) + @Excel(name = "管理类别",sort = 3,readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") private String licenseManType; @ApiModelProperty(value = "是否位于工业园区") /** 是否位于工业园区 */ diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisEnforcementVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisEnforcementVo.java index 5048af2..8198149 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisEnforcementVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisEnforcementVo.java @@ -86,7 +86,7 @@ public class BMainPollDisEnforcementVo @ApiModelProperty(value = "许可管理类别") /** 许可管理类别 */ - @Excel(name = "管理类别",sort = 3) + @Excel(name = "管理类别",sort = 3,readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") private String licenseManType; @ApiModelProperty(value = "是否位于工业园区") /** 是否位于工业园区 */ diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisInformationVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisInformationVo.java index 14023d1..af17522 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisInformationVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisInformationVo.java @@ -83,7 +83,7 @@ public class BMainPollDisInformationVo @ApiModelProperty(value = "许可管理类别") /** 许可管理类别 */ - @Excel(name = "管理类别",sort = 3) + @Excel(name = "管理类别",sort = 3,readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") private String licenseManType; @ApiModelProperty(value = "是否位于工业园区") /** 是否位于工业园区 */ diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisNoiseRegulationVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisNoiseRegulationVo.java index fc6dbc7..0c7620a 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisNoiseRegulationVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainPollDisNoiseRegulationVo.java @@ -75,7 +75,7 @@ public class BMainPollDisNoiseRegulationVo @ApiModelProperty(value = "许可管理类别") /** 许可管理类别 */ - @Excel(name = "管理类别",sort = 3) + @Excel(name = "管理类别",sort = 3,readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") private String licenseManType; @ApiModelProperty(name = "排污许可行业名称") diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainProductionOrganizGasVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainProductionOrganizGasVo.java index 45cf517..c2710d5 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainProductionOrganizGasVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainProductionOrganizGasVo.java @@ -1,5 +1,6 @@ package cn.cecep.talroad.vo; +import cn.cecep.talroad.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -75,4 +76,92 @@ public class BMainProductionOrganizGasVo @ApiModelProperty(value = "污染物种类") /** 污染物种类 */ private String pollutionType; + + @ApiModel(value = "排污许可-废气排污节点及治理设施信息vo") + @Data + public static class PwxkCzp { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "产污设施编号") + @Excel(name = "产污设施编号", sort = 70) + private String proFacilityCode; + + @ApiModelProperty(value = "生产设施名称") + @Excel(name = "产污设施名称", sort = 80) + private String proFacilityName; + + @ApiModelProperty(value = "对应产污环节名称") + @Excel(name = "对应产污环节名称", sort = 90) + private String pollutionProductionLink; + + @ApiModelProperty(value = "污染物种类") + @Excel(name = "污染物种类", sort = 100) + private String pollutionType; + + @ApiModelProperty(value = "排放形式") + @Excel(name = "排放形式", sort = 110) + private String emissionsForm; + + @ApiModelProperty(value = "治理设施编号") + @Excel(name = "污染防治设施编号", sort = 120, parentName = "污染治理设施") + private String cepFacilityCode; + + @ApiModelProperty(value = "治理设施名称") + @Excel(name = "污染防治设施名称", sort = 130, parentName = "污染治理设施") + private String cepFacilityName; + + @ApiModelProperty(value = "治理设施工艺") + @Excel(name = "污染治理设施工艺", sort = 140, parentName = "污染治理设施") + private String cepFacilityCraft; + + @ApiModelProperty(value = "排放口编号") + @Excel(name = "有组织排放口编号", sort = 150) + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + @Excel(name = "有组织排放口名称", sort = 160) + private String outletName; + + @ApiModelProperty(value = "排放口设置是否符合要求 0:否, 1:是") + @Excel(name = "排放口设置是否符合要求", readConverterExp = "1=是,0=否", sort = 170) + private String whetherOutletRequirements; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + @Excel(name = "排口类型", readConverterExp = "1=主要排口,2=一般排口", sort = 180) + private String outletTypes; + + @ApiModelProperty(value = "其他信息") + @Excel(name = "其他信息", sort = 190) + private String moreDetails; + } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainProductionWaterVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainProductionWaterVo.java index 81d6698..bf59fca 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainProductionWaterVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BMainProductionWaterVo.java @@ -1,5 +1,6 @@ package cn.cecep.talroad.vo; +import cn.cecep.talroad.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -63,4 +64,92 @@ public class BMainProductionWaterVo /** 废水类别 */ private String waterType; + @ApiModel(value = "排污许可-废水类别及治理设施信息vo") + @Data + public static class PwxkCzp { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "废水类别") + @Excel(name = "废水类别", sort = 70) + private String waterType; + + @ApiModelProperty(value = "污染物种类") + @Excel(name = "污染物种类", sort = 100) + private String pollutionType; + + @ApiModelProperty(value = "治理设施编号") + @Excel(name = "污染治理设施编号", sort = 120, parentName = "污染治理设施") + private String cepFacilityCode; + + @ApiModelProperty(value = "治理设施名称") + @Excel(name = "污染治理设施名称", sort = 130, parentName = "污染治理设施") + private String cepFacilityName; + + @ApiModelProperty(value = "治理设施工艺") + @Excel(name = "污染治理设施工艺", sort = 140, parentName = "污染治理设施") + private String cepFacilityCraft; + + @ApiModelProperty(value = "排水去向") + @Excel(name = "排水去向", sort = 120) + private String directionDrainage; + + @ApiModelProperty(value = "排放形式。 直接排放/间接排放") + @Excel(name = "排放形式", sort = 125) + private String emissionsForm; + + @ApiModelProperty(value = "排放规律") + @Excel(name = "排放规律", sort = 130) + private String dischargeLaw; + + @ApiModelProperty(value = "排放口编号") + @Excel(name = "排放口编号", sort = 140) + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + @Excel(name = "排放口名称", sort = 150) + private String outletName; + + @ApiModelProperty(value = "排放口设置是否符合要求 0:否, 1:是") + @Excel(name = "排放口设置是否符合要求", readConverterExp = "1=是,0=否", sort = 160) + private String whetherOutletRequirements; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + @Excel(name = "排口类型", readConverterExp = "1=主要排口,2=一般排口", sort = 170) + private String outletTypes; + + @ApiModelProperty(value = "其他信息") + @Excel(name = "其他信息", sort = 190) + private String moreDetails; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkBoilerFuelGasVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkBoilerFuelGasVo.java new file mode 100644 index 0000000..d856567 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkBoilerFuelGasVo.java @@ -0,0 +1,42 @@ +package cn.cecep.talroad.vo; + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.annotation.ExcelNew; +import cn.cecep.talroad.domain.BStatTablePwxkBoilerFuelGas; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BStatTablePwxkBoilerFuelGasVo extends BStatTablePwxkBoilerFuelGas { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkBoilerFuelSolidLiquidVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkBoilerFuelSolidLiquidVo.java new file mode 100644 index 0000000..c9d47a5 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkBoilerFuelSolidLiquidVo.java @@ -0,0 +1,43 @@ +package cn.cecep.talroad.vo; + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.common.core.annotation.ExcelNew; +import cn.cecep.talroad.domain.BStatTablePwxkBoilerFuelSolidLiquid; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BStatTablePwxkBoilerFuelSolidLiquidVo extends BStatTablePwxkBoilerFuelSolidLiquid { + + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkFuelVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkFuelVo.java new file mode 100644 index 0000000..9dc9340 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkFuelVo.java @@ -0,0 +1,45 @@ +package cn.cecep.talroad.vo; + +import cn.cecep.talroad.common.core.annotation.ExcelNew; +import cn.cecep.talroad.domain.BStatTablePwxkFuel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BStatTablePwxkFuelVo extends BStatTablePwxkFuel { + /** 排污单位名称 */ + @ApiModelProperty(value = "排污单位名称") + @ExcelNew(needMerge = true,name = "排污单位名称",sort = 2) + private String factoryName; + + + @ApiModelProperty(value = "县名称") + /** 县名称 */ + @ExcelNew(needMerge = true,name = "所在区县",sort = 4) + private String countryName; + @ApiModelProperty(value = "许可管理类别") + /** 许可管理类别 */ + @ExcelNew(needMerge = true,name = "管理类别",sort = 3,readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") + private String licenseManType; + + @ApiModelProperty(name = "排污许可行业名称") + @ExcelNew(needMerge = true,name = "行业",sort = 8) + private String industryPermissionName; + @ApiModelProperty(value = "工业园区名称") + /** 工业园区名称 */ + @ExcelNew(needMerge = true,name = "所属工业园区名称",sort = 6) + private String industrialParkName; + + @ApiModelProperty(value = "工业园区编码") + /** 工业园区编码 */ + @ExcelNew(needMerge = true,name = "所属工业园区编码",sort = 7) + private String industrialParkCode; + @ApiModelProperty(value = "所属流域") + /** 工业园区编码 */ + @ExcelNew(needMerge = true,name = "所属流域",sort = 5) + private String riverBasin; + @ApiModelProperty(value = "排污许可证编码") + /** 排污许可证编码 */ + @ExcelNew(needMerge = true,name = "许可证编号",sort = 1) + private String pollDisLicenseCode; +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkProductionFacilitiesVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkProductionFacilitiesVo.java index f882f18..203d0b6 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkProductionFacilitiesVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkProductionFacilitiesVo.java @@ -1,58 +1,61 @@ package cn.cecep.talroad.vo; -//import cn.cecep.talroad.common.core.annotation.ExcelNew; +import cn.cecep.talroad.common.core.annotation.Excel; import cn.cecep.talroad.domain.BStatTablePwxkProductionFacilitiesParams; import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data +@ApiModel(value = "生产设施信息") public class BStatTablePwxkProductionFacilitiesVo { private Long id; - @ApiModelProperty(value = "排污单位名称") + /** 排污单位名称 */ -// @ExcelNew(needMerge = true,name = "排污单位名称",sort = 2) + @ApiModelProperty(value = "排污单位名称") + @Excel(name = "排污单位名称",sort = 2) private String factoryName; + @ApiModelProperty(value = "县名称") /** 县名称 */ -// @ExcelNew(needMerge = true,name = "所在区县",sort = 4) + @Excel(name = "所在区县",sort = 4) private String countryName; - @ApiModelProperty(value = "许可管理类别") /** 许可管理类别 */ -// @ExcelNew(needMerge = true,name = "管理类别",sort = 3) + @Excel(name = "管理类别",sort = 3,readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") private String licenseManType; @ApiModelProperty(name = "排污许可行业名称") -// @ExcelNew(needMerge = true,name = "行业",sort = 8) + @Excel(name = "行业",sort = 8) private String industryPermissionName; @ApiModelProperty(value = "工业园区名称") /** 工业园区名称 */ -// @ExcelNew(needMerge = true,name = "所属工业园区名称",sort = 6) + @Excel(name = "所属工业园区名称",sort = 6) private String industrialParkName; @ApiModelProperty(value = "工业园区编码") /** 工业园区编码 */ -// @ExcelNew(needMerge = true,name = "所属工业园区编码",sort = 7) + @Excel(name = "所属工业园区编码",sort = 7) private String industrialParkCode; @ApiModelProperty(value = "所属流域") /** 工业园区编码 */ -// @ExcelNew(needMerge = true,name = "所属流域",sort = 5) + @Excel(name = "所属流域",sort = 5) private String riverBasin; @ApiModelProperty(value = "排污许可证编码") /** 排污许可证编码 */ -// @ExcelNew(needMerge = true,name = "许可证编号",sort = 1) + @Excel(name = "许可证编号",sort = 1) private String pollDisLicenseCode; /** * 生产线类型 */ @TableField(value = "production_line_type") @ApiModelProperty(value = "生产线类型") -// @ExcelNew(needMerge = true,name = "生产线类型",sort = 9) + @Excel(name = "生产线类型",sort = 9) private String productionLineType; /** @@ -60,7 +63,7 @@ public class BStatTablePwxkProductionFacilitiesVo { */ @TableField(value = "production_line_code") @ApiModelProperty(value = "生产线编号") -// @ExcelNew(needMerge = true,name = "生产线编号",sort = 10) + @Excel(name = "生产线编号",sort = 10) private String productionLineCode; /** @@ -68,7 +71,7 @@ public class BStatTablePwxkProductionFacilitiesVo { */ @TableField(value = "production_unit_name") @ApiModelProperty(value = "主要生产单元名称") -// @ExcelNew(needMerge = true,name = "主要生产单元名称",sort = 11) + @Excel(name = "主要生产单元名称",sort = 11) private String productionUnitName; /** @@ -76,7 +79,7 @@ public class BStatTablePwxkProductionFacilitiesVo { */ @TableField(value = "craft_name") @ApiModelProperty(value = "主要工艺名称") -// @ExcelNew(needMerge = true,name = "主要工艺名称",sort = 12) + @Excel(name = "主要工艺名称",sort = 12) private Short craftName; /** @@ -84,7 +87,7 @@ public class BStatTablePwxkProductionFacilitiesVo { */ @TableField(value = "facility_name") @ApiModelProperty(value = "生产设施名称") -// @ExcelNew(needMerge = true,name = "生产设施名称",sort = 13) + @Excel(name = "生产设施名称",sort = 13) private String facilityName; /** @@ -92,7 +95,7 @@ public class BStatTablePwxkProductionFacilitiesVo { */ @TableField(value = "trade_secrets") @ApiModelProperty(value = "是否涉及商业秘密（0否1是）") -// @ExcelNew(needMerge = true,name = "是否涉及商业秘密",sort = 14,readConverterExp = "0=否,1=是") + @Excel(name = "是否涉及商业秘密",sort = 14,readConverterExp = "0=否,1=是") private String tradeSecrets; /** @@ -100,7 +103,7 @@ public class BStatTablePwxkProductionFacilitiesVo { */ @TableField(value = "production_facility_code") @ApiModelProperty(value = "生产设施编号") -// @ExcelNew(needMerge = true,name = "生产设施编号",sort = 15) + @Excel(name = "生产设施编号",sort = 15) private String productionFacilityCode; /** @@ -108,7 +111,7 @@ public class BStatTablePwxkProductionFacilitiesVo { */ @TableField(value = "other_facility_info") @ApiModelProperty(value = "其他设施信息") -// @ExcelNew(needMerge = true,name = "其他设施信息",sort = 17) + @Excel(name = "其他设施信息",sort = 17) private String otherFacilityInfo; /** @@ -116,9 +119,10 @@ public class BStatTablePwxkProductionFacilitiesVo { */ @TableField(value = "other_craft_info") @ApiModelProperty(value = "其他工艺信息") -// @ExcelNew(needMerge = true,name = "其他工艺信息",sort = 18) + @Excel(name = "其他工艺信息",sort = 18) private String otherCraftInfo; -// @ExcelNew(name = "设施参数",sort = 19) + @Excel(name = "设施参数",sort = 16,parentName = "设施参数") + @ApiModelProperty(value = "设施参数") private List params; } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkProductsVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkProductsVo.java index f84a2a4..3472725 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkProductsVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkProductsVo.java @@ -33,7 +33,7 @@ public class BStatTablePwxkProductsVo extends BStatTablePwxkProducts { @ApiModelProperty(value = "许可管理类别") /** 许可管理类别 */ - @Excel(name = "管理类别",sort = 3) + @Excel(name = "管理类别",sort = 3,readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") private String licenseManType; @ApiModelProperty(value = "是否位于工业园区") /** 是否位于工业园区 */ diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkRawMaterialVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkRawMaterialVo.java new file mode 100644 index 0000000..ee9cdeb --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTablePwxkRawMaterialVo.java @@ -0,0 +1,62 @@ +package cn.cecep.talroad.vo; + +import cn.cecep.talroad.common.core.annotation.Excel; +import cn.cecep.talroad.domain.BStatTablePwxkRawMaterial; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BStatTablePwxkRawMaterialVo extends BStatTablePwxkRawMaterial { + @ApiModelProperty(value = "排污单位名称") + /** 排污单位名称 */ + @Excel(name = "排污单位名称",sort = 2) + private String factoryName; + @ApiModelProperty(value = "市编码") + /** 市编码 */ + private String cityCode; + + + @ApiModelProperty(value = "市名称") + /** 市名称 */ + private String cityName; + + + @ApiModelProperty(value = "县编码") + /** 县编码 */ + private String countryCode; + + + @ApiModelProperty(value = "县名称") + /** 县名称 */ + @Excel(name = "所在区县",sort = 4) + private String countryName; + + @ApiModelProperty(value = "许可管理类别") + /** 许可管理类别 */ + @Excel(name = "管理类别",sort = 3,readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") + private String licenseManType; + @ApiModelProperty(value = "是否位于工业园区") + /** 是否位于工业园区 */ + private String whetherLocalPark; + @ApiModelProperty(name = "排污许可行业名称") + @Excel(name = "行业类别",sort = 8) + private String industryPermissionName; + @ApiModelProperty(value = "工业园区名称") + /** 工业园区名称 */ + @Excel(name = "所属工业园区名称",sort = 6) + private String industrialParkName; + + @ApiModelProperty(value = "工业园区编码") + /** 工业园区编码 */ + @Excel(name = "所属工业园区编码",sort = 7) + private String industrialParkCode; + @ApiModelProperty(value = "所属流域") + /** 工业园区编码 */ + @Excel(name = "所属流域",sort = 5) + private String riverBasin; + @ApiModelProperty(value = "排污许可证编码") + /** 排污许可证编码 */ + @Excel(name = "许可证编号",sort = 1) + private String pollDisLicenseCode; +} + diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionSpeedVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionSpeedVo.java new file mode 100644 index 0000000..3820784 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionSpeedVo.java @@ -0,0 +1,95 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--有组织废气污染物排放速率监测对象 b_stat_table_zxbg_gas_emission_speed + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--有组织废气污染物排放速率监测") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgGasEmissionSpeedVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "排放口编码") + /** 排放口编码 */ + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + /** 排放口名称 */ + private String outletName; + + @ApiModelProperty(value = "备注") + /** 备注 */ + private String remark; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + + @ApiModelProperty(value = "污染物名称") + /** 污染物名称 */ + private String pollutantName; + + @ApiModelProperty(value = "污染物编码") + /** 污染物编码 */ + private String pollutantCode; + + @ApiModelProperty(value = "许可排放浓度限值") + /** 许可排放浓度限值 */ + private String emissionConcentration; + + @ApiModelProperty(value = "有效监测数据(小时值)数量") + /** 有效监测数据(小时值)数量 */ + private String effectivelyHour; + + @ApiModelProperty(value = "实际排放速率最小值") + /** 实际排放速率最小值 */ + private String detectionMinHour; + + @ApiModelProperty(value = "实际排放速率最大值") + /** 实际排放速率最大值 */ + private String detectionMaxHour; + + @ApiModelProperty(value = "实际排放速率平均值") + /** 实际排放速率平均值 */ + private String detectionAvgHour; + + @ApiModelProperty(value = "超标数据个数") + /** 超标数据个数 */ + private String exceededData; + + @ApiModelProperty(value = "超标率（%）") + /** 超标率（%） */ + private String exceededRate; + + @ApiModelProperty(value = "超标原因") + /** 超标原因 */ + private String exceededCause; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionStatisticsVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionStatisticsVo.java new file mode 100644 index 0000000..ad09d83 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionStatisticsVo.java @@ -0,0 +1,87 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计对象 b_stat_table_zxbg_gas_emission_statistics + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgGasEmissionStatisticsVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "类型") + /** 类型 */ + private String zxbgPollutantType; + + @ApiModelProperty(value = "污染物名称") + /** 污染物名称 */ + private String pollutantName; + + @ApiModelProperty(value = "设施名称") + /** 设施名称 */ + private String facilityName; + + @ApiModelProperty(value = "生产设施/无组织排放编号") + /** 生产设施/无组织排放编号 */ + private String facilitiesCode; + + @ApiModelProperty(value = "监测时间") + /** 监测时间 */ + private String monitoringTime; + + @ApiModelProperty(value = "监测次数") + /** 监测次数 */ + private Long monitoringNumber; + + @ApiModelProperty(value = "许可排放浓度限值") + /** 许可排放浓度限值 */ + private String emissionConcentration; + + @ApiModelProperty(value = "浓度监测结果（小时浓度）") + /** 浓度监测结果（小时浓度） */ + private String monitoringResultsHour; + + @ApiModelProperty(value = "浓度监测结果（折标，小时浓度）") + /** 浓度监测结果（折标，小时浓度） */ + private String monitoringFoldsHour; + + @ApiModelProperty(value = "是否超标:0否1是") + /** 是否超标:0否1是 */ + private String isExceeded; + + @ApiModelProperty(value = "备注") + /** 备注 */ + private String remark; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionVo.java new file mode 100644 index 0000000..87eb3aa --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGasEmissionVo.java @@ -0,0 +1,139 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据对象 b_stat_table_zxbg_gas_emission + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--有组织废气污染物排放浓度监测数据") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgGasEmissionVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "类型") + /** 类型 */ + private String zxbgPollutantType; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + + @ApiModelProperty(value = "备注") + /** 备注 */ + private String remark; + + @ApiModelProperty(value = "排放口编码") + /** 排放口编码 */ + private String outletCode; + + @ApiModelProperty(value = "污染物名称") + /** 污染物名称 */ + private String pollutantName; + + @ApiModelProperty(value = "监测设施:手工、自动") + /** 监测设施:手工、自动 */ + private String monitoringFacilities; + + @ApiModelProperty(value = "设施名称") + /** 设施名称 */ + private String facilityName; + + @ApiModelProperty(value = "许可排放浓度限值") + /** 许可排放浓度限值 */ + private String emissionConcentration; + + @ApiModelProperty(value = "有效监测数据(小时值)数量") + /** 有效监测数据(小时值)数量 */ + private String effectivelyHour; + + @ApiModelProperty(value = "检测结果（小时浓度）最小值mg/m3") + /** 检测结果（小时浓度）最小值mg/m3 */ + private String detectionMinHour; + + @ApiModelProperty(value = "检测结果（小时浓度）最大值mg/m3") + /** 检测结果（小时浓度）最大值mg/m3 */ + private String detectionMaxHour; + + @ApiModelProperty(value = "检测结果（小时浓度）平均值") + /** 检测结果（小时浓度）平均值 */ + private String detectionAvgHour; + + @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）最小值") + /** 监测结果（折标，小时浓度,mg/Nm3）最小值 */ + private String foldsMinHour; + + @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）最大值") + /** 监测结果（折标，小时浓度,mg/Nm3）最大值 */ + private String foldsMaxHour; + + @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）平均值") + /** 监测结果（折标，小时浓度,mg/Nm3）平均值 */ + private String foldsAvgHour; + + @ApiModelProperty(value = "超标数据个数") + /** 超标数据个数 */ + private String exceededData; + + @ApiModelProperty(value = "超标率（%）") + /** 超标率（%） */ + private String exceededRate; + + @ApiModelProperty(value = "实际产生量（吨）") + /** 实际产生量（吨） */ + private String actualAmount; + + @ApiModelProperty(value = "实际排放量（吨）") + /** 实际排放量（吨） */ + private String actualEmissions; + + @ApiModelProperty(value = "监测仪器名称或型号") + /** 监测仪器名称或型号 */ + private String instrumentName; + + @ApiModelProperty(value = "手工监测采样方法及个数") + /** 手工监测采样方法及个数 */ + private String samplingMethod; + + @ApiModelProperty(value = "手工测定方法") + /** 手工测定方法 */ + private String manualMethod; + + @ApiModelProperty(value = "监测设备测量范围(mg/m3)") + /** 监测设备测量范围(mg/m3) */ + private String deviceRange; + + @ApiModelProperty(value = "监测设备准确度") + /** 监测设备准确度 */ + private String deviceAccuracy; + + @ApiModelProperty(value = "监测设备检出下限mg/m3") + /** 监测设备检出下限mg/m3 */ + private String deviceCheckout; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGtFuelVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGtFuelVo.java new file mode 100644 index 0000000..818332f --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGtFuelVo.java @@ -0,0 +1,60 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--钢铁-燃料分析对象 b_stat_table_zxbg_gt_fuel + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--钢铁-燃料分析") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgGtFuelVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "记录内容") + /** 记录内容 */ + private String recordContent; + + @ApiModelProperty(value = "名称") + /** 名称 */ + private String name; + + @ApiModelProperty(value = "具体情况") + /** 具体情况 */ + private String specificInformation; + + + @ApiModelProperty(value = "备注") + /** 备注 */ + private String remark; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGtProductionVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGtProductionVo.java new file mode 100644 index 0000000..423eed3 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgGtProductionVo.java @@ -0,0 +1,64 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--钢铁-生产单元运行情况对象 b_stat_table_zxbg_gt_production + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--钢铁-生产单元运行情况") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgGtProductionVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "主要生产单元") + /** 主要生产单元 */ + private String mainProductionUnit; + + + @ApiModelProperty(value = "名称") + /** 名称 */ + private String name; + + @ApiModelProperty(value = "数量") + /** 数量 */ + private String quantity; + + @ApiModelProperty(value = "单位") + /** 单位 */ + private String unit; + + @ApiModelProperty(value = "备注") + /** 备注 */ + private String remark; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdFuelAnalysisVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdFuelAnalysisVo.java new file mode 100644 index 0000000..55fba83 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdFuelAnalysisVo.java @@ -0,0 +1,75 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--火电燃料分析对象 b_stat_table_zxbg_hd_fuel_analysis + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电燃料分析") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdFuelAnalysisVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "生产单元") + /** 生产单元 */ + private String productionUnit; + + @ApiModelProperty(value = "燃料名称") + /** 燃料名称 */ + private String fuelName; + + @ApiModelProperty(value = "使用量（万t/a、万m³/a）") + /** 使用量（万t/a、万m³/a） */ + private String usage; + + @ApiModelProperty(value = "灰分（%）") + /** 灰分（%） */ + private String ashContent; + + @ApiModelProperty(value = "硫分（%）") + /** 硫分（%） */ + private String sulfur; + + @ApiModelProperty(value = "挥发分（%）") + /** 挥发分（%） */ + private String volatileContent; + + @ApiModelProperty(value = "热值（MJ/kg、MJ/m³）") + /** 热值（MJ/kg、MJ/m³） */ + private String caloricValue; + + @ApiModelProperty(value = "备注") + /** 备注 */ + private String remark; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGasPollutionVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGasPollutionVo.java new file mode 100644 index 0000000..fb649f2 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGasPollutionVo.java @@ -0,0 +1,120 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--火电废气污染治理设施正常情况对象 b_stat_table_zxbg_hd_gas_pollution + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电废气污染治理设施正常情况") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdGasPollutionVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "生产设施名称") + /** 生产设施名称 */ + private String productionFacilityName; + + @ApiModelProperty(value = "生产设施编号") + /** 生产设施编号 */ + private String productionFacilityCode; + + @ApiModelProperty(value = "治理设施编号") + /** 治理设施编号 */ + private String governanceFacilityCode; + + @ApiModelProperty(value = "治理设施名称") + /** 治理设施名称 */ + private String governanceFacilityName; + + + @ApiModelProperty(value = "治理设施运行时间（小时）") + /** 治理设施运行时间（小时） */ + private String governanceFacilityTime; + + @ApiModelProperty(value = "粉煤灰产生量（吨）") + /** 粉煤灰产生量（吨） */ + private String flyAshProduction; + + @ApiModelProperty(value = "布袋除尘器清灰周期和换代情况") + /** 布袋除尘器清灰周期和换代情况 */ + private String bagFilter; + + @ApiModelProperty(value = "除尘效率设计值") + /** 除尘效率设计值 */ + private String dustRemovalEfficiency; + + @ApiModelProperty(value = "除尘效率实际值") + /** 除尘效率实际值 */ + private String actualValue; + + @ApiModelProperty(value = "脱硫剂用量（吨）") + /** 脱硫剂用量（吨） */ + private String desulfurizerDosage; + + @ApiModelProperty(value = "脱硫副产物产生量（吨）") + /** 脱硫副产物产生量（吨） */ + private String amountProduct; + + @ApiModelProperty(value = "脱硫效率设计值%") + /** 脱硫效率设计值% */ + private String designValues; + + @ApiModelProperty(value = "脱硫效率实际值%") + /** 脱硫效率实际值% */ + private String actualEfficiency; + + @ApiModelProperty(value = "脱硝还原剂用量（吨）") + /** 脱硝还原剂用量（吨） */ + private String reducingAgentDosage; + + @ApiModelProperty(value = "脱硝效率设计值") + /** 脱硝效率设计值 */ + private String denitrationEfficiency; + + @ApiModelProperty(value = "脱硝效率实际") + /** 脱硝效率实际 */ + private String efficiencyPractical; + + @ApiModelProperty(value = "污染治理设施运行费用（万元）") + /** 污染治理设施运行费用（万元） */ + private String facilityOperatingCosts; + + @ApiModelProperty(value = "综合除尘效率设计值") + /** 综合除尘效率设计值 */ + private String efficiencyDesignValues; + + @ApiModelProperty(value = "综合除尘效率实际值") + /** 综合除尘效率实际值 */ + private String actualDustRemoval; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtBasicVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtBasicVo.java new file mode 100644 index 0000000..404cd88 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtBasicVo.java @@ -0,0 +1,75 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--火电、钢铁基本信息对象 b_stat_table_zxbg_hd_gt_basic + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电、钢铁基本信息") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdGtBasicVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "机组名称") + /** 机组名称 */ + private String unitName; + + @ApiModelProperty(value = "规模（万千瓦）") + /** 规模（万千瓦） */ + private String scale; + + @ApiModelProperty(value = "设计运行时间（小时）") + /** 设计运行时间（小时） */ + private String runTime; + + @ApiModelProperty(value = "发电量（万千瓦时）") + /** 发电量（万千瓦时） */ + private String powerGeneration; + + @ApiModelProperty(value = "供热量（万吉焦）") + /** 供热量（万吉焦） */ + private String heatSupply; + + @ApiModelProperty(value = "实际运行时间（小时）") + /** 实际运行时间（小时） */ + private String actualRunningTime; + + @ApiModelProperty(value = "平均负荷率") + /** 平均负荷率 */ + private String averageLoadRatio; + + @ApiModelProperty(value = "备注") + /** 备注 */ + private String remark; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtFuelVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtFuelVo.java new file mode 100644 index 0000000..b2b66c0 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtFuelVo.java @@ -0,0 +1,83 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--火电、钢铁燃料信息对象 b_stat_table_zxbg_hd_gt_fuel + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电、钢铁燃料信息") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdGtFuelVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "机组名称") + /** 机组名称 */ + private String unitName; + + @ApiModelProperty(value = "机组类型") + /** 机组类型 */ + private String unitType; + + @ApiModelProperty(value = "燃料消耗量") + /** 燃料消耗量 */ + private String fuelConsumption; + + @ApiModelProperty(value = "燃料消耗量单位") + /** 燃料消耗量单位 */ + private String fuelConsumptionUnits; + + @ApiModelProperty(value = "发电标准煤耗") + /** 发电标准煤耗 */ + private String coalConsumption; + + @ApiModelProperty(value = "发电标准煤耗单位") + /** 发电标准煤耗单位 */ + private String coalConsumptionUnits; + + @ApiModelProperty(value = "产灰量") + /** 产灰量 */ + private String ashProduction; + + @ApiModelProperty(value = "产灰量单位") + /** 产灰量单位 */ + private String ashProductionUits; + + @ApiModelProperty(value = "产渣量") + /** 产渣量 */ + private String slagProduction; + + @ApiModelProperty(value = "产渣量单位") + /** 产渣量单位 */ + private String slagProductionUnits; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtInvestmentVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtInvestmentVo.java new file mode 100644 index 0000000..d433a7e --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdGtInvestmentVo.java @@ -0,0 +1,68 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况对象 b_stat_table_zxbg_hd_gt_investment + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdGtInvestmentVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "机组名称") + /** 机组名称 */ + private String unitName; + + @ApiModelProperty(value = "治理类型") + /** 治理类型 */ + private String governanceType; + + @ApiModelProperty(value = "开工时间") + /** 开工时间 */ + private String startTime; + + @ApiModelProperty(value = "建成投产时间（拟）") + /** 建成投产时间（拟） */ + private String productionTime; + + @ApiModelProperty(value = "计划总投资") + /** 计划总投资 */ + private String plannedInvestment; + + @ApiModelProperty(value = "计划周期内完成投资") + /** 计划周期内完成投资 */ + private String cycleCompleteInvestment; + + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdWaterPollutionVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdWaterPollutionVo.java new file mode 100644 index 0000000..54f1bc1 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgHdWaterPollutionVo.java @@ -0,0 +1,136 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--火电废水污染治理设施正常情况对象 b_stat_table_zxbg_hd_water_pollution + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电废水污染治理设施正常情况") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdWaterPollutionVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "废水类别") + /** 废水类别 */ + private String waterCategory; + + + @ApiModelProperty(value = "治理设施编号") + /** 治理设施编号 */ + private String governanceFacilityCode; + + @ApiModelProperty(value = "治理设施名称") + /** 治理设施名称 */ + private String governanceFacilityName; + + @ApiModelProperty(value = "治理设施运行时间（小时）") + /** 治理设施运行时间（小时） */ + private String governanceFacilityTime; + + @ApiModelProperty(value = "污染治理设施工艺") + /** 污染治理设施工艺 */ + private String pollutionFacilityTechnology; + + @ApiModelProperty(value = "污染因子") + /** 污染因子 */ + private String contaminateFactor; + + @ApiModelProperty(value = "排放去向") + /** 排放去向 */ + private String emissions; + + @ApiModelProperty(value = "受纳水体名称") + /** 受纳水体名称 */ + private String receivingName; + + @ApiModelProperty(value = "用电量") + /** 用电量 */ + private String electricityConsumption; + + @ApiModelProperty(value = "污水设计处理能力") + /** 污水设计处理能力 */ + private String processingPower; + + @ApiModelProperty(value = "污水实际处理量") + /** 污水实际处理量 */ + private String actualProcessingVolume; + + @ApiModelProperty(value = "污水实际会用量") + /** 污水实际会用量 */ + private String willAmount; + + @ApiModelProperty(value = "污水实际排放量") + /** 污水实际排放量 */ + private String actualEmissions; + + @ApiModelProperty(value = "废水设计处理能力") + /** 废水设计处理能力 */ + private String designProcessingPower; + + @ApiModelProperty(value = "废水实际处理量") + /** 废水实际处理量 */ + private String waterTreatmentVolume; + + @ApiModelProperty(value = "废水实际会用量") + /** 废水实际会用量 */ + private String waterWillAmount; + + @ApiModelProperty(value = "废水实际排放量") + /** 废水实际排放量 */ + private String waterActualEmissions; + + @ApiModelProperty(value = "污泥生成量") + /** 污泥生成量 */ + private String sludgeGeneration; + + @ApiModelProperty(value = "污泥含水率") + /** 污泥含水率 */ + private String sludgeMoistureContent; + + @ApiModelProperty(value = "循环冷却水排放量") + /** 循环冷却水排放量 */ + private String circulatingCooling; + + @ApiModelProperty(value = "直流冷却水排水量") + /** 直流冷却水排水量 */ + private String coolingDischarge; + + @ApiModelProperty(value = "污泥处置方式") + /** 污泥处置方式 */ + private String sludgeDisposalMethod; + + @ApiModelProperty(value = "污染治理设施运行费用") + /** 污染治理设施运行费用 */ + private String facilityOperatingCosts; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgSnFuelVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgSnFuelVo.java new file mode 100644 index 0000000..d32948a --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgSnFuelVo.java @@ -0,0 +1,67 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--水泥燃料分析对象 b_stat_table_zxbg_sn_fuel + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--水泥燃料分析") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgSnFuelVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "参数") + /** 参数 */ + private String parameter; + + @ApiModelProperty(value = "记录内容") + /** 记录内容 */ + private String recordTheContent; + + @ApiModelProperty(value = "名称") + /** 名称 */ + private String name; + + @ApiModelProperty(value = "备注") + /** 备注 */ + private String remark; + + @ApiModelProperty(value = "类型") + /** 类型 */ + private String type; + + @ApiModelProperty(value = "使用情况") + /** 使用情况 */ + private String usage; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgSnProductionVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgSnProductionVo.java new file mode 100644 index 0000000..b43f375 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgSnProductionVo.java @@ -0,0 +1,67 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--水泥-生产单元运行情况对象 b_stat_table_zxbg_sn_production + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--水泥-生产单元运行情况") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgSnProductionVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "主要生产单元") + /** 主要生产单元 */ + private String mainProductionUnit; + + @ApiModelProperty(value = "生产设施名称") + /** 生产设施名称 */ + private String productionFacilities; + + @ApiModelProperty(value = "名称") + /** 名称 */ + private String name; + + @ApiModelProperty(value = "数量") + /** 数量 */ + private String quantity; + + @ApiModelProperty(value = "单位") + /** 单位 */ + private String unit; + + @ApiModelProperty(value = "备注") + /** 备注 */ + private String remark; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgWaterEmissionVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgWaterEmissionVo.java new file mode 100644 index 0000000..d75871e --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/BStatTableZxbgWaterEmissionVo.java @@ -0,0 +1,111 @@ +package cn.cecep.talroad.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + + +/** + * 固定源产排治--执行报告--废水污染物排放浓度监测数据对象 b_stat_table_zxbg_water_emission + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--废水污染物排放浓度监测数据") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgWaterEmissionVo +{ + + + @ApiModelProperty(value = "主键id") + /** 主键id */ + private Long id; + + @ApiModelProperty(value = "企业id") + /** 企业id */ + private String factoryId; + + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + /** 执行报告类型，0：月报，1：季报，2：年报 */ + private String zxbgType; + + @ApiModelProperty(value = "执行报告周期") + /** 执行报告周期 */ + private String zxbgPeriod; + + @ApiModelProperty(value = "类型") + /** 类型 */ + private String zxbgPollutantType; + + @ApiModelProperty(value = "创建时间") + /** 创建时间 */ + private String createTime; + + @ApiModelProperty(value = "备注") + /** 备注 */ + private String remark; + + @ApiModelProperty(value = "排放口编码") + /** 排放口编码 */ + private String outletCode; + + @ApiModelProperty(value = "污染物名称") + /** 污染物名称 */ + private String pollutantName; + + @ApiModelProperty(value = "监测设施") + /** 监测设施 */ + private String monitoringFacilities; + + @ApiModelProperty(value = "设施名称") + /** 设施名称 */ + private String facilityName; + + @ApiModelProperty(value = "许可排放浓度限值") + /** 许可排放浓度限值 */ + private String emissionConcentration; + + @ApiModelProperty(value = "有效监测数据(日)数量") + /** 有效监测数据(日)数量 */ + private String effectivelyDay; + + @ApiModelProperty(value = "检测结果（日均浓度）最小值mg/m3") + /** 检测结果（日均浓度）最小值mg/m3 */ + private String detectionMinDay; + + @ApiModelProperty(value = "检测结果（日均浓度）最大值mg/m3") + /** 检测结果（日均浓度）最大值mg/m3 */ + private String detectionMaxDay; + + @ApiModelProperty(value = "检测结果（日均浓度）平均值") + /** 检测结果（日均浓度）平均值 */ + private String detectionAvgDay; + + @ApiModelProperty(value = "超标数据个数") + /** 超标数据个数 */ + private String exceededData; + + @ApiModelProperty(value = "超标率（%）") + /** 超标率（%） */ + private String exceededRate; + + @ApiModelProperty(value = "实际排放量（吨）") + /** 实际排放量（吨） */ + private String actualEmissions; + + @ApiModelProperty(value = "监测仪器名称或型号") + /** 监测仪器名称或型号 */ + private String instrumentName; + + @ApiModelProperty(value = "手工监测采样方法及个数") + /** 手工监测采样方法及个数 */ + private String samplingMethod; + + @ApiModelProperty(value = "手工测定方法") + /** 手工测定方法 */ + private String manualMethod; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcControlRequirementsVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcControlRequirementsVo.java index 552295a..df55a67 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcControlRequirementsVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcControlRequirementsVo.java @@ -1,10 +1,12 @@ package cn.cecep.talroad.vo; +import cn.cecep.talroad.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; /** @@ -140,4 +142,633 @@ public class PcControlRequirementsVo @ApiModelProperty(value = "许可排放浓度限值（水）") private String permissibleConcentrationLimWater; + + @ApiModel(value = "排污许可-废气有组织排放要求vo") + @Data + public static class PwxkGasOrg { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "排放口编号") + @Excel(name = "排放口编号", sort = 70) + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + @Excel(name = "排放口名称", sort = 80) + private String outletName; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + @Excel(name = "排口类型", sort = 81, readConverterExp = "1=主要排口,2=一般排口") + private String outletTypes; + + @ApiModelProperty(value = "排口经度") + @Excel(name = "经度", parentName = "排放口地理坐标", sort = 90) + private String outletLon; + + @ApiModelProperty(value = "排口纬度") + @Excel(name = "纬度", parentName = "排放口地理坐标", sort = 100) + private String outletLat; + + @ApiModelProperty(value = "排气筒高度（m）") + @Excel(name = "排气筒高度（m）", sort = 110) + private String exhaustFunnelHight; + + @ApiModelProperty(value = "排气筒出口内径（m）") + @Excel(name = "排气筒出口内径（m）", sort = 120) + private String exhaustFunnelInner; + + @ApiModelProperty(value = "排气温度") + @Excel(name = "排气温度", sort = 130) + private String exhaustGasTemperature; + + @ApiModelProperty(value = "污染物种类") + @Excel(name = "污染物种类", sort = 131) + private String pollutantName; + + @ApiModelProperty(value = "国家或地方污染物排放标准名") + @Excel(name = "名称", parentName = "国家或地方污染物排放标准", sort = 140) + private String pollutantStandardName; + + @ApiModelProperty(value = "排放标准浓度限值") + @Excel(name = "浓度限值", parentName = "国家或地方污染物排放标准", sort = 150) + private String emissionStandardConcentrationLim; + + @ApiModelProperty(value = "排放标准浓度单位") + @Excel(name = "浓度单位", parentName = "国家或地方污染物排放标准", sort = 160) + private String emissionStandardConcentrationUnit; + + @ApiModelProperty(value = "排放标准速率限值（kg/h）") + @Excel(name = "速率限值（kg/h）", parentName = "国家或地方污染物排放标准", sort = 170) + private String emissionStandardRateLim; + + @ApiModelProperty(value = "环境影响评价批复要求") + @Excel(name = "环境影响评价批复要求", sort = 180) + private String approvalRequirements; + + @ApiModelProperty(value = "许可排放小时浓度限值") + @Excel(name = "许可排放小时浓度限值", sort = 190) + private String permissibleConcentrationLimHour; + + @ApiModelProperty(value = "许可排放日均浓度限值") + @Excel(name = "许可排放日均浓度限值", sort = 200) + private String permissibleConcentrationLimDay; + + @ApiModelProperty(value = "许可排放速率限值（kg/h）") + @Excel(name = "许可排放速率限值（kg/h）", sort = 210) + private String permissibleRateLim; + + @ApiModelProperty(value = "许可年排放量限值-第一年（t/a）") + @Excel(name = "第一年", parentName = "许可年排放量限值（t/a）", sort = 220) + private String permissibleLimFirst; + + @ApiModelProperty(value = "许可年排放量限值-第二年（t/a）") + @Excel(name = "第二年", parentName = "许可年排放量限值（t/a）", sort = 230) + private String permissibleLimSecond; + + @ApiModelProperty(value = "许可年排放量限值-第三年（t/a）") + @Excel(name = "第三年", parentName = "许可年排放量限值（t/a）", sort = 240) + private String permissibleLimThird; + + @ApiModelProperty(value = "许可年排放量限值-第四年（t/a）") + @Excel(name = "第四年", parentName = "许可年排放量限值（t/a）", sort = 250) + private String permissibleLimFourth; + + @ApiModelProperty(value = "许可年排放量限值-第五年（t/a）") + @Excel(name = "第五年", parentName = "许可年排放量限值（t/a）", sort = 260) + private String permissibleLimSfifth; + + @ApiModelProperty(value = "承诺更加严格排放浓度限值") + @Excel(name = "承诺更加严格排放浓度限值", sort = 270) + private String commitmentEmissionLim; + + @ApiModelProperty(value = "监测设施") + @Excel(name = "监测设施", sort = 280) + private String monitoringFacilities; + + @ApiModelProperty(value = "自动监测是否联网") + @Excel(name = "自动监测是否联网", sort = 290) + private String whetherAutoMonitorConn; + + @ApiModelProperty(value = "自动监测仪器名称") + @Excel(name = "自动监测仪器名称", sort = 300) + private String autoMonitorName; + + @ApiModelProperty(value = "自动监测设施安装位置") + @Excel(name = "自动监测设施安装位置", sort = 310) + private String autoMonitorAddress; + + @ApiModelProperty(value = "自动监测设施是否符合安装、运行、维护等管理要求") + @Excel(name = "自动监测设施是否符合安装、运行、维护等管理要求", sort = 320) + private String whetherAutoMonitorRequire; + + @ApiModelProperty(value = "手工监测采样方法及个数") + @Excel(name = "手工监测采样方法及个数", sort = 330) + private String manualMonitorNumber; + + @ApiModelProperty(value = "手工监测频次") + @Excel(name = "手工监测频次", sort = 340) + private String manualMonitorFrequency; + + @ApiModelProperty(value = "手工测定方法") + @Excel(name = "手工测定方法", sort = 350) + private String manualMonitorMethod; + + @ApiModelProperty(value = "其他信息") + @Excel(name = "其他信息", sort = 360) + private String otherInformation; + } + + @ApiModel(value = "排污许可-废气无组织排放要求vo") + @Data + public static class PwxkGasNoOrg { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "无组织排放编号") + @Excel(name = "无组织排放编号", sort = 70) + private String outletCode; + + @ApiModelProperty(value = "产污环节") + @Excel(name = "产污环节", sort = 80) + private String productionProcess; + + @ApiModelProperty(value = "污染物种类") + @Excel(name = "污染物种类", sort = 131) + private String pollutantName; + + @ApiModelProperty(value = "主要污染防治措施") + @Excel(name = "主要污染防治措施", sort = 135) + private String pollutionPreventionMeasures; + + + @ApiModelProperty(value = "国家或地方污染物排放标准名") + @Excel(name = "名称", parentName = "国家或地方污染物排放标准", sort = 140) + private String pollutantStandardName; + + @ApiModelProperty(value = "许可排放小时浓度限值") + @Excel(name = "小时浓度限值", parentName = "国家或地方污染物排放标准", sort = 190) + private String permissibleConcentrationLimHour; + + @ApiModelProperty(value = "许可排放日均浓度限值") + @Excel(name = "日均浓度限值", parentName = "国家或地方污染物排放标准", sort = 200) + private String permissibleConcentrationLimDay; + + @ApiModelProperty(value = "排放标准浓度单位") + @Excel(name = "浓度限制单位", parentName = "国家或地方污染物排放标准", sort = 160) + private String emissionStandardConcentrationUnit; + + + @ApiModelProperty(value = "许可年排放量限值-第一年（t/a）") + @Excel(name = "第一年", parentName = "许可年排放量限值（t/a）", sort = 220) + private String permissibleLimFirst; + + @ApiModelProperty(value = "许可年排放量限值-第二年（t/a）") + @Excel(name = "第二年", parentName = "许可年排放量限值（t/a）", sort = 230) + private String permissibleLimSecond; + + @ApiModelProperty(value = "许可年排放量限值-第三年（t/a）") + @Excel(name = "第三年", parentName = "许可年排放量限值（t/a）", sort = 240) + private String permissibleLimThird; + + @ApiModelProperty(value = "许可年排放量限值-第四年（t/a）") + @Excel(name = "第四年", parentName = "许可年排放量限值（t/a）", sort = 250) + private String permissibleLimFourth; + + @ApiModelProperty(value = "许可年排放量限值-第五年（t/a）") + @Excel(name = "第五年", parentName = "许可年排放量限值（t/a）", sort = 260) + private String permissibleLimSfifth; + + @ApiModelProperty(value = "申请特殊时段许可排放量限值") + @Excel(name = "申请特殊时段许可排放量限值", sort = 270) + private String commitmentEmissionPromise; + + @ApiModelProperty(value = "监测设施") + @Excel(name = "监测设施", sort = 280) + private String monitoringFacilities; + + @ApiModelProperty(value = "自动监测是否联网") + @Excel(name = "自动监测是否联网", sort = 290) + private String whetherAutoMonitorConn; + + @ApiModelProperty(value = "自动监测仪器名称") + @Excel(name = "自动监测仪器名称", sort = 300) + private String autoMonitorName; + + @ApiModelProperty(value = "自动监测设施安装位置") + @Excel(name = "自动监测设施安装位置", sort = 310) + private String autoMonitorAddress; + + @ApiModelProperty(value = "自动监测设施是否符合安装、运行、维护等管理要求") + @Excel(name = "自动监测设施是否符合安装、运行、维护等管理要求", sort = 320) + private String whetherAutoMonitorRequire; + + @ApiModelProperty(value = "手工监测采样方法及个数") + @Excel(name = "手工监测采样方法及个数", sort = 330) + private String manualMonitorNumber; + + @ApiModelProperty(value = "手工监测频次") + @Excel(name = "手工监测频次", sort = 340) + private String manualMonitorFrequency; + + @ApiModelProperty(value = "手工测定方法") + @Excel(name = "手工测定方法", sort = 350) + private String manualMonitorMethod; + + @ApiModelProperty(value = "其他信息") + @Excel(name = "其他信息", sort = 360) + private String otherInformation; + } + + @ApiModel(value = "排污许可-废水直接排口排放要求vo") + @Data + public static class PwxkWaterDirect { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "排放口编号") + @Excel(name = "排放口编号", sort = 70) + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + @Excel(name = "排放口名称", sort = 80) + private String outletName; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + @Excel(name = "排口类型", readConverterExp = "1=主要排口,2=一般排口", sort = 90) + private String outletTypes; + + @ApiModelProperty(value = "排口经度") + @Excel(name = "经度", parentName = "排放口地理位置", sort = 100) + private BigDecimal outletLon; + + @ApiModelProperty(value = "排口纬度") + @Excel(name = "纬度", parentName = "排放口地理位置", sort = 110) + private BigDecimal outletLat; + + @ApiModelProperty(value = "排水去向") + @Excel(name = "排水去向", sort = 120) + private String directionDrainage; + + @ApiModelProperty(value = "排放规律") + @Excel(name = "排放规律", sort = 130) + private String dischargeLaw; + + @ApiModelProperty(value = "间歇式排放时段") + @Excel(name = "间歇式排放时段", sort = 140) + private String intermittentEmissionPeriod; + + @ApiModelProperty(value = "受纳自然水体信息-名称") + @Excel(name = "名称", parentName = "受纳自然水体信息", sort = 150) + private String receivingWaterName; + + @ApiModelProperty(value = "受纳自然水体信息-功能目标") + @Excel(name = "功能目标", parentName = "受纳自然水体信息", sort = 160) + private String receivingWaterObjective; + + @ApiModelProperty(value = "汇入受纳自然水体处地理坐标-经度") + @Excel(name = "经度", parentName = "汇入受纳自然水体处地理坐标", sort = 170) + private String receivingWaterLon; + + @ApiModelProperty(value = "汇入受纳自然水体处地理坐标-纬度") + @Excel(name = "纬度", parentName = "汇入受纳自然水体处地理坐标", sort = 180) + private String receivingWaterLat; + + @ApiModelProperty(value = "污染物种类") + @Excel(name = "污染物种类", sort = 190) + private String pollutantName; + + @ApiModelProperty(value = "国家或地方污染物排放标准名") + @Excel(name = "名称", parentName = "国家或地方污染物排放标准", sort = 200) + private String pollutantStandardName; + + @ApiModelProperty(value = "排放标准浓度限值") + @Excel(name = "浓度限值", parentName = "国家或地方污染物排放标准", sort = 210) + private String emissionStandardConcentrationLim; + + @ApiModelProperty(value = "环境影响评价审批意见要求") + @Excel(name = "环境影响评价审批意见要求", sort = 220) + private String approvalRequirements; + + @ApiModelProperty(value = "承诺更加严格排放限值") + @Excel(name = "承诺更加严格排放限值", sort = 230) + private String commitmentEmissionLim; + + @ApiModelProperty(value = "许可排放浓度限值") + @Excel(name = "许可排放浓度限值", sort = 240) + private String permissibleConcentrationLimWater; + + @ApiModelProperty(value = "浓度限制单位") + @Excel(name = "浓度限制单位", sort = 250) + private String emissionStandardConcentrationUnit; + + @ApiModelProperty(value = "许可年排放量限值-第一年（t/a）") + @Excel(name = "第一年", parentName = "许可年排放量限值（t/a）", sort = 260) + private String permissibleLimFirst; + + @ApiModelProperty(value = "许可年排放量限值-第二年（t/a）") + @Excel(name = "第二年", parentName = "许可年排放量限值（t/a）", sort = 270) + private String permissibleLimSecond; + + @ApiModelProperty(value = "许可年排放量限值-第三年（t/a）") + @Excel(name = "第三年", parentName = "许可年排放量限值（t/a）", sort = 280) + private String permissibleLimThird; + + @ApiModelProperty(value = "许可年排放量限值-第四年（t/a）") + @Excel(name = "第四年", parentName = "许可年排放量限值（t/a）", sort = 290) + private String permissibleLimFourth; + + @ApiModelProperty(value = "许可年排放量限值-第五年（t/a）") + @Excel(name = "第五年", parentName = "许可年排放量限值（t/a）", sort = 300) + private String permissibleLimSfifth; + + @ApiModelProperty(value = "申请特殊时段许可排放量限值") + @Excel(name = "申请特殊时段许可排放量限值", sort = 310) + private String commitmentEmissionPromise; + + + @ApiModelProperty(value = "监测设施") + @Excel(name = "监测设施", sort = 320) + private String monitoringFacilities; + + @ApiModelProperty(value = "自动监测是否联网") + @Excel(name = "自动监测是否联网", sort = 330) + private String whetherAutoMonitorConn; + + @ApiModelProperty(value = "自动监测仪器名称") + @Excel(name = "自动监测仪器名称", sort = 340) + private String autoMonitorName; + + @ApiModelProperty(value = "自动监测设施安装位置") + @Excel(name = "自动监测设施安装位置", sort = 350) + private String autoMonitorAddress; + + @ApiModelProperty(value = "自动监测设施是否符合安装、运行、维护等管理要求") + @Excel(name = "自动监测设施是否符合安装、运行、维护等管理要求", sort = 360) + private String whetherAutoMonitorRequire; + + @ApiModelProperty(value = "手工监测采样方法及个数") + @Excel(name = "手工监测采样方法及个数", sort = 370) + private String manualMonitorNumber; + + @ApiModelProperty(value = "手工监测频次") + @Excel(name = "手工监测频次", sort = 380) + private String manualMonitorFrequency; + + @ApiModelProperty(value = "手工测定方法") + @Excel(name = "手工测定方法", sort = 390) + private String manualMonitorMethod; + + @ApiModelProperty(value = "其他信息") + @Excel(name = "其他信息", sort = 400) + private String otherInformation; + } + + @ApiModel(value = "排污许可-废水间接排口排放要求vo") + @Data + public static class PwxkWaterIndirect { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "排放口编号") + @Excel(name = "排放口编号", sort = 70) + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + @Excel(name = "排放口名称", sort = 80) + private String outletName; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + @Excel(name = "排口类型", readConverterExp = "1=主要排口,2=一般排口", sort = 90) + private String outletTypes; + + @ApiModelProperty(value = "排口经度") + @Excel(name = "经度", parentName = "排放口地理坐标", sort = 100) + private BigDecimal outletLon; + + @ApiModelProperty(value = "排口纬度") + @Excel(name = "纬度", parentName = "排放口地理坐标", sort = 110) + private BigDecimal outletLat; + + @ApiModelProperty(value = "排水去向") + @Excel(name = "排水去向", sort = 120) + private String directionDrainage; + + @ApiModelProperty(value = "排放规律") + @Excel(name = "排放规律", sort = 130) + private String dischargeLaw; + + @ApiModelProperty(value = "间歇式排放时段") + @Excel(name = "间歇式排放时段", sort = 140) + private String intermittentEmissionPeriod; + + @ApiModelProperty(value = "受纳污水处理厂名称") + @Excel(name = "受纳污水处理厂名称", sort = 150) + private String treatmentPlantAcceptedName; + + + @ApiModelProperty(value = "污染物种类") + @Excel(name = "污染物种类", sort = 190) + private String pollutantName; + + @ApiModelProperty(value = "国家或地方污染物排放标准名") + @Excel(name = "名称", parentName = "国家或地方污染物排放标准", sort = 200) + private String pollutantStandardName; + + @ApiModelProperty(value = "排放标准浓度限值") + @Excel(name = "浓度限值", parentName = "国家或地方污染物排放标准", sort = 210) + private String emissionStandardConcentrationLim; + + @ApiModelProperty(value = "环境影响评价审批意见要求") + @Excel(name = "环境影响评价审批意见要求", sort = 220) + private String approvalRequirements; + + @ApiModelProperty(value = "承诺更加严格排放限值") + @Excel(name = "承诺更加严格排放限值", sort = 230) + private String commitmentEmissionLim; + + @ApiModelProperty(value = "许可排放浓度限值") + @Excel(name = "许可排放浓度限值", sort = 240) + private String permissibleConcentrationLimWater; + + @ApiModelProperty(value = "浓度限制单位") + @Excel(name = "浓度限制单位", sort = 250) + private String emissionStandardConcentrationUnit; + + @ApiModelProperty(value = "许可年排放量限值-第一年（t/a）") + @Excel(name = "第一年", parentName = "许可年排放量限值（t/a）", sort = 260) + private String permissibleLimFirst; + + @ApiModelProperty(value = "许可年排放量限值-第二年（t/a）") + @Excel(name = "第二年", parentName = "许可年排放量限值（t/a）", sort = 270) + private String permissibleLimSecond; + + @ApiModelProperty(value = "许可年排放量限值-第三年（t/a）") + @Excel(name = "第三年", parentName = "许可年排放量限值（t/a）", sort = 280) + private String permissibleLimThird; + + @ApiModelProperty(value = "许可年排放量限值-第四年（t/a）") + @Excel(name = "第四年", parentName = "许可年排放量限值（t/a）", sort = 290) + private String permissibleLimFourth; + + @ApiModelProperty(value = "许可年排放量限值-第五年（t/a）") + @Excel(name = "第五年", parentName = "许可年排放量限值（t/a）", sort = 300) + private String permissibleLimSfifth; + + @ApiModelProperty(value = "申请特殊时段许可排放量限值") + @Excel(name = "申请特殊时段许可排放量限值", sort = 310) + private String commitmentEmissionPromise; + + + @ApiModelProperty(value = "监测设施") + @Excel(name = "监测设施", sort = 320) + private String monitoringFacilities; + + @ApiModelProperty(value = "自动监测是否联网") + @Excel(name = "自动监测是否联网", sort = 330) + private String whetherAutoMonitorConn; + + @ApiModelProperty(value = "自动监测仪器名称") + @Excel(name = "自动监测仪器名称", sort = 340) + private String autoMonitorName; + + @ApiModelProperty(value = "自动监测设施安装位置") + @Excel(name = "自动监测设施安装位置", sort = 350) + private String autoMonitorAddress; + + @ApiModelProperty(value = "自动监测设施是否符合安装、运行、维护等管理要求") + @Excel(name = "自动监测设施是否符合安装、运行、维护等管理要求", sort = 360) + private String whetherAutoMonitorRequire; + + @ApiModelProperty(value = "手工监测采样方法及个数") + @Excel(name = "手工监测采样方法及个数", sort = 370) + private String manualMonitorNumber; + + @ApiModelProperty(value = "手工监测频次") + @Excel(name = "手工监测频次", sort = 380) + private String manualMonitorFrequency; + + @ApiModelProperty(value = "手工测定方法") + @Excel(name = "手工测定方法", sort = 390) + private String manualMonitorMethod; + + @ApiModelProperty(value = "其他信息") + @Excel(name = "其他信息", sort = 400) + private String otherInformation; + } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcFactoryVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcFactoryVo.java index 599a304..23fda09 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcFactoryVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcFactoryVo.java @@ -44,6 +44,9 @@ public class PcFactoryVo /** 县名称 */ private String countryName; + @ApiModelProperty(value = "所在流域") + private String riverBasin; + @ApiModelProperty(value = "是否重点排污单位") /** 是否重点排污单位 */ private String wipollunit; @@ -233,6 +236,9 @@ public class PcFactoryVo @ApiModelProperty(name = "排污许可行业名称") private String industryPermissionName; + @ApiModelProperty(name = "是否包含指定标签值 1:是, 0:否") + private Boolean labelChecked; + public String getMajorPollutantCategoriesName() { if (StringUtils.isNotEmpty(majorPollutantCategories)) { Map majorMap = new HashMap<>(); diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcLabelFactoryVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcLabelFactoryVo.java index 3faa316..795ea37 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcLabelFactoryVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcLabelFactoryVo.java @@ -5,6 +5,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; /** @@ -44,4 +48,24 @@ public class PcLabelFactoryVo @ApiModelProperty(value = "标签值") private String labelValue; + @Data + @ApiModel(value = "企业-标签批量维护表单") + public static class FactoryLabelUpdateForm { + @NotNull(message = "factoryIds不可以为空") + @NotEmpty(message = "factoryIds不可以为空") + private List factoryIds; + + @NotBlank(message = "labelId不可以为空") + @ApiModelProperty(value = "标签id") + private String labelId; + + @NotBlank(message = "labelValue不可以为空") + @ApiModelProperty(value = "标签值编码") + private String labelValue; + + @NotNull(message = "checked不可以为空") + @ApiModelProperty(value = "true:选中, false:取消选中") + private Boolean checked; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcOutletVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcOutletVo.java index d06d131..8641a86 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcOutletVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PcOutletVo.java @@ -1,13 +1,13 @@ package cn.cecep.talroad.vo; -import cn.cecep.talroad.service.IProductionManageService; +import cn.cecep.talroad.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.List; -import java.util.Map; /** @@ -195,4 +195,235 @@ public class PcOutletVo @ApiModelProperty(value = "曲线图返回指定的污染物") private List pollutantVos; } + + @ApiModel(value = "排污许可-废气排口基本信息vo") + @Data + public static class PwxkGas { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "排放口编号") + @Excel(name = "排放口编号", sort = 70) + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + @Excel(name = "排放口名称", sort = 80) + private String outletName; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + @Excel(name = "排口类型", readConverterExp = "1=主要排口,2=一般排口", sort = 90) + private String outletTypes; + + // TODO 污染物种类 + + @ApiModelProperty(value = "排口经度") + @Excel(name = "经度", parentName = "排放口地理坐标", sort = 90) + private String outletLon; + + @ApiModelProperty(value = "排口纬度") + @Excel(name = "纬度", parentName = "排放口地理坐标", sort = 100) + private String outletLat; + + @ApiModelProperty(value = "排气筒高度（m）") + @Excel(name = "排气筒高度（m）", sort = 110) + private String exhaustFunnelHight; + + @ApiModelProperty(value = "排气筒出口内径（m）") + @Excel(name = "排气筒出口内径（m）", sort = 120) + private String exhaustFunnelInner; + + @ApiModelProperty(value = "排气温度") + @Excel(name = "排气温度", sort = 130) + private String exhaustGasTemperature; + + @ApiModelProperty(value = "其他信息") + @Excel(name = "其他信息", sort = 140) + private String moreDetails; + } + + @ApiModel(value = "排污许可-废水直接排口基本信息vo") + @Data + public static class PwxkWaterDirect { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "排放口编号") + @Excel(name = "排放口编号", sort = 70) + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + @Excel(name = "排放口名称", sort = 80) + private String outletName; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + @Excel(name = "排口类型", readConverterExp = "1=主要排口,2=一般排口", sort = 90) + private String outletTypes; + + @ApiModelProperty(value = "排口经度") + @Excel(name = "经度", parentName = "排放口地理位置", sort = 100) + private BigDecimal outletLon; + + @ApiModelProperty(value = "排口纬度") + @Excel(name = "纬度", parentName = "排放口地理位置", sort = 110) + private BigDecimal outletLat; + + @ApiModelProperty(value = "排水去向") + @Excel(name = "排水去向", sort = 120) + private String directionDrainage; + + @ApiModelProperty(value = "排放规律") + @Excel(name = "排放规律", sort = 130) + private String dischargeLaw; + + @ApiModelProperty(value = "间歇式排放时段") + @Excel(name = "间歇式排放时段", sort = 140) + private String intermittentEmissionPeriod; + + @ApiModelProperty(value = "受纳自然水体信息-名称") + @Excel(name = "名称", parentName = "受纳自然水体信息", sort = 150) + private String receivingWaterName; + + @ApiModelProperty(value = "受纳自然水体信息-功能目标") + @Excel(name = "功能目标", parentName = "受纳自然水体信息", sort = 160) + private String receivingWaterObjective; + + @ApiModelProperty(value = "汇入受纳自然水体处地理坐标-经度") + @Excel(name = "经度", parentName = "汇入受纳自然水体处地理坐标", sort = 170) + private String receivingWaterLon; + + @ApiModelProperty(value = "汇入受纳自然水体处地理坐标-纬度") + @Excel(name = "纬度", parentName = "汇入受纳自然水体处地理坐标", sort = 180) + private String receivingWaterLat; + + @ApiModelProperty(value = "其他信息") + @Excel(name = "其他信息", sort = 190) + private String moreDetails; + } + + @ApiModel(value = "排污许可-废水间接排口基本信息vo") + @Data + public static class PwxkWaterIndirect { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "排放口编号") + @Excel(name = "排放口编号", sort = 70) + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + @Excel(name = "排放口名称", sort = 80) + private String outletName; + + @ApiModelProperty(value = "排口经度") + @Excel(name = "经度", parentName = "排放口地理坐标", sort = 100) + private BigDecimal outletLon; + + @ApiModelProperty(value = "排口纬度") + @Excel(name = "纬度", parentName = "排放口地理坐标", sort = 110) + private BigDecimal outletLat; + + @ApiModelProperty(value = "排水去向") + @Excel(name = "排水去向", sort = 120) + private String directionDrainage; + + @ApiModelProperty(value = "排放规律") + @Excel(name = "排放规律", sort = 130) + private String dischargeLaw; + + @ApiModelProperty(value = "间歇式排放时段") + @Excel(name = "间歇式排放时段", sort = 140) + private String intermittentEmissionPeriod; + + @ApiModelProperty(value = "受纳污水处理厂名称") + @Excel(name = "受纳污水处理厂名称", sort = 150) + private String treatmentPlantAcceptedName; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PwxkFactoryVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PwxkFactoryVo.java new file mode 100644 index 0000000..a545a1e --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/PwxkFactoryVo.java @@ -0,0 +1,156 @@ +package cn.cecep.talroad.vo; + +import cn.cecep.talroad.common.core.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel(value = "排污许可企业vo") +@Data +public class PwxkFactoryVo { + @ApiModelProperty("排污许可证编码") + @Excel(name = "许可证编号", sort = 1) + private String pollDisLicenseCode; + + @ApiModelProperty("排污许可证有效期限") + @Excel(name = "有效期限", sort = 10) + private String pollDisLicenseDeadline; + + // TODO 发证日期 + + @ApiModelProperty("排污单位名称") + @Excel(name = "排污单位名称", sort = 20) + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 30) + private String licenseManType; + + @ApiModelProperty("县名称") + @Excel(name = "所在区县", sort = 40) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty("注册地址") + @Excel(name = "注册地址", sort = 50) + private String address; + + @ApiModelProperty("生产经营场所地址") + @Excel(name = "生产经营场所地址", sort = 60) + private String prodBusiOperation; + + @ApiModelProperty("邮政编码") + @Excel(name = "邮政编码", sort = 70) + private String postalCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 80) + private String industryPermissionName; + + @ApiModelProperty("其他行业类别") + @Excel(name = "其他行业类别", sort = 90) + private String industryCategoryOther; + + @ApiModelProperty("许可是否整改(限期整改 0否 1是 )") + @Excel(name = "是否需要整改", readConverterExp = "0=否,1=是", sort = 100) + private String licenseWabarbeitung; + + @ApiModelProperty("是否投产") + @Excel(name = "是否投产", sort = 110) + private String whetherProduction; + + @ApiModelProperty("投产日期") + @Excel(name = "投产日期", sort = 120) + private String productionDate; + + @ApiModelProperty("生产经营场所中心经度") + @Excel(name = "生产经营场所中心经度", sort = 130) + private String productionLon; + + @ApiModelProperty("生产经营场所中心纬度") + @Excel(name = "生产经营场所中心纬度", sort = 140) + private String productionLat; + + @ApiModelProperty("组织机构代码") + @Excel(name = "组织机构代码", sort = 150) + private String insFramCode; + + @ApiModelProperty("统一社会信用代码") + @Excel(name = "统一社会信用代码", sort = 160) + private String uscCode; + + @ApiModelProperty("法定代表人（主要负责人）") + @Excel(name = "法定代表人（主要负责人）", sort = 170) + private String principalMan; + + @ApiModelProperty("技术负责人") + @Excel(name = "技术负责人", sort = 180) + private String technicalMan; + + @ApiModelProperty("固定电话") + @Excel(name = "固定电话", sort = 190) + private String tel; + + @ApiModelProperty("移动电话") + @Excel(name = "移动电话", sort = 200) + private String mobileTelephone; + + @ApiModelProperty("所在地是否属于大气重点控制区") + @Excel(name = "所在地是否属于大气重点控制区", sort = 210) + private String whetherLocalKeyAri; + + @ApiModelProperty("所在地是否属于总磷控制区") + @Excel(name = "所在地是否属于总磷控制区", sort = 220) + private String whetherLocalKeyPho; + + @ApiModelProperty("所在地是否属于总氮控制区") + @Excel(name = "所在地是否属于总氮控制区", sort = 230) + private String whetherLocalKeyNitrogen; + + @ApiModelProperty("所在地是否属于重金属污染物特别排放限值实施区域") + @Excel(name = "所在地是否属于重金属污染物特别排放限值实施区域", sort = 240) + private String whetherLocalKeyPollArea; + + @ApiModelProperty("是否位于工业园区") + @Excel(name = "是否位于工业园区", sort = 250) + private String whetherLocalPark; + + @ApiModelProperty("工业园区名称") + @Excel(name = "所属工业园区名称", sort = 260) + private String industrialParkName; + + @ApiModelProperty("工业园区编码") + @Excel(name = "所属工业园区编码", sort = 270) + private String industrialParkCode; + + @ApiModelProperty("是否有环评审批文件") + @Excel(name = "是否有环评审批文件", sort = 280) + private String whetherReviewFile; + + @ApiModelProperty("环境影响评价审批文件文号或备案编号") + @Excel(name = "环境影响评价审批文件文号或备案编号", sort = 290) + private String environmentalCode; + + @ApiModelProperty("是否有地方政府对违规项目的认定或备案文件") + @Excel(name = "是否有地方政府对违规项目的认定或备案文件", sort = 300) + private String whetherGovProFile; + + @ApiModelProperty("地方政府对违规项目的认定或备案文件文号") + @Excel(name = "认定或备案文件文号", sort = 310) + private String govProIdentFile; + + @ApiModelProperty("是否有主要污染物总量分配计划文件") + @Excel(name = "是否有主要污染物总量分配计划文件", sort = 320) + private String pollutantTotalFileWhere; + + // TODO 大气污染物控制指标 + // TODO 水污染物控制指标 + + + @ApiModelProperty("主键id") + private String id; + +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/SupermonitorDrainOutletVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/SupermonitorDrainOutletVo.java index cf3ba47..12e68d1 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/SupermonitorDrainOutletVo.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/SupermonitorDrainOutletVo.java @@ -1,5 +1,6 @@ package cn.cecep.talroad.vo; +import cn.cecep.talroad.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -95,4 +96,148 @@ public class SupermonitorDrainOutletVo /** 入河口编号*/ private String riversOutletCode; + @ApiModel(value = "排污许可-入河排口信息vo") + @Data + public static class PwxkRh { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "排放口编号") + @Excel(name = "排放口编号", sort = 70) + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + @Excel(name = "排放口名称", sort = 80) + private String outletName; + + @ApiModelProperty(value = "入河口名称") + @Excel(name = "名称", parentName = "入河排污口", sort = 90) + private String riversOutletName; + + @ApiModelProperty(value = "入河口编号") + @Excel(name = "编号", parentName = "入河排污口", sort = 100) + private String riversOutletCode; + + @ApiModelProperty(value = "入河排污口批复文号") + @Excel(name = "批复文号", parentName = "入河排污口", sort = 110) + private String approvalDocument; + + @ApiModelProperty(value = "其他信息") + private String otherInformation; + + } + + @ApiModel(value = "排污许可-入河排口信息vo") + @Data + public static class PwxkYs { + @Excel(name = "排污许可证编号", sort = 0) + @ApiModelProperty(value = "排污许可证编码") + private String pollDisLicenseCode; + + @Excel(name = "排污单位名称", sort = 10) + @ApiModelProperty(value = "排污单位名称") + private String factoryName; + + @ApiModelProperty(value = "管理类别") + @Excel(name = "管理类别", readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记", sort = 20) + private String licenseManType; + + @ApiModelProperty(value = "所在区县") + @Excel(name = "所在区县", sort = 30) + private String countryName; + + @ApiModelProperty(value = "所在流域") + @Excel(name = "所在流域", sort = 31) + private String riverBasin; + + @ApiModelProperty(value = "所属工业园区名称") + @Excel(name = "所属工业园区名称", sort = 40) + private String industrialParkName; + + @ApiModelProperty(value = "所属工业园区编码") + @Excel(name = "所属工业园区编码", sort = 50) + private String industrialParkCode; + + @ApiModelProperty(value = "行业类别") + @Excel(name = "行业类别", sort = 60) + private String industryPermissionName; + + @ApiModelProperty(value = "排放口编号") + @Excel(name = "排放口编号", sort = 70) + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + @Excel(name = "排放口名称", sort = 80) + private String outletName; + + @ApiModelProperty(value = "排放口地理位置-经度") + @Excel(name = "经度", parentName = "排放口地理位置", sort = 90) + private String lon; + + @ApiModelProperty(value = "排放口地理位置-纬度") + @Excel(name = "纬度", parentName = "排放口地理位置", sort = 100) + private String lat; + + @ApiModelProperty(value = "排水去向") + @Excel(name = "排水去向", sort = 110) + private String drainageTo; + + @ApiModelProperty(value = "排放规律") + @Excel(name = "排放规律", sort = 120) + private String emissionsLaws; + + @ApiModelProperty(value = "间歇式排放时间段") + @Excel(name = "间歇式排放时间段", sort = 130) + private String intermittentEmissionPeriod; + + @ApiModelProperty(value = "受纳自然水体信息-名称") + @Excel(name = "名称", parentName = "受纳自然水体信息", sort = 140) + private String receivingWaterName; + + @ApiModelProperty(value = "受纳自然水体信息-功能目标") + @Excel(name = "功能目标", parentName = "受纳自然水体信息", sort = 150) + private String receivingWaterObjective; + + @ApiModelProperty(value = "汇入受纳自然水体处地理坐标-经度") + @Excel(name = "经度", parentName = "汇入受纳自然水体处地理坐标", sort = 160) + private String receivingWaterLon; + + @ApiModelProperty(value = "汇入受纳自然水体处地理坐标-纬度") + @Excel(name = "纬度", parentName = "汇入受纳自然水体处地理坐标", sort = 170) + private String receivingWaterLat; + + @ApiModelProperty(value = "其他信息") + @Excel(name = "其他信息", sort = 180) + private String otherInformation; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/analysis/BasModelAnalyseQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/analysis/BasModelAnalyseQuery.java new file mode 100644 index 0000000..ba07c7c --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/analysis/BasModelAnalyseQuery.java @@ -0,0 +1,30 @@ +package cn.cecep.talroad.vo.analysis; + +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import cn.cecep.talroad.domain.BasModelAnalyse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BasModelAnalyseQuery extends PageQuery { + + @ApiModelProperty(value="模型名称") + private String modelName; + + /** + * 参数名称 + */ + @ApiModelProperty(value="参数名称") + private String paramName; + + public static QueryWrapper createWrpper(BasModelAnalyseQuery query) { + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.like(StringUtils.isNotBlank(query.getModelName()),BasModelAnalyse.COL_MODEL_NAME,query.getModelName()); + queryWrapper.like(StringUtils.isNotBlank(query.getParamName()),BasModelAnalyse.COL_PARAM_NAME,query.getParamName()); + queryWrapper.eq(BasModelAnalyse.COL_DELETE_STATUS,"0"); + return queryWrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/analysis/SRaPollManTypeChangeVo.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/analysis/SRaPollManTypeChangeVo.java new file mode 100644 index 0000000..b8d9b22 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/analysis/SRaPollManTypeChangeVo.java @@ -0,0 +1,50 @@ +package cn.cecep.talroad.vo.analysis; + +import cn.cecep.talroad.common.core.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class SRaPollManTypeChangeVo { + @Excel(name = "企业名称") + private String factoryName; + + @Excel(name = "行业类别") + private String industryPermissionName; + @Excel(name = "区县名称") + private String countryName; + private String countryCode; + + /** + * 上次排污许可证发证日期 + */ + @ApiModelProperty(value="上次排污许可证发证日期") + @Excel(name = "上次排污许可证发证日期",dateFormat = "yyyy-MM-dd") + private Date lastLicenseTime; + + /** + * 上次排污许可证管理级别 + */ + + @ApiModelProperty(value="上次排污许可证管理级别--重点FOCUS、简化:SIMPLIFY、登记:REGISTER") + @Excel(name = "上次排污许可证管理级别",readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") + private String lastLicenseManType; + + /** + * 本次排污许可证发证日期 + */ + + @ApiModelProperty(value="本次排污许可证发证日期") + @Excel(name = "本次排污许可证发证日期",dateFormat = "yyyy-MM-dd") + private Date nowLicenseTime; + + /** + * 本次排污许可证管理级别 + */ + + @ApiModelProperty(value="本次排污许可证管理级别--重点FOCUS、简化:SIMPLIFY、登记:REGISTER") + @Excel(name = "本次排污许可证管理级别",readConverterExp = "FOCUS=重点,SIMPLIFY=简化,REGISTER=登记") + private String nowLicenseManType; +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BMainProductionOrganizGasQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BMainProductionOrganizGasQuery.java index d092e18..3fbb09e 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BMainProductionOrganizGasQuery.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BMainProductionOrganizGasQuery.java @@ -10,6 +10,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 废气有组织排放产治排信息对象 b_main_production_organiz_gas @@ -80,4 +82,32 @@ public class BMainProductionOrganizGasQuery extends PageQuery wrapper.orderByAsc("outlet_code", "id"); return wrapper; } + + @ApiModel(value = "排污许可-废气排污节点及治理设施信息query") + @Data + public static class PwxkCzp { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "生产设施编号") + private String proFacilityCode; + + @ApiModelProperty(value = "生产设施名称") + private String proFacilityName; + + @ApiModelProperty(value = "对应产污环节名称") + private String pollutionProductionLink; + + @ApiModelProperty(value = "污染物种类") + private List pollutionType; + + @ApiModelProperty(value = "治理设施工艺") + private List cepFacilityCraft; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + private String outletTypes; + + @ApiModelProperty(value = "排放口设置是否符合要求 0:否, 1:是") + private String whetherOutletRequirements; + } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BMainProductionWaterQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BMainProductionWaterQuery.java index 4712709..fb07f72 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BMainProductionWaterQuery.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BMainProductionWaterQuery.java @@ -10,6 +10,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 废水排放产治排信息对象 b_main_production_water @@ -68,4 +70,35 @@ public class BMainProductionWaterQuery extends PageQuery wrapper.orderByAsc("outlet_code", "id"); return wrapper; } + + @ApiModel(value = "排污许可-废水类别及治理设施信息query") + @Data + public static class PwxkCzp { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "废水类别") + private String waterType; + + @ApiModelProperty(value = "污染物种类") + private List pollutionType; + + @ApiModelProperty(value = "治理设施工艺") + private List cepFacilityCraft; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + private String outletTypes; + + @ApiModelProperty(value = "排放口设置是否符合要求 0:否, 1:是") + private String whetherOutletRequirements; + + @ApiModelProperty(value = "排水去向") + private List directionDrainage; + + @ApiModelProperty(value = "排放规律") + private List dischargeLaw; + + @ApiModelProperty(value = "排放形式。 直接排放/间接排放") + private String emissionsForm; + } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionQuery.java new file mode 100644 index 0000000..46b6092 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionQuery.java @@ -0,0 +1,123 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmission; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 固定源产排治--执行报告--有组织废气污染物排放浓度监测数据对象 b_stat_table_zxbg_gas_emission + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--有组织废气污染物排放浓度监测数据") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgGasEmissionQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "类型") + private String zxbgPollutantType; + @ApiModelProperty(value = "创建时间") + private String createTime; + @ApiModelProperty(value = "备注") + private String remark; + @ApiModelProperty(value = "排放口编码") + private String outletCode; + @ApiModelProperty(value = "污染物名称") + private String pollutantName; + @ApiModelProperty(value = "监测设施:手工、自动") + private String monitoringFacilities; + @ApiModelProperty(value = "设施名称") + private String facilityName; + @ApiModelProperty(value = "许可排放浓度限值") + private String emissionConcentration; + @ApiModelProperty(value = "有效监测数据(小时值)数量") + private String effectivelyHour; + @ApiModelProperty(value = "检测结果（小时浓度）最小值mg/m3") + private String detectionMinHour; + @ApiModelProperty(value = "检测结果（小时浓度）最大值mg/m3") + private String detectionMaxHour; + @ApiModelProperty(value = "检测结果（小时浓度）平均值") + private String detectionAvgHour; + @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）最小值") + private String foldsMinHour; + @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）最大值") + private String foldsMaxHour; + @ApiModelProperty(value = "监测结果（折标，小时浓度,mg/Nm3）平均值") + private String foldsAvgHour; + @ApiModelProperty(value = "超标数据个数") + private String exceededData; + @ApiModelProperty(value = "超标率（%）") + private String exceededRate; + @ApiModelProperty(value = "实际产生量（吨）") + private String actualAmount; + @ApiModelProperty(value = "实际排放量（吨）") + private String actualEmissions; + @ApiModelProperty(value = "监测仪器名称或型号") + private String instrumentName; + @ApiModelProperty(value = "手工监测采样方法及个数") + private String samplingMethod; + @ApiModelProperty(value = "手工测定方法") + private String manualMethod; + @ApiModelProperty(value = "监测设备测量范围(mg/m3)") + private String deviceRange; + @ApiModelProperty(value = "监测设备准确度") + private String deviceAccuracy; + @ApiModelProperty(value = "监测设备检出下限mg/m3") + private String deviceCheckout; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgGasEmissionQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPollutantType()), "zxbg_pollutant_type", query.getZxbgPollutantType()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + wrapper.eq(ObjectUtil.isNotNull(query.getRemark()), "remark", query.getRemark()); + wrapper.eq(ObjectUtil.isNotNull(query.getOutletCode()), "outlet_code", query.getOutletCode()); + wrapper.eq(ObjectUtil.isNotNull(query.getPollutantName()), "pollutant_name", query.getPollutantName()); + wrapper.eq(ObjectUtil.isNotNull(query.getMonitoringFacilities()), "monitoring_facilities", query.getMonitoringFacilities()); + wrapper.eq(ObjectUtil.isNotNull(query.getFacilityName()), "facility_name", query.getFacilityName()); + wrapper.eq(ObjectUtil.isNotNull(query.getEmissionConcentration()), "emission_concentration", query.getEmissionConcentration()); + wrapper.eq(ObjectUtil.isNotNull(query.getEffectivelyHour()), "effectively_hour", query.getEffectivelyHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getDetectionMinHour()), "detection_min_hour", query.getDetectionMinHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getDetectionMaxHour()), "detection_max_hour", query.getDetectionMaxHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getDetectionAvgHour()), "detection_avg_hour", query.getDetectionAvgHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getFoldsMinHour()), "folds_min_hour", query.getFoldsMinHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getFoldsMaxHour()), "folds_max_hour", query.getFoldsMaxHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getFoldsAvgHour()), "folds_avg_hour", query.getFoldsAvgHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getExceededData()), "exceeded_data", query.getExceededData()); + wrapper.eq(ObjectUtil.isNotNull(query.getExceededRate()), "exceeded_rate", query.getExceededRate()); + wrapper.eq(ObjectUtil.isNotNull(query.getActualAmount()), "actual_amount", query.getActualAmount()); + wrapper.eq(ObjectUtil.isNotNull(query.getActualEmissions()), "actual_emissions", query.getActualEmissions()); + wrapper.eq(ObjectUtil.isNotNull(query.getInstrumentName()), "instrument_name", query.getInstrumentName()); + wrapper.eq(ObjectUtil.isNotNull(query.getSamplingMethod()), "sampling_method", query.getSamplingMethod()); + wrapper.eq(ObjectUtil.isNotNull(query.getManualMethod()), "manual_method", query.getManualMethod()); + wrapper.eq(ObjectUtil.isNotNull(query.getDeviceRange()), "device_range", query.getDeviceRange()); + wrapper.eq(ObjectUtil.isNotNull(query.getDeviceAccuracy()), "device_accuracy", query.getDeviceAccuracy()); + wrapper.eq(ObjectUtil.isNotNull(query.getDeviceCheckout()), "device_checkout", query.getDeviceCheckout()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionSpeedQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionSpeedQuery.java new file mode 100644 index 0000000..3062f4a --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionSpeedQuery.java @@ -0,0 +1,90 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionSpeed; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 固定源产排治--执行报告--有组织废气污染物排放速率监测对象 b_stat_table_zxbg_gas_emission_speed + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--有组织废气污染物排放速率监测") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgGasEmissionSpeedQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "排放口编码") + private String outletCode; + @ApiModelProperty(value = "排放口名称") + private String outletName; + @ApiModelProperty(value = "备注") + private String remark; + @ApiModelProperty(value = "创建时间") + private String createTime; + @ApiModelProperty(value = "污染物名称") + private String pollutantName; + @ApiModelProperty(value = "污染物编码") + private String pollutantCode; + @ApiModelProperty(value = "许可排放浓度限值") + private String emissionConcentration; + @ApiModelProperty(value = "有效监测数据(小时值)数量") + private String effectivelyHour; + @ApiModelProperty(value = "实际排放速率最小值") + private String detectionMinHour; + @ApiModelProperty(value = "实际排放速率最大值") + private String detectionMaxHour; + @ApiModelProperty(value = "实际排放速率平均值") + private String detectionAvgHour; + @ApiModelProperty(value = "超标数据个数") + private String exceededData; + @ApiModelProperty(value = "超标率（%）") + private String exceededRate; + @ApiModelProperty(value = "超标原因") + private String exceededCause; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgGasEmissionSpeedQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getOutletCode()), "outlet_code", query.getOutletCode()); + wrapper.eq(ObjectUtil.isNotNull(query.getOutletName()), "outlet_name", query.getOutletName()); + wrapper.eq(ObjectUtil.isNotNull(query.getRemark()), "remark", query.getRemark()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + wrapper.eq(ObjectUtil.isNotNull(query.getPollutantName()), "pollutant_name", query.getPollutantName()); + wrapper.eq(ObjectUtil.isNotNull(query.getPollutantCode()), "pollutant_code", query.getPollutantCode()); + wrapper.eq(ObjectUtil.isNotNull(query.getEmissionConcentration()), "emission_concentration", query.getEmissionConcentration()); + wrapper.eq(ObjectUtil.isNotNull(query.getEffectivelyHour()), "effectively_hour", query.getEffectivelyHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getDetectionMinHour()), "detection_min_hour", query.getDetectionMinHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getDetectionMaxHour()), "detection_max_hour", query.getDetectionMaxHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getDetectionAvgHour()), "detection_avg_hour", query.getDetectionAvgHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getExceededData()), "exceeded_data", query.getExceededData()); + wrapper.eq(ObjectUtil.isNotNull(query.getExceededRate()), "exceeded_rate", query.getExceededRate()); + wrapper.eq(ObjectUtil.isNotNull(query.getExceededCause()), "exceeded_cause", query.getExceededCause()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionStatisticsQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionStatisticsQuery.java new file mode 100644 index 0000000..7213a3d --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGasEmissionStatisticsQuery.java @@ -0,0 +1,84 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgGasEmissionStatistics; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计对象 b_stat_table_zxbg_gas_emission_statistics + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--无组织废气污染物排放浓度监测数据统计") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgGasEmissionStatisticsQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "类型") + private String zxbgPollutantType; + @ApiModelProperty(value = "污染物名称") + private String pollutantName; + @ApiModelProperty(value = "设施名称") + private String facilityName; + @ApiModelProperty(value = "生产设施/无组织排放编号") + private String facilitiesCode; + @ApiModelProperty(value = "监测时间") + private String monitoringTime; + @ApiModelProperty(value = "监测次数") + private Long monitoringNumber; + @ApiModelProperty(value = "许可排放浓度限值") + private String emissionConcentration; + @ApiModelProperty(value = "浓度监测结果（小时浓度）") + private String monitoringResultsHour; + @ApiModelProperty(value = "浓度监测结果（折标，小时浓度）") + private String monitoringFoldsHour; + @ApiModelProperty(value = "是否超标:0否1是") + private String isExceeded; + @ApiModelProperty(value = "备注") + private String remark; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgGasEmissionStatisticsQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPollutantType()), "zxbg_pollutant_type", query.getZxbgPollutantType()); + wrapper.eq(ObjectUtil.isNotNull(query.getPollutantName()), "pollutant_name", query.getPollutantName()); + wrapper.eq(ObjectUtil.isNotNull(query.getFacilityName()), "facility_name", query.getFacilityName()); + wrapper.eq(ObjectUtil.isNotNull(query.getFacilitiesCode()), "facilities_code", query.getFacilitiesCode()); + wrapper.eq(ObjectUtil.isNotNull(query.getMonitoringTime()), "monitoring_time", query.getMonitoringTime()); + wrapper.eq(ObjectUtil.isNotNull(query.getMonitoringNumber()), "Monitoring_number", query.getMonitoringNumber()); + wrapper.eq(ObjectUtil.isNotNull(query.getEmissionConcentration()), "emission_concentration", query.getEmissionConcentration()); + wrapper.eq(ObjectUtil.isNotNull(query.getMonitoringResultsHour()), "monitoring_results_hour", query.getMonitoringResultsHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getMonitoringFoldsHour()), "monitoring_folds_hour", query.getMonitoringFoldsHour()); + wrapper.eq(ObjectUtil.isNotNull(query.getIsExceeded()), "is_exceeded", query.getIsExceeded()); + wrapper.eq(ObjectUtil.isNotNull(query.getRemark()), "remark", query.getRemark()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGtFuelQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGtFuelQuery.java new file mode 100644 index 0000000..e103e8a --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGtFuelQuery.java @@ -0,0 +1,64 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgGtFuel; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--钢铁-燃料分析对象 b_stat_table_zxbg_gt_fuel + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--钢铁-燃料分析") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgGtFuelQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "记录内容") + private String recordContent; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty(value = "具体情况") + private String specificInformation; + @ApiModelProperty(value = "备注") + private String remark; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgGtFuelQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getRecordContent()), "record_content", query.getRecordContent()); + wrapper.eq(ObjectUtil.isNotNull(query.getName()), "name", query.getName()); + wrapper.eq(ObjectUtil.isNotNull(query.getSpecificInformation()), "specific_information", query.getSpecificInformation()); + wrapper.eq(ObjectUtil.isNotNull(query.getRemark()), "remark", query.getRemark()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGtProductionQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGtProductionQuery.java new file mode 100644 index 0000000..85a417b --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgGtProductionQuery.java @@ -0,0 +1,67 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgGtProduction; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--钢铁-生产单元运行情况对象 b_stat_table_zxbg_gt_production + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--钢铁-生产单元运行情况") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgGtProductionQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "主要生产单元") + private String mainProductionUnit; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty(value = "数量") + private String quantity; + @ApiModelProperty(value = "单位") + private String unit; + @ApiModelProperty(value = "备注") + private String remark; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgGtProductionQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getMainProductionUnit()), "main_production_unit", query.getMainProductionUnit()); + wrapper.eq(ObjectUtil.isNotNull(query.getName()), "name", query.getName()); + wrapper.eq(ObjectUtil.isNotNull(query.getQuantity()), "quantity", query.getQuantity()); + wrapper.eq(ObjectUtil.isNotNull(query.getUnit()), "unit", query.getUnit()); + wrapper.eq(ObjectUtil.isNotNull(query.getRemark()), "remark", query.getRemark()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdFuelAnalysisQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdFuelAnalysisQuery.java new file mode 100644 index 0000000..56252d5 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdFuelAnalysisQuery.java @@ -0,0 +1,76 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdFuelAnalysis; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电燃料分析对象 b_stat_table_zxbg_hd_fuel_analysis + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电燃料分析") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdFuelAnalysisQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "生产单元") + private String productionUnit; + @ApiModelProperty(value = "燃料名称") + private String fuelName; + @ApiModelProperty(value = "使用量（万t/a、万m³/a）") + private String usage; + @ApiModelProperty(value = "灰分（%）") + private String ashContent; + @ApiModelProperty(value = "硫分（%）") + private String sulfur; + @ApiModelProperty(value = "挥发分（%）") + private String volatileContent; + @ApiModelProperty(value = "热值（MJ/kg、MJ/m³）") + private String caloricValue; + @ApiModelProperty(value = "备注") + private String remark; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgHdFuelAnalysisQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getProductionUnit()), "production_unit", query.getProductionUnit()); + wrapper.eq(ObjectUtil.isNotNull(query.getFuelName()), "fuel_name", query.getFuelName()); + wrapper.eq(ObjectUtil.isNotNull(query.getUsage()), "usage", query.getUsage()); + wrapper.eq(ObjectUtil.isNotNull(query.getAshContent()), "ash_content", query.getAshContent()); + wrapper.eq(ObjectUtil.isNotNull(query.getSulfur()), "sulfur", query.getSulfur()); + wrapper.eq(ObjectUtil.isNotNull(query.getVolatileContent()), "volatile_content", query.getVolatileContent()); + wrapper.eq(ObjectUtil.isNotNull(query.getCaloricValue()), "caloric_value", query.getCaloricValue()); + wrapper.eq(ObjectUtil.isNotNull(query.getRemark()), "remark", query.getRemark()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGasPollutionQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGasPollutionQuery.java new file mode 100644 index 0000000..f650a30 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGasPollutionQuery.java @@ -0,0 +1,109 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGasPollution; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电废气污染治理设施正常情况对象 b_stat_table_zxbg_hd_gas_pollution + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电废气污染治理设施正常情况") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdGasPollutionQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "生产设施名称") + private String productionFacilityName; + @ApiModelProperty(value = "生产设施编号") + private String productionFacilityCode; + @ApiModelProperty(value = "治理设施编号") + private String governanceFacilityCode; + @ApiModelProperty(value = "治理设施名称") + private String governanceFacilityName; + @ApiModelProperty(value = "治理设施运行时间（小时）") + private String governanceFacilityTime; + @ApiModelProperty(value = "粉煤灰产生量（吨）") + private String flyAshProduction; + @ApiModelProperty(value = "布袋除尘器清灰周期和换代情况") + private String bagFilter; + @ApiModelProperty(value = "除尘效率设计值") + private String dustRemovalEfficiency; + @ApiModelProperty(value = "除尘效率实际值") + private String actualValue; + @ApiModelProperty(value = "脱硫剂用量（吨）") + private String desulfurizerDosage; + @ApiModelProperty(value = "脱硫副产物产生量（吨）") + private String amountProduct; + @ApiModelProperty(value = "脱硫效率设计值%") + private String designValues; + @ApiModelProperty(value = "脱硫效率实际值%") + private String actualEfficiency; + @ApiModelProperty(value = "脱硝还原剂用量（吨）") + private String reducingAgentDosage; + @ApiModelProperty(value = "脱硝效率设计值") + private String denitrationEfficiency; + @ApiModelProperty(value = "脱硝效率实际") + private String efficiencyPractical; + @ApiModelProperty(value = "污染治理设施运行费用（万元）") + private String facilityOperatingCosts; + @ApiModelProperty(value = "综合除尘效率设计值") + private String efficiencyDesignValues; + @ApiModelProperty(value = "综合除尘效率实际值") + private String actualDustRemoval; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgHdGasPollutionQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getProductionFacilityName()), "production_facility_name", query.getProductionFacilityName()); + wrapper.eq(ObjectUtil.isNotNull(query.getProductionFacilityCode()), "production_facility_code", query.getProductionFacilityCode()); + wrapper.eq(ObjectUtil.isNotNull(query.getGovernanceFacilityCode()), "governance_facility_code", query.getGovernanceFacilityCode()); + wrapper.eq(ObjectUtil.isNotNull(query.getGovernanceFacilityName()), "governance_facility_name", query.getGovernanceFacilityName()); + wrapper.eq(ObjectUtil.isNotNull(query.getGovernanceFacilityTime()), "governance_facility_time", query.getGovernanceFacilityTime()); + wrapper.eq(ObjectUtil.isNotNull(query.getFlyAshProduction()), "fly_ash_production", query.getFlyAshProduction()); + wrapper.eq(ObjectUtil.isNotNull(query.getBagFilter()), "bag_filter", query.getBagFilter()); + wrapper.eq(ObjectUtil.isNotNull(query.getDustRemovalEfficiency()), "dust_removal_efficiency", query.getDustRemovalEfficiency()); + wrapper.eq(ObjectUtil.isNotNull(query.getActualValue()), "actual_value", query.getActualValue()); + wrapper.eq(ObjectUtil.isNotNull(query.getDesulfurizerDosage()), "desulfurizer_dosage", query.getDesulfurizerDosage()); + wrapper.eq(ObjectUtil.isNotNull(query.getAmountProduct()), "amount_product", query.getAmountProduct()); + wrapper.eq(ObjectUtil.isNotNull(query.getDesignValues()), "design_values", query.getDesignValues()); + wrapper.eq(ObjectUtil.isNotNull(query.getActualEfficiency()), "actual_efficiency", query.getActualEfficiency()); + wrapper.eq(ObjectUtil.isNotNull(query.getReducingAgentDosage()), "reducing_agent_dosage", query.getReducingAgentDosage()); + wrapper.eq(ObjectUtil.isNotNull(query.getDenitrationEfficiency()), "denitration_efficiency", query.getDenitrationEfficiency()); + wrapper.eq(ObjectUtil.isNotNull(query.getEfficiencyPractical()), "efficiency_practical", query.getEfficiencyPractical()); + wrapper.eq(ObjectUtil.isNotNull(query.getFacilityOperatingCosts()), "facility_operating_costs", query.getFacilityOperatingCosts()); + wrapper.eq(ObjectUtil.isNotNull(query.getEfficiencyDesignValues()), "efficiency_design_values", query.getEfficiencyDesignValues()); + wrapper.eq(ObjectUtil.isNotNull(query.getActualDustRemoval()), "actual_dust_removal", query.getActualDustRemoval()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtBasicQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtBasicQuery.java new file mode 100644 index 0000000..15951e7 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtBasicQuery.java @@ -0,0 +1,76 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtBasic; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电、钢铁基本信息对象 b_stat_table_zxbg_hd_gt_basic + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电、钢铁基本信息") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdGtBasicQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "机组名称") + private String unitName; + @ApiModelProperty(value = "规模（万千瓦）") + private String scale; + @ApiModelProperty(value = "设计运行时间（小时）") + private String runTime; + @ApiModelProperty(value = "发电量（万千瓦时）") + private String powerGeneration; + @ApiModelProperty(value = "供热量（万吉焦）") + private String heatSupply; + @ApiModelProperty(value = "实际运行时间（小时）") + private String actualRunningTime; + @ApiModelProperty(value = "平均负荷率") + private String averageLoadRatio; + @ApiModelProperty(value = "备注") + private String remark; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgHdGtBasicQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getUnitName()), "unit_name", query.getUnitName()); + wrapper.eq(ObjectUtil.isNotNull(query.getScale()), "scale", query.getScale()); + wrapper.eq(ObjectUtil.isNotNull(query.getRunTime()), "run_time", query.getRunTime()); + wrapper.eq(ObjectUtil.isNotNull(query.getPowerGeneration()), "power_generation", query.getPowerGeneration()); + wrapper.eq(ObjectUtil.isNotNull(query.getHeatSupply()), "heat_supply", query.getHeatSupply()); + wrapper.eq(ObjectUtil.isNotNull(query.getActualRunningTime()), "actual_running_time", query.getActualRunningTime()); + wrapper.eq(ObjectUtil.isNotNull(query.getAverageLoadRatio()), "average_load_ratio", query.getAverageLoadRatio()); + wrapper.eq(ObjectUtil.isNotNull(query.getRemark()), "remark", query.getRemark()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtFuelQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtFuelQuery.java new file mode 100644 index 0000000..8628794 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtFuelQuery.java @@ -0,0 +1,82 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtFuel; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电、钢铁燃料信息对象 b_stat_table_zxbg_hd_gt_fuel + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电、钢铁燃料信息") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdGtFuelQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "机组名称") + private String unitName; + @ApiModelProperty(value = "机组类型") + private String unitType; + @ApiModelProperty(value = "燃料消耗量") + private String fuelConsumption; + @ApiModelProperty(value = "燃料消耗量单位") + private String fuelConsumptionUnits; + @ApiModelProperty(value = "发电标准煤耗") + private String coalConsumption; + @ApiModelProperty(value = "发电标准煤耗单位") + private String coalConsumptionUnits; + @ApiModelProperty(value = "产灰量") + private String ashProduction; + @ApiModelProperty(value = "产灰量单位") + private String ashProductionUits; + @ApiModelProperty(value = "产渣量") + private String slagProduction; + @ApiModelProperty(value = "产渣量单位") + private String slagProductionUnits; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgHdGtFuelQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getUnitName()), "unit_name", query.getUnitName()); + wrapper.eq(ObjectUtil.isNotNull(query.getUnitType()), "unit_type", query.getUnitType()); + wrapper.eq(ObjectUtil.isNotNull(query.getFuelConsumption()), "fuel_consumption", query.getFuelConsumption()); + wrapper.eq(ObjectUtil.isNotNull(query.getFuelConsumptionUnits()), "fuel_consumption_units", query.getFuelConsumptionUnits()); + wrapper.eq(ObjectUtil.isNotNull(query.getCoalConsumption()), "coal_consumption", query.getCoalConsumption()); + wrapper.eq(ObjectUtil.isNotNull(query.getCoalConsumptionUnits()), "coal_consumption_units", query.getCoalConsumptionUnits()); + wrapper.eq(ObjectUtil.isNotNull(query.getAshProduction()), "ash_production", query.getAshProduction()); + wrapper.eq(ObjectUtil.isNotNull(query.getAshProductionUits()), "ash_production_uits", query.getAshProductionUits()); + wrapper.eq(ObjectUtil.isNotNull(query.getSlagProduction()), "slag_production", query.getSlagProduction()); + wrapper.eq(ObjectUtil.isNotNull(query.getSlagProductionUnits()), "slag_production_units", query.getSlagProductionUnits()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtInvestmentQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtInvestmentQuery.java new file mode 100644 index 0000000..97e6593 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdGtInvestmentQuery.java @@ -0,0 +1,70 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdGtInvestment; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况对象 b_stat_table_zxbg_hd_gt_investment + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电、钢铁污染治理设施计划投资情况") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdGtInvestmentQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "机组名称") + private String unitName; + @ApiModelProperty(value = "治理类型") + private String governanceType; + @ApiModelProperty(value = "开工时间") + private String startTime; + @ApiModelProperty(value = "建成投产时间（拟）") + private String productionTime; + @ApiModelProperty(value = "计划总投资") + private String plannedInvestment; + @ApiModelProperty(value = "计划周期内完成投资") + private String cycleCompleteInvestment; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgHdGtInvestmentQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getUnitName()), "unit_name", query.getUnitName()); + wrapper.eq(ObjectUtil.isNotNull(query.getGovernanceType()), "governance_type", query.getGovernanceType()); + wrapper.eq(ObjectUtil.isNotNull(query.getStartTime()), "start_time", query.getStartTime()); + wrapper.eq(ObjectUtil.isNotNull(query.getProductionTime()), "production_time", query.getProductionTime()); + wrapper.eq(ObjectUtil.isNotNull(query.getPlannedInvestment()), "planned_investment", query.getPlannedInvestment()); + wrapper.eq(ObjectUtil.isNotNull(query.getCycleCompleteInvestment()), "cycle_complete_investment", query.getCycleCompleteInvestment()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdWaterPollutionQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdWaterPollutionQuery.java new file mode 100644 index 0000000..2dd7bd3 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgHdWaterPollutionQuery.java @@ -0,0 +1,121 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgHdWaterPollution; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--火电废水污染治理设施正常情况对象 b_stat_table_zxbg_hd_water_pollution + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--火电废水污染治理设施正常情况") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgHdWaterPollutionQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "废水类别") + private String waterCategory; + @ApiModelProperty(value = "治理设施编号") + private String governanceFacilityCode; + @ApiModelProperty(value = "治理设施名称") + private String governanceFacilityName; + @ApiModelProperty(value = "治理设施运行时间（小时）") + private String governanceFacilityTime; + @ApiModelProperty(value = "污染治理设施工艺") + private String pollutionFacilityTechnology; + @ApiModelProperty(value = "污染因子") + private String contaminateFactor; + @ApiModelProperty(value = "排放去向") + private String emissions; + @ApiModelProperty(value = "受纳水体名称") + private String receivingName; + @ApiModelProperty(value = "用电量") + private String electricityConsumption; + @ApiModelProperty(value = "污水设计处理能力") + private String processingPower; + @ApiModelProperty(value = "污水实际处理量") + private String actualProcessingVolume; + @ApiModelProperty(value = "污水实际会用量") + private String willAmount; + @ApiModelProperty(value = "污水实际排放量") + private String actualEmissions; + @ApiModelProperty(value = "废水设计处理能力") + private String designProcessingPower; + @ApiModelProperty(value = "废水实际处理量") + private String waterTreatmentVolume; + @ApiModelProperty(value = "废水实际会用量") + private String waterWillAmount; + @ApiModelProperty(value = "废水实际排放量") + private String waterActualEmissions; + @ApiModelProperty(value = "污泥生成量") + private String sludgeGeneration; + @ApiModelProperty(value = "污泥含水率") + private String sludgeMoistureContent; + @ApiModelProperty(value = "循环冷却水排放量") + private String circulatingCooling; + @ApiModelProperty(value = "直流冷却水排水量") + private String coolingDischarge; + @ApiModelProperty(value = "污泥处置方式") + private String sludgeDisposalMethod; + @ApiModelProperty(value = "污染治理设施运行费用") + private String facilityOperatingCosts; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgHdWaterPollutionQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getWaterCategory()), "water_category", query.getWaterCategory()); + wrapper.eq(ObjectUtil.isNotNull(query.getGovernanceFacilityCode()), "governance_facility_code", query.getGovernanceFacilityCode()); + wrapper.eq(ObjectUtil.isNotNull(query.getGovernanceFacilityName()), "governance_facility_name", query.getGovernanceFacilityName()); + wrapper.eq(ObjectUtil.isNotNull(query.getGovernanceFacilityTime()), "governance_facility_time", query.getGovernanceFacilityTime()); + wrapper.eq(ObjectUtil.isNotNull(query.getPollutionFacilityTechnology()), "pollution_facility_technology", query.getPollutionFacilityTechnology()); + wrapper.eq(ObjectUtil.isNotNull(query.getContaminateFactor()), "contaminate_factor", query.getContaminateFactor()); + wrapper.eq(ObjectUtil.isNotNull(query.getEmissions()), "emissions", query.getEmissions()); + wrapper.eq(ObjectUtil.isNotNull(query.getReceivingName()), "receiving_name", query.getReceivingName()); + wrapper.eq(ObjectUtil.isNotNull(query.getElectricityConsumption()), "electricity_consumption", query.getElectricityConsumption()); + wrapper.eq(ObjectUtil.isNotNull(query.getProcessingPower()), "processing_power", query.getProcessingPower()); + wrapper.eq(ObjectUtil.isNotNull(query.getActualProcessingVolume()), "actual_processing_volume", query.getActualProcessingVolume()); + wrapper.eq(ObjectUtil.isNotNull(query.getWillAmount()), "will_amount", query.getWillAmount()); + wrapper.eq(ObjectUtil.isNotNull(query.getActualEmissions()), "actual_emissions", query.getActualEmissions()); + wrapper.eq(ObjectUtil.isNotNull(query.getDesignProcessingPower()), "design_processing_power", query.getDesignProcessingPower()); + wrapper.eq(ObjectUtil.isNotNull(query.getWaterTreatmentVolume()), "water_treatment_volume", query.getWaterTreatmentVolume()); + wrapper.eq(ObjectUtil.isNotNull(query.getWaterWillAmount()), "water_will_amount", query.getWaterWillAmount()); + wrapper.eq(ObjectUtil.isNotNull(query.getWaterActualEmissions()), "water_actual_emissions", query.getWaterActualEmissions()); + wrapper.eq(ObjectUtil.isNotNull(query.getSludgeGeneration()), "sludge_generation", query.getSludgeGeneration()); + wrapper.eq(ObjectUtil.isNotNull(query.getSludgeMoistureContent()), "sludge_moisture_content", query.getSludgeMoistureContent()); + wrapper.eq(ObjectUtil.isNotNull(query.getCirculatingCooling()), "circulating_cooling", query.getCirculatingCooling()); + wrapper.eq(ObjectUtil.isNotNull(query.getCoolingDischarge()), "cooling_discharge", query.getCoolingDischarge()); + wrapper.eq(ObjectUtil.isNotNull(query.getSludgeDisposalMethod()), "sludge_disposal_method", query.getSludgeDisposalMethod()); + wrapper.eq(ObjectUtil.isNotNull(query.getFacilityOperatingCosts()), "facility_operating_costs", query.getFacilityOperatingCosts()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgSnFuelQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgSnFuelQuery.java new file mode 100644 index 0000000..e191940 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgSnFuelQuery.java @@ -0,0 +1,70 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgSnFuel; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--水泥燃料分析对象 b_stat_table_zxbg_sn_fuel + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--水泥燃料分析") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgSnFuelQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "参数") + private String parameter; + @ApiModelProperty(value = "记录内容") + private String recordTheContent; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty(value = "备注") + private String remark; + @ApiModelProperty(value = "类型") + private String type; + @ApiModelProperty(value = "使用情况") + private String usage; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgSnFuelQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getParameter()), "parameter", query.getParameter()); + wrapper.eq(ObjectUtil.isNotNull(query.getRecordTheContent()), "record_the_content", query.getRecordTheContent()); + wrapper.eq(ObjectUtil.isNotNull(query.getName()), "name", query.getName()); + wrapper.eq(ObjectUtil.isNotNull(query.getRemark()), "remark", query.getRemark()); + wrapper.eq(ObjectUtil.isNotNull(query.getType()), "type", query.getType()); + wrapper.eq(ObjectUtil.isNotNull(query.getUsage()), "usage", query.getUsage()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgSnProductionQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgSnProductionQuery.java new file mode 100644 index 0000000..0e346f1 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgSnProductionQuery.java @@ -0,0 +1,70 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgSnProduction; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--水泥-生产单元运行情况对象 b_stat_table_zxbg_sn_production + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--水泥-生产单元运行情况") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgSnProductionQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "主要生产单元") + private String mainProductionUnit; + @ApiModelProperty(value = "生产设施名称") + private String productionFacilities; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty(value = "数量") + private String quantity; + @ApiModelProperty(value = "单位") + private String unit; + @ApiModelProperty(value = "备注") + private String remark; + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgSnProductionQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getMainProductionUnit()), "main_production_unit", query.getMainProductionUnit()); + wrapper.eq(ObjectUtil.isNotNull(query.getProductionFacilities()), "production_facilities", query.getProductionFacilities()); + wrapper.eq(ObjectUtil.isNotNull(query.getName()), "name", query.getName()); + wrapper.eq(ObjectUtil.isNotNull(query.getQuantity()), "quantity", query.getQuantity()); + wrapper.eq(ObjectUtil.isNotNull(query.getUnit()), "unit", query.getUnit()); + wrapper.eq(ObjectUtil.isNotNull(query.getRemark()), "remark", query.getRemark()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgWaterEmissionQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgWaterEmissionQuery.java new file mode 100644 index 0000000..bc94756 --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTableZxbgWaterEmissionQuery.java @@ -0,0 +1,103 @@ +package cn.cecep.talroad.vo.query; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import cn.cecep.talroad.domain.BStatTableZxbgWaterEmission; +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; + + +/** + * 固定源产排治--执行报告--废水污染物排放浓度监测数据对象 b_stat_table_zxbg_water_emission + * + * @author szhpt + * @date 2023-08-01*/ +@ApiModel(value = "固定源产排治--执行报告--废水污染物排放浓度监测数据") +@EqualsAndHashCode(callSuper = false) +@Data +public class BStatTableZxbgWaterEmissionQuery extends PageQuery +{ + + @ApiModelProperty(value = "主键id") + private Long id; + @ApiModelProperty(value = "企业id") + private String factoryId; + @ApiModelProperty(value = "执行报告类型，0：月报，1：季报，2：年报") + private String zxbgType; + @ApiModelProperty(value = "执行报告周期") + private String zxbgPeriod; + @ApiModelProperty(value = "类型") + private String zxbgPollutantType; + @ApiModelProperty(value = "创建时间") + private String createTime; + @ApiModelProperty(value = "备注") + private String remark; + @ApiModelProperty(value = "排放口编码") + private String outletCode; + @ApiModelProperty(value = "污染物名称") + private String pollutantName; + @ApiModelProperty(value = "监测设施") + private String monitoringFacilities; + @ApiModelProperty(value = "设施名称") + private String facilityName; + @ApiModelProperty(value = "许可排放浓度限值") + private String emissionConcentration; + @ApiModelProperty(value = "有效监测数据(日)数量") + private String effectivelyDay; + @ApiModelProperty(value = "检测结果（日均浓度）最小值mg/m3") + private String detectionMinDay; + @ApiModelProperty(value = "检测结果（日均浓度）最大值mg/m3") + private String detectionMaxDay; + @ApiModelProperty(value = "检测结果（日均浓度）平均值") + private String detectionAvgDay; + @ApiModelProperty(value = "超标数据个数") + private String exceededData; + @ApiModelProperty(value = "超标率（%）") + private String exceededRate; + @ApiModelProperty(value = "实际排放量（吨）") + private String actualEmissions; + @ApiModelProperty(value = "监测仪器名称或型号") + private String instrumentName; + @ApiModelProperty(value = "手工监测采样方法及个数") + private String samplingMethod; + @ApiModelProperty(value = "手工测定方法") + private String manualMethod; + /** + * + * @Title: getQueryWrapper + * @Description: 查询参数组装 + * @param: @return + * @return: QueryWrapper + * @throws + */ + public static QueryWrapper createLambdaQueryWrapper(BStatTableZxbgWaterEmissionQuery query) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); + wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgType()), "zxbg_type", query.getZxbgType()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPeriod()), "zxbg_period", query.getZxbgPeriod()); + wrapper.eq(ObjectUtil.isNotNull(query.getZxbgPollutantType()), "zxbg_pollutant_type", query.getZxbgPollutantType()); + wrapper.eq(ObjectUtil.isNotNull(query.getCreateTime()), "create_time", query.getCreateTime()); + wrapper.eq(ObjectUtil.isNotNull(query.getRemark()), "remark", query.getRemark()); + wrapper.eq(ObjectUtil.isNotNull(query.getOutletCode()), "outlet_code", query.getOutletCode()); + wrapper.eq(ObjectUtil.isNotNull(query.getPollutantName()), "pollutant_name", query.getPollutantName()); + wrapper.eq(ObjectUtil.isNotNull(query.getMonitoringFacilities()), "monitoring_facilities", query.getMonitoringFacilities()); + wrapper.eq(ObjectUtil.isNotNull(query.getFacilityName()), "facility_name", query.getFacilityName()); + wrapper.eq(ObjectUtil.isNotNull(query.getEmissionConcentration()), "emission_concentration", query.getEmissionConcentration()); + wrapper.eq(ObjectUtil.isNotNull(query.getEffectivelyDay()), "effectively_day", query.getEffectivelyDay()); + wrapper.eq(ObjectUtil.isNotNull(query.getDetectionMinDay()), "detection_min_day", query.getDetectionMinDay()); + wrapper.eq(ObjectUtil.isNotNull(query.getDetectionMaxDay()), "detection_max_day", query.getDetectionMaxDay()); + wrapper.eq(ObjectUtil.isNotNull(query.getDetectionAvgDay()), "detection_avg_day", query.getDetectionAvgDay()); + wrapper.eq(ObjectUtil.isNotNull(query.getExceededData()), "exceeded_data", query.getExceededData()); + wrapper.eq(ObjectUtil.isNotNull(query.getExceededRate()), "exceeded_rate", query.getExceededRate()); + wrapper.eq(ObjectUtil.isNotNull(query.getActualEmissions()), "actual_emissions", query.getActualEmissions()); + wrapper.eq(ObjectUtil.isNotNull(query.getInstrumentName()), "instrument_name", query.getInstrumentName()); + wrapper.eq(ObjectUtil.isNotNull(query.getSamplingMethod()), "sampling_method", query.getSamplingMethod()); + wrapper.eq(ObjectUtil.isNotNull(query.getManualMethod()), "manual_method", query.getManualMethod()); + return wrapper; + } +} diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTablepPwxkWaterQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTablepPwxkWaterQuery.java index d64dce5..1e00ef6 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTablepPwxkWaterQuery.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/BStatTablepPwxkWaterQuery.java @@ -1,11 +1,9 @@ package cn.cecep.talroad.vo.query; -import cn.cecep.talroad.common.core.annotation.Excel; import cn.cecep.talroad.common.core.domain.query.PageQuery; -import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiModelProperty; -import jdk.internal.dynalink.linker.LinkerServices; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Map; @@ -32,12 +30,130 @@ public class BStatTablepPwxkWaterQuery extends PageQuery { @ApiModelProperty(value = "执行报告周期") private String zxbgPeriod; - @ApiModelProperty(value = "执行报告记录内容") + @ApiModelProperty(value = "执行报告-记录内容") private String zxbgRecord; - @ApiModelProperty(value = "名称") + @ApiModelProperty(value = "执行报告-名称") private String zxbgName; - @ApiModelProperty(value = "参数") + @ApiModelProperty(value = "执行报告-参数") private String zxbgParam; + + @ApiModelProperty(value = "执行报告-污染物名称") + private String zxbgPollutant; + + @ApiModelProperty(value = "执行报告-排放方式") + private String zxbgEmissionType; + + @ApiModelProperty(value = "执行报告-超标时段开始时间") + private String overStartTime; + + @ApiModelProperty(value = "执行报告-超标时段截止时间") + private String overEndTime; + + @ApiModelProperty(value = "执行报告-超标原因说明") + private String overRemark; + + @ApiModelProperty(value = "执行报告-类型") + private String zxbgAirType; + + @ApiModelProperty(value = "执行报告-废气类型") + private String zxbgAirAllType; + + @ApiModelProperty(value = "执行报告-时间-开始") + private String zxbgStartTime; + + @ApiModelProperty(value = "执行报告-时间-结束") + private String zxbgEndTime; + + @ApiModelProperty(value = "执行报告-运行参数") + private String processParameter; + + @ApiModelProperty(value = "执行报告-监测设施") + private String monitoringFacilities; + + + @ApiModelProperty(value = "执行报告-生产单元") + private String productionUnit; + + + @ApiModelProperty(value = "执行报告-燃料名称") + private String fuelName; + + + @ApiModelProperty(value = "污水处理厂名称") + private String treatmentPlantName; + @ApiModelProperty(value = "污水处理厂类型") + private List treatmentPlantTypes; + + @ApiModelProperty(value = "运营商名称") + private String serviceProvider; + + @ApiModelProperty(value = "是否属于工业园区配套污水处理设施（0否1是）") + private String belongToWaterTreatmentFacilities; + + @ApiModelProperty(value="服务范围所属行政区域") + private String serviceCountryCode; + @ApiModelProperty(value="生产设施编号") + private String productionFacilitiesCode; + + /** + * 生产设施名称 + */ + @ApiModelProperty(value="生产设施名称") + private String productionFacilitiesName; + + @ApiModelProperty(value = "固体废物类别") + /** 固体废物类别*/ + private String solidWasteType; + + @ApiModelProperty(value = "主要生产单元名称") + private String productionUnitName; + @ApiModelProperty(value = "主要工艺名称") + private Short craftName; + @ApiModelProperty(value = "生产设施名称") + private String facilityName; + @ApiModelProperty(value = "生产线类型") + private String productionLineType; + @ApiModelProperty(value="产品名称") + private String productName; + @ApiModelProperty(value = "记录频次") + /** 记录频次 */ + private List recordFrequencys; + @ApiModelProperty(value = "true导出压缩包，false") + private Boolean bol; + + /** + * 种类 + */ + @ApiModelProperty(value="种类") + private String rawMaterialClass; + + /** + * 类型 + */ + @ApiModelProperty(value="类型") + private String rawMaterialType; + + /** + * 名称 + */ + @ApiModelProperty(value="名称") + private String rawMaterialName; + @ApiModelProperty(value="多表导出ZIP的bean和方法:BStatTableZxbgJbxxInfoController.export多个英文逗号分隔") + private String beanMethodList; + + public String getZxbgType() { + return zxbgType; + } + + public void setZxbgType(String zxbgType) { + if(StringUtils.isNotBlank(zxbgType)){ + if(zxbgType.equals("year")){this.zxbgType = "2";} + if(zxbgType.equals("quarter")){this.zxbgType = "1";} + if(zxbgType.equals("month")){this.zxbgType = "0";} + }else { + this.zxbgType = zxbgType; + } + } } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcControlRequirementsQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcControlRequirementsQuery.java index 8358468..717d601 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcControlRequirementsQuery.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcControlRequirementsQuery.java @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 管控要求对象 pc_control_requirements @@ -49,4 +51,120 @@ public class PcControlRequirementsQuery extends PageQuery wrapper.orderByAsc("id"); return wrapper; } + + @ApiModel(value = "排污许可-废气有组织排放要求query") + @Data + public static class PwxkGasOrg { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "排放口编号") + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + private String outletName; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + private String outletTypes; + + @ApiModelProperty(value = "污染物种类") + private List pollutantNames; + + @ApiModelProperty(value = "国家或地方污染物排放标准名") + private String pollutantStandardName; + + @ApiModelProperty(value = "监测设施 自动/手工") + private String monitoringFacilities; + } + + @ApiModel(value = "排污许可-废气无组织排放要求query") + @Data + public static class PwxkGasNoOrg { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "排放口编号") + private String outletCode; + + @ApiModelProperty(value = "污染物种类") + private List pollutantNames; + + @ApiModelProperty(value = "国家或地方污染物排放标准名") + private String pollutantStandardName; + + @ApiModelProperty(value = "监测设施 自动/手工") + private String monitoringFacilities; + } + + @ApiModel(value = "排污许可-废水直接排口排放要求query") + @Data + public static class PwxkWaterDirect { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "排放口编号") + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + private String outletName; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + private String outletTypes; + + @ApiModelProperty(value = "排水去向") + private List directionDrainage; + + @ApiModelProperty(value = "排放规律") + private List dischargeLaw; + + @ApiModelProperty(value = "受纳自然水体信息-名称") + private String receivingWaterName; + + @ApiModelProperty(value = "受纳自然水体信息-功能目标") + private String receivingWaterObjective; + + @ApiModelProperty(value = "国家或地方污染物排放标准名") + private String pollutantStandardName; + + @ApiModelProperty(value = "污染物种类") + private List pollutantNames; + + @ApiModelProperty(value = "监测设施 自动/手工") + private String monitoringFacilities; + } + + @ApiModel(value = "排污许可-废水间接排口排放要求query") + @Data + public static class PwxkWaterIndirect { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "排放口编号") + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + private String outletName; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + private String outletTypes; + + @ApiModelProperty(value = "排水去向") + private List directionDrainage; + + @ApiModelProperty(value = "排放规律") + private List dischargeLaw; + + @ApiModelProperty(value = "受纳污水处理厂名称") + private String treatmentPlantAcceptedName; + + @ApiModelProperty(value = "国家或地方污染物排放标准名") + private String pollutantStandardName; + + @ApiModelProperty(value = "污染物种类") + private List pollutantNames; + + @ApiModelProperty(value = "监测设施 自动/手工") + private String monitoringFacilities; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcFactoryQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcFactoryQuery.java index 657060a..d90aa89 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcFactoryQuery.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcFactoryQuery.java @@ -133,6 +133,9 @@ public class PcFactoryQuery extends PageQuery @ApiModelProperty(value = "生态环境信用类别") private String ecoEnvCreditLevel; + @ApiModelProperty(value = "根据该参数，返回结果中增加企业是否包含指定标签值。数组中第一个值为标签id,第二个值为标签值编码") + private List labelAndValue; + @ApiModel(value = "高级搜索查询条件vo") @Data public static class SearchVo extends PageQuery { @@ -144,6 +147,9 @@ public class PcFactoryQuery extends PageQuery @ApiModelProperty(value = "是否展示企业重点标签") private Boolean showMainLable; + + @ApiModelProperty(value = "根据该参数，返回结果中增加企业是否包含指定标签值。数组中第一个值为标签id,第二个值为标签值编码") + private List labelAndValue; } /** diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcLabelFactoryQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcLabelFactoryQuery.java index e2b70b5..5d464ef 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcLabelFactoryQuery.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcLabelFactoryQuery.java @@ -29,19 +29,5 @@ public class PcLabelFactoryQuery extends PageQuery private String labelId; @ApiModelProperty(value = "是否是企业重点展示标签") private String lableUseing; - /** - * - * @Title: getQueryWrapper - * @Description: 查询参数组装 - * @param: @return - * @return: QueryWrapper - * @throws - */ - public static QueryWrapper createLambdaQueryWrapper(PcLabelFactoryQuery query) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(ObjectUtil.isNotNull(query.getId()), "id", query.getId()); - wrapper.eq(ObjectUtil.isNotNull(query.getFactoryId()), "factory_id", query.getFactoryId()); - wrapper.eq(ObjectUtil.isNotNull(query.getLabelId()), "label_id", query.getLabelId()); - return wrapper; - } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcOutletQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcOutletQuery.java index d38f389..694703d 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcOutletQuery.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/PcOutletQuery.java @@ -1,5 +1,6 @@ package cn.cecep.talroad.vo.query; +import cn.cecep.talroad.common.core.annotation.Excel; import cn.cecep.talroad.common.core.domain.query.PageQuery; import cn.cecep.talroad.common.core.utils.StringUtils; import cn.cecep.talroad.domain.PcOutlet; @@ -10,6 +11,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; +import java.util.List; + /** * 废气有组织、无组织排口对象 pc_outlet @@ -109,4 +113,74 @@ public class PcOutletQuery extends PageQuery wrapper.orderByAsc("outlet_code", "id"); return wrapper; } + + @ApiModel(value = "排污许可-废气排口基本信息query") + @Data + public static class PwxkGas { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "排气筒高度范围开始") + private BigDecimal exhaustFunnelHightStart; + + @ApiModelProperty(value = "排气筒高度范围结束") + private BigDecimal exhaustFunnelHightEnd; + + @ApiModelProperty(value = "排气筒出口内径范围开始") + private BigDecimal exhaustFunnelInnerStart; + + @ApiModelProperty(value = "排气筒出口内径范围结束") + private BigDecimal exhaustFunnelInnerEnd; + } + + @ApiModel(value = "排污许可-废水直接排口基本信息query") + @Data + public static class PwxkWaterDirect { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "排放口编号") + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + private String outletName; + + @ApiModelProperty(value = "排口类型 1:主要排口, 2:一般排口") + private String outletTypes; + + @ApiModelProperty(value = "排水去向") + private List directionDrainage; + + @ApiModelProperty(value = "排放规律") + private List dischargeLaw; + + @ApiModelProperty(value = "受纳自然水体信息-名称") + private String receivingWaterName; + + @ApiModelProperty(value = "受纳自然水体信息-功能目标") + private String receivingWaterObjective; + } + + @ApiModel(value = "排污许可-废水间接排口基本信息query") + @Data + public static class PwxkWaterIndirect { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "排放口编号") + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + private String outletName; + + @ApiModelProperty(value = "排水去向") + private List directionDrainage; + + @ApiModelProperty(value = "排放规律") + private List dischargeLaw; + + @ApiModelProperty(value = "受纳污水处理厂名称") + private String treatmentPlantAcceptedName; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/SupermonitorDrainOutletQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/SupermonitorDrainOutletQuery.java index ffffd45..bbec40b 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/SupermonitorDrainOutletQuery.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/SupermonitorDrainOutletQuery.java @@ -1,5 +1,6 @@ package cn.cecep.talroad.vo.query; +import cn.cecep.talroad.common.core.annotation.Excel; import cn.cecep.talroad.common.core.domain.query.PageQuery; import cn.cecep.talroad.domain.SupermonitorDrainOutlet; import cn.hutool.core.util.ObjectUtil; @@ -9,6 +10,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 排污口对象 m_supermonitor_drain_outlet @@ -85,4 +88,43 @@ public class SupermonitorDrainOutletQuery extends PageQuery wrapper.orderByAsc("outlet_code", "id"); return wrapper; } + + @ApiModel(value = "排污许可-入河排口信息query") + @Data + public static class PwxkRh { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "入河口名称") + private String riversOutletName; + + @ApiModelProperty(value = "入河口编号") + private String riversOutletCode; + } + + @ApiModel(value = "排污许可-雨水排口信息query") + @Data + public static class PwxkYs { + @ApiModelProperty(value = "企业查询条件") + private PcFactoryQuery.SearchVo searchVo; + + @ApiModelProperty(value = "排放口编号") + private String outletCode; + + @ApiModelProperty(value = "排放口名称") + private String outletName; + + @ApiModelProperty(value = "排水去向") + private List drainageTo; + + @ApiModelProperty(value = "排放规律") + private List emissionsLaws; + + @ApiModelProperty(value = "受纳自然水体信息-名称") + private String receivingWaterName; + + @ApiModelProperty(value = "受纳自然水体信息-功能目标") + private String receivingWaterObjective; + } + } diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/analysis/SRaAbNalysisLowCarQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/analysis/SRaAbNalysisLowCarQuery.java index 5dc6661..dc19164 100644 --- a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/analysis/SRaAbNalysisLowCarQuery.java +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/analysis/SRaAbNalysisLowCarQuery.java @@ -5,10 +5,12 @@ import cn.cecep.talroad.domain.analysis.SRaAbNalysisLowCar; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Calendar; import java.util.Date; @@ -58,9 +60,11 @@ public class SRaAbNalysisLowCarQuery extends PageQuery @ApiModelProperty(value = "分析开始时间(原型中日期)") @TableField(exist = false) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startAnalyseTime; @ApiModelProperty(value = "分析结束时间(原型中日期)") @TableField(exist = false) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endAnalyseTime; @ApiModelProperty(value = "排放阶段") diff --git a/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/analysis/SRaPollManTypeChangeQuery.java b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/analysis/SRaPollManTypeChangeQuery.java new file mode 100644 index 0000000..c08cfbf --- /dev/null +++ b/szhpt-fixed-task/src/main/java/cn/cecep/talroad/vo/query/analysis/SRaPollManTypeChangeQuery.java @@ -0,0 +1,17 @@ +package cn.cecep.talroad.vo.query.analysis; + +import cn.cecep.talroad.common.core.domain.query.PageQuery; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class SRaPollManTypeChangeQuery extends PageQuery { + + private String factoryName; + + private String countryName; + private String countryCode; + + private String industryPermissionName; +} diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/AmProblemFiMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/AmProblemFiMapper.xml index 8b1d592..fd4921e 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/AmProblemFiMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/AmProblemFiMapper.xml @@ -142,9 +142,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, factory_id, production_unit_name, production_facilities_code, production_facilities_name, + fuel_name, methane, ethane, propane, butane, pentane, hexane_and_heavier, co, co2, + hydrogen, oxygen, nitrogen, hydrogen_sulfide, other_components, total_sulfur, lower_heating, + year_used, other_info, trade_secrets + + + + update b_stat_table_pwxk_boiler_fuel_gas + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.factoryId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionUnitName,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionFacilitiesCode,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionFacilitiesName,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.fuelName,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.methane,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.ethane,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.propane,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.butane,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.pentane,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.hexaneAndHeavier,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.co,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.co2,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.hydrogen,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.oxygen,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.nitrogen,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.hydrogenSulfide,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.otherComponents,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.totalSulfur,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.lowerHeating,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.yearUsed,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.otherInfo,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.tradeSecrets,jdbcType=VARCHAR} + + + + where id in + + #{item.id,jdbcType=BIGINT} + + + + + update b_stat_table_pwxk_boiler_fuel_gas + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.factoryId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionUnitName,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionFacilitiesCode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionFacilitiesName,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.fuelName,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.methane,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.ethane,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.propane,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.butane,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.pentane,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.hexaneAndHeavier,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.co,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.co2,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.hydrogen,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.oxygen,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.nitrogen,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.hydrogenSulfide,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.otherComponents,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.totalSulfur,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.lowerHeating,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.yearUsed,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.otherInfo,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.tradeSecrets,jdbcType=VARCHAR} + + + + + where id in + + #{item.id,jdbcType=BIGINT} + + + + + insert into b_stat_table_pwxk_boiler_fuel_gas + (id, factory_id, production_unit_name, production_facilities_code, production_facilities_name, + fuel_name, methane, ethane, propane, butane, pentane, hexane_and_heavier, co, co2, + hydrogen, oxygen, nitrogen, hydrogen_sulfide, other_components, total_sulfur, lower_heating, + year_used, other_info, trade_secrets) + values + + (#{item.id,jdbcType=BIGINT}, #{item.factoryId,jdbcType=VARCHAR}, #{item.productionUnitName,jdbcType=VARCHAR}, + #{item.productionFacilitiesCode,jdbcType=VARCHAR}, #{item.productionFacilitiesName,jdbcType=VARCHAR}, + #{item.fuelName,jdbcType=VARCHAR}, #{item.methane,jdbcType=NUMERIC}, #{item.ethane,jdbcType=NUMERIC}, + #{item.propane,jdbcType=NUMERIC}, #{item.butane,jdbcType=NUMERIC}, #{item.pentane,jdbcType=NUMERIC}, + #{item.hexaneAndHeavier,jdbcType=NUMERIC}, #{item.co,jdbcType=NUMERIC}, #{item.co2,jdbcType=NUMERIC}, + #{item.hydrogen,jdbcType=NUMERIC}, #{item.oxygen,jdbcType=NUMERIC}, #{item.nitrogen,jdbcType=NUMERIC}, + #{item.hydrogenSulfide,jdbcType=NUMERIC}, #{item.otherComponents,jdbcType=NUMERIC}, + #{item.totalSulfur,jdbcType=NUMERIC}, #{item.lowerHeating,jdbcType=NUMERIC}, #{item.yearUsed,jdbcType=NUMERIC}, + #{item.otherInfo,jdbcType=VARCHAR}, #{item.tradeSecrets,jdbcType=VARCHAR}) + + + + + \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkBoilerFuelSolidLiquidMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkBoilerFuelSolidLiquidMapper.xml new file mode 100644 index 0000000..35b8c3e --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkBoilerFuelSolidLiquidMapper.xml @@ -0,0 +1,341 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, factory_id, production_unit_name, production_facilities_code, production_facilities_name, + fuel_name, water_content, ash_content, "volatile_percentage", fixed_carbon, carbon, hydrogen, + oxygen, nitrogen, sulfur, lower_heating, mercury, year_used, other_info, trade_secrets + + + + update b_stat_table_pwxk_boiler_fuel_solid_liquid + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.factoryId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionUnitName,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionFacilitiesCode,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionFacilitiesName,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.fuelName,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.waterContent,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.ashContent,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.volatilePercentage,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.fixedCarbon,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.carbon,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.hydrogen,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.oxygen,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.nitrogen,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.sulfur,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.lowerHeating,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.mercury,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.yearUsed,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.otherInfo,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.tradeSecrets,jdbcType=VARCHAR} + + + + where id in + + #{item.id,jdbcType=BIGINT} + + + + + update b_stat_table_pwxk_boiler_fuel_solid_liquid + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.factoryId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionUnitName,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionFacilitiesCode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.productionFacilitiesName,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.fuelName,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.waterContent,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.ashContent,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.volatilePercentage,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.fixedCarbon,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.carbon,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.hydrogen,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.oxygen,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.nitrogen,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.sulfur,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.lowerHeating,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.mercury,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.yearUsed,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.otherInfo,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.tradeSecrets,jdbcType=VARCHAR} + + + + + where id in + + #{item.id,jdbcType=BIGINT} + + + + + insert into b_stat_table_pwxk_boiler_fuel_solid_liquid + (id, factory_id, production_unit_name, production_facilities_code, production_facilities_name, + fuel_name, water_content, ash_content, "volatile_percentage", fixed_carbon, carbon, hydrogen, + oxygen, nitrogen, sulfur, lower_heating, mercury, year_used, other_info, trade_secrets + ) + values + + (#{item.id,jdbcType=BIGINT}, #{item.factoryId,jdbcType=VARCHAR}, #{item.productionUnitName,jdbcType=VARCHAR}, + #{item.productionFacilitiesCode,jdbcType=VARCHAR}, #{item.productionFacilitiesName,jdbcType=VARCHAR}, + #{item.fuelName,jdbcType=VARCHAR}, #{item.waterContent,jdbcType=NUMERIC}, #{item.ashContent,jdbcType=NUMERIC}, + #{item.volatilePercentage,jdbcType=NUMERIC}, #{item.fixedCarbon,jdbcType=NUMERIC}, #{item.carbon,jdbcType=NUMERIC}, + #{item.hydrogen,jdbcType=NUMERIC}, #{item.oxygen,jdbcType=NUMERIC}, #{item.nitrogen,jdbcType=NUMERIC}, + #{item.sulfur,jdbcType=NUMERIC}, #{item.lowerHeating,jdbcType=NUMERIC}, #{item.mercury,jdbcType=NUMERIC}, + #{item.yearUsed,jdbcType=NUMERIC}, #{item.otherInfo,jdbcType=VARCHAR}, #{item.tradeSecrets,jdbcType=VARCHAR} + ) + + + + + \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkFuelMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkFuelMapper.xml new file mode 100644 index 0000000..65122de --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkFuelMapper.xml @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + id, factory_id, fuel_name, year_plan_used, unit, ash_content, sulfur_content, volatile_percentage, + lower_heating, extra, other_info, trade_secrets + + + + update b_stat_table_pwxk_fuel + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.factoryId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.fuelName,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.yearPlanUsed,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.unit,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.ashContent,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.sulfurContent,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.volatilePercentage,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.lowerHeating,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.extra,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.otherInfo,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.tradeSecrets,jdbcType=VARCHAR} + + + + where id in + + #{item.id,jdbcType=BIGINT} + + + + + update b_stat_table_pwxk_fuel + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.factoryId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.fuelName,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.yearPlanUsed,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.unit,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.ashContent,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.sulfurContent,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.volatilePercentage,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.lowerHeating,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.extra,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.otherInfo,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.tradeSecrets,jdbcType=VARCHAR} + + + + + where id in + + #{item.id,jdbcType=BIGINT} + + + + + insert into b_stat_table_pwxk_fuel + (id, factory_id, fuel_name, year_plan_used, unit, ash_content, sulfur_content, volatile_percentage, + lower_heating, extra, other_info, trade_secrets) + values + + (#{item.id,jdbcType=BIGINT}, #{item.factoryId,jdbcType=VARCHAR}, #{item.fuelName,jdbcType=VARCHAR}, + #{item.yearPlanUsed,jdbcType=NUMERIC}, #{item.unit,jdbcType=VARCHAR}, #{item.ashContent,jdbcType=NUMERIC}, + #{item.sulfurContent,jdbcType=NUMERIC}, #{item.volatilePercentage,jdbcType=NUMERIC}, + #{item.lowerHeating,jdbcType=NUMERIC}, #{item.extra,jdbcType=VARCHAR}, #{item.otherInfo,jdbcType=VARCHAR}, + #{item.tradeSecrets,jdbcType=VARCHAR}) + + + + + \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkProductionFacilitiesMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkProductionFacilitiesMapper.xml index caeeb07..07f28cf 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkProductionFacilitiesMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkProductionFacilitiesMapper.xml @@ -231,16 +231,29 @@ pf.industry_permission_name, pf.river_basin FROM - b_stat_table_pwxk_production_facilities bstpwiit - LEFT JOIN pc_factory pf ON pf.ID = bstpwiit.factory_id + pc_factory pf + RIGHT JOIN b_stat_table_pwxk_production_facilities bstpwiit ON pf.ID = bstpwiit.factory_id + + AND bstpwiit.production_unit_name LIKE CONCAT ('%',#{productionUnitName,jdbcType=VARCHAR},'%') + + + AND bstpwiit.craft_name LIKE CONCAT ('%',#{craftName,jdbcType=VARCHAR},'%') + + + AND bstpwiit.facility_name LIKE CONCAT ('%',#{facilityName,jdbcType=VARCHAR},'%') + + + AND bstpwiit.production_line_type = #{productionLineType,jdbcType=VARCHAR} + LEFT JOIN b_stat_table_pwxk_production_facilities_params b ON b.facilities_id=bstpwiit.id - + pf.id - + #{item,jdbcType=VARCHAR} + ORDER BY pf.order_num, pf.id \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkProductsMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkProductsMapper.xml index 8ecd5f0..6fdb375 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkProductsMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkProductsMapper.xml @@ -153,15 +153,19 @@ pf.industry_permission_name, pf.river_basin FROM - b_stat_table_pwxk_products bstpp - LEFT JOIN pc_factory pf ON pf.ID = bstpp.factory_id + pc_factory pf + LEFT JOIN b_stat_table_pwxk_products bstpp ON pf.ID = bstpp.factory_id + + AND bstpp.product_name LIKE CONCAT ('%',#{productName,jdbcType=VARCHAR},'%') + - + pf.id - + #{item,jdbcType=VARCHAR} + ORDER BY pf.order_num, pf.id \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkRawMaterialMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkRawMaterialMapper.xml new file mode 100644 index 0000000..33b1c94 --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkRawMaterialMapper.xml @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + id, factory_id, raw_material_class, raw_material_type, raw_material_name, year_max_used, + year_plan_used, unit, sulfur_ratio, poisonous_component, extra, other_info, trade_secrets + + + + update b_stat_table_pwxk_raw_material + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.factoryId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.rawMaterialClass,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.rawMaterialType,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.rawMaterialName,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.yearMaxUsed,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.yearPlanUsed,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.unit,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.sulfurRatio,jdbcType=NUMERIC} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.poisonousComponent,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.extra,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.otherInfo,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.tradeSecrets,jdbcType=VARCHAR} + + + + where id in + + #{item.id,jdbcType=BIGINT} + + + + + update b_stat_table_pwxk_raw_material + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.factoryId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.rawMaterialClass,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.rawMaterialType,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.rawMaterialName,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.yearMaxUsed,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.yearPlanUsed,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.unit,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.sulfurRatio,jdbcType=NUMERIC} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.poisonousComponent,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.extra,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.otherInfo,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=BIGINT} then #{item.tradeSecrets,jdbcType=VARCHAR} + + + + + where id in + + #{item.id,jdbcType=BIGINT} + + + + + insert into b_stat_table_pwxk_raw_material + (id, factory_id, raw_material_class, raw_material_type, raw_material_name, year_max_used, + year_plan_used, unit, sulfur_ratio, poisonous_component, extra, other_info, trade_secrets + ) + values + + (#{item.id,jdbcType=BIGINT}, #{item.factoryId,jdbcType=VARCHAR}, #{item.rawMaterialClass,jdbcType=VARCHAR}, + #{item.rawMaterialType,jdbcType=VARCHAR}, #{item.rawMaterialName,jdbcType=VARCHAR}, + #{item.yearMaxUsed,jdbcType=NUMERIC}, #{item.yearPlanUsed,jdbcType=NUMERIC}, #{item.unit,jdbcType=VARCHAR}, + #{item.sulfurRatio,jdbcType=NUMERIC}, #{item.poisonousComponent,jdbcType=VARCHAR}, + #{item.extra,jdbcType=VARCHAR}, #{item.otherInfo,jdbcType=VARCHAR}, #{item.tradeSecrets,jdbcType=VARCHAR} + ) + + + + + \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterIndustryInMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterIndustryInMapper.xml index e3a343f..435a8d2 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterIndustryInMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterIndustryInMapper.xml @@ -237,15 +237,36 @@ pf.industry_permission_name, pf.river_basin FROM - b_stat_table_pwxk_water_industry_in bstpwii - RIGHT JOIN pc_factory pf ON pf.ID = bstpwii.factory_id + + pc_factory pf + LEFT JOIN b_stat_table_pwxk_water_industry_in bstpwii ON pf.ID = bstpwii.factory_id + + AND bstpwii.treatment_plant_name LIKE CONCAT('%',#{treatmentPlantName},'%') + + + AND bstpwii.service_provider LIKE CONCAT('%',#{serviceProvider},'%') + + + AND bstpwii.belong_to_water_treatment_facilities = #{serviceProvider} + + + AND bstpwii.service_country_code = #{serviceCountryCode} + + + AND bstpwii.treatment_plant_type + + #{item,jdbcType=VARCHAR} + + + - + pf.id - + #{item,jdbcType=VARCHAR} + ORDER BY pf.order_num, pf.id \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterIndustryInTotalMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterIndustryInTotalMapper.xml index 6d335d3..7b76126 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterIndustryInTotalMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterIndustryInTotalMapper.xml @@ -196,15 +196,34 @@ pf.industry_permission_name, pf.river_basin FROM - b_stat_table_pwxk_water_industry_in_total bstpwiit - Right JOIN pc_factory pf ON pf.ID = bstpwiit.factory_id + pc_factory pf + LEFT JOIN b_stat_table_pwxk_water_industry_in_total bstpwiit ON pf.ID = bstpwiit.factory_id + + AND bstpwiit.treatment_plant_name LIKE CONCAT('%',#{treatmentPlantName},'%') + + + AND bstpwiit.service_provider LIKE CONCAT('%',#{serviceProvider},'%') + + + AND bstpwiit.belong_to_water_treatment_facilities = #{serviceProvider} + + + AND bstpwiit.service_country_code = #{serviceCountryCode} + + + AND bstpwiit.treatment_plant_type + + #{item,jdbcType=VARCHAR} + + - + pf.id - + #{item,jdbcType=VARCHAR} + ORDER BY pf.order_num, pf.id \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterLifeInMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterLifeInMapper.xml index f8210ea..2e3833e 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterLifeInMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterLifeInMapper.xml @@ -264,15 +264,34 @@ pf.industry_permission_name, pf.river_basin FROM - b_stat_table_pwxk_water_life_in bstpwli - Right JOIN pc_factory pf ON pf.ID = bstpwli.factory_id + pc_factory pf + LEFT JOIN b_stat_table_pwxk_water_life_in bstpwli ON pf.ID = bstpwli.factory_id + + AND bstpwli.treatment_plant_name LIKE CONCAT('%',#{treatmentPlantName},'%') + + + AND bstpwli.service_provider LIKE CONCAT('%',#{serviceProvider},'%') + + + AND bstpwli.belong_to_water_treatment_facilities = #{serviceProvider} + + + AND bstpwli.service_country_code = #{serviceCountryCode} + + + AND bstpwli.treatment_plant_type + + #{item,jdbcType=VARCHAR} + + - + pf.id - + #{item,jdbcType=VARCHAR} + ORDER BY pf.order_num, pf.id \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterTreatmentInAskMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterTreatmentInAskMapper.xml index 5ac829c..d039f74 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterTreatmentInAskMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterTreatmentInAskMapper.xml @@ -306,15 +306,34 @@ pf.industry_permission_name, pf.river_basin FROM - b_stat_table_pwxk_water_treatment_in_ask bstpwtia - RIGHT JOIN pc_factory pf ON pf.ID = bstpwtia.factory_id + pc_factory pf + LEFT JOIN b_stat_table_pwxk_water_treatment_in_ask bstpwtia ON pf.ID = bstpwtia.factory_id + + AND bstpwtia.treatment_plant_name LIKE CONCAT('%',#{treatmentPlantName},'%') + + + AND bstpwtia.service_provider LIKE CONCAT('%',#{serviceProvider},'%') + + + AND bstpwtia.belong_to_water_treatment_facilities = #{serviceProvider} + + + AND bstpwtia.service_country_code = #{serviceCountryCode} + + + AND bstpwtia.treatment_plant_type + + #{item,jdbcType=VARCHAR} + + - + pf.id - + #{item,jdbcType=VARCHAR} + ORDER BY pf.order_num, pf.id \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterTreatmentLineMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterTreatmentLineMapper.xml index ea34035..13d7c28 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterTreatmentLineMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTablePwxkWaterTreatmentLineMapper.xml @@ -293,15 +293,35 @@ pf.industry_permission_name, pf.river_basin FROM - b_stat_table_pwxk_water_treatment_line bstpwtl - Right JOIN pc_factory pf ON pf.ID = bstpwtl.factory_id + pc_factory pf + LEFT JOIN b_stat_table_pwxk_water_treatment_line bstpwtl ON pf.ID = bstpwtl.factory_id + + AND bstpwtl.treatment_plant_name LIKE CONCAT('%',#{treatmentPlantName},'%') + + + AND bstpwtl.service_provider LIKE CONCAT('%',#{serviceProvider},'%') + + + AND bstpwtl.belong_to_water_treatment_facilities = #{serviceProvider} + + + AND bstpwtl.service_country_code = #{serviceCountryCode} + + + AND bstpwtl.treatment_plant_type + + #{item,jdbcType=VARCHAR} + + - + pf.id - + #{item,jdbcType=VARCHAR} + + ORDER BY pf.order_num, pf.id \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionMapper.xml new file mode 100644 index 0000000..3c23b6c --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionMapper.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, zxbg_pollutant_type, create_time, remark, outlet_code, pollutant_name, monitoring_facilities, facility_name, emission_concentration, effectively_hour, detection_min_hour, detection_max_hour, detection_avg_hour, folds_min_hour, folds_max_hour, folds_avg_hour, exceeded_data, exceeded_rate, actual_amount, actual_emissions, instrument_name, sampling_method, manual_method, device_range, device_accuracy, device_checkout from b_stat_table_zxbg_gas_emission + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionSpeedMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionSpeedMapper.xml new file mode 100644 index 0000000..84b5d7d --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionSpeedMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, outlet_code, outlet_name, remark, create_time, pollutant_name, pollutant_code, emission_concentration, effectively_hour, detection_min_hour, detection_max_hour, detection_avg_hour, exceeded_data, exceeded_rate, exceeded_cause from b_stat_table_zxbg_gas_emission_speed + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionStatisticsMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionStatisticsMapper.xml new file mode 100644 index 0000000..6ae93d4 --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGasEmissionStatisticsMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, zxbg_pollutant_type, pollutant_name, facility_name, facilities_code, monitoring_time, Monitoring_number, emission_concentration, monitoring_results_hour, monitoring_folds_hour, is_exceeded, remark, create_time from b_stat_table_zxbg_gas_emission_statistics + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGtFuelMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGtFuelMapper.xml new file mode 100644 index 0000000..319ef51 --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGtFuelMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, record_content, name, specific_information,remark, create_time from b_stat_table_zxbg_gt_fuel + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGtProductionMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGtProductionMapper.xml new file mode 100644 index 0000000..49b67d5 --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgGtProductionMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, main_production_unit, name, quantity, unit, remark, create_time from b_stat_table_zxbg_gt_production + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdFuelAnalysisMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdFuelAnalysisMapper.xml new file mode 100644 index 0000000..f12379f --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdFuelAnalysisMapper.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, production_unit, fuel_name, usage, ash_content, sulfur, volatile_content, caloric_value, remark, create_time from b_stat_table_zxbg_hd_fuel_analysis + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGasPollutionMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGasPollutionMapper.xml new file mode 100644 index 0000000..382f1f4 --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGasPollutionMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, production_facility_name, production_facility_code, governance_facility_code, governance_facility_name, governance_facility_time, fly_ash_production, bag_filter, dust_removal_efficiency, actual_value, desulfurizer_dosage, amount_product, design_values, actual_efficiency, reducing_agent_dosage, denitration_efficiency, efficiency_practical, facility_operating_costs, efficiency_design_values, actual_dust_removal, create_time from b_stat_table_zxbg_hd_gas_pollution + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtBasicMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtBasicMapper.xml new file mode 100644 index 0000000..0eb2dad --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtBasicMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, unit_name, scale, run_time, power_generation, heat_supply, actual_running_time, average_load_ratio, remark, create_time from b_stat_table_zxbg_hd_gt_basic + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtFuelMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtFuelMapper.xml new file mode 100644 index 0000000..74aa0aa --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtFuelMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, unit_name, unit_type, fuel_consumption, fuel_consumption_units, coal_consumption, coal_consumption_units, ash_production, ash_production_uits, slag_production, slag_production_units, create_time from b_stat_table_zxbg_hd_gt_fuel + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtInvestmentMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtInvestmentMapper.xml new file mode 100644 index 0000000..a83df86 --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdGtInvestmentMapper.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, unit_name, governance_type, start_time, production_time, planned_investment, cycle_complete_investment, create_time from b_stat_table_zxbg_hd_gt_investment + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdWaterPollutionMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdWaterPollutionMapper.xml new file mode 100644 index 0000000..c95922d --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgHdWaterPollutionMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, water_category, governance_facility_code, governance_facility_name, governance_facility_time, pollution_facility_technology, contaminate_factor, emissions, receiving_name, electricity_consumption, processing_power, actual_processing_volume, will_amount, actual_emissions, design_processing_power, water_treatment_volume, water_will_amount, water_actual_emissions, sludge_generation, sludge_moisture_content, circulating_cooling, cooling_discharge, sludge_disposal_method, facility_operating_costs, create_time from b_stat_table_zxbg_hd_water_pollution + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgJbxxInfoMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgJbxxInfoMapper.xml index b793eef..cdcc0ce 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgJbxxInfoMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgJbxxInfoMapper.xml @@ -54,7 +54,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pf.industry_permission_name, pf.river_basin FROM - b_stat_table_zxbg_jbxx_info zxbg + (select * from b_stat_table_zxbg_jbxx_info + + and zxbg_type = #{zxbgType} + and zxbg_period like concat('%', #{zxbgPeriod}, '%') + and zxbg_record like concat('%', #{zxbgRecord}, '%') + and zxbg_name like concat('%', #{zxbgName}, '%') + and zxbg_param like concat('%', #{zxbgParam}, '%') + + ) zxbg right JOIN pc_factory pf ON pf.ID = zxbg.factory_id @@ -63,12 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item,jdbcType=VARCHAR} - and zxbg_type = #{zxbgType} - and zxbg_period like concat('%', #{zxbgPeriod}, '%') - and zxbg_record like concat('%', #{zxbgRecord}, '%') - and zxbg_name like concat('%', #{zxbgName}, '%') - and zxbg_param like concat('%', #{zxbgParam}, '%') + ORDER BY pf.order_num, pf.id diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirOtherMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirOtherMapper.xml index 3ed74b6..9cd8377 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirOtherMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirOtherMapper.xml @@ -48,7 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pf.industry_permission_name, pf.river_basin FROM - b_stat_table_zxbg_pfl_air_other zxbg + (select * from b_stat_table_zxbg_pfl_air_other + + and zxbg_pollutant like concat('%', #{zxbgPollutant}, '%') + and zxbg_type = #{zxbgType} + and zxbg_period like concat('%', #{zxbgPeriod}, '%') + + ) zxbg right JOIN pc_factory pf ON pf.ID = zxbg.factory_id @@ -58,5 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + ORDER BY pf.order_num, pf.id diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirOverproofMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirOverproofMapper.xml index 5d31fee..b4c1ff1 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirOverproofMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirOverproofMapper.xml @@ -58,7 +58,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pf.industry_permission_name, pf.river_basin FROM - b_stat_table_zxbg_pfl_air_overproof zxbg + (select * from b_stat_table_zxbg_pfl_air_overproof + + and zxbg_pollutant like concat('%', #{zxbgPollutant}, '%') + and over_remark like concat('%', #{overRemark}, '%') + and over_start_time >= CAST(concat(#{overStartTime},':00:00') AS timestamp) + and over_end_time <= CAST(concat(#{overEndTime},':59:59') AS timestamp) + and zxbg_type = #{zxbgType} + and zxbg_period like concat('%', #{zxbgPeriod}, '%') + + ) zxbg right JOIN pc_factory pf ON pf.ID = zxbg.factory_id @@ -68,5 +77,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + ORDER BY pf.order_num, pf.id diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirSpecialMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirSpecialMapper.xml index 1919a6d..9754b11 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirSpecialMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirSpecialMapper.xml @@ -54,7 +54,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pf.industry_permission_name, pf.river_basin FROM - b_stat_table_zxbg_pfl_air_special zxbg + (select * from b_stat_table_zxbg_pfl_air_special + + and zxbg_pollutant like concat('%', #{zxbgPollutant}, '%') + and zxbg_air_type = #{zxbgAirType} + and zxbg_air_all_type = ANY (string_to_array(#{zxbgAirAllType}, ',')) + and zxbg_time >= #{zxbgStartTime} + and zxbg_time <= #{zxbgEndTime} + and zxbg_type = #{zxbgType} + and zxbg_period like concat('%', #{zxbgPeriod}, '%') + + ) zxbg right JOIN pc_factory pf ON pf.ID = zxbg.factory_id @@ -64,5 +74,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + ORDER BY pf.order_num, pf.id diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirStatMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirStatMapper.xml index 43749b0..d90d338 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirStatMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflAirStatMapper.xml @@ -46,7 +46,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pf.industry_permission_name, pf.river_basin FROM - b_stat_table_zxbg_pfl_air_stat zxbg + (select * from b_stat_table_zxbg_pfl_air_stat + + and zxbg_pollutant like concat('%', #{zxbgPollutant}, '%') + and zxbg_type = #{zxbgType} + and zxbg_period like concat('%', #{zxbgPeriod}, '%') + + ) zxbg right JOIN pc_factory pf ON pf.ID = zxbg.factory_id @@ -56,5 +62,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + ORDER BY pf.order_num, pf.id diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflWaterMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflWaterMapper.xml index 9cd53d2..4f5968a 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflWaterMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflWaterMapper.xml @@ -54,7 +54,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pf.industry_permission_name, pf.river_basin FROM - b_stat_table_zxbg_pfl_water zxbg + (select * from b_stat_table_zxbg_pfl_water + + and zxbg_pollutant like concat('%', #{zxbgPollutant}, '%') + and zxbg_emission_type = #{zxbgEmissionType} + and zxbg_type = #{zxbgType} + and zxbg_period like concat('%', #{zxbgPeriod}, '%') + + ) zxbg right JOIN pc_factory pf ON pf.ID = zxbg.factory_id @@ -64,5 +71,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + ORDER BY pf.order_num, pf.id diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflWaterVoerproofMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflWaterVoerproofMapper.xml index e220b38..3e21a17 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflWaterVoerproofMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflWaterVoerproofMapper.xml @@ -56,7 +56,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pf.industry_permission_name, pf.river_basin FROM - b_stat_table_zxbg_pfl_water_voerproof zxbg + (select * from b_stat_table_zxbg_pfl_water_voerproof + + and zxbg_pollutant like concat('%', #{zxbgPollutant}, '%') + and over_remark like concat('%', #{overRemark}, '%') + and over_start_time >= CAST(concat(#{overStartTime},':00:00') AS timestamp) + and over_end_time <= CAST(concat(#{overEndTime},':59:59') AS timestamp) + and zxbg_type = #{zxbgType} + and zxbg_period like concat('%', #{zxbgPeriod}, '%') + + ) zxbg right JOIN pc_factory pf ON pf.ID = zxbg.factory_id @@ -66,5 +75,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + ORDER BY pf.order_num, pf.id diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflallWaterMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflallWaterMapper.xml index 0c7ccbf..b047281 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflallWaterMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPflallWaterMapper.xml @@ -50,7 +50,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pf.industry_permission_name, pf.river_basin FROM - b_stat_table_zxbg_pflall_water zxbg + (select * from b_stat_table_zxbg_pflall_water + + and zxbg_pollutant like concat('%', #{zxbgPollutant}, '%') + and zxbg_emission_type = #{zxbgEmissionType} + and zxbg_type = #{zxbgType} + and zxbg_period like concat('%', #{zxbgPeriod}, '%') + + ) zxbg right JOIN pc_factory pf ON pf.ID = zxbg.factory_id @@ -60,5 +67,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + ORDER BY pf.order_num, pf.id diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPfltotalWaterMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPfltotalWaterMapper.xml index 5401061..7e417a6 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPfltotalWaterMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgPfltotalWaterMapper.xml @@ -51,7 +51,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pf.industry_permission_name, pf.river_basin FROM - b_stat_table_zxbg_pfltotal_water zxbg + (select * from b_stat_table_zxbg_pfltotal_water + + and zxbg_pollutant like concat('%', #{zxbgPollutant}, '%') + and zxbg_emission_type = #{zxbgEmissionType} + and zxbg_type = #{zxbgType} + and zxbg_period like concat('%', #{zxbgPeriod}, '%') + + ) zxbg right JOIN pc_factory pf ON pf.ID = zxbg.factory_id @@ -61,5 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + ORDER BY pf.order_num, pf.id diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgSnFuelMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgSnFuelMapper.xml new file mode 100644 index 0000000..634fabe --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgSnFuelMapper.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, parameter, record_the_content, name, remark, type, usage, create_time from b_stat_table_zxbg_sn_fuel + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgSnProductionMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgSnProductionMapper.xml new file mode 100644 index 0000000..b24260a --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgSnProductionMapper.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, main_production_unit, production_facilities, name, quantity, unit, remark, create_time from b_stat_table_zxbg_sn_production + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgWaterEmissionMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgWaterEmissionMapper.xml new file mode 100644 index 0000000..ed6441d --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgWaterEmissionMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, factory_id, zxbg_type, zxbg_period, zxbg_pollutant_type, create_time, remark, outlet_code, pollutant_name, monitoring_facilities, facility_name, emission_concentration, effectively_day, detection_min_day, detection_max_day, detection_avg_day, exceeded_data, exceeded_rate, actual_emissions, instrument_name, sampling_method, manual_method from b_stat_table_zxbg_water_emission + + + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgWrzlAbnormalitiesMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgWrzlAbnormalitiesMapper.xml index 7b3a075..e581fba 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgWrzlAbnormalitiesMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/BStatTableZxbgWrzlAbnormalitiesMapper.xml @@ -55,7 +55,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pf.industry_permission_name, pf.river_basin FROM - b_stat_table_zxbg_wrzl_abnormalities zxbg + (select * from b_stat_table_zxbg_wrzl_abnormalities + + and over_start_time >= CAST(concat(#{overStartTime},':00:00') AS timestamp) + and over_end_time <= CAST(concat(#{overEndTime},':59:59') AS timestamp) + and zxbg_type = #{zxbgType} + and zxbg_period like concat('%', #{zxbgPeriod}, '%') + + ) zxbg right JOIN pc_factory pf ON pf.ID = zxbg.factory_id @@ -65,8 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + ORDER BY pf.order_num, pf.id - + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/PcControlRequirementsMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/PcControlRequirementsMapper.xml index e1e4b2b..21b7b38 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/PcControlRequirementsMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/PcControlRequirementsMapper.xml @@ -107,4 +107,329 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE po.pollutant_type ='4' and po.parent_outlet_id is not null + + + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/PcFactoryMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/PcFactoryMapper.xml index 015d097..b1cd247 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/PcFactoryMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/PcFactoryMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" fac.city_name, fac.country_code, fac.country_name, + fac.river_basin, fac.wipollunit, fac.license_man_type, fac.license_wabarbeitung, @@ -18,7 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" fac.poll_dis_license_code, fac.poll_dis_license_deadline, fac.poll_dis_license_issuing, - fac.usc_code, ins_fram_code, + fac.usc_code, + fac.ins_fram_code, fac.address, fac.prod_busi_operation, fac.postal_code, @@ -53,7 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" fac.sud_links_pollution_prevention, fac.industrial_park_name, fac.industrial_park_code, - fac.pollutant_total_file_where + fac.pollutant_total_file_where, + fac.eco_env_credit_level, + fac.industry_permission_name fac.id, @@ -98,6 +102,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" fac.country_name, fac.principal_man, fac.mobile_telephone, + + CASE WHEN t6.factory_id IS NULL THEN 0 ELSE 1 END AS label_checked, + fac.industry_permission_name AS "industry_category_name", t3.qr_code_url, @@ -112,6 +119,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM pc_factory_pollutant_emissions_rank GROUP BY factory_id ) t5 ON fac.id = t5.factory_id + + LEFT JOIN ( + SELECT factory_id + FROM pc_label_factory + WHERE label_id = '${query.labelAndValue[0]}' + AND '${query.labelAndValue[1]}' = ANY( string_to_array(label_value, ',') ) + GROUP BY factory_id + ) t6 ON fac.id = t6.factory_id + AND fac.id IN diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/PcLabelFactoryMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/PcLabelFactoryMapper.xml index 20a23e4..4c61c3a 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/PcLabelFactoryMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/PcLabelFactoryMapper.xml @@ -123,5 +123,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" when '1' then '1017' end as labelValue from pc_factory pf + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/PcOutletMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/PcOutletMapper.xml index 2c25f49..7f63620 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/PcOutletMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/PcOutletMapper.xml @@ -529,6 +529,154 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by po.id asc + + + + UPDATE pc_outlet diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/SupermonitorDrainOutletMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/SupermonitorDrainOutletMapper.xml index e923410..12b2363 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/SupermonitorDrainOutletMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/SupermonitorDrainOutletMapper.xml @@ -52,5 +52,91 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and receiving_water_lat = #{receivingWaterLat} + + diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/analysis/SRaActionReportsAuditResultMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/analysis/SRaActionReportsAuditResultMapper.xml index e4c1d8e..181fce5 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/analysis/SRaActionReportsAuditResultMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/analysis/SRaActionReportsAuditResultMapper.xml @@ -69,20 +69,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/analysis/SRaPollManTypeChangeMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/analysis/SRaPollManTypeChangeMapper.xml new file mode 100644 index 0000000..0ce4954 --- /dev/null +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/analysis/SRaPollManTypeChangeMapper.xml @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + id, factory_id, last_license_time, last_license_man_type, now_license_time, now_license_man_type, + create_time, update_time + + + + update s_ra_poll_man_type_change + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.factoryId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.lastLicenseTime,jdbcType=DATE} + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.lastLicenseManType,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.nowLicenseTime,jdbcType=DATE} + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.nowLicenseManType,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP} + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP} + + + + where id in + + #{item.id,jdbcType=VARCHAR} + + + + + update s_ra_poll_man_type_change + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.factoryId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.lastLicenseTime,jdbcType=DATE} + + + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.lastLicenseManType,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.nowLicenseTime,jdbcType=DATE} + + + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.nowLicenseManType,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP} + + + + + + + when id = #{item.id,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP} + + + + + where id in + + #{item.id,jdbcType=VARCHAR} + + + + + insert into s_ra_poll_man_type_change + (id, factory_id, last_license_time, last_license_man_type, now_license_time, now_license_man_type, + create_time, update_time) + values + + (#{item.id,jdbcType=VARCHAR}, #{item.factoryId,jdbcType=VARCHAR}, #{item.lastLicenseTime,jdbcType=DATE}, + #{item.lastLicenseManType,jdbcType=VARCHAR}, #{item.nowLicenseTime,jdbcType=DATE}, + #{item.nowLicenseManType,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, + #{item.updateTime,jdbcType=TIMESTAMP}) + + + + + + + \ No newline at end of file diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/effective/RectificationEffectEvaluationMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/effective/RectificationEffectEvaluationMapper.xml index 8e11ea3..7fe2d3a 100644 --- a/szhpt-fixed-task/src/main/resources/mapper/talroad/effective/RectificationEffectEvaluationMapper.xml +++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/effective/RectificationEffectEvaluationMapper.xml @@ -7,12 +7,12 @@ factory.factory_name, industry.indus_name, factory.country_name, - count(*) filter (where effect.rectification_status = 1) as finishCount, - count(*) filter (where effect.rectification_status= 2 and effect.complate_time >= NOW()) as unFinishCount, - count(*) filter (where effect.rectification_status = 1 and effect.complate_time >= effect.actuali_complate_time) as inTimeFinishCount, - count(*) filter (where effect.rectification_status = 1 and effect.complate_time < effect.actuali_complate_time) as outTimeFinishCount, - count(*) filter (where effect.rectification_status = 2 and effect.complate_time < NOW()) as outTimeUnFinishCount - from pc_factory_rectification_effect effect + count(*) filter (where effect.problem_status = '500') as finishCount, + count(*) filter (where effect.problem_status !='500' and effect.rectify_limit_end_time >= NOW()) as unFinishCount, + count(*) filter (where effect.problem_status = '500' and effect.rectify_limit_end_time >= effect.rectify_time) as inTimeFinishCount, + count(*) filter (where effect.problem_status = '500' and effect.rectify_limit_end_time < effect.rectify_time) as outTimeFinishCount, + count(*) filter (where effect.problem_status != '500' and effect.rectify_limit_end_time < NOW()) as outTimeUnFinishCount + from m_am_problem_fi effect left join pc_factory factory on effect.factory_id = factory.id left join pc_industry industry on factory.industry_category = industry.indus_code @@ -39,4 +39,4 @@ industry.indus_name, factory.country_name - \ No newline at end of file +