From e8fe1eeede7ce9167bbcfa438588e678f80a8561 Mon Sep 17 00:00:00 2001 From: xiachao Date: Thu, 8 Aug 2024 17:25:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?cqc=E6=8A=A5=E8=A1=A8=E5=A1=AB=E6=8A=A5?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/pom.xml | 4 + modules/cqc-service/pom.xml | 31 ++ .../CqcCarbonConsumablesController.java | 98 ++++++ .../dto/CqcCarbonConsumablesDTO.java | 71 ++++ .../entity/CqcCarbonConsumablesEntity.java | 122 +++++++ .../mapper/CqcCarbonConsumablesMapper.java | 16 + .../service/CqcCarbonConsumablesService.java | 14 + .../impl/CqcCarbonConsumablesServiceImpl.java | 28 ++ .../CqcCarbonDiscardController.java | 98 ++++++ .../dto/CqcCarbonDiscardDTO.java | 71 ++++ .../entity/CqcCarbonDiscardEntity.java | 123 +++++++ .../mapper/CqcCarbonDiscardMapper.java | 16 + .../service/CqcCarbonDiscardService.java | 14 + .../impl/CqcCarbonDiscardServiceImpl.java | 28 ++ .../CqcCarbonDistributionController.java | 98 ++++++ .../dto/CqcCarbonDistributionDTO.java | 59 ++++ .../entity/CqcCarbonDistributionEntity.java | 99 ++++++ .../mapper/CqcCarbonDistributionMapper.java | 16 + .../service/CqcCarbonDistributionService.java | 14 + .../CqcCarbonDistributionServiceImpl.java | 28 ++ .../controller/CqcCarbonEnergyController.java | 98 ++++++ .../dto/CqcCarbonEnergyDTO.java | 55 ++++ .../entity/CqcCarbonEnergyEntity.java | 91 +++++ .../mapper/CqcCarbonEnergyMapper.java | 16 + .../service/CqcCarbonEnergyService.java | 14 + .../impl/CqcCarbonEnergyServiceImpl.java | 28 ++ .../controller/CqcCarbonMakeController.java | 98 ++++++ .../CqcCarbonMake/dto/CqcCarbonMakeDTO.java | 53 +++ .../entity/CqcCarbonMakeEntity.java | 87 +++++ .../mapper/CqcCarbonMakeMapper.java | 16 + .../service/CqcCarbonMakeService.java | 14 + .../impl/CqcCarbonMakeServiceImpl.java | 28 ++ .../controller/CqcCarbonRawController.java | 98 ++++++ .../cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java | 71 ++++ .../entity/CqcCarbonRawEntity.java | 123 +++++++ .../CqcCarbonConsumablesController.java | 96 ++++++ .../dto/CqcCarbonConsumablesDTO.java | 70 ++++ .../entity/CqcCarbonConsumablesEntity.java | 121 +++++++ .../mapper/CqcCarbonConsumablesMapper.java | 16 + .../service/CqcCarbonConsumablesService.java | 14 + .../impl/CqcCarbonConsumablesServiceImpl.java | 28 ++ .../CqcCarbonDiscardController.java | 96 ++++++ .../dto/CqcCarbonDiscardDTO.java | 70 ++++ .../entity/CqcCarbonDiscardEntity.java | 122 +++++++ .../mapper/CqcCarbonDiscardMapper.java | 16 + .../service/CqcCarbonDiscardService.java | 14 + .../impl/CqcCarbonDiscardServiceImpl.java | 28 ++ .../CqcCarbonDistributionController.java | 96 ++++++ .../dto/CqcCarbonDistributionDTO.java | 58 ++++ .../entity/CqcCarbonDistributionEntity.java | 98 ++++++ .../mapper/CqcCarbonDistributionMapper.java | 16 + .../service/CqcCarbonDistributionService.java | 14 + .../CqcCarbonDistributionServiceImpl.java | 28 ++ .../controller/CqcCarbonEnergyController.java | 96 ++++++ .../dto/CqcCarbonEnergyDTO.java | 54 +++ .../entity/CqcCarbonEnergyEntity.java | 90 +++++ .../mapper/CqcCarbonEnergyMapper.java | 16 + .../service/CqcCarbonEnergyService.java | 14 + .../impl/CqcCarbonEnergyServiceImpl.java | 28 ++ .../controller/CqcCarbonMakeController.java | 96 ++++++ .../CqcCarbonMake/dto/CqcCarbonMakeDTO.java | 52 +++ .../entity/CqcCarbonMakeEntity.java | 86 +++++ .../mapper/CqcCarbonMakeMapper.java | 16 + .../service/CqcCarbonMakeService.java | 14 + .../impl/CqcCarbonMakeServiceImpl.java | 28 ++ .../controller/CqcCarbonRawController.java | 96 ++++++ .../cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java | 70 ++++ .../entity/CqcCarbonRawEntity.java | 122 +++++++ .../mapper/CqcCarbonRawMapper.java | 16 + .../service/CqcCarbonRawService.java | 14 + .../service/impl/CqcCarbonRawServiceImpl.java | 28 ++ .../controller/CqcCarbonReportController.java | 96 ++++++ .../dto/CqcCarbonReportDTO.java | 164 +++++++++ .../entity/CqcCarbonReportEntity.java | 309 +++++++++++++++++ .../mapper/CqcCarbonReportMapper.java | 16 + .../service/CqcCarbonReportService.java | 14 + .../impl/CqcCarbonReportServiceImpl.java | 28 ++ .../mapper/CqcCarbonRawMapper.java | 16 + .../service/CqcCarbonRawService.java | 14 + .../service/impl/CqcCarbonRawServiceImpl.java | 28 ++ .../controller/CqcCarbonReportController.java | 98 ++++++ .../dto/CqcCarbonReportDTO.java | 165 ++++++++++ .../entity/CqcCarbonReportEntity.java | 310 ++++++++++++++++++ .../mapper/CqcCarbonReportMapper.java | 16 + .../service/CqcCarbonReportService.java | 14 + .../impl/CqcCarbonReportServiceImpl.java | 28 ++ .../CqcCarbonConsumablesMapper.xml | 33 ++ .../CqcCarbonDiscardMapper.xml | 33 ++ .../CqcCarbonDistributionMapper.xml | 27 ++ .../CqcCarbonEnergy/CqcCarbonEnergyMapper.xml | 25 ++ .../CqcCarbonMake/CqcCarbonMakeMapper.xml | 24 ++ .../CqcCarbonRaw/CqcCarbonRawMapper.xml | 33 ++ .../CqcCarbonReport/CqcCarbonReportMapper.xml | 80 +++++ modules/pom.xml | 1 + pom.xml | 6 +- 95 files changed, 5452 insertions(+), 1 deletion(-) create mode 100644 modules/cqc-service/pom.xml create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java create mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java create mode 100644 modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml create mode 100644 modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml create mode 100644 modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml create mode 100644 modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml create mode 100644 modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml create mode 100644 modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml create mode 100644 modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml diff --git a/application/pom.xml b/application/pom.xml index 8d8fc4d..fe426e3 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -137,6 +137,10 @@ com.thing.modules filter-rule + + com.thing.modules + cqc-service + diff --git a/modules/cqc-service/pom.xml b/modules/cqc-service/pom.xml new file mode 100644 index 0000000..2b95eb2 --- /dev/null +++ b/modules/cqc-service/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + + com.thing + modules + 5.1 + + + com.thing.modules + cqc-service + jar + ThingBI Server Modules cqc-service + + + UTF-8 + + + + + + org.projectlombok + lombok + + + + com.thing.common + orm + + + diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java new file mode 100644 index 0000000..5dc7a84 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java @@ -0,0 +1,98 @@ +package com.thing.cqc.CqcCarbonConsumables.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonConsumables.dto.CqcCarbonConsumablesDTO; +import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** +* 使用阶段耗材信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/cqccarbonconsumables") +@Tag(name="使用阶段耗材信息") +@RequiredArgsConstructor +public class CqcCarbonConsumablesController { + + private final CqcCarbonConsumablesService cqcCarbonConsumablesService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonConsumablesDTO data = cqcCarbonConsumablesService.getByIdAs(id, CqcCarbonConsumablesDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonConsumablesDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonConsumablesService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonConsumablesDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonConsumablesService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonConsumablesService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonConsumablesService.listAs(params, CqcCarbonConsumablesDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "使用阶段耗材信息", list, CqcCarbonConsumablesExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java new file mode 100644 index 0000000..4c7448f --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java @@ -0,0 +1,71 @@ +package com.thing.cqc.CqcCarbonConsumables.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 使用阶段耗材信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "使用阶段耗材信息") +public class CqcCarbonConsumablesDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "唯一标识符") + private Long id; + @Schema(description = "申请编号") + private String applyNo; + @Schema(description = "类别") + private String cateid; + @Schema(description = "中文名称") + private String materialsnamecn; + @Schema(description = "化学名称") + private String materialsnameen; + @Schema(description = "用途") + private String materialsuse; + @Schema(description = "材料组份") + private String materialcomponent; + @Schema(description = "产品使用耗材总投入量") + private String productcapacity; + @Schema(description = "单位") + private String productcapacityunit; + @Schema(description = "功能单位耗用量") + private String rawmaterialsinput; + @Schema(description = "单位") + private String rawmaterialsunit; + @Schema(description = "供货商名称") + private String suppliername; + @Schema(description = "供货商地址") + private String supplieraddress; + @Schema(description = "运输方式") + private String transmode; + @Schema(description = "运输工具载重量") + private String transloadcapacity; + @Schema(description = "运输距离") + private String transdistance; + @Schema(description = "单位") + private String transdistanceunit; + @Schema(description = "运输数据来源") + private String transdatasource; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "人员") + private String person; + @Schema(description = "电话") + private String phone; + @Schema(description = "备注") + private String remake; + @Schema(description = "能源编号") + private String energyno; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java new file mode 100644 index 0000000..460db88 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java @@ -0,0 +1,122 @@ +package com.thing.cqc.CqcCarbonConsumables.entity; + +import com.mybatisflex.annotation.Table; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 使用阶段耗材信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_consumables") +public class CqcCarbonConsumablesEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + private Long id; + /** + * 申请编号 + */ + private String applyNo; + /** + * 类别 + */ + private String cateid; + /** + * 中文名称 + */ + private String materialsnamecn; + /** + * 化学名称 + */ + private String materialsnameen; + /** + * 用途 + */ + private String materialsuse; + /** + * 材料组份 + */ + private String materialcomponent; + /** + * 产品使用耗材总投入量 + */ + private String productcapacity; + /** + * 单位 + */ + private String productcapacityunit; + /** + * 功能单位耗用量 + */ + private String rawmaterialsinput; + /** + * 单位 + */ + private String rawmaterialsunit; + /** + * 供货商名称 + */ + private String suppliername; + /** + * 供货商地址 + */ + private String supplieraddress; + /** + * 运输方式 + */ + private String transmode; + /** + * 运输工具载重量 + */ + private String transloadcapacity; + /** + * 运输距离 + */ + private String transdistance; + /** + * 单位 + */ + private String transdistanceunit; + /** + * 运输数据来源 + */ + private String transdatasource; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 人员 + */ + private String person; + /** + * 电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; + /** + * 能源编号 + */ + private String energyno; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java new file mode 100644 index 0000000..1b27ac9 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonConsumables.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 使用阶段耗材信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonConsumablesMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java new file mode 100644 index 0000000..a59ff6b --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonConsumables.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; + +/** + * 使用阶段耗材信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonConsumablesService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java new file mode 100644 index 0000000..b436f41 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonConsumables.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper; +import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; +import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 使用阶段耗材信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonConsumablesServiceImpl extends BaseServiceImpl implements CqcCarbonConsumablesService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java new file mode 100644 index 0000000..99f76c7 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java @@ -0,0 +1,98 @@ +package com.thing.cqc.CqcCarbonDiscard.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonDiscard.dto.CqcCarbonDiscardDTO; +import com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** +* 废物处置及再利用信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/cqccarbondiscard") +@Tag(name="废物处置及再利用信息") +@RequiredArgsConstructor +public class CqcCarbonDiscardController { + + private final CqcCarbonDiscardService cqcCarbonDiscardService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonDiscardService.getPageData(params, CqcCarbonDiscardDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonDiscardDTO data = cqcCarbonDiscardService.getByIdAs(id, CqcCarbonDiscardDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonDiscardDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonDiscardService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonDiscardDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonDiscardService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonDiscardService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonDiscardService.listAs(params, CqcCarbonDiscardDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "废物处置及再利用信息", list, CqcCarbonDiscardExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java new file mode 100644 index 0000000..9027ac7 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java @@ -0,0 +1,71 @@ +package com.thing.cqc.CqcCarbonDiscard.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 废物处置及再利用信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "废物处置及再利用信息") +public class CqcCarbonDiscardDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "唯一标识符") + private Long id; + @Schema(description = "申请编号") + private String applyNo; + @Schema(description = "类别") + private String cateid; + @Schema(description = "中文名称") + private String materialsnamecn; + @Schema(description = "化学名称") + private String materialsnameen; + @Schema(description = "材料组份") + private String materialcomponent; + @Schema(description = "废物处置材料总重量") + private String wastedisposal; + @Schema(description = "单位") + private String wastedisposalunit; + @Schema(description = "功能单位处置量") + private String rawmaterialsinput; + @Schema(description = "单位") + private String rawmaterialsunit; + @Schema(description = "处理方式") + private String disposeway; + @Schema(description = "处理商名称") + private String disposename; + @Schema(description = "处理商地址") + private String disposeaddress; + @Schema(description = "运输方式") + private String transmode; + @Schema(description = "运输工具载重量") + private String transloadcapacity; + @Schema(description = "运输距离") + private String transdistance; + @Schema(description = "单位") + private String transdistanceunit; + @Schema(description = "运输数据来源") + private String transdatasource; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "人员") + private String person; + @Schema(description = "电话") + private String phone; + @Schema(description = "备注") + private String remake; + @Schema(description = "编号") + private String wasteno; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java new file mode 100644 index 0000000..254243d --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java @@ -0,0 +1,123 @@ +package com.thing.cqc.CqcCarbonDiscard.entity; + +import com.mybatisflex.annotation.Table; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 废物处置及再利用信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_discard") +public class CqcCarbonDiscardEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @Id + private Long id; + /** + * 申请编号 + */ + private String applyNo; + /** + * 类别 + */ + private String cateid; + /** + * 中文名称 + */ + private String materialsnamecn; + /** + * 化学名称 + */ + private String materialsnameen; + /** + * 材料组份 + */ + private String materialcomponent; + /** + * 废物处置材料总重量 + */ + private String wastedisposal; + /** + * 单位 + */ + private String wastedisposalunit; + /** + * 功能单位处置量 + */ + private String rawmaterialsinput; + /** + * 单位 + */ + private String rawmaterialsunit; + /** + * 处理方式 + */ + private String disposeway; + /** + * 处理商名称 + */ + private String disposename; + /** + * 处理商地址 + */ + private String disposeaddress; + /** + * 运输方式 + */ + private String transmode; + /** + * 运输工具载重量 + */ + private String transloadcapacity; + /** + * 运输距离 + */ + private String transdistance; + /** + * 单位 + */ + private String transdistanceunit; + /** + * 运输数据来源 + */ + private String transdatasource; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 人员 + */ + private String person; + /** + * 电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; + /** + * 编号 + */ + private String wasteno; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java new file mode 100644 index 0000000..740834f --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonDiscard.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 废物处置及再利用信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonDiscardMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java new file mode 100644 index 0000000..ebf4d7b --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonDiscard.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; + +/** + * 废物处置及再利用信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonDiscardService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java new file mode 100644 index 0000000..9436f08 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonDiscard.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonDiscard.mapper.CqcCarbonDiscardMapper; +import com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; +import com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 废物处置及再利用信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonDiscardServiceImpl extends BaseServiceImpl implements CqcCarbonDiscardService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java new file mode 100644 index 0000000..643590e --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java @@ -0,0 +1,98 @@ +package com.thing.cqc.CqcCarbonDistribution.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonDistribution.dto.CqcCarbonDistributionDTO; +import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** +* 产品分销信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/cqccarbondistribution") +@Tag(name="产品分销信息") +@RequiredArgsConstructor +public class CqcCarbonDistributionController { + + private final CqcCarbonDistributionService cqcCarbonDistributionService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonDistributionDTO data = cqcCarbonDistributionService.getByIdAs(id, CqcCarbonDistributionDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonDistributionDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonDistributionService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonDistributionDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonDistributionService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonDistributionService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonDistributionService.listAs(params, CqcCarbonDistributionDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "产品分销信息", list, CqcCarbonDistributionExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java new file mode 100644 index 0000000..5353eae --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java @@ -0,0 +1,59 @@ +package com.thing.cqc.CqcCarbonDistribution.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 产品分销信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "产品分销信息") +public class CqcCarbonDistributionDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "唯一标识符") + private Long id; + @Schema(description = "申请编号") + private String applyNo; + @Schema(description = "中文名称") + private String materialsnamecn; + @Schema(description = "产品出货重量") + private String productweight; + @Schema(description = "单位") + private String productweightunit; + @Schema(description = "分销对象") + private String distributionobject; + @Schema(description = "分销地址") + private String distributionaddress; + @Schema(description = "运输方式") + private String transmode; + @Schema(description = "运输工具载重量") + private String transloadcapacity; + @Schema(description = "运输距离") + private String transdistance; + @Schema(description = "单位") + private String transdistanceunit; + @Schema(description = "运输数据来源") + private String transdatasource; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "人员") + private String person; + @Schema(description = "电话") + private String phone; + @Schema(description = "备注") + private String remake; + @Schema(description = "编号") + private String disno; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java new file mode 100644 index 0000000..ceece46 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java @@ -0,0 +1,99 @@ +package com.thing.cqc.CqcCarbonDistribution.entity; + +import com.mybatisflex.annotation.Table; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 产品分销信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_distribution") +public class CqcCarbonDistributionEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @Id + private Long id; + /** + * 申请编号 + */ + private String applyNo; + /** + * 中文名称 + */ + private String materialsnamecn; + /** + * 产品出货重量 + */ + private String productweight; + /** + * 单位 + */ + private String productweightunit; + /** + * 分销对象 + */ + private String distributionobject; + /** + * 分销地址 + */ + private String distributionaddress; + /** + * 运输方式 + */ + private String transmode; + /** + * 运输工具载重量 + */ + private String transloadcapacity; + /** + * 运输距离 + */ + private String transdistance; + /** + * 单位 + */ + private String transdistanceunit; + /** + * 运输数据来源 + */ + private String transdatasource; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 人员 + */ + private String person; + /** + * 电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; + /** + * 编号 + */ + private String disno; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java new file mode 100644 index 0000000..55a7270 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonDistribution.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 产品分销信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonDistributionMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java new file mode 100644 index 0000000..f11db4b --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonDistribution.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; + +/** + * 产品分销信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonDistributionService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java new file mode 100644 index 0000000..ff0be4d --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonDistribution.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper; +import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; +import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 产品分销信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonDistributionServiceImpl extends BaseServiceImpl implements CqcCarbonDistributionService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java new file mode 100644 index 0000000..6f53023 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java @@ -0,0 +1,98 @@ +package com.thing.cqc.CqcCarbonEnergy.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonEnergy.dto.CqcCarbonEnergyDTO; +import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** +* 使用阶段能源信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/cqccarbonenergy") +@Tag(name=" 使用阶段能源信息") +@RequiredArgsConstructor +public class CqcCarbonEnergyController { + + private final CqcCarbonEnergyService cqcCarbonEnergyService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonEnergyDTO data = cqcCarbonEnergyService.getByIdAs(id, CqcCarbonEnergyDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonEnergyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonEnergyService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonEnergyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonEnergyService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonEnergyService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonEnergyService.listAs(params, CqcCarbonEnergyDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, " 使用阶段能源信息", list, CqcCarbonEnergyExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java new file mode 100644 index 0000000..be1d4fc --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java @@ -0,0 +1,55 @@ +package com.thing.cqc.CqcCarbonEnergy.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 使用阶段能源信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = " 使用阶段能源信息") +public class CqcCarbonEnergyDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "唯一标识符") + private Long id; + @Schema(description = "申请编号") + private String applyNo; + @Schema(description = "类别") + private String cateid; + @Schema(description = "使用过程") + private String useprocedure; + @Schema(description = "排放源") + private String emissionsource; + @Schema(description = "用途") + private String materialsuse; + @Schema(description = "产品使用能源总投入量") + private String energycapacity; + @Schema(description = "单位") + private String energycapacityunit; + @Schema(description = "功能单位耗用量") + private String rawmaterialsinput; + @Schema(description = "单位") + private String rawmaterialsunit; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "人员") + private String person; + @Schema(description = "电话") + private String phone; + @Schema(description = "备注") + private String remake; + @Schema(description = "备注") + private String consumeno; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java new file mode 100644 index 0000000..d1a9079 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java @@ -0,0 +1,91 @@ +package com.thing.cqc.CqcCarbonEnergy.entity; + +import com.mybatisflex.annotation.Table; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 使用阶段能源信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_energy") +public class CqcCarbonEnergyEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @Id + private Long id; + /** + * 申请编号 + */ + private String applyNo; + /** + * 类别 + */ + private String cateid; + /** + * 使用过程 + */ + private String useprocedure; + /** + * 排放源 + */ + private String emissionsource; + /** + * 用途 + */ + private String materialsuse; + /** + * 产品使用能源总投入量 + */ + private String energycapacity; + /** + * 单位 + */ + private String energycapacityunit; + /** + * 功能单位耗用量 + */ + private String rawmaterialsinput; + /** + * 单位 + */ + private String rawmaterialsunit; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 人员 + */ + private String person; + /** + * 电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; + /** + * 备注 + */ + private String consumeno; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java new file mode 100644 index 0000000..9bc4363 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonEnergy.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 使用阶段能源信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonEnergyMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java new file mode 100644 index 0000000..c8550d5 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonEnergy.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; + +/** + * 使用阶段能源信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonEnergyService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java new file mode 100644 index 0000000..22e34a4 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonEnergy.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper; +import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; +import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 使用阶段能源信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonEnergyServiceImpl extends BaseServiceImpl implements CqcCarbonEnergyService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java new file mode 100644 index 0000000..62f0ee6 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java @@ -0,0 +1,98 @@ +package com.thing.cqc.CqcCarbonMake.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonMake.dto.CqcCarbonMakeDTO; +import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** +* 制造阶段能源消耗信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/cqccarbonmake") +@Tag(name="制造阶段能源消耗信息") +@RequiredArgsConstructor +public class CqcCarbonMakeController { + + private final CqcCarbonMakeService cqcCarbonMakeService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonMakeDTO data = cqcCarbonMakeService.getByIdAs(id, CqcCarbonMakeDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonMakeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonMakeService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonMakeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonMakeService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonMakeService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonMakeService.listAs(params, CqcCarbonMakeDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "制造阶段能源消耗信息", list, CqcCarbonMakeExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java new file mode 100644 index 0000000..b0206ce --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java @@ -0,0 +1,53 @@ +package com.thing.cqc.CqcCarbonMake.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 制造阶段能源消耗信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "制造阶段能源消耗信息") +public class CqcCarbonMakeDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "唯一标识符") + private Long id; + @Schema(description = "申请编号,，关联申请记录表申请唯一编码") + private String applyNo; + @Schema(description = "类别") + private String cateid; + @Schema(description = "制程投入位置") + private String useplace; + @Schema(description = "排放源") + private String emissionsource; + @Schema(description = "全厂总用量") + private String totalelectricity; + @Schema(description = "全厂总用量单位") + private String totalelectricityunit; + @Schema(description = "功能单位消耗量") + private String specificconsumption; + @Schema(description = "消耗量单位") + private String specificconsumptionunit; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "人员") + private String person; + @Schema(description = "电话") + private String phone; + @Schema(description = "备注") + private String remake; + @Schema(description = "编号") + private String makeno; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java new file mode 100644 index 0000000..48beaea --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java @@ -0,0 +1,87 @@ +package com.thing.cqc.CqcCarbonMake.entity; + +import com.mybatisflex.annotation.Table; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 制造阶段能源消耗信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_make") +public class CqcCarbonMakeEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @Id + private Long id; + /** + * 申请编号,，关联申请记录表申请唯一编码 + */ + private String applyNo; + /** + * 类别 + */ + private String cateid; + /** + * 制程投入位置 + */ + private String useplace; + /** + * 排放源 + */ + private String emissionsource; + /** + * 全厂总用量 + */ + private String totalelectricity; + /** + * 全厂总用量单位 + */ + private String totalelectricityunit; + /** + * 功能单位消耗量 + */ + private String specificconsumption; + /** + * 消耗量单位 + */ + private String specificconsumptionunit; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 人员 + */ + private String person; + /** + * 电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; + /** + * 编号 + */ + private String makeno; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java new file mode 100644 index 0000000..5fef182 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonMake.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 制造阶段能源消耗信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonMakeMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java new file mode 100644 index 0000000..2bb4955 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonMake.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; + +/** + * 制造阶段能源消耗信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonMakeService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java new file mode 100644 index 0000000..5ade199 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonMake.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper; +import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; +import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 制造阶段能源消耗信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonMakeServiceImpl extends BaseServiceImpl implements CqcCarbonMakeService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java new file mode 100644 index 0000000..a9be11a --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java @@ -0,0 +1,98 @@ +package com.thing.cqc.CqcCarbonRaw.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; +import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** +* 原物料阶段数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/cqccarbonraw") +@Tag(name="原物料阶段数据") +@RequiredArgsConstructor +public class CqcCarbonRawController { + + private final CqcCarbonRawService cqcCarbonRawService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonRawDTO data = cqcCarbonRawService.getByIdAs(id, CqcCarbonRawDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonRawDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonRawService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonRawDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonRawService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonRawService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonRawService.listAs(params, CqcCarbonRawDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "原物料阶段数据", list, CqcCarbonRawExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java new file mode 100644 index 0000000..49023f4 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java @@ -0,0 +1,71 @@ +package com.thing.cqc.CqcCarbonRaw.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 原物料阶段数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "原物料阶段数据") +public class CqcCarbonRawDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "记录ID") + private Long id; + @Schema(description = "申请唯一编码，关联申请记录表申请唯一编码") + private String applyNo; + @Schema(description = "材料编号") + private String materialno; + @Schema(description = "类别ID") + private String cateid; + @Schema(description = "材料中文名称") + private String materialsnamecn; + @Schema(description = "材料英文名称及化学名称") + private String materialsnameen; + @Schema(description = "生成工序") + private String productionprocesses; + @Schema(description = "材料组份名称及比例") + private String materialcomponent; + @Schema(description = "盘查期间内生产该产品所使用原料总投入量") + private String productcapacity; + @Schema(description = "投入量单位") + private String productcapacityunit; + @Schema(description = "功能单位原物料投入量") + private String rawmaterialsinput; + @Schema(description = "原物料投入量单位") + private String rawmaterialsunit; + @Schema(description = "供货商名称") + private String suppliername; + @Schema(description = "供货商地址") + private String supplieraddress; + @Schema(description = "运输方式") + private String transmode; + @Schema(description = "运输工具载重量") + private String transloadcapacity; + @Schema(description = "运输距离") + private String transdistance; + @Schema(description = "运输距离单位") + private String transdistanceunit; + @Schema(description = "运输数据来源") + private String transdatasource; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "负责人") + private String person; + @Schema(description = "联系电话") + private String phone; + @Schema(description = "备注") + private String remake; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java new file mode 100644 index 0000000..0c74558 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java @@ -0,0 +1,123 @@ +package com.thing.cqc.CqcCarbonRaw.entity; + +import com.mybatisflex.annotation.Table; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 原物料阶段数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_raw") +public class CqcCarbonRawEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @Id + private Long id; + /** + * 申请唯一编码，关联申请记录表申请唯一编码 + */ + private String applyNo; + /** + * 材料编号 + */ + private String materialno; + /** + * 类别ID + */ + private String cateid; + /** + * 材料中文名称 + */ + private String materialsnamecn; + /** + * 材料英文名称及化学名称 + */ + private String materialsnameen; + /** + * 生成工序 + */ + private String productionprocesses; + /** + * 材料组份名称及比例 + */ + private String materialcomponent; + /** + * 盘查期间内生产该产品所使用原料总投入量 + */ + private String productcapacity; + /** + * 投入量单位 + */ + private String productcapacityunit; + /** + * 功能单位原物料投入量 + */ + private String rawmaterialsinput; + /** + * 原物料投入量单位 + */ + private String rawmaterialsunit; + /** + * 供货商名称 + */ + private String suppliername; + /** + * 供货商地址 + */ + private String supplieraddress; + /** + * 运输方式 + */ + private String transmode; + /** + * 运输工具载重量 + */ + private String transloadcapacity; + /** + * 运输距离 + */ + private String transdistance; + /** + * 运输距离单位 + */ + private String transdistanceunit; + /** + * 运输数据来源 + */ + private String transdatasource; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 负责人 + */ + private String person; + /** + * 联系电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java new file mode 100644 index 0000000..7b63ae2 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java @@ -0,0 +1,96 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.dto.CqcCarbonConsumablesDTO; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; + +import java.util.Map; + +/** +* 使用阶段耗材信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/CqcCarbonConsumables/cqccarbonconsumables") +@Tag(name="使用阶段耗材信息") +@RequiredArgsConstructor +public class CqcCarbonConsumablesController { + + private final CqcCarbonConsumablesService cqcCarbonConsumablesService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonConsumablesDTO data = cqcCarbonConsumablesService.getByIdAs(id, CqcCarbonConsumablesDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonConsumablesDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonConsumablesService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonConsumablesDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonConsumablesService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonConsumablesService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonConsumablesService.listAs(params, CqcCarbonConsumablesDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "使用阶段耗材信息", list, CqcCarbonConsumablesExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java new file mode 100644 index 0000000..ec6f06c --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java @@ -0,0 +1,70 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 使用阶段耗材信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "使用阶段耗材信息") +public class CqcCarbonConsumablesDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "唯一标识符") + private Long id; + @Schema(description = "申请编号") + private String applyNo; + @Schema(description = "类别") + private String cateid; + @Schema(description = "中文名称") + private String materialsnamecn; + @Schema(description = "化学名称") + private String materialsnameen; + @Schema(description = "用途") + private String materialsuse; + @Schema(description = "材料组份") + private String materialcomponent; + @Schema(description = "产品使用耗材总投入量") + private String productcapacity; + @Schema(description = "单位") + private String productcapacityunit; + @Schema(description = "功能单位耗用量") + private String rawmaterialsinput; + @Schema(description = "单位") + private String rawmaterialsunit; + @Schema(description = "供货商名称") + private String suppliername; + @Schema(description = "供货商地址") + private String supplieraddress; + @Schema(description = "运输方式") + private String transmode; + @Schema(description = "运输工具载重量") + private String transloadcapacity; + @Schema(description = "运输距离") + private String transdistance; + @Schema(description = "单位") + private String transdistanceunit; + @Schema(description = "运输数据来源") + private String transdatasource; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "人员") + private String person; + @Schema(description = "电话") + private String phone; + @Schema(description = "备注") + private String remake; + @Schema(description = "能源编号") + private String energyno; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java new file mode 100644 index 0000000..0ac60e2 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java @@ -0,0 +1,121 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity; + +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 使用阶段耗材信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_consumables") +public class CqcCarbonConsumablesEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + private Long id; + /** + * 申请编号 + */ + private String applyNo; + /** + * 类别 + */ + private String cateid; + /** + * 中文名称 + */ + private String materialsnamecn; + /** + * 化学名称 + */ + private String materialsnameen; + /** + * 用途 + */ + private String materialsuse; + /** + * 材料组份 + */ + private String materialcomponent; + /** + * 产品使用耗材总投入量 + */ + private String productcapacity; + /** + * 单位 + */ + private String productcapacityunit; + /** + * 功能单位耗用量 + */ + private String rawmaterialsinput; + /** + * 单位 + */ + private String rawmaterialsunit; + /** + * 供货商名称 + */ + private String suppliername; + /** + * 供货商地址 + */ + private String supplieraddress; + /** + * 运输方式 + */ + private String transmode; + /** + * 运输工具载重量 + */ + private String transloadcapacity; + /** + * 运输距离 + */ + private String transdistance; + /** + * 单位 + */ + private String transdistanceunit; + /** + * 运输数据来源 + */ + private String transdatasource; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 人员 + */ + private String person; + /** + * 电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; + /** + * 能源编号 + */ + private String energyno; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java new file mode 100644 index 0000000..522cab1 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 使用阶段耗材信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonConsumablesMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java new file mode 100644 index 0000000..bd2ae70 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; + +/** + * 使用阶段耗材信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonConsumablesService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java new file mode 100644 index 0000000..fb3f23f --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 使用阶段耗材信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonConsumablesServiceImpl extends BaseServiceImpl implements CqcCarbonConsumablesService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java new file mode 100644 index 0000000..7c34cdb --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java @@ -0,0 +1,96 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.dto.CqcCarbonDiscardDTO; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; + +import java.util.Map; + +/** +* 废物处置及再利用信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/CqcCarbonDiscard/cqccarbondiscard") +@Tag(name="废物处置及再利用信息") +@RequiredArgsConstructor +public class CqcCarbonDiscardController { + + private final CqcCarbonDiscardService cqcCarbonDiscardService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonDiscardService.getPageData(params, CqcCarbonDiscardDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonDiscardDTO data = cqcCarbonDiscardService.getByIdAs(id, CqcCarbonDiscardDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonDiscardDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonDiscardService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonDiscardDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonDiscardService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonDiscardService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonDiscardService.listAs(params, CqcCarbonDiscardDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "废物处置及再利用信息", list, CqcCarbonDiscardExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java new file mode 100644 index 0000000..e388282 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java @@ -0,0 +1,70 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 废物处置及再利用信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "废物处置及再利用信息") +public class CqcCarbonDiscardDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "唯一标识符") + private Long id; + @Schema(description = "申请编号") + private String applyNo; + @Schema(description = "类别") + private String cateid; + @Schema(description = "中文名称") + private String materialsnamecn; + @Schema(description = "化学名称") + private String materialsnameen; + @Schema(description = "材料组份") + private String materialcomponent; + @Schema(description = "废物处置材料总重量") + private String wastedisposal; + @Schema(description = "单位") + private String wastedisposalunit; + @Schema(description = "功能单位处置量") + private String rawmaterialsinput; + @Schema(description = "单位") + private String rawmaterialsunit; + @Schema(description = "处理方式") + private String disposeway; + @Schema(description = "处理商名称") + private String disposename; + @Schema(description = "处理商地址") + private String disposeaddress; + @Schema(description = "运输方式") + private String transmode; + @Schema(description = "运输工具载重量") + private String transloadcapacity; + @Schema(description = "运输距离") + private String transdistance; + @Schema(description = "单位") + private String transdistanceunit; + @Schema(description = "运输数据来源") + private String transdatasource; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "人员") + private String person; + @Schema(description = "电话") + private String phone; + @Schema(description = "备注") + private String remake; + @Schema(description = "编号") + private String wasteno; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java new file mode 100644 index 0000000..dcb2cd6 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java @@ -0,0 +1,122 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity; + +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 废物处置及再利用信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_discard") +public class CqcCarbonDiscardEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @Id + private Long id; + /** + * 申请编号 + */ + private String applyNo; + /** + * 类别 + */ + private String cateid; + /** + * 中文名称 + */ + private String materialsnamecn; + /** + * 化学名称 + */ + private String materialsnameen; + /** + * 材料组份 + */ + private String materialcomponent; + /** + * 废物处置材料总重量 + */ + private String wastedisposal; + /** + * 单位 + */ + private String wastedisposalunit; + /** + * 功能单位处置量 + */ + private String rawmaterialsinput; + /** + * 单位 + */ + private String rawmaterialsunit; + /** + * 处理方式 + */ + private String disposeway; + /** + * 处理商名称 + */ + private String disposename; + /** + * 处理商地址 + */ + private String disposeaddress; + /** + * 运输方式 + */ + private String transmode; + /** + * 运输工具载重量 + */ + private String transloadcapacity; + /** + * 运输距离 + */ + private String transdistance; + /** + * 单位 + */ + private String transdistanceunit; + /** + * 运输数据来源 + */ + private String transdatasource; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 人员 + */ + private String person; + /** + * 电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; + /** + * 编号 + */ + private String wasteno; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java new file mode 100644 index 0000000..f8467eb --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 废物处置及再利用信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonDiscardMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java new file mode 100644 index 0000000..c914de7 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; + +/** + * 废物处置及再利用信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonDiscardService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java new file mode 100644 index 0000000..844250e --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.mapper.CqcCarbonDiscardMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 废物处置及再利用信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonDiscardServiceImpl extends BaseServiceImpl implements CqcCarbonDiscardService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java new file mode 100644 index 0000000..d559da2 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java @@ -0,0 +1,96 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.dto.CqcCarbonDistributionDTO; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; + +import java.util.Map; + +/** +* 产品分销信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/CqcCarbonDistribution/cqccarbondistribution") +@Tag(name="产品分销信息") +@RequiredArgsConstructor +public class CqcCarbonDistributionController { + + private final CqcCarbonDistributionService cqcCarbonDistributionService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonDistributionDTO data = cqcCarbonDistributionService.getByIdAs(id, CqcCarbonDistributionDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonDistributionDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonDistributionService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonDistributionDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonDistributionService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonDistributionService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonDistributionService.listAs(params, CqcCarbonDistributionDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "产品分销信息", list, CqcCarbonDistributionExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java new file mode 100644 index 0000000..dfdcba0 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java @@ -0,0 +1,58 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 产品分销信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "产品分销信息") +public class CqcCarbonDistributionDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "唯一标识符") + private Long id; + @Schema(description = "申请编号") + private String applyNo; + @Schema(description = "中文名称") + private String materialsnamecn; + @Schema(description = "产品出货重量") + private String productweight; + @Schema(description = "单位") + private String productweightunit; + @Schema(description = "分销对象") + private String distributionobject; + @Schema(description = "分销地址") + private String distributionaddress; + @Schema(description = "运输方式") + private String transmode; + @Schema(description = "运输工具载重量") + private String transloadcapacity; + @Schema(description = "运输距离") + private String transdistance; + @Schema(description = "单位") + private String transdistanceunit; + @Schema(description = "运输数据来源") + private String transdatasource; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "人员") + private String person; + @Schema(description = "电话") + private String phone; + @Schema(description = "备注") + private String remake; + @Schema(description = "编号") + private String disno; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java new file mode 100644 index 0000000..a55bc45 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java @@ -0,0 +1,98 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity; + +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 产品分销信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_distribution") +public class CqcCarbonDistributionEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @Id + private Long id; + /** + * 申请编号 + */ + private String applyNo; + /** + * 中文名称 + */ + private String materialsnamecn; + /** + * 产品出货重量 + */ + private String productweight; + /** + * 单位 + */ + private String productweightunit; + /** + * 分销对象 + */ + private String distributionobject; + /** + * 分销地址 + */ + private String distributionaddress; + /** + * 运输方式 + */ + private String transmode; + /** + * 运输工具载重量 + */ + private String transloadcapacity; + /** + * 运输距离 + */ + private String transdistance; + /** + * 单位 + */ + private String transdistanceunit; + /** + * 运输数据来源 + */ + private String transdatasource; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 人员 + */ + private String person; + /** + * 电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; + /** + * 编号 + */ + private String disno; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java new file mode 100644 index 0000000..a931f40 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 产品分销信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonDistributionMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java new file mode 100644 index 0000000..e3d117d --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; + +/** + * 产品分销信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonDistributionService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java new file mode 100644 index 0000000..defefc8 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 产品分销信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonDistributionServiceImpl extends BaseServiceImpl implements CqcCarbonDistributionService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java new file mode 100644 index 0000000..b4681b8 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java @@ -0,0 +1,96 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.dto.CqcCarbonEnergyDTO; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; + +import java.util.Map; + +/** +* 使用阶段能源信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/CqcCarbonEnergy/cqccarbonenergy") +@Tag(name=" 使用阶段能源信息") +@RequiredArgsConstructor +public class CqcCarbonEnergyController { + + private final CqcCarbonEnergyService cqcCarbonEnergyService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonEnergyDTO data = cqcCarbonEnergyService.getByIdAs(id, CqcCarbonEnergyDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonEnergyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonEnergyService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonEnergyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonEnergyService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonEnergyService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonEnergyService.listAs(params, CqcCarbonEnergyDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, " 使用阶段能源信息", list, CqcCarbonEnergyExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java new file mode 100644 index 0000000..5e7bcdd --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java @@ -0,0 +1,54 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 使用阶段能源信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = " 使用阶段能源信息") +public class CqcCarbonEnergyDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "唯一标识符") + private Long id; + @Schema(description = "申请编号") + private String applyNo; + @Schema(description = "类别") + private String cateid; + @Schema(description = "使用过程") + private String useprocedure; + @Schema(description = "排放源") + private String emissionsource; + @Schema(description = "用途") + private String materialsuse; + @Schema(description = "产品使用能源总投入量") + private String energycapacity; + @Schema(description = "单位") + private String energycapacityunit; + @Schema(description = "功能单位耗用量") + private String rawmaterialsinput; + @Schema(description = "单位") + private String rawmaterialsunit; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "人员") + private String person; + @Schema(description = "电话") + private String phone; + @Schema(description = "备注") + private String remake; + @Schema(description = "备注") + private String consumeno; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java new file mode 100644 index 0000000..883f352 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java @@ -0,0 +1,90 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity; + +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 使用阶段能源信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_energy") +public class CqcCarbonEnergyEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @Id + private Long id; + /** + * 申请编号 + */ + private String applyNo; + /** + * 类别 + */ + private String cateid; + /** + * 使用过程 + */ + private String useprocedure; + /** + * 排放源 + */ + private String emissionsource; + /** + * 用途 + */ + private String materialsuse; + /** + * 产品使用能源总投入量 + */ + private String energycapacity; + /** + * 单位 + */ + private String energycapacityunit; + /** + * 功能单位耗用量 + */ + private String rawmaterialsinput; + /** + * 单位 + */ + private String rawmaterialsunit; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 人员 + */ + private String person; + /** + * 电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; + /** + * 备注 + */ + private String consumeno; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java new file mode 100644 index 0000000..5229466 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 使用阶段能源信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonEnergyMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java new file mode 100644 index 0000000..625065d --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; + +/** + * 使用阶段能源信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonEnergyService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java new file mode 100644 index 0000000..fc28a48 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 使用阶段能源信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonEnergyServiceImpl extends BaseServiceImpl implements CqcCarbonEnergyService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java new file mode 100644 index 0000000..f5ba3e4 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java @@ -0,0 +1,96 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.dto.CqcCarbonMakeDTO; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; + +import java.util.Map; + +/** +* 制造阶段能源消耗信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/CqcCarbonMake/cqccarbonmake") +@Tag(name="制造阶段能源消耗信息") +@RequiredArgsConstructor +public class CqcCarbonMakeController { + + private final CqcCarbonMakeService cqcCarbonMakeService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonMakeDTO data = cqcCarbonMakeService.getByIdAs(id, CqcCarbonMakeDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonMakeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonMakeService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonMakeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonMakeService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonMakeService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonMakeService.listAs(params, CqcCarbonMakeDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "制造阶段能源消耗信息", list, CqcCarbonMakeExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java new file mode 100644 index 0000000..8b43486 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java @@ -0,0 +1,52 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 制造阶段能源消耗信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "制造阶段能源消耗信息") +public class CqcCarbonMakeDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "唯一标识符") + private Long id; + @Schema(description = "申请编号,，关联申请记录表申请唯一编码") + private String applyNo; + @Schema(description = "类别") + private String cateid; + @Schema(description = "制程投入位置") + private String useplace; + @Schema(description = "排放源") + private String emissionsource; + @Schema(description = "全厂总用量") + private String totalelectricity; + @Schema(description = "全厂总用量单位") + private String totalelectricityunit; + @Schema(description = "功能单位消耗量") + private String specificconsumption; + @Schema(description = "消耗量单位") + private String specificconsumptionunit; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "人员") + private String person; + @Schema(description = "电话") + private String phone; + @Schema(description = "备注") + private String remake; + @Schema(description = "编号") + private String makeno; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java new file mode 100644 index 0000000..70bc739 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java @@ -0,0 +1,86 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity; + +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 制造阶段能源消耗信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_make") +public class CqcCarbonMakeEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 唯一标识符 + */ + @Id + private Long id; + /** + * 申请编号,，关联申请记录表申请唯一编码 + */ + private String applyNo; + /** + * 类别 + */ + private String cateid; + /** + * 制程投入位置 + */ + private String useplace; + /** + * 排放源 + */ + private String emissionsource; + /** + * 全厂总用量 + */ + private String totalelectricity; + /** + * 全厂总用量单位 + */ + private String totalelectricityunit; + /** + * 功能单位消耗量 + */ + private String specificconsumption; + /** + * 消耗量单位 + */ + private String specificconsumptionunit; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 人员 + */ + private String person; + /** + * 电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; + /** + * 编号 + */ + private String makeno; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java new file mode 100644 index 0000000..af4b4cd --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 制造阶段能源消耗信息 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonMakeMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java new file mode 100644 index 0000000..718c0a4 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; + +/** + * 制造阶段能源消耗信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonMakeService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java new file mode 100644 index 0000000..91ff389 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 制造阶段能源消耗信息 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonMakeServiceImpl extends BaseServiceImpl implements CqcCarbonMakeService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java new file mode 100644 index 0000000..c9db104 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java @@ -0,0 +1,96 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; + +import java.util.Map; + +/** +* 原物料阶段数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/CqcCarbonRaw/cqccarbonraw") +@Tag(name="原物料阶段数据") +@RequiredArgsConstructor +public class CqcCarbonRawController { + + private final CqcCarbonRawService cqcCarbonRawService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonRawDTO data = cqcCarbonRawService.getByIdAs(id, CqcCarbonRawDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonRawDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonRawService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonRawDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonRawService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonRawService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonRawService.listAs(params, CqcCarbonRawDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "原物料阶段数据", list, CqcCarbonRawExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java new file mode 100644 index 0000000..84a00c8 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java @@ -0,0 +1,70 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 原物料阶段数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "原物料阶段数据") +public class CqcCarbonRawDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "记录ID") + private Long id; + @Schema(description = "申请唯一编码，关联申请记录表申请唯一编码") + private String applyNo; + @Schema(description = "材料编号") + private String materialno; + @Schema(description = "类别ID") + private String cateid; + @Schema(description = "材料中文名称") + private String materialsnamecn; + @Schema(description = "材料英文名称及化学名称") + private String materialsnameen; + @Schema(description = "生成工序") + private String productionprocesses; + @Schema(description = "材料组份名称及比例") + private String materialcomponent; + @Schema(description = "盘查期间内生产该产品所使用原料总投入量") + private String productcapacity; + @Schema(description = "投入量单位") + private String productcapacityunit; + @Schema(description = "功能单位原物料投入量") + private String rawmaterialsinput; + @Schema(description = "原物料投入量单位") + private String rawmaterialsunit; + @Schema(description = "供货商名称") + private String suppliername; + @Schema(description = "供货商地址") + private String supplieraddress; + @Schema(description = "运输方式") + private String transmode; + @Schema(description = "运输工具载重量") + private String transloadcapacity; + @Schema(description = "运输距离") + private String transdistance; + @Schema(description = "运输距离单位") + private String transdistanceunit; + @Schema(description = "运输数据来源") + private String transdatasource; + @Schema(description = "活动数据来源") + private String activitydatasource; + @Schema(description = "部门") + private String dept; + @Schema(description = "负责人") + private String person; + @Schema(description = "联系电话") + private String phone; + @Schema(description = "备注") + private String remake; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java new file mode 100644 index 0000000..b844591 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java @@ -0,0 +1,122 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity; + +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 原物料阶段数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_raw") +public class CqcCarbonRawEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @Id + private Long id; + /** + * 申请唯一编码，关联申请记录表申请唯一编码 + */ + private String applyNo; + /** + * 材料编号 + */ + private String materialno; + /** + * 类别ID + */ + private String cateid; + /** + * 材料中文名称 + */ + private String materialsnamecn; + /** + * 材料英文名称及化学名称 + */ + private String materialsnameen; + /** + * 生成工序 + */ + private String productionprocesses; + /** + * 材料组份名称及比例 + */ + private String materialcomponent; + /** + * 盘查期间内生产该产品所使用原料总投入量 + */ + private String productcapacity; + /** + * 投入量单位 + */ + private String productcapacityunit; + /** + * 功能单位原物料投入量 + */ + private String rawmaterialsinput; + /** + * 原物料投入量单位 + */ + private String rawmaterialsunit; + /** + * 供货商名称 + */ + private String suppliername; + /** + * 供货商地址 + */ + private String supplieraddress; + /** + * 运输方式 + */ + private String transmode; + /** + * 运输工具载重量 + */ + private String transloadcapacity; + /** + * 运输距离 + */ + private String transdistance; + /** + * 运输距离单位 + */ + private String transdistanceunit; + /** + * 运输数据来源 + */ + private String transdatasource; + /** + * 活动数据来源 + */ + private String activitydatasource; + /** + * 部门 + */ + private String dept; + /** + * 负责人 + */ + private String person; + /** + * 联系电话 + */ + private String phone; + /** + * 备注 + */ + private String remake; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java new file mode 100644 index 0000000..cddd08a --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 原物料阶段数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonRawMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java new file mode 100644 index 0000000..805d65a --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; + +/** + * 原物料阶段数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonRawService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java new file mode 100644 index 0000000..09b67c3 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 原物料阶段数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonRawServiceImpl extends BaseServiceImpl implements CqcCarbonRawService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java new file mode 100644 index 0000000..6386eb5 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java @@ -0,0 +1,96 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.dto.CqcCarbonReportDTO; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; + +import java.util.Map; + +/** +* 申请表基础数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/CqcCarbonReport/cqccarbonreport") +@Tag(name="申请表基础数据") +@RequiredArgsConstructor +public class CqcCarbonReportController { + + private final CqcCarbonReportService cqcCarbonReportService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonReportService.getPageData(params, CqcCarbonReportDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonReportDTO data = cqcCarbonReportService.getByIdAs(id, CqcCarbonReportDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonReportDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonReportService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonReportDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonReportService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonReportService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonReportService.listAs(params, CqcCarbonReportDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "申请表基础数据", list, CqcCarbonReportExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java new file mode 100644 index 0000000..e51962b --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java @@ -0,0 +1,164 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 申请表基础数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "申请表基础数据") +public class CqcCarbonReportDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "受理机构") + private String deptId; + @Schema(description = "申请唯一编码(自行设定规则，与文件传输接口对应)") + private String applyNo; + @Schema(description = "委托方名称（中文）") + private String clientNameCn; + @Schema(description = "委托方名称（英文）") + private String clientNameEn; + @Schema(description = "委托方地址（中文）") + private String clientAddressCn; + @Schema(description = "委托方地址（英文）") + private String clientAddressEn; + @Schema(description = "委托方邮编") + private String clientPostcode; + @Schema(description = "委托方联系人姓名") + private String clientContactName; + @Schema(description = "委托方部门") + private String clientDepartment; + @Schema(description = "委托方职务") + private String clientPosition; + @Schema(description = "委托方电话") + private String clientPhone; + @Schema(description = "委托方传真") + private String clientFax; + @Schema(description = "委托方E-MAIL") + private String clientEmail; + @Schema(description = "与受核查方的关系") + private String relationshipWithChecked; + @Schema(description = "核查涉及的企业名称（中文）") + private String enterpriseNameCn; + @Schema(description = "核查涉及的企业名称（英文）") + private String enterpriseNameEn; + @Schema(description = "核查涉及的企业地址（中文）") + private String enterpriseAddressCn; + @Schema(description = "核查涉及的企业地址（英文）") + private String enterpriseAddressEn; + @Schema(description = "企业性质 1-国企 2-私企 3-外资或合资") + private String enterpriseNature; + @Schema(description = "提供产品或服务") + private String offerProduct; + @Schema(description = "提供产品或服务的年产量") + private String annualProduction; + @Schema(description = "产品原材料供应数据是否可提供 1-原料组成 2-产品中原料用量配比 3-原料供应商信息") + private String supplyDataAvailable; + @Schema(description = "公司网址") + private String companyUrl; + @Schema(description = "原材料运输数据是否齐全 1-是 0-否") + private String transportationDataComplete; + @Schema(description = "是否做过ISO 14064-1温室气体盘查 1-是 0-否") + private String isUseIso; + @Schema(description = "当前能源使用来源 1-电网供电 2-自备电厂 3-电力交易平台 4-网供蒸汽 5-集中供热 6-自用锅炉 7-其他") + private String currentEnergySource; + @Schema(description = "当前能源使用来源其他信息填写") + private String currentEnergyOther; + @Schema(description = "工厂名称（中文）") + private String factoryNameCn; + @Schema(description = "工厂名称（英文）") + private String factoryNameEn; + @Schema(description = "工厂地址（中文）") + private String factoryAddressCn; + @Schema(description = "工厂地址（英文）") + private String factoryAddressEn; + @Schema(description = "是否做过碳足迹盘查 1-是 0-否") + private String isCarbonCheck; + @Schema(description = "申请碳足迹核查所覆盖的阶段 0-从摇篮到大门 1-从摇篮到坟墓") + private String checkType; + @Schema(description = "委托方期望达到的核查保证等级 0-合理保证等级 1-有限保证等级") + private String expectedCheckLevel; + @Schema(description = "核查过程所使用的语言") + private String language; + @Schema(description = "接受核查的产品名称(中文)") + private String productNameCn; + @Schema(description = "接受核查的产品名称（英文）") + private String productNameEn; + @Schema(description = "接受核查的产品型号(中文)") + private String productModelCn; + @Schema(description = "接受核查的产品型号（英文）") + private String productModelEn; + @Schema(description = "产品碳足迹数据开始时间") + private String startDate; + @Schema(description = "产品碳足迹数据结束时间") + private String endDate; + @Schema(description = "希望文件评审的日期") + private String fileReviewDate; + @Schema(description = "希望提交核查陈述的日期") + private String statementSubmissionDate; + @Schema(description = "希望实施现场核查的日期") + private String onSiteCheckDate; + @Schema(description = "希望发布最终证书的日期") + private String certificateReleaseDate; + @Schema(description = "其他要求") + private String otherRequirements; + @Schema(description = "是否已经编制过GHG清单 1-是 0-否") + private String ghgInventoryPrepared; + @Schema(description = "GHG清单所覆盖的时间段") + private String ghgInventoryCoveredPeriod; + @Schema(description = "需要特殊关注的事项") + private String specialAttention; + @Schema(description = "工艺流程简述") + private String processDescription; + @Schema(description = "产品信息") + private String productInfo; + @Schema(description = "公司简介") + private String companyInfo; + @Schema(description = "盘查期间场内平均人数") + private String avgPersonNum; + @Schema(description = "盘查期间场内平均工时") + private String avgWorkTim; + @Schema(description = "计量单位") + private String measureUnit; + @Schema(description = "待核查产品的总产量") + private String waitProductionCapacity; + @Schema(description = "总量单位") + private String waitProductionUnit; + @Schema(description = "单件重量") + private String pieceWeight; + @Schema(description = "单件重量单位") + private String pieceWeightUnit; + @Schema(description = "生产的所有产品的总产量") + private String fullProductionCapacity; + @Schema(description = "生产的所有产品的总产量单位") + private String fullProductionUnit; + @Schema(description = "审核主管") + private String checkExecutive; + @Schema(description = "电话") + private String phone; + @Schema(description = "email") + private String email; + @Schema(description = "主键id") + private Long id; + @Schema(description = "租户编码") + private Long tenantCode; + @Schema(description = "企业id") + private Long companyId; + @Schema(description = "创建人") + private Long creator; + @Schema(description = "创建时间") + private Long createDate; + @Schema(description = "更新人") + private Long updater; + @Schema(description = "更新时间") + private Long updateDate; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java new file mode 100644 index 0000000..6fb8592 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java @@ -0,0 +1,309 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity; + +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 申请表基础数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_report") +public class CqcCarbonReportEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 受理机构 + */ + private String deptId; + /** + * 申请唯一编码(自行设定规则，与文件传输接口对应) + */ + private String applyNo; + /** + * 委托方名称（中文） + */ + private String clientNameCn; + /** + * 委托方名称（英文） + */ + private String clientNameEn; + /** + * 委托方地址（中文） + */ + private String clientAddressCn; + /** + * 委托方地址（英文） + */ + private String clientAddressEn; + /** + * 委托方邮编 + */ + private String clientPostcode; + /** + * 委托方联系人姓名 + */ + private String clientContactName; + /** + * 委托方部门 + */ + private String clientDepartment; + /** + * 委托方职务 + */ + private String clientPosition; + /** + * 委托方电话 + */ + private String clientPhone; + /** + * 委托方传真 + */ + private String clientFax; + /** + * 委托方E-MAIL + */ + private String clientEmail; + /** + * 与受核查方的关系 + */ + private String relationshipWithChecked; + /** + * 核查涉及的企业名称（中文） + */ + private String enterpriseNameCn; + /** + * 核查涉及的企业名称（英文） + */ + private String enterpriseNameEn; + /** + * 核查涉及的企业地址（中文） + */ + private String enterpriseAddressCn; + /** + * 核查涉及的企业地址（英文） + */ + private String enterpriseAddressEn; + /** + * 企业性质 1-国企 2-私企 3-外资或合资 + */ + private String enterpriseNature; + /** + * 提供产品或服务 + */ + private String offerProduct; + /** + * 提供产品或服务的年产量 + */ + private String annualProduction; + /** + * 产品原材料供应数据是否可提供 1-原料组成 2-产品中原料用量配比 3-原料供应商信息 + */ + private String supplyDataAvailable; + /** + * 公司网址 + */ + private String companyUrl; + /** + * 原材料运输数据是否齐全 1-是 0-否 + */ + private String transportationDataComplete; + /** + * 是否做过ISO 14064-1温室气体盘查 1-是 0-否 + */ + private String isUseIso; + /** + * 当前能源使用来源 1-电网供电 2-自备电厂 3-电力交易平台 4-网供蒸汽 5-集中供热 6-自用锅炉 7-其他 + */ + private String currentEnergySource; + /** + * 当前能源使用来源其他信息填写 + */ + private String currentEnergyOther; + /** + * 工厂名称（中文） + */ + private String factoryNameCn; + /** + * 工厂名称（英文） + */ + private String factoryNameEn; + /** + * 工厂地址（中文） + */ + private String factoryAddressCn; + /** + * 工厂地址（英文） + */ + private String factoryAddressEn; + /** + * 是否做过碳足迹盘查 1-是 0-否 + */ + private String isCarbonCheck; + /** + * 申请碳足迹核查所覆盖的阶段 0-从摇篮到大门 1-从摇篮到坟墓 + */ + private String checkType; + /** + * 委托方期望达到的核查保证等级 0-合理保证等级 1-有限保证等级 + */ + private String expectedCheckLevel; + /** + * 核查过程所使用的语言 + */ + private String language; + /** + * 接受核查的产品名称(中文) + */ + private String productNameCn; + /** + * 接受核查的产品名称（英文） + */ + private String productNameEn; + /** + * 接受核查的产品型号(中文) + */ + private String productModelCn; + /** + * 接受核查的产品型号（英文） + */ + private String productModelEn; + /** + * 产品碳足迹数据开始时间 + */ + private String startDate; + /** + * 产品碳足迹数据结束时间 + */ + private String endDate; + /** + * 希望文件评审的日期 + */ + private String fileReviewDate; + /** + * 希望提交核查陈述的日期 + */ + private String statementSubmissionDate; + /** + * 希望实施现场核查的日期 + */ + private String onSiteCheckDate; + /** + * 希望发布最终证书的日期 + */ + private String certificateReleaseDate; + /** + * 其他要求 + */ + private String otherRequirements; + /** + * 是否已经编制过GHG清单 1-是 0-否 + */ + private String ghgInventoryPrepared; + /** + * GHG清单所覆盖的时间段 + */ + private String ghgInventoryCoveredPeriod; + /** + * 需要特殊关注的事项 + */ + private String specialAttention; + /** + * 工艺流程简述 + */ + private String processDescription; + /** + * 产品信息 + */ + private String productInfo; + /** + * 公司简介 + */ + private String companyInfo; + /** + * 盘查期间场内平均人数 + */ + private String avgPersonNum; + /** + * 盘查期间场内平均工时 + */ + private String avgWorkTim; + /** + * 计量单位 + */ + private String measureUnit; + /** + * 待核查产品的总产量 + */ + private String waitProductionCapacity; + /** + * 总量单位 + */ + private String waitProductionUnit; + /** + * 单件重量 + */ + private String pieceWeight; + /** + * 单件重量单位 + */ + private String pieceWeightUnit; + /** + * 生产的所有产品的总产量 + */ + private String fullProductionCapacity; + /** + * 生产的所有产品的总产量单位 + */ + private String fullProductionUnit; + /** + * 审核主管 + */ + private String checkExecutive; + /** + * 电话 + */ + private String phone; + /** + * email + */ + private String email; + /** + * 主键id + */ + private Long id; + /** + * 租户编码 + */ + private Long tenantCode; + /** + * 企业id + */ + private Long companyId; + /** + * 创建人 + */ + private Long creator; + /** + * 创建时间 + */ + private Long createDate; + /** + * 更新人 + */ + private Long updater; + /** + * 更新时间 + */ + private Long updateDate; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java new file mode 100644 index 0000000..bb2a2b0 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 申请表基础数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonReportMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java new file mode 100644 index 0000000..bcf4be3 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; + +/** + * 申请表基础数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonReportService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java new file mode 100644 index 0000000..2d5a294 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper; +import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 申请表基础数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonReportServiceImpl extends BaseServiceImpl implements CqcCarbonReportService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java new file mode 100644 index 0000000..922d3cb --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonRaw.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 原物料阶段数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonRawMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java new file mode 100644 index 0000000..196a81d --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonRaw.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; + +/** + * 原物料阶段数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonRawService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java new file mode 100644 index 0000000..a1e0440 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonRaw.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper; +import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 原物料阶段数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonRawServiceImpl extends BaseServiceImpl implements CqcCarbonRawService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java new file mode 100644 index 0000000..3c15f43 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java @@ -0,0 +1,98 @@ +package com.thing.cqc.CqcCarbonReport.controller; + +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.validator.ValidatorUtils; +import com.thing.common.core.validator.group.AddGroup; +import com.thing.common.core.validator.group.DefaultGroup; +import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +import com.thing.cqc.CqcCarbonReport.dto.CqcCarbonReportDTO; +import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** +* 申请表基础数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@RestController +@RequestMapping("v2/cqccarbonreport") +@Tag(name="申请表基础数据") +@RequiredArgsConstructor +public class CqcCarbonReportController { + + private final CqcCarbonReportService cqcCarbonReportService; + + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonReportService.getPageData(params, CqcCarbonReportDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CqcCarbonReportDTO data = cqcCarbonReportService.getByIdAs(id, CqcCarbonReportDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CqcCarbonReportDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cqcCarbonReportService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CqcCarbonReportDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cqcCarbonReportService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cqcCarbonReportService.batchDelete(ids); + return new Result<>(); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cqcCarbonReportService.listAs(params, CqcCarbonReportDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "申请表基础数据", list, CqcCarbonReportExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java new file mode 100644 index 0000000..1ff9733 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java @@ -0,0 +1,165 @@ +package com.thing.cqc.CqcCarbonReport.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 申请表基础数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Data +@Schema(description = "申请表基础数据") +public class CqcCarbonReportDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "受理机构") + private String deptId; + @Schema(description = "申请唯一编码(自行设定规则，与文件传输接口对应)") + private String applyNo; + @Schema(description = "委托方名称（中文）") + private String clientNameCn; + @Schema(description = "委托方名称（英文）") + private String clientNameEn; + @Schema(description = "委托方地址（中文）") + private String clientAddressCn; + @Schema(description = "委托方地址（英文）") + private String clientAddressEn; + @Schema(description = "委托方邮编") + private String clientPostcode; + @Schema(description = "委托方联系人姓名") + private String clientContactName; + @Schema(description = "委托方部门") + private String clientDepartment; + @Schema(description = "委托方职务") + private String clientPosition; + @Schema(description = "委托方电话") + private String clientPhone; + @Schema(description = "委托方传真") + private String clientFax; + @Schema(description = "委托方E-MAIL") + private String clientEmail; + @Schema(description = "与受核查方的关系") + private String relationshipWithChecked; + @Schema(description = "核查涉及的企业名称（中文）") + private String enterpriseNameCn; + @Schema(description = "核查涉及的企业名称（英文）") + private String enterpriseNameEn; + @Schema(description = "核查涉及的企业地址（中文）") + private String enterpriseAddressCn; + @Schema(description = "核查涉及的企业地址（英文）") + private String enterpriseAddressEn; + @Schema(description = "企业性质 1-国企 2-私企 3-外资或合资") + private String enterpriseNature; + @Schema(description = "提供产品或服务") + private String offerProduct; + @Schema(description = "提供产品或服务的年产量") + private String annualProduction; + @Schema(description = "产品原材料供应数据是否可提供 1-原料组成 2-产品中原料用量配比 3-原料供应商信息") + private String supplyDataAvailable; + @Schema(description = "公司网址") + private String companyUrl; + @Schema(description = "原材料运输数据是否齐全 1-是 0-否") + private String transportationDataComplete; + @Schema(description = "是否做过ISO 14064-1温室气体盘查 1-是 0-否") + private String isUseIso; + @Schema(description = "当前能源使用来源 1-电网供电 2-自备电厂 3-电力交易平台 4-网供蒸汽 5-集中供热 6-自用锅炉 7-其他") + private String currentEnergySource; + @Schema(description = "当前能源使用来源其他信息填写") + private String currentEnergyOther; + @Schema(description = "工厂名称（中文）") + private String factoryNameCn; + @Schema(description = "工厂名称（英文）") + private String factoryNameEn; + @Schema(description = "工厂地址（中文）") + private String factoryAddressCn; + @Schema(description = "工厂地址（英文）") + private String factoryAddressEn; + @Schema(description = "是否做过碳足迹盘查 1-是 0-否") + private String isCarbonCheck; + @Schema(description = "申请碳足迹核查所覆盖的阶段 0-从摇篮到大门 1-从摇篮到坟墓") + private String checkType; + @Schema(description = "委托方期望达到的核查保证等级 0-合理保证等级 1-有限保证等级") + private String expectedCheckLevel; + @Schema(description = "核查过程所使用的语言") + private String language; + @Schema(description = "接受核查的产品名称(中文)") + private String productNameCn; + @Schema(description = "接受核查的产品名称（英文）") + private String productNameEn; + @Schema(description = "接受核查的产品型号(中文)") + private String productModelCn; + @Schema(description = "接受核查的产品型号（英文）") + private String productModelEn; + @Schema(description = "产品碳足迹数据开始时间") + private String startDate; + @Schema(description = "产品碳足迹数据结束时间") + private String endDate; + @Schema(description = "希望文件评审的日期") + private String fileReviewDate; + @Schema(description = "希望提交核查陈述的日期") + private String statementSubmissionDate; + @Schema(description = "希望实施现场核查的日期") + private String onSiteCheckDate; + @Schema(description = "希望发布最终证书的日期") + private String certificateReleaseDate; + @Schema(description = "其他要求") + private String otherRequirements; + @Schema(description = "是否已经编制过GHG清单 1-是 0-否") + private String ghgInventoryPrepared; + @Schema(description = "GHG清单所覆盖的时间段") + private String ghgInventoryCoveredPeriod; + @Schema(description = "需要特殊关注的事项") + private String specialAttention; + @Schema(description = "工艺流程简述") + private String processDescription; + @Schema(description = "产品信息") + private String productInfo; + @Schema(description = "公司简介") + private String companyInfo; + @Schema(description = "盘查期间场内平均人数") + private String avgPersonNum; + @Schema(description = "盘查期间场内平均工时") + private String avgWorkTim; + @Schema(description = "计量单位") + private String measureUnit; + @Schema(description = "待核查产品的总产量") + private String waitProductionCapacity; + @Schema(description = "总量单位") + private String waitProductionUnit; + @Schema(description = "单件重量") + private String pieceWeight; + @Schema(description = "单件重量单位") + private String pieceWeightUnit; + @Schema(description = "生产的所有产品的总产量") + private String fullProductionCapacity; + @Schema(description = "生产的所有产品的总产量单位") + private String fullProductionUnit; + @Schema(description = "审核主管") + private String checkExecutive; + @Schema(description = "电话") + private String phone; + @Schema(description = "email") + private String email; + @Schema(description = "主键id") + private Long id; + @Schema(description = "租户编码") + private Long tenantCode; + @Schema(description = "企业id") + private Long companyId; + @Schema(description = "创建人") + private Long creator; + @Schema(description = "创建时间") + private Long createDate; + @Schema(description = "更新人") + private Long updater; + @Schema(description = "更新时间") + private Long updateDate; + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java new file mode 100644 index 0000000..d79e656 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java @@ -0,0 +1,310 @@ +package com.thing.cqc.CqcCarbonReport.entity; + +import com.mybatisflex.annotation.Table; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 申请表基础数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cqc_carbon_report") +public class CqcCarbonReportEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 受理机构 + */ + private String deptId; + /** + * 申请唯一编码(自行设定规则，与文件传输接口对应) + */ + private String applyNo; + /** + * 委托方名称（中文） + */ + private String clientNameCn; + /** + * 委托方名称（英文） + */ + private String clientNameEn; + /** + * 委托方地址（中文） + */ + private String clientAddressCn; + /** + * 委托方地址（英文） + */ + private String clientAddressEn; + /** + * 委托方邮编 + */ + private String clientPostcode; + /** + * 委托方联系人姓名 + */ + private String clientContactName; + /** + * 委托方部门 + */ + private String clientDepartment; + /** + * 委托方职务 + */ + private String clientPosition; + /** + * 委托方电话 + */ + private String clientPhone; + /** + * 委托方传真 + */ + private String clientFax; + /** + * 委托方E-MAIL + */ + private String clientEmail; + /** + * 与受核查方的关系 + */ + private String relationshipWithChecked; + /** + * 核查涉及的企业名称（中文） + */ + private String enterpriseNameCn; + /** + * 核查涉及的企业名称（英文） + */ + private String enterpriseNameEn; + /** + * 核查涉及的企业地址（中文） + */ + private String enterpriseAddressCn; + /** + * 核查涉及的企业地址（英文） + */ + private String enterpriseAddressEn; + /** + * 企业性质 1-国企 2-私企 3-外资或合资 + */ + private String enterpriseNature; + /** + * 提供产品或服务 + */ + private String offerProduct; + /** + * 提供产品或服务的年产量 + */ + private String annualProduction; + /** + * 产品原材料供应数据是否可提供 1-原料组成 2-产品中原料用量配比 3-原料供应商信息 + */ + private String supplyDataAvailable; + /** + * 公司网址 + */ + private String companyUrl; + /** + * 原材料运输数据是否齐全 1-是 0-否 + */ + private String transportationDataComplete; + /** + * 是否做过ISO 14064-1温室气体盘查 1-是 0-否 + */ + private String isUseIso; + /** + * 当前能源使用来源 1-电网供电 2-自备电厂 3-电力交易平台 4-网供蒸汽 5-集中供热 6-自用锅炉 7-其他 + */ + private String currentEnergySource; + /** + * 当前能源使用来源其他信息填写 + */ + private String currentEnergyOther; + /** + * 工厂名称（中文） + */ + private String factoryNameCn; + /** + * 工厂名称（英文） + */ + private String factoryNameEn; + /** + * 工厂地址（中文） + */ + private String factoryAddressCn; + /** + * 工厂地址（英文） + */ + private String factoryAddressEn; + /** + * 是否做过碳足迹盘查 1-是 0-否 + */ + private String isCarbonCheck; + /** + * 申请碳足迹核查所覆盖的阶段 0-从摇篮到大门 1-从摇篮到坟墓 + */ + private String checkType; + /** + * 委托方期望达到的核查保证等级 0-合理保证等级 1-有限保证等级 + */ + private String expectedCheckLevel; + /** + * 核查过程所使用的语言 + */ + private String language; + /** + * 接受核查的产品名称(中文) + */ + private String productNameCn; + /** + * 接受核查的产品名称（英文） + */ + private String productNameEn; + /** + * 接受核查的产品型号(中文) + */ + private String productModelCn; + /** + * 接受核查的产品型号（英文） + */ + private String productModelEn; + /** + * 产品碳足迹数据开始时间 + */ + private String startDate; + /** + * 产品碳足迹数据结束时间 + */ + private String endDate; + /** + * 希望文件评审的日期 + */ + private String fileReviewDate; + /** + * 希望提交核查陈述的日期 + */ + private String statementSubmissionDate; + /** + * 希望实施现场核查的日期 + */ + private String onSiteCheckDate; + /** + * 希望发布最终证书的日期 + */ + private String certificateReleaseDate; + /** + * 其他要求 + */ + private String otherRequirements; + /** + * 是否已经编制过GHG清单 1-是 0-否 + */ + private String ghgInventoryPrepared; + /** + * GHG清单所覆盖的时间段 + */ + private String ghgInventoryCoveredPeriod; + /** + * 需要特殊关注的事项 + */ + private String specialAttention; + /** + * 工艺流程简述 + */ + private String processDescription; + /** + * 产品信息 + */ + private String productInfo; + /** + * 公司简介 + */ + private String companyInfo; + /** + * 盘查期间场内平均人数 + */ + private String avgPersonNum; + /** + * 盘查期间场内平均工时 + */ + private String avgWorkTim; + /** + * 计量单位 + */ + private String measureUnit; + /** + * 待核查产品的总产量 + */ + private String waitProductionCapacity; + /** + * 总量单位 + */ + private String waitProductionUnit; + /** + * 单件重量 + */ + private String pieceWeight; + /** + * 单件重量单位 + */ + private String pieceWeightUnit; + /** + * 生产的所有产品的总产量 + */ + private String fullProductionCapacity; + /** + * 生产的所有产品的总产量单位 + */ + private String fullProductionUnit; + /** + * 审核主管 + */ + private String checkExecutive; + /** + * 电话 + */ + private String phone; + /** + * email + */ + private String email; + /** + * 主键id + */ + private Long id; + /** + * 租户编码 + */ + private Long tenantCode; + /** + * 企业id + */ + private Long companyId; + /** + * 创建人 + */ + private Long creator; + /** + * 创建时间 + */ + private Long createDate; + /** + * 更新人 + */ + private Long updater; + /** + * 更新时间 + */ + private Long updateDate; +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java new file mode 100644 index 0000000..4fe6c55 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java @@ -0,0 +1,16 @@ +package com.thing.cqc.CqcCarbonReport.mapper; + +import com.thing.common.orm.mapper.PowerBaseMapper; +import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; +import org.apache.ibatis.annotations.Mapper; + +/** +* 申请表基础数据 +* +* @author xc +* @since 3.0 2024-08-08 +*/ +@Mapper +public interface CqcCarbonReportMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java new file mode 100644 index 0000000..157d1b2 --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java @@ -0,0 +1,14 @@ +package com.thing.cqc.CqcCarbonReport.service; + +import com.thing.common.orm.service.IBaseService; +import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; + +/** + * 申请表基础数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +public interface CqcCarbonReportService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java new file mode 100644 index 0000000..3a357ad --- /dev/null +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cqc.CqcCarbonReport.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper; +import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; +import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 申请表基础数据 + * + * @author xc + * @since 3.0 2024-08-08 + */ +@Service +public class CqcCarbonReportServiceImpl extends BaseServiceImpl implements CqcCarbonReportService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml new file mode 100644 index 0000000..bb08a24 --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonConsumables/CqcCarbonConsumablesMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml new file mode 100644 index 0000000..bdb6f7e --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDiscard/CqcCarbonDiscardMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml new file mode 100644 index 0000000..4a9a35d --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonDistribution/CqcCarbonDistributionMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml new file mode 100644 index 0000000..1c253cc --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonEnergy/CqcCarbonEnergyMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml new file mode 100644 index 0000000..20d88c9 --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonMake/CqcCarbonMakeMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml new file mode 100644 index 0000000..39c14ff --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonRaw/CqcCarbonRawMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml new file mode 100644 index 0000000..7302bcf --- /dev/null +++ b/modules/cqc-service/src/main/resources/mapper/CqcCarbonReport/CqcCarbonReportMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/pom.xml b/modules/pom.xml index 6b5f88b..a2638c2 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -27,6 +27,7 @@ equipment carbon-track carbon-public + cqc-service modules diff --git a/pom.xml b/pom.xml index e660df1..ae0aa28 100644 --- a/pom.xml +++ b/pom.xml @@ -621,7 +621,11 @@ carbon-public ${project.version} - + + com.thing.modules + cqc-service + ${project.version} + com.thing.tools From 0c57647fb56a4c5f83363ebcb4abddb169b97661 Mon Sep 17 00:00:00 2001 From: xiachao Date: Thu, 8 Aug 2024 18:21:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?cqc=E6=8A=A5=E8=A1=A8=E5=A1=AB=E6=8A=A5?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/cqc-service/pom.xml | 4 +- .../CqcCarbonConsumablesController.java | 2 +- .../entity/CqcCarbonConsumablesEntity.java | 2 + .../CqcCarbonDiscardController.java | 2 +- .../entity/CqcCarbonDiscardEntity.java | 1 + .../CqcCarbonDistributionController.java | 2 +- .../entity/CqcCarbonDistributionEntity.java | 1 + .../controller/CqcCarbonEnergyController.java | 2 +- .../entity/CqcCarbonEnergyEntity.java | 1 + .../controller/CqcCarbonMakeController.java | 2 +- .../entity/CqcCarbonMakeEntity.java | 1 + .../controller/CqcCarbonRawController.java | 3 +- .../entity/CqcCarbonRawEntity.java | 1 + .../CqcCarbonConsumablesController.java | 96 ------ .../dto/CqcCarbonConsumablesDTO.java | 70 ---- .../entity/CqcCarbonConsumablesEntity.java | 121 ------- .../mapper/CqcCarbonConsumablesMapper.java | 16 - .../service/CqcCarbonConsumablesService.java | 14 - .../impl/CqcCarbonConsumablesServiceImpl.java | 28 -- .../CqcCarbonDiscardController.java | 96 ------ .../dto/CqcCarbonDiscardDTO.java | 70 ---- .../entity/CqcCarbonDiscardEntity.java | 122 ------- .../mapper/CqcCarbonDiscardMapper.java | 16 - .../service/CqcCarbonDiscardService.java | 14 - .../impl/CqcCarbonDiscardServiceImpl.java | 28 -- .../CqcCarbonDistributionController.java | 96 ------ .../dto/CqcCarbonDistributionDTO.java | 58 ---- .../entity/CqcCarbonDistributionEntity.java | 98 ------ .../mapper/CqcCarbonDistributionMapper.java | 16 - .../service/CqcCarbonDistributionService.java | 14 - .../CqcCarbonDistributionServiceImpl.java | 28 -- .../controller/CqcCarbonEnergyController.java | 96 ------ .../dto/CqcCarbonEnergyDTO.java | 54 --- .../entity/CqcCarbonEnergyEntity.java | 90 ----- .../mapper/CqcCarbonEnergyMapper.java | 16 - .../service/CqcCarbonEnergyService.java | 14 - .../impl/CqcCarbonEnergyServiceImpl.java | 28 -- .../controller/CqcCarbonMakeController.java | 96 ------ .../CqcCarbonMake/dto/CqcCarbonMakeDTO.java | 52 --- .../entity/CqcCarbonMakeEntity.java | 86 ----- .../mapper/CqcCarbonMakeMapper.java | 16 - .../service/CqcCarbonMakeService.java | 14 - .../impl/CqcCarbonMakeServiceImpl.java | 28 -- .../controller/CqcCarbonRawController.java | 96 ------ .../cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java | 70 ---- .../entity/CqcCarbonRawEntity.java | 122 ------- .../mapper/CqcCarbonRawMapper.java | 16 - .../service/CqcCarbonRawService.java | 14 - .../service/impl/CqcCarbonRawServiceImpl.java | 28 -- .../controller/CqcCarbonReportController.java | 96 ------ .../dto/CqcCarbonReportDTO.java | 164 ---------- .../entity/CqcCarbonReportEntity.java | 309 ------------------ .../mapper/CqcCarbonReportMapper.java | 16 - .../service/CqcCarbonReportService.java | 14 - .../impl/CqcCarbonReportServiceImpl.java | 28 -- .../controller/CqcCarbonReportController.java | 12 +- .../dto/CqcCarbonReportDTO.java | 4 + .../entity/CqcCarbonReportEntity.java | 8 + .../impl/CqcCarbonReportServiceImpl.java | 5 + 59 files changed, 39 insertions(+), 2578 deletions(-) delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java delete mode 100644 modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java diff --git a/modules/cqc-service/pom.xml b/modules/cqc-service/pom.xml index 2b95eb2..faa316e 100644 --- a/modules/cqc-service/pom.xml +++ b/modules/cqc-service/pom.xml @@ -24,8 +24,8 @@ - com.thing.common - orm + com.thing.modules + thing diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java index 5dc7a84..7780f42 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java @@ -29,7 +29,7 @@ import java.util.Map; */ @RestController @RequestMapping("v2/cqccarbonconsumables") -@Tag(name="使用阶段耗材信息") +@Tag(name="碳足迹认证核查-使用阶段耗材") @RequiredArgsConstructor public class CqcCarbonConsumablesController { diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java index 460db88..8f3d81e 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java @@ -1,5 +1,6 @@ package com.thing.cqc.CqcCarbonConsumables.entity; +import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import lombok.Data; @@ -26,6 +27,7 @@ public class CqcCarbonConsumablesEntity implements Serializable { /** * 唯一标识符 */ + @Id private Long id; /** * 申请编号 diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java index 99f76c7..52af7b0 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java @@ -29,7 +29,7 @@ import java.util.Map; */ @RestController @RequestMapping("v2/cqccarbondiscard") -@Tag(name="废物处置及再利用信息") +@Tag(name="碳足迹认证核查-废物处置阶段") @RequiredArgsConstructor public class CqcCarbonDiscardController { diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java index 254243d..82e0dc9 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java @@ -1,5 +1,6 @@ package com.thing.cqc.CqcCarbonDiscard.entity; +import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import lombok.Data; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java index 643590e..08d1566 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java @@ -29,7 +29,7 @@ import java.util.Map; */ @RestController @RequestMapping("v2/cqccarbondistribution") -@Tag(name="产品分销信息") +@Tag(name="碳足迹认证核查-分销阶段") @RequiredArgsConstructor public class CqcCarbonDistributionController { diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java index ceece46..6441b5f 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java @@ -1,5 +1,6 @@ package com.thing.cqc.CqcCarbonDistribution.entity; +import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import lombok.Data; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java index 6f53023..69d7743 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java @@ -29,7 +29,7 @@ import java.util.Map; */ @RestController @RequestMapping("v2/cqccarbonenergy") -@Tag(name=" 使用阶段能源信息") +@Tag(name=" 碳足迹认证核查-使用阶段") @RequiredArgsConstructor public class CqcCarbonEnergyController { diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java index d1a9079..c9d8339 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java @@ -1,5 +1,6 @@ package com.thing.cqc.CqcCarbonEnergy.entity; +import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import lombok.Data; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java index 62f0ee6..82f7b82 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java @@ -29,7 +29,7 @@ import java.util.Map; */ @RestController @RequestMapping("v2/cqccarbonmake") -@Tag(name="制造阶段能源消耗信息") +@Tag(name="碳足迹认证核查-制造阶段") @RequiredArgsConstructor public class CqcCarbonMakeController { diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java index 48beaea..33758da 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java @@ -1,5 +1,6 @@ package com.thing.cqc.CqcCarbonMake.entity; +import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import lombok.Data; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java index a9be11a..7f3808f 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java @@ -11,7 +11,6 @@ import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService; - import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -29,7 +28,7 @@ import java.util.Map; */ @RestController @RequestMapping("v2/cqccarbonraw") -@Tag(name="原物料阶段数据") +@Tag(name="碳足迹认证喝茶-原物料阶段") @RequiredArgsConstructor public class CqcCarbonRawController { diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java index 0c74558..f5f79e5 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java @@ -1,5 +1,6 @@ package com.thing.cqc.CqcCarbonRaw.entity; +import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; import lombok.Data; diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java deleted file mode 100644 index 7b63ae2..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/controller/CqcCarbonConsumablesController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.controller; - -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.dto.CqcCarbonConsumablesDTO; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; - -import java.util.Map; - -/** -* 使用阶段耗材信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@RestController -@RequestMapping("v2/CqcCarbonConsumables/cqccarbonconsumables") -@Tag(name="使用阶段耗材信息") -@RequiredArgsConstructor -public class CqcCarbonConsumablesController { - - private final CqcCarbonConsumablesService cqcCarbonConsumablesService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CqcCarbonConsumablesDTO data = cqcCarbonConsumablesService.getByIdAs(id, CqcCarbonConsumablesDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CqcCarbonConsumablesDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cqcCarbonConsumablesService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CqcCarbonConsumablesDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cqcCarbonConsumablesService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cqcCarbonConsumablesService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cqcCarbonConsumablesService.listAs(params, CqcCarbonConsumablesDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "使用阶段耗材信息", list, CqcCarbonConsumablesExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java deleted file mode 100644 index ec6f06c..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/dto/CqcCarbonConsumablesDTO.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 使用阶段耗材信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Data -@Schema(description = "使用阶段耗材信息") -public class CqcCarbonConsumablesDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "唯一标识符") - private Long id; - @Schema(description = "申请编号") - private String applyNo; - @Schema(description = "类别") - private String cateid; - @Schema(description = "中文名称") - private String materialsnamecn; - @Schema(description = "化学名称") - private String materialsnameen; - @Schema(description = "用途") - private String materialsuse; - @Schema(description = "材料组份") - private String materialcomponent; - @Schema(description = "产品使用耗材总投入量") - private String productcapacity; - @Schema(description = "单位") - private String productcapacityunit; - @Schema(description = "功能单位耗用量") - private String rawmaterialsinput; - @Schema(description = "单位") - private String rawmaterialsunit; - @Schema(description = "供货商名称") - private String suppliername; - @Schema(description = "供货商地址") - private String supplieraddress; - @Schema(description = "运输方式") - private String transmode; - @Schema(description = "运输工具载重量") - private String transloadcapacity; - @Schema(description = "运输距离") - private String transdistance; - @Schema(description = "单位") - private String transdistanceunit; - @Schema(description = "运输数据来源") - private String transdatasource; - @Schema(description = "活动数据来源") - private String activitydatasource; - @Schema(description = "部门") - private String dept; - @Schema(description = "人员") - private String person; - @Schema(description = "电话") - private String phone; - @Schema(description = "备注") - private String remake; - @Schema(description = "能源编号") - private String energyno; - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java deleted file mode 100644 index 0ac60e2..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/entity/CqcCarbonConsumablesEntity.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity; - -import com.mybatisflex.annotation.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 使用阶段耗材信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cqc_carbon_consumables") -public class CqcCarbonConsumablesEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 唯一标识符 - */ - private Long id; - /** - * 申请编号 - */ - private String applyNo; - /** - * 类别 - */ - private String cateid; - /** - * 中文名称 - */ - private String materialsnamecn; - /** - * 化学名称 - */ - private String materialsnameen; - /** - * 用途 - */ - private String materialsuse; - /** - * 材料组份 - */ - private String materialcomponent; - /** - * 产品使用耗材总投入量 - */ - private String productcapacity; - /** - * 单位 - */ - private String productcapacityunit; - /** - * 功能单位耗用量 - */ - private String rawmaterialsinput; - /** - * 单位 - */ - private String rawmaterialsunit; - /** - * 供货商名称 - */ - private String suppliername; - /** - * 供货商地址 - */ - private String supplieraddress; - /** - * 运输方式 - */ - private String transmode; - /** - * 运输工具载重量 - */ - private String transloadcapacity; - /** - * 运输距离 - */ - private String transdistance; - /** - * 单位 - */ - private String transdistanceunit; - /** - * 运输数据来源 - */ - private String transdatasource; - /** - * 活动数据来源 - */ - private String activitydatasource; - /** - * 部门 - */ - private String dept; - /** - * 人员 - */ - private String person; - /** - * 电话 - */ - private String phone; - /** - * 备注 - */ - private String remake; - /** - * 能源编号 - */ - private String energyno; -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java deleted file mode 100644 index 522cab1..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/mapper/CqcCarbonConsumablesMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.mapper; - -import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; -import org.apache.ibatis.annotations.Mapper; - -/** -* 使用阶段耗材信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Mapper -public interface CqcCarbonConsumablesMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java deleted file mode 100644 index bd2ae70..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/CqcCarbonConsumablesService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service; - -import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; - -/** - * 使用阶段耗材信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -public interface CqcCarbonConsumablesService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java deleted file mode 100644 index fb3f23f..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 使用阶段耗材信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Service -public class CqcCarbonConsumablesServiceImpl extends BaseServiceImpl implements CqcCarbonConsumablesService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java deleted file mode 100644 index 7c34cdb..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/controller/CqcCarbonDiscardController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.controller; - -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.dto.CqcCarbonDiscardDTO; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; - -import java.util.Map; - -/** -* 废物处置及再利用信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@RestController -@RequestMapping("v2/CqcCarbonDiscard/cqccarbondiscard") -@Tag(name="废物处置及再利用信息") -@RequiredArgsConstructor -public class CqcCarbonDiscardController { - - private final CqcCarbonDiscardService cqcCarbonDiscardService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cqcCarbonDiscardService.getPageData(params, CqcCarbonDiscardDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CqcCarbonDiscardDTO data = cqcCarbonDiscardService.getByIdAs(id, CqcCarbonDiscardDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CqcCarbonDiscardDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cqcCarbonDiscardService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CqcCarbonDiscardDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cqcCarbonDiscardService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cqcCarbonDiscardService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cqcCarbonDiscardService.listAs(params, CqcCarbonDiscardDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "废物处置及再利用信息", list, CqcCarbonDiscardExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java deleted file mode 100644 index e388282..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/dto/CqcCarbonDiscardDTO.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 废物处置及再利用信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Data -@Schema(description = "废物处置及再利用信息") -public class CqcCarbonDiscardDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "唯一标识符") - private Long id; - @Schema(description = "申请编号") - private String applyNo; - @Schema(description = "类别") - private String cateid; - @Schema(description = "中文名称") - private String materialsnamecn; - @Schema(description = "化学名称") - private String materialsnameen; - @Schema(description = "材料组份") - private String materialcomponent; - @Schema(description = "废物处置材料总重量") - private String wastedisposal; - @Schema(description = "单位") - private String wastedisposalunit; - @Schema(description = "功能单位处置量") - private String rawmaterialsinput; - @Schema(description = "单位") - private String rawmaterialsunit; - @Schema(description = "处理方式") - private String disposeway; - @Schema(description = "处理商名称") - private String disposename; - @Schema(description = "处理商地址") - private String disposeaddress; - @Schema(description = "运输方式") - private String transmode; - @Schema(description = "运输工具载重量") - private String transloadcapacity; - @Schema(description = "运输距离") - private String transdistance; - @Schema(description = "单位") - private String transdistanceunit; - @Schema(description = "运输数据来源") - private String transdatasource; - @Schema(description = "活动数据来源") - private String activitydatasource; - @Schema(description = "部门") - private String dept; - @Schema(description = "人员") - private String person; - @Schema(description = "电话") - private String phone; - @Schema(description = "备注") - private String remake; - @Schema(description = "编号") - private String wasteno; - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java deleted file mode 100644 index dcb2cd6..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/entity/CqcCarbonDiscardEntity.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity; - -import com.mybatisflex.annotation.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 废物处置及再利用信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cqc_carbon_discard") -public class CqcCarbonDiscardEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 唯一标识符 - */ - @Id - private Long id; - /** - * 申请编号 - */ - private String applyNo; - /** - * 类别 - */ - private String cateid; - /** - * 中文名称 - */ - private String materialsnamecn; - /** - * 化学名称 - */ - private String materialsnameen; - /** - * 材料组份 - */ - private String materialcomponent; - /** - * 废物处置材料总重量 - */ - private String wastedisposal; - /** - * 单位 - */ - private String wastedisposalunit; - /** - * 功能单位处置量 - */ - private String rawmaterialsinput; - /** - * 单位 - */ - private String rawmaterialsunit; - /** - * 处理方式 - */ - private String disposeway; - /** - * 处理商名称 - */ - private String disposename; - /** - * 处理商地址 - */ - private String disposeaddress; - /** - * 运输方式 - */ - private String transmode; - /** - * 运输工具载重量 - */ - private String transloadcapacity; - /** - * 运输距离 - */ - private String transdistance; - /** - * 单位 - */ - private String transdistanceunit; - /** - * 运输数据来源 - */ - private String transdatasource; - /** - * 活动数据来源 - */ - private String activitydatasource; - /** - * 部门 - */ - private String dept; - /** - * 人员 - */ - private String person; - /** - * 电话 - */ - private String phone; - /** - * 备注 - */ - private String remake; - /** - * 编号 - */ - private String wasteno; -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java deleted file mode 100644 index f8467eb..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/mapper/CqcCarbonDiscardMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.mapper; - -import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; -import org.apache.ibatis.annotations.Mapper; - -/** -* 废物处置及再利用信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Mapper -public interface CqcCarbonDiscardMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java deleted file mode 100644 index c914de7..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/CqcCarbonDiscardService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service; - -import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; - -/** - * 废物处置及再利用信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -public interface CqcCarbonDiscardService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java deleted file mode 100644 index 844250e..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.entity.CqcCarbonDiscardEntity; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.mapper.CqcCarbonDiscardMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDiscard.service.CqcCarbonDiscardService; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 废物处置及再利用信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Service -public class CqcCarbonDiscardServiceImpl extends BaseServiceImpl implements CqcCarbonDiscardService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java deleted file mode 100644 index d559da2..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/controller/CqcCarbonDistributionController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.controller; - -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.dto.CqcCarbonDistributionDTO; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; - -import java.util.Map; - -/** -* 产品分销信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@RestController -@RequestMapping("v2/CqcCarbonDistribution/cqccarbondistribution") -@Tag(name="产品分销信息") -@RequiredArgsConstructor -public class CqcCarbonDistributionController { - - private final CqcCarbonDistributionService cqcCarbonDistributionService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CqcCarbonDistributionDTO data = cqcCarbonDistributionService.getByIdAs(id, CqcCarbonDistributionDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CqcCarbonDistributionDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cqcCarbonDistributionService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CqcCarbonDistributionDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cqcCarbonDistributionService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cqcCarbonDistributionService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cqcCarbonDistributionService.listAs(params, CqcCarbonDistributionDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "产品分销信息", list, CqcCarbonDistributionExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java deleted file mode 100644 index dfdcba0..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/dto/CqcCarbonDistributionDTO.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 产品分销信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Data -@Schema(description = "产品分销信息") -public class CqcCarbonDistributionDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "唯一标识符") - private Long id; - @Schema(description = "申请编号") - private String applyNo; - @Schema(description = "中文名称") - private String materialsnamecn; - @Schema(description = "产品出货重量") - private String productweight; - @Schema(description = "单位") - private String productweightunit; - @Schema(description = "分销对象") - private String distributionobject; - @Schema(description = "分销地址") - private String distributionaddress; - @Schema(description = "运输方式") - private String transmode; - @Schema(description = "运输工具载重量") - private String transloadcapacity; - @Schema(description = "运输距离") - private String transdistance; - @Schema(description = "单位") - private String transdistanceunit; - @Schema(description = "运输数据来源") - private String transdatasource; - @Schema(description = "活动数据来源") - private String activitydatasource; - @Schema(description = "部门") - private String dept; - @Schema(description = "人员") - private String person; - @Schema(description = "电话") - private String phone; - @Schema(description = "备注") - private String remake; - @Schema(description = "编号") - private String disno; - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java deleted file mode 100644 index a55bc45..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/entity/CqcCarbonDistributionEntity.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity; - -import com.mybatisflex.annotation.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 产品分销信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cqc_carbon_distribution") -public class CqcCarbonDistributionEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 唯一标识符 - */ - @Id - private Long id; - /** - * 申请编号 - */ - private String applyNo; - /** - * 中文名称 - */ - private String materialsnamecn; - /** - * 产品出货重量 - */ - private String productweight; - /** - * 单位 - */ - private String productweightunit; - /** - * 分销对象 - */ - private String distributionobject; - /** - * 分销地址 - */ - private String distributionaddress; - /** - * 运输方式 - */ - private String transmode; - /** - * 运输工具载重量 - */ - private String transloadcapacity; - /** - * 运输距离 - */ - private String transdistance; - /** - * 单位 - */ - private String transdistanceunit; - /** - * 运输数据来源 - */ - private String transdatasource; - /** - * 活动数据来源 - */ - private String activitydatasource; - /** - * 部门 - */ - private String dept; - /** - * 人员 - */ - private String person; - /** - * 电话 - */ - private String phone; - /** - * 备注 - */ - private String remake; - /** - * 编号 - */ - private String disno; -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java deleted file mode 100644 index a931f40..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/mapper/CqcCarbonDistributionMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.mapper; - -import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; -import org.apache.ibatis.annotations.Mapper; - -/** -* 产品分销信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Mapper -public interface CqcCarbonDistributionMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java deleted file mode 100644 index e3d117d..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/CqcCarbonDistributionService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service; - -import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; - -/** - * 产品分销信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -public interface CqcCarbonDistributionService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java deleted file mode 100644 index defefc8..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 产品分销信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Service -public class CqcCarbonDistributionServiceImpl extends BaseServiceImpl implements CqcCarbonDistributionService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java deleted file mode 100644 index b4681b8..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/controller/CqcCarbonEnergyController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.controller; - -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.dto.CqcCarbonEnergyDTO; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; - -import java.util.Map; - -/** -* 使用阶段能源信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@RestController -@RequestMapping("v2/CqcCarbonEnergy/cqccarbonenergy") -@Tag(name=" 使用阶段能源信息") -@RequiredArgsConstructor -public class CqcCarbonEnergyController { - - private final CqcCarbonEnergyService cqcCarbonEnergyService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CqcCarbonEnergyDTO data = cqcCarbonEnergyService.getByIdAs(id, CqcCarbonEnergyDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CqcCarbonEnergyDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cqcCarbonEnergyService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CqcCarbonEnergyDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cqcCarbonEnergyService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cqcCarbonEnergyService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cqcCarbonEnergyService.listAs(params, CqcCarbonEnergyDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, " 使用阶段能源信息", list, CqcCarbonEnergyExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java deleted file mode 100644 index 5e7bcdd..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/dto/CqcCarbonEnergyDTO.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 使用阶段能源信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Data -@Schema(description = " 使用阶段能源信息") -public class CqcCarbonEnergyDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "唯一标识符") - private Long id; - @Schema(description = "申请编号") - private String applyNo; - @Schema(description = "类别") - private String cateid; - @Schema(description = "使用过程") - private String useprocedure; - @Schema(description = "排放源") - private String emissionsource; - @Schema(description = "用途") - private String materialsuse; - @Schema(description = "产品使用能源总投入量") - private String energycapacity; - @Schema(description = "单位") - private String energycapacityunit; - @Schema(description = "功能单位耗用量") - private String rawmaterialsinput; - @Schema(description = "单位") - private String rawmaterialsunit; - @Schema(description = "活动数据来源") - private String activitydatasource; - @Schema(description = "部门") - private String dept; - @Schema(description = "人员") - private String person; - @Schema(description = "电话") - private String phone; - @Schema(description = "备注") - private String remake; - @Schema(description = "备注") - private String consumeno; - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java deleted file mode 100644 index 883f352..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/entity/CqcCarbonEnergyEntity.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity; - -import com.mybatisflex.annotation.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 使用阶段能源信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cqc_carbon_energy") -public class CqcCarbonEnergyEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 唯一标识符 - */ - @Id - private Long id; - /** - * 申请编号 - */ - private String applyNo; - /** - * 类别 - */ - private String cateid; - /** - * 使用过程 - */ - private String useprocedure; - /** - * 排放源 - */ - private String emissionsource; - /** - * 用途 - */ - private String materialsuse; - /** - * 产品使用能源总投入量 - */ - private String energycapacity; - /** - * 单位 - */ - private String energycapacityunit; - /** - * 功能单位耗用量 - */ - private String rawmaterialsinput; - /** - * 单位 - */ - private String rawmaterialsunit; - /** - * 活动数据来源 - */ - private String activitydatasource; - /** - * 部门 - */ - private String dept; - /** - * 人员 - */ - private String person; - /** - * 电话 - */ - private String phone; - /** - * 备注 - */ - private String remake; - /** - * 备注 - */ - private String consumeno; -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java deleted file mode 100644 index 5229466..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/mapper/CqcCarbonEnergyMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.mapper; - -import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; -import org.apache.ibatis.annotations.Mapper; - -/** -* 使用阶段能源信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Mapper -public interface CqcCarbonEnergyMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java deleted file mode 100644 index 625065d..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/CqcCarbonEnergyService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service; - -import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; - -/** - * 使用阶段能源信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -public interface CqcCarbonEnergyService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java deleted file mode 100644 index fc28a48..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 使用阶段能源信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Service -public class CqcCarbonEnergyServiceImpl extends BaseServiceImpl implements CqcCarbonEnergyService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java deleted file mode 100644 index f5ba3e4..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/controller/CqcCarbonMakeController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.controller; - -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.dto.CqcCarbonMakeDTO; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; - -import java.util.Map; - -/** -* 制造阶段能源消耗信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@RestController -@RequestMapping("v2/CqcCarbonMake/cqccarbonmake") -@Tag(name="制造阶段能源消耗信息") -@RequiredArgsConstructor -public class CqcCarbonMakeController { - - private final CqcCarbonMakeService cqcCarbonMakeService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CqcCarbonMakeDTO data = cqcCarbonMakeService.getByIdAs(id, CqcCarbonMakeDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CqcCarbonMakeDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cqcCarbonMakeService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CqcCarbonMakeDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cqcCarbonMakeService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cqcCarbonMakeService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cqcCarbonMakeService.listAs(params, CqcCarbonMakeDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "制造阶段能源消耗信息", list, CqcCarbonMakeExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java deleted file mode 100644 index 8b43486..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/dto/CqcCarbonMakeDTO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 制造阶段能源消耗信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Data -@Schema(description = "制造阶段能源消耗信息") -public class CqcCarbonMakeDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "唯一标识符") - private Long id; - @Schema(description = "申请编号,，关联申请记录表申请唯一编码") - private String applyNo; - @Schema(description = "类别") - private String cateid; - @Schema(description = "制程投入位置") - private String useplace; - @Schema(description = "排放源") - private String emissionsource; - @Schema(description = "全厂总用量") - private String totalelectricity; - @Schema(description = "全厂总用量单位") - private String totalelectricityunit; - @Schema(description = "功能单位消耗量") - private String specificconsumption; - @Schema(description = "消耗量单位") - private String specificconsumptionunit; - @Schema(description = "活动数据来源") - private String activitydatasource; - @Schema(description = "部门") - private String dept; - @Schema(description = "人员") - private String person; - @Schema(description = "电话") - private String phone; - @Schema(description = "备注") - private String remake; - @Schema(description = "编号") - private String makeno; - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java deleted file mode 100644 index 70bc739..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/entity/CqcCarbonMakeEntity.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity; - -import com.mybatisflex.annotation.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 制造阶段能源消耗信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cqc_carbon_make") -public class CqcCarbonMakeEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 唯一标识符 - */ - @Id - private Long id; - /** - * 申请编号,，关联申请记录表申请唯一编码 - */ - private String applyNo; - /** - * 类别 - */ - private String cateid; - /** - * 制程投入位置 - */ - private String useplace; - /** - * 排放源 - */ - private String emissionsource; - /** - * 全厂总用量 - */ - private String totalelectricity; - /** - * 全厂总用量单位 - */ - private String totalelectricityunit; - /** - * 功能单位消耗量 - */ - private String specificconsumption; - /** - * 消耗量单位 - */ - private String specificconsumptionunit; - /** - * 活动数据来源 - */ - private String activitydatasource; - /** - * 部门 - */ - private String dept; - /** - * 人员 - */ - private String person; - /** - * 电话 - */ - private String phone; - /** - * 备注 - */ - private String remake; - /** - * 编号 - */ - private String makeno; -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java deleted file mode 100644 index af4b4cd..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/mapper/CqcCarbonMakeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.mapper; - -import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; -import org.apache.ibatis.annotations.Mapper; - -/** -* 制造阶段能源消耗信息 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Mapper -public interface CqcCarbonMakeMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java deleted file mode 100644 index 718c0a4..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/CqcCarbonMakeService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service; - -import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; - -/** - * 制造阶段能源消耗信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -public interface CqcCarbonMakeService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java deleted file mode 100644 index 91ff389..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 制造阶段能源消耗信息 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Service -public class CqcCarbonMakeServiceImpl extends BaseServiceImpl implements CqcCarbonMakeService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java deleted file mode 100644 index c9db104..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/controller/CqcCarbonRawController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.controller; - -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; - -import java.util.Map; - -/** -* 原物料阶段数据 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@RestController -@RequestMapping("v2/CqcCarbonRaw/cqccarbonraw") -@Tag(name="原物料阶段数据") -@RequiredArgsConstructor -public class CqcCarbonRawController { - - private final CqcCarbonRawService cqcCarbonRawService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CqcCarbonRawDTO data = cqcCarbonRawService.getByIdAs(id, CqcCarbonRawDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CqcCarbonRawDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cqcCarbonRawService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CqcCarbonRawDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cqcCarbonRawService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cqcCarbonRawService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cqcCarbonRawService.listAs(params, CqcCarbonRawDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "原物料阶段数据", list, CqcCarbonRawExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java deleted file mode 100644 index 84a00c8..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/dto/CqcCarbonRawDTO.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 原物料阶段数据 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Data -@Schema(description = "原物料阶段数据") -public class CqcCarbonRawDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "记录ID") - private Long id; - @Schema(description = "申请唯一编码，关联申请记录表申请唯一编码") - private String applyNo; - @Schema(description = "材料编号") - private String materialno; - @Schema(description = "类别ID") - private String cateid; - @Schema(description = "材料中文名称") - private String materialsnamecn; - @Schema(description = "材料英文名称及化学名称") - private String materialsnameen; - @Schema(description = "生成工序") - private String productionprocesses; - @Schema(description = "材料组份名称及比例") - private String materialcomponent; - @Schema(description = "盘查期间内生产该产品所使用原料总投入量") - private String productcapacity; - @Schema(description = "投入量单位") - private String productcapacityunit; - @Schema(description = "功能单位原物料投入量") - private String rawmaterialsinput; - @Schema(description = "原物料投入量单位") - private String rawmaterialsunit; - @Schema(description = "供货商名称") - private String suppliername; - @Schema(description = "供货商地址") - private String supplieraddress; - @Schema(description = "运输方式") - private String transmode; - @Schema(description = "运输工具载重量") - private String transloadcapacity; - @Schema(description = "运输距离") - private String transdistance; - @Schema(description = "运输距离单位") - private String transdistanceunit; - @Schema(description = "运输数据来源") - private String transdatasource; - @Schema(description = "活动数据来源") - private String activitydatasource; - @Schema(description = "部门") - private String dept; - @Schema(description = "负责人") - private String person; - @Schema(description = "联系电话") - private String phone; - @Schema(description = "备注") - private String remake; - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java deleted file mode 100644 index b844591..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/entity/CqcCarbonRawEntity.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity; - -import com.mybatisflex.annotation.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 原物料阶段数据 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cqc_carbon_raw") -public class CqcCarbonRawEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 记录ID - */ - @Id - private Long id; - /** - * 申请唯一编码，关联申请记录表申请唯一编码 - */ - private String applyNo; - /** - * 材料编号 - */ - private String materialno; - /** - * 类别ID - */ - private String cateid; - /** - * 材料中文名称 - */ - private String materialsnamecn; - /** - * 材料英文名称及化学名称 - */ - private String materialsnameen; - /** - * 生成工序 - */ - private String productionprocesses; - /** - * 材料组份名称及比例 - */ - private String materialcomponent; - /** - * 盘查期间内生产该产品所使用原料总投入量 - */ - private String productcapacity; - /** - * 投入量单位 - */ - private String productcapacityunit; - /** - * 功能单位原物料投入量 - */ - private String rawmaterialsinput; - /** - * 原物料投入量单位 - */ - private String rawmaterialsunit; - /** - * 供货商名称 - */ - private String suppliername; - /** - * 供货商地址 - */ - private String supplieraddress; - /** - * 运输方式 - */ - private String transmode; - /** - * 运输工具载重量 - */ - private String transloadcapacity; - /** - * 运输距离 - */ - private String transdistance; - /** - * 运输距离单位 - */ - private String transdistanceunit; - /** - * 运输数据来源 - */ - private String transdatasource; - /** - * 活动数据来源 - */ - private String activitydatasource; - /** - * 部门 - */ - private String dept; - /** - * 负责人 - */ - private String person; - /** - * 联系电话 - */ - private String phone; - /** - * 备注 - */ - private String remake; -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java deleted file mode 100644 index cddd08a..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/mapper/CqcCarbonRawMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.mapper; - -import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; -import org.apache.ibatis.annotations.Mapper; - -/** -* 原物料阶段数据 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Mapper -public interface CqcCarbonRawMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java deleted file mode 100644 index 805d65a..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/CqcCarbonRawService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service; - -import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; - -/** - * 原物料阶段数据 - * - * @author xc - * @since 3.0 2024-08-08 - */ -public interface CqcCarbonRawService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java deleted file mode 100644 index 09b67c3..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 原物料阶段数据 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Service -public class CqcCarbonRawServiceImpl extends BaseServiceImpl implements CqcCarbonRawService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java deleted file mode 100644 index 6386eb5..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.controller; - -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.dto.CqcCarbonReportDTO; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; - -import java.util.Map; - -/** -* 申请表基础数据 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@RestController -@RequestMapping("v2/CqcCarbonReport/cqccarbonreport") -@Tag(name="申请表基础数据") -@RequiredArgsConstructor -public class CqcCarbonReportController { - - private final CqcCarbonReportService cqcCarbonReportService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cqcCarbonReportService.getPageData(params, CqcCarbonReportDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CqcCarbonReportDTO data = cqcCarbonReportService.getByIdAs(id, CqcCarbonReportDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CqcCarbonReportDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cqcCarbonReportService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CqcCarbonReportDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cqcCarbonReportService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cqcCarbonReportService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cqcCarbonReportService.listAs(params, CqcCarbonReportDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "申请表基础数据", list, CqcCarbonReportExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java deleted file mode 100644 index e51962b..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 申请表基础数据 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Data -@Schema(description = "申请表基础数据") -public class CqcCarbonReportDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "受理机构") - private String deptId; - @Schema(description = "申请唯一编码(自行设定规则，与文件传输接口对应)") - private String applyNo; - @Schema(description = "委托方名称（中文）") - private String clientNameCn; - @Schema(description = "委托方名称（英文）") - private String clientNameEn; - @Schema(description = "委托方地址（中文）") - private String clientAddressCn; - @Schema(description = "委托方地址（英文）") - private String clientAddressEn; - @Schema(description = "委托方邮编") - private String clientPostcode; - @Schema(description = "委托方联系人姓名") - private String clientContactName; - @Schema(description = "委托方部门") - private String clientDepartment; - @Schema(description = "委托方职务") - private String clientPosition; - @Schema(description = "委托方电话") - private String clientPhone; - @Schema(description = "委托方传真") - private String clientFax; - @Schema(description = "委托方E-MAIL") - private String clientEmail; - @Schema(description = "与受核查方的关系") - private String relationshipWithChecked; - @Schema(description = "核查涉及的企业名称（中文）") - private String enterpriseNameCn; - @Schema(description = "核查涉及的企业名称（英文）") - private String enterpriseNameEn; - @Schema(description = "核查涉及的企业地址（中文）") - private String enterpriseAddressCn; - @Schema(description = "核查涉及的企业地址（英文）") - private String enterpriseAddressEn; - @Schema(description = "企业性质 1-国企 2-私企 3-外资或合资") - private String enterpriseNature; - @Schema(description = "提供产品或服务") - private String offerProduct; - @Schema(description = "提供产品或服务的年产量") - private String annualProduction; - @Schema(description = "产品原材料供应数据是否可提供 1-原料组成 2-产品中原料用量配比 3-原料供应商信息") - private String supplyDataAvailable; - @Schema(description = "公司网址") - private String companyUrl; - @Schema(description = "原材料运输数据是否齐全 1-是 0-否") - private String transportationDataComplete; - @Schema(description = "是否做过ISO 14064-1温室气体盘查 1-是 0-否") - private String isUseIso; - @Schema(description = "当前能源使用来源 1-电网供电 2-自备电厂 3-电力交易平台 4-网供蒸汽 5-集中供热 6-自用锅炉 7-其他") - private String currentEnergySource; - @Schema(description = "当前能源使用来源其他信息填写") - private String currentEnergyOther; - @Schema(description = "工厂名称（中文）") - private String factoryNameCn; - @Schema(description = "工厂名称（英文）") - private String factoryNameEn; - @Schema(description = "工厂地址（中文）") - private String factoryAddressCn; - @Schema(description = "工厂地址（英文）") - private String factoryAddressEn; - @Schema(description = "是否做过碳足迹盘查 1-是 0-否") - private String isCarbonCheck; - @Schema(description = "申请碳足迹核查所覆盖的阶段 0-从摇篮到大门 1-从摇篮到坟墓") - private String checkType; - @Schema(description = "委托方期望达到的核查保证等级 0-合理保证等级 1-有限保证等级") - private String expectedCheckLevel; - @Schema(description = "核查过程所使用的语言") - private String language; - @Schema(description = "接受核查的产品名称(中文)") - private String productNameCn; - @Schema(description = "接受核查的产品名称（英文）") - private String productNameEn; - @Schema(description = "接受核查的产品型号(中文)") - private String productModelCn; - @Schema(description = "接受核查的产品型号（英文）") - private String productModelEn; - @Schema(description = "产品碳足迹数据开始时间") - private String startDate; - @Schema(description = "产品碳足迹数据结束时间") - private String endDate; - @Schema(description = "希望文件评审的日期") - private String fileReviewDate; - @Schema(description = "希望提交核查陈述的日期") - private String statementSubmissionDate; - @Schema(description = "希望实施现场核查的日期") - private String onSiteCheckDate; - @Schema(description = "希望发布最终证书的日期") - private String certificateReleaseDate; - @Schema(description = "其他要求") - private String otherRequirements; - @Schema(description = "是否已经编制过GHG清单 1-是 0-否") - private String ghgInventoryPrepared; - @Schema(description = "GHG清单所覆盖的时间段") - private String ghgInventoryCoveredPeriod; - @Schema(description = "需要特殊关注的事项") - private String specialAttention; - @Schema(description = "工艺流程简述") - private String processDescription; - @Schema(description = "产品信息") - private String productInfo; - @Schema(description = "公司简介") - private String companyInfo; - @Schema(description = "盘查期间场内平均人数") - private String avgPersonNum; - @Schema(description = "盘查期间场内平均工时") - private String avgWorkTim; - @Schema(description = "计量单位") - private String measureUnit; - @Schema(description = "待核查产品的总产量") - private String waitProductionCapacity; - @Schema(description = "总量单位") - private String waitProductionUnit; - @Schema(description = "单件重量") - private String pieceWeight; - @Schema(description = "单件重量单位") - private String pieceWeightUnit; - @Schema(description = "生产的所有产品的总产量") - private String fullProductionCapacity; - @Schema(description = "生产的所有产品的总产量单位") - private String fullProductionUnit; - @Schema(description = "审核主管") - private String checkExecutive; - @Schema(description = "电话") - private String phone; - @Schema(description = "email") - private String email; - @Schema(description = "主键id") - private Long id; - @Schema(description = "租户编码") - private Long tenantCode; - @Schema(description = "企业id") - private Long companyId; - @Schema(description = "创建人") - private Long creator; - @Schema(description = "创建时间") - private Long createDate; - @Schema(description = "更新人") - private Long updater; - @Schema(description = "更新时间") - private Long updateDate; - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java deleted file mode 100644 index 6fb8592..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java +++ /dev/null @@ -1,309 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity; - -import com.mybatisflex.annotation.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 申请表基础数据 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cqc_carbon_report") -public class CqcCarbonReportEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 受理机构 - */ - private String deptId; - /** - * 申请唯一编码(自行设定规则，与文件传输接口对应) - */ - private String applyNo; - /** - * 委托方名称（中文） - */ - private String clientNameCn; - /** - * 委托方名称（英文） - */ - private String clientNameEn; - /** - * 委托方地址（中文） - */ - private String clientAddressCn; - /** - * 委托方地址（英文） - */ - private String clientAddressEn; - /** - * 委托方邮编 - */ - private String clientPostcode; - /** - * 委托方联系人姓名 - */ - private String clientContactName; - /** - * 委托方部门 - */ - private String clientDepartment; - /** - * 委托方职务 - */ - private String clientPosition; - /** - * 委托方电话 - */ - private String clientPhone; - /** - * 委托方传真 - */ - private String clientFax; - /** - * 委托方E-MAIL - */ - private String clientEmail; - /** - * 与受核查方的关系 - */ - private String relationshipWithChecked; - /** - * 核查涉及的企业名称（中文） - */ - private String enterpriseNameCn; - /** - * 核查涉及的企业名称（英文） - */ - private String enterpriseNameEn; - /** - * 核查涉及的企业地址（中文） - */ - private String enterpriseAddressCn; - /** - * 核查涉及的企业地址（英文） - */ - private String enterpriseAddressEn; - /** - * 企业性质 1-国企 2-私企 3-外资或合资 - */ - private String enterpriseNature; - /** - * 提供产品或服务 - */ - private String offerProduct; - /** - * 提供产品或服务的年产量 - */ - private String annualProduction; - /** - * 产品原材料供应数据是否可提供 1-原料组成 2-产品中原料用量配比 3-原料供应商信息 - */ - private String supplyDataAvailable; - /** - * 公司网址 - */ - private String companyUrl; - /** - * 原材料运输数据是否齐全 1-是 0-否 - */ - private String transportationDataComplete; - /** - * 是否做过ISO 14064-1温室气体盘查 1-是 0-否 - */ - private String isUseIso; - /** - * 当前能源使用来源 1-电网供电 2-自备电厂 3-电力交易平台 4-网供蒸汽 5-集中供热 6-自用锅炉 7-其他 - */ - private String currentEnergySource; - /** - * 当前能源使用来源其他信息填写 - */ - private String currentEnergyOther; - /** - * 工厂名称（中文） - */ - private String factoryNameCn; - /** - * 工厂名称（英文） - */ - private String factoryNameEn; - /** - * 工厂地址（中文） - */ - private String factoryAddressCn; - /** - * 工厂地址（英文） - */ - private String factoryAddressEn; - /** - * 是否做过碳足迹盘查 1-是 0-否 - */ - private String isCarbonCheck; - /** - * 申请碳足迹核查所覆盖的阶段 0-从摇篮到大门 1-从摇篮到坟墓 - */ - private String checkType; - /** - * 委托方期望达到的核查保证等级 0-合理保证等级 1-有限保证等级 - */ - private String expectedCheckLevel; - /** - * 核查过程所使用的语言 - */ - private String language; - /** - * 接受核查的产品名称(中文) - */ - private String productNameCn; - /** - * 接受核查的产品名称（英文） - */ - private String productNameEn; - /** - * 接受核查的产品型号(中文) - */ - private String productModelCn; - /** - * 接受核查的产品型号（英文） - */ - private String productModelEn; - /** - * 产品碳足迹数据开始时间 - */ - private String startDate; - /** - * 产品碳足迹数据结束时间 - */ - private String endDate; - /** - * 希望文件评审的日期 - */ - private String fileReviewDate; - /** - * 希望提交核查陈述的日期 - */ - private String statementSubmissionDate; - /** - * 希望实施现场核查的日期 - */ - private String onSiteCheckDate; - /** - * 希望发布最终证书的日期 - */ - private String certificateReleaseDate; - /** - * 其他要求 - */ - private String otherRequirements; - /** - * 是否已经编制过GHG清单 1-是 0-否 - */ - private String ghgInventoryPrepared; - /** - * GHG清单所覆盖的时间段 - */ - private String ghgInventoryCoveredPeriod; - /** - * 需要特殊关注的事项 - */ - private String specialAttention; - /** - * 工艺流程简述 - */ - private String processDescription; - /** - * 产品信息 - */ - private String productInfo; - /** - * 公司简介 - */ - private String companyInfo; - /** - * 盘查期间场内平均人数 - */ - private String avgPersonNum; - /** - * 盘查期间场内平均工时 - */ - private String avgWorkTim; - /** - * 计量单位 - */ - private String measureUnit; - /** - * 待核查产品的总产量 - */ - private String waitProductionCapacity; - /** - * 总量单位 - */ - private String waitProductionUnit; - /** - * 单件重量 - */ - private String pieceWeight; - /** - * 单件重量单位 - */ - private String pieceWeightUnit; - /** - * 生产的所有产品的总产量 - */ - private String fullProductionCapacity; - /** - * 生产的所有产品的总产量单位 - */ - private String fullProductionUnit; - /** - * 审核主管 - */ - private String checkExecutive; - /** - * 电话 - */ - private String phone; - /** - * email - */ - private String email; - /** - * 主键id - */ - private Long id; - /** - * 租户编码 - */ - private Long tenantCode; - /** - * 企业id - */ - private Long companyId; - /** - * 创建人 - */ - private Long creator; - /** - * 创建时间 - */ - private Long createDate; - /** - * 更新人 - */ - private Long updater; - /** - * 更新时间 - */ - private Long updateDate; -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java deleted file mode 100644 index bb2a2b0..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/mapper/CqcCarbonReportMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.mapper; - -import com.thing.common.orm.mapper.PowerBaseMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; -import org.apache.ibatis.annotations.Mapper; - -/** -* 申请表基础数据 -* -* @author xc -* @since 3.0 2024-08-08 -*/ -@Mapper -public interface CqcCarbonReportMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java deleted file mode 100644 index bcf4be3..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/CqcCarbonReportService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service; - -import com.thing.common.orm.service.IBaseService; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; - -/** - * 申请表基础数据 - * - * @author xc - * @since 3.0 2024-08-08 - */ -public interface CqcCarbonReportService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java deleted file mode 100644 index 2d5a294..0000000 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/entity/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper; -import com.thing.cqc.CqcCarbonRaw.entity.main.java.com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 申请表基础数据 - * - * @author xc - * @since 3.0 2024-08-08 - */ -@Service -public class CqcCarbonReportServiceImpl extends BaseServiceImpl implements CqcCarbonReportService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java index 3c15f43..2d0a2f6 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/controller/CqcCarbonReportController.java @@ -20,6 +20,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.Map; +import java.util.UUID; /** * 申请表基础数据 @@ -29,7 +30,7 @@ import java.util.Map; */ @RestController @RequestMapping("v2/cqccarbonreport") -@Tag(name="申请表基础数据") +@Tag(name="碳足迹认证核查-基本信息") @RequiredArgsConstructor public class CqcCarbonReportController { @@ -58,21 +59,22 @@ public class CqcCarbonReportController { @PostMapping @Operation(summary="保存") @LogOperation("保存") - public Result save(@RequestBody CqcCarbonReportDTO dto){ + public Result save(@RequestBody CqcCarbonReportDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + dto.setApplyNo(String.valueOf(UUID.randomUUID())); cqcCarbonReportService.saveDto(dto); - return new Result<>(); + return new Result().ok(dto.getApplyNo()); } @PutMapping @Operation(summary="修改") @LogOperation("修改") - public Result update(@RequestBody CqcCarbonReportDTO dto){ + public Result update(@RequestBody CqcCarbonReportDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); cqcCarbonReportService.updateDto(dto); - return new Result<>(); + return new Result().ok(dto.getApplyNo()); } @DeleteMapping diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java index 1ff9733..d1f3996 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java @@ -51,6 +51,8 @@ public class CqcCarbonReportDTO implements Serializable { private String enterpriseNameCn; @Schema(description = "核查涉及的企业名称（英文）") private String enterpriseNameEn; + @Schema(description = "统一社会信用代码") + private String corporationCode; @Schema(description = "核查涉及的企业地址（中文）") private String enterpriseAddressCn; @Schema(description = "核查涉及的企业地址（英文）") @@ -147,6 +149,8 @@ public class CqcCarbonReportDTO implements Serializable { private String phone; @Schema(description = "email") private String email; + @Schema(description = "审核状态") + private String status; @Schema(description = "主键id") private Long id; @Schema(description = "租户编码") diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java index d79e656..a718f62 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java @@ -87,6 +87,10 @@ public class CqcCarbonReportEntity implements Serializable { * 核查涉及的企业名称（英文） */ private String enterpriseNameEn; + /** + * 统一社会信用代码 + */ + private String corporationCode; /** * 核查涉及的企业地址（中文） */ @@ -283,6 +287,10 @@ public class CqcCarbonReportEntity implements Serializable { * 主键id */ private Long id; + /** + * 审核状态 + */ + private String status; /** * 租户编码 */ diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java index 3a357ad..85b2349 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java @@ -5,6 +5,7 @@ import com.thing.common.orm.service.impl.BaseServiceImpl; import com.thing.cqc.CqcCarbonReport.mapper.CqcCarbonReportMapper; import com.thing.cqc.CqcCarbonReport.entity.CqcCarbonReportEntity; import com.thing.cqc.CqcCarbonReport.service.CqcCarbonReportService; +import com.thing.sys.security.context.UserContext; import org.springframework.stereotype.Service; import java.util.Map; @@ -21,6 +22,10 @@ public class CqcCarbonReportServiceImpl extends BaseServiceImpl params){ QueryWrapper wrapper = new QueryWrapper(); + Long tenantCode = UserContext.getTenantCode(); + if(!tenantCode.equals(1001L)){ + wrapper.eq(CqcCarbonReportEntity::getTenantCode,tenantCode); + } return wrapper; } From 2d3e3be6f31d7379c6186b3e3fa72aed96d92c7b Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 9 Aug 2024 09:42:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=88=86?= =?UTF-8?q?=E9=A1=B5=202024=E5=B9=B48=E6=9C=889=E6=97=A509:41:59?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IotThingModelController.java | 4 ++-- .../thing/model/param/DistributeModelParam.java | 2 ++ .../model/service/IotThingModelService.java | 2 +- .../service/impl/IotThingModelServiceImpl.java | 16 ++++++++-------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java index 37d8d40..38f5602 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java +++ b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java @@ -151,8 +151,8 @@ public class IotThingModelController { @Parameter(name = "endTime",description ="结束时间"), @Parameter(name = "attrs",description ="属性编码集合") }) - public Result> getSequenceAttr(String entityCode,String attrs,Long startTime,Long endTime) { - return new Result>().ok(service.getSequenceAttr(entityCode,attrs,startTime,endTime)); + public Result> getSequenceAttr(String entityCode,String attrs,Long startTime,Long endTime,Integer page,Integer limit) { + return new Result>().ok(service.getSequenceAttr(entityCode,attrs,startTime,endTime,page,limit)); } @PostMapping("saveSequenceAttr") diff --git a/modules/thing/src/main/java/com/thing/thing/model/param/DistributeModelParam.java b/modules/thing/src/main/java/com/thing/thing/model/param/DistributeModelParam.java index 0e45e3b..31151af 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/param/DistributeModelParam.java +++ b/modules/thing/src/main/java/com/thing/thing/model/param/DistributeModelParam.java @@ -28,6 +28,8 @@ public class DistributeModelParam implements Serializable { private String code; @Schema(description = "是否网关: 0否1是") private String gateway; + @Schema(description = "租户内物存在类型，0虚拟 1真实") + private String realType; @Schema(description = "备注说明") private String remark; @Schema(description = "物模型：分配租户编码(分配企业功能参数)") diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java b/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java index ace3851..251bf30 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java +++ b/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java @@ -37,7 +37,7 @@ public interface IotThingModelService extends IBaseService Map status(); - List getSequenceAttr(String entityCode, String attrs, Long startTime, Long endTime); + PageData getSequenceAttr(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit); List latestData(String entityCode, String attrs, Long startTime, Long endTime); diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java index 1d58e49..eadad86 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java @@ -230,7 +230,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl getSequenceAttr(String entityCode, String attrs, Long startTime, Long endTime) { + public PageData getSequenceAttr(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit) { Optional optional = findByCode(entityCode); if (optional.isEmpty()) { return null; @@ -240,13 +240,13 @@ public class IotThingModelServiceImpl extends BaseServiceImpl tskvList; + PageData tskvList; // 有时间参数：查历史值 if (!Objects.isNull(startTime) && !Objects.isNull(endTime) && CollectionUtils.isNotEmpty(attrList)) { - tskvList = tsKvService.findTsKvByCodeAndAttrs(entityCode, attrList, startTime, endTime, false); + tskvList = tsKvService.findPageTsKvByCodeAndAttrs(entityCode, attrList, startTime, endTime, false,page, limit); } else { // 没有时间参数：查最新值 - tskvList = tsKvService.findLatestByCodeAndAttrs(entityCode, attrList, false); + tskvList = tsKvService.findPageTsKvByCodeAndAttrs(entityCode, attrList, null,null, false,page, limit); } return tskvList; } @@ -292,7 +292,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl entitiesList = shareThingsToTenantCode(Collections.singletonList(code), dto.getTenantCodes()); Optional optional = findByCode(code); if (optional.isEmpty()) { - IotThingModelEntity modelEntity = buildIotThingModelEntity(code, dto.getRemark(), (long) CollectionUtils.size(entitiesList), null, dto.getGateway()); + IotThingModelEntity modelEntity = buildIotThingModelEntity(code, dto.getRemark(), (long) CollectionUtils.size(entitiesList), null, dto.getGateway(),dto.getRealType()); mapper.insert(modelEntity); } else { updateModelAuthNumByCodes(Collections.singletonList(code)); @@ -314,7 +314,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl entitiesList = shareThingsToTenantCode(Collections.singletonList(modelDTO.getCode()), dto.getTenantCodes()); IotThingModelEntity iotThingModelEntity = buildIotThingModelEntity(modelDTO.getCode(), dto.getRemark(), - (long) CollectionUtils.size(entitiesList), modelDTO.getToken(), gateway); + (long) CollectionUtils.size(entitiesList), modelDTO.getToken(), gateway,dto.getRealType()); iotThingModelEntity.setId(modelDTO.getId()); mapper.update(iotThingModelEntity, true); //更新缓存 @@ -408,7 +408,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl Date: Fri, 9 Aug 2024 10:42:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E6=97=B6?= =?UTF-8?q?=E5=BA=8F=E5=B1=9E=E6=80=A7=E5=88=86=E9=A1=B5=202024=E5=B9=B48?= =?UTF-8?q?=E6=9C=889=E6=97=A510:42:38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thing/model/controller/IotThingModelController.java | 4 ++-- .../com/thing/thing/model/service/IotThingModelService.java | 2 +- .../thing/model/service/impl/IotThingModelServiceImpl.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java index 38f5602..7e37cb8 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java +++ b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java @@ -139,8 +139,8 @@ public class IotThingModelController { @Parameter(name = "entityCode",description ="物编码"), @Parameter(name = "attrs",description ="属性编码集合") }) - public Result> latestData(String entityCode,String attrs,Long startTime,Long endTime) { - return new Result>().ok(service.latestData(entityCode,attrs,startTime,endTime)); + public Result> latestData(String entityCode,String attrs,Long startTime,Long endTime,Integer page,Integer limit) { + return new Result>().ok(service.latestData(entityCode,attrs,startTime,endTime,page,limit)); } @GetMapping("getSequenceAttr") diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java b/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java index 251bf30..91f9f2e 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java +++ b/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java @@ -39,7 +39,7 @@ public interface IotThingModelService extends IBaseService PageData getSequenceAttr(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit); - List latestData(String entityCode, String attrs, Long startTime, Long endTime); + PageData latestData(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit); void saveSequenceAttr(List tsKvDTOS); diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java index eadad86..9e2341d 100644 --- a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java @@ -246,13 +246,13 @@ public class IotThingModelServiceImpl extends BaseServiceImpl latestData(String entityCode, String attrs, Long startTime, Long endTime) { + public PageData latestData(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit) { Optional optional = findByCode(entityCode); if (optional.isEmpty()) { return null; @@ -262,7 +262,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl Date: Fri, 9 Aug 2024 14:39:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=89=A9=E5=AE=9E=E4=BD=93=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=202024=E5=B9=B48=E6=9C=889=E6=97=A514:39:19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IotThingEntityServiceImpl.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java index eb6e788..0f8bd87 100644 --- a/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java @@ -276,11 +276,12 @@ public class IotThingEntityServiceImpl extends BaseServiceImpl> pairs = buildParam(name,name,type,tenantCode, + List> pairs = buildParam(type,tenantCode, deptId,realType,tags,enableStatus,templateMark); String finalOrderField = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, orderField); Comparator comparator = CompareUtils.getComparator(order, finalOrderField); return thingList.stream().filter(jsonObject -> JacksonUtil.filter(jsonObject, pairs)) + .filter(jsonObject -> JacksonUtil.filterOr(jsonObject, name,CacheNameEnum.EntityField.THING_ENTITY_CODE.getField(),CacheNameEnum.EntityField.THING_ENTITY_NAME.getField())) .sorted(comparator.thenComparing(obj -> obj.get(CacheNameEnum.EntityField.THING_ENTITY_ID.getField()).asLong())).toList(); } @@ -924,9 +925,7 @@ public class IotThingEntityServiceImpl extends BaseServiceImpl> buildParam(String code, - String name, - String type, + private List> buildParam(String type, Long tenantCode, Long deptId, String realType, @@ -935,12 +934,12 @@ public class IotThingEntityServiceImpl extends BaseServiceImpl> filterList = new ArrayList<>(); - if (StringUtils.isNotBlank(code)) { + /* if (StringUtils.isNotBlank(code)) { filterList.add(Pair.of(CacheNameEnum.EntityField.THING_ENTITY_CODE.getField(), code)); - } - if (StringUtils.isNotBlank(name)) { - filterList.add(Pair.of(CacheNameEnum.EntityField.THING_ENTITY_NAME.getField(), name)); - } + }*/ +// if (StringUtils.isNotBlank(name)) { +// filterList.add(Pair.of(CacheNameEnum.EntityField.THING_ENTITY_NAME.getField(), name)); +// } if (StringUtils.isNotBlank(type)) { filterList.add(Pair.of(CacheNameEnum.EntityField.THING_ENTITY_TYPE.getField(), type)); }