From 5e8f1c26a4ef235fe789400bd336b8d27a177569 Mon Sep 17 00:00:00 2001 From: jiangc <12345678> Date: Fri, 29 Nov 2024 11:22:25 +0800 Subject: [PATCH 01/19] =?UTF-8?q?CBAM=E5=9F=BA=E7=A1=80CRUD=202024?= =?UTF-8?q?=E5=B9=B411=E6=9C=8829=E6=97=A511:22:10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/pom.xml | 4 + modules/cbam/pom.xml | 39 +++++++ .../controller/CbamIndustryController.java | 95 +++++++++++++++++ .../controller/CbamMaterialController.java | 69 ++++++++++++ .../controller/CbamProductInfoController.java | 98 +++++++++++++++++ .../baesInfoExcel/dto/CbamIndustryDTO.java | 100 ++++++++++++++++++ .../baesInfoExcel/dto/CbamMaterialDTO.java | 30 ++++++ .../baesInfoExcel/dto/CbamProductInfoDTO.java | 38 +++++++ .../entity/CbamIndustryEntity.java | 35 ++++++ .../entity/CbamMaterialEntity.java | 41 +++++++ .../entity/CbamProductInfoEntity.java | 55 ++++++++++ .../mapper/CbamIndustryMapper.java | 11 ++ .../mapper/CbamMaterialMapper.java | 10 ++ .../mapper/CbamProductInfoMapper.java | 17 +++ .../service/CbamIndustryService.java | 18 ++++ .../service/CbamMaterialService.java | 13 +++ .../service/CbamProductInfoService.java | 22 ++++ .../service/impl/CbamIndustryServiceImpl.java | 87 +++++++++++++++ .../service/impl/CbamMaterialServiceImpl.java | 27 +++++ .../impl/CbamProductInfoServiceImpl.java | 36 +++++++ .../CbamCarbonPriceToolController.java | 85 +++++++++++++++ .../dto/CbamCarbonPriceToolDTO.java | 38 +++++++ .../entity/CbamCarbonPriceToolEntity.java | 57 ++++++++++ .../mapper/CbamCarbonPriceToolMapper.java | 9 ++ .../service/CbamCarbonPriceToolService.java | 7 ++ .../Impl/CbamCarbonPriceToolServiceImpl.java | 19 ++++ .../dict/controller/CbamHsDictController.java | 99 +++++++++++++++++ .../CbamIndustryDictController.java | 99 +++++++++++++++++ .../CbamProdProcessDictController.java | 99 +++++++++++++++++ .../thing/cbam/dict/dto/CbamHsDictDTO.java | 37 +++++++ .../cbam/dict/dto/CbamIndustryDictDTO.java | 31 ++++++ .../cbam/dict/dto/CbamProdProcessDictDTO.java | 37 +++++++ .../cbam/dict/entity/CbamHsDictEntity.java | 56 ++++++++++ .../dict/entity/CbamIndustryDictEntity.java | 44 ++++++++ .../entity/CbamProdProcessDictEntity.java | 56 ++++++++++ .../cbam/dict/mapper/CbamHsDictMapper.java | 17 +++ .../dict/mapper/CbamIndustryDictMapper.java | 17 +++ .../mapper/CbamProdProcessDictMapper.java | 17 +++ .../cbam/dict/service/CbamHsDictService.java | 15 +++ .../dict/service/CbamIndustryDictService.java | 15 +++ .../service/CbamProdProcessDictService.java | 15 +++ .../service/impl/CbamHsDictServiceImpl.java | 29 +++++ .../impl/CbamIndustryDictServiceImpl.java | 29 +++++ .../impl/CbamProdProcessDictServiceImpl.java | 29 +++++ .../controller/CbamCarbonBurnController.java | 99 +++++++++++++++++ .../CbamCarbonMaterialController.java | 89 ++++++++++++++++ .../CbamCarbonMonitorController.java | 87 +++++++++++++++ .../CbamCarbonProgressController.java | 88 +++++++++++++++ .../directCarbon/dto/CbamCarbonBurnDTO.java | 42 ++++++++ .../dto/CbamCarbonMaterialDTO.java | 30 ++++++ .../dto/CbamCarbonMonitorDTO.java | 42 ++++++++ .../dto/CbamCarbonProgressDTO.java | 34 ++++++ .../entity/CbamCarbonBurnEntity.java | 61 +++++++++++ .../entity/CbamCarbonMaterialEntity.java | 42 ++++++++ .../entity/CbamCarbonMonitorEntity.java | 65 ++++++++++++ .../entity/CbamCarbonProgressEntity.java | 49 +++++++++ .../mapper/CbamCarbonBurnMapper.java | 17 +++ .../mapper/CbamCarbonMaterialMapper.java | 9 ++ .../mapper/CbamCarbonMonitorMapper.java | 9 ++ .../mapper/CbamCarbonProgressMapper.java | 10 ++ .../service/CbamCarbonBurnService.java | 15 +++ .../service/CbamCarbonMaterialService.java | 7 ++ .../service/CbamCarbonMonitorService.java | 7 ++ .../service/CbamCarbonProgressService.java | 8 ++ .../impl/CbamCarbonBurnServiceImpl.java | 29 +++++ .../impl/CbamCarbonMaterialServiceImpl.java | 19 ++++ .../impl/CbamCarbonMonitorServiceImpl.java | 19 ++++ .../impl/CbamCarbonProgressServiceImpl.java | 29 +++++ .../CbamElectricityToolController.java | 83 +++++++++++++++ .../dto/CbamElectricityToolDTO.java | 40 +++++++ .../entity/CbamElectricityToolEntity.java | 61 +++++++++++ .../mapper/CbamElectricityToolMapper.java | 9 ++ .../service/CbamElectricityToolService.java | 7 ++ .../Impl/CbamElectricityToolServiceImpl.java | 19 ++++ ...CbamCarbonIndirectEmissionsController.java | 91 ++++++++++++++++ ...rbonPowerProgressAllocationController.java | 98 +++++++++++++++++ .../dto/CbamCarbonIndirectEmissionsDTO.java | 32 ++++++ .../CbamCarbonPowerProgressAllocationDTO.java | 42 ++++++++ .../CbamCarbonIndirectEmissionsEntity.java | 45 ++++++++ ...amCarbonPowerProgressAllocationEntity.java | 65 ++++++++++++ .../CbamCarbonIndirectEmissionsMapper.java | 17 +++ ...amCarbonPowerProgressAllocationMapper.java | 17 +++ .../CbamCarbonIndirectEmissionsService.java | 7 ++ ...mCarbonPowerProgressAllocationService.java | 15 +++ ...bamCarbonIndirectEmissionsServiceImpl.java | 19 ++++ ...bonPowerProgressAllocationServiceImpl.java | 29 +++++ .../CbamProductAllocationController.java | 88 +++++++++++++++ .../CbamProductElectricityController.java | 98 +++++++++++++++++ ...CbamProductExhaustEmissionsController.java | 97 +++++++++++++++++ .../CbamProductHeatEmissionsController.java | 88 +++++++++++++++ .../dto/CbamProductAllocationDTO.java | 32 ++++++ .../dto/CbamProductElectricityDTO.java | 30 ++++++ .../dto/CbamProductExhaustEmissionsDTO.java | 30 ++++++ .../dto/CbamProductHeatEmissionsDTO.java | 22 ++++ .../entity/CbamProductAllocationEntity.java | 45 ++++++++ .../entity/CbamProductElectricityEntity.java | 41 +++++++ .../CbamProductExhaustEmissionsEntity.java | 41 +++++++ .../CbamProductHeatEmissionsEntity.java | 34 ++++++ .../mapper/CbamProductAllocationMapper.java | 9 ++ .../mapper/CbamProductElectricityMapper.java | 17 +++ .../CbamProductExhaustEmissionsMapper.java | 9 ++ .../CbamProductHeatEmissionsMapper.java | 9 ++ .../service/CbamProductAllocationService.java | 7 ++ .../CbamProductElectricityService.java | 7 ++ .../CbamProductExhaustEmissionsService.java | 7 ++ .../CbamProductHeatEmissionsService.java | 7 ++ .../CbamProductAllocationServiceImpl.java | 23 ++++ .../CbamProductElectricityServiceImpl.java | 19 ++++ ...bamProductExhaustEmissionsServiceImpl.java | 20 ++++ .../CbamProductHeatEmissionsServiceImpl.java | 27 +++++ modules/pom.xml | 1 + pom.xml | 15 ++- 112 files changed, 4218 insertions(+), 8 deletions(-) create mode 100644 modules/cbam/pom.xml create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamMaterialController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProductInfoController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamMaterialDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProductInfoDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamMaterialEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProductInfoEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamMaterialMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProductInfoMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamMaterialService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProductInfoService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamMaterialServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProductInfoServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMonitorController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMaterialDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMonitorDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMaterialEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMonitorEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonBurnMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMaterialMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMonitorMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMaterialService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMonitorService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMaterialServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMonitorServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonProgressServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductElectricityController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductHeatEmissionsController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductElectricityDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductExhaustEmissionsDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductHeatEmissionsDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductElectricityEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductExhaustEmissionsEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductHeatEmissionsEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductElectricityMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductExhaustEmissionsMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductHeatEmissionsMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductElectricityService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductExhaustEmissionsService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductHeatEmissionsService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductElectricityServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductExhaustEmissionsServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductHeatEmissionsServiceImpl.java diff --git a/application/pom.xml b/application/pom.xml index d45a2d4..5972202 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -145,6 +145,10 @@ com.thing.modules visual-design + + com.thing.modules + cbam + org.springframework.boot diff --git a/modules/cbam/pom.xml b/modules/cbam/pom.xml new file mode 100644 index 0000000..ede5601 --- /dev/null +++ b/modules/cbam/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + com.thing + modules + 5.1 + + + com.thing.modules + cbam + jar + ThingBI Server Modules cbam + + + + UTF-8 + + + + + + + org.projectlombok + lombok + + + + com.thing.modules + thing + + + + + + + \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java new file mode 100644 index 0000000..0a88274 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java @@ -0,0 +1,95 @@ +package com.thing.cbam.baesInfoExcel.controller; + + +import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; +import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; +import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.exception.SysException; +import com.thing.common.core.utils.ConvertUtils; +import com.thing.common.core.validator.AssertUtils; +import com.thing.common.core.web.response.PageData; +import com.thing.common.core.web.response.Result; +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 jakarta.annotation.Resource; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Objects; + +@RestController +@RequestMapping("v2/cbam/industry") +@Tag(name = "基础信息A表") +@RequiredArgsConstructor +public class CbamIndustryController { + + @Resource + private CbamIndustryService service; + + @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 param) { + PageData pageList = service.getPageData(param,CbamIndustryDTO.class); + return new Result>().ok(pageList); + } + + + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id) { + CbamIndustryDTO dto = service.findById(id); + return new Result().ok(dto); + } + + @PostMapping + @Operation(summary = "保存") + @LogOperation("保存") + public Result save(@RequestBody CbamIndustryDTO dto) { + service.saveEntity(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary = "修改") + @LogOperation("修改") + public Result update(@RequestBody CbamIndustryDTO dto) { + //效验数据 + //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + Long id = dto.getId(); + if(Objects.isNull(id)){ + throw new SysException("id不能为空"); + } + service.updateById(ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class)); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary = "删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + service.batchDelete(ids); + return new Result<>(); + } + +// @PostMapping("export") +// @Operation(summary = "导出") +// @LogOperation("导出") +// public void export(@RequestBody Long[] ids, @RequestParam Map params, HttpServletResponse response) { +// ExcelUtils.exportExcel(service.export(ids, params), "物模型列表", "物模型", IotThingModelExcel.class, "物模型列表.xls", response); +// } + + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamMaterialController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamMaterialController.java new file mode 100644 index 0000000..003385a --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamMaterialController.java @@ -0,0 +1,69 @@ +package com.thing.cbam.baesInfoExcel.controller; + + +import com.thing.cbam.baesInfoExcel.dto.CbamMaterialDTO; +import com.thing.cbam.baesInfoExcel.service.CbamMaterialService; +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.web.response.PageData; +import com.thing.common.core.web.response.Result; +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; + +@RestController +@RequestMapping("v2/cbam/material") +@Tag(name = "原材料") +@RequiredArgsConstructor +public class CbamMaterialController { + private final CbamMaterialService cbamMaterialService; + @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 = cbamMaterialService.getPageData(params, CbamMaterialDTO.class); + return new Result>().ok(page); + } + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id) { + CbamMaterialDTO data = cbamMaterialService.getByIdAs(id, CbamMaterialDTO.class); + return new Result().ok(data); + } + @PostMapping + @Operation(summary = "保存") + @LogOperation("保存") + public Result save(@RequestBody CbamMaterialDTO dto) { + cbamMaterialService.saveDto(dto); + return new Result<>(); + } + @PutMapping + @Operation(summary = "修改") + @LogOperation("修改") + public Result update(@RequestBody CbamMaterialDTO dto) { + //效验数据 + cbamMaterialService.updateDto(dto); + return new Result<>(); + } + @DeleteMapping + @Operation(summary = "删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamMaterialService.batchDelete(ids); + return new Result<>(); + } + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProductInfoController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProductInfoController.java new file mode 100644 index 0000000..7f78a18 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProductInfoController.java @@ -0,0 +1,98 @@ +package com.thing.cbam.baesInfoExcel.controller; + +import com.thing.cbam.baesInfoExcel.dto.CbamProductInfoDTO; +import com.thing.cbam.baesInfoExcel.service.CbamProductInfoService; +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 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-11-27 +*/ +@RestController +@RequestMapping("v2/cbam/product") +@Tag(name="综合商品类别和相关生产过程") +@RequiredArgsConstructor +public class CbamProductInfoController { + + private final CbamProductInfoService cbamProductInfoService; + + @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 = cbamProductInfoService.getPageData(params, CbamProductInfoDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamProductInfoDTO data = cbamProductInfoService.getByIdAs(id, CbamProductInfoDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamProductInfoDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamProductInfoService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamProductInfoDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamProductInfoService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamProductInfoService.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 = cbamProductInfoService.listAs(params, CbamProductInfoDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "综合商品类别和相关生产过程", list, CbamProductInfoExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java new file mode 100644 index 0000000..2636fe0 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java @@ -0,0 +1,100 @@ +package com.thing.cbam.baesInfoExcel.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +@Data +@Schema(description = "基础信息表") +public class CbamIndustryDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + + @Schema(description = "主键id") + private Long id; + @Schema(description = "所属行业") + private String industry; + @Schema(description = "开始日期：11位数") + private Long startDate; + @Schema(description = "结束日期：11位数") + private Long endDate; + @Schema(description = "报告周期说明：默认情况是一整个日历年") + private String cycleDesc; + @Schema(description = "生产工厂名称") + private String factoryName; + @Schema(description = "街道编号") + private String streetNum; + @Schema(description = "在欧盟进行的主要经济活动") + private String economicActivities; + @Schema(description = "邮政编码") + private String postalCode; + @Schema(description = "邮政信箱") + private String postBox; + @Schema(description = "城市") + private String city; + @Schema(description = "国家") + private String country; + @Schema(description = "国际港口代码") + private String internationalCode; + @Schema(description = "生产坐标经度") + private String factoryLongitude; + @Schema(description = "生产坐标纬度") + private String factoryLatitude; + @Schema(description = "授权代表姓名") + private String authorizedName; + @Schema(description = "电子邮件") + private String email; + @Schema(description = "电话") + private String telephone; + @Schema(description = "是否涉及原料：0否1是") + private Integer materialMark; + + + private List cbamProductList; + + private List cbamMaterialList; + + /*------------------------租户信息--------------------------------*/ + + /** + * 租户编码 + */ + private Long tenantCode; + + /** + * 公司id + */ + private Long companyId; + + /** + * 部门id + */ + private Long deptId; + + /*------------------------修改记录信息--------------------------------*/ + + /** + * 创建者 + */ + private Long creator; + + /** + * 创建时间 + */ + private Long createDate; + + /** + * 修改人 + */ + private Long updater; + /** + * 修改时间 + */ + private Long updateDate; + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamMaterialDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamMaterialDTO.java new file mode 100644 index 0000000..bcd21ad --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamMaterialDTO.java @@ -0,0 +1,30 @@ +package com.thing.cbam.baesInfoExcel.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-11-27 +*/ +@Data +@Schema(description = "原材料") +public class CbamMaterialDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "原材料名称") + private String rawMaterialName; + @Schema(description = "原材料的综合商品类别") + private String materialCategories; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProductInfoDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProductInfoDTO.java new file mode 100644 index 0000000..541c514 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProductInfoDTO.java @@ -0,0 +1,38 @@ +package com.thing.cbam.baesInfoExcel.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-11-26 +*/ +@Data +@Schema(description = "综合商品类别和相关生产过程") +public class CbamProductInfoDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "产品名称") + private String productName; + @Schema(description = "总产量") + private String totalOutput; + @Schema(description = "HS代码") + private String hsCode; + @Schema(description = "产品生产过程") + private String productionProcess; + @Schema(description = "综合商品类别") + private String comprehensiveProductCategories; + @Schema(description = "工艺路线") + private String processRoute; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java new file mode 100644 index 0000000..9cd8e3b --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java @@ -0,0 +1,35 @@ +package com.thing.cbam.baesInfoExcel.entity; + +import com.mybatisflex.annotation.Table; +import com.thing.common.orm.entity.BaseInfoEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Table("cbam_industry_info") +public class CbamIndustryEntity extends BaseInfoEntity { + + + private String industry; + private Long startDate; + private Long endDate; + private String cycleDesc; + private String factoryName; + private String streetNum; + private String economicActivities; + private String postalCode; + private String postBox; + private String city; + private String country; + private String internationalCode; + private String factoryLongitude; + private String factoryLatitude; + private String authorizedName; + private String email; + private String telephone; + private Integer materialMark; + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamMaterialEntity.java new file mode 100644 index 0000000..a7cc7bb --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamMaterialEntity.java @@ -0,0 +1,41 @@ +package com.thing.cbam.baesInfoExcel.entity; + +import com.mybatisflex.annotation.Id; +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-11-27 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_industry_material") +public class CbamMaterialEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L;//数据序列化 + + @Id + private Long id; + /** + * 原材料名称 + */ + private String rawMaterialName; + /** + * 原材料的综合商品类别 + */ + private String materialCategories; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProductInfoEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProductInfoEntity.java new file mode 100644 index 0000000..ccf3346 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProductInfoEntity.java @@ -0,0 +1,55 @@ +package com.thing.cbam.baesInfoExcel.entity; + +import com.mybatisflex.annotation.Table; +import com.thing.common.orm.entity.BaseInfoEntity; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 综合商品类别和相关生产过程 + * + * @author xc + * @since 3.0 2024-11-26 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_product_info") +public class CbamProductInfoEntity extends BaseInfoEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 产品名称 + */ + private String productName; + /** + * 总产量 + */ + private String totalOutput; + /** + * HS代码 + */ + private String hsCode; + /** + * 产品生产过程 + */ + private String productionProcess; + /** + * 综合商品类别 + */ + private String comprehensiveProductCategories; + /** + * 工艺路线 + */ + private String processRoute; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java new file mode 100644 index 0000000..21288dc --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java @@ -0,0 +1,11 @@ +package com.thing.cbam.baesInfoExcel.mapper; + + +import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamIndustryMapper extends PowerBaseMapper { + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamMaterialMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamMaterialMapper.java new file mode 100644 index 0000000..228f048 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamMaterialMapper.java @@ -0,0 +1,10 @@ +package com.thing.cbam.baesInfoExcel.mapper; + + +import com.thing.cbam.baesInfoExcel.entity.CbamMaterialEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamMaterialMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProductInfoMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProductInfoMapper.java new file mode 100644 index 0000000..b503cb7 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProductInfoMapper.java @@ -0,0 +1,17 @@ +package com.thing.cbam.baesInfoExcel.mapper; + +import com.thing.cbam.baesInfoExcel.entity.CbamProductInfoEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; + +import org.apache.ibatis.annotations.Mapper; + +/** +* 综合商品类别和相关生产过程 +* +* @author xc +* @since 3.0 2024-11-27 +*/ +@Mapper +public interface CbamProductInfoMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java new file mode 100644 index 0000000..1244d01 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java @@ -0,0 +1,18 @@ +package com.thing.cbam.baesInfoExcel.service; + + +import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; +import com.thing.common.orm.service.IBaseService; + + +public interface CbamIndustryService extends IBaseService { + + + CbamIndustryDTO findById(Long id); + + + void saveEntity(CbamIndustryDTO dto); + + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamMaterialService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamMaterialService.java new file mode 100644 index 0000000..7db73aa --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamMaterialService.java @@ -0,0 +1,13 @@ +package com.thing.cbam.baesInfoExcel.service; + + +import com.thing.cbam.baesInfoExcel.dto.CbamMaterialDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamMaterialEntity; +import com.thing.common.orm.service.IBaseService; + +import java.util.List; + +public interface CbamMaterialService extends IBaseService { + List findListByIndustryId(Long industryId); + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProductInfoService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProductInfoService.java new file mode 100644 index 0000000..20d0246 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProductInfoService.java @@ -0,0 +1,22 @@ +package com.thing.cbam.baesInfoExcel.service; + + +import com.thing.cbam.baesInfoExcel.dto.CbamProductInfoDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamProductInfoEntity; +import com.thing.common.orm.service.IBaseService; + +import java.util.List; + + +/** + * 综合商品类别和相关生产过程 + * + * @author xc + * @since 3.0 2024-11-26 + */ +public interface CbamProductInfoService extends IBaseService { + + + List findListByIndustryId(Long industryId); + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java new file mode 100644 index 0000000..dbea3ab --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java @@ -0,0 +1,87 @@ +package com.thing.cbam.baesInfoExcel.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import com.mybatisflex.core.query.QueryWrapper; + +import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; +import com.thing.cbam.baesInfoExcel.dto.CbamMaterialDTO; +import com.thing.cbam.baesInfoExcel.dto.CbamProductInfoDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; +import com.thing.cbam.baesInfoExcel.entity.CbamMaterialEntity; +import com.thing.cbam.baesInfoExcel.entity.CbamProductInfoEntity; +import com.thing.cbam.baesInfoExcel.mapper.CbamIndustryMapper; +import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; +import com.thing.cbam.baesInfoExcel.service.CbamMaterialService; +import com.thing.cbam.baesInfoExcel.service.CbamProductInfoService; +import com.thing.common.core.constants.Constant; +import com.thing.common.core.exception.SysException; +import com.thing.common.core.utils.ConvertUtils; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import jakarta.annotation.Resource; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.Objects; + +@Service +public class CbamIndustryServiceImpl extends BaseServiceImpl implements CbamIndustryService { + @Resource + private CbamProductInfoService cbamProductInfoService; + + @Resource + private CbamMaterialService cbamMaterialService; + + + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + //String code = (String) params.get("code"); + + Long startTime = (Long) params.get("startTime"); + Long endTime = (Long) params.get("endTime"); + String orderField = (String) params.get("orderField"); + String order = (String) params.get("order"); + wrapper.between(CbamIndustryEntity::getCreateDate, + startTime, + endTime, + !Objects.isNull(startTime) && !Objects.isNull(endTime)) + .orderBy(StringUtils.isNotBlank(orderField) ? orderField : "create_date", StringUtils.equals(order, Constant.ASC)) + ; + return wrapper; + } + + + @Override + public CbamIndustryDTO findById(Long id) { + CbamIndustryDTO dto = mapper.selectObjectByQueryAs(QueryWrapper.create().eq(CbamIndustryEntity::getId, id), CbamIndustryDTO.class); + if (Objects.isNull(dto)) { + throw new SysException("CBAM行业，企业信息为空"); + } + List cbamProductInfoDTOList = cbamProductInfoService.findListByIndustryId(id); + dto.setCbamProductList(cbamProductInfoDTOList); + + List cbamMaterialDTOList = cbamMaterialService.findListByIndustryId(id); + dto.setCbamMaterialList(cbamMaterialDTOList); + + return dto; + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void saveEntity(CbamIndustryDTO dto) { + //逻辑： + mapper.insert(ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class)); + List cbamProductList = dto.getCbamProductList(); + List cbamMaterialList = dto.getCbamMaterialList(); + + if (CollectionUtil.isNotEmpty(cbamProductList)) { + cbamProductInfoService.saveBatch(ConvertUtils.sourceToTarget(cbamProductList, CbamProductInfoEntity.class)); + } + if (CollectionUtil.isNotEmpty(cbamMaterialList)) { + cbamMaterialService.saveBatch(ConvertUtils.sourceToTarget(cbamMaterialList, CbamMaterialEntity.class)); + } + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamMaterialServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamMaterialServiceImpl.java new file mode 100644 index 0000000..920b6a1 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamMaterialServiceImpl.java @@ -0,0 +1,27 @@ +package com.thing.cbam.baesInfoExcel.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; + +import com.thing.cbam.baesInfoExcel.dto.CbamMaterialDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamMaterialEntity; +import com.thing.cbam.baesInfoExcel.mapper.CbamMaterialMapper; +import com.thing.cbam.baesInfoExcel.service.CbamMaterialService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service +public class CbamMaterialServiceImpl extends BaseServiceImpl implements CbamMaterialService { + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + @Override + public List findListByIndustryId(Long industryId) { + return mapper.selectListByQueryAs(QueryWrapper.create().eq(CbamMaterialEntity::getIndustryId,industryId), CbamMaterialDTO.class); + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProductInfoServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProductInfoServiceImpl.java new file mode 100644 index 0000000..bfc9470 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProductInfoServiceImpl.java @@ -0,0 +1,36 @@ +package com.thing.cbam.baesInfoExcel.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; + +import com.thing.cbam.baesInfoExcel.dto.CbamProductInfoDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamProductInfoEntity; +import com.thing.cbam.baesInfoExcel.mapper.CbamProductInfoMapper; +import com.thing.cbam.baesInfoExcel.service.CbamProductInfoService; +import com.thing.common.orm.service.impl.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * 综合商品类别和相关生产过程 + * + * @author xc + * @since 3.0 2024-11-26 + */ +@Service +public class CbamProductInfoServiceImpl extends BaseServiceImpl implements CbamProductInfoService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + + @Override + public List findListByIndustryId(Long industryId){ + return mapper.selectListByQueryAs(QueryWrapper.create().eq(CbamProductInfoEntity::getIndustryId,industryId), CbamProductInfoDTO.class); + } +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java new file mode 100644 index 0000000..a61c54b --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java @@ -0,0 +1,85 @@ +package com.thing.cbam.carbonPrice.controller; + +import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; +import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService; +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.web.response.PageData; +import com.thing.common.core.web.response.Result; +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 jakarta.annotation.Resource; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequestMapping("v2/price/tool") +@Tag(name = "碳价工具") +@RequiredArgsConstructor +public class CbamCarbonPriceToolController { + + @Resource + private CbamCarbonPriceToolService cbamCarbonPriceToolServicevice; + + @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 param) { + PageData pageList = cbamCarbonPriceToolServicevice.getPageData(param, CbamCarbonPriceToolDTO.class); + return new Result>().ok(pageList); + } + @GetMapping("{id}") + @Operation(summary = "信息") + @LogOperation("信息") + public Result info(@PathVariable("id") String id) { + CbamCarbonPriceToolDTO dto = cbamCarbonPriceToolServicevice.getByIdAs(id, CbamCarbonPriceToolDTO.class); + return new Result().ok(dto); + } + @PostMapping + @Operation(summary = "保存") + @LogOperation("保存") + public Result save(@RequestBody CbamCarbonPriceToolDTO dto) { + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamCarbonPriceToolServicevice.saveDto(dto); + return new Result<>(); + } + @PutMapping + @Operation(summary = "修改") + @LogOperation("修改") + public Result update(@RequestBody CbamCarbonPriceToolDTO dto) { + //实验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamCarbonPriceToolServicevice.updateDto(dto); + return new Result<>(); + } + @DeleteMapping + @Operation(summary = "删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids) { + AssertUtils.isArrayEmpty(ids,"id"); + cbamCarbonPriceToolServicevice.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); + *} + */ +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java new file mode 100644 index 0000000..806a718 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java @@ -0,0 +1,38 @@ +package com.thing.cbam.carbonPrice.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-11-28 +*/ +@Data +@Schema(description = "碳价工具") +public class CbamCarbonPriceToolDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "碳价工具") + private String priceTool; + @Schema(description = "其他附加说明") + private String otherInfo; + @Schema(description = "货币") + private String currency; + @Schema(description = "配额缺口占总配额的比例") + private String gapProportion; + @Schema(description = "国内碳价") + private String carbonPrice; + @Schema(description = "抵扣金额") + private String deductionAmount; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java new file mode 100644 index 0000000..d560848 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java @@ -0,0 +1,57 @@ +package com.thing.cbam.carbonPrice.entity; + +import com.mybatisflex.annotation.Id; +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-11-28 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_carbon_price_tool") +public class CbamCarbonPriceToolEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 碳价工具 + */ + private String priceTool; + /** + * 其他附加说明 + */ + private String otherInfo; + /** + * 货币 + */ + private String currency; + /** + * 配额缺口占总配额的比例 + */ + private String gapProportion; + /** + * 国内碳价 + */ + private String carbonPrice; + /** + * 抵扣金额 + */ + private String deductionAmount; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java new file mode 100644 index 0000000..c081936 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java @@ -0,0 +1,9 @@ +package com.thing.cbam.carbonPrice.mapper; + +import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamCarbonPriceToolMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java new file mode 100644 index 0000000..07af157 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java @@ -0,0 +1,7 @@ +package com.thing.cbam.carbonPrice.service; + +import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamCarbonPriceToolService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java new file mode 100644 index 0000000..764a54b --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java @@ -0,0 +1,19 @@ +package com.thing.cbam.carbonPrice.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; +import com.thing.cbam.carbonPrice.mapper.CbamCarbonPriceToolMapper; +import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class CbamCarbonPriceToolServiceImpl extends BaseServiceImpl implements CbamCarbonPriceToolService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java new file mode 100644 index 0000000..4617de9 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java @@ -0,0 +1,99 @@ +package com.thing.cbam.dict.controller; + +import com.thing.cbam.dict.dto.CbamHsDictDTO; +import com.thing.cbam.dict.service.CbamHsDictService; +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 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; + +/** +* hs字典表 +* +* @author xc +* @since 3.0 2024-11-29 +*/ +@RestController +@RequestMapping("v2/hs字典表/cbamhsdict") +@Tag(name="hs字典表") +@RequiredArgsConstructor +public class CbamHsDictController { + + private final CbamHsDictService cbamHsDictService; + + @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 = cbamHsDictService.getPageData(params, CbamHsDictDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamHsDictDTO data = cbamHsDictService.getByIdAs(id, CbamHsDictDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamHsDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamHsDictService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamHsDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamHsDictService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamHsDictService.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 = cbamHsDictService.listAs(params, CbamHsDictDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "hs字典表", list, CbamHsDictExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java new file mode 100644 index 0000000..1dd3cca --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java @@ -0,0 +1,99 @@ + + +import com.thing.cbam.dict.dto.CbamIndustryDictDTO; +import com.thing.cbam.dict.service.CbamIndustryDictService; +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 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-11-29 +*/ +@RestController +@RequestMapping("v2/所属行业字典/cbamindustrydict") +@Tag(name="所属行业字典") +@RequiredArgsConstructor +public class CbamIndustryDictController { + + private final CbamIndustryDictService cbamIndustryDictService; + + @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 = cbamIndustryDictService.getPageData(params, CbamIndustryDictDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamIndustryDictDTO data = cbamIndustryDictService.getByIdAs(id, CbamIndustryDictDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamIndustryDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamIndustryDictService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamIndustryDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamIndustryDictService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamIndustryDictService.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 = cbamIndustryDictService.listAs(params, CbamIndustryDictDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "所属行业字典", list, CbamIndustryDictExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java new file mode 100644 index 0000000..c8e6664 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java @@ -0,0 +1,99 @@ +package com.thing.cbam.dict.controller; + +import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; +import com.thing.cbam.dict.service.CbamProdProcessDictService; +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 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-11-29 +*/ +@RestController +@RequestMapping("v2/工艺路线映射表/cbamprodprocessdict") +@Tag(name="原料（生产过程）---工艺路线映射表") +@RequiredArgsConstructor +public class CbamProdProcessDictController { + + private final CbamProdProcessDictService cbamProdProcessDictService; + + @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 = cbamProdProcessDictService.getPageData(params, CbamProdProcessDictDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamProdProcessDictDTO data = cbamProdProcessDictService.getByIdAs(id, CbamProdProcessDictDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamProdProcessDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamProdProcessDictService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamProdProcessDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamProdProcessDictService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamProdProcessDictService.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 = cbamProdProcessDictService.listAs(params, CbamProdProcessDictDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "原料（生产过程）---工艺路线映射表", list, CbamProdProcessDictExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java new file mode 100644 index 0000000..e0b05dc --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java @@ -0,0 +1,37 @@ +package com.thing.cbam.dict.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* hs字典表 +* +* @author xc +* @since 3.0 2024-11-29 +*/ +@Data +@Schema(description = "hs字典表") +public class CbamHsDictDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "主键") + private Long id; + @Schema(description = "预留字段,可以关联") + private String name; + @Schema(description = "hs编码") + private String code; + @Schema(description = "排序") + private String sort; + @Schema(description = "类型预留字段") + private String type; + @Schema(description = "英文名称预留字段") + private String ename; + @Schema(description = "关联cbam_prod_process_dict的id") + private Long prodProcessId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java new file mode 100644 index 0000000..657253f --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java @@ -0,0 +1,31 @@ +package com.thing.cbam.dict.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-11-29 +*/ +@Data +@Schema(description = "所属行业字典") +public class CbamIndustryDictDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "主键") + private Long id; + @Schema(description = "中文名称") + private String name; + @Schema(description = "英文名称") + private String ename; + @Schema(description = "排序") + private Integer sort; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java new file mode 100644 index 0000000..f570fc4 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java @@ -0,0 +1,37 @@ +package com.thing.cbam.dict.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-11-29 +*/ +@Data +@Schema(description = "原料（生产过程）---工艺路线映射表") +public class CbamProdProcessDictDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "主键") + private Long id; + @Schema(description = "中文名称") + private String name; + @Schema(description = "英文名称") + private String ename; + @Schema(description = "类型") + private String type; + @Schema(description = "排序") + private Integer sort; + @Schema(description = "是否表黄：0否 1是") + private Integer tagging; + @Schema(description = "关联：当type=yl 关联 cbam_industry_dict 主键id，否则关联本表的id") + private Long pidId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java new file mode 100644 index 0000000..01359eb --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java @@ -0,0 +1,56 @@ +package com.thing.cbam.dict.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.Table; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * hs字典表 + * + * @author xc + * @since 3.0 2024-11-29 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_hs_dict") +public class CbamHsDictEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @Id + private Long id; + /** + * 预留字段,可以关联 + */ + private String name; + /** + * hs编码 + */ + private String code; + /** + * 排序 + */ + private String sort; + /** + * 类型预留字段 + */ + private String type; + /** + * 英文名称预留字段 + */ + private String ename; + /** + * 关联cbam_prod_process_dict的id + */ + private Long prodProcessId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java new file mode 100644 index 0000000..efd76e8 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java @@ -0,0 +1,44 @@ +package com.thing.cbam.dict.entity; + +import com.mybatisflex.annotation.Id; +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-11-29 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_industry_dict") +public class CbamIndustryDictEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @Id + private Long id; + /** + * 中文名称 + */ + private String name; + /** + * 英文名称 + */ + private String ename; + /** + * 排序 + */ + private Integer sort; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java new file mode 100644 index 0000000..895a333 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java @@ -0,0 +1,56 @@ +package com.thing.cbam.dict.entity; + +import com.mybatisflex.annotation.Id; +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-11-29 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_prod_process_dict") +public class CbamProdProcessDictEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @Id + private Long id; + /** + * 中文名称 + */ + private String name; + /** + * 英文名称 + */ + private String ename; + /** + * 类型 + */ + private String type; + /** + * 排序 + */ + private Integer sort; + /** + * 是否表黄：0否 1是 + */ + private Integer tagging; + /** + * 关联：当type=yl 关联 cbam_industry_dict 主键id，否则关联本表的id + */ + private Long pidId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java new file mode 100644 index 0000000..66b559f --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java @@ -0,0 +1,17 @@ +package com.thing.cbam.dict.mapper; + +import com.thing.cbam.dict.entity.CbamHsDictEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; + +import org.apache.ibatis.annotations.Mapper; + +/** +* hs字典表 +* +* @author xc +* @since 3.0 2024-11-29 +*/ +@Mapper +public interface CbamHsDictMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java new file mode 100644 index 0000000..872053b --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java @@ -0,0 +1,17 @@ +package com.thing.cbam.dict.mapper; + +import com.thing.cbam.dict.entity.CbamIndustryDictEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; + +import org.apache.ibatis.annotations.Mapper; + +/** +* 所属行业字典 +* +* @author xc +* @since 3.0 2024-11-29 +*/ +@Mapper +public interface CbamIndustryDictMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java new file mode 100644 index 0000000..2091bfb --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java @@ -0,0 +1,17 @@ +package com.thing.cbam.dict.mapper; + +import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; + +import org.apache.ibatis.annotations.Mapper; + +/** +* 原料（生产过程）---工艺路线映射表 +* +* @author xc +* @since 3.0 2024-11-29 +*/ +@Mapper +public interface CbamProdProcessDictMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java new file mode 100644 index 0000000..8e57db4 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java @@ -0,0 +1,15 @@ +package com.thing.cbam.dict.service; + +import com.thing.cbam.dict.entity.CbamHsDictEntity; +import com.thing.common.orm.service.IBaseService; + + +/** + * hs字典表 + * + * @author xc + * @since 3.0 2024-11-29 + */ +public interface CbamHsDictService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java new file mode 100644 index 0000000..971f161 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java @@ -0,0 +1,15 @@ +package com.thing.cbam.dict.service; + +import com.thing.cbam.dict.entity.CbamIndustryDictEntity; +import com.thing.common.orm.service.IBaseService; + + +/** + * 所属行业字典 + * + * @author xc + * @since 3.0 2024-11-29 + */ +public interface CbamIndustryDictService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java new file mode 100644 index 0000000..51d3591 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java @@ -0,0 +1,15 @@ +package com.thing.cbam.dict.service; + +import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; +import com.thing.common.orm.service.IBaseService; + + +/** + * 原料（生产过程）---工艺路线映射表 + * + * @author xc + * @since 3.0 2024-11-29 + */ +public interface CbamProdProcessDictService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java new file mode 100644 index 0000000..90d64d4 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java @@ -0,0 +1,29 @@ +package com.thing.cbam.dict.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.dict.entity.CbamHsDictEntity; +import com.thing.cbam.dict.mapper.CbamHsDictMapper; +import com.thing.cbam.dict.service.CbamHsDictService; +import com.thing.common.orm.service.impl.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * hs字典表 + * + * @author xc + * @since 3.0 2024-11-29 + */ +@Service +public class CbamHsDictServiceImpl extends BaseServiceImpl implements CbamHsDictService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java new file mode 100644 index 0000000..32a653b --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java @@ -0,0 +1,29 @@ +package com.thing.cbam.dict.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.dict.entity.CbamIndustryDictEntity; +import com.thing.cbam.dict.mapper.CbamIndustryDictMapper; +import com.thing.cbam.dict.service.CbamIndustryDictService; +import com.thing.common.orm.service.impl.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 所属行业字典 + * + * @author xc + * @since 3.0 2024-11-29 + */ +@Service +public class CbamIndustryDictServiceImpl extends BaseServiceImpl implements CbamIndustryDictService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java new file mode 100644 index 0000000..ccf8cf0 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java @@ -0,0 +1,29 @@ +package com.thing.cbam.dict.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; +import com.thing.cbam.dict.mapper.CbamProdProcessDictMapper; +import com.thing.cbam.dict.service.CbamProdProcessDictService; +import com.thing.common.orm.service.impl.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 原料（生产过程）---工艺路线映射表 + * + * @author xc + * @since 3.0 2024-11-29 + */ +@Service +public class CbamProdProcessDictServiceImpl extends BaseServiceImpl implements CbamProdProcessDictService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java new file mode 100644 index 0000000..6447633 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java @@ -0,0 +1,99 @@ +package com.thing.cbam.directCarbon.controller; + +import com.thing.cbam.directCarbon.dto.CbamCarbonBurnDTO; +import com.thing.cbam.directCarbon.service.CbamCarbonBurnService; +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 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-11-27 +*/ +@RestController +@RequestMapping("v2/cbam/carbon/burn") +@Tag(name="直接排放量") +@RequiredArgsConstructor +public class CbamCarbonBurnController { + + private final CbamCarbonBurnService cbamCarbonBurnService; + + @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 = cbamCarbonBurnService.getPageData(params, CbamCarbonBurnDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamCarbonBurnDTO data = cbamCarbonBurnService.getByIdAs(id, CbamCarbonBurnDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamCarbonBurnDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamCarbonBurnService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamCarbonBurnDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamCarbonBurnService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamCarbonBurnService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java new file mode 100644 index 0000000..3004269 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java @@ -0,0 +1,89 @@ +package com.thing.cbam.directCarbon.controller; + +import com.thing.cbam.directCarbon.dto.CbamCarbonMaterialDTO; +import com.thing.cbam.directCarbon.service.CbamCarbonMaterialService; +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 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.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequestMapping("v2/cbam/carbon/material") +@Tag(name = "原材料") +@RequiredArgsConstructor +public class CbamCarbonMaterialController { + private final CbamCarbonMaterialService cbamCarbonMaterialService; + @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 = cbamCarbonMaterialService.getPageData(params, CbamCarbonMaterialDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamCarbonMaterialDTO data = cbamCarbonMaterialService.getByIdAs(id, CbamCarbonMaterialDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamCarbonMaterialDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamCarbonMaterialService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamCarbonMaterialDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamCarbonMaterialService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamCarbonMaterialService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); + *} + */ +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMonitorController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMonitorController.java new file mode 100644 index 0000000..515bd57 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMonitorController.java @@ -0,0 +1,87 @@ +package com.thing.cbam.directCarbon.controller; + +import com.thing.cbam.directCarbon.dto.CbamCarbonMonitorDTO; +import com.thing.cbam.directCarbon.service.CbamCarbonMonitorService; +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 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; + +@RestController +@RequestMapping("v2/cbam/carbon/monitor") +@Tag(name="排放源监测") +@RequiredArgsConstructor +public class CbamCarbonMonitorController { + private final CbamCarbonMonitorService cbamCarbonMonitorService; + @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 = cbamCarbonMonitorService.getPageData(params, CbamCarbonMonitorDTO.class); + return new Result>().ok(page); + } + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamCarbonMonitorDTO data = cbamCarbonMonitorService.getByIdAs(id, CbamCarbonMonitorDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamCarbonMonitorDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamCarbonMonitorService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamCarbonMonitorDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamCarbonMonitorService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamCarbonMonitorService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); + *} + */ +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java new file mode 100644 index 0000000..0728320 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java @@ -0,0 +1,88 @@ +package com.thing.cbam.directCarbon.controller; + +import com.thing.cbam.directCarbon.dto.CbamCarbonProgressDTO; +import com.thing.cbam.directCarbon.service.CbamCarbonProgressService; +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 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; + +@RestController +@RequestMapping("v2/cbam/carbon/progress") +@Tag(name="原料过程排放") +@RequiredArgsConstructor +public class CbamCarbonProgressController { + private final CbamCarbonProgressService cbamCarbonProgressService; + @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 = cbamCarbonProgressService.getPageData(params, CbamCarbonProgressDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamCarbonProgressDTO data = cbamCarbonProgressService.getByIdAs(id, CbamCarbonProgressDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamCarbonProgressDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamCarbonProgressService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamCarbonProgressDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamCarbonProgressService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamCarbonProgressService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); + *} + */ +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java new file mode 100644 index 0000000..c05a56c --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java @@ -0,0 +1,42 @@ +package com.thing.cbam.directCarbon.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** +* 直接排放量 +* +* @author xc +* @since 3.0 2024-11-27 +*/ +@Data +@Schema(description = "直接排放量") +public class CbamCarbonBurnDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "名称") + private String name; + @Schema(description = "消耗量") + private String consumAmount; + @Schema(description = "低位发热量") + private String lowheatGener; + @Schema(description = "排放源名称") + private String emissionName; + @Schema(description = "排放因子") + private String emissionFactors; + @Schema(description = "氧化因子") + private String oxidationFactor; + @Schema(description = "生物量含量") + private String biomassContent; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMaterialDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMaterialDTO.java new file mode 100644 index 0000000..88ccd1e --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMaterialDTO.java @@ -0,0 +1,30 @@ +package com.thing.cbam.directCarbon.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-11-27 +*/ +@Data +@Schema(description = "原材料") +public class CbamCarbonMaterialDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "原材料名称") + private String rawMaterialName; + @Schema(description = "原材料的综合商品类别") + private String materialCategories; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMonitorDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMonitorDTO.java new file mode 100644 index 0000000..76e2e54 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMonitorDTO.java @@ -0,0 +1,42 @@ +package com.thing.cbam.directCarbon.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-11-27 +*/ +@Data +@Schema(description = "排放源监测") +public class CbamCarbonMonitorDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "名称") + private String name; + @Schema(description = "温室气体类型") + private String typeGas; + @Schema(description = "生物质组分") + private String biomassComp; + @Schema(description = "每小时平均温室气体浓度") + private String gasConcen; + @Schema(description = "运行小时数") + private String operHours; + @Schema(description = "烟气（平均值）") + private String smokeAver; + @Schema(description = "能量含量（化石燃料）") + private String fossilContent; + @Schema(description = "能量含量（生物质燃料）") + private String biomassContent; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java new file mode 100644 index 0000000..692283b --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java @@ -0,0 +1,34 @@ +package com.thing.cbam.directCarbon.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-11-27 +*/ +@Data +@Schema(description = "原料过程排放") +public class CbamCarbonProgressDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "名称") + private String name; + @Schema(description = "消耗量") + private String consumAmount; + @Schema(description = "排放因子") + private String emissionFactors; + @Schema(description = "排放源名称") + private String emissionName; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java new file mode 100644 index 0000000..20a4fbd --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java @@ -0,0 +1,61 @@ +package com.thing.cbam.directCarbon.entity; + +import com.mybatisflex.annotation.Id; +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-11-27 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_carbon_burn") +public class CbamCarbonBurnEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 名称 + */ + private String name; + /** + * 消耗量 + */ + private String consumAmount; + /** + * 低位发热量 + */ + private String lowheatGener; + /** + * 排放源名称 + */ + private String emissionName; + /** + * 排放因子 + */ + private String emissionFactors; + /** + * 氧化因子 + */ + private String oxidationFactor; + /** + * 生物量含量 + */ + private String biomassContent; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMaterialEntity.java new file mode 100644 index 0000000..d419715 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMaterialEntity.java @@ -0,0 +1,42 @@ +package com.thing.cbam.directCarbon.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_carbon_material") +public class CbamCarbonMaterialEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + @Id + private Long id; + /** + * 名称 + */ + private String name; + /** + * 消耗量产量 + */ + private String consumOutput; + /** + * 碳含量 + */ + private String carbonContent; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; + /** + * 排放源名称 + */ + private String emissionName; + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMonitorEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMonitorEntity.java new file mode 100644 index 0000000..c16a873 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMonitorEntity.java @@ -0,0 +1,65 @@ +package com.thing.cbam.directCarbon.entity; + +import com.mybatisflex.annotation.Id; +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-11-27 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_carbon_monitor") +public class CbamCarbonMonitorEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 名称 + */ + private String name; + /** + * 温室气体类型 + */ + private String typeGas; + /** + * 生物质组分 + */ + private String biomassComp; + /** + * 每小时平均温室气体浓度 + */ + private String gasConcen; + /** + * 运行小时数 + */ + private String operHours; + /** + * 烟气（平均值） + */ + private String smokeAver; + /** + * 能量含量（化石燃料） + */ + private String fossilContent; + /** + * 能量含量（生物质燃料） + */ + private String biomassContent; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java new file mode 100644 index 0000000..a25a7f9 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java @@ -0,0 +1,49 @@ +package com.thing.cbam.directCarbon.entity; + +import com.mybatisflex.annotation.Id; +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-11-27 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_carbon_progress") +public class CbamCarbonProgressEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 名称 + */ + private String name; + /** + * 消耗量 + */ + private String consumAmount; + /** + * 排放因子 + */ + private String emissionFactors; + /** + * 排放源名称 + */ + private String emissionName; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonBurnMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonBurnMapper.java new file mode 100644 index 0000000..3a038ed --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonBurnMapper.java @@ -0,0 +1,17 @@ +package com.thing.cbam.directCarbon.mapper; + +import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; + +import org.apache.ibatis.annotations.Mapper; + +/** +* 直接排放量 +* +* @author xc +* @since 3.0 2024-11-27 +*/ +@Mapper +public interface CbamCarbonBurnMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMaterialMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMaterialMapper.java new file mode 100644 index 0000000..993c927 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMaterialMapper.java @@ -0,0 +1,9 @@ +package com.thing.cbam.directCarbon.mapper; + +import com.thing.cbam.directCarbon.entity.CbamCarbonMaterialEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamCarbonMaterialMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMonitorMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMonitorMapper.java new file mode 100644 index 0000000..4fe09b1 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMonitorMapper.java @@ -0,0 +1,9 @@ +package com.thing.cbam.directCarbon.mapper; + +import com.thing.cbam.directCarbon.entity.CbamCarbonMonitorEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamCarbonMonitorMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java new file mode 100644 index 0000000..971efab --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java @@ -0,0 +1,10 @@ +package com.thing.cbam.directCarbon.mapper; + +import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; +import com.thing.cbam.directCarbon.entity.CbamCarbonProgressEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamCarbonProgressMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java new file mode 100644 index 0000000..be520f5 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java @@ -0,0 +1,15 @@ +package com.thing.cbam.directCarbon.service; + +import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; +import com.thing.common.orm.service.IBaseService; + + +/** + * 直接排放量 + * + * @author xc + * @since 3.0 2024-11-27 + */ +public interface CbamCarbonBurnService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMaterialService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMaterialService.java new file mode 100644 index 0000000..ecef58d --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMaterialService.java @@ -0,0 +1,7 @@ +package com.thing.cbam.directCarbon.service; + +import com.thing.cbam.directCarbon.entity.CbamCarbonMaterialEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamCarbonMaterialService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMonitorService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMonitorService.java new file mode 100644 index 0000000..6f92b37 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMonitorService.java @@ -0,0 +1,7 @@ +package com.thing.cbam.directCarbon.service; + +import com.thing.cbam.directCarbon.entity.CbamCarbonMonitorEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamCarbonMonitorService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java new file mode 100644 index 0000000..8a6d0b4 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java @@ -0,0 +1,8 @@ +package com.thing.cbam.directCarbon.service; + +import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; +import com.thing.cbam.directCarbon.entity.CbamCarbonProgressEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamCarbonProgressService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java new file mode 100644 index 0000000..67f2e29 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java @@ -0,0 +1,29 @@ +package com.thing.cbam.directCarbon.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; +import com.thing.cbam.directCarbon.mapper.CbamCarbonBurnMapper; +import com.thing.cbam.directCarbon.service.CbamCarbonBurnService; +import com.thing.common.orm.service.impl.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 直接排放量 + * + * @author xc + * @since 3.0 2024-11-27 + */ +@Service +public class CbamCarbonBurnServiceImpl extends BaseServiceImpl implements CbamCarbonBurnService { + + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMaterialServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMaterialServiceImpl.java new file mode 100644 index 0000000..e5bdf4e --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMaterialServiceImpl.java @@ -0,0 +1,19 @@ +package com.thing.cbam.directCarbon.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.directCarbon.entity.CbamCarbonMaterialEntity; +import com.thing.cbam.directCarbon.mapper.CbamCarbonMaterialMapper; +import com.thing.cbam.directCarbon.service.CbamCarbonMaterialService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class CbamCarbonMaterialServiceImpl extends BaseServiceImpl implements CbamCarbonMaterialService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMonitorServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMonitorServiceImpl.java new file mode 100644 index 0000000..7639d09 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMonitorServiceImpl.java @@ -0,0 +1,19 @@ +package com.thing.cbam.directCarbon.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.directCarbon.entity.CbamCarbonMonitorEntity; +import com.thing.cbam.directCarbon.mapper.CbamCarbonMonitorMapper; +import com.thing.cbam.directCarbon.service.CbamCarbonMonitorService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class CbamCarbonMonitorServiceImpl extends BaseServiceImpl implements CbamCarbonMonitorService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonProgressServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonProgressServiceImpl.java new file mode 100644 index 0000000..7080c88 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonProgressServiceImpl.java @@ -0,0 +1,29 @@ +package com.thing.cbam.directCarbon.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.directCarbon.entity.CbamCarbonProgressEntity; +import com.thing.cbam.directCarbon.mapper.CbamCarbonProgressMapper; +import com.thing.cbam.directCarbon.service.CbamCarbonProgressService; +import com.thing.common.orm.service.impl.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 原料过程排放 + * + * @author xc + * @since 3.0 2024-11-27 + */ +@Service +public class CbamCarbonProgressServiceImpl extends BaseServiceImpl implements CbamCarbonProgressService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java new file mode 100644 index 0000000..fdda4f7 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java @@ -0,0 +1,83 @@ +package com.thing.cbam.electricity.controller; + +import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; +import com.thing.cbam.electricity.service.CbamElectricityToolService; +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.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 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; + +@RestController +@RequestMapping("v2/electricity/tool") +@Tag(name = "热电联产工具") +@RequiredArgsConstructor +public class CbamElectricityToolController { + private final CbamElectricityToolService cbamElectricityToolService; + + @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 = cbamElectricityToolService.getPageData(params, CbamElectricityToolDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary = "信息") + public Result info(@PathVariable("id") String id) { + CbamElectricityToolDTO data=cbamElectricityToolService.getByIdAs(id, CbamElectricityToolDTO.class); + return new Result().ok(data); + } + @PostMapping + @Operation(summary = "保存") + @LogOperation("保存") + public Result save(@RequestBody CbamElectricityToolDTO dto) { + cbamElectricityToolService.saveDto(dto); + return new Result<>(); + } + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamElectricityToolDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamElectricityToolService.updateDto(dto); + return new Result<>(); + } + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamElectricityToolService.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 = cbamProductInfoService.listAs(params, CbamProductInfoDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "综合商品类别和相关生产过程", list, CbamProductInfoExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java new file mode 100644 index 0000000..b8f3d55 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java @@ -0,0 +1,40 @@ +package com.thing.cbam.electricity.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-11-28 +*/ +@Data +@Schema(description = "热电联产工具") +public class CbamElectricityToolDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "CHP的燃料投入") + private String fuelInput; + @Schema(description = "CHP的发热量产出") + private String heatingOutput; + @Schema(description = "CHP发电量") + private String powerGener; + @Schema(description = "来自CHP机组的燃料投入量") + private String fuelUnit; + @Schema(description = "来自烟气净化过程的燃料投入量") + private String gasProcess; + @Schema(description = "发热量生产") + private String heatProduction; + @Schema(description = "电力生产") + private String electProduction; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java new file mode 100644 index 0000000..4a29312 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java @@ -0,0 +1,61 @@ +package com.thing.cbam.electricity.entity; + +import com.mybatisflex.annotation.Id; +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-11-28 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_electricity_tool") +public class CbamElectricityToolEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * CHP的燃料投入 + */ + private String fuelInput; + /** + * CHP的发热量产出 + */ + private String heatingOutput; + /** + * CHP发电量 + */ + private String powerGener; + /** + * 来自CHP机组的燃料投入量 + */ + private String fuelUnit; + /** + * 来自烟气净化过程的燃料投入量 + */ + private String gasProcess; + /** + * 发热量生产 + */ + private String heatProduction; + /** + * 电力生产 + */ + private String electProduction; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java new file mode 100644 index 0000000..0701963 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java @@ -0,0 +1,9 @@ +package com.thing.cbam.electricity.mapper; + +import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamElectricityToolMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java new file mode 100644 index 0000000..e49cd23 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java @@ -0,0 +1,7 @@ +package com.thing.cbam.electricity.service; + +import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamElectricityToolService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java new file mode 100644 index 0000000..5ae500c --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java @@ -0,0 +1,19 @@ +package com.thing.cbam.electricity.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; +import com.thing.cbam.electricity.mapper.CbamElectricityToolMapper; +import com.thing.cbam.electricity.service.CbamElectricityToolService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class CbamElectricityToolServiceImpl extends BaseServiceImplimplements CbamElectricityToolService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java new file mode 100644 index 0000000..ab183d9 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java @@ -0,0 +1,91 @@ +package com.thing.cbam.indirectCarbon.controller; + + +import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; +import com.thing.cbam.indirectCarbon.service.CbamCarbonIndirectEmissionsService; +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 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; + +@RestController +@RequestMapping("v2/cbam/indirect") +@Tag(name = "间接排放量") +@RequiredArgsConstructor +public class CbamCarbonIndirectEmissionsController { + private final CbamCarbonIndirectEmissionsService cbamCarbonIndirectEmissionsService; + + @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 = cbamCarbonIndirectEmissionsService.getPageData(params, CbamCarbonIndirectEmissionsDTO.class); + return new Result>().ok(page); + } + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamCarbonIndirectEmissionsDTO data = cbamCarbonIndirectEmissionsService.getByIdAs(id, CbamCarbonIndirectEmissionsDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamCarbonIndirectEmissionsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamCarbonIndirectEmissionsService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamCarbonIndirectEmissionsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamCarbonIndirectEmissionsService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamCarbonIndirectEmissionsService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); + *} + */ + + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java new file mode 100644 index 0000000..bc39f86 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java @@ -0,0 +1,98 @@ +package com.thing.cbam.indirectCarbon.controller; + +import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; +import com.thing.cbam.indirectCarbon.service.CbamCarbonPowerProgressAllocationService; +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 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-11-28 +*/ +@RestController +@RequestMapping("v2/耗电量分配/cbamcarbonpowerprogressallocation") +@Tag(name="耗电量分配") +@RequiredArgsConstructor +public class CbamCarbonPowerProgressAllocationController { + + private final CbamCarbonPowerProgressAllocationService cbamCarbonPowerProgressAllocationService; + + @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 = cbamCarbonPowerProgressAllocationService.getPageData(params, CbamCarbonPowerProgressAllocationDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamCarbonPowerProgressAllocationDTO data = cbamCarbonPowerProgressAllocationService.getByIdAs(id, CbamCarbonPowerProgressAllocationDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamCarbonPowerProgressAllocationDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamCarbonPowerProgressAllocationService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamCarbonPowerProgressAllocationDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamCarbonPowerProgressAllocationService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamCarbonPowerProgressAllocationService.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 = cbamCarbonPowerProgressAllocationService.listAs(params, CbamCarbonPowerProgressAllocationDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "耗电量分配", list, CbamCarbonPowerProgressAllocationExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java new file mode 100644 index 0000000..dc12d13 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java @@ -0,0 +1,32 @@ +package com.thing.cbam.indirectCarbon.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-11-28 +*/ +@Data +@Schema(description = "间接排放量") +public class CbamCarbonIndirectEmissionsDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "用电类型") + private String electricityType; + @Schema(description = "耗电量") + private String powerConsum; + @Schema(description = "电力碳排放因子") + private String electricityFactor; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java new file mode 100644 index 0000000..bf83b81 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java @@ -0,0 +1,42 @@ +package com.thing.cbam.indirectCarbon.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-11-28 +*/ +@Data +@Schema(description = "耗电量分配") +public class CbamCarbonPowerProgressAllocationDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "生产过程设备总功率") + private String powerEquip; + @Schema(description = "设备平均运行时间") + private String averEquip; + @Schema(description = "电力排放因子的来源") + private String sourceElect; + @Schema(description = "有关数据质量的一般信息") + private String qualityInfo; + @Schema(description = "质量保证信息") + private String assurInfo; + @Schema(description = "电力生产燃料") + private String produFuel; + @Schema(description = "非CBAM商品生产的直接燃料 ") + private String nocbamFuel; + @Schema(description = "CBAM商品生产的直接燃料 ") + private String cbamFuel; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java new file mode 100644 index 0000000..0ff18ae --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java @@ -0,0 +1,45 @@ +package com.thing.cbam.indirectCarbon.entity; + +import com.mybatisflex.annotation.Id; +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-11-28 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_carbon_indirect_emissions") +public class CbamCarbonIndirectEmissionsEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 用电类型 + */ + private String electricityType; + /** + * 耗电量 + */ + private String powerConsum; + /** + * 电力碳排放因子 + */ + private String electricityFactor; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java new file mode 100644 index 0000000..904308f --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java @@ -0,0 +1,65 @@ +package com.thing.cbam.indirectCarbon.entity; + +import com.mybatisflex.annotation.Id; +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-11-28 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_carbon_power_progress_allocation") +public class CbamCarbonPowerProgressAllocationEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 生产过程设备总功率 + */ + private String powerEquip; + /** + * 设备平均运行时间 + */ + private String averEquip; + /** + * 电力排放因子的来源 + */ + private String sourceElect; + /** + * 有关数据质量的一般信息 + */ + private String qualityInfo; + /** + * 质量保证信息 + */ + private String assurInfo; + /** + * 电力生产燃料 + */ + private String produFuel; + /** + * 非CBAM商品生产的直接燃料 + */ + private String nocbamFuel; + /** + * CBAM商品生产的直接燃料 + */ + private String cbamFuel; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java new file mode 100644 index 0000000..327f807 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java @@ -0,0 +1,17 @@ +package com.thing.cbam.indirectCarbon.mapper; + +import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; + +import org.apache.ibatis.annotations.Mapper; + +/** +* 间接排放量 +* +* @author xc +* @since 3.0 2024-11-28 +*/ +@Mapper +public interface CbamCarbonIndirectEmissionsMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java new file mode 100644 index 0000000..7cefcdc --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java @@ -0,0 +1,17 @@ +package com.thing.cbam.indirectCarbon.mapper; + +import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; + +import org.apache.ibatis.annotations.Mapper; + +/** +* 耗电量分配 +* +* @author xc +* @since 3.0 2024-11-28 +*/ +@Mapper +public interface CbamCarbonPowerProgressAllocationMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java new file mode 100644 index 0000000..9b965d8 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java @@ -0,0 +1,7 @@ +package com.thing.cbam.indirectCarbon.service; + +import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamCarbonIndirectEmissionsService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java new file mode 100644 index 0000000..a4a6ec8 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java @@ -0,0 +1,15 @@ +package com.thing.cbam.indirectCarbon.service; + +import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; +import com.thing.common.orm.service.IBaseService; + + +/** + * 耗电量分配 + * + * @author xc + * @since 3.0 2024-11-28 + */ +public interface CbamCarbonPowerProgressAllocationService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java new file mode 100644 index 0000000..16430d9 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java @@ -0,0 +1,19 @@ +package com.thing.cbam.indirectCarbon.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; +import com.thing.cbam.indirectCarbon.mapper.CbamCarbonIndirectEmissionsMapper; +import com.thing.cbam.indirectCarbon.service.CbamCarbonIndirectEmissionsService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class CbamCarbonIndirectEmissionsServiceImpl extends BaseServiceImpl implements CbamCarbonIndirectEmissionsService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java new file mode 100644 index 0000000..6a47c58 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java @@ -0,0 +1,29 @@ +package com.thing.cbam.indirectCarbon.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; +import com.thing.cbam.indirectCarbon.mapper.CbamCarbonPowerProgressAllocationMapper; +import com.thing.cbam.indirectCarbon.service.CbamCarbonPowerProgressAllocationService; +import com.thing.common.orm.service.impl.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 耗电量分配 + * + * @author xc + * @since 3.0 2024-11-28 + */ +@Service +public class CbamCarbonPowerProgressAllocationServiceImpl extends BaseServiceImpl implements CbamCarbonPowerProgressAllocationService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java new file mode 100644 index 0000000..c4cba64 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java @@ -0,0 +1,88 @@ +package com.thing.cbam.production.controller; + +import com.thing.cbam.production.dto.CbamProductAllocationDTO; +import com.thing.cbam.production.service.CbamProductAllocationService; +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 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; + +@RestController +@RequestMapping("v2/product/allocation") +@Tag(name = "产品的分配") +@RequiredArgsConstructor +public class CbamProductAllocationController { + private final CbamProductAllocationService cbamProductAllocationService; + @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 = cbamProductAllocationService.getPageData(params, CbamProductAllocationDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id) { + CbamProductAllocationDTO data = cbamProductAllocationService.getByIdAs(id, CbamProductAllocationDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary = "保存") + @LogOperation("保存") + public Result save(@RequestBody CbamProductAllocationDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamProductAllocationService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary = "修改") + @LogOperation("修改") + public Result update(@RequestBody CbamProductAllocationDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamProductAllocationService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary = "删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamProductAllocationService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); + *} + */ +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductElectricityController.java b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductElectricityController.java new file mode 100644 index 0000000..323fdc9 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductElectricityController.java @@ -0,0 +1,98 @@ +package com.thing.cbam.production.controller; + +import com.thing.cbam.production.dto.CbamProductElectricityDTO; +import com.thing.cbam.production.service.CbamProductElectricityService; +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 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-11-28 +*/ +@RestController +@RequestMapping("v2/输出的电力/cbamproductelectricity") +@Tag(name="输出的电力") +@RequiredArgsConstructor +public class CbamProductElectricityController { + + private final CbamProductElectricityService cbamProductElectricityService; + + @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 = cbamProductElectricityService.getPageData(params, CbamProductElectricityDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamProductElectricityDTO data = cbamProductElectricityService.getByIdAs(id, CbamProductElectricityDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamProductElectricityDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamProductElectricityService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamProductElectricityDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamProductElectricityService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamProductElectricityService.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 = cbamProductElectricityService.listAs(params, CbamProductElectricityDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "输出的电力", list, CbamProductElectricityExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java new file mode 100644 index 0000000..b837d64 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java @@ -0,0 +1,97 @@ +package com.thing.cbam.production.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 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-11-28 +*/ +@RestController +@RequestMapping("v2/废气排放量/cbamproductexhaustemissions") +@Tag(name="废气排放量") +@RequiredArgsConstructor +public class CbamProductExhaustEmissionsController { + + private final CbamProductExhaustEmissionsService cbamProductExhaustEmissionsService; + + @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 = cbamProductExhaustEmissionsService.getPageData(params, CbamProductExhaustEmissionsDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamProductExhaustEmissionsDTO data = cbamProductExhaustEmissionsService.getByIdAs(id, CbamProductExhaustEmissionsDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamProductExhaustEmissionsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamProductExhaustEmissionsService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamProductExhaustEmissionsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamProductExhaustEmissionsService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamProductExhaustEmissionsService.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 = cbamProductExhaustEmissionsService.listAs(params, CbamProductExhaustEmissionsDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "废气排放量", list, CbamProductExhaustEmissionsExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductHeatEmissionsController.java b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductHeatEmissionsController.java new file mode 100644 index 0000000..0ddc822 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductHeatEmissionsController.java @@ -0,0 +1,88 @@ +package com.thing.cbam.production.controller; + +import com.thing.cbam.production.dto.CbamProductHeatEmissionsDTO; +import com.thing.cbam.production.service.CbamProductHeatEmissionsService; +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 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; + +@RestController +@RequestMapping("v2/product/heat") +@Tag(name = "发热量排放") +@RequiredArgsConstructor +public class CbamProductHeatEmissionsController { + private final CbamProductHeatEmissionsService cbamProductHeatEmissionsService; + @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 = cbamProductHeatEmissionsService.getPageData(params, CbamProductHeatEmissionsDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamProductHeatEmissionsDTO data = cbamProductHeatEmissionsService.getByIdAs(id, CbamProductHeatEmissionsDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamProductHeatEmissionsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamProductHeatEmissionsService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamProductHeatEmissionsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamProductHeatEmissionsService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamProductHeatEmissionsService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); + *} + */ +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java new file mode 100644 index 0000000..aa64fde --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java @@ -0,0 +1,32 @@ +package com.thing.cbam.production.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-11-28 +*/ +@Data +@Schema(description = "产品的分配") +public class CbamProductAllocationDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "消耗量t") + private String consum; + @Schema(description = "欧盟出口量") + private String exportVolume; + @Schema(description = "非欧盟销售量") + private String salesVolume; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductElectricityDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductElectricityDTO.java new file mode 100644 index 0000000..04fd984 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductElectricityDTO.java @@ -0,0 +1,30 @@ +package com.thing.cbam.production.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-11-28 +*/ +@Data +@Schema(description = "输出的电力") +public class CbamProductElectricityDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "输出总量") + private String totalOutput; + @Schema(description = "电力排放因子") + private String electricityFactor; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductExhaustEmissionsDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductExhaustEmissionsDTO.java new file mode 100644 index 0000000..937e1de --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductExhaustEmissionsDTO.java @@ -0,0 +1,30 @@ +package com.thing.cbam.production.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-11-28 +*/ +@Data +@Schema(description = "废气排放量") +public class CbamProductExhaustEmissionsDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "输入量") + private String inputQuantity; + @Schema(description = "输出量") + private String output; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductHeatEmissionsDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductHeatEmissionsDTO.java new file mode 100644 index 0000000..1609d53 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductHeatEmissionsDTO.java @@ -0,0 +1,22 @@ +package com.thing.cbam.production.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Schema(description = "发热量排放") +public class CbamProductHeatEmissionsDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "输入量") + private String inputQuantity; + @Schema(description = "输出量") + private String outpuQuantity; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java new file mode 100644 index 0000000..be8ae3f --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java @@ -0,0 +1,45 @@ +package com.thing.cbam.production.entity; + +import com.mybatisflex.annotation.Id; +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-11-28 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_product_allocation") +public class CbamProductAllocationEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 消耗量t + */ + private String consum; + /** + * 欧盟出口量 + */ + private String exportVolume; + /** + * 非欧盟销售量 + */ + private String salesVolume; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductElectricityEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductElectricityEntity.java new file mode 100644 index 0000000..58fe78d --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductElectricityEntity.java @@ -0,0 +1,41 @@ +package com.thing.cbam.production.entity; + +import com.mybatisflex.annotation.Id; +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-11-28 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_product_electricity") +public class CbamProductElectricityEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 输出总量 + */ + private String totalOutput; + /** + * 电力排放因子 + */ + private String electricityFactor; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductExhaustEmissionsEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductExhaustEmissionsEntity.java new file mode 100644 index 0000000..340dbaf --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductExhaustEmissionsEntity.java @@ -0,0 +1,41 @@ +package com.thing.cbam.production.entity; + +import com.mybatisflex.annotation.Id; +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-11-28 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_product_exhaust_emissions") +public class CbamProductExhaustEmissionsEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 输入量 + */ + private String inputQuantity; + /** + * 输出量 + */ + private String output; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductHeatEmissionsEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductHeatEmissionsEntity.java new file mode 100644 index 0000000..c852935 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductHeatEmissionsEntity.java @@ -0,0 +1,34 @@ +package com.thing.cbam.production.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_product_heat_emissions") +public class CbamProductHeatEmissionsEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 输入量 + */ + private String inputQuantity; + /** + * 输出量 + */ + private String outpuQuantity; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java new file mode 100644 index 0000000..4d515f0 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java @@ -0,0 +1,9 @@ +package com.thing.cbam.production.mapper; + +import com.thing.cbam.production.entity.CbamProductAllocationEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamProductAllocationMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductElectricityMapper.java b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductElectricityMapper.java new file mode 100644 index 0000000..1fadc78 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductElectricityMapper.java @@ -0,0 +1,17 @@ +package com.thing.cbam.production.mapper; + +import com.thing.cbam.production.entity.CbamProductElectricityEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; + +import org.apache.ibatis.annotations.Mapper; + +/** +* 输出的电力 +* +* @author xc +* @since 3.0 2024-11-28 +*/ +@Mapper +public interface CbamProductElectricityMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductExhaustEmissionsMapper.java b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductExhaustEmissionsMapper.java new file mode 100644 index 0000000..076496c --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductExhaustEmissionsMapper.java @@ -0,0 +1,9 @@ +package com.thing.cbam.production.mapper; + +import com.thing.cbam.production.entity.CbamProductExhaustEmissionsEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamProductExhaustEmissionsMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductHeatEmissionsMapper.java b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductHeatEmissionsMapper.java new file mode 100644 index 0000000..3d816ff --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductHeatEmissionsMapper.java @@ -0,0 +1,9 @@ +package com.thing.cbam.production.mapper; + +import com.thing.cbam.production.entity.CbamProductHeatEmissionsEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamProductHeatEmissionsMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java new file mode 100644 index 0000000..ebd1615 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java @@ -0,0 +1,7 @@ +package com.thing.cbam.production.service; + +import com.thing.cbam.production.entity.CbamProductAllocationEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamProductAllocationService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductElectricityService.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductElectricityService.java new file mode 100644 index 0000000..f208467 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductElectricityService.java @@ -0,0 +1,7 @@ +package com.thing.cbam.production.service; + +import com.thing.cbam.production.entity.CbamProductElectricityEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamProductElectricityService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductExhaustEmissionsService.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductExhaustEmissionsService.java new file mode 100644 index 0000000..705d348 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductExhaustEmissionsService.java @@ -0,0 +1,7 @@ +package com.thing.cbam.production.service; + +import com.thing.cbam.production.entity.CbamProductExhaustEmissionsEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamProductExhaustEmissionsService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductHeatEmissionsService.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductHeatEmissionsService.java new file mode 100644 index 0000000..9e105fa --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductHeatEmissionsService.java @@ -0,0 +1,7 @@ +package com.thing.cbam.production.service; + +import com.thing.cbam.production.entity.CbamProductHeatEmissionsEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamProductHeatEmissionsService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java new file mode 100644 index 0000000..bb89bff --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java @@ -0,0 +1,23 @@ +package com.thing.cbam.production.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.production.entity.CbamProductAllocationEntity; +import com.thing.cbam.production.mapper.CbamProductAllocationMapper; +import com.thing.cbam.production.service.CbamProductAllocationService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class CbamProductAllocationServiceImpl extends BaseServiceImpl + implements CbamProductAllocationService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductElectricityServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductElectricityServiceImpl.java new file mode 100644 index 0000000..1e21be7 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductElectricityServiceImpl.java @@ -0,0 +1,19 @@ +package com.thing.cbam.production.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.production.entity.CbamProductElectricityEntity; +import com.thing.cbam.production.mapper.CbamProductElectricityMapper; +import com.thing.cbam.production.service.CbamProductElectricityService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class CbamProductElectricityServiceImpl extends BaseServiceImpl implements CbamProductElectricityService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductExhaustEmissionsServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductExhaustEmissionsServiceImpl.java new file mode 100644 index 0000000..e19e8a5 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductExhaustEmissionsServiceImpl.java @@ -0,0 +1,20 @@ +package com.thing.cbam.production.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.production.entity.CbamProductExhaustEmissionsEntity; +import com.thing.cbam.production.mapper.CbamProductExhaustEmissionsMapper; +import com.thing.cbam.production.service.CbamProductExhaustEmissionsService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class CbamProductExhaustEmissionsServiceImpl extends BaseServiceImpl +implements CbamProductExhaustEmissionsService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductHeatEmissionsServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductHeatEmissionsServiceImpl.java new file mode 100644 index 0000000..a8497b4 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductHeatEmissionsServiceImpl.java @@ -0,0 +1,27 @@ +package com.thing.cbam.production.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.production.entity.CbamProductHeatEmissionsEntity; +import com.thing.cbam.production.mapper.CbamProductHeatEmissionsMapper; +import com.thing.cbam.production.service.CbamProductHeatEmissionsService; +import com.thing.common.orm.service.impl.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 发热量排放 + * + * @author xc + * @since 3.0 2024-11-28 + */ + +@Service +public class CbamProductHeatEmissionsServiceImpl extends BaseServiceImpl implements CbamProductHeatEmissionsService{ + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } +} \ No newline at end of file diff --git a/modules/pom.xml b/modules/pom.xml index eb93403..8febd16 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -29,6 +29,7 @@ carbon-public cqc-service visual-design + cbam modules diff --git a/pom.xml b/pom.xml index 991ca6a..f02b49e 100644 --- a/pom.xml +++ b/pom.xml @@ -626,6 +626,12 @@ visual-design ${project.version} + + + com.thing.modules + cbam + ${project.version} + com.thing.tools @@ -748,14 +754,7 @@ - - public - ali - https://maven.aliyun.com/repository/central - - true - - + From 10c3481deeb4fdddb1954c3bcb98e5505898fc53 Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 29 Nov 2024 13:29:41 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=202024=E5=B9=B411?= =?UTF-8?q?=E6=9C=8829=E6=97=A513:29:37?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/thing/ScriptCreateServiceImpl.java | 4 +--- .../com/thing/cbam/dict/controller/CbamHsDictController.java | 2 +- .../cbam/dict/controller/CbamIndustryDictController.java | 4 ++-- .../cbam/dict/controller/CbamProdProcessDictController.java | 4 ++-- .../controller/CbamProductExhaustEmissionsController.java | 2 ++ 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/script/src/main/java/com/thing/ScriptCreateServiceImpl.java b/common/script/src/main/java/com/thing/ScriptCreateServiceImpl.java index 382f475..6cd5daa 100644 --- a/common/script/src/main/java/com/thing/ScriptCreateServiceImpl.java +++ b/common/script/src/main/java/com/thing/ScriptCreateServiceImpl.java @@ -33,9 +33,7 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; -/** - * @author zhenghh. 2022-12-27 - **/ + @Service public class ScriptCreateServiceImpl implements ScriptCreateService { diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java index 4617de9..47a6acd 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java @@ -29,7 +29,7 @@ import java.util.Map; * @since 3.0 2024-11-29 */ @RestController -@RequestMapping("v2/hs字典表/cbamhsdict") +@RequestMapping("v2/cbam/hs") @Tag(name="hs字典表") @RequiredArgsConstructor public class CbamHsDictController { diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java index 1dd3cca..56635f1 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java @@ -1,4 +1,4 @@ - +package com.thing.cbam.dict.controller; import com.thing.cbam.dict.dto.CbamIndustryDictDTO; import com.thing.cbam.dict.service.CbamIndustryDictService; @@ -29,7 +29,7 @@ import java.util.Map; * @since 3.0 2024-11-29 */ @RestController -@RequestMapping("v2/所属行业字典/cbamindustrydict") +@RequestMapping("v2/cbam/industry/dict") @Tag(name="所属行业字典") @RequiredArgsConstructor public class CbamIndustryDictController { diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java index c8e6664..9c02f8c 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java @@ -29,8 +29,8 @@ import java.util.Map; * @since 3.0 2024-11-29 */ @RestController -@RequestMapping("v2/工艺路线映射表/cbamprodprocessdict") -@Tag(name="原料（生产过程）---工艺路线映射表") +@RequestMapping("v2/cbam/prodprocess") +@Tag(name="原料（生产过程）---工艺路线映射字典表") @RequiredArgsConstructor public class CbamProdProcessDictController { diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java index b837d64..178bbd5 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java @@ -1,5 +1,7 @@ package com.thing.cbam.production.controller; +import com.thing.cbam.production.dto.CbamProductExhaustEmissionsDTO; +import com.thing.cbam.production.service.CbamProductExhaustEmissionsService; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; From b64a223e197c12764a1507947c37abaa69a58b5a Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 29 Nov 2024 14:24:41 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=92=8C=E6=A0=A1=E9=AA=8C=E7=9A=84=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E6=96=B9=E6=B3=95=202024=E5=B9=B411=E6=9C=8829=E6=97=A514:24:3?= =?UTF-8?q?8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/CbamIndustryService.java | 5 ++- .../service/impl/CbamIndustryServiceImpl.java | 15 +++++++ .../dict/controller/CbamHsDictController.java | 12 ++++++ .../CbamIndustryDictController.java | 15 +++++++ .../CbamProdProcessDictController.java | 28 +++++++++++++ .../cbam/dict/service/CbamHsDictService.java | 5 +++ .../service/CbamProdProcessDictService.java | 12 ++++++ .../service/impl/CbamHsDictServiceImpl.java | 6 +++ .../impl/CbamProdProcessDictServiceImpl.java | 40 ++++++++++++++++++- 9 files changed, 135 insertions(+), 3 deletions(-) diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java index 1244d01..797f093 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java @@ -5,14 +5,17 @@ import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; import com.thing.common.orm.service.IBaseService; +import java.util.LinkedHashMap; + public interface CbamIndustryService extends IBaseService { CbamIndustryDTO findById(Long id); - void saveEntity(CbamIndustryDTO dto); + LinkedHashMap validateMsg(Long hyId,Long startTime,Long endTime); + } diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java index dbea3ab..82c3dac 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java @@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -84,4 +85,18 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl validateMsg(Long hyId,Long startTime,Long endTime) { + + LinkedHashMap resMap = new LinkedHashMap<>(); + //1.所属行业不能为空，并且是行业字典的值 + + + + + + + return null; + } } diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java index 47a6acd..4378349 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java @@ -1,6 +1,7 @@ package com.thing.cbam.dict.controller; import com.thing.cbam.dict.dto.CbamHsDictDTO; +import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; import com.thing.cbam.dict.service.CbamHsDictService; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; @@ -20,6 +21,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -86,6 +88,16 @@ public class CbamHsDictController { return new Result<>(); } + + + @GetMapping("hs/{code}") + @Operation(summary="信息") + public Result> getByHsCode(@PathVariable("code") String code){ + List cbamHsDictDTOS = cbamHsDictService.getByHsCode(code); + return new Result>().ok(cbamHsDictDTOS); + } + + /** *@GetMapping("export") *@Operation(summary="导出") diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java index 56635f1..2620c41 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java @@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -49,6 +50,20 @@ public class CbamIndustryDictController { return new Result>().ok(page); } + + @GetMapping("list") + @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> list(@Parameter(hidden = true) @RequestParam Map params){ + List list = cbamIndustryDictService.listAs(params, CbamIndustryDictDTO.class); + return new Result>().ok(list); + } + @GetMapping("{id}") @Operation(summary="信息") public Result get(@PathVariable("id") Long id){ diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java index 9c02f8c..3e26251 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java @@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -56,6 +57,33 @@ public class CbamProdProcessDictController { return new Result().ok(data); } + + @GetMapping("prod/{industryId}") + @Operation(summary="信息") + public Result> getByIndustryId(@PathVariable("industryId") Long industryId){ + List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByIndustryId(industryId); + return new Result>().ok(cbamProdProcessDictDTOS); + } + + + + @GetMapping("process/{prodId}") + @Operation(summary="信息") + public Result> getByProdId(@PathVariable("prodId") Long prodId){ + List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdId(prodId); + return new Result>().ok(cbamProdProcessDictDTOS); + } + + + + @PostMapping("process/list") + @Operation(summary="信息") + public Result> getByProdIds(@RequestBody List prodIds){ + List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdIds(prodIds); + return new Result>().ok(cbamProdProcessDictDTOS); + } + + @PostMapping @Operation(summary="保存") @LogOperation("保存") diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java index 8e57db4..d1f16d5 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java @@ -1,8 +1,11 @@ package com.thing.cbam.dict.service; +import com.thing.cbam.dict.dto.CbamHsDictDTO; import com.thing.cbam.dict.entity.CbamHsDictEntity; import com.thing.common.orm.service.IBaseService; +import java.util.List; + /** * hs字典表 @@ -12,4 +15,6 @@ import com.thing.common.orm.service.IBaseService; */ public interface CbamHsDictService extends IBaseService { + List getByHsCode(String code); + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java index 51d3591..de667b4 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java @@ -1,7 +1,11 @@ package com.thing.cbam.dict.service; +import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; import com.thing.common.orm.service.IBaseService; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; /** @@ -12,4 +16,12 @@ import com.thing.common.orm.service.IBaseService; */ public interface CbamProdProcessDictService extends IBaseService { + + List getByIndustryId(Long industryId); + + List getByProdId(Long prodId); + + List getByProdIds(List prodIds); + + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java index 90d64d4..a420963 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java @@ -1,6 +1,7 @@ package com.thing.cbam.dict.service.impl; import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.dict.dto.CbamHsDictDTO; import com.thing.cbam.dict.entity.CbamHsDictEntity; import com.thing.cbam.dict.mapper.CbamHsDictMapper; import com.thing.cbam.dict.service.CbamHsDictService; @@ -8,6 +9,7 @@ import com.thing.common.orm.service.impl.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -26,4 +28,8 @@ public class CbamHsDictServiceImpl extends BaseServiceImpl getByHsCode(String code) { + return mapper.selectListByQueryAs(new QueryWrapper().eq(CbamHsDictEntity::getCode, code), CbamHsDictDTO.class); + } } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java index ccf8cf0..ba33286 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java @@ -1,29 +1,65 @@ package com.thing.cbam.dict.service.impl; import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; import com.thing.cbam.dict.mapper.CbamProdProcessDictMapper; import com.thing.cbam.dict.service.CbamProdProcessDictService; +import com.thing.common.core.constants.Constant; import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; +import java.util.Objects; /** * 原料（生产过程）---工艺路线映射表 * - * @author xc + * @author xc * @since 3.0 2024-11-29 */ @Service public class CbamProdProcessDictServiceImpl extends BaseServiceImpl implements CbamProdProcessDictService { @Override - public QueryWrapper getWrapper(Map params){ + public QueryWrapper getWrapper(Map params) { QueryWrapper wrapper = new QueryWrapper(); return wrapper; } + @Override + public List getByIndustryId(Long industryId) { + return getByIndustryIdAndType(industryId, null,"yl", Constant.ASC); + } + + @Override + public List getByProdId(Long prodId) { + return getByIndustryIdAndType(prodId, null,"gylx", Constant.ASC); + } + + @Override + public List getByProdIds(List prodIds) { + return getByIndustryIdAndType(null, prodIds,"gylx", Constant.ASC); + } + + + public List getByIndustryIdAndType(Long pidId,List pidIds, String type, String order) { + boolean asc = true; + if (StringUtils.equalsIgnoreCase(Constant.DESC, order)) { + asc = false; + } + QueryWrapper queryWrapper = QueryWrapper.create() + .eq(CbamProdProcessDictEntity::getPidId, pidId, Objects::nonNull) + .eq(CbamProdProcessDictEntity::getPidId, pidIds, CollectionUtils::isNotEmpty) + .eq(CbamProdProcessDictEntity::getType, type) + .orderBy(CbamProdProcessDictEntity::getSort, asc); + return mapper.selectListByQueryAs(queryWrapper, CbamProdProcessDictDTO.class); + } + + } \ No newline at end of file From 9c9dc5088e2d9fa3d67852ec8ee3e199f68ae6cf Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 29 Nov 2024 14:57:02 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=92=8C=E6=A0=A1=E9=AA=8C=E7=9A=84=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E6=96=B9=E6=B3=95=202024=E5=B9=B411=E6=9C=8829=E6=97=A514:24:3?= =?UTF-8?q?8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dict/service/impl/CbamProdProcessDictServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java index ba33286..8b85991 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java @@ -34,21 +34,21 @@ public class CbamProdProcessDictServiceImpl extends BaseServiceImpl getByIndustryId(Long industryId) { - return getByIndustryIdAndType(industryId, null,"yl", Constant.ASC); + return getByPidIdAndType(industryId, null,"yl", Constant.ASC); } @Override public List getByProdId(Long prodId) { - return getByIndustryIdAndType(prodId, null,"gylx", Constant.ASC); + return getByPidIdAndType(prodId, null,"gylx", Constant.ASC); } @Override public List getByProdIds(List prodIds) { - return getByIndustryIdAndType(null, prodIds,"gylx", Constant.ASC); + return getByPidIdAndType(null, prodIds,"gylx", Constant.ASC); } - public List getByIndustryIdAndType(Long pidId,List pidIds, String type, String order) { + public List getByPidIdAndType(Long pidId, List pidIds, String type, String order) { boolean asc = true; if (StringUtils.equalsIgnoreCase(Constant.DESC, order)) { asc = false; From 8e93c209136e36e1d11f8496b72f56a6ed4b6f85 Mon Sep 17 00:00:00 2001 From: lishuai Date: Mon, 2 Dec 2024 17:12:54 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0Aexcel=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=202024=E5=B9=B412=E6=9C=88?= =?UTF-8?q?2=E6=97=A517:12:50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CbamIndustryController.java | 18 +-- .../controller/CbamMaterialController.java | 69 --------- .../CbamProcessMaterialController.java | 112 ++++++++++++++ ...a => CbamProdRouteRelationController.java} | 43 +++--- .../baesInfoExcel/dto/CbamIndustryDTO.java | 17 +- .../baesInfoExcel/dto/CbamMaterialDTO.java | 30 ---- .../dto/CbamProcessMaterialDTO.java | 60 +++++++ .../dto/CbamProdRouteRelationDTO.java | 34 ++++ .../baesInfoExcel/dto/CbamProductInfoDTO.java | 38 ----- .../entity/CbamIndustryEntity.java | 61 +++++++- .../entity/CbamMaterialEntity.java | 41 ----- .../entity/CbamProcessMaterialEntity.java | 88 +++++++++++ .../entity/CbamProdRouteRelationEntity.java | 51 ++++++ .../entity/CbamProductInfoEntity.java | 55 ------- .../mapper/CbamMaterialMapper.java | 10 -- .../mapper/CbamProcessMaterialMapper.java | 16 ++ .../mapper/CbamProdRouteRelationMapper.java | 16 ++ .../mapper/CbamProductInfoMapper.java | 17 -- .../service/CbamIndustryService.java | 6 +- .../service/CbamMaterialService.java | 13 -- .../service/CbamProcessMaterialService.java | 44 ++++++ .../service/CbamProdRouteRelationService.java | 19 +++ .../service/CbamProductInfoService.java | 22 --- .../service/impl/CbamIndustryServiceImpl.java | 124 +++++++++++---- .../service/impl/CbamMaterialServiceImpl.java | 27 ---- .../impl/CbamProcessMaterialServiceImpl.java | 95 ++++++++++++ .../CbamProdRouteRelationServiceImpl.java | 39 +++++ .../impl/CbamProductInfoServiceImpl.java | 36 ----- .../controller/CbamFuelDictController.java | 112 ++++++++++++++ .../thing/cbam/dict/dto/CbamFuelDictDTO.java | 37 +++++ .../cbam/dict/entity/CbamFuelDictEntity.java | 54 +++++++ .../cbam/dict/mapper/CbamFuelDictMapper.java | 16 ++ .../dict/service/CbamFuelDictService.java | 15 ++ .../service/impl/CbamFuelDictServiceImpl.java | 35 +++++ .../controller/CbamCarbonBurnController.java | 44 +++++- .../CbamCarbonDirectController.java | 114 ++++++++++++++ .../CbamCarbonProgressController.java | 2 + .../directCarbon/dto/CbamCarbonBurnDTO.java | 6 +- .../directCarbon/dto/CbamCarbonDirectDTO.java | 84 ++++++++++ .../entity/CbamCarbonBurnEntity.java | 10 +- .../entity/CbamCarbonDirectEntity.java | 146 ++++++++++++++++++ .../entity/CbamCarbonProgressEntity.java | 2 +- .../mapper/CbamCarbonDirectMapper.java | 16 ++ .../service/CbamCarbonBurnService.java | 11 ++ .../service/CbamCarbonDirectService.java | 19 +++ .../service/CbamCarbonProgressService.java | 1 - .../impl/CbamCarbonBurnServiceImpl.java | 58 +++++++ .../impl/CbamCarbonDirectServiceImpl.java | 38 +++++ 48 files changed, 1566 insertions(+), 455 deletions(-) delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamMaterialController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java rename modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/{CbamProductInfoController.java => CbamProdRouteRelationController.java} (59%) delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamMaterialDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProductInfoDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamMaterialEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProductInfoEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamMaterialMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProductInfoMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamMaterialService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProductInfoService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamMaterialServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProductInfoServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java index 0a88274..475b7b1 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java @@ -2,12 +2,9 @@ package com.thing.cbam.baesInfoExcel.controller; import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; -import com.thing.common.core.exception.SysException; -import com.thing.common.core.utils.ConvertUtils; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; @@ -15,12 +12,10 @@ 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 jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.Map; -import java.util.Objects; @RestController @RequestMapping("v2/cbam/industry") @@ -28,8 +23,7 @@ import java.util.Objects; @RequiredArgsConstructor public class CbamIndustryController { - @Resource - private CbamIndustryService service; + private final CbamIndustryService service; @GetMapping("page") @Operation(summary = "分页") @@ -56,7 +50,7 @@ public class CbamIndustryController { @Operation(summary = "保存") @LogOperation("保存") public Result save(@RequestBody CbamIndustryDTO dto) { - service.saveEntity(dto); + service.saveIndustryInfo(dto); return new Result<>(); } @@ -66,11 +60,7 @@ public class CbamIndustryController { public Result update(@RequestBody CbamIndustryDTO dto) { //效验数据 //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - Long id = dto.getId(); - if(Objects.isNull(id)){ - throw new SysException("id不能为空"); - } - service.updateById(ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class)); + service.updateIndustryInfo(dto); return new Result<>(); } @@ -80,7 +70,7 @@ public class CbamIndustryController { public Result delete(@RequestBody Long[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - service.batchDelete(ids); + service.batchDeleteByIds(ids); return new Result<>(); } diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamMaterialController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamMaterialController.java deleted file mode 100644 index 003385a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamMaterialController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.thing.cbam.baesInfoExcel.controller; - - -import com.thing.cbam.baesInfoExcel.dto.CbamMaterialDTO; -import com.thing.cbam.baesInfoExcel.service.CbamMaterialService; -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.web.response.PageData; -import com.thing.common.core.web.response.Result; -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; - -@RestController -@RequestMapping("v2/cbam/material") -@Tag(name = "原材料") -@RequiredArgsConstructor -public class CbamMaterialController { - private final CbamMaterialService cbamMaterialService; - @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 = cbamMaterialService.getPageData(params, CbamMaterialDTO.class); - return new Result>().ok(page); - } - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamMaterialDTO data = cbamMaterialService.getByIdAs(id, CbamMaterialDTO.class); - return new Result().ok(data); - } - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamMaterialDTO dto) { - cbamMaterialService.saveDto(dto); - return new Result<>(); - } - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamMaterialDTO dto) { - //效验数据 - cbamMaterialService.updateDto(dto); - return new Result<>(); - } - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamMaterialService.batchDelete(ids); - return new Result<>(); - } - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java new file mode 100644 index 0000000..978199a --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java @@ -0,0 +1,112 @@ +package com.thing.cbam.baesInfoExcel.controller; + +import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; +import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; +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 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.List; +import java.util.Map; + +/** +* 综合商品类别和相关生产过程 和 购买的原材料 表 +* +* @author xc +* @since 3.0 2024-12-02 +*/ +@RestController +@RequestMapping("v2/cbam/processmaterial") +@Tag(name="综合商品类别和相关生产过程 和 购买的原材料 表") +@RequiredArgsConstructor +public class CbamProcessMaterialController { + + private final CbamProcessMaterialService cbamProcessMaterialService; + + @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 = cbamProcessMaterialService.getPageData(params, CbamProcessMaterialDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamProcessMaterialDTO data = cbamProcessMaterialService.getByIdAs(id, CbamProcessMaterialDTO.class); + return new Result().ok(data); + } + + @GetMapping("industryIdAndType") + @Operation(summary="根据AExcel的基本信息id，查询原材料信息或者生产过程") + public Result> getByIndustryIdAndType(Long industryId,Integer type){ + List processMaterialDTOList = cbamProcessMaterialService.getByIndustryIdAndType(industryId,type); + return new Result>().ok(processMaterialDTOList); + } + + @GetMapping("industryId") + @Operation(summary="根据AExcel的基本信息id，查询原材料信息和生产过程列表") + public Result> getByIndustryId(Long industryId){ + List processMaterialDTOList = cbamProcessMaterialService.getByIndustryId(industryId); + return new Result>().ok(processMaterialDTOList); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamProcessMaterialDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamProcessMaterialService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamProcessMaterialDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamProcessMaterialService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamProcessMaterialService.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 = cbamProcessMaterialService.listAs(params, CbamProcessMaterialDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "综合商品类别和相关生产过程 和 购买的原材料 表", list, CbamProcessMaterialExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProductInfoController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java similarity index 59% rename from modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProductInfoController.java rename to modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java index 7f78a18..d6ab122 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProductInfoController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java @@ -1,7 +1,7 @@ package com.thing.cbam.baesInfoExcel.controller; -import com.thing.cbam.baesInfoExcel.dto.CbamProductInfoDTO; -import com.thing.cbam.baesInfoExcel.service.CbamProductInfoService; +import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; +import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; @@ -11,7 +11,6 @@ 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 io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -22,18 +21,18 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; /** -* 综合商品类别和相关生产过程 +* 生产过程和原料 与 工艺路线关联表 * * @author xc -* @since 3.0 2024-11-27 +* @since 3.0 2024-12-02 */ @RestController -@RequestMapping("v2/cbam/product") -@Tag(name="综合商品类别和相关生产过程") +@RequestMapping("v2/cbam/routerelation") +@Tag(name="生产过程和原料 与 工艺路线关联表") @RequiredArgsConstructor -public class CbamProductInfoController { +public class CbamProdRouteRelationController { - private final CbamProductInfoService cbamProductInfoService; + private final CbamProdRouteRelationService cbamProdRouteRelationService; @GetMapping("page") @Operation(summary="分页") @@ -43,35 +42,35 @@ public class CbamProductInfoController { @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamProductInfoService.getPageData(params, CbamProductInfoDTO.class); - return new Result>().ok(page); + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cbamProdRouteRelationService.getPageData(params, CbamProdRouteRelationDTO.class); + return new Result>().ok(page); } @GetMapping("{id}") @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProductInfoDTO data = cbamProductInfoService.getByIdAs(id, CbamProductInfoDTO.class); - return new Result().ok(data); + public Result get(@PathVariable("id") Long id){ + CbamProdRouteRelationDTO data = cbamProdRouteRelationService.getByIdAs(id, CbamProdRouteRelationDTO.class); + return new Result().ok(data); } @PostMapping @Operation(summary="保存") @LogOperation("保存") - public Result save(@RequestBody CbamProductInfoDTO dto){ + public Result save(@RequestBody CbamProdRouteRelationDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProductInfoService.saveDto(dto); + cbamProdRouteRelationService.saveDto(dto); return new Result<>(); } @PutMapping @Operation(summary="修改") @LogOperation("修改") - public Result update(@RequestBody CbamProductInfoDTO dto){ + public Result update(@RequestBody CbamProdRouteRelationDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProductInfoService.updateDto(dto); + cbamProdRouteRelationService.updateDto(dto); return new Result<>(); } @@ -81,7 +80,7 @@ public class CbamProductInfoController { public Result delete(@RequestBody Long[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - cbamProductInfoService.batchDelete(ids); + cbamProdRouteRelationService.batchDelete(ids); return new Result<>(); } @@ -90,8 +89,8 @@ public class CbamProductInfoController { *@Operation(summary="导出") *@LogOperation("导出") *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamProductInfoService.listAs(params, CbamProductInfoDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "综合商品类别和相关生产过程", list, CbamProductInfoExcel.class); + * List list = cbamProdRouteRelationService.listAs(params, CbamProdRouteRelationDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "生产过程和原料 与 工艺路线关联表", list, CbamProdRouteRelationExcel.class); *} */ diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java index 2636fe0..57afe58 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java @@ -17,13 +17,15 @@ public class CbamIndustryDTO implements Serializable { @Schema(description = "主键id") private Long id; + @Schema(description = "所属行业字典id") + private Long industryDictId; @Schema(description = "所属行业") - private String industry; + private String industryDict; @Schema(description = "开始日期：11位数") private Long startDate; @Schema(description = "结束日期：11位数") private Long endDate; - @Schema(description = "报告周期说明：默认情况是一整个日历年") + @Schema(description = "报告周期说明：默认情况是一整个日历年，这个是固定的，要是前段传过来就要") private String cycleDesc; @Schema(description = "生产工厂名称") private String factoryName; @@ -51,13 +53,10 @@ public class CbamIndustryDTO implements Serializable { private String email; @Schema(description = "电话") private String telephone; - @Schema(description = "是否涉及原料：0否1是") - private Integer materialMark; - - - private List cbamProductList; - - private List cbamMaterialList; + @Schema(description = "生产过程：返给前端的生产过程信息") + private List cbamProductList; + @Schema(description = "原料信息：返给前端的生产过程信息") + private List cbamMaterialList; /*------------------------租户信息--------------------------------*/ diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamMaterialDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamMaterialDTO.java deleted file mode 100644 index bcd21ad..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamMaterialDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.thing.cbam.baesInfoExcel.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-11-27 -*/ -@Data -@Schema(description = "原材料") -public class CbamMaterialDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "原材料名称") - private String rawMaterialName; - @Schema(description = "原材料的综合商品类别") - private String materialCategories; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java new file mode 100644 index 0000000..08faa5f --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java @@ -0,0 +1,60 @@ +package com.thing.cbam.baesInfoExcel.dto; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.core.keygen.KeyGenerators; +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** +* 综合商品类别和相关生产过程 和 购买的原材料 表 +* +* @author xc +* @since 3.0 2024-12-02 +*/ +@Data +@Schema(description = "综合商品类别和相关生产过程 和 购买的原材料 表") +public class CbamProcessMaterialDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + @Schema(description = "产品名称") + private String name; + @Schema(description = "总产量") + private String totalOutput; + @Schema(description = "HS代码") + private String hsCode; + @Schema(description = "产品生产过程字典id") + private Long productionProcessId; + @Schema(description = "综合商品类别") + private String productCategories; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + @Schema(description = "租户编码") + private Long tenantCode; + @Schema(description = "部门ID") + private Long deptId; + private Long companyId; + @Schema(description = "创建者") + private Long creator; + @Schema(description = "创建时间") + private Long createDate; + @Schema(description = "更新者") + private Long updater; + @Schema(description = "更新时间") + private Long updateDate; + @Schema(description = "产品生产过程") + private Long productionProcess; + @Schema(description = "类型1.生产过程 2.原材料") + private Integer type; + @Schema(description = "生产工艺相关信息--由关联表得到") + List routeRelationList; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java new file mode 100644 index 0000000..503c2dd --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java @@ -0,0 +1,34 @@ +package com.thing.cbam.baesInfoExcel.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-12-02 +*/ +@Data +@Schema(description = "生产过程和原料 与 工艺路线关联表") +public class CbamProdRouteRelationDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "工艺路线字典id") + private Long routeId; + @Schema(description = "排序") + private Long sort; + @Schema(description = "工艺路线名称") + private String routeName; + @Schema(description = "生产过程或原材料的id") + private Long prodMaterialId; + @Schema(description = "类型：1.生产过程 2.原料") + private Integer type; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProductInfoDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProductInfoDTO.java deleted file mode 100644 index 541c514..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProductInfoDTO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.thing.cbam.baesInfoExcel.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-11-26 -*/ -@Data -@Schema(description = "综合商品类别和相关生产过程") -public class CbamProductInfoDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "产品名称") - private String productName; - @Schema(description = "总产量") - private String totalOutput; - @Schema(description = "HS代码") - private String hsCode; - @Schema(description = "产品生产过程") - private String productionProcess; - @Schema(description = "综合商品类别") - private String comprehensiveProductCategories; - @Schema(description = "工艺路线") - private String processRoute; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java index 9cd8e3b..f24948d 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java @@ -12,24 +12,81 @@ import lombok.experimental.Accessors; @Table("cbam_industry_info") public class CbamIndustryEntity extends BaseInfoEntity { - - private String industry; + /** + * 所属行业字典id + */ + private Long industryDictId; + /** + * 所属行业 + */ + private Long industryDict; + /** + * 开始日期 + */ private Long startDate; + /** + * 结束日期 + */ private Long endDate; + /** + * 报告周期说明：默认情况是一整个日历年 + */ private String cycleDesc; + /** + * 生产工厂名称 + */ private String factoryName; + /** + * 街道编号 + */ private String streetNum; + /** + * 在欧盟进行的主要经济活动 + */ private String economicActivities; + /** + * 邮政编码 + */ private String postalCode; + /** + * 邮政信箱 + */ private String postBox; + /** + * 城市 + */ private String city; + /** + * 国家 + */ private String country; + /** + * 国际港口代码 + */ private String internationalCode; + /** + * 生产工厂坐标(经度) + */ private String factoryLongitude; + /** + * 生产工厂坐标(纬度) + */ private String factoryLatitude; + /** + * 授权代表姓名 + */ private String authorizedName; + /** + * 电子邮件 + */ private String email; + /** + * 电话 + */ private String telephone; + /** + * 是否涉及原料：0否1是 + */ private Integer materialMark; } diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamMaterialEntity.java deleted file mode 100644 index a7cc7bb..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamMaterialEntity.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.thing.cbam.baesInfoExcel.entity; - -import com.mybatisflex.annotation.Id; -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-11-27 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_industry_material") -public class CbamMaterialEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L;//数据序列化 - - @Id - private Long id; - /** - * 原材料名称 - */ - private String rawMaterialName; - /** - * 原材料的综合商品类别 - */ - private String materialCategories; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java new file mode 100644 index 0000000..bdc8d95 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java @@ -0,0 +1,88 @@ +package com.thing.cbam.baesInfoExcel.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; + +import com.mybatisflex.core.keygen.KeyGenerators; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 综合商品类别和相关生产过程 和 购买的原材料 表 + * + * @author xc + * @since 3.0 2024-12-02 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_process_material") +public class CbamProcessMaterialEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + /** + * 产品名称 + */ + private String name; + /** + * 总产量 + */ + private String totalOutput; + /** + * HS代码 + */ + private String hsCode; + /** + * 产品生产过程字典id + */ + private Long productionProcessId; + /** + * 综合商品类别 + */ + private String productCategories; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; + /** + * 租户编码 + */ + private Long tenantCode; + /** + * 部门ID + */ + private Long deptId; + private Long companyId; + /** + * 创建者 + */ + private Long creator; + /** + * 创建时间 + */ + private Long createDate; + /** + * 更新者 + */ + private Long updater; + /** + * 更新时间 + */ + private Long updateDate; + /** + * 产品生产过程 + */ + private Long productionProcess; + /** + * 类型1.生产过程 2.原材料 + */ + private Integer type; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java new file mode 100644 index 0000000..8b56da5 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java @@ -0,0 +1,51 @@ +package com.thing.cbam.baesInfoExcel.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; + +import com.mybatisflex.core.keygen.KeyGenerators; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 生产过程和原料 与 工艺路线关联表 + * + * @author xc + * @since 3.0 2024-12-02 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_prod_route_relation") +public class CbamProdRouteRelationEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + /** + * 工艺路线字典id + */ + private Long routeId; + /** + * 排序 + */ + private Long sort; + /** + * 工艺路线名称 + */ + private String routeName; + /** + * 生产过程或原材料的id + */ + private Long prodMaterialId; + /** + * 类型：1.生产过程 2.原料 + */ + private Integer type; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProductInfoEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProductInfoEntity.java deleted file mode 100644 index ccf3346..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProductInfoEntity.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.thing.cbam.baesInfoExcel.entity; - -import com.mybatisflex.annotation.Table; -import com.thing.common.orm.entity.BaseInfoEntity; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 综合商品类别和相关生产过程 - * - * @author xc - * @since 3.0 2024-11-26 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_product_info") -public class CbamProductInfoEntity extends BaseInfoEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 产品名称 - */ - private String productName; - /** - * 总产量 - */ - private String totalOutput; - /** - * HS代码 - */ - private String hsCode; - /** - * 产品生产过程 - */ - private String productionProcess; - /** - * 综合商品类别 - */ - private String comprehensiveProductCategories; - /** - * 工艺路线 - */ - private String processRoute; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamMaterialMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamMaterialMapper.java deleted file mode 100644 index 228f048..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamMaterialMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.thing.cbam.baesInfoExcel.mapper; - - -import com.thing.cbam.baesInfoExcel.entity.CbamMaterialEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamMaterialMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java new file mode 100644 index 0000000..1068bdc --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java @@ -0,0 +1,16 @@ +package com.thing.cbam.baesInfoExcel.mapper; + +import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* 综合商品类别和相关生产过程 和 购买的原材料 表 +* +* @author xc +* @since 3.0 2024-12-02 +*/ +@Mapper +public interface CbamProcessMaterialMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java new file mode 100644 index 0000000..70f6a77 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java @@ -0,0 +1,16 @@ +package com.thing.cbam.baesInfoExcel.mapper; + +import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* 生产过程和原料 与 工艺路线关联表 +* +* @author xc +* @since 3.0 2024-12-02 +*/ +@Mapper +public interface CbamProdRouteRelationMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProductInfoMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProductInfoMapper.java deleted file mode 100644 index b503cb7..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProductInfoMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.baesInfoExcel.mapper; - -import com.thing.cbam.baesInfoExcel.entity.CbamProductInfoEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 综合商品类别和相关生产过程 -* -* @author xc -* @since 3.0 2024-11-27 -*/ -@Mapper -public interface CbamProductInfoMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java index 797f093..4d8eeb7 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java @@ -13,7 +13,11 @@ public interface CbamIndustryService extends IBaseService { CbamIndustryDTO findById(Long id); - void saveEntity(CbamIndustryDTO dto); + void saveIndustryInfo(CbamIndustryDTO dto); + + void updateIndustryInfo(CbamIndustryDTO dto); + + void batchDeleteByIds( Long[] ids); LinkedHashMap validateMsg(Long hyId,Long startTime,Long endTime); diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamMaterialService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamMaterialService.java deleted file mode 100644 index 7db73aa..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamMaterialService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service; - - -import com.thing.cbam.baesInfoExcel.dto.CbamMaterialDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamMaterialEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -public interface CbamMaterialService extends IBaseService { - List findListByIndustryId(Long industryId); - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java new file mode 100644 index 0000000..472aeba --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java @@ -0,0 +1,44 @@ +package com.thing.cbam.baesInfoExcel.service; + +import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; +import com.thing.common.orm.service.IBaseService; + +import java.util.List; + +/** + * 综合商品类别和相关生产过程 和 购买的原材料 表 + * + * @author xc + * @since 3.0 2024-12-02 + */ +public interface CbamProcessMaterialService extends IBaseService { + + /** + * 根据行业id和类型查询 + * @param industryId + * @param type + * @return + */ + List getByIndustryIdAndType(Long industryId,Integer type); + + /** + * 根据行业id查询 + * @param industryId + * @return + */ + List getByIndustryId(Long industryId); + + /** + * 批量保存 + * @param list + */ + void batchSaveList(List list,Integer type); + + /** + * 批量更新 + * @param list + */ + void batchDeleteAndSaveList(List list,Long industryId,Integer type); + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java new file mode 100644 index 0000000..1cd1f8f --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java @@ -0,0 +1,19 @@ +package com.thing.cbam.baesInfoExcel.service; + +import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; +import com.thing.common.orm.service.IBaseService; + +import java.util.List; + +/** + * 生产过程和原料 与 工艺路线关联表 + * + * @author xc + * @since 3.0 2024-12-02 + */ +public interface CbamProdRouteRelationService extends IBaseService { + + List getByProdMaterialIdAndType(Long prodMaterialId, Integer type); + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProductInfoService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProductInfoService.java deleted file mode 100644 index 20d0246..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProductInfoService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service; - - -import com.thing.cbam.baesInfoExcel.dto.CbamProductInfoDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProductInfoEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - - -/** - * 综合商品类别和相关生产过程 - * - * @author xc - * @since 3.0 2024-11-26 - */ -public interface CbamProductInfoService extends IBaseService { - - - List findListByIndustryId(Long industryId); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java index 82c3dac..0a6afbc 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java @@ -2,38 +2,38 @@ package com.thing.cbam.baesInfoExcel.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.mybatisflex.core.query.QueryWrapper; - import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; -import com.thing.cbam.baesInfoExcel.dto.CbamMaterialDTO; -import com.thing.cbam.baesInfoExcel.dto.CbamProductInfoDTO; +import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; +import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; -import com.thing.cbam.baesInfoExcel.entity.CbamMaterialEntity; -import com.thing.cbam.baesInfoExcel.entity.CbamProductInfoEntity; +import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; +import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; import com.thing.cbam.baesInfoExcel.mapper.CbamIndustryMapper; import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; -import com.thing.cbam.baesInfoExcel.service.CbamMaterialService; -import com.thing.cbam.baesInfoExcel.service.CbamProductInfoService; +import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; +import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; import com.thing.common.core.constants.Constant; import com.thing.common.core.exception.SysException; import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; -import jakarta.annotation.Resource; +import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; @Service +@RequiredArgsConstructor public class CbamIndustryServiceImpl extends BaseServiceImpl implements CbamIndustryService { - @Resource - private CbamProductInfoService cbamProductInfoService; - @Resource - private CbamMaterialService cbamMaterialService; +// private final CbamProductInfoService cbamProductInfoService; +// +// private final CbamMaterialService cbamMaterialService; +// +// private final CbamProdRouteRelationService cbamProdRouteRelationService; + private final CbamProcessMaterialService cbamProcessMaterialService; + private final CbamProdRouteRelationService cbamProdRouteRelationService; @Override @@ -57,38 +57,94 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl cbamProductInfoDTOList = cbamProductInfoService.findListByIndustryId(id); - dto.setCbamProductList(cbamProductInfoDTOList); - - List cbamMaterialDTOList = cbamMaterialService.findListByIndustryId(id); - dto.setCbamMaterialList(cbamMaterialDTOList); - - return dto; + //2.查询综合商品类别和相关生产过程和相关工艺路线 + List processDTOList = cbamProcessMaterialService.getByIndustryIdAndType(cbamIndustryDTO.getId(),1); + //2.1查询综合商品类别相关工艺路线 + if(CollectionUtil.isNotEmpty(processDTOList)){ + for (CbamProcessMaterialDTO cbamProcessDTO : processDTOList) { + //查询工艺路线 + List routeRelationDTOS = cbamProdRouteRelationService.getByProdMaterialIdAndType(cbamProcessDTO.getId(), cbamProcessDTO.getType()); + if(CollectionUtil.isNotEmpty(routeRelationDTOS)){ + //将工艺路线设置到综合商品类别中 + cbamProcessDTO.setRouteRelationList(routeRelationDTOS); + } + } + cbamIndustryDTO.setCbamProductList(processDTOList); + } + //3.查询购买的原材料和相关工艺路线 + List cbamMaterialDTOList = cbamProcessMaterialService.getByIndustryIdAndType(cbamIndustryDTO.getId(),2); + //3.1查询购买的原材料的相关工艺路线 + if(CollectionUtil.isNotEmpty(cbamMaterialDTOList)){ + for (CbamProcessMaterialDTO cbamProcessMaterialDTO : cbamMaterialDTOList) { + //查询工艺路线 + List routeRelationDTOS = cbamProdRouteRelationService.getByProdMaterialIdAndType(cbamProcessMaterialDTO.getId(), cbamProcessMaterialDTO.getType()); + if(CollectionUtil.isNotEmpty(routeRelationDTOS)){ + //将工艺路线设置到原料类别中 + cbamProcessMaterialDTO.setRouteRelationList(routeRelationDTOS); + } + } + cbamIndustryDTO.setCbamMaterialList(cbamMaterialDTOList); + } + return cbamIndustryDTO; } @Transactional(rollbackFor = Exception.class) @Override - public void saveEntity(CbamIndustryDTO dto) { - //逻辑： + public void saveIndustryInfo(CbamIndustryDTO dto) { + //1.插入相关行业企业等基本信息 mapper.insert(ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class)); - List cbamProductList = dto.getCbamProductList(); - List cbamMaterialList = dto.getCbamMaterialList(); - + //2.获取生产过程和相关工艺路线 + List cbamProductList = dto.getCbamProductList(); if (CollectionUtil.isNotEmpty(cbamProductList)) { - cbamProductInfoService.saveBatch(ConvertUtils.sourceToTarget(cbamProductList, CbamProductInfoEntity.class)); + cbamProcessMaterialService.batchSaveList(cbamProductList,1); } - if (CollectionUtil.isNotEmpty(cbamMaterialList)) { - cbamMaterialService.saveBatch(ConvertUtils.sourceToTarget(cbamMaterialList, CbamMaterialEntity.class)); + //3.获取购买的原材料和相关工艺路线 + List cbamMaterialList = dto.getCbamMaterialList(); + if (CollectionUtil.isNotEmpty(cbamProductList)) { + cbamProcessMaterialService.batchSaveList(cbamProductList,2); } } + @Transactional(rollbackFor = Exception.class) @Override - public LinkedHashMap validateMsg(Long hyId,Long startTime,Long endTime) { + public void updateIndustryInfo(CbamIndustryDTO dto) { + //1.根据id查询相关行业企业等基本信息 + CbamIndustryEntity cbamIndustryEntity = mapper.selectOneById(dto.getId()); + if(Objects.isNull(cbamIndustryEntity)){ + throw new SysException("查询相关行业企业等基本信息不存在"); + } + //2.将修改的值赋值给 industryEntity 对象 + CbamIndustryEntity industryEntity = ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class); + //3.更新相关行业企业等基本信息 + mapper.updateByQuery(industryEntity,QueryWrapper.create().eq(CbamIndustryEntity::getId,dto.getId())); + //4.获取生产过程和相关工艺路线，并进行更新 + List cbamProductList = dto.getCbamProductList(); + cbamProcessMaterialService.batchDeleteAndSaveList(cbamProductList,industryEntity.getId(),1); + //5.获取购买的原材料和相关工艺路线，并进行更新 + List cbamaterialList = dto.getCbamMaterialList(); + cbamProcessMaterialService.batchDeleteAndSaveList(cbamaterialList,industryEntity.getId(),2); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void batchDeleteByIds(Long[] ids) { + //1.删行业基本信息 + mapper.deleteBatchByIds(Arrays.asList(ids)); + //2.删除生产过程和原料信息 + cbamProcessMaterialService.getMapper().deleteByQuery(QueryWrapper.create() + .in(CbamProcessMaterialEntity::getIndustryId,Arrays.asList(ids))); + //3.首选删除生产过程和原料信息相关联的工艺路线 + cbamProdRouteRelationService.getMapper().deleteByQuery(QueryWrapper.create() + .in(CbamProdRouteRelationEntity::getProdMaterialId,Arrays.asList(ids))); + } + @Override + public LinkedHashMap validateMsg(Long hyId,Long startTime,Long endTime) { LinkedHashMap resMap = new LinkedHashMap<>(); //1.所属行业不能为空，并且是行业字典的值 diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamMaterialServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamMaterialServiceImpl.java deleted file mode 100644 index 920b6a1..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamMaterialServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; - -import com.thing.cbam.baesInfoExcel.dto.CbamMaterialDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamMaterialEntity; -import com.thing.cbam.baesInfoExcel.mapper.CbamMaterialMapper; -import com.thing.cbam.baesInfoExcel.service.CbamMaterialService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -@Service -public class CbamMaterialServiceImpl extends BaseServiceImpl implements CbamMaterialService { - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - @Override - public List findListByIndustryId(Long industryId) { - return mapper.selectListByQueryAs(QueryWrapper.create().eq(CbamMaterialEntity::getIndustryId,industryId), CbamMaterialDTO.class); - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java new file mode 100644 index 0000000..897c8ab --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java @@ -0,0 +1,95 @@ +package com.thing.cbam.baesInfoExcel.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; +import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; +import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; +import com.thing.cbam.baesInfoExcel.mapper.CbamProcessMaterialMapper; +import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; +import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; +import com.thing.common.core.exception.SysException; +import com.thing.common.core.utils.ConvertUtils; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * 综合商品类别和相关生产过程 和 购买的原材料 表 + * + * @author xc + * @since 3.0 2024-12-02 + */ +@Service +@RequiredArgsConstructor +public class CbamProcessMaterialServiceImpl extends BaseServiceImpl implements CbamProcessMaterialService { + + + private final CbamProdRouteRelationService cbamProdRouteRelationService; + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + + @Override + public List getByIndustryIdAndType(Long industryId, Integer type) { + QueryWrapper queryWrapper = QueryWrapper.create() + .eq(CbamProcessMaterialEntity::getIndustryId, industryId) + .eq(CbamProcessMaterialEntity::getType, type); + return mapper.selectListByQueryAs(queryWrapper, CbamProcessMaterialDTO.class); + } + + @Override + public List getByIndustryId(Long industryId) { + QueryWrapper queryWrapper = QueryWrapper.create().eq(CbamProcessMaterialEntity::getIndustryId, industryId); + return mapper.selectListByQueryAs(queryWrapper, CbamProcessMaterialDTO.class); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void batchSaveList(List list,Integer type) { + //遍历相关生产产品或者原料列表 + for (CbamProcessMaterialDTO cbamProcessMaterialDTO : list) { + cbamProcessMaterialDTO.setType(type); + CbamProcessMaterialEntity cbamProcessMaterialEntity = ConvertUtils.sourceToTarget(cbamProcessMaterialDTO, CbamProcessMaterialEntity.class); + //1.保存产品或者原料信息 + mapper.insert(cbamProcessMaterialEntity); + //2.保存产品或者原料的生产工艺信息 + List routeRelationList = cbamProcessMaterialDTO.getRouteRelationList(); + if(CollectionUtil.isNotEmpty(routeRelationList)){ + for (CbamProdRouteRelationDTO cbamProdRouteRelationDTO : routeRelationList) { + cbamProdRouteRelationDTO.setProdMaterialId(cbamProcessMaterialEntity.getId()); + cbamProdRouteRelationDTO.setType(type); + } + //将工艺信息保存到数据库 + cbamProdRouteRelationService.saveBatch(ConvertUtils.sourceToTarget(routeRelationList, CbamProdRouteRelationEntity.class)); + } + } + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void batchDeleteAndSaveList(List list,Long industryId,Integer type){ + //1.先删除相关的产品或者原料信息 + mapper.deleteByQuery(QueryWrapper.create() + .in(CbamProcessMaterialEntity::getIndustryId,list.stream().map(CbamProcessMaterialDTO::getIndustryId).toList()) + .eq(CbamProcessMaterialEntity::getType,type) + ); + //2.先删除相关的产品或者原料信息 关联的 生产工艺信息 + cbamProdRouteRelationService.getMapper().deleteByQuery(QueryWrapper.create() + .in(CbamProdRouteRelationEntity::getProdMaterialId,list.stream().map(CbamProcessMaterialDTO::getId).toList()) + .eq(CbamProdRouteRelationEntity::getType,type) + ); + //3.重写保存相关的产品或者原料信息和相关联的工艺信息 + batchSaveList( list,type); + } +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java new file mode 100644 index 0000000..2a3c7ac --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java @@ -0,0 +1,39 @@ +package com.thing.cbam.baesInfoExcel.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; +import com.thing.cbam.baesInfoExcel.mapper.CbamProdRouteRelationMapper; +import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; +import com.thing.common.orm.service.impl.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * 生产过程和原料 与 工艺路线关联表 + * + * @author xc + * @since 3.0 2024-12-02 + */ +@Service +public class CbamProdRouteRelationServiceImpl extends BaseServiceImpl implements CbamProdRouteRelationService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + + @Override + public List getByProdMaterialIdAndType(Long prodMaterialId, Integer type) { + QueryWrapper queryWrapper = QueryWrapper.create() + .eq(CbamProdRouteRelationEntity::getProdMaterialId, prodMaterialId) + .eq(CbamProdRouteRelationEntity::getType, type) + .orderBy(CbamProdRouteRelationEntity::getSort,true); + return mapper.selectListByQueryAs(queryWrapper, CbamProdRouteRelationDTO.class); + } +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProductInfoServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProductInfoServiceImpl.java deleted file mode 100644 index bfc9470..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProductInfoServiceImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; - -import com.thing.cbam.baesInfoExcel.dto.CbamProductInfoDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProductInfoEntity; -import com.thing.cbam.baesInfoExcel.mapper.CbamProductInfoMapper; -import com.thing.cbam.baesInfoExcel.service.CbamProductInfoService; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * 综合商品类别和相关生产过程 - * - * @author xc - * @since 3.0 2024-11-26 - */ -@Service -public class CbamProductInfoServiceImpl extends BaseServiceImpl implements CbamProductInfoService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List findListByIndustryId(Long industryId){ - return mapper.selectListByQueryAs(QueryWrapper.create().eq(CbamProductInfoEntity::getIndustryId,industryId), CbamProductInfoDTO.class); - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java new file mode 100644 index 0000000..048aa20 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java @@ -0,0 +1,112 @@ +package com.thing.cbam.dict.controller; + +import com.thing.cbam.dict.dto.CbamFuelDictDTO; +import com.thing.cbam.dict.service.CbamFuelDictService; +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 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.List; +import java.util.Map; + +/** +* 燃料参数字典表 +* +* @author xc +* @since 3.0 2024-11-29 +*/ +@RestController +@RequestMapping("v2/cbam/fuel") +@Tag(name="燃料参数字典表") +@RequiredArgsConstructor +public class CbamFuelDictController { + + private final CbamFuelDictService cbamFuelDictService; + + @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 = cbamFuelDictService.getPageData(params, CbamFuelDictDTO.class); + return new Result>().ok(page); + } + + @GetMapping("list") + @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> list(@Parameter(hidden = true) @RequestParam Map params){ + List list = cbamFuelDictService.listAs(params, CbamFuelDictDTO.class); + return new Result>().ok(list); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamFuelDictDTO data = cbamFuelDictService.getByIdAs(id, CbamFuelDictDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamFuelDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamFuelDictService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamFuelDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamFuelDictService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamFuelDictService.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 = cbamFuelDictService.listAs(params, CbamFuelDictDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "燃料参数字典表", list, CbamFuelDictExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java new file mode 100644 index 0000000..890388c --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java @@ -0,0 +1,37 @@ +package com.thing.cbam.dict.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-11-29 +*/ +@Data +@Schema(description = "燃料参数字典表") +public class CbamFuelDictDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "主键") + private Long id; + @Schema(description = "中文名") + private String name; + @Schema(description = "英文名") + private String ename; + @Schema(description = "低位发热量") + private String lowHeatAmount; + @Schema(description = "单位") + private String unit; + @Schema(description = "碳氧化率") + private String carbonOxdRate; + @Schema(description = "排放因子") + private String emissionFactor; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java new file mode 100644 index 0000000..fe4553a --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java @@ -0,0 +1,54 @@ +package com.thing.cbam.dict.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-11-29 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_fuel_dict") +public class CbamFuelDictEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + /** + * 中文名 + */ + private String name; + /** + * 英文名 + */ + private String ename; + /** + * 低位发热量 + */ + private String lowHeatAmount; + /** + * 单位 + */ + private String unit; + /** + * 碳氧化率（氧化因子） + */ + private String carbonOxdRate; + /** + * 排放因子 + */ + private String emissionFactor; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java new file mode 100644 index 0000000..4d4467b --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java @@ -0,0 +1,16 @@ +package com.thing.cbam.dict.mapper; + +import com.thing.cbam.dict.entity.CbamFuelDictEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* 燃料参数字典表 +* +* @author xc +* @since 3.0 2024-11-29 +*/ +@Mapper +public interface CbamFuelDictMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java new file mode 100644 index 0000000..7702ffa --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java @@ -0,0 +1,15 @@ +package com.thing.cbam.dict.service; + +import com.thing.cbam.dict.entity.CbamFuelDictEntity; +import com.thing.common.orm.service.IBaseService; + +/** + * 燃料参数字典表 + * + * @author xc + * @since 3.0 2024-11-29 + */ +public interface CbamFuelDictService extends IBaseService { + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java new file mode 100644 index 0000000..ec93fc2 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java @@ -0,0 +1,35 @@ +package com.thing.cbam.dict.service.impl; + +import cn.hutool.core.map.MapUtil; +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.dict.entity.CbamFuelDictEntity; +import com.thing.cbam.dict.mapper.CbamFuelDictMapper; +import com.thing.cbam.dict.service.CbamFuelDictService; +import com.thing.common.core.constants.Constant; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 燃料参数字典表 + * + * @author xc + * @since 3.0 2024-11-29 + */ +@Service +public class CbamFuelDictServiceImpl extends BaseServiceImpl implements CbamFuelDictService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + + String orderField = MapUtil.getStr(params, Constant.ORDER_FIELD, "sort"); + String order = MapUtil.getStr(params, Constant.ORDER, Constant.ASC); + + wrapper.orderBy(orderField, Constant.ASC.equals(order)); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java index 6447633..f06051c 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java @@ -1,3 +1,4 @@ +/* package com.thing.cbam.directCarbon.controller; import com.thing.cbam.directCarbon.dto.CbamCarbonBurnDTO; @@ -20,20 +21,24 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; +import java.util.List; import java.util.Map; +*/ /** * 直接排放量 * -* @author xc +* @author xc * @since 3.0 2024-11-27 -*/ +*//* + @RestController -@RequestMapping("v2/cbam/carbon/burn") -@Tag(name="直接排放量") +@RequestMapping("v2/cbam/carbon1") +@Tag(name="直接排放量--燃烧排放") @RequiredArgsConstructor public class CbamCarbonBurnController { - + private final CbamCarbonBurnService cbamCarbonBurnService; @GetMapping("page") @@ -66,6 +71,16 @@ public class CbamCarbonBurnController { return new Result<>(); } + + @PostMapping + @Operation(summary="批量保存") + @LogOperation("批量保存") + public Result batchSave(@RequestBody List dtoList){ + //效验数据 + cbamCarbonBurnService.batchSave(dtoList); + return new Result<>(); + } + @PutMapping @Operation(summary="修改") @LogOperation("修改") @@ -86,7 +101,19 @@ public class CbamCarbonBurnController { return new Result<>(); } - /** + @PostMapping + @Operation(summary="计算燃烧排放量") + @LogOperation("计算燃烧排放量") + public Result> calculate(Long fuelId,BigDecimal consumeAmount,BigDecimal biomassContent){ + //效验数据 + return new Result>().ok(cbamCarbonBurnService.calculate(fuelId, consumeAmount,biomassContent)); + } + + + + + */ +/** *@GetMapping("export") *@Operation(summary="导出") *@LogOperation("导出") @@ -94,6 +121,7 @@ public class CbamCarbonBurnController { * List list = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); *} - */ + *//* + -} \ No newline at end of file +}*/ diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java new file mode 100644 index 0000000..1129fc2 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java @@ -0,0 +1,114 @@ +package com.thing.cbam.directCarbon.controller; + +import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; +import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; +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 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.List; +import java.util.Map; + +/** +* 直接排放量B-Excel +* +* @author xc +* @since 3.0 2024-12-02 +*/ +@RestController +@RequestMapping("v2/cbam/carbonDirect") +@Tag(name="直接排放量B-Excel") +@RequiredArgsConstructor +public class CbamCarbonDirectController { + + private final CbamCarbonDirectService cbamCarbonDirectService; + + @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 = cbamCarbonDirectService.getPageData(params, CbamCarbonDirectDTO.class); + return new Result>().ok(page); + } + + + @GetMapping("listByIndustryId") + @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> listByIndustryId(@RequestParam Long industryId){ + List cbamCarbonDirectDTOS = cbamCarbonDirectService.listByIndustryId(industryId); + return new Result>().ok(cbamCarbonDirectDTOS); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamCarbonDirectDTO data = cbamCarbonDirectService.getByIdAs(id, CbamCarbonDirectDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamCarbonDirectDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamCarbonDirectService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamCarbonDirectDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamCarbonDirectService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamCarbonDirectService.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 = cbamCarbonDirectService.listAs(params, CbamCarbonDirectDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量B-Excel", list, CbamCarbonDirectExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java index 0728320..05af6c0 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java @@ -25,7 +25,9 @@ import java.util.Map; @Tag(name="原料过程排放") @RequiredArgsConstructor public class CbamCarbonProgressController { + private final CbamCarbonProgressService cbamCarbonProgressService; + @GetMapping("page") @Operation(summary="分页") @Parameters({ diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java index c05a56c..33f4487 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java @@ -24,9 +24,11 @@ public class CbamCarbonBurnDTO implements Serializable { @Schema(description = "名称") private String name; @Schema(description = "消耗量") - private String consumAmount; + private String consumeAmount; + @Schema(description = "消耗量单位") + private String consumeUnit; @Schema(description = "低位发热量") - private String lowheatGener; + private String lowHeatVal; @Schema(description = "排放源名称") private String emissionName; @Schema(description = "排放因子") diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java new file mode 100644 index 0000000..a0c5a22 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java @@ -0,0 +1,84 @@ +package com.thing.cbam.directCarbon.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 直接排放量B-Excel +* +* @author xc +* @since 3.0 2024-12-02 +*/ +@Data +@Schema(description = "直接排放量B-Excel") +public class CbamCarbonDirectDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "燃料名称/过程排放名称/物料平衡名称") + private String name; + @Schema(description = "消耗量/产量：输入") + private String consumeAmount; + @Schema(description = "消耗量单位：t 或者 1000Nm2") + private String consumeUnit; + @Schema(description = "低位发热量：燃料字典表值") + private String lowHeatVal; + @Schema(description = "低位发热量单位：燃料字典表值") + private String lowHeatUnit; + @Schema(description = "排放因子：燃料字典表值") + private String emissionFactors; + @Schema(description = "排放因子单位：燃料字典表值") + private String emissionFactorsUnit; + @Schema(description = "氧化因子/转化因子：燃料字典表值") + private String oxidationFactor; + @Schema(description = "生物量含量/生物质组分：输入") + private String biomassContent; + @Schema(description = "直接碳排量：计算") + private String directCarbonNum; + @Schema(description = "生物质燃料排放量：计算") + private String biomassFuelNum; + @Schema(description = "能量含量(化石燃料)，TJ：计算") + private String energyFossilNum; + @Schema(description = "能量含量(生物燃料)，TJ：计算") + private String energyBiologyNum; + @Schema(description = "碳含量(tC/t)") + private String carbonNum; + @Schema(description = "气体类型：CO2/N2O") + private String gasType; + @Schema(description = "生物质组分单位") + private String biomassUnit; + @Schema(description = "每小时平均温室气体浓度") + private String hourAvgGasDensity; + @Schema(description = "每小时平均温室气体浓度.单位") + private String hourAvgGasDensityUnit; + @Schema(description = "运行小时数") + private String runHours; + @Schema(description = "烟气") + private String smokeAvg; + @Schema(description = "烟气.单位") + private String smokeAvgUnit; + @Schema(description = "温室气体年排放量") + private String gasAnnualEmissions; + @Schema(description = "温室气体年排放量单位") + private String gasAnnualEmissionsUnit; + @Schema(description = "化石燃料碳排放量") + private String fossilFuelCarbon; + @Schema(description = "全球变暖潜势id") + private String globalWarmingId; + @Schema(description = "全球变暖潜势") + private String globalWarming; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + @Schema(description = "类型：\n" + + "1.是否涉及燃烧排放\n" + + "2.是否涉及过程排放\n" + + "3.是否涉及物料平衡\n" + + "4.是否有连续排放测量系统(CEMS)") + private Integer type; + private Long sort; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java index 20a4fbd..237bb30 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java @@ -11,7 +11,7 @@ import java.io.Serial; import java.io.Serializable; /** - * 直接排放量 + * 燃烧排放量 * * @author xc * @since 3.0 2024-11-27 @@ -33,11 +33,15 @@ public class CbamCarbonBurnEntity implements Serializable { /** * 消耗量 */ - private String consumAmount; + private String consumeAmount; + /** + * 消耗量单位 + */ + private String consumeUnit; /** * 低位发热量 */ - private String lowheatGener; + private String lowHeatVal; /** * 排放源名称 */ diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java new file mode 100644 index 0000000..3e8c33c --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java @@ -0,0 +1,146 @@ +package com.thing.cbam.directCarbon.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.Table; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 直接排放量B-Excel + * + * @author xc + * @since 3.0 2024-12-02 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_carbon_direct") +public class CbamCarbonDirectEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id + private Long id; + /** + * 燃料名称/过程排放名称/物料平衡名称 + */ + private String name; + /** + * 消耗量/产量：输入 + */ + private String consumeAmount; + /** + * 消耗量单位：t 或者 1000Nm2 + */ + private String consumeUnit; + /** + * 低位发热量：燃料字典表值 + */ + private String lowHeatVal; + /** + * 低位发热量单位：燃料字典表值 + */ + private String lowHeatUnit; + /** + * 排放因子：燃料字典表值 + */ + private String emissionFactors; + /** + * 排放因子单位：燃料字典表值 + */ + private String emissionFactorsUnit; + /** + * 氧化因子/转化因子：燃料字典表值 + */ + private String oxidationFactor; + /** + * 生物量含量/生物质组分：输入 + */ + private String biomassContent; + /** + * 直接碳排量：计算 + */ + private String directCarbonNum; + /** + * 生物质燃料排放量：计算 + */ + private String biomassFuelNum; + /** + * 能量含量(化石燃料)，TJ：计算 + */ + private String energyFossilNum; + /** + * 能量含量(生物燃料)，TJ：计算 + */ + private String energyBiologyNum; + /** + * 碳含量(tC/t) + */ + private String carbonNum; + /** + * 气体类型：CO2/N2O + */ + private String gasType; + /** + * 生物质组分单位 + */ + private String biomassUnit; + /** + * 每小时平均温室气体浓度 + */ + private String hourAvgGasDensity; + /** + * 每小时平均温室气体浓度.单位 + */ + private String hourAvgGasDensityUnit; + /** + * 运行小时数 + */ + private String runHours; + /** + * 烟气 + */ + private String smokeAvg; + /** + * 烟气.单位 + */ + private String smokeAvgUnit; + /** + * 温室气体年排放量 + */ + private String gasAnnualEmissions; + /** + * 温室气体年排放量单位 + */ + private String gasAnnualEmissionsUnit; + /** + * 化石燃料碳排放量 + */ + private String fossilFuelCarbon; + /** + * 全球变暖潜势id + */ + private String globalWarmingId; + /** + * 全球变暖潜势 + */ + private String globalWarming; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; + + /** + * 类型： + * 1.是否涉及燃烧排放 + * 2.是否涉及过程排放 + * 3.是否涉及物料平衡 + * 4.是否有连续排放测量系统(CEMS) + */ + private Integer type; + private Long sort; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java index a25a7f9..0c2f0a8 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java @@ -29,7 +29,7 @@ public class CbamCarbonProgressEntity implements Serializable { /** * 名称 */ - private String name; + private String fuelName; /** * 消耗量 */ diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java new file mode 100644 index 0000000..b663595 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java @@ -0,0 +1,16 @@ +package com.thing.cbam.directCarbon.mapper; + +import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* 直接排放量B-Excel +* +* @author xc +* @since 3.0 2024-12-02 +*/ +@Mapper +public interface CbamCarbonDirectMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java index be520f5..32c068f 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java @@ -1,8 +1,13 @@ package com.thing.cbam.directCarbon.service; +import com.thing.cbam.directCarbon.dto.CbamCarbonBurnDTO; import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; import com.thing.common.orm.service.IBaseService; +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + /** * 直接排放量 @@ -12,4 +17,10 @@ import com.thing.common.orm.service.IBaseService; */ public interface CbamCarbonBurnService extends IBaseService { + + void batchSave(List dtoList); + + Map calculate(Long fuelId, BigDecimal consumeAmount,BigDecimal biomassContent); + + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java new file mode 100644 index 0000000..7484518 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java @@ -0,0 +1,19 @@ +package com.thing.cbam.directCarbon.service; + +import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; +import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; +import com.thing.common.orm.service.IBaseService; + +import java.util.List; + +/** + * 直接排放量B-Excel + * + * @author xc + * @since 3.0 2024-12-02 + */ +public interface CbamCarbonDirectService extends IBaseService { + + List listByIndustryId(Long industryId); + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java index 8a6d0b4..ace25bd 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java @@ -1,6 +1,5 @@ package com.thing.cbam.directCarbon.service; -import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; import com.thing.cbam.directCarbon.entity.CbamCarbonProgressEntity; import com.thing.common.orm.service.IBaseService; diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java index 67f2e29..77085b5 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java @@ -1,14 +1,25 @@ package com.thing.cbam.directCarbon.service.impl; import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.dict.entity.CbamFuelDictEntity; +import com.thing.cbam.dict.service.CbamFuelDictService; +import com.thing.cbam.directCarbon.dto.CbamCarbonBurnDTO; import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; import com.thing.cbam.directCarbon.mapper.CbamCarbonBurnMapper; import com.thing.cbam.directCarbon.service.CbamCarbonBurnService; +import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.HashMap; +import java.util.List; import java.util.Map; +import java.util.Objects; /** * 直接排放量 @@ -17,8 +28,10 @@ import java.util.Map; * @since 3.0 2024-11-27 */ @Service +@RequiredArgsConstructor public class CbamCarbonBurnServiceImpl extends BaseServiceImpl implements CbamCarbonBurnService { + private final CbamFuelDictService cbamFuelDictService; @Override public QueryWrapper getWrapper(Map params){ @@ -26,4 +39,49 @@ public class CbamCarbonBurnServiceImpl extends BaseServiceImpl dtoList) { + List cbamCarbonBurnEntities = ConvertUtils.sourceToTarget(dtoList, CbamCarbonBurnEntity.class); + mapper.insertBatch(cbamCarbonBurnEntities); + } + + @Override + public Map calculate(Long fuelId, BigDecimal consumeAmount,BigDecimal biomassContent) { + Map resMap = new HashMap<>(); + //获取燃料系数字典信息 + CbamFuelDictEntity cbamFuelDict = cbamFuelDictService.getById(fuelId); + if(Objects.isNull(cbamFuelDict)){ + throw new RuntimeException("燃料系数字典信息不存在"); + } + //公用计算：消耗量*低位发热量 + String lowHeatAmount = cbamFuelDict.getLowHeatAmount(); + BigDecimal commonResult = consumeAmount.multiply(new BigDecimal(lowHeatAmount)); + //1.首先先计算（第四个）----能量含量(生物质燃料)，工J =消耗量*低位发热量*生物量含量/100/1000 + BigDecimal energySwNum = commonResult.multiply(biomassContent) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) + .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP); + resMap.put("energyBiologyNum",energySwNum); + //2.其次计算第三个：能量含量(化石燃料),TJ =消耗量*低位发热量/1000-能量含量(生物质燃料) + BigDecimal energyHsNum = commonResult + .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP) + .subtract(energySwNum); + resMap.put("energyFossilNum",energyHsNum); + //3.生物质燃料排放量 =消耗量*低位发热量*生物量含量*排放因子/100/1000 + BigDecimal biomassFuelNum = commonResult + .multiply(commonResult) + .multiply(new BigDecimal(cbamFuelDict.getEmissionFactor())) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) + .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP); + resMap.put("biomassFuelNum",biomassFuelNum); + //4.直接碳排放量 =消耗量*低位发热量*氧化因子*排放因子/100/1000-生物质燃料排放量 + BigDecimal directCarbonNum = commonResult + .multiply(new BigDecimal(cbamFuelDict.getCarbonOxdRate())) + .multiply(new BigDecimal(cbamFuelDict.getEmissionFactor())) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) + .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP) + .subtract(biomassFuelNum); + resMap.put("directCarbonNum",directCarbonNum); + return resMap; + } } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java new file mode 100644 index 0000000..3b51e6f --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java @@ -0,0 +1,38 @@ +package com.thing.cbam.directCarbon.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; +import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; +import com.thing.cbam.directCarbon.mapper.CbamCarbonDirectMapper; +import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * 直接排放量B-Excel + * + * @author xc + * @since 3.0 2024-12-02 + */ +@Service +public class CbamCarbonDirectServiceImpl extends BaseServiceImpl implements CbamCarbonDirectService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + + @Override + public List listByIndustryId(Long industryId) { + QueryWrapper queryWrapper = QueryWrapper.create().eq(CbamCarbonDirectEntity::getIndustryId, industryId) + .orderBy(CbamCarbonDirectEntity::getType, true) + .orderBy(CbamCarbonDirectEntity::getSort, true); + List cbamCarbonDirectDTOS = mapper.selectListByQueryAs(queryWrapper, CbamCarbonDirectDTO.class); + return cbamCarbonDirectDTOS; + } +} \ No newline at end of file From 37cda69ba97d450443ac662bdcae93ae4431500b Mon Sep 17 00:00:00 2001 From: jiangc <12345678> Date: Mon, 2 Dec 2024 17:37:03 +0800 Subject: [PATCH 06/19] =?UTF-8?q?CRUD=202024=E5=B9=B412=E6=9C=882=E6=97=A5?= =?UTF-8?q?17:36:59?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CbamIndustryServiceImpl.java | 4 ++-- .../cbam/dict/controller/CbamHsDictController.java | 2 +- .../dict/controller/CbamIndustryDictController.java | 2 +- .../dict/controller/CbamProdProcessDictController.java | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java index 0a6afbc..ee3b1bb 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java @@ -105,8 +105,8 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl cbamMaterialList = dto.getCbamMaterialList(); - if (CollectionUtil.isNotEmpty(cbamProductList)) { - cbamProcessMaterialService.batchSaveList(cbamProductList,2); + if (CollectionUtil.isNotEmpty(cbamMaterialList)) { + cbamProcessMaterialService.batchSaveList(cbamMaterialList,2); } } diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java index 4378349..18f6162 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java @@ -90,7 +90,7 @@ public class CbamHsDictController { - @GetMapping("hs/{code}") + @GetMapping("process/{code}") @Operation(summary="信息") public Result> getByHsCode(@PathVariable("code") String code){ List cbamHsDictDTOS = cbamHsDictService.getByHsCode(code); diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java index 2620c41..3da627d 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java @@ -52,7 +52,7 @@ public class CbamIndustryDictController { @GetMapping("list") - @Operation(summary="列表") + @Operation(summary="行业字典列表") @Parameters({ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java index 3e26251..9ce2f49 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java @@ -59,7 +59,7 @@ public class CbamProdProcessDictController { @GetMapping("prod/{industryId}") - @Operation(summary="信息") + @Operation(summary="根据行业查询原料") public Result> getByIndustryId(@PathVariable("industryId") Long industryId){ List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByIndustryId(industryId); return new Result>().ok(cbamProdProcessDictDTOS); @@ -67,8 +67,8 @@ public class CbamProdProcessDictController { - @GetMapping("process/{prodId}") - @Operation(summary="信息") + @GetMapping("route/{prodId}") + @Operation(summary="根据原料查询工艺路线") public Result> getByProdId(@PathVariable("prodId") Long prodId){ List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdId(prodId); return new Result>().ok(cbamProdProcessDictDTOS); @@ -76,8 +76,8 @@ public class CbamProdProcessDictController { - @PostMapping("process/list") - @Operation(summary="信息") + @PostMapping("route/list") + @Operation(summary="工艺路线的集合") public Result> getByProdIds(@RequestBody List prodIds){ List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdIds(prodIds); return new Result>().ok(cbamProdProcessDictDTOS); From db8a628d7cc673b530c1a1cf6710b79660bfeccb Mon Sep 17 00:00:00 2001 From: lishuai Date: Tue, 3 Dec 2024 08:38:32 +0800 Subject: [PATCH 07/19] =?UTF-8?q?Bexcel=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=8F=91=202024=E5=B9=B412=E6=9C=883=E6=97=A508:38:27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CbamProcessMaterialEntity.java | 4 + .../CbamCarbonDirectController.java | 11 ++- .../CbamCarbonMaterialController.java | 2 +- ...a => CbamProcessAllocationController.java} | 83 ++++++------------ .../directCarbon/dto/CbamCarbonBurnDTO.java | 44 ---------- .../directCarbon/dto/CbamCarbonDirectDTO.java | 6 ++ .../dto/CbamProcessAllocationDTO.java | 35 ++++++++ ....java => CbamProcessAllocationEntity.java} | 47 ++++------ .../mapper/CbamCarbonBurnMapper.java | 17 ---- .../mapper/CbamCarbonProgressMapper.java | 1 - .../mapper/CbamProcessAllocationMapper.java | 16 ++++ .../service/CbamCarbonBurnService.java | 26 ------ .../service/CbamCarbonDirectService.java | 7 ++ .../service/CbamProcessAllocationService.java | 14 +++ .../impl/CbamCarbonBurnServiceImpl.java | 87 ------------------- .../impl/CbamCarbonDirectServiceImpl.java | 79 ++++++++++++++++- .../CbamProcessAllocationServiceImpl.java | 28 ++++++ .../util/BurningDischargeUtil.java | 85 ++++++++++++++++++ .../util/MaterialBalanceUtil.java | 55 ++++++++++++ .../util/ProcessDischargeUtil.java | 61 +++++++++++++ 20 files changed, 444 insertions(+), 264 deletions(-) rename modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/{CbamCarbonBurnController.java => CbamProcessAllocationController.java} (52%) delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java rename modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/{CbamCarbonBurnEntity.java => CbamProcessAllocationEntity.java} (50%) delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonBurnMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java index bdc8d95..e3f2605 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java @@ -85,4 +85,8 @@ public class CbamProcessMaterialEntity implements Serializable { * 类型1.生产过程 2.原材料 */ private Integer type; + /** + * 生产过程分配量 + */ +// private String processAllocation; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java index 1129fc2..943d2bd 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java @@ -29,7 +29,7 @@ import java.util.Map; * @since 3.0 2024-12-02 */ @RestController -@RequestMapping("v2/cbam/carbonDirect") +@RequestMapping("v2/cbam/carbon/direct") @Tag(name="直接排放量B-Excel") @RequiredArgsConstructor public class CbamCarbonDirectController { @@ -80,6 +80,15 @@ public class CbamCarbonDirectController { return new Result<>(); } + @PostMapping("batchSave") + @Operation(summary="保存") + @LogOperation("保存") + public Result saveList(@RequestBody List carbonDirectDTOList){ + //效验数据 + cbamCarbonDirectService.saveList(carbonDirectDTOList); + return new Result<>(); + } + @PutMapping @Operation(summary="修改") @LogOperation("修改") diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java index 3004269..e55dc37 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java @@ -23,7 +23,7 @@ import java.util.Map; @RestController @RequestMapping("v2/cbam/carbon/material") -@Tag(name = "原材料") +@Tag(name = "产品原材料") @RequiredArgsConstructor public class CbamCarbonMaterialController { private final CbamCarbonMaterialService cbamCarbonMaterialService; diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamProcessAllocationController.java similarity index 52% rename from modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java rename to modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamProcessAllocationController.java index f06051c..d5096c3 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonBurnController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamProcessAllocationController.java @@ -1,8 +1,7 @@ -/* package com.thing.cbam.directCarbon.controller; -import com.thing.cbam.directCarbon.dto.CbamCarbonBurnDTO; -import com.thing.cbam.directCarbon.service.CbamCarbonBurnService; +import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; +import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; @@ -13,7 +12,6 @@ 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 io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -21,25 +19,21 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.math.BigDecimal; -import java.util.List; import java.util.Map; -*/ /** -* 直接排放量 +* 生产过程分配量 * -* @author xc -* @since 3.0 2024-11-27 -*//* - +* @author xc +* @since 3.0 2024-12-02 +*/ @RestController -@RequestMapping("v2/cbam/carbon1") -@Tag(name="直接排放量--燃烧排放") +@RequestMapping("v2/cbam/allocation") +@Tag(name="生产过程分配量") @RequiredArgsConstructor -public class CbamCarbonBurnController { - - private final CbamCarbonBurnService cbamCarbonBurnService; +public class CbamProcessAllocationController { + + private final CbamProcessAllocationService cbamProcessAllocationService; @GetMapping("page") @Operation(summary="分页") @@ -49,45 +43,35 @@ public class CbamCarbonBurnController { @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamCarbonBurnService.getPageData(params, CbamCarbonBurnDTO.class); - return new Result>().ok(page); + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cbamProcessAllocationService.getPageData(params, CbamProcessAllocationDTO.class); + return new Result>().ok(page); } @GetMapping("{id}") @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonBurnDTO data = cbamCarbonBurnService.getByIdAs(id, CbamCarbonBurnDTO.class); - return new Result().ok(data); + public Result get(@PathVariable("id") Long id){ + CbamProcessAllocationDTO data = cbamProcessAllocationService.getByIdAs(id, CbamProcessAllocationDTO.class); + return new Result().ok(data); } @PostMapping @Operation(summary="保存") @LogOperation("保存") - public Result save(@RequestBody CbamCarbonBurnDTO dto){ + public Result save(@RequestBody CbamProcessAllocationDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonBurnService.saveDto(dto); - return new Result<>(); - } - - - @PostMapping - @Operation(summary="批量保存") - @LogOperation("批量保存") - public Result batchSave(@RequestBody List dtoList){ - //效验数据 - cbamCarbonBurnService.batchSave(dtoList); + cbamProcessAllocationService.saveDto(dto); return new Result<>(); } @PutMapping @Operation(summary="修改") @LogOperation("修改") - public Result update(@RequestBody CbamCarbonBurnDTO dto){ + public Result update(@RequestBody CbamProcessAllocationDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonBurnService.updateDto(dto); + cbamProcessAllocationService.updateDto(dto); return new Result<>(); } @@ -97,31 +81,18 @@ public class CbamCarbonBurnController { public Result delete(@RequestBody Long[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonBurnService.batchDelete(ids); + cbamProcessAllocationService.batchDelete(ids); return new Result<>(); } - @PostMapping - @Operation(summary="计算燃烧排放量") - @LogOperation("计算燃烧排放量") - public Result> calculate(Long fuelId,BigDecimal consumeAmount,BigDecimal biomassContent){ - //效验数据 - return new Result>().ok(cbamCarbonBurnService.calculate(fuelId, consumeAmount,biomassContent)); - } - - - - - */ -/** + /** *@GetMapping("export") *@Operation(summary="导出") *@LogOperation("导出") *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); + * List list = cbamProcessAllocationService.listAs(params, CbamProcessAllocationDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "生产过程分配量", list, CbamProcessAllocationExcel.class); *} - *//* - + */ -}*/ +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java deleted file mode 100644 index 33f4487..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonBurnDTO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.thing.cbam.directCarbon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* 直接排放量 -* -* @author xc -* @since 3.0 2024-11-27 -*/ -@Data -@Schema(description = "直接排放量") -public class CbamCarbonBurnDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "名称") - private String name; - @Schema(description = "消耗量") - private String consumeAmount; - @Schema(description = "消耗量单位") - private String consumeUnit; - @Schema(description = "低位发热量") - private String lowHeatVal; - @Schema(description = "排放源名称") - private String emissionName; - @Schema(description = "排放因子") - private String emissionFactors; - @Schema(description = "氧化因子") - private String oxidationFactor; - @Schema(description = "生物量含量") - private String biomassContent; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java index a0c5a22..9afbffc 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java @@ -1,11 +1,13 @@ package com.thing.cbam.directCarbon.dto; +import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * 直接排放量B-Excel @@ -81,4 +83,8 @@ public class CbamCarbonDirectDTO implements Serializable { "4.是否有连续排放测量系统(CEMS)") private Integer type; private Long sort; + @Schema(description = "生产过程分配量") + private String processAllocation; + + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java new file mode 100644 index 0000000..de52162 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java @@ -0,0 +1,35 @@ +package com.thing.cbam.directCarbon.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-12-02 +*/ +@Data +@Schema(description = "生产过程分配量") +public class CbamProcessAllocationDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "主键") + private Long id; + @Schema(description = "排放源名称") + private String name; + @Schema(description = "排放源类型：1 和 2") + private Integer type; + @Schema(description = "关联cbam_industry_info的主键id") + private Long industryId; + @Schema(description = "关联cbam_process_material的id") + private Long prodId; + @Schema(description = "生产过程分配量") + private String processAllocation; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java similarity index 50% rename from modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java rename to modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java index 237bb30..9209fe9 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonBurnEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java @@ -1,8 +1,10 @@ package com.thing.cbam.directCarbon.entity; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; +import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -11,55 +13,42 @@ import java.io.Serial; import java.io.Serializable; /** - * 燃烧排放量 + * 生产过程分配量 * * @author xc - * @since 3.0 2024-11-27 + * @since 3.0 2024-12-02 */ @Data @Accessors(chain = true) @EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_burn") -public class CbamCarbonBurnEntity implements Serializable { +@Table("cbam_process_allocation") +public class CbamProcessAllocationEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Id - private Long id; - /** - * 名称 - */ - private String name; - /** - * 消耗量 - */ - private String consumeAmount; /** - * 消耗量单位 + * 主键 */ - private String consumeUnit; - /** - * 低位发热量 - */ - private String lowHeatVal; + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; /** * 排放源名称 */ - private String emissionName; + private String name; /** - * 排放因子 + * 排放源类型：1 和 2 */ - private String emissionFactors; + private Integer type; /** - * 氧化因子 + * 关联cbam_industry_info的主键id */ - private String oxidationFactor; + private Long industryId; /** - * 生物量含量 + * 关联cbam_process_material的id */ - private String biomassContent; + private Long prodId; /** - * 关联cbam_industry_information的主键id + * 生产过程分配量 */ - private Long industryId; + private String processAllocation; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonBurnMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonBurnMapper.java deleted file mode 100644 index 3a038ed..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonBurnMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.directCarbon.mapper; - -import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 直接排放量 -* -* @author xc -* @since 3.0 2024-11-27 -*/ -@Mapper -public interface CbamCarbonBurnMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java index 971efab..569b635 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java @@ -1,6 +1,5 @@ package com.thing.cbam.directCarbon.mapper; -import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; import com.thing.cbam.directCarbon.entity.CbamCarbonProgressEntity; import com.thing.common.orm.mapper.PowerBaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java new file mode 100644 index 0000000..6e180e8 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java @@ -0,0 +1,16 @@ +package com.thing.cbam.directCarbon.mapper; + +import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* 生产过程分配量 +* +* @author xc +* @since 3.0 2024-12-02 +*/ +@Mapper +public interface CbamProcessAllocationMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java deleted file mode 100644 index 32c068f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonBurnService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.thing.cbam.directCarbon.service; - -import com.thing.cbam.directCarbon.dto.CbamCarbonBurnDTO; -import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; -import com.thing.common.orm.service.IBaseService; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - - -/** - * 直接排放量 - * - * @author xc - * @since 3.0 2024-11-27 - */ -public interface CbamCarbonBurnService extends IBaseService { - - - void batchSave(List dtoList); - - Map calculate(Long fuelId, BigDecimal consumeAmount,BigDecimal biomassContent); - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java index 7484518..5469a7c 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java @@ -3,8 +3,11 @@ package com.thing.cbam.directCarbon.service; import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; import com.thing.common.orm.service.IBaseService; +import org.springframework.web.bind.annotation.RequestBody; +import java.math.BigDecimal; import java.util.List; +import java.util.Map; /** * 直接排放量B-Excel @@ -16,4 +19,8 @@ public interface CbamCarbonDirectService extends IBaseService listByIndustryId(Long industryId); + void saveList(List carbonDirectDTOList); + + Map calculate(Long fuelId, String consumeAmount, String biomassContent); + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java new file mode 100644 index 0000000..45e5fd9 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java @@ -0,0 +1,14 @@ +package com.thing.cbam.directCarbon.service; + +import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; +import com.thing.common.orm.service.IBaseService; + +/** + * 生产过程分配量 + * + * @author xc + * @since 3.0 2024-12-02 + */ +public interface CbamProcessAllocationService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java deleted file mode 100644 index 77085b5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonBurnServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.thing.cbam.directCarbon.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamFuelDictEntity; -import com.thing.cbam.dict.service.CbamFuelDictService; -import com.thing.cbam.directCarbon.dto.CbamCarbonBurnDTO; -import com.thing.cbam.directCarbon.entity.CbamCarbonBurnEntity; -import com.thing.cbam.directCarbon.mapper.CbamCarbonBurnMapper; -import com.thing.cbam.directCarbon.service.CbamCarbonBurnService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * 直接排放量 - * - * @author xc - * @since 3.0 2024-11-27 - */ -@Service -@RequiredArgsConstructor -public class CbamCarbonBurnServiceImpl extends BaseServiceImpl implements CbamCarbonBurnService { - - private final CbamFuelDictService cbamFuelDictService; - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchSave(List dtoList) { - List cbamCarbonBurnEntities = ConvertUtils.sourceToTarget(dtoList, CbamCarbonBurnEntity.class); - mapper.insertBatch(cbamCarbonBurnEntities); - } - - @Override - public Map calculate(Long fuelId, BigDecimal consumeAmount,BigDecimal biomassContent) { - Map resMap = new HashMap<>(); - //获取燃料系数字典信息 - CbamFuelDictEntity cbamFuelDict = cbamFuelDictService.getById(fuelId); - if(Objects.isNull(cbamFuelDict)){ - throw new RuntimeException("燃料系数字典信息不存在"); - } - //公用计算：消耗量*低位发热量 - String lowHeatAmount = cbamFuelDict.getLowHeatAmount(); - BigDecimal commonResult = consumeAmount.multiply(new BigDecimal(lowHeatAmount)); - //1.首先先计算（第四个）----能量含量(生物质燃料)，工J =消耗量*低位发热量*生物量含量/100/1000 - BigDecimal energySwNum = commonResult.multiply(biomassContent) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP); - resMap.put("energyBiologyNum",energySwNum); - //2.其次计算第三个：能量含量(化石燃料),TJ =消耗量*低位发热量/1000-能量含量(生物质燃料) - BigDecimal energyHsNum = commonResult - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP) - .subtract(energySwNum); - resMap.put("energyFossilNum",energyHsNum); - //3.生物质燃料排放量 =消耗量*低位发热量*生物量含量*排放因子/100/1000 - BigDecimal biomassFuelNum = commonResult - .multiply(commonResult) - .multiply(new BigDecimal(cbamFuelDict.getEmissionFactor())) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP); - resMap.put("biomassFuelNum",biomassFuelNum); - //4.直接碳排放量 =消耗量*低位发热量*氧化因子*排放因子/100/1000-生物质燃料排放量 - BigDecimal directCarbonNum = commonResult - .multiply(new BigDecimal(cbamFuelDict.getCarbonOxdRate())) - .multiply(new BigDecimal(cbamFuelDict.getEmissionFactor())) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP) - .subtract(biomassFuelNum); - resMap.put("directCarbonNum",directCarbonNum); - return resMap; - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java index 3b51e6f..cddd291 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java @@ -1,15 +1,28 @@ package com.thing.cbam.directCarbon.service.impl; import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; +import com.thing.cbam.dict.entity.CbamFuelDictEntity; +import com.thing.cbam.dict.service.CbamFuelDictService; import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; +import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; import com.thing.cbam.directCarbon.mapper.CbamCarbonDirectMapper; import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; +import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; +import com.thing.cbam.directCarbon.util.BurningDischargeUtil; +import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** * 直接排放量B-Excel @@ -18,8 +31,14 @@ import java.util.Map; * @since 3.0 2024-12-02 */ @Service +@RequiredArgsConstructor public class CbamCarbonDirectServiceImpl extends BaseServiceImpl implements CbamCarbonDirectService { + + private final CbamFuelDictService cbamFuelDictService; + private final CbamProcessMaterialService cbamProcessMaterialService; + private final CbamProcessAllocationService cbamProcessAllocationService; + @Override public QueryWrapper getWrapper(Map params){ QueryWrapper wrapper = new QueryWrapper(); @@ -32,7 +51,63 @@ public class CbamCarbonDirectServiceImpl extends BaseServiceImpl cbamCarbonDirectDTOS = mapper.selectListByQueryAs(queryWrapper, CbamCarbonDirectDTO.class); - return cbamCarbonDirectDTOS; + return mapper.selectListByQueryAs(queryWrapper, CbamCarbonDirectDTO.class); + } + + @Transactional(rollbackFor = Exception.class) + @Override + public void saveList(List carbonDirectDTOList) { + //插入 是否涉及燃烧排放 && 是否涉及过程排放 && 是否涉及物料平衡 && 是否有连续排放测量系统(CEMS),即排除type=5的类型 + List list = carbonDirectDTOList.stream().filter(carbonDirectDTO -> !Objects.equals(carbonDirectDTO.getType(), 5)).toList(); + List cbamCarbonDirectEntities = ConvertUtils.sourceToTarget(list, CbamCarbonDirectEntity.class); + mapper.insertBatch(cbamCarbonDirectEntities); + // type=5的类型 单独 更新生产过程中的分配量 + List fiveList = carbonDirectDTOList.stream().filter(carbonDirectDTO -> Objects.equals(carbonDirectDTO.getType(), 5)).toList(); + List cbamProcessAllocationList = fiveList.stream().map(f -> { + CbamProcessAllocationEntity cbamProcessAllocationEntity = new CbamProcessAllocationEntity(); + cbamProcessAllocationEntity.setName(f.getName()); + cbamProcessAllocationEntity.setType(f.getType()); + cbamProcessAllocationEntity.setIndustryId(f.getIndustryId()); + cbamProcessAllocationEntity.setProcessAllocation(f.getProcessAllocation()); + // 根据排放源名字，排放源类型和顺序获取id + cbamCarbonDirectEntities.stream() + .filter(cbamCarbonDirectEntity -> + StringUtils.equals(cbamCarbonDirectEntity.getName(), f.getName()) + && Objects.equals(cbamCarbonDirectEntity.getType(), f.getType()) + && Objects.equals(cbamCarbonDirectEntity.getSort(), f.getSort()) + ) + .findFirst() + .ifPresent(cbamCarbonDirectEntity -> { + cbamProcessAllocationEntity.setProdId(cbamCarbonDirectEntity.getId()); + }); + return cbamProcessAllocationEntity; + }).toList(); + cbamProcessAllocationService.saveBatch(cbamProcessAllocationList); + } + + @Override + public Map calculate(Long fuelId, String consumeAmount, String biomassContent) { + Map resMap = new HashMap<>(); + //获取燃料系数字典信息 + CbamFuelDictEntity cbamFuelDict = cbamFuelDictService.getById(fuelId); + if(Objects.isNull(cbamFuelDict)){ + throw new RuntimeException("燃料系数字典信息不存在"); + } + //公用计算：消耗量*低位发热量 + String lowHeatAmount = cbamFuelDict.getLowHeatAmount(); + //1.首先先计算（第四个）----能量含量(生物质燃料)，工J =消耗量*低位发热量*生物量含量/100/1000 + BigDecimal energyBiologyNum = + BurningDischargeUtil.energyBiologyNumCalculate(consumeAmount, lowHeatAmount, biomassContent); + resMap.put("energyBiologyNum",energyBiologyNum); + //2.其次计算第三个：能量含量(化石燃料),TJ =消耗量*低位发热量/1000-能量含量(生物质燃料) + BigDecimal energyFossilNum = BurningDischargeUtil.energyHsNumCalculate(consumeAmount, lowHeatAmount, energyBiologyNum.toPlainString()); + resMap.put("energyFossilNum",energyFossilNum); + //3.生物质燃料排放量 =消耗量*低位发热量*生物量含量*排放因子/100/1000 + BigDecimal biomassFuelNum = BurningDischargeUtil.biomassFuelNumCalculate(consumeAmount, lowHeatAmount, biomassContent, cbamFuelDict.getEmissionFactor()); + resMap.put("biomassFuelNum",biomassFuelNum); + //4.直接碳排放量 =消耗量*低位发热量*氧化因子*排放因子/100/1000-生物质燃料排放量 + BigDecimal directCarbonNum = BurningDischargeUtil.directCarbonCalculate(consumeAmount, lowHeatAmount, biomassContent, cbamFuelDict.getEmissionFactor(), cbamFuelDict.getCarbonOxdRate()); + resMap.put("directCarbonNum",directCarbonNum); + return resMap; } } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java new file mode 100644 index 0000000..8fe5ef4 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cbam.directCarbon.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; +import com.thing.cbam.directCarbon.mapper.CbamProcessAllocationMapper; +import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 生产过程分配量 + * + * @author xc + * @since 3.0 2024-12-02 + */ +@Service +public class CbamProcessAllocationServiceImpl extends BaseServiceImpl implements CbamProcessAllocationService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java new file mode 100644 index 0000000..85bdd4d --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java @@ -0,0 +1,85 @@ +package com.thing.cbam.directCarbon.util; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +/** + * 燃烧排放的计算工具类 + */ +public class BurningDischargeUtil { + + /** + * 公用计算：消耗量*低位发热量 + * @param consumeAmount 消耗量 + * @param lowHeatAmount 低位发热量 + * @return 公用计算结果 + */ + public static BigDecimal commonCalculate(String consumeAmount,String lowHeatAmount) { + return new BigDecimal(consumeAmount).multiply(new BigDecimal(lowHeatAmount)); + } + + /** + * 能量含量(生物质燃料)，工J =消耗量*低位发热量*生物量含量/100/1000 + * @param consumeAmount 消耗量 + * @param lowHeatAmount 低位发热量 + * @param biomassContent 生物量含量 + * @return 公用计算结果 + */ + public static BigDecimal energyBiologyNumCalculate(String consumeAmount, String lowHeatAmount, String biomassContent) { + return commonCalculate(consumeAmount,lowHeatAmount) + .multiply(new BigDecimal(biomassContent)) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) + .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP); + } + + /** + * 能量含量(化石燃料),TJ =消耗量*低位发热量/1000-能量含量(生物质燃料) + * @param consumeAmount 消耗量 + * @param lowHeatAmount 低位发热量 + * @param energyBiologyNum 能量含量(生物质燃料) + * @return 公用计算结果 + */ + public static BigDecimal energyHsNumCalculate(String consumeAmount,String lowHeatAmount,String energyBiologyNum) { + return commonCalculate(consumeAmount,lowHeatAmount) + .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP) + .subtract(energyBiologyNumCalculate(consumeAmount,lowHeatAmount,energyBiologyNum)); + } + + + /** + * 生物质燃料排放量 =消耗量*低位发热量*生物量含量*排放因子/100/1000 + * @param consumeAmount 消耗量 + * @param lowHeatAmount 低位发热量 + * @param biomassContent 生物量含量 + * @param emissionFactor 排放因子 + * @return 公用计算结果 + */ + public static BigDecimal biomassFuelNumCalculate(String consumeAmount,String lowHeatAmount,String biomassContent,String emissionFactor) { + return commonCalculate(consumeAmount,lowHeatAmount) + .multiply(new BigDecimal(biomassContent)) + .multiply(new BigDecimal(emissionFactor)) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) + .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP); + } + + + /** + * 直接碳排放量 =消耗量*低位发热量*氧化因子*排放因子/100/1000-生物质燃料排放量 + * @param consumeAmount 消耗量 + * @param lowHeatAmount 低位发热量 + * @param biomassContent 生物量含量 + * @param emissionFactor 排放因子 + * @return 公用计算结果 + */ + public static BigDecimal directCarbonCalculate(String consumeAmount,String lowHeatAmount,String biomassContent,String emissionFactor,String carbonOxdRate) { + return commonCalculate(consumeAmount,lowHeatAmount) + .multiply(new BigDecimal(carbonOxdRate)) + .multiply(new BigDecimal(emissionFactor)) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) + .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP) + .subtract(biomassFuelNumCalculate(consumeAmount,lowHeatAmount,biomassContent,emissionFactor)); + } + + + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java new file mode 100644 index 0000000..a52e5e6 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java @@ -0,0 +1,55 @@ +package com.thing.cbam.directCarbon.util; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +/** + * 物料平衡计算工具类 + */ +public class MaterialBalanceUtil { + + + /** + * 公用计算：消耗量*含碳量*44/12 + * @param consumeAmount 消耗量 + * @param carbonContent 碳含量 + * @return 公用计算结果 + */ + public static BigDecimal commonCalculate(String consumeAmount,String carbonContent) { + return new BigDecimal(consumeAmount) + .multiply(new BigDecimal(carbonContent)) + .multiply(new BigDecimal(44)) + .divide(new BigDecimal(12), 2, RoundingMode.HALF_UP) + ; + } + + + /** + * 生物质燃料排放量 =消耗量*含碳量*44/12*生物量含量/100 + * @param consumeAmount 消耗量 + * @param carbonContent 碳含量 + * @param biomassContent 生物量含量 + * @return 公用计算结果 + */ + public static BigDecimal biomassFuelNumCalculate(String consumeAmount,String carbonContent, String biomassContent) { + return commonCalculate(consumeAmount, carbonContent) + .multiply(new BigDecimal(biomassContent)) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP); + } + + + /** + * 直接碳排放量 ==消耗量*含碳量*44/12-生物质燃料排放量 + * @param consumeAmount 消耗量 + * @param carbonContent 碳含量 + * @param biomassContent 生物量含量 + * @return 公用计算结果 + */ + public static BigDecimal directCarbonCalculate(String consumeAmount,String carbonContent, String biomassContent) { + return commonCalculate(consumeAmount, carbonContent) + .subtract(biomassFuelNumCalculate(consumeAmount,carbonContent,biomassContent)); + } + + + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java new file mode 100644 index 0000000..402cb71 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java @@ -0,0 +1,61 @@ +package com.thing.cbam.directCarbon.util; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +/** + * 过程排放的计算工具类 + */ +public class ProcessDischargeUtil { + + + /** + * 公用计算：消耗量*排放因子*转化因子/100 + * @param consumeAmount 消耗量 + * @param emissionFactor 排放因子 + * @param conversionFactor 转换因子 + * @return 公用计算结果 + */ + public static BigDecimal commonCalculate(String consumeAmount,String emissionFactor,String conversionFactor) { + return new BigDecimal(consumeAmount) + .multiply(new BigDecimal(emissionFactor)) + .multiply(new BigDecimal(conversionFactor)) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) + ; + } + + + /** + * 生物质燃料排放量 ==消耗量*排放因子*转化因子/100*生物量含量/100 + * @param consumeAmount 消耗量 + * @param emissionFactor 排放因子 + * @param conversionFactor 转换因子 + * @param biomassContent 生物量含量 + * @return 公用计算结果 + */ + public static BigDecimal biomassFuelNumCalculate(String consumeAmount,String emissionFactor,String conversionFactor, String biomassContent) { + return commonCalculate( consumeAmount, emissionFactor,conversionFactor) + .multiply(new BigDecimal(biomassContent)) + .multiply(new BigDecimal(emissionFactor)) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) + .multiply(new BigDecimal(biomassContent)) + .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP); + } + + + /** + * 直接碳排放量 ==消耗量"排放因子*转化因子/100-生物质燃料排成量 + * @param consumeAmount 消耗量 + * @param emissionFactor 排放因子 + * @param conversionFactor 转换因子 + * @param biomassContent 生物量含量 + * @return 公用计算结果 + */ + public static BigDecimal directCarbonCalculate(String consumeAmount,String emissionFactor,String conversionFactor, String biomassContent) { + return commonCalculate( consumeAmount, emissionFactor,conversionFactor) + .subtract(biomassFuelNumCalculate(consumeAmount,emissionFactor,conversionFactor,biomassContent)); + } + + + +} From 285e45295d9f1052100ed43472acb53601c85f55 Mon Sep 17 00:00:00 2001 From: lishuai Date: Tue, 3 Dec 2024 10:14:38 +0800 Subject: [PATCH 08/19] =?UTF-8?q?Aexcel=E7=9A=84=E6=9F=A5=E8=AF=A2=202024?= =?UTF-8?q?=E5=B9=B412=E6=9C=883=E6=97=A510:14:34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baesInfoExcel/dto/CbamIndustryDTO.java | 2 ++ .../dto/CbamProcessMaterialDTO.java | 4 ++-- .../entity/CbamIndustryEntity.java | 7 +++++- .../entity/CbamProcessMaterialEntity.java | 9 +++---- .../thing/cbam/dict/dto/CbamHsDictDTO.java | 5 ++++ .../cbam/dict/dto/CbamProdProcessDictDTO.java | 3 +++ .../service/impl/CbamHsDictServiceImpl.java | 24 ++++++++++++++++++- 7 files changed, 46 insertions(+), 8 deletions(-) diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java index 57afe58..36edbbb 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java @@ -29,6 +29,8 @@ public class CbamIndustryDTO implements Serializable { private String cycleDesc; @Schema(description = "生产工厂名称") private String factoryName; + @Schema(description = "生产工厂名称（英文名）") + private String factoryEname; @Schema(description = "街道编号") private String streetNum; @Schema(description = "在欧盟进行的主要经济活动") diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java index 08faa5f..8aad691 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java @@ -33,6 +33,8 @@ public class CbamProcessMaterialDTO implements Serializable { private String hsCode; @Schema(description = "产品生产过程字典id") private Long productionProcessId; + @Schema(description = "产品生产过程") + private String productionProcess; @Schema(description = "综合商品类别") private String productCategories; @Schema(description = "关联cbam_industry_information的主键id") @@ -50,8 +52,6 @@ public class CbamProcessMaterialDTO implements Serializable { private Long updater; @Schema(description = "更新时间") private Long updateDate; - @Schema(description = "产品生产过程") - private Long productionProcess; @Schema(description = "类型1.生产过程 2.原材料") private Integer type; @Schema(description = "生产工艺相关信息--由关联表得到") diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java index f24948d..56ff6dc 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java @@ -19,7 +19,7 @@ public class CbamIndustryEntity extends BaseInfoEntity { /** * 所属行业 */ - private Long industryDict; + private String industryDict; /** * 开始日期 */ @@ -36,6 +36,11 @@ public class CbamIndustryEntity extends BaseInfoEntity { * 生产工厂名称 */ private String factoryName; + + /** + * 生产工厂名称（英文名） + */ + private String factoryEname; /** * 街道编号 */ diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java index e3f2605..9291948 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java @@ -44,6 +44,10 @@ public class CbamProcessMaterialEntity implements Serializable { * 产品生产过程字典id */ private Long productionProcessId; + /** + * 产品生产过程 + */ + private String productionProcess; /** * 综合商品类别 */ @@ -77,10 +81,7 @@ public class CbamProcessMaterialEntity implements Serializable { * 更新时间 */ private Long updateDate; - /** - * 产品生产过程 - */ - private Long productionProcess; + /** * 类型1.生产过程 2.原材料 */ diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java index e0b05dc..f51bb59 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * hs字典表 @@ -33,5 +34,9 @@ public class CbamHsDictDTO implements Serializable { private String ename; @Schema(description = "关联cbam_prod_process_dict的id") private Long prodProcessId; +// @Schema(description = "产品字典列表") +// private List prodProcessList; + @Schema(description = "生产过程/产品字典") + private CbamProdProcessDictDTO prodProcess; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java index f570fc4..baf22a0 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * 原料（生产过程）---工艺路线映射表 @@ -33,5 +34,7 @@ public class CbamProdProcessDictDTO implements Serializable { private Integer tagging; @Schema(description = "关联：当type=yl 关联 cbam_industry_dict 主键id，否则关联本表的id") private Long pidId; + @Schema(description = "生产工艺字典列表") + private List prodRouteList; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java index a420963..3257a24 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java @@ -2,11 +2,14 @@ package com.thing.cbam.dict.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.cbam.dict.dto.CbamHsDictDTO; +import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; import com.thing.cbam.dict.entity.CbamHsDictEntity; import com.thing.cbam.dict.mapper.CbamHsDictMapper; import com.thing.cbam.dict.service.CbamHsDictService; +import com.thing.cbam.dict.service.CbamProdProcessDictService; import com.thing.common.orm.service.impl.BaseServiceImpl; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; @@ -19,8 +22,12 @@ import java.util.Map; * @since 3.0 2024-11-29 */ @Service +@RequiredArgsConstructor public class CbamHsDictServiceImpl extends BaseServiceImpl implements CbamHsDictService { + + private final CbamProdProcessDictService cbamProdProcessDictService; + @Override public QueryWrapper getWrapper(Map params){ QueryWrapper wrapper = new QueryWrapper(); @@ -30,6 +37,21 @@ public class CbamHsDictServiceImpl extends BaseServiceImpl getByHsCode(String code) { - return mapper.selectListByQueryAs(new QueryWrapper().eq(CbamHsDictEntity::getCode, code), CbamHsDictDTO.class); + //1.获取hscode代码 + List cbamHsDictDTOS = mapper.selectListByQueryAs( + new QueryWrapper() + .eq(CbamHsDictEntity::getCode, code) + .orderBy(CbamHsDictEntity::getSort, true) + , CbamHsDictDTO.class); + + for (CbamHsDictDTO cbamHsDictDTO : cbamHsDictDTOS) { + //查询原料或者生产过程 + CbamProdProcessDictDTO prodDict = cbamProdProcessDictService.getByIdAs(cbamHsDictDTO.getProdProcessId(),CbamProdProcessDictDTO.class); + //查询生产工艺 + List ruteList = cbamProdProcessDictService.getByProdId(prodDict.getId()); + prodDict.setProdRouteList(ruteList); + cbamHsDictDTO.setProdProcess(prodDict); + } + return cbamHsDictDTOS; } } \ No newline at end of file From 6cfdec5668512ba3287e6c49c31626127c4db946 Mon Sep 17 00:00:00 2001 From: lishuai Date: Tue, 3 Dec 2024 14:44:48 +0800 Subject: [PATCH 09/19] =?UTF-8?q?Bexcel=E7=9A=84=E9=93=9D=E5=88=B6?= =?UTF-8?q?=E5=93=81=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=202024=E5=B9=B412?= =?UTF-8?q?=E6=9C=883=E6=97=A514:44:44?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CbamIndustryController.java | 5 +- .../service/CbamIndustryService.java | 2 +- .../service/impl/CbamIndustryServiceImpl.java | 7 +- .../CbamCarbonDirectController.java | 19 ++- .../CbamCarbonMaterialController.java | 89 -------------- .../CbamCarbonMonitorController.java | 87 -------------- .../CbamCarbonProgressController.java | 90 -------------- .../CbamPerfluorinatedCarbonController.java | 97 +++++++++++++++ .../directCarbon/dto/CbamCarbonDirectDTO.java | 3 - .../dto/CbamCarbonMaterialDTO.java | 30 ----- .../dto/CbamCarbonMonitorDTO.java | 42 ------- .../dto/CbamPerfluorinatedCarbonDTO.java | 64 ++++++++++ .../entity/CbamCarbonDirectEntity.java | 4 +- .../entity/CbamCarbonMaterialEntity.java | 42 ------- .../entity/CbamCarbonMonitorEntity.java | 65 ---------- .../entity/CbamCarbonProgressEntity.java | 4 +- .../CbamPerfluorinatedCarbonEntity.java | 111 ++++++++++++++++++ .../mapper/CbamCarbonMaterialMapper.java | 9 -- .../mapper/CbamCarbonMonitorMapper.java | 9 -- .../mapper/CbamCarbonProgressMapper.java | 9 -- .../CbamPerfluorinatedCarbonMapper.java | 16 +++ .../service/CbamCarbonDirectService.java | 2 + .../service/CbamCarbonMaterialService.java | 7 -- .../service/CbamCarbonMonitorService.java | 7 -- .../service/CbamCarbonProgressService.java | 7 -- .../CbamPerfluorinatedCarbonService.java | 14 +++ .../impl/CbamCarbonDirectServiceImpl.java | 13 +- .../impl/CbamCarbonMaterialServiceImpl.java | 19 --- .../impl/CbamCarbonMonitorServiceImpl.java | 19 --- .../impl/CbamCarbonProgressServiceImpl.java | 29 ----- .../CbamPerfluorinatedCarbonServiceImpl.java | 28 +++++ 31 files changed, 372 insertions(+), 577 deletions(-) delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMonitorController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMaterialDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMonitorDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMaterialEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMonitorEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMaterialMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMonitorMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMaterialService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMonitorService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMaterialServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMonitorServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonProgressServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java index 475b7b1..b5a06bd 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java @@ -49,9 +49,8 @@ public class CbamIndustryController { @PostMapping @Operation(summary = "保存") @LogOperation("保存") - public Result save(@RequestBody CbamIndustryDTO dto) { - service.saveIndustryInfo(dto); - return new Result<>(); + public Result save(@RequestBody CbamIndustryDTO dto) { + return new Result().ok(service.saveIndustryInfo(dto)); } @PutMapping diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java index 4d8eeb7..24984bb 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java @@ -13,7 +13,7 @@ public interface CbamIndustryService extends IBaseService { CbamIndustryDTO findById(Long id); - void saveIndustryInfo(CbamIndustryDTO dto); + CbamIndustryDTO saveIndustryInfo(CbamIndustryDTO dto); void updateIndustryInfo(CbamIndustryDTO dto); diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java index ee3b1bb..06fafc1 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java @@ -95,9 +95,10 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl cbamProductList = dto.getCbamProductList(); if (CollectionUtil.isNotEmpty(cbamProductList)) { @@ -108,6 +109,8 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl save(@RequestBody CbamCarbonDirectDTO dto){ //效验数据 @@ -81,14 +80,24 @@ public class CbamCarbonDirectController { } @PostMapping("batchSave") - @Operation(summary="保存") - @LogOperation("保存") - public Result saveList(@RequestBody List carbonDirectDTOList){ + @Operation(summary="保存所有的tab信息") + @LogOperation("保存所有的tab信息") + public Result batchSaveList(@RequestBody List carbonDirectDTOList){ + //效验数据 + cbamCarbonDirectService.saveList(carbonDirectDTOList); + return new Result<>(); + } + + @PostMapping("batchUpdate") + @Operation(summary="更新所有的tab信息") + @LogOperation("更新所有的tab信息") + public Result batchUpdateList(@RequestBody List carbonDirectDTOList){ //效验数据 cbamCarbonDirectService.saveList(carbonDirectDTOList); return new Result<>(); } + @PutMapping @Operation(summary="修改") @LogOperation("修改") diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java deleted file mode 100644 index e55dc37..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMaterialController.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.thing.cbam.directCarbon.controller; - -import com.thing.cbam.directCarbon.dto.CbamCarbonMaterialDTO; -import com.thing.cbam.directCarbon.service.CbamCarbonMaterialService; -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 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.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("v2/cbam/carbon/material") -@Tag(name = "产品原材料") -@RequiredArgsConstructor -public class CbamCarbonMaterialController { - private final CbamCarbonMaterialService cbamCarbonMaterialService; - @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 = cbamCarbonMaterialService.getPageData(params, CbamCarbonMaterialDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonMaterialDTO data = cbamCarbonMaterialService.getByIdAs(id, CbamCarbonMaterialDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonMaterialDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonMaterialService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonMaterialDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonMaterialService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonMaterialService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); - *} - */ -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMonitorController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMonitorController.java deleted file mode 100644 index 515bd57..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonMonitorController.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.thing.cbam.directCarbon.controller; - -import com.thing.cbam.directCarbon.dto.CbamCarbonMonitorDTO; -import com.thing.cbam.directCarbon.service.CbamCarbonMonitorService; -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 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; - -@RestController -@RequestMapping("v2/cbam/carbon/monitor") -@Tag(name="排放源监测") -@RequiredArgsConstructor -public class CbamCarbonMonitorController { - private final CbamCarbonMonitorService cbamCarbonMonitorService; - @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 = cbamCarbonMonitorService.getPageData(params, CbamCarbonMonitorDTO.class); - return new Result>().ok(page); - } - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonMonitorDTO data = cbamCarbonMonitorService.getByIdAs(id, CbamCarbonMonitorDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonMonitorDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonMonitorService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonMonitorDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonMonitorService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonMonitorService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); - *} - */ -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java deleted file mode 100644 index 05af6c0..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonProgressController.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.thing.cbam.directCarbon.controller; - -import com.thing.cbam.directCarbon.dto.CbamCarbonProgressDTO; -import com.thing.cbam.directCarbon.service.CbamCarbonProgressService; -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 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; - -@RestController -@RequestMapping("v2/cbam/carbon/progress") -@Tag(name="原料过程排放") -@RequiredArgsConstructor -public class CbamCarbonProgressController { - - private final CbamCarbonProgressService cbamCarbonProgressService; - - @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 = cbamCarbonProgressService.getPageData(params, CbamCarbonProgressDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonProgressDTO data = cbamCarbonProgressService.getByIdAs(id, CbamCarbonProgressDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonProgressDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonProgressService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonProgressDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonProgressService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonProgressService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); - *} - */ -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java new file mode 100644 index 0000000..9766518 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java @@ -0,0 +1,97 @@ +package com.thing.cbam.directCarbon.controller; + +import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; +import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; +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 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; + +/** +* 全氟化碳PFC排放 +* +* @author xc +* @since 3.0 2024-12-03 +*/ +@RestController +@RequestMapping("v2/cbam/perfluorinated") +@Tag(name="全氟化碳PFC排放") +@RequiredArgsConstructor +public class CbamPerfluorinatedCarbonController { + + private final CbamPerfluorinatedCarbonService cbamPerfluorinatedCarbonService; + + @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 = cbamPerfluorinatedCarbonService.getPageData(params, CbamPerfluorinatedCarbonDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamPerfluorinatedCarbonDTO data = cbamPerfluorinatedCarbonService.getByIdAs(id, CbamPerfluorinatedCarbonDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamPerfluorinatedCarbonDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamPerfluorinatedCarbonService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamPerfluorinatedCarbonDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamPerfluorinatedCarbonService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamPerfluorinatedCarbonService.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 = cbamPerfluorinatedCarbonService.listAs(params, CbamPerfluorinatedCarbonDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "全氟化碳PFC排放", list, CbamPerfluorinatedCarbonExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java index 9afbffc..ebac710 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java @@ -1,13 +1,10 @@ package com.thing.cbam.directCarbon.dto; -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; import io.swagger.v3.oas.annotations.media.Schema; - import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.List; /** * 直接排放量B-Excel diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMaterialDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMaterialDTO.java deleted file mode 100644 index 88ccd1e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMaterialDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.thing.cbam.directCarbon.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-11-27 -*/ -@Data -@Schema(description = "原材料") -public class CbamCarbonMaterialDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "原材料名称") - private String rawMaterialName; - @Schema(description = "原材料的综合商品类别") - private String materialCategories; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMonitorDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMonitorDTO.java deleted file mode 100644 index 76e2e54..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonMonitorDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.thing.cbam.directCarbon.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-11-27 -*/ -@Data -@Schema(description = "排放源监测") -public class CbamCarbonMonitorDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "名称") - private String name; - @Schema(description = "温室气体类型") - private String typeGas; - @Schema(description = "生物质组分") - private String biomassComp; - @Schema(description = "每小时平均温室气体浓度") - private String gasConcen; - @Schema(description = "运行小时数") - private String operHours; - @Schema(description = "烟气（平均值）") - private String smokeAver; - @Schema(description = "能量含量（化石燃料）") - private String fossilContent; - @Schema(description = "能量含量（生物质燃料）") - private String biomassContent; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java new file mode 100644 index 0000000..33bd600 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java @@ -0,0 +1,64 @@ +package com.thing.cbam.directCarbon.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** +* 全氟化碳PFC排放 +* +* @author xc +* @since 3.0 2024-12-03 +*/ +@Data +@Schema(description = "全氟化碳PFC排放") +public class CbamPerfluorinatedCarbonDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "主键") + private Long id; + @Schema(description = "阳极类型字典id") + private Long anodeTypeId; + @Schema(description = "阳极类型") + private String anodeType; + @Schema(description = "消耗量/产量：输入") + private String consumeAmount; + @Schema(description = "化石燃料碳排放量") + private String energyFossilNum; + @Schema(description = "消耗量/产量 单位") + private String consumeAmountUnit; + @Schema(description = "化石燃料碳排放量单位") + private String energyFossilUnit; + @Schema(description = "阳极类型(其他)") + private String anodeOtherType; + @Schema(description = "A: 频率") + private String rate; + @Schema(description = "A: 持续时间") + private String duration; + @Schema(description = "A:SEF(四氟化碳，CF)") + private String sfht; + @Schema(description = "F(六氟乙烷，CzFe)") + private String sfyw; + @Schema(description = "全球变暖潜势(A:SEF(四氟化碳，CF))") + private String globalWarmingSfht; + @Schema(description = "全球变暖潜势(F(六氟乙烷，CzFe))") + private String globalWarmingSfyw; + private String collectRate; + @Schema(description = "关联cbam_industry_info的主键id") + private Long industryId; + @Schema(description = "类型：6：倾斜法 7电压法") + private String type; + @Schema(description = "排序") + private Long sort; + @Schema(description = "B: AEO") + private String aeo; + @Schema(description = "B: OVC") + private String ovc; + @Schema(description = "B:CE") + private String ce; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java index 3e8c33c..b5cac9b 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java @@ -1,7 +1,9 @@ package com.thing.cbam.directCarbon.entity; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; +import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -23,7 +25,7 @@ public class CbamCarbonDirectEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Id + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; /** * 燃料名称/过程排放名称/物料平衡名称 diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMaterialEntity.java deleted file mode 100644 index d419715..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMaterialEntity.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.thing.cbam.directCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_material") -public class CbamCarbonMaterialEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - @Id - private Long id; - /** - * 名称 - */ - private String name; - /** - * 消耗量产量 - */ - private String consumOutput; - /** - * 碳含量 - */ - private String carbonContent; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 排放源名称 - */ - private String emissionName; - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMonitorEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMonitorEntity.java deleted file mode 100644 index c16a873..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonMonitorEntity.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.thing.cbam.directCarbon.entity; - -import com.mybatisflex.annotation.Id; -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-11-27 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_monitor") -public class CbamCarbonMonitorEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id - private Long id; - /** - * 名称 - */ - private String name; - /** - * 温室气体类型 - */ - private String typeGas; - /** - * 生物质组分 - */ - private String biomassComp; - /** - * 每小时平均温室气体浓度 - */ - private String gasConcen; - /** - * 运行小时数 - */ - private String operHours; - /** - * 烟气（平均值） - */ - private String smokeAver; - /** - * 能量含量（化石燃料） - */ - private String fossilContent; - /** - * 能量含量（生物质燃料） - */ - private String biomassContent; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java index 0c2f0a8..519d03d 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java @@ -1,8 +1,10 @@ package com.thing.cbam.directCarbon.entity; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; +import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -24,7 +26,7 @@ public class CbamCarbonProgressEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Id + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; /** * 名称 diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java new file mode 100644 index 0000000..7c1641d --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java @@ -0,0 +1,111 @@ +package com.thing.cbam.directCarbon.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; + +import com.mybatisflex.core.keygen.KeyGenerators; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 全氟化碳PFC排放 + * + * @author xc + * @since 3.0 2024-12-03 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_perfluorinated_carbon") +public class CbamPerfluorinatedCarbonEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + /** + * 阳极类型字典id + */ + private Long anodeTypeId; + /** + * 阳极类型 + */ + private String anodeType; + /** + * 消耗量/产量：输入 + */ + private String consumeAmount; + /** + * 化石燃料碳排放量 + */ + private String energyFossilNum; + /** + * 消耗量/产量 单位 + */ + private String consumeAmountUnit; + /** + * 化石燃料碳排放量单位 + */ + private String energyFossilUnit; + /** + * 阳极类型(其他) + */ + private String anodeOtherType; + /** + * A: 频率 + */ + private String rate; + /** + * A: 持续时间 + */ + private String duration; + /** + * A:SEF(四氟化碳，CF) + */ + private String sfht; + /** + * F(六氟乙烷，CzFe) + */ + private String sfyw; + /** + * 全球变暖潜势(A:SEF(四氟化碳，CF)) + */ + private String globalWarmingSfht; + /** + * 全球变暖潜势(F(六氟乙烷，CzFe)) + */ + private String globalWarmingSfyw; + private String collectRate; + /** + * 关联cbam_industry_info的主键id + */ + private Long industryId; + /** + * 类型：6：倾斜法 7电压法 + */ + private String type; + /** + * 排序 + */ + private Long sort; + /** + * B: AEO + */ + private String aeo; + /** + * B: OVC + */ + private String ovc; + /** + * B:CE + */ + private String ce; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMaterialMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMaterialMapper.java deleted file mode 100644 index 993c927..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMaterialMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.directCarbon.mapper; - -import com.thing.cbam.directCarbon.entity.CbamCarbonMaterialEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamCarbonMaterialMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMonitorMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMonitorMapper.java deleted file mode 100644 index 4fe09b1..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonMonitorMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.directCarbon.mapper; - -import com.thing.cbam.directCarbon.entity.CbamCarbonMonitorEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamCarbonMonitorMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java deleted file mode 100644 index 569b635..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonProgressMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.directCarbon.mapper; - -import com.thing.cbam.directCarbon.entity.CbamCarbonProgressEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamCarbonProgressMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java new file mode 100644 index 0000000..f04de87 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java @@ -0,0 +1,16 @@ +package com.thing.cbam.directCarbon.mapper; + +import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* 全氟化碳PFC排放 +* +* @author xc +* @since 3.0 2024-12-03 +*/ +@Mapper +public interface CbamPerfluorinatedCarbonMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java index 5469a7c..a958a15 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java @@ -21,6 +21,8 @@ public interface CbamCarbonDirectService extends IBaseService carbonDirectDTOList); + void batchUpdateList(List carbonDirectDTOList); + Map calculate(Long fuelId, String consumeAmount, String biomassContent); } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMaterialService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMaterialService.java deleted file mode 100644 index ecef58d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMaterialService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.thing.cbam.directCarbon.service; - -import com.thing.cbam.directCarbon.entity.CbamCarbonMaterialEntity; -import com.thing.common.orm.service.IBaseService; - -public interface CbamCarbonMaterialService extends IBaseService { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMonitorService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMonitorService.java deleted file mode 100644 index 6f92b37..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonMonitorService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.thing.cbam.directCarbon.service; - -import com.thing.cbam.directCarbon.entity.CbamCarbonMonitorEntity; -import com.thing.common.orm.service.IBaseService; - -public interface CbamCarbonMonitorService extends IBaseService { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java deleted file mode 100644 index ace25bd..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonProgressService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.thing.cbam.directCarbon.service; - -import com.thing.cbam.directCarbon.entity.CbamCarbonProgressEntity; -import com.thing.common.orm.service.IBaseService; - -public interface CbamCarbonProgressService extends IBaseService { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java new file mode 100644 index 0000000..14203c9 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java @@ -0,0 +1,14 @@ +package com.thing.cbam.directCarbon.service; + +import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; +import com.thing.common.orm.service.IBaseService; + +/** + * 全氟化碳PFC排放 + * + * @author xc + * @since 3.0 2024-12-03 + */ +public interface CbamPerfluorinatedCarbonService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java index cddd291..6a29946 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java @@ -36,7 +36,6 @@ public class CbamCarbonDirectServiceImpl extends BaseServiceImpl carbonDirectDTOList) { + //1.删除直接碳排相关的数据 + mapper.deleteByQuery(QueryWrapper.create().eq(CbamCarbonDirectEntity::getIndustryId,carbonDirectDTOList.get(0).getIndustryId())); + //2.删除各生产过程中原材料/燃料的分配 + cbamProcessAllocationService.getMapper() + .deleteByQuery(QueryWrapper.create().eq(CbamProcessAllocationEntity::getIndustryId,carbonDirectDTOList.get(0).getIndustryId())); + //重新添加相关信息 + saveList(carbonDirectDTOList); + } + @Override public Map calculate(Long fuelId, String consumeAmount, String biomassContent) { Map resMap = new HashMap<>(); diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMaterialServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMaterialServiceImpl.java deleted file mode 100644 index e5bdf4e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMaterialServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.thing.cbam.directCarbon.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.directCarbon.entity.CbamCarbonMaterialEntity; -import com.thing.cbam.directCarbon.mapper.CbamCarbonMaterialMapper; -import com.thing.cbam.directCarbon.service.CbamCarbonMaterialService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public class CbamCarbonMaterialServiceImpl extends BaseServiceImpl implements CbamCarbonMaterialService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMonitorServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMonitorServiceImpl.java deleted file mode 100644 index 7639d09..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonMonitorServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.thing.cbam.directCarbon.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.directCarbon.entity.CbamCarbonMonitorEntity; -import com.thing.cbam.directCarbon.mapper.CbamCarbonMonitorMapper; -import com.thing.cbam.directCarbon.service.CbamCarbonMonitorService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public class CbamCarbonMonitorServiceImpl extends BaseServiceImpl implements CbamCarbonMonitorService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonProgressServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonProgressServiceImpl.java deleted file mode 100644 index 7080c88..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonProgressServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.thing.cbam.directCarbon.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.directCarbon.entity.CbamCarbonProgressEntity; -import com.thing.cbam.directCarbon.mapper.CbamCarbonProgressMapper; -import com.thing.cbam.directCarbon.service.CbamCarbonProgressService; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 原料过程排放 - * - * @author xc - * @since 3.0 2024-11-27 - */ -@Service -public class CbamCarbonProgressServiceImpl extends BaseServiceImpl implements CbamCarbonProgressService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java new file mode 100644 index 0000000..761eb84 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cbam.directCarbon.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; +import com.thing.cbam.directCarbon.mapper.CbamPerfluorinatedCarbonMapper; +import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 全氟化碳PFC排放 + * + * @author xc + * @since 3.0 2024-12-03 + */ +@Service +public class CbamPerfluorinatedCarbonServiceImpl extends BaseServiceImpl implements CbamPerfluorinatedCarbonService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file From ec999541beab577a4dd16b95e8d8fd66dbdc85bc Mon Sep 17 00:00:00 2001 From: jiangc <12345678> Date: Wed, 4 Dec 2024 14:12:58 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=AD=97=E5=85=B8=2020?= =?UTF-8?q?24=E5=B9=B412=E6=9C=884=E6=97=A514:12:55?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CbamCountryDictController.java | 84 +++++++++++++++++++ .../cbam/dict/dto/CbamCountryDictDTO.java | 33 ++++++++ .../dict/entity/CbamCountryDictEntity.java | 48 +++++++++++ .../dict/mapper/CbamCountryDictMapper.java | 9 ++ .../dict/service/CbamCountryDictService.java | 10 +++ .../impl/CbamCountryDictServiceImpl.java | 22 +++++ 6 files changed, 206 insertions(+) create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java new file mode 100644 index 0000000..ccc15cc --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java @@ -0,0 +1,84 @@ +package com.thing.cbam.dict.controller; + +import com.thing.cbam.dict.dto.CbamCountryDictDTO; +import com.thing.cbam.dict.service.CbamCountryDictService; +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.web.response.PageData; +import com.thing.common.core.web.response.Result; +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.List; +import java.util.Map; + +@RestController +@RequestMapping("v2/cbam/country/dict") +@Tag(name = "国家字典表") +@RequiredArgsConstructor +public class CbamCountryDictController { + private final CbamCountryDictService cbamCountryDictService; + @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 param) { + PageData pageList = cbamCountryDictService.getPageData(param,CbamCountryDictDTO.class); + return new Result>().ok(pageList); + } + + + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id) { + CbamCountryDictDTO dto = cbamCountryDictService.getByIdAs(id,CbamCountryDictDTO.class); + return new Result().ok(dto); + } + + @PostMapping + @Operation(summary = "保存") + @LogOperation("保存") + public Result save(@RequestBody CbamCountryDictDTO dto) { + cbamCountryDictService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary = "修改") + @LogOperation("修改") + public Result update(@RequestBody CbamCountryDictDTO dto) { + //效验数据 + //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamCountryDictService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary = "删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamCountryDictService.batchDelete(ids); + return new Result<>(); + } + @GetMapping("list") + @Operation(summary = "查询国家列表") + @Parameters({ + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> list(@Parameter(hidden = true) @RequestParam Map params){ + List list = cbamCountryDictService.listAs(params, CbamCountryDictDTO.class); + return new Result>().ok(list); + } + } diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java new file mode 100644 index 0000000..c777548 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java @@ -0,0 +1,33 @@ +package com.thing.cbam.dict.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-12-04 +*/ +@Data +@Schema(description = "国家字典表") +public class CbamCountryDictDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "主键") + private Long id; + @Schema(description = "国家名称") + private String name; + @Schema(description = "国家英文名称") + private String ename; + @Schema(description = "是否默认：0.默认 1.不默认") + private Integer isDefault; + @Schema(description = "排序") + private String sort; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java new file mode 100644 index 0000000..c77eda4 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java @@ -0,0 +1,48 @@ +package com.thing.cbam.dict.entity; + +import com.mybatisflex.annotation.Id; +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-12-04 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_country_dict") +public class CbamCountryDictEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @Id + private Long id; + /** + * 国家名称 + */ + private String name; + /** + * 国家英文名称 + */ + private String ename; + /** + * 是否默认：0.默认 1.不默认 + */ + private Integer isDefault; + /** + * 排序 + */ + private String sort; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java new file mode 100644 index 0000000..9a47c84 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java @@ -0,0 +1,9 @@ +package com.thing.cbam.dict.mapper; + +import com.thing.cbam.dict.entity.CbamCountryDictEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamCountryDictMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java new file mode 100644 index 0000000..eb12ee7 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java @@ -0,0 +1,10 @@ +package com.thing.cbam.dict.service; + + +import com.thing.cbam.dict.entity.CbamCountryDictEntity; +import com.thing.common.orm.service.IBaseService; + + +public interface CbamCountryDictService extends IBaseService { + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java new file mode 100644 index 0000000..7f51b03 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java @@ -0,0 +1,22 @@ +package com.thing.cbam.dict.service.impl; + + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.dict.dto.CbamCountryDictDTO; +import com.thing.cbam.dict.entity.CbamCountryDictEntity; +import com.thing.cbam.dict.mapper.CbamCountryDictMapper; +import com.thing.cbam.dict.service.CbamCountryDictService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service +public class CbamCountryDictServiceImpl extends BaseServiceImpl implements CbamCountryDictService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper queryWrapper = new QueryWrapper(); + return queryWrapper; + } +} From b766996ab341784a2839a39a184cf27a3b8aeeeb Mon Sep 17 00:00:00 2001 From: lishuai Date: Thu, 5 Dec 2024 14:35:10 +0800 Subject: [PATCH 11/19] =?UTF-8?q?Bexcel=E7=9A=84=E9=93=9D=E5=88=B6?= =?UTF-8?q?=E5=93=81=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=202024=E5=B9=B412?= =?UTF-8?q?=E6=9C=883=E6=97=A514:44:44?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CbamIndustryController.java | 12 +-- .../CbamProcessMaterialController.java | 36 +++---- .../CbamProdRouteRelationController.java | 12 ++- .../dto/CbamProcessMaterialDTO.java | 4 +- .../entity/CbamProcessMaterialEntity.java | 2 +- .../service/CbamIndustryService.java | 3 +- .../service/CbamProcessMaterialService.java | 7 ++ .../service/CbamProdRouteRelationService.java | 2 + .../service/impl/CbamIndustryServiceImpl.java | 41 +++++--- .../impl/CbamProcessMaterialServiceImpl.java | 38 ++++++- .../CbamProdRouteRelationServiceImpl.java | 15 +++ .../CbamCarbonDirectController.java | 24 +++-- .../CbamPerfluorinatedCarbonController.java | 12 +++ .../dto/CbamCarbonDirectContextDTO.java | 60 +++++++++++ .../directCarbon/dto/CbamCarbonDirectDTO.java | 11 ++- .../dto/CbamPerfluorinatedCarbonDTO.java | 7 +- .../dto/CbamProcessAllocationDTO.java | 6 +- .../CbamPerfluorinatedCarbonEntity.java | 2 +- .../entity/CbamProcessAllocationEntity.java | 19 +++- .../service/CbamCarbonDirectService.java | 8 +- .../CbamPerfluorinatedCarbonService.java | 5 + .../service/CbamProcessAllocationService.java | 5 + .../impl/CbamCarbonDirectServiceImpl.java | 77 ++++++++------- .../CbamPerfluorinatedCarbonServiceImpl.java | 63 ++++++++++++ .../CbamProcessAllocationServiceImpl.java | 19 +++- ...CbamCarbonIndirectEmissionsController.java | 1 + .../CbamPowerSummaryFuelController.java} | 44 ++++----- .../dto/CbamCarbonIndirectEmissionsDTO.java | 9 +- .../CbamCarbonPowerProgressAllocationDTO.java | 36 ++++--- .../dto/CbamPowerSummaryFuelDTO.java | 44 +++++++++ .../CbamCarbonIndirectEmissionsEntity.java | 21 +++- ...amCarbonPowerProgressAllocationEntity.java | 39 +++++--- .../entity/CbamPowerSummaryFuelEntity.java | 71 +++++++++++++ .../mapper/CbamPowerSummaryFuelMapper.java | 16 +++ .../CbamCarbonIndirectEmissionsService.java | 7 ++ ...mCarbonPowerProgressAllocationService.java | 5 + .../service/CbamPowerSummaryFuelService.java | 14 +++ ...bamCarbonIndirectEmissionsServiceImpl.java | 14 +++ ...bonPowerProgressAllocationServiceImpl.java | 16 +++ .../Impl/CbamPowerSummaryFuelServiceImpl.java | 28 ++++++ .../CbamProductAllocationController.java | 2 +- ...CbamProductExhaustEmissionsController.java | 99 ------------------- .../CbamProductHeatEmissionsController.java | 88 ----------------- .../dto/CbamProductAllocationDTO.java | 33 ++++++- .../dto/CbamProductElectricityDTO.java | 30 ------ .../dto/CbamProductExhaustEmissionsDTO.java | 30 ------ .../dto/CbamProductHeatEmissionsDTO.java | 22 ----- .../entity/CbamProductAllocationEntity.java | 95 +++++++++++++----- .../entity/CbamProductElectricityEntity.java | 41 -------- .../CbamProductExhaustEmissionsEntity.java | 41 -------- .../CbamProductHeatEmissionsEntity.java | 34 ------- .../mapper/CbamProductElectricityMapper.java | 17 ---- .../CbamProductExhaustEmissionsMapper.java | 9 -- .../CbamProductHeatEmissionsMapper.java | 9 -- .../service/CbamProductAllocationService.java | 6 ++ .../CbamProductElectricityService.java | 7 -- .../CbamProductExhaustEmissionsService.java | 7 -- .../CbamProductHeatEmissionsService.java | 7 -- .../CbamProductAllocationServiceImpl.java | 16 ++- .../CbamProductElectricityServiceImpl.java | 19 ---- ...bamProductExhaustEmissionsServiceImpl.java | 20 ---- .../CbamProductHeatEmissionsServiceImpl.java | 27 ----- 62 files changed, 816 insertions(+), 698 deletions(-) create mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java rename modules/cbam/src/main/java/com/thing/cbam/{production/controller/CbamProductElectricityController.java => indirectCarbon/controller/CbamPowerSummaryFuelController.java} (58%) create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductHeatEmissionsController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductElectricityDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductExhaustEmissionsDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductHeatEmissionsDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductElectricityEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductExhaustEmissionsEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductHeatEmissionsEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductElectricityMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductExhaustEmissionsMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductHeatEmissionsMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductElectricityService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductExhaustEmissionsService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductHeatEmissionsService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductElectricityServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductExhaustEmissionsServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductHeatEmissionsServiceImpl.java diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java index b5a06bd..b95121e 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java @@ -46,15 +46,15 @@ public class CbamIndustryController { return new Result().ok(dto); } - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamIndustryDTO dto) { - return new Result().ok(service.saveIndustryInfo(dto)); + @PostMapping("saveOrUpdate") + @Operation(summary = "新增或者修改") + @LogOperation("新增或者修改") + public Result saveOrUpdate(@RequestBody CbamIndustryDTO dto) { + return new Result().ok(service.saveOrUpdate(dto)); } @PutMapping - @Operation(summary = "修改") + @Operation(summary = "修改-废弃") @LogOperation("修改") public Result update(@RequestBody CbamIndustryDTO dto) { //效验数据 diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java index 978199a..45478a8 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java @@ -69,25 +69,25 @@ public class CbamProcessMaterialController { return new Result>().ok(processMaterialDTOList); } - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProcessMaterialDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProcessMaterialService.saveDto(dto); - return new Result<>(); - } +// @PostMapping +// @Operation(summary="保存或者更新") +// @LogOperation("保存或者更新") +// public Result saveOrUpdate(@RequestBody CbamProcessMaterialDTO dto){ +// //效验数据 +// ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); +// cbamProcessMaterialService.saveDto(dto); +// return new Result<>(); +// } - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProcessMaterialDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProcessMaterialService.updateDto(dto); - return new Result<>(); - } +// @PutMapping +// @Operation(summary="修改") +// @LogOperation("修改") +// public Result update(@RequestBody CbamProcessMaterialDTO dto){ +// //效验数据 +// ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); +// cbamProcessMaterialService.updateDto(dto); +// return new Result<>(); +// } @DeleteMapping @Operation(summary="删除") diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java index d6ab122..3d5b933 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java @@ -18,6 +18,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -54,7 +55,7 @@ public class CbamProdRouteRelationController { return new Result().ok(data); } - @PostMapping + /* @PostMapping @Operation(summary="保存") @LogOperation("保存") public Result save(@RequestBody CbamProdRouteRelationDTO dto){ @@ -62,6 +63,15 @@ public class CbamProdRouteRelationController { ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); cbamProdRouteRelationService.saveDto(dto); return new Result<>(); + }*/ + + @PostMapping + @Operation(summary="批量保存或者更新") + @LogOperation("保存") + public Result batchSaveOrUpdate(@RequestBody List list){ + //效验数据 + cbamProdRouteRelationService.batchSaveOrUpdate(list); + return new Result<>(); } @PutMapping diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java index 8aad691..c7b5c41 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java @@ -54,7 +54,9 @@ public class CbamProcessMaterialDTO implements Serializable { private Long updateDate; @Schema(description = "类型1.生产过程 2.原材料") private Integer type; + @Schema(description = "生产过程分配量") + private String processAllocation; @Schema(description = "生产工艺相关信息--由关联表得到") - List routeRelationList; + private List routeRelationList; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java index 9291948..c43fca4 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java @@ -89,5 +89,5 @@ public class CbamProcessMaterialEntity implements Serializable { /** * 生产过程分配量 */ -// private String processAllocation; + private String processAllocation; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java index 24984bb..370cfa0 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java @@ -10,11 +10,10 @@ import java.util.LinkedHashMap; public interface CbamIndustryService extends IBaseService { + CbamIndustryDTO saveOrUpdate(CbamIndustryDTO dto); CbamIndustryDTO findById(Long id); - CbamIndustryDTO saveIndustryInfo(CbamIndustryDTO dto); - void updateIndustryInfo(CbamIndustryDTO dto); void batchDeleteByIds( Long[] ids); diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java index 472aeba..d4c3731 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java @@ -14,6 +14,12 @@ import java.util.List; */ public interface CbamProcessMaterialService extends IBaseService { + + + + List batchSaveOrUpdate(List list); + + /** * 根据行业id和类型查询 * @param industryId @@ -35,6 +41,7 @@ public interface CbamProcessMaterialService extends IBaseService list,Integer type); + /** * 批量更新 * @param list diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java index 1cd1f8f..2766f0e 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java @@ -16,4 +16,6 @@ public interface CbamProdRouteRelationService extends IBaseService getByProdMaterialIdAndType(Long prodMaterialId, Integer type); + List batchSaveOrUpdate(List list); + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java index 06fafc1..fa55945 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java @@ -16,8 +16,10 @@ import com.thing.common.core.constants.Constant; import com.thing.common.core.exception.SysException; import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.common.orm.utils.IdGenerator; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -95,7 +97,32 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl cbamProductList = dto.getCbamProductList(); cbamProcessMaterialService.batchDeleteAndSaveList(cbamProductList,industryEntity.getId(),1); @@ -150,12 +175,6 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl validateMsg(Long hyId,Long startTime,Long endTime) { LinkedHashMap resMap = new LinkedHashMap<>(); //1.所属行业不能为空，并且是行业字典的值 - - - - - - return null; } } diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java index 897c8ab..885605d 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java @@ -9,16 +9,16 @@ import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; import com.thing.cbam.baesInfoExcel.mapper.CbamProcessMaterialMapper; import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -import com.thing.common.core.exception.SysException; import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Objects; /** * 综合商品类别和相关生产过程 和 购买的原材料 表 @@ -76,6 +76,40 @@ public class CbamProcessMaterialServiceImpl extends BaseServiceImpl batchSaveOrUpdate(List list) { + if(CollectionUtils.isEmpty(list)){ + return list; + } + //除了id，不管有没有值，都根据 industryId 和类型（自定义1.代表 生产过程 2.代表原料） 先删除，再插入 + List industryIds = list.stream().map(CbamProcessMaterialDTO::getIndustryId).distinct().toList(); + List typeList = list.stream().map(CbamProcessMaterialDTO::getType).distinct().toList(); + mapper.deleteByQuery(QueryWrapper.create() + .in(CbamProcessMaterialEntity::getIndustryId,industryIds) + .in(CbamProcessMaterialEntity::getType,typeList)); + //再进行插入操作 + List resList = new ArrayList<>(); + for (CbamProcessMaterialDTO cbamProcessMaterialDTO : list) { + CbamProcessMaterialEntity cbamProcessMaterialEntity = ConvertUtils.sourceToTarget(cbamProcessMaterialDTO, CbamProcessMaterialEntity.class); + //1.保存产品或者原料信息 + mapper.insert(cbamProcessMaterialEntity); + //2.保存产品或者原料的生产工艺信息 + List routeRelationList = cbamProcessMaterialDTO.getRouteRelationList(); + if(CollectionUtil.isNotEmpty(routeRelationList)){ + for (CbamProdRouteRelationDTO cbamProdRouteRelationDTO : routeRelationList) { + cbamProdRouteRelationDTO.setProdMaterialId(cbamProcessMaterialEntity.getId()); + cbamProdRouteRelationDTO.setType(cbamProcessMaterialEntity.getType()); + } + //将工艺信息保存到数据库 + List routeRelationDTOS = cbamProdRouteRelationService.batchSaveOrUpdate(routeRelationList); + CbamProcessMaterialDTO processMaterialDTO = ConvertUtils.sourceToTarget(cbamProcessMaterialEntity, CbamProcessMaterialDTO.class); + processMaterialDTO.setRouteRelationList(routeRelationDTOS); + resList.add(processMaterialDTO); + } + } + return resList; + } + @Transactional(rollbackFor = Exception.class) @Override public void batchDeleteAndSaveList(List list,Long industryId,Integer type){ diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java index 2a3c7ac..8a43e10 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java @@ -5,6 +5,7 @@ import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; import com.thing.cbam.baesInfoExcel.mapper.CbamProdRouteRelationMapper; import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; +import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; import org.springframework.stereotype.Service; @@ -36,4 +37,18 @@ public class CbamProdRouteRelationServiceImpl extends BaseServiceImpl batchSaveOrUpdate(List list) { + //除了id，不管有没有值，都根据（生产过程或者原料id） 和类型（自定义1.代表 生产过程 2.代表原料） 先删除，再插入 + List typeList = list.stream().map(CbamProdRouteRelationDTO::getType).toList(); + List prodMaterialIdList = list.stream().map(CbamProdRouteRelationDTO::getProdMaterialId).toList(); + mapper.deleteByQuery(QueryWrapper.create() + .in(CbamProdRouteRelationEntity::getProdMaterialId, prodMaterialIdList) + .in(CbamProdRouteRelationEntity::getType, typeList)); + //插入工艺路线 + List cbamProdRouteRelationEntities = ConvertUtils.sourceToTarget(list, CbamProdRouteRelationEntity.class); + mapper.insertBatch(cbamProdRouteRelationEntities); + return ConvertUtils.sourceToTarget(cbamProdRouteRelationEntities, CbamProdRouteRelationDTO.class); + } } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java index daba7dd..633e650 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java @@ -1,5 +1,6 @@ package com.thing.cbam.directCarbon.controller; +import com.thing.cbam.directCarbon.dto.CbamCarbonDirectContextDTO; import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; import com.thing.common.core.annotation.LogOperation; @@ -79,21 +80,28 @@ public class CbamCarbonDirectController { return new Result<>(); } - @PostMapping("batchSave") - @Operation(summary="保存所有的tab信息") - @LogOperation("保存所有的tab信息") - public Result batchSaveList(@RequestBody List carbonDirectDTOList){ + @PostMapping("batchSaveOrUpdate") + @Operation(summary="批量保存或者更新") + @LogOperation("批量保存或者更新") + public Result batchSaveOrUpdate(@RequestBody List carbonDirectDTOList){ //效验数据 - cbamCarbonDirectService.saveList(carbonDirectDTOList); + cbamCarbonDirectService.batchSaveOrUpdate(carbonDirectDTOList); return new Result<>(); } + @PostMapping("batchSaveOrUpdateCarbonDirect") + @Operation(summary="批量保存或者更新整个B-excel") + @LogOperation("批量保存或者更新") + public Result batchSaveOrUpdateCarbonDirect(@RequestBody CbamCarbonDirectContextDTO directContextDTO){ + return new Result().ok(cbamCarbonDirectService.batchSaveOrUpdateCarbonDirect(directContextDTO)); + } + @PostMapping("batchUpdate") - @Operation(summary="更新所有的tab信息") - @LogOperation("更新所有的tab信息") + @Operation(summary="批量更新") + @LogOperation("批量更新") public Result batchUpdateList(@RequestBody List carbonDirectDTOList){ //效验数据 - cbamCarbonDirectService.saveList(carbonDirectDTOList); + cbamCarbonDirectService.batchSaveOrUpdate(carbonDirectDTOList); return new Result<>(); } diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java index 9766518..33d190b 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java @@ -18,6 +18,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -64,6 +65,17 @@ public class CbamPerfluorinatedCarbonController { return new Result<>(); } + + @PostMapping("batchSaveOrUpdate") + @Operation(summary="保存") + @LogOperation("保存") + public Result batchSaveOrUpdate(@RequestBody List list){ + //效验数据 + // ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamPerfluorinatedCarbonService.batchSaveOrUpdate(list); + return new Result<>(); + } + @PutMapping @Operation(summary="修改") @LogOperation("修改") diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java new file mode 100644 index 0000000..ae9d401 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java @@ -0,0 +1,60 @@ +package com.thing.cbam.directCarbon.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** +* 直接排放量B-Excel +* +* @author xc +* @since 3.0 2024-12-02 +*/ +@Data +@Schema(description = "直接排放量B-Excel") +public class CbamCarbonDirectContextDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "类型：\n" + + "1.是否涉及燃烧排放\n" + + "2.是否涉及过程排放\n" + + "3.是否涉及物料平衡\n" + +// "4.是否涉及斜率法\n" + +// "5.是否涉及过电压法\n" + + "6.是否有连续排放测量系统(CEMS)\n" + + "7.各生产过程中原材料/燃料的分配") + private List carbonDirectList; + + + + @Schema(description = "类型：\n" + +// "1.是否涉及燃烧排放\n" + +// "2.是否涉及过程排放\n" + +// "3.是否涉及物料平衡\n" + + "4.是否涉及斜率法\n" + + "5.是否涉及过电压法\n" +// "6.是否有连续排放测量系统(CEMS)\n" + +// "7.各生产过程中原材料/燃料的分配" + ) + private List perfluorinatedCarbonList; + + + @Schema(description = "类型：\n" + +// "1.是否涉及燃烧排放\n" + +// "2.是否涉及过程排放\n" + +// "3.是否涉及物料平衡\n" + +// "4.是否涉及斜率法\n" + +// "5.是否涉及过电压法\n" +// "6.是否有连续排放测量系统(CEMS)\n" + + "7.各生产过程中原材料/燃料的分配" + ) + private List processAllocationList; + + + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java index ebac710..9b45d26 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java @@ -1,10 +1,12 @@ package com.thing.cbam.directCarbon.dto; +import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * 直接排放量B-Excel @@ -71,17 +73,22 @@ public class CbamCarbonDirectDTO implements Serializable { private String globalWarmingId; @Schema(description = "全球变暖潜势") private String globalWarming; - @Schema(description = "关联cbam_industry_information的主键id") + @Schema(description = "关联cbam_industry_info的主键id") private Long industryId; @Schema(description = "类型：\n" + "1.是否涉及燃烧排放\n" + "2.是否涉及过程排放\n" + "3.是否涉及物料平衡\n" + - "4.是否有连续排放测量系统(CEMS)") +// "4.是否涉及斜率法\n" + +// "5.是否涉及过电压法\n" + + "6.是否有连续排放测量系统(CEMS)\n" + + "7.各生产过程中原材料/燃料的分配") private Integer type; private Long sort; @Schema(description = "生产过程分配量") private String processAllocation; + @Schema(description = "铝制品：6：倾斜法 7电压法 集合") + private List perfluorinatedCarbonDTOList; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java index 33bd600..d97e02f 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java @@ -14,7 +14,7 @@ import java.io.Serializable; * @since 3.0 2024-12-03 */ @Data -@Schema(description = "全氟化碳PFC排放") +@Schema(description = "全氟化碳PFC排放-铝制品") public class CbamPerfluorinatedCarbonDTO implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -47,11 +47,12 @@ public class CbamPerfluorinatedCarbonDTO implements Serializable { private String globalWarmingSfht; @Schema(description = "全球变暖潜势(F(六氟乙烷，CzFe))") private String globalWarmingSfyw; + @Schema(description = "收集评率") private String collectRate; @Schema(description = "关联cbam_industry_info的主键id") private Long industryId; - @Schema(description = "类型：6：倾斜法 7电压法") - private String type; + @Schema(description = "类型：4：倾斜法 5 电压法") + private Integer type; @Schema(description = "排序") private Long sort; @Schema(description = "B: AEO") diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java index de52162..22256da 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java @@ -23,13 +23,15 @@ public class CbamProcessAllocationDTO implements Serializable { private Long id; @Schema(description = "排放源名称") private String name; - @Schema(description = "排放源类型：1 和 2") - private Integer type; @Schema(description = "关联cbam_industry_info的主键id") private Long industryId; @Schema(description = "关联cbam_process_material的id") private Long prodId; + @Schema(description = "关联cbam_carbon_direct的id") + private Long directId; @Schema(description = "生产过程分配量") private String processAllocation; + @Schema(description = "排序") + private Long sort; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java index 7c1641d..38ae13c 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java @@ -91,7 +91,7 @@ public class CbamPerfluorinatedCarbonEntity implements Serializable { /** * 类型：6：倾斜法 7电压法 */ - private String type; + private Integer type; /** * 排序 */ diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java index 9209fe9..1ac37b6 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java @@ -3,7 +3,6 @@ package com.thing.cbam.directCarbon.entity; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; - import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; @@ -35,20 +34,30 @@ public class CbamProcessAllocationEntity implements Serializable { * 排放源名称 */ private String name; - /** - * 排放源类型：1 和 2 - */ - private Integer type; + /** * 关联cbam_industry_info的主键id */ private Long industryId; + /** * 关联cbam_process_material的id */ private Long prodId; + + /** + * 关联cbam_carbon_direct的id + */ + private Long directId; + /** * 生产过程分配量 */ private String processAllocation; + + + /** + * 排序 + */ + private Long sort; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java index a958a15..ddfbf5f 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java @@ -1,9 +1,9 @@ package com.thing.cbam.directCarbon.service; +import com.thing.cbam.directCarbon.dto.CbamCarbonDirectContextDTO; import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; import com.thing.common.orm.service.IBaseService; -import org.springframework.web.bind.annotation.RequestBody; import java.math.BigDecimal; import java.util.List; @@ -17,9 +17,11 @@ import java.util.Map; */ public interface CbamCarbonDirectService extends IBaseService { - List listByIndustryId(Long industryId); + List batchSaveOrUpdate(List carbonDirectDTOList); + + CbamCarbonDirectContextDTO batchSaveOrUpdateCarbonDirect(CbamCarbonDirectContextDTO cbamCarbonDirectContextDTO); - void saveList(List carbonDirectDTOList); + List listByIndustryId(Long industryId); void batchUpdateList(List carbonDirectDTOList); diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java index 14203c9..f617428 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java @@ -1,8 +1,11 @@ package com.thing.cbam.directCarbon.service; +import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; import com.thing.common.orm.service.IBaseService; +import java.util.List; + /** * 全氟化碳PFC排放 * @@ -11,4 +14,6 @@ import com.thing.common.orm.service.IBaseService; */ public interface CbamPerfluorinatedCarbonService extends IBaseService { + List batchSaveOrUpdate(List list); + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java index 45e5fd9..1f2e469 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java @@ -1,8 +1,11 @@ package com.thing.cbam.directCarbon.service; +import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; import com.thing.common.orm.service.IBaseService; +import java.util.List; + /** * 生产过程分配量 * @@ -11,4 +14,6 @@ import com.thing.common.orm.service.IBaseService; */ public interface CbamProcessAllocationService extends IBaseService { + List batchSaveOrUpdate(List list); + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java index 6a29946..629fd5c 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java @@ -1,28 +1,28 @@ package com.thing.cbam.directCarbon.service.impl; import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; import com.thing.cbam.dict.entity.CbamFuelDictEntity; import com.thing.cbam.dict.service.CbamFuelDictService; +import com.thing.cbam.directCarbon.dto.CbamCarbonDirectContextDTO; import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; +import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; +import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; import com.thing.cbam.directCarbon.mapper.CbamCarbonDirectMapper; import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; +import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; import com.thing.cbam.directCarbon.util.BurningDischargeUtil; import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; +import java.util.stream.Collectors; /** * 直接排放量B-Excel @@ -36,6 +36,7 @@ public class CbamCarbonDirectServiceImpl extends BaseServiceImpl carbonDirectDTOList) { - //插入 是否涉及燃烧排放 && 是否涉及过程排放 && 是否涉及物料平衡 && 是否有连续排放测量系统(CEMS),即排除type=5的类型 - List list = carbonDirectDTOList.stream().filter(carbonDirectDTO -> !Objects.equals(carbonDirectDTO.getType(), 5)).toList(); - List cbamCarbonDirectEntities = ConvertUtils.sourceToTarget(list, CbamCarbonDirectEntity.class); - mapper.insertBatch(cbamCarbonDirectEntities); - // type=5的类型 单独 更新生产过程中的分配量 - List fiveList = carbonDirectDTOList.stream().filter(carbonDirectDTO -> Objects.equals(carbonDirectDTO.getType(), 5)).toList(); - List cbamProcessAllocationList = fiveList.stream().map(f -> { - CbamProcessAllocationEntity cbamProcessAllocationEntity = new CbamProcessAllocationEntity(); - cbamProcessAllocationEntity.setName(f.getName()); - cbamProcessAllocationEntity.setType(f.getType()); - cbamProcessAllocationEntity.setIndustryId(f.getIndustryId()); - cbamProcessAllocationEntity.setProcessAllocation(f.getProcessAllocation()); - // 根据排放源名字，排放源类型和顺序获取id - cbamCarbonDirectEntities.stream() - .filter(cbamCarbonDirectEntity -> - StringUtils.equals(cbamCarbonDirectEntity.getName(), f.getName()) - && Objects.equals(cbamCarbonDirectEntity.getType(), f.getType()) - && Objects.equals(cbamCarbonDirectEntity.getSort(), f.getSort()) - ) - .findFirst() - .ifPresent(cbamCarbonDirectEntity -> { - cbamProcessAllocationEntity.setProdId(cbamCarbonDirectEntity.getId()); - }); - return cbamProcessAllocationEntity; - }).toList(); - cbamProcessAllocationService.saveBatch(cbamProcessAllocationList); + public List batchSaveOrUpdate(List carbonDirectDTOList) { + List resList = new ArrayList<>(); + //根据type分组 + Map> carbonDirectMapList = carbonDirectDTOList.stream().collect(Collectors.groupingBy(CbamCarbonDirectDTO::getType)); + for (Map.Entry> entries : carbonDirectMapList.entrySet()) { + Integer key = entries.getKey(); + if(Objects.equals(key,1) || Objects.equals(key,2) || Objects.equals(key,3)|| Objects.equals(key,6)|| Objects.equals(key,7)){ + List values = entries.getValue(); + List industryIds = values.stream().map(CbamCarbonDirectDTO::getIndustryId).toList(); + //先删除 + mapper.deleteByQuery(QueryWrapper.create() + .in(CbamCarbonDirectEntity::getIndustryId, industryIds) + .eq(CbamCarbonDirectEntity::getType, key)); + List cbamCarbonDirectEntities = ConvertUtils.sourceToTarget(values, CbamCarbonDirectEntity.class); + mapper.insertBatch(cbamCarbonDirectEntities); + resList.addAll(ConvertUtils.sourceToTarget(cbamCarbonDirectEntities, CbamCarbonDirectDTO.class)); + } + } + return resList; } + @Override + public CbamCarbonDirectContextDTO batchSaveOrUpdateCarbonDirect(CbamCarbonDirectContextDTO cbamCarbonDirectContextDTO) { + CbamCarbonDirectContextDTO resDTO = new CbamCarbonDirectContextDTO(); + //处理直接碳排数据，类型是1、2、3、6 + List cbamCarbonDirectDTOS = batchSaveOrUpdate(cbamCarbonDirectContextDTO.getCarbonDirectList()); + resDTO.setCarbonDirectList(cbamCarbonDirectDTOS); + //处理直接碳排数据，类型是4、5 + List cbamPerfluorinatedCarbonDTOS = cbamPerfluorinatedCarbonService.batchSaveOrUpdate(cbamCarbonDirectContextDTO.getPerfluorinatedCarbonList()); + resDTO.setPerfluorinatedCarbonList(cbamPerfluorinatedCarbonDTOS); + //处理直接碳排数据，类型是7 + List cbamProcessAllocationDTOS = cbamProcessAllocationService.batchSaveOrUpdate(cbamCarbonDirectContextDTO.getProcessAllocationList()); + resDTO.setProcessAllocationList(cbamProcessAllocationDTOS); + return resDTO; + } + + @Transactional(rollbackFor = Exception.class) @Override public void batchUpdateList(List carbonDirectDTOList) { @@ -93,7 +102,7 @@ public class CbamCarbonDirectServiceImpl extends BaseServiceImpl implements CbamPerfluorinatedCarbonService { + private final CbamIndustryService cbamIndustryService; + @Override public QueryWrapper getWrapper(Map params){ QueryWrapper wrapper = new QueryWrapper(); @@ -25,4 +38,54 @@ public class CbamPerfluorinatedCarbonServiceImpl extends BaseServiceImpl batchSaveOrUpdate(List list) { + //只有铝制品行业有以下处理 + // type=4,5 的类型 单独 更新生产过程中的分配量 + List industryIds = list.stream().map(CbamPerfluorinatedCarbonDTO::getIndustryId).distinct().toList(); + //先删除 + mapper.deleteByQuery(QueryWrapper.create().in(CbamPerfluorinatedCarbonEntity::getIndustryId, industryIds)); + //再新增 + List perfluorinatedCarbonEntities = ConvertUtils.sourceToTarget(list, CbamPerfluorinatedCarbonEntity.class); + mapper.insertBatch(perfluorinatedCarbonEntities); + return ConvertUtils.sourceToTarget(perfluorinatedCarbonEntities, CbamPerfluorinatedCarbonDTO.class); +// if(CollectionUtils.isEmpty(list)){ +// throw new RuntimeException("铝制品行业相关《倾斜法，电压法》没有相关数据"); +// } +// //1.获取相关industryId +// Long industryId = list.get(0).getIndustryId(); +// CbamIndustryEntity cbamIndustryEntity = cbamIndustryService.getById(industryId); +// if(!StringUtils.equals(cbamIndustryEntity.getIndustryDict(), "铝行业") && !Objects.equals(cbamIndustryEntity.getIndustryDictId(), 11002L)){ +// throw new RuntimeException("非铝制品行业相关《倾斜法，电压法》行业，无需添加"); +// } +// //1.1获取id没有值的参数,即新增数据 +// List newList = list.stream().filter(carbonDirectDTO -> Objects.isNull(carbonDirectDTO.getId())).toList(); +// if(CollectionUtils.isNotEmpty(newList)){ +// mapper.insertBatch(ConvertUtils.sourceToTarget(newList, CbamPerfluorinatedCarbonEntity.class)); +// } +// //1.2 获取id有值的参数,即更新数据 +// List existList = list.stream().filter(carbonDirectDTO -> Objects.isNull(carbonDirectDTO.getId())).toList(); +// if(CollectionUtils.isEmpty(existList)){ +// return; +// } +// //2.根据industryId查询所有数据 +// List perfluorinatedCarbonEntities = +// mapper.selectListByQuery(QueryWrapper.create().eq(CbamPerfluorinatedCarbonEntity::getIndustryId, industryId)); +// //3.获取参数中需要更新的id +// List updateIds = existList.stream().map(CbamPerfluorinatedCarbonDTO::getId).toList(); +// //4.排除不需要更新的id集合,并且删除相关信息 +// if(CollectionUtils.isNotEmpty(perfluorinatedCarbonEntities)){ +// //获取不在数据库的id集合 +// List unUpdatePerfluorinatedEntities +// = perfluorinatedCarbonEntities.stream().filter(carbonDirectEntity -> !updateIds.contains(carbonDirectEntity.getId())).toList(); +// if(CollectionUtils.isNotEmpty(unUpdatePerfluorinatedEntities)){ +// mapper.deleteBatchByIds(unUpdatePerfluorinatedEntities.stream().map(CbamPerfluorinatedCarbonEntity::getId).toList()); +// } +// //获取在数据库的记录,并进行更新 +// List existPerfluorinatedCarbons = existList.stream().filter(s -> updateIds.contains(s.getId())).toList(); +// if(CollectionUtils.isNotEmpty(existPerfluorinatedCarbons)){ +// existPerfluorinatedCarbons.forEach(carbonDirectDTO -> mapper.update(ConvertUtils.sourceToTarget(carbonDirectDTO, CbamPerfluorinatedCarbonEntity.class))); +// } +// } + } } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java index 8fe5ef4..2438d43 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java @@ -1,12 +1,15 @@ package com.thing.cbam.directCarbon.service.impl; import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; import com.thing.cbam.directCarbon.mapper.CbamProcessAllocationMapper; import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; +import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -24,5 +27,19 @@ public class CbamProcessAllocationServiceImpl extends BaseServiceImpl batchSaveOrUpdate(List list) { + //先删除 + List industryIds = list.stream().map(CbamProcessAllocationDTO::getIndustryId).toList(); + List prodIds = list.stream().map(CbamProcessAllocationDTO::getProdId).toList(); + List directId = list.stream().map(CbamProcessAllocationDTO::getDirectId).toList(); + mapper.deleteByQuery(new QueryWrapper() + .in(CbamProcessAllocationEntity::getIndustryId, industryIds) + .in(CbamProcessAllocationEntity::getProdId, prodIds) + .in(CbamProcessAllocationEntity::getDirectId, directId)); + //再新增 + List cbamProcessAllocationEntities = ConvertUtils.sourceToTarget(list, CbamProcessAllocationEntity.class); + mapper.insertBatch(cbamProcessAllocationEntities); + return ConvertUtils.sourceToTarget(cbamProcessAllocationEntities, CbamProcessAllocationDTO.class); + } } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java index ab183d9..3dc2e7a 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java @@ -26,6 +26,7 @@ import java.util.Map; @Tag(name = "间接排放量") @RequiredArgsConstructor public class CbamCarbonIndirectEmissionsController { + private final CbamCarbonIndirectEmissionsService cbamCarbonIndirectEmissionsService; @GetMapping("page") diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductElectricityController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java similarity index 58% rename from modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductElectricityController.java rename to modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java index 323fdc9..fa665f9 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductElectricityController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java @@ -1,7 +1,7 @@ -package com.thing.cbam.production.controller; +package com.thing.cbam.indirectCarbon.controller; -import com.thing.cbam.production.dto.CbamProductElectricityDTO; -import com.thing.cbam.production.service.CbamProductElectricityService; +import com.thing.cbam.indirectCarbon.dto.CbamPowerSummaryFuelDTO; +import com.thing.cbam.indirectCarbon.service.CbamPowerSummaryFuelService; import com.thing.common.core.annotation.LogOperation; import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; @@ -22,18 +22,18 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; /** -* 输出的电力 +* 排放量汇总与数据质量信息 与 燃料平衡 * * @author xc -* @since 3.0 2024-11-28 +* @since 3.0 2024-12-05 */ @RestController -@RequestMapping("v2/输出的电力/cbamproductelectricity") -@Tag(name="输出的电力") +@RequestMapping("v2/cbam/powersummary") +@Tag(name="排放量汇总与数据质量信息 与 燃料平衡") @RequiredArgsConstructor -public class CbamProductElectricityController { +public class CbamPowerSummaryFuelController { - private final CbamProductElectricityService cbamProductElectricityService; + private final CbamPowerSummaryFuelService cbamPowerSummaryFuelService; @GetMapping("page") @Operation(summary="分页") @@ -43,35 +43,35 @@ public class CbamProductElectricityController { @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamProductElectricityService.getPageData(params, CbamProductElectricityDTO.class); - return new Result>().ok(page); + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cbamPowerSummaryFuelService.getPageData(params, CbamPowerSummaryFuelDTO.class); + return new Result>().ok(page); } @GetMapping("{id}") @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProductElectricityDTO data = cbamProductElectricityService.getByIdAs(id, CbamProductElectricityDTO.class); - return new Result().ok(data); + public Result get(@PathVariable("id") Long id){ + CbamPowerSummaryFuelDTO data = cbamPowerSummaryFuelService.getByIdAs(id, CbamPowerSummaryFuelDTO.class); + return new Result().ok(data); } @PostMapping @Operation(summary="保存") @LogOperation("保存") - public Result save(@RequestBody CbamProductElectricityDTO dto){ + public Result save(@RequestBody CbamPowerSummaryFuelDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProductElectricityService.saveDto(dto); + cbamPowerSummaryFuelService.saveDto(dto); return new Result<>(); } @PutMapping @Operation(summary="修改") @LogOperation("修改") - public Result update(@RequestBody CbamProductElectricityDTO dto){ + public Result update(@RequestBody CbamPowerSummaryFuelDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProductElectricityService.updateDto(dto); + cbamPowerSummaryFuelService.updateDto(dto); return new Result<>(); } @@ -81,7 +81,7 @@ public class CbamProductElectricityController { public Result delete(@RequestBody Long[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - cbamProductElectricityService.batchDelete(ids); + cbamPowerSummaryFuelService.batchDelete(ids); return new Result<>(); } @@ -90,8 +90,8 @@ public class CbamProductElectricityController { *@Operation(summary="导出") *@LogOperation("导出") *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamProductElectricityService.listAs(params, CbamProductElectricityDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "输出的电力", list, CbamProductElectricityExcel.class); + * List list = cbamPowerSummaryFuelService.listAs(params, CbamPowerSummaryFuelDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "排放量汇总与数据质量信息 与 燃料平衡", list, CbamPowerSummaryFuelExcel.class); *} */ diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java index dc12d13..b12973d 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java @@ -20,10 +20,15 @@ public class CbamCarbonIndirectEmissionsDTO implements Serializable { private static final long serialVersionUID = 1L; private Long id; - @Schema(description = "用电类型") + @Schema(description = "用电类型：\n" + + "0 - 总计\n" + + "1 - 国家电网电量\n" + + "2.第三方发电厂电量\n" + + "3.绿色电力（自建绿电）\n" + + "4.生产烟气/余热发电") private String electricityType; @Schema(description = "耗电量") - private String powerConsum; + private String powerConsume; @Schema(description = "电力碳排放因子") private String electricityFactor; @Schema(description = "关联cbam_industry_information的主键id") diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java index bf83b81..015663b 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java @@ -1,7 +1,6 @@ package com.thing.cbam.indirectCarbon.dto; import io.swagger.v3.oas.annotations.media.Schema; - import lombok.Data; import java.io.Serial; @@ -19,24 +18,35 @@ public class CbamCarbonPowerProgressAllocationDTO implements Serializable { @Serial private static final long serialVersionUID = 1L; + @Schema(description = "主键") private Long id; + @Schema(description = "生产过程设备总功率") private String powerEquip; + @Schema(description = "设备平均运行时间") private String averEquip; + + @Schema(description = "耗电量") + private String powerConsume; + + @Schema(description = "电力排放因子") + private String electricityEmissionFactor; + @Schema(description = "电力排放因子的来源") - private String sourceElect; - @Schema(description = "有关数据质量的一般信息") - private String qualityInfo; - @Schema(description = "质量保证信息") - private String assurInfo; - @Schema(description = "电力生产燃料") - private String produFuel; - @Schema(description = "非CBAM商品生产的直接燃料 ") - private String nocbamFuel; - @Schema(description = "CBAM商品生产的直接燃料 ") - private String cbamFuel; - @Schema(description = "关联cbam_industry_information的主键id") + private String electricityEmissionSource; + + @Schema(description = "关联cbam_industry_info的主键id") private Long industryId; + @Schema(description = "关联cbam_process_material的主键id") + private Long processId; + + @Schema(description = "生产过程名称") + private String processName; + + @Schema(description = "排序") + private Long sort; + + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java new file mode 100644 index 0000000..7fd83a4 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java @@ -0,0 +1,44 @@ +package com.thing.cbam.indirectCarbon.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-12-05 +*/ +@Data +@Schema(description = "排放量汇总与数据质量信息 与 燃料平衡") +public class CbamPowerSummaryFuelDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + @Schema(description = "有关数据质量的一般信息") + private String qualityInfo; + @Schema(description = "质量保证信息") + private String assurInfo; + @Schema(description = "电力生产燃料") + private String produFuel; + @Schema(description = "非CBAM商品生产的直接燃料 ") + private String nocbamFuel; + @Schema(description = "CBAM商品生产的直接燃料 ") + private String cbamFuel; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + @Schema(description = "使用默认值的理由（如果适用）") + private String qualityReason; + @Schema(description = "单位") + private String unit; + @Schema(description = "总燃料投入") + private String totalFuel; + @Schema(description = "其他") + private String otherFuel; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java index 0ff18ae..7717f7f 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java @@ -1,8 +1,10 @@ package com.thing.cbam.indirectCarbon.entity; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; +import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -24,22 +26,31 @@ public class CbamCarbonIndirectEmissionsEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Id + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; /** - * 用电类型 + * 用电类型： + * 0 - 总计 + * 1 - 国家电网电量 + * 2.第三方发电厂电量 + * 3.绿色电力（自建绿电） + * 4.生产烟气/余热发电 */ private String electricityType; /** * 耗电量 */ - private String powerConsum; + private String powerConsume; /** * 电力碳排放因子 */ - private String electricityFactor; + private String electricityFactor="0.5568"; /** - * 关联cbam_industry_information的主键id + * 关联cbam_industry_info的主键id */ private Long industryId; + /** + * 排序 + */ + private Long sort; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java index 904308f..55bc725 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java @@ -1,8 +1,10 @@ package com.thing.cbam.indirectCarbon.entity; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; +import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -19,12 +21,12 @@ import java.io.Serializable; @Data @Accessors(chain = true) @EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_power_progress_allocation") +@Table("cbam_power_progress_allocation") public class CbamCarbonPowerProgressAllocationEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Id + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; /** * 生产过程设备总功率 @@ -35,31 +37,36 @@ public class CbamCarbonPowerProgressAllocationEntity implements Serializable { */ private String averEquip; /** - * 电力排放因子的来源 + * 耗电量 */ - private String sourceElect; + private String powerConsume; /** - * 有关数据质量的一般信息 + * 电力排放因子 */ - private String qualityInfo; + private String electricityEmissionFactor; /** - * 质量保证信息 + * 电力排放因子的来源 */ - private String assurInfo; + private String electricityEmissionSource; + /** - * 电力生产燃料 + * 关联cbam_industry_info的主键id */ - private String produFuel; + private Long industryId; /** - * 非CBAM商品生产的直接燃料 + * 关联cbam_process_material的主键id */ - private String nocbamFuel; + private Long processId; /** - * CBAM商品生产的直接燃料 + * 生产过程名称 */ - private String cbamFuel; + private String processName; + /** - * 关联cbam_industry_information的主键id + * 排序 */ - private Long industryId; + private Long sort; + + + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java new file mode 100644 index 0000000..381134f --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java @@ -0,0 +1,71 @@ +package com.thing.cbam.indirectCarbon.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; + +import com.mybatisflex.core.keygen.KeyGenerators; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 排放量汇总与数据质量信息 与 燃料平衡 + * + * @author xc + * @since 3.0 2024-12-05 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_power_summary_fuel") +public class CbamPowerSummaryFuelEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + /** + * 有关数据质量的一般信息 + */ + private String qualityInfo; + /** + * 质量保证信息 + */ + private String assurInfo; + /** + * 电力生产燃料 + */ + private String produFuel; + /** + * 非CBAM商品生产的直接燃料 + */ + private String nocbamFuel; + /** + * CBAM商品生产的直接燃料 + */ + private String cbamFuel; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; + /** + * 使用默认值的理由（如果适用） + */ + private String qualityReason; + /** + * 单位 + */ + private String unit; + /** + * 总燃料投入 + */ + private String totalFuel; + /** + * 其他 + */ + private String otherFuel; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java new file mode 100644 index 0000000..a21e2ff --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java @@ -0,0 +1,16 @@ +package com.thing.cbam.indirectCarbon.mapper; + +import com.thing.cbam.indirectCarbon.entity.CbamPowerSummaryFuelEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* 排放量汇总与数据质量信息 与 燃料平衡 +* +* @author xc +* @since 3.0 2024-12-05 +*/ +@Mapper +public interface CbamPowerSummaryFuelMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java index 9b965d8..e961223 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java @@ -1,7 +1,14 @@ package com.thing.cbam.indirectCarbon.service; +import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; import com.thing.common.orm.service.IBaseService; +import java.util.List; + public interface CbamCarbonIndirectEmissionsService extends IBaseService { + + + List batchSaveOrUpdate(List cbamCarbonIndirectEmissionsDTOList); + } diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java index a4a6ec8..06de4f8 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java @@ -1,8 +1,11 @@ package com.thing.cbam.indirectCarbon.service; +import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; import com.thing.common.orm.service.IBaseService; +import java.util.List; + /** * 耗电量分配 @@ -12,4 +15,6 @@ import com.thing.common.orm.service.IBaseService; */ public interface CbamCarbonPowerProgressAllocationService extends IBaseService { + List batchSaveOrUpdate(List carbonPowerProgressAllocationDTOS); + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java new file mode 100644 index 0000000..0430889 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java @@ -0,0 +1,14 @@ +package com.thing.cbam.indirectCarbon.service; + +import com.thing.cbam.indirectCarbon.entity.CbamPowerSummaryFuelEntity; +import com.thing.common.orm.service.IBaseService; + +/** + * 排放量汇总与数据质量信息 与 燃料平衡 + * + * @author xc + * @since 3.0 2024-12-05 + */ +public interface CbamPowerSummaryFuelService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java index 16430d9..0b12f26 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java @@ -1,12 +1,15 @@ package com.thing.cbam.indirectCarbon.service.Impl; import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; import com.thing.cbam.indirectCarbon.mapper.CbamCarbonIndirectEmissionsMapper; import com.thing.cbam.indirectCarbon.service.CbamCarbonIndirectEmissionsService; +import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; @Service @@ -16,4 +19,15 @@ public class CbamCarbonIndirectEmissionsServiceImpl extends BaseServiceImpl batchSaveOrUpdate(List indirectEmissionsDTOS) { + //先删除 + List industryIds = indirectEmissionsDTOS.stream().map(CbamCarbonIndirectEmissionsDTO::getIndustryId).toList(); + mapper.deleteByQuery(QueryWrapper.create().in(CbamCarbonIndirectEmissionsEntity::getIndustryId, industryIds)); + //再插入 + List insertList = ConvertUtils.sourceToTarget(indirectEmissionsDTOS, CbamCarbonIndirectEmissionsEntity.class); + mapper.insertBatch(insertList); + return ConvertUtils.sourceToTarget(insertList, CbamCarbonIndirectEmissionsDTO.class); + } } diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java index 6a47c58..e8150f1 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java @@ -1,13 +1,16 @@ package com.thing.cbam.indirectCarbon.service.Impl; import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; import com.thing.cbam.indirectCarbon.mapper.CbamCarbonPowerProgressAllocationMapper; import com.thing.cbam.indirectCarbon.service.CbamCarbonPowerProgressAllocationService; +import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; /** @@ -26,4 +29,17 @@ public class CbamCarbonPowerProgressAllocationServiceImpl extends BaseServiceImp } + @Override + public List batchSaveOrUpdate(List allocationDTOS) { + //先删除 + List industryIds = allocationDTOS.stream().map(CbamCarbonPowerProgressAllocationDTO::getIndustryId).toList(); + List processIds = allocationDTOS.stream().map(CbamCarbonPowerProgressAllocationDTO::getProcessId).toList(); + mapper.deleteByQuery(new QueryWrapper() + .in(CbamCarbonPowerProgressAllocationEntity::getIndustryId, industryIds) + .in(CbamCarbonPowerProgressAllocationEntity::getProcessId, processIds)); + //再插入 + List insertList = ConvertUtils.sourceToTarget(allocationDTOS, CbamCarbonPowerProgressAllocationEntity.class); + mapper.insertBatch(insertList); + return ConvertUtils.sourceToTarget(insertList, CbamCarbonPowerProgressAllocationDTO.class); + } } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java new file mode 100644 index 0000000..0a50e48 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java @@ -0,0 +1,28 @@ +package com.thing.cbam.indirectCarbon.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.indirectCarbon.entity.CbamPowerSummaryFuelEntity; +import com.thing.cbam.indirectCarbon.mapper.CbamPowerSummaryFuelMapper; +import com.thing.cbam.indirectCarbon.service.CbamPowerSummaryFuelService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 排放量汇总与数据质量信息 与 燃料平衡 + * + * @author xc + * @since 3.0 2024-12-05 + */ +@Service +public class CbamPowerSummaryFuelServiceImpl extends BaseServiceImpl implements CbamPowerSummaryFuelService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java index c4cba64..d0c30ea 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; @RestController -@RequestMapping("v2/product/allocation") +@RequestMapping("v2/cbam/product/allocation") @Tag(name = "产品的分配") @RequiredArgsConstructor public class CbamProductAllocationController { diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java deleted file mode 100644 index 178bbd5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.thing.cbam.production.controller; - -import com.thing.cbam.production.dto.CbamProductExhaustEmissionsDTO; -import com.thing.cbam.production.service.CbamProductExhaustEmissionsService; -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 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-11-28 -*/ -@RestController -@RequestMapping("v2/废气排放量/cbamproductexhaustemissions") -@Tag(name="废气排放量") -@RequiredArgsConstructor -public class CbamProductExhaustEmissionsController { - - private final CbamProductExhaustEmissionsService cbamProductExhaustEmissionsService; - - @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 = cbamProductExhaustEmissionsService.getPageData(params, CbamProductExhaustEmissionsDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProductExhaustEmissionsDTO data = cbamProductExhaustEmissionsService.getByIdAs(id, CbamProductExhaustEmissionsDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProductExhaustEmissionsDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProductExhaustEmissionsService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProductExhaustEmissionsDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProductExhaustEmissionsService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProductExhaustEmissionsService.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 = cbamProductExhaustEmissionsService.listAs(params, CbamProductExhaustEmissionsDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "废气排放量", list, CbamProductExhaustEmissionsExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductHeatEmissionsController.java b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductHeatEmissionsController.java deleted file mode 100644 index 0ddc822..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductHeatEmissionsController.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.thing.cbam.production.controller; - -import com.thing.cbam.production.dto.CbamProductHeatEmissionsDTO; -import com.thing.cbam.production.service.CbamProductHeatEmissionsService; -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 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; - -@RestController -@RequestMapping("v2/product/heat") -@Tag(name = "发热量排放") -@RequiredArgsConstructor -public class CbamProductHeatEmissionsController { - private final CbamProductHeatEmissionsService cbamProductHeatEmissionsService; - @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 = cbamProductHeatEmissionsService.getPageData(params, CbamProductHeatEmissionsDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProductHeatEmissionsDTO data = cbamProductHeatEmissionsService.getByIdAs(id, CbamProductHeatEmissionsDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProductHeatEmissionsDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProductHeatEmissionsService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProductHeatEmissionsDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProductHeatEmissionsService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProductHeatEmissionsService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); - *} - */ -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java index aa64fde..a0bc23f 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java @@ -1,7 +1,6 @@ package com.thing.cbam.production.dto; import io.swagger.v3.oas.annotations.media.Schema; - import lombok.Data; import java.io.Serial; @@ -14,19 +13,43 @@ import java.io.Serializable; * @since 3.0 2024-11-28 */ @Data -@Schema(description = "产品的分配") +@Schema(description = "d表各生产过程中产品的分配，可测量的发热量排放量，废弃排放量，输出电力排放量") public class CbamProductAllocationDTO implements Serializable { @Serial private static final long serialVersionUID = 1L; private Long id; - @Schema(description = "消耗量t") - private String consum; + @Schema(description = "消耗量t:{} json格式，以产品名称（A表中校验了重名）为key，消耗量t为value") + private String consume; + @Schema(description = "产品名称|生产过程") + private String prodProcessName; + @Schema(description = "空白处的名称") + private String bankName; + @Schema(description = "单位") + private String unit; + @Schema(description = "输入量") + private String input_quantity; + @Schema(description = "输出量") + private String output_quantity; + @Schema(description = "排放量: 发热量排放量、废弃排放量、输出电力排放量") + private String emissions; + @Schema(description = "电力排放因子") + private String electricityEmissionFactor; @Schema(description = "欧盟出口量") private String exportVolume; @Schema(description = "非欧盟销售量") private String salesVolume; - @Schema(description = "关联cbam_industry_information的主键id") + @Schema(description = "剩余消耗量") + private String remainConsume; + @Schema(description = "总产量") + private String totalOutput; + @Schema(description = "关联cbam_industry_info的主键id") private Long industryId; + @Schema(description = "d表类型\n" + + "1.各生产过程中产品的分配\n" + + "2.可测量的发热量排放量\n" + + "3.废气排放量\n" + + "4.生产过程输出的电力\n") + private Integer type; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductElectricityDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductElectricityDTO.java deleted file mode 100644 index 04fd984..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductElectricityDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.thing.cbam.production.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-11-28 -*/ -@Data -@Schema(description = "输出的电力") -public class CbamProductElectricityDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "输出总量") - private String totalOutput; - @Schema(description = "电力排放因子") - private String electricityFactor; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductExhaustEmissionsDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductExhaustEmissionsDTO.java deleted file mode 100644 index 937e1de..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductExhaustEmissionsDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.thing.cbam.production.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-11-28 -*/ -@Data -@Schema(description = "废气排放量") -public class CbamProductExhaustEmissionsDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "输入量") - private String inputQuantity; - @Schema(description = "输出量") - private String output; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductHeatEmissionsDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductHeatEmissionsDTO.java deleted file mode 100644 index 1609d53..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductHeatEmissionsDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.thing.cbam.production.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -@Data -@Schema(description = "发热量排放") -public class CbamProductHeatEmissionsDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "输入量") - private String inputQuantity; - @Schema(description = "输出量") - private String outpuQuantity; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java index be8ae3f..4a1e416 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java @@ -1,8 +1,9 @@ package com.thing.cbam.production.entity; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; - +import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -11,35 +12,81 @@ import java.io.Serial; import java.io.Serializable; /** - * 产品的分配 + * d表各生产过程中产品的分配 * - * @author xc + * @author xc * @since 3.0 2024-11-28 */ @Data @Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @Table("cbam_product_allocation") public class CbamProductAllocationEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator, value = KeyGenerators.snowFlakeId) + private Long id; + /** + * 产品名称|生产过程 + */ + private String prodProcessName; + /** + * 空白处的名称 + */ + private String bankName; + + /** + * 消耗量t:{} json格式，以产品名称（A表中校验了重名）为key，消耗量t为value + */ + private String consume; + /** + * 欧盟出口量 + */ + private String exportVolume; + /** + * 非欧盟销售量 + */ + private String salesVolume; - @Id - private Long id; - /** - * 消耗量t - */ - private String consum; - /** - * 欧盟出口量 - */ - private String exportVolume; - /** - * 非欧盟销售量 - */ - private String salesVolume; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; + /** + * 剩余消耗量 + */ + private String remainConsume; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; + /** + * 单位 + */ + private String unit; + /** + * 输入量 + */ + private String input_quantity; + /** + * 输出量 + */ + private String output_quantity; + /** + * 排放量: 发热量排放量、废弃排放量、输出电力排放量 + */ + private String emissions; + /** + * 电力排放因子 + */ + private String electricityEmissionFactor; + /** + * 总产量 + */ + private String totalOutput; + /** + * d表类型\n" + + * "1.各生产过程中产品的分配\n" + + * "2.可测量的发热量排放量\n" + + * "3.废气排放量\n" + + * "4.生产过程输出的电力\n + */ + private Integer type; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductElectricityEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductElectricityEntity.java deleted file mode 100644 index 58fe78d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductElectricityEntity.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.thing.cbam.production.entity; - -import com.mybatisflex.annotation.Id; -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-11-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_product_electricity") -public class CbamProductElectricityEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id - private Long id; - /** - * 输出总量 - */ - private String totalOutput; - /** - * 电力排放因子 - */ - private String electricityFactor; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductExhaustEmissionsEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductExhaustEmissionsEntity.java deleted file mode 100644 index 340dbaf..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductExhaustEmissionsEntity.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.thing.cbam.production.entity; - -import com.mybatisflex.annotation.Id; -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-11-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_product_exhaust_emissions") -public class CbamProductExhaustEmissionsEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id - private Long id; - /** - * 输入量 - */ - private String inputQuantity; - /** - * 输出量 - */ - private String output; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductHeatEmissionsEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductHeatEmissionsEntity.java deleted file mode 100644 index c852935..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductHeatEmissionsEntity.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.thing.cbam.production.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_product_heat_emissions") -public class CbamProductHeatEmissionsEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id - private Long id; - /** - * 输入量 - */ - private String inputQuantity; - /** - * 输出量 - */ - private String outpuQuantity; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductElectricityMapper.java b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductElectricityMapper.java deleted file mode 100644 index 1fadc78..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductElectricityMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.production.mapper; - -import com.thing.cbam.production.entity.CbamProductElectricityEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 输出的电力 -* -* @author xc -* @since 3.0 2024-11-28 -*/ -@Mapper -public interface CbamProductElectricityMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductExhaustEmissionsMapper.java b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductExhaustEmissionsMapper.java deleted file mode 100644 index 076496c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductExhaustEmissionsMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.production.mapper; - -import com.thing.cbam.production.entity.CbamProductExhaustEmissionsEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamProductExhaustEmissionsMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductHeatEmissionsMapper.java b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductHeatEmissionsMapper.java deleted file mode 100644 index 3d816ff..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductHeatEmissionsMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.production.mapper; - -import com.thing.cbam.production.entity.CbamProductHeatEmissionsEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamProductHeatEmissionsMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java index ebd1615..cfb641b 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java @@ -1,7 +1,13 @@ package com.thing.cbam.production.service; +import com.thing.cbam.production.dto.CbamProductAllocationDTO; import com.thing.cbam.production.entity.CbamProductAllocationEntity; import com.thing.common.orm.service.IBaseService; +import java.util.List; + public interface CbamProductAllocationService extends IBaseService { + + List batchSaveOrUpdate(List list); + } diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductElectricityService.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductElectricityService.java deleted file mode 100644 index f208467..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductElectricityService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.thing.cbam.production.service; - -import com.thing.cbam.production.entity.CbamProductElectricityEntity; -import com.thing.common.orm.service.IBaseService; - -public interface CbamProductElectricityService extends IBaseService { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductExhaustEmissionsService.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductExhaustEmissionsService.java deleted file mode 100644 index 705d348..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductExhaustEmissionsService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.thing.cbam.production.service; - -import com.thing.cbam.production.entity.CbamProductExhaustEmissionsEntity; -import com.thing.common.orm.service.IBaseService; - -public interface CbamProductExhaustEmissionsService extends IBaseService { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductHeatEmissionsService.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductHeatEmissionsService.java deleted file mode 100644 index 9e105fa..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductHeatEmissionsService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.thing.cbam.production.service; - -import com.thing.cbam.production.entity.CbamProductHeatEmissionsEntity; -import com.thing.common.orm.service.IBaseService; - -public interface CbamProductHeatEmissionsService extends IBaseService { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java index bb89bff..9064a64 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java @@ -1,17 +1,19 @@ package com.thing.cbam.production.service.Impl; import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.production.dto.CbamProductAllocationDTO; import com.thing.cbam.production.entity.CbamProductAllocationEntity; import com.thing.cbam.production.mapper.CbamProductAllocationMapper; import com.thing.cbam.production.service.CbamProductAllocationService; +import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; @Service -public class CbamProductAllocationServiceImpl extends BaseServiceImpl - implements CbamProductAllocationService { +public class CbamProductAllocationServiceImpl extends BaseServiceImpl implements CbamProductAllocationService { @Override public QueryWrapper getWrapper(Map params){ @@ -20,4 +22,14 @@ public class CbamProductAllocationServiceImpl extends BaseServiceImpl batchSaveOrUpdate(List list) { + //先删除 + List industryIds = list.stream().map(CbamProductAllocationDTO::getIndustryId).toList(); + mapper.deleteByQuery(QueryWrapper.create().in(CbamProductAllocationEntity::getIndustryId, industryIds)); + //再插入 + List cbamProductAllocationEntities = ConvertUtils.sourceToTarget(list, CbamProductAllocationEntity.class); + mapper.insertBatch(cbamProductAllocationEntities); + return ConvertUtils.sourceToTarget(cbamProductAllocationEntities, CbamProductAllocationDTO.class); + } } diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductElectricityServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductElectricityServiceImpl.java deleted file mode 100644 index 1e21be7..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductElectricityServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.thing.cbam.production.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.production.entity.CbamProductElectricityEntity; -import com.thing.cbam.production.mapper.CbamProductElectricityMapper; -import com.thing.cbam.production.service.CbamProductElectricityService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public class CbamProductElectricityServiceImpl extends BaseServiceImpl implements CbamProductElectricityService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductExhaustEmissionsServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductExhaustEmissionsServiceImpl.java deleted file mode 100644 index e19e8a5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductExhaustEmissionsServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.thing.cbam.production.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.production.entity.CbamProductExhaustEmissionsEntity; -import com.thing.cbam.production.mapper.CbamProductExhaustEmissionsMapper; -import com.thing.cbam.production.service.CbamProductExhaustEmissionsService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public class CbamProductExhaustEmissionsServiceImpl extends BaseServiceImpl -implements CbamProductExhaustEmissionsService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductHeatEmissionsServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductHeatEmissionsServiceImpl.java deleted file mode 100644 index a8497b4..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductHeatEmissionsServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.thing.cbam.production.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.production.entity.CbamProductHeatEmissionsEntity; -import com.thing.cbam.production.mapper.CbamProductHeatEmissionsMapper; -import com.thing.cbam.production.service.CbamProductHeatEmissionsService; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 发热量排放 - * - * @author xc - * @since 3.0 2024-11-28 - */ - -@Service -public class CbamProductHeatEmissionsServiceImpl extends BaseServiceImpl implements CbamProductHeatEmissionsService{ - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } -} \ No newline at end of file From bc630b002529dbb6bb0d55a5cfd9908f389ce5ec Mon Sep 17 00:00:00 2001 From: jiangc <12345678> Date: Thu, 5 Dec 2024 14:38:30 +0800 Subject: [PATCH 12/19] =?UTF-8?q?2024=E5=B9=B412=E6=9C=885=E6=97=A514:38:2?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CbamCountryDictController.java | 1 + .../controller/CbamFactorDictController.java | 81 +++++++++++++++++++ .../cbam/dict/dto/CbamCountryDictDTO.java | 5 +- .../cbam/dict/dto/CbamFactorDictDTO.java | 34 ++++++++ .../dict/entity/CbamCountryDictEntity.java | 4 +- .../dict/entity/CbamFactorDictEntity.java | 43 ++++++++++ .../dict/mapper/CbamFactorDictMapper.java | 9 +++ .../dict/service/CbamFactorDictService.java | 7 ++ .../impl/CbamFactorDictServiceImpl.java | 19 +++++ .../CbamElectricityToolController.java | 45 ++++------- .../dto/CbamElectricityToolDTO.java | 28 ++++++- .../entity/CbamElectricityToolEntity.java | 46 ++++++++++- .../service/CbamElectricityToolService.java | 6 ++ .../Impl/CbamElectricityToolServiceImpl.java | 35 +++++++- .../CbamMaterialConsumptionController.java | 73 +++++++++++++++++ .../CbamMaterialSpecificController.java | 76 +++++++++++++++++ .../dto/CbamMaterialConsumptionDTO.java | 42 ++++++++++ .../material/dto/CbamMaterialSpecificDTO.java | 50 ++++++++++++ .../entity/CbamMaterialConsumptionEntity.java | 59 ++++++++++++++ .../entity/CbamMaterialSpecificEntity.java | 76 +++++++++++++++++ .../mapper/CbamMaterialConsumptionMapper.java | 9 +++ .../mapper/CbamMaterialSpecificMapper.java | 11 +++ .../CbamMaterialConsumptionService.java | 9 +++ .../service/CbamMaterialSpecificService.java | 11 +++ .../CbamMaterialConsumptionServiceImpl.java | 23 ++++++ .../Impl/CbamMaterialSpecificServiceImpl.java | 33 ++++++++ 26 files changed, 794 insertions(+), 41 deletions(-) create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialConsumptionEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialConsumptionMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialConsumptionServiceImpl.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java index ccc15cc..6406910 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java @@ -81,4 +81,5 @@ public class CbamCountryDictController { List list = cbamCountryDictService.listAs(params, CbamCountryDictDTO.class); return new Result>().ok(list); } + } diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java new file mode 100644 index 0000000..e7bc4f8 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java @@ -0,0 +1,81 @@ +package com.thing.cbam.dict.controller; + +import com.thing.cbam.dict.dto.CbamFactorDictDTO; +import com.thing.cbam.dict.service.CbamFactorDictService; +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.web.response.PageData; +import com.thing.common.core.web.response.Result; +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.List; +import java.util.Map; + +@RestController +@RequestMapping("v2/cbam/factor/dict") +@Tag(name = "电力排放因子来源") +@RequiredArgsConstructor +public class CbamFactorDictController { + private final CbamFactorDictService cbamFactorDictService; + + @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 param) { + PageData pageList = cbamFactorDictService.getPageData(param, CbamFactorDictDTO.class); + return new Result>().ok(pageList); + } + + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id) { + CbamFactorDictDTO dto = cbamFactorDictService.getByIdAs(id, CbamFactorDictDTO.class); + return new Result().ok(dto); + } + + @PostMapping + @Operation(summary = "save") + @LogOperation("保存") + public Result save(@RequestBody CbamFactorDictDTO dto) { + cbamFactorDictService.saveDto(dto); + return new Result<>(); + } + @PutMapping + @Operation(summary = "update") + @LogOperation("修改") + public Result update(@RequestBody CbamFactorDictDTO dto) { + cbamFactorDictService.updateDto(dto); + return new Result<>(); + } + @DeleteMapping + @Operation(summary = "delete") + @LogOperation("删除") + public Result update(@RequestBody Long[] ids) { + AssertUtils.isArrayEmpty(ids,"id"); + cbamFactorDictService.batchDelete(ids); + return new Result<>(); + } + + + @GetMapping("list") + @Operation(summary = "电力排放因子来源") + @Parameters({ + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> list(@Parameter(hidden = true) @RequestParam Map params){ + List list = cbamFactorDictService.listAs(params, CbamFactorDictDTO.class); + return new Result>().ok(list); + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java index c777548..ff94feb 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java @@ -1,5 +1,8 @@ package com.thing.cbam.dict.dto; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.core.keygen.KeyGenerators; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -19,7 +22,7 @@ public class CbamCountryDictDTO implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Schema(description = "主键") + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; @Schema(description = "国家名称") private String name; diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java new file mode 100644 index 0000000..717d429 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java @@ -0,0 +1,34 @@ +package com.thing.cbam.dict.dto; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.core.keygen.KeyGenerators; +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-12-05 +*/ +@Data +@Schema(description = "电力排放因子来源字典表") +public class CbamFactorDictDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + @Schema(description = "名称") + private String name; + @Schema(description = "说明") + private String description; + @Schema(description = "排序") + private String sort; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java index c77eda4..e454e06 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java @@ -1,8 +1,10 @@ package com.thing.cbam.dict.entity; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; +import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -27,7 +29,7 @@ public class CbamCountryDictEntity implements Serializable { /** * 主键 */ - @Id + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; /** * 国家名称 diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java new file mode 100644 index 0000000..021554a --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java @@ -0,0 +1,43 @@ +package com.thing.cbam.dict.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; + +import com.mybatisflex.core.keygen.KeyGenerators; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 电力排放因子来源字典表 + * + * @author xc + * @since 3.0 2024-12-05 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_factor_dict") +public class CbamFactorDictEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + /** + * 名称 + */ + private String name; + /** + * 说明 + */ + private String description; + /** + * 排序 + */ + private String sort; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java new file mode 100644 index 0000000..ef01f74 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java @@ -0,0 +1,9 @@ +package com.thing.cbam.dict.mapper; + +import com.thing.cbam.dict.entity.CbamFactorDictEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamFactorDictMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java new file mode 100644 index 0000000..d23279d --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java @@ -0,0 +1,7 @@ +package com.thing.cbam.dict.service; + +import com.thing.cbam.dict.entity.CbamFactorDictEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamFactorDictService extends IBaseService { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java new file mode 100644 index 0000000..6f0cb2e --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java @@ -0,0 +1,19 @@ +package com.thing.cbam.dict.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.dict.entity.CbamFactorDictEntity; +import com.thing.cbam.dict.mapper.CbamFactorDictMapper; +import com.thing.cbam.dict.service.CbamFactorDictService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class CbamFactorDictServiceImpl extends BaseServiceImpl implements CbamFactorDictService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java index fdda4f7..d7f5ec5 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java @@ -5,9 +5,6 @@ import com.thing.cbam.electricity.service.CbamElectricityToolService; 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.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 io.swagger.v3.oas.annotations.Operation; @@ -20,12 +17,11 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; @RestController -@RequestMapping("v2/electricity/tool") -@Tag(name = "热电联产工具") +@RequestMapping("v2/cbam/electricity/tool") +@Tag(name="热电联产工具") @RequiredArgsConstructor public class CbamElectricityToolController { private final CbamElectricityToolService cbamElectricityToolService; - @GetMapping("page") @Operation(summary = "分页") @Parameters({ @@ -34,16 +30,16 @@ public class CbamElectricityToolController { @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"), @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params) { - PageData page = cbamElectricityToolService.getPageData(params, CbamElectricityToolDTO.class); - return new Result>().ok(page); + public Result> page(@Parameter(hidden = true) @RequestParam Map param) { + PageData pageList = cbamElectricityToolService.getPageData(param,CbamElectricityToolDTO.class); + return new Result>().ok(pageList); } @GetMapping("{id}") @Operation(summary = "信息") - public Result info(@PathVariable("id") String id) { - CbamElectricityToolDTO data=cbamElectricityToolService.getByIdAs(id, CbamElectricityToolDTO.class); - return new Result().ok(data); + public Result info(@PathVariable("id") Long id) { + CbamElectricityToolDTO dto = cbamElectricityToolService.getByIdAs(id,CbamElectricityToolDTO.class); + return new Result().ok(dto); } @PostMapping @Operation(summary = "保存") @@ -53,31 +49,18 @@ public class CbamElectricityToolController { return new Result<>(); } @PutMapping - @Operation(summary="修改") + @Operation(summary = "修改") @LogOperation("修改") - public Result update(@RequestBody CbamElectricityToolDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + public Result update(@RequestBody CbamElectricityToolDTO dto) { cbamElectricityToolService.updateDto(dto); return new Result<>(); } @DeleteMapping - @Operation(summary="删除") + @Operation(summary = "删除") @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); + public Result delete(@RequestBody Long[] ids) { + AssertUtils.isArrayEmpty(ids,"id"); cbamElectricityToolService.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 = cbamProductInfoService.listAs(params, CbamProductInfoDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "综合商品类别和相关生产过程", list, CbamProductInfoExcel.class); - *} - */ - -} \ No newline at end of file +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java index b8f3d55..ce45c27 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java @@ -1,5 +1,8 @@ package com.thing.cbam.electricity.dto; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.core.keygen.KeyGenerators; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -11,7 +14,7 @@ import java.io.Serializable; * 热电联产工具 * * @author xc -* @since 3.0 2024-11-28 +* @since 3.0 2024-12-03 */ @Data @Schema(description = "热电联产工具") @@ -19,6 +22,7 @@ public class CbamElectricityToolDTO implements Serializable { @Serial private static final long serialVersionUID = 1L; + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; @Schema(description = "CHP的燃料投入") private String fuelInput; @@ -31,10 +35,28 @@ public class CbamElectricityToolDTO implements Serializable { @Schema(description = "来自烟气净化过程的燃料投入量") private String gasProcess; @Schema(description = "发热量生产") - private String heatProduction; + private String heatProd; @Schema(description = "电力生产") - private String electProduction; + private String electProd; @Schema(description = "关联cbam_industry_information的主键id") private Long industryId; + @Schema(description = "CHP发电量计算值") + private String calcuPower; + @Schema(description = "排放总量") + private String totalEmiss; + @Schema(description = "发热量电力合计") + private String totalSum; + @Schema(description = "发热量产出引起的排放量") + private String emissHeat; + @Schema(description = "排放因子,发热量") + private String factorHeat; + @Schema(description = "电力排放") + private String electEmiss; + @Schema(description = "排放因子,电力") + private String factorElect; + @Schema(description = "发热量的燃料投入") + private String inputHeat; + @Schema(description = "电力的燃料投入") + private String inputElect; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java index 4a29312..a3b9a3e 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java @@ -1,8 +1,10 @@ package com.thing.cbam.electricity.entity; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; +import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -14,7 +16,7 @@ import java.io.Serializable; * 热电联产工具 * * @author xc - * @since 3.0 2024-11-28 + * @since 3.0 2024-12-03 */ @Data @Accessors(chain = true) @@ -24,7 +26,7 @@ public class CbamElectricityToolEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Id + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; /** * CHP的燃料投入 @@ -49,13 +51,49 @@ public class CbamElectricityToolEntity implements Serializable { /** * 发热量生产 */ - private String heatProduction; + private String heatProd; /** * 电力生产 */ - private String electProduction; + private String electProd; /** * 关联cbam_industry_information的主键id */ private Long industryId; + /** + * CHP发电量计算值 + */ + private String calcuPower; + /** + * 排放总量 + */ + private String totalEmiss; + /** + * 发热量电力合计 + */ + private String totalSum; + /** + * 发热量产出引起的排放量 + */ + private String emissHeat; + /** + * 排放因子,发热量 + */ + private String factorHeat; + /** + * 电力排放 + */ + private String electEmiss; + /** + * 排放因子,电力 + */ + private String factorElect; + /** + * 发热量的燃料投入 + */ + private String inputHeat; + /** + * 电力的燃料投入 + */ + private String inputElect; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java index e49cd23..d14b18d 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java @@ -1,7 +1,13 @@ package com.thing.cbam.electricity.service; + +import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; import com.thing.common.orm.service.IBaseService; +import java.util.LinkedHashMap; + public interface CbamElectricityToolService extends IBaseService { + + LinkedHashMap validateMsg(CbamElectricityToolDTO cbamElectricityToolDTO); } diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java index 5ae500c..a5e162e 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java @@ -1,19 +1,52 @@ package com.thing.cbam.electricity.service.Impl; import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; import com.thing.cbam.electricity.mapper.CbamElectricityToolMapper; import com.thing.cbam.electricity.service.CbamElectricityToolService; import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.LinkedHashMap; import java.util.Map; @Service -public class CbamElectricityToolServiceImpl extends BaseServiceImplimplements CbamElectricityToolService { +public class CbamElectricityToolServiceImpl extends BaseServiceImpl implements CbamElectricityToolService { + @Override public QueryWrapper getWrapper(Map params) { QueryWrapper wrapper = new QueryWrapper(); return wrapper; } + + + @Override + public LinkedHashMap validateMsg(CbamElectricityToolDTO cbamElectricityToolDTO) { + LinkedHashMap resMap = new LinkedHashMap<>(); + if (StringUtils.isBlank(cbamElectricityToolDTO.getFuelInput())){ + resMap.put("fuelInput","CHP的燃料投入不能为空"); + } + if (StringUtils.isBlank(cbamElectricityToolDTO.getHeatingOutput())){ + resMap.put("heatingOutput","CHP的发热量产出不能为空"); + } + if (StringUtils.isBlank(cbamElectricityToolDTO.getPowerGener())){ + resMap.put("powerGener","CHP发电量不能为空"); + } + if (StringUtils.isBlank(cbamElectricityToolDTO.getFuelUnit())){ + resMap.put("fuelUnit","来自CHP机组的燃料投入量不能为空"); + } + if (StringUtils.isBlank(cbamElectricityToolDTO.getGasProcess())){ + resMap.put("gasProcess","来自烟气净化过程的燃料投入量不能为空"); + } + if (StringUtils.isBlank(cbamElectricityToolDTO.getHeatProd())){ + resMap.put("heatProd","发热量生产不能为空"); + } + if (StringUtils.isBlank(cbamElectricityToolDTO.getElectProd())){ + resMap.put("electProd","电力生产不能为空"); + } + + return resMap; + } } diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java new file mode 100644 index 0000000..4ea045f --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java @@ -0,0 +1,73 @@ +package com.thing.cbam.material.controller; + + +import com.thing.cbam.material.dto.CbamMaterialConsumptionDTO; +import com.thing.cbam.material.service.CbamMaterialConsumptionService; +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.web.response.PageData; +import com.thing.common.core.web.response.Result; +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; + +@RestController +@RequestMapping +@Tag(name = "原材料消耗量") +@RequiredArgsConstructor +public class CbamMaterialConsumptionController { + private final CbamMaterialConsumptionService cbamMaterialConsumptionService; + @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 param) { + PageData pageList = cbamMaterialConsumptionService.getPageData(param,CbamMaterialConsumptionDTO.class); + return new Result>().ok(pageList); + } + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id) { + CbamMaterialConsumptionDTO dto = cbamMaterialConsumptionService.getByIdAs(id,CbamMaterialConsumptionDTO.class); + return new Result().ok(dto); + } + + @PostMapping + @Operation(summary = "保存") + @LogOperation("保存") + public Result save(@RequestBody CbamMaterialConsumptionDTO dto) { + cbamMaterialConsumptionService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary = "修改") + @LogOperation("修改") + public Result update(@RequestBody CbamMaterialConsumptionDTO dto) { + //效验数据 + //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamMaterialConsumptionService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary = "删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamMaterialConsumptionService.batchDelete(ids); + return new Result<>(); + } + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java new file mode 100644 index 0000000..ca40c95 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java @@ -0,0 +1,76 @@ +package com.thing.cbam.material.controller; + + +import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; +import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; +import com.thing.cbam.material.service.CbamMaterialSpecificService; +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.web.response.PageData; +import com.thing.common.core.web.response.Result; +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; + +@RestController +@RequestMapping("v2/cbam/material/specific") +@Tag(name = "原材料特定") +@RequiredArgsConstructor +public class CbamMaterialSpecificController { + private final CbamMaterialSpecificService cbamMaterialSpecificService; + + @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 param) { + PageData pageList = cbamMaterialSpecificService.getPageData(param,CbamMaterialSpecificDTO.class); + return new Result>().ok(pageList); + } + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id) { + CbamMaterialSpecificDTO dto = cbamMaterialSpecificService.getByIdAs(id,CbamMaterialSpecificDTO.class); + return new Result().ok(dto); + } + + @PostMapping + @Operation(summary = "保存") + @LogOperation("保存") + public Result save(@RequestBody CbamMaterialSpecificDTO dto) { + cbamMaterialSpecificService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary = "修改") + @LogOperation("修改") + public Result update(@RequestBody CbamMaterialSpecificDTO dto) { + //效验数据 + //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamMaterialSpecificService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary = "删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamMaterialSpecificService.batchDelete(ids); + return new Result<>(); + } + + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java b/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java new file mode 100644 index 0000000..ff81521 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java @@ -0,0 +1,42 @@ +package com.thing.cbam.material.dto; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.core.keygen.KeyGenerators; +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-12-03 +*/ +@Data +@Schema(description = "原材料消耗量") +public class CbamMaterialConsumptionDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + @Schema(description = "采购量") + private String purchaseQuantity; + @Schema(description = "消耗量") + private String consumAmount; + @Schema(description = "非欧盟商品消耗量") + private String consumGoods; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + @Schema(description = "产品名称|生产过程") + private String prodNameProcess; + @Schema(description = "剩余消耗量") + private String remainConsum; + @Schema(description = "关联cbam_process_material的原材料") + private Long materialId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java b/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java new file mode 100644 index 0000000..d1d70b8 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java @@ -0,0 +1,50 @@ +package com.thing.cbam.material.dto; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.core.keygen.KeyGenerators; +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-12-03 +*/ +@Data +@Schema(description = "原材料特定") +public class CbamMaterialSpecificDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + @Schema(description = "SEE(直接) tCO₂e/t") + private String seeDirect; + @Schema(description = "SEE(直接)来源") + private String seeSource; + @Schema(description = "单位耗电量") + private String unitPowerConsum; + @Schema(description = "单位耗电量来源") + private String consumSource; + @Schema(description = "电力排放因子") + private String electEmissionFactor; + @Schema(description = "电力排放因子来源") + private String factorSource; + @Schema(description = "关联cbam_industry_information的主键id") + private Long industryId; + @Schema(description = "生产路线") + private String prodRoute; + @Schema(description = "产品名称|生产过程") + private String prodNameProcess; + @Schema(description = "SEE(间接) tCO₂e/t") + private String seeIndirect; + @Schema(description = "关联cbam_process_material的原材料") + private Long materialId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialConsumptionEntity.java b/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialConsumptionEntity.java new file mode 100644 index 0000000..653aed9 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialConsumptionEntity.java @@ -0,0 +1,59 @@ +package com.thing.cbam.material.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; + +import com.mybatisflex.core.keygen.KeyGenerators; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 原材料消耗量 + * + * @author xc + * @since 3.0 2024-12-03 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_material_consumption") +public class CbamMaterialConsumptionEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + /** + * 采购量 + */ + private String purchaseQuantity; + /** + * 消耗量 + */ + private String consumAmount; + /** + * 非欧盟商品消耗量 + */ + private String consumGoods; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; + /** + * 产品名称|生产过程 + */ + private String prodNameProcess; + /** + * 剩余消耗量 + */ + private String remainConsum; + /** + * 关联cbam_process_material的原材料 + */ + private Long materialId; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java b/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java new file mode 100644 index 0000000..e5fa3e6 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java @@ -0,0 +1,76 @@ +package com.thing.cbam.material.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; + +import com.mybatisflex.core.keygen.KeyGenerators; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 购买的原材料 + * + * @author xc + * @since 3.0 2024-12-03 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_material_specific") +public class CbamMaterialSpecificEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + /** + * SEE(直接) tCO₂e/t + */ + private String seeDirect; + /** + * SEE(直接)来源 + */ + private String seeSource; + /** + * 单位耗电量 + */ + private String unitPowerConsum; + /** + * 单位耗电量来源 + */ + private String consumSource; + /** + * 电力排放因子 + */ + private String electEmissionFactor; + /** + * 电力排放因子来源 + */ + private String factorSource; + /** + * 关联cbam_industry_information的主键id + */ + private Long industryId; + /** + * 生产路线 + */ + private String prodRoute; + /** + * 产品名称|生产过程 + */ + private String prodNameProcess; + /** + * SEE(间接) tCO₂e/t + */ + private String seeIndirect; + /** + * 关联cbam_process_material的原材料 + */ + private Long materialId; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialConsumptionMapper.java b/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialConsumptionMapper.java new file mode 100644 index 0000000..fe37bc4 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialConsumptionMapper.java @@ -0,0 +1,9 @@ +package com.thing.cbam.material.mapper; + +import com.thing.cbam.material.entity.CbamMaterialConsumptionEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CbamMaterialConsumptionMapper extends PowerBaseMapper { +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java b/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java new file mode 100644 index 0000000..f326255 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java @@ -0,0 +1,11 @@ +package com.thing.cbam.material.mapper; + +import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +public interface CbamMaterialSpecificMapper extends PowerBaseMapper { + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java new file mode 100644 index 0000000..1d00f1d --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java @@ -0,0 +1,9 @@ +package com.thing.cbam.material.service; + +import com.thing.cbam.material.dto.CbamMaterialConsumptionDTO; +import com.thing.cbam.material.entity.CbamMaterialConsumptionEntity; +import com.thing.common.orm.service.IBaseService; + +public interface CbamMaterialConsumptionService extends IBaseService { + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java new file mode 100644 index 0000000..cd541b5 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java @@ -0,0 +1,11 @@ +package com.thing.cbam.material.service; + +import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; +import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; +import com.thing.common.orm.service.IBaseService; + +import java.util.LinkedHashMap; + +public interface CbamMaterialSpecificService extends IBaseService { + LinkedHashMap validateMsg(CbamMaterialSpecificDTO cbamMaterialSpecificDTO); +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialConsumptionServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialConsumptionServiceImpl.java new file mode 100644 index 0000000..360bdf7 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialConsumptionServiceImpl.java @@ -0,0 +1,23 @@ +package com.thing.cbam.material.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.material.dto.CbamMaterialConsumptionDTO; +import com.thing.cbam.material.entity.CbamMaterialConsumptionEntity; +import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; +import com.thing.cbam.material.mapper.CbamMaterialConsumptionMapper; +import com.thing.cbam.material.mapper.CbamMaterialSpecificMapper; +import com.thing.cbam.material.service.CbamMaterialConsumptionService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class CbamMaterialConsumptionServiceImpl extends BaseServiceImpl implements CbamMaterialConsumptionService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java new file mode 100644 index 0000000..4ad22b1 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java @@ -0,0 +1,33 @@ +package com.thing.cbam.material.service.Impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.electricity.mapper.CbamElectricityToolMapper; +import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; +import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; +import com.thing.cbam.material.mapper.CbamMaterialSpecificMapper; +import com.thing.cbam.material.service.CbamMaterialSpecificService; +import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.LinkedHashMap; +import java.util.Map; + +@Service +public class CbamMaterialSpecificServiceImpl extends BaseServiceImpl implements CbamMaterialSpecificService { + @Override + public QueryWrapper getWrapper(Map params) { + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + @Override + public LinkedHashMap validateMsg(CbamMaterialSpecificDTO cbamMaterialSpecificDTO) { + LinkedHashMap resultMap = new LinkedHashMap<>(); + if (StringUtils.isBlank(cbamMaterialSpecificDTO.getSeeDirect())){ + resultMap.put("seeDirect","SEE(直接)不能为空"); + } + + return resultMap; + } +} From fa607a785d8f69ec9dab692c5b4323276299d955 Mon Sep 17 00:00:00 2001 From: jiangc <12345678> Date: Thu, 5 Dec 2024 14:49:52 +0800 Subject: [PATCH 13/19] =?UTF-8?q?2024=E5=B9=B412=E6=9C=885=E6=97=A514:49:4?= =?UTF-8?q?7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CbamCarbonPowerProgressAllocationController.java | 2 +- .../controller/CbamPowerSummaryFuelController.java | 2 +- .../material/controller/CbamMaterialConsumptionController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java index bc39f86..909e632 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java @@ -28,7 +28,7 @@ import java.util.Map; * @since 3.0 2024-11-28 */ @RestController -@RequestMapping("v2/耗电量分配/cbamcarbonpowerprogressallocation") +@RequestMapping("v2/cbamcarbonpowerprogressallocation") @Tag(name="耗电量分配") @RequiredArgsConstructor public class CbamCarbonPowerProgressAllocationController { diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java index fa665f9..dfbfa74 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java @@ -29,7 +29,7 @@ import java.util.Map; */ @RestController @RequestMapping("v2/cbam/powersummary") -@Tag(name="排放量汇总与数据质量信息 与 燃料平衡") +@Tag(name="排放量汇总与数据质量信息与燃料平衡") @RequiredArgsConstructor public class CbamPowerSummaryFuelController { diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java index 4ea045f..3b1c51a 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; @RestController -@RequestMapping +@RequestMapping("v2/cbam/material/consume") @Tag(name = "原材料消耗量") @RequiredArgsConstructor public class CbamMaterialConsumptionController { From 029e4a3c8909e741cfd0b5745243feceb1fb088c Mon Sep 17 00:00:00 2001 From: lishuai Date: Thu, 5 Dec 2024 15:12:50 +0800 Subject: [PATCH 14/19] =?UTF-8?q?E=E8=A1=A8=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=202024=E5=B9=B412=E6=9C=885=E6=97=A515:12:46?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CbamMaterialConsumptionController.java | 73 ------------------- .../CbamMaterialSpecificController.java | 1 - .../dto/CbamMaterialConsumptionDTO.java | 42 ----------- .../entity/CbamMaterialConsumptionEntity.java | 59 --------------- .../mapper/CbamMaterialConsumptionMapper.java | 9 --- .../CbamMaterialConsumptionService.java | 9 --- .../service/CbamMaterialSpecificService.java | 5 ++ .../CbamMaterialConsumptionServiceImpl.java | 23 ------ .../Impl/CbamMaterialSpecificServiceImpl.java | 13 ++++ .../dto/CbamProductAllocationDTO.java | 2 +- .../entity/CbamProductAllocationEntity.java | 2 +- 11 files changed, 20 insertions(+), 218 deletions(-) delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialConsumptionEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialConsumptionMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialConsumptionServiceImpl.java diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java deleted file mode 100644 index 3b1c51a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.thing.cbam.material.controller; - - -import com.thing.cbam.material.dto.CbamMaterialConsumptionDTO; -import com.thing.cbam.material.service.CbamMaterialConsumptionService; -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.web.response.PageData; -import com.thing.common.core.web.response.Result; -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; - -@RestController -@RequestMapping("v2/cbam/material/consume") -@Tag(name = "原材料消耗量") -@RequiredArgsConstructor -public class CbamMaterialConsumptionController { - private final CbamMaterialConsumptionService cbamMaterialConsumptionService; - @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 param) { - PageData pageList = cbamMaterialConsumptionService.getPageData(param,CbamMaterialConsumptionDTO.class); - return new Result>().ok(pageList); - } - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamMaterialConsumptionDTO dto = cbamMaterialConsumptionService.getByIdAs(id,CbamMaterialConsumptionDTO.class); - return new Result().ok(dto); - } - - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamMaterialConsumptionDTO dto) { - cbamMaterialConsumptionService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamMaterialConsumptionDTO dto) { - //效验数据 - //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamMaterialConsumptionService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamMaterialConsumptionService.batchDelete(ids); - return new Result<>(); - } - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java index ca40c95..1d27c40 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java @@ -1,7 +1,6 @@ package com.thing.cbam.material.controller; -import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; import com.thing.cbam.material.service.CbamMaterialSpecificService; import com.thing.common.core.annotation.LogOperation; diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java b/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java deleted file mode 100644 index ff81521..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.thing.cbam.material.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -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-12-03 -*/ -@Data -@Schema(description = "原材料消耗量") -public class CbamMaterialConsumptionDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "采购量") - private String purchaseQuantity; - @Schema(description = "消耗量") - private String consumAmount; - @Schema(description = "非欧盟商品消耗量") - private String consumGoods; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "产品名称|生产过程") - private String prodNameProcess; - @Schema(description = "剩余消耗量") - private String remainConsum; - @Schema(description = "关联cbam_process_material的原材料") - private Long materialId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialConsumptionEntity.java b/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialConsumptionEntity.java deleted file mode 100644 index 653aed9..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialConsumptionEntity.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.thing.cbam.material.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 原材料消耗量 - * - * @author xc - * @since 3.0 2024-12-03 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_material_consumption") -public class CbamMaterialConsumptionEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 采购量 - */ - private String purchaseQuantity; - /** - * 消耗量 - */ - private String consumAmount; - /** - * 非欧盟商品消耗量 - */ - private String consumGoods; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 产品名称|生产过程 - */ - private String prodNameProcess; - /** - * 剩余消耗量 - */ - private String remainConsum; - /** - * 关联cbam_process_material的原材料 - */ - private Long materialId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialConsumptionMapper.java b/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialConsumptionMapper.java deleted file mode 100644 index fe37bc4..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialConsumptionMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.material.mapper; - -import com.thing.cbam.material.entity.CbamMaterialConsumptionEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamMaterialConsumptionMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java deleted file mode 100644 index 1d00f1d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.material.service; - -import com.thing.cbam.material.dto.CbamMaterialConsumptionDTO; -import com.thing.cbam.material.entity.CbamMaterialConsumptionEntity; -import com.thing.common.orm.service.IBaseService; - -public interface CbamMaterialConsumptionService extends IBaseService { - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java index cd541b5..50ddceb 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java @@ -5,7 +5,12 @@ import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; import com.thing.common.orm.service.IBaseService; import java.util.LinkedHashMap; +import java.util.List; public interface CbamMaterialSpecificService extends IBaseService { + + List batchSaveOrUpdate(List cbamMaterialSpecificDTOList); + + LinkedHashMap validateMsg(CbamMaterialSpecificDTO cbamMaterialSpecificDTO); } diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialConsumptionServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialConsumptionServiceImpl.java deleted file mode 100644 index 360bdf7..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialConsumptionServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.thing.cbam.material.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.material.dto.CbamMaterialConsumptionDTO; -import com.thing.cbam.material.entity.CbamMaterialConsumptionEntity; -import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; -import com.thing.cbam.material.mapper.CbamMaterialConsumptionMapper; -import com.thing.cbam.material.mapper.CbamMaterialSpecificMapper; -import com.thing.cbam.material.service.CbamMaterialConsumptionService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public class CbamMaterialConsumptionServiceImpl extends BaseServiceImpl implements CbamMaterialConsumptionService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java index 4ad22b1..56f102e 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java @@ -6,11 +6,13 @@ import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; import com.thing.cbam.material.mapper.CbamMaterialSpecificMapper; import com.thing.cbam.material.service.CbamMaterialSpecificService; +import com.thing.common.core.utils.ConvertUtils; import com.thing.common.orm.service.impl.BaseServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; @Service @@ -21,6 +23,17 @@ public class CbamMaterialSpecificServiceImpl extends BaseServiceImpl batchSaveOrUpdate(List cbamMaterialSpecificDTOList) { + //先删除 + List industryIds = cbamMaterialSpecificDTOList.stream().map(CbamMaterialSpecificDTO::getIndustryId).toList(); + mapper.deleteByQuery(QueryWrapper.create().in(CbamMaterialSpecificEntity::getIndustryId,industryIds)); + //再批量新增 + List cbamMaterialSpecificEntities = ConvertUtils.sourceToTarget(cbamMaterialSpecificDTOList, CbamMaterialSpecificEntity.class); + mapper.insertBatch(cbamMaterialSpecificEntities); + return ConvertUtils.sourceToTarget(cbamMaterialSpecificEntities, CbamMaterialSpecificDTO.class); + } + @Override public LinkedHashMap validateMsg(CbamMaterialSpecificDTO cbamMaterialSpecificDTO) { LinkedHashMap resultMap = new LinkedHashMap<>(); diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java index a0bc23f..43bd2ea 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java @@ -41,7 +41,7 @@ public class CbamProductAllocationDTO implements Serializable { private String salesVolume; @Schema(description = "剩余消耗量") private String remainConsume; - @Schema(description = "总产量") + @Schema(description = "总产量/输出总量/采购量") private String totalOutput; @Schema(description = "关联cbam_industry_info的主键id") private Long industryId; diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java index 4a1e416..078f1cf 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java @@ -78,7 +78,7 @@ public class CbamProductAllocationEntity implements Serializable { */ private String electricityEmissionFactor; /** - * 总产量 + * d总产量/输出总量/E采购量 */ private String totalOutput; /** From 9a6b707899479997c97f2c257414010ad2a79b57 Mon Sep 17 00:00:00 2001 From: jiangc <12345678> Date: Thu, 5 Dec 2024 17:33:50 +0800 Subject: [PATCH 15/19] =?UTF-8?q?2024=E5=B9=B412=E6=9C=885=E6=97=A517:33:1?= =?UTF-8?q?8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CbamCarbonPriceToolController.java | 2 +- .../dto/CbamCarbonPriceToolDTO.java | 23 ++++ .../entity/CbamCarbonPriceToolEntity.java | 37 +++++- .../service/CbamCarbonPriceToolService.java | 6 + .../Impl/CbamCarbonPriceToolServiceImpl.java | 41 +++++++ ...CbamCarbonPriceCurrencyDictController.java | 110 ++++++++++++++++++ .../dto/CbamCarbonPriceCurrencyDictDTO.java | 34 ++++++ .../cbam/dict/dto/CbamFactorDictDTO.java | 2 +- .../CbamCarbonPriceCurrencyDictEntity.java | 43 +++++++ .../dict/entity/CbamFactorDictEntity.java | 2 +- .../CbamCarbonPriceCurrencyDictMapper.java | 17 +++ .../CbamCarbonPriceCurrencyDictService.java | 15 +++ ...bamCarbonPriceCurrencyDictServiceImpl.java | 29 +++++ .../dto/CbamCarbonProgressDTO.java | 4 + .../service/CbamMaterialSpecificService.java | 1 + 15 files changed, 362 insertions(+), 4 deletions(-) create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java index a61c54b..30f95e4 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java @@ -43,7 +43,6 @@ public class CbamCarbonPriceToolController { } @GetMapping("{id}") @Operation(summary = "信息") - @LogOperation("信息") public Result info(@PathVariable("id") String id) { CbamCarbonPriceToolDTO dto = cbamCarbonPriceToolServicevice.getByIdAs(id, CbamCarbonPriceToolDTO.class); return new Result().ok(dto); @@ -73,6 +72,7 @@ public class CbamCarbonPriceToolController { cbamCarbonPriceToolServicevice.batchDelete(ids); return new Result<>(); } + /** *@GetMapping("export") *@Operation(summary="导出") diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java index 806a718..5986c3f 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java @@ -1,5 +1,8 @@ package com.thing.cbam.carbonPrice.dto; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.core.keygen.KeyGenerators; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -19,6 +22,7 @@ public class CbamCarbonPriceToolDTO implements Serializable { @Serial private static final long serialVersionUID = 1L; + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; @Schema(description = "碳价工具") private String priceTool; @@ -34,5 +38,24 @@ public class CbamCarbonPriceToolDTO implements Serializable { private String deductionAmount; @Schema(description = "关联cbam_industry_information的主键id") private Long industryId; + @Schema(description = "生产过程") + private String productionProcess; + @Schema(description = "综合商品类别") + private String productCategories; + @Schema(description = "SE涵盖范围") + private String seCoverage; + @Schema(description = "抵扣金额(CNY/t)") + private String deductionAmountCny; + @Schema(description = "预期碳价(CNY/t)") + private String expectedPrice; + @Schema(description = "结果:有效的预期碳价") + private String effectivePrice; + @Schema(description = "关联cbam_process_material的生产过程") + private String process_id; + @Schema(description = "排序") + private Long sort; + + + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java index d560848..fa19c01 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java @@ -1,8 +1,10 @@ package com.thing.cbam.carbonPrice.entity; import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; +import com.mybatisflex.core.keygen.KeyGenerators; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -24,7 +26,7 @@ public class CbamCarbonPriceToolEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Id + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; /** * 碳价工具 @@ -54,4 +56,37 @@ public class CbamCarbonPriceToolEntity implements Serializable { * 关联cbam_industry_information的主键id */ private Long industryId; + /** + * 生产过程 + */ + private String productionProcess; + /** + * 综合商品类别 + */ + private String productCategories; + /** + * SE涵盖范围 + */ + private String seCoverage; + /** + * 抵扣金额(CNY/t) + */ + private String deductionAmountCny; + /** + * 预期碳价(CNY/t) + */ + private String expectedPrice; + /** + * 结果:有效的预期碳价 + */ + private String effectivePrice; + /** + * 关联cbam_process_material的生产过程 + */ + private String process_id; + /** + * 排序 + */ + private Long sort; + } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java index 07af157..96335e1 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java @@ -1,7 +1,13 @@ package com.thing.cbam.carbonPrice.service; +import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; +import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO; import com.thing.common.orm.service.IBaseService; +import java.util.LinkedHashMap; +import java.util.List; + public interface CbamCarbonPriceToolService extends IBaseService { + LinkedHashMap valiteMsg(CbamCarbonPriceToolDTO cbamCarbonPriceToolDTO); } diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java index 764a54b..fb5bc2c 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java @@ -1,19 +1,60 @@ package com.thing.cbam.carbonPrice.service.Impl; +import cn.hutool.core.collection.CollectionUtil; +import com.clickhouse.client.internal.google.common.collect.Maps; import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; +import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; +import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; import com.thing.cbam.carbonPrice.mapper.CbamCarbonPriceToolMapper; import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService; +import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO; +import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService; import com.thing.common.orm.service.impl.BaseServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; @Service public class CbamCarbonPriceToolServiceImpl extends BaseServiceImpl implements CbamCarbonPriceToolService { + private final CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService; + + public CbamCarbonPriceToolServiceImpl(CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService) { + super(); + this.cbamCarbonPriceCurrencyDictService = cbamCarbonPriceCurrencyDictService; + } + @Override public QueryWrapper getWrapper(Map params) { QueryWrapper wrapper = new QueryWrapper(); return wrapper; } + + @Override + public LinkedHashMap valiteMsg(CbamCarbonPriceToolDTO cbamCarbonPriceToolDTO) { + LinkedHashMap resMap = new LinkedHashMap<>(); + if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getPriceTool())) { + resMap.put("priceTool", "碳价工具不能为空"); + } + if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getOtherInfo())){ + resMap.put("otherInfo","其他附加信息不能为空"); + } + List cbamCarbonPriceCurrencyDictDTOS = cbamCarbonPriceCurrencyDictService.listAs(Maps.newHashMap(), CbamCarbonPriceCurrencyDictDTO.class); + if (CollectionUtil.isEmpty(cbamCarbonPriceCurrencyDictDTOS)) { + resMap.put("currency","货币不能为空"); + } + if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getCarbonPrice())){ + resMap.put("carbonPrice","国内碳价不能为空"); + } + if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getDeductionAmount())){ + resMap.put("deductionAmount","抵扣金额(当地货币)不能为空"); + } + return resMap; + } + } diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java new file mode 100644 index 0000000..b7f41da --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java @@ -0,0 +1,110 @@ +package com.thing.cbam.dict.controller; + +import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO; +import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService; +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 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.List; +import java.util.Map; + +/** +* 计算碳价的工具货币字典表 +* +* @author xc +* @since 3.0 2024-12-05 +*/ +@RestController +@RequestMapping("v2/cbamcarbonpricecurrencydict") +@Tag(name="计算碳价的工具货币字典表") +@RequiredArgsConstructor +public class CbamCarbonPriceCurrencyDictController { + + private final CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService; + + @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 = cbamCarbonPriceCurrencyDictService.getPageData(params, CbamCarbonPriceCurrencyDictDTO.class); + return new Result>().ok(page); + } + + @GetMapping("{id}") + @Operation(summary="信息") + public Result get(@PathVariable("id") Long id){ + CbamCarbonPriceCurrencyDictDTO data = cbamCarbonPriceCurrencyDictService.getByIdAs(id, CbamCarbonPriceCurrencyDictDTO.class); + return new Result().ok(data); + } + + @PostMapping + @Operation(summary="保存") + @LogOperation("保存") + public Result save(@RequestBody CbamCarbonPriceCurrencyDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + cbamCarbonPriceCurrencyDictService.saveDto(dto); + return new Result<>(); + } + + @PutMapping + @Operation(summary="修改") + @LogOperation("修改") + public Result update(@RequestBody CbamCarbonPriceCurrencyDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + cbamCarbonPriceCurrencyDictService.updateDto(dto); + return new Result<>(); + } + + @DeleteMapping + @Operation(summary="删除") + @LogOperation("删除") + public Result delete(@RequestBody Long[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + cbamCarbonPriceCurrencyDictService.batchDelete(ids); + return new Result<>(); + } + @GetMapping("list") + @Operation(summary = "货币字典表") + @Parameters({ + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + }) + public Result> list(@Parameter(hidden = true) @RequestParam Map params){ + List list = cbamCarbonPriceCurrencyDictService.listAs(params, CbamCarbonPriceCurrencyDictDTO.class); + return new Result>().ok(list); + } + + /** + *@GetMapping("export") + *@Operation(summary="导出") + *@LogOperation("导出") + *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { + * List list = cbamCarbonPriceCurrencyDictService.listAs(params, CbamCarbonPriceCurrencyDictDTO.class); + * //ExcelUtils.exportExcelToTarget(response, null, "计算碳价的工具货币字典表", list, CbamCarbonPriceCurrencyDictExcel.class); + *} + */ + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java new file mode 100644 index 0000000..3815396 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java @@ -0,0 +1,34 @@ +package com.thing.cbam.dict.dto; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.core.keygen.KeyGenerators; +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-12-05 +*/ +@Data +@Schema(description = "计算碳价的工具货币字典表") +public class CbamCarbonPriceCurrencyDictDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + @Schema(description = "货币中文名称") + private String name; + @Schema(description = "货币英文名称") + private String ename; + @Schema(description = "排序") + private Long sort; + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java index 717d429..4851924 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java @@ -29,6 +29,6 @@ public class CbamFactorDictDTO implements Serializable { @Schema(description = "说明") private String description; @Schema(description = "排序") - private String sort; + private Long sort; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java new file mode 100644 index 0000000..969ec0b --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java @@ -0,0 +1,43 @@ +package com.thing.cbam.dict.entity; + +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; + +import com.mybatisflex.core.keygen.KeyGenerators; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 计算碳价的工具货币字典表 + * + * @author xc + * @since 3.0 2024-12-05 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) +@Table("cbam_carbon_price_currency_dict") +public class CbamCarbonPriceCurrencyDictEntity implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) + private Long id; + /** + * 货币中文名称 + */ + private String name; + /** + * 货币英文名称 + */ + private String ename; + /** + * 排序 + */ + private Long sort; +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java index 021554a..0bfe57b 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java @@ -39,5 +39,5 @@ public class CbamFactorDictEntity implements Serializable { /** * 排序 */ - private String sort; + private Long sort; } \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java new file mode 100644 index 0000000..4665ecd --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java @@ -0,0 +1,17 @@ +package com.thing.cbam.dict.mapper; + +import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity; +import com.thing.common.orm.mapper.PowerBaseMapper; + +import org.apache.ibatis.annotations.Mapper; + +/** +* 计算碳价的工具货币字典表 +* +* @author xc +* @since 3.0 2024-12-05 +*/ +@Mapper +public interface CbamCarbonPriceCurrencyDictMapper extends PowerBaseMapper { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java new file mode 100644 index 0000000..938d414 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java @@ -0,0 +1,15 @@ +package com.thing.cbam.dict.service; + +import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity; +import com.thing.common.orm.service.IBaseService; + + +/** + * 计算碳价的工具货币字典表 + * + * @author xc + * @since 3.0 2024-12-05 + */ +public interface CbamCarbonPriceCurrencyDictService extends IBaseService { + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java new file mode 100644 index 0000000..c61dd10 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java @@ -0,0 +1,29 @@ +package com.thing.cbam.dict.service.impl; + +import com.mybatisflex.core.query.QueryWrapper; +import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity; +import com.thing.cbam.dict.mapper.CbamCarbonPriceCurrencyDictMapper; +import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService; +import com.thing.common.orm.service.impl.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * 计算碳价的工具货币字典表 + * + * @author xc + * @since 3.0 2024-12-05 + */ +@Service +public class CbamCarbonPriceCurrencyDictServiceImpl extends BaseServiceImpl implements CbamCarbonPriceCurrencyDictService { + + @Override + public QueryWrapper getWrapper(Map params){ + QueryWrapper wrapper = new QueryWrapper(); + return wrapper; + } + + +} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java index 692283b..f403b2c 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java @@ -1,5 +1,8 @@ package com.thing.cbam.directCarbon.dto; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.core.keygen.KeyGenerators; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -19,6 +22,7 @@ public class CbamCarbonProgressDTO implements Serializable { @Serial private static final long serialVersionUID = 1L; + @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; @Schema(description = "名称") private String name; diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java index 50ddceb..513ca0e 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java +++ b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java @@ -12,5 +12,6 @@ public interface CbamMaterialSpecificService extends IBaseService batchSaveOrUpdate(List cbamMaterialSpecificDTOList); + LinkedHashMap validateMsg(CbamMaterialSpecificDTO cbamMaterialSpecificDTO); } From 4edde42019e3d5bac6be8ddddb7af724611f1045 Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 6 Dec 2024 16:52:30 +0800 Subject: [PATCH 16/19] =?UTF-8?q?cbam=E6=95=B4=E4=B8=AA=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=A2=9E=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=202024=E5=B9=B412=E6=9C=886=E6=97=A516:52:27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CbamProcessMaterialController.java | 2 +- .../thing/cbam/context/ContextExcelDTO.java | 24 ++++++++++++ .../cbam/context/ExcelContextManage.java | 39 +++++++++++++++++++ .../com/thing/cbam/context/ExcelTypeDTO.java | 8 ++++ 4 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java create mode 100644 modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java index 45478a8..1a1ced5 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java @@ -28,7 +28,7 @@ import java.util.Map; * @since 3.0 2024-12-02 */ @RestController -@RequestMapping("v2/cbam/processmaterial") +@RequestMapping("v2/cbam/process/material") @Tag(name="综合商品类别和相关生产过程 和 购买的原材料 表") @RequiredArgsConstructor public class CbamProcessMaterialController { diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java b/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java new file mode 100644 index 0000000..78b9bfa --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java @@ -0,0 +1,24 @@ +package com.thing.cbam.context; + +import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; +import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +@Data +@Schema(description = "Excel所有的请求参数") +public class ContextExcelDTO { + + @Schema(description = "CBAM的行业,报告周期，企业信息") + private CbamIndustryDTO industry; + + @Schema(description = "综合商品类别和相关生产过程集合") + private List processList; + + @Schema(description = "购买的原材料集合") + private List materialList; + + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java b/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java new file mode 100644 index 0000000..32eacf6 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java @@ -0,0 +1,39 @@ +package com.thing.cbam.context; + +import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; +import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; +import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; +import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("v2/cbam/context") +@Tag(name = "excel的上下文管理") +@RequiredArgsConstructor +public class ExcelContextManage { + + /** + * A表企业基础信息 + */ + private final CbamIndustryService cbamIndustryService; + + /** + * A表企综合商品类别和相关生产过程 + */ + private final CbamProcessMaterialService cbamProcessMaterialService; + + /** + * A表购买的原材料 + */ + private final CbamProdRouteRelationService cbamProdRouteRelationService; + + /** + * B表是否涉及燃烧排放 + */ + private final CbamCarbonDirectService cbamCarbonDirectService; + + +} diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java b/modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java new file mode 100644 index 0000000..c992989 --- /dev/null +++ b/modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java @@ -0,0 +1,8 @@ +package com.thing.cbam.context; + +public class ExcelTypeDTO { + + + + +} From a55dd2dd7a8ae93455c503f5e9476a09219a43d2 Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 6 Dec 2024 17:44:45 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E6=95=B4=E5=90=88Excel=E7=9A=84=E5=A2=9E?= =?UTF-8?q?=E5=88=A0=E6=94=B9=E6=9F=A5=E8=AF=A2=202024=E5=B9=B412=E6=9C=88?= =?UTF-8?q?6=E6=97=A517:44:42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CbamCarbonPriceToolController.java | 12 ++-- .../dto/CbamCarbonPriceToolDTO.java | 5 -- .../thing/cbam/context/ContextExcelDTO.java | 33 +++++++++++ .../cbam/context/ExcelContextManage.java | 57 ++++++++++++++++++- ...rbonPowerProgressAllocationController.java | 2 +- 5 files changed, 96 insertions(+), 13 deletions(-) diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java index 30f95e4..78cbdc7 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java @@ -27,7 +27,7 @@ import java.util.Map; public class CbamCarbonPriceToolController { @Resource - private CbamCarbonPriceToolService cbamCarbonPriceToolServicevice; + private CbamCarbonPriceToolService cbamCarbonPriceToolService; @GetMapping("page") @Operation(summary = "分页") @@ -38,13 +38,13 @@ public class CbamCarbonPriceToolController { @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") }) public Result> page(@Parameter(hidden = true) @RequestParam Map param) { - PageData pageList = cbamCarbonPriceToolServicevice.getPageData(param, CbamCarbonPriceToolDTO.class); + PageData pageList = cbamCarbonPriceToolService.getPageData(param, CbamCarbonPriceToolDTO.class); return new Result>().ok(pageList); } @GetMapping("{id}") @Operation(summary = "信息") public Result info(@PathVariable("id") String id) { - CbamCarbonPriceToolDTO dto = cbamCarbonPriceToolServicevice.getByIdAs(id, CbamCarbonPriceToolDTO.class); + CbamCarbonPriceToolDTO dto = cbamCarbonPriceToolService.getByIdAs(id, CbamCarbonPriceToolDTO.class); return new Result().ok(dto); } @PostMapping @@ -52,7 +52,7 @@ public class CbamCarbonPriceToolController { @LogOperation("保存") public Result save(@RequestBody CbamCarbonPriceToolDTO dto) { ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonPriceToolServicevice.saveDto(dto); + cbamCarbonPriceToolService.saveDto(dto); return new Result<>(); } @PutMapping @@ -61,7 +61,7 @@ public class CbamCarbonPriceToolController { public Result update(@RequestBody CbamCarbonPriceToolDTO dto) { //实验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonPriceToolServicevice.updateDto(dto); + cbamCarbonPriceToolService.updateDto(dto); return new Result<>(); } @DeleteMapping @@ -69,7 +69,7 @@ public class CbamCarbonPriceToolController { @LogOperation("删除") public Result delete(@RequestBody Long[] ids) { AssertUtils.isArrayEmpty(ids,"id"); - cbamCarbonPriceToolServicevice.batchDelete(ids); + cbamCarbonPriceToolService.batchDelete(ids); return new Result<>(); } diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java index 5986c3f..1e1f14b 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java @@ -1,10 +1,6 @@ package com.thing.cbam.carbonPrice.dto; -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; import io.swagger.v3.oas.annotations.media.Schema; - import lombok.Data; import java.io.Serial; @@ -22,7 +18,6 @@ public class CbamCarbonPriceToolDTO implements Serializable { @Serial private static final long serialVersionUID = 1L; - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) private Long id; @Schema(description = "碳价工具") private String priceTool; diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java b/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java index 78b9bfa..e7bfb8f 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java +++ b/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java @@ -2,6 +2,14 @@ package com.thing.cbam.context; import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; +import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; +import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; +import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; +import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; +import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; +import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; +import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; +import com.thing.cbam.indirectCarbon.dto.CbamPowerSummaryFuelDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -20,5 +28,30 @@ public class ContextExcelDTO { @Schema(description = "购买的原材料集合") private List materialList; + @Schema(description = "是否涉及燃烧排放 和 是否涉及过程排放 和 是否涉及物料平衡 和 是否有连续排放测量系统(CEMS)") + private List carbonDirectList; + + @Schema(description = "全氟化碳PFC排放： 是否涉及斜率法 和 是否涉及过电压法") + private List perfluorinatedCarbonList; + + @Schema(description = "各生产过程中原材料/燃料的分配") + private List processAllocationList; + + @Schema(description = "间接排放量") + private List carbonIndirectEmissionsList; + + @Schema(description = "各生产过程中耗电量的分配") + private List carbonPowerProgressAllocationList; + + @Schema(description = "排放量汇总与数据质量信息 和 燃料平衡 ") + private CbamPowerSummaryFuelDTO powerSummaryFuel; + + @Schema(description = "热电联产工具 ") + private CbamElectricityToolDTO electricityTool; + + @Schema(description = "碳价工具 ") + private CbamCarbonPriceToolDTO dto; + + } diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java b/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java index 32eacf6..2a2d38a 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java +++ b/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java @@ -3,8 +3,18 @@ package com.thing.cbam.context; import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; +import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService; import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; +import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; +import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; +import com.thing.cbam.electricity.service.CbamElectricityToolService; +import com.thing.cbam.indirectCarbon.service.CbamCarbonIndirectEmissionsService; +import com.thing.cbam.indirectCarbon.service.CbamCarbonPowerProgressAllocationService; +import com.thing.cbam.indirectCarbon.service.CbamPowerSummaryFuelService; +import com.thing.cbam.material.service.CbamMaterialSpecificService; +import com.thing.cbam.production.service.CbamProductAllocationService; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -31,9 +41,54 @@ public class ExcelContextManage { private final CbamProdRouteRelationService cbamProdRouteRelationService; /** - * B表是否涉及燃烧排放 + * B表 是否涉及燃烧排放 和 是否涉及过程排放 和 是否涉及物料平衡 和 是否有连续排放测量系统(CEMS) */ private final CbamCarbonDirectService cbamCarbonDirectService; + /** + * B表 全氟化碳PFC排放： 是否涉及斜率法 和 是否涉及过电压法 + */ + private final CbamPerfluorinatedCarbonService cbamPerfluorinatedCarbonService; + + /** + * B表--各生产过程中原材料/燃料的分配 + */ + private final CbamProcessAllocationService cbamProcessAllocationService; + + + /** + * c表--间接排放量 + */ + private final CbamCarbonIndirectEmissionsService cbamCarbonIndirectEmissionsService; + + /** + * c表-- 各生产过程中耗电量的分配 + */ + private final CbamCarbonPowerProgressAllocationService cbamCarbonPowerProgressAllocationService; + + /** + * c表-- 排放量汇总与数据质量信息 和 燃料平衡 + */ + private final CbamPowerSummaryFuelService cbamPowerSummaryFuelService; + + /** + * d表-- 各生产过程中产品的分配 / 可测量的发热量排放量 / 废气排放量 /生产过程输出的电力 + */ + private final CbamProductAllocationService cbamProductAllocationService; + + /** + * E表-- 原材料特定隐含排放SEE /各生产过程中原材料的消耗量 + */ + private final CbamMaterialSpecificService cbamMaterialSpecificService; + + /** + * F表-- 热电联产（CHP）计算工具 以下所有 + */ + private final CbamElectricityToolService cbamElectricityToolService; + + /** + * F表-- 计算碳价格工具 + */ + private CbamCarbonPriceToolService carbonPriceToolServicevice; } diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java index 909e632..488116a 100644 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java +++ b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java @@ -28,7 +28,7 @@ import java.util.Map; * @since 3.0 2024-11-28 */ @RestController -@RequestMapping("v2/cbamcarbonpowerprogressallocation") +@RequestMapping("v2/cbam/power/allocation") @Tag(name="耗电量分配") @RequiredArgsConstructor public class CbamCarbonPowerProgressAllocationController { From 4305943eeebe1846a92a792ce2d5ff682c420e6d Mon Sep 17 00:00:00 2001 From: lishuai Date: Thu, 19 Dec 2024 14:12:51 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E8=B6=85=E7=BA=A7apibug=202024=E5=B9=B41?= =?UTF-8?q?2=E6=9C=8819=E6=97=A514:12:47?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thing/thing/api/dto/ApiEntityAttrDTO.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java b/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java index bbdfa8f..7b2307b 100644 --- a/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java +++ b/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java @@ -90,10 +90,21 @@ public class ApiEntityAttrDTO implements Serializable { JSONArray keys1 = jsonObject.getJSONArray("keys"); JSONArray entitys = jsonObject.getJSONArray("entitys"); if(!entitys.isEmpty() && !keys1.isEmpty()){ - entityAttrMap.put(entitys.getLong(0),keys1.stream() - .map(Object::toString) - .map(Long::parseLong) - .toList()); + if(entityAttrMap.containsKey(entitys.getLong(0))){ + List longs = entityAttrMap.get(entitys.getLong(0)); + List list1 = new java.util.ArrayList<>(keys1.stream() + .map(Object::toString) + .map(Long::parseLong) + .toList()); + list1.addAll(longs); + entityAttrMap.put(entitys.getLong(0),list1); + }else{ + entityAttrMap.put(entitys.getLong(0),keys1.stream() + .map(Object::toString) + .map(Long::parseLong) + .toList()); + } + } } } From 025f96e53aa0a28edef8ccee9d06304fd5762dcc Mon Sep 17 00:00:00 2001 From: lishuai Date: Thu, 19 Dec 2024 14:56:06 +0800 Subject: [PATCH 19/19] =?UTF-8?q?master=E5=88=86=E6=94=AF=E5=88=A0?= =?UTF-8?q?=E9=99=A4cbam=202024=E5=B9=B412=E6=9C=8819=E6=97=A514:56:03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/pom.xml | 4 - modules/cbam/pom.xml | 39 ---- .../controller/CbamIndustryController.java | 84 -------- .../CbamProcessMaterialController.java | 112 ----------- .../CbamProdRouteRelationController.java | 107 ----------- .../baesInfoExcel/dto/CbamIndustryDTO.java | 101 ---------- .../dto/CbamProcessMaterialDTO.java | 62 ------ .../dto/CbamProdRouteRelationDTO.java | 34 ---- .../entity/CbamIndustryEntity.java | 97 ---------- .../entity/CbamProcessMaterialEntity.java | 93 --------- .../entity/CbamProdRouteRelationEntity.java | 51 ----- .../mapper/CbamIndustryMapper.java | 11 -- .../mapper/CbamProcessMaterialMapper.java | 16 -- .../mapper/CbamProdRouteRelationMapper.java | 16 -- .../service/CbamIndustryService.java | 24 --- .../service/CbamProcessMaterialService.java | 51 ----- .../service/CbamProdRouteRelationService.java | 21 -- .../service/impl/CbamIndustryServiceImpl.java | 180 ------------------ .../impl/CbamProcessMaterialServiceImpl.java | 129 ------------- .../CbamProdRouteRelationServiceImpl.java | 54 ------ .../CbamCarbonPriceToolController.java | 85 --------- .../dto/CbamCarbonPriceToolDTO.java | 56 ------ .../entity/CbamCarbonPriceToolEntity.java | 92 --------- .../mapper/CbamCarbonPriceToolMapper.java | 9 - .../service/CbamCarbonPriceToolService.java | 13 -- .../Impl/CbamCarbonPriceToolServiceImpl.java | 60 ------ .../thing/cbam/context/ContextExcelDTO.java | 57 ------ .../cbam/context/ExcelContextManage.java | 94 --------- .../com/thing/cbam/context/ExcelTypeDTO.java | 8 - ...CbamCarbonPriceCurrencyDictController.java | 110 ----------- .../controller/CbamCountryDictController.java | 85 --------- .../controller/CbamFactorDictController.java | 81 -------- .../controller/CbamFuelDictController.java | 112 ----------- .../dict/controller/CbamHsDictController.java | 111 ----------- .../CbamIndustryDictController.java | 114 ----------- .../CbamProdProcessDictController.java | 127 ------------ .../dto/CbamCarbonPriceCurrencyDictDTO.java | 34 ---- .../cbam/dict/dto/CbamCountryDictDTO.java | 36 ---- .../cbam/dict/dto/CbamFactorDictDTO.java | 34 ---- .../thing/cbam/dict/dto/CbamFuelDictDTO.java | 37 ---- .../thing/cbam/dict/dto/CbamHsDictDTO.java | 42 ---- .../cbam/dict/dto/CbamIndustryDictDTO.java | 31 --- .../cbam/dict/dto/CbamProdProcessDictDTO.java | 40 ---- .../CbamCarbonPriceCurrencyDictEntity.java | 43 ----- .../dict/entity/CbamCountryDictEntity.java | 50 ----- .../dict/entity/CbamFactorDictEntity.java | 43 ----- .../cbam/dict/entity/CbamFuelDictEntity.java | 54 ------ .../cbam/dict/entity/CbamHsDictEntity.java | 56 ------ .../dict/entity/CbamIndustryDictEntity.java | 44 ----- .../entity/CbamProdProcessDictEntity.java | 56 ------ .../CbamCarbonPriceCurrencyDictMapper.java | 17 -- .../dict/mapper/CbamCountryDictMapper.java | 9 - .../dict/mapper/CbamFactorDictMapper.java | 9 - .../cbam/dict/mapper/CbamFuelDictMapper.java | 16 -- .../cbam/dict/mapper/CbamHsDictMapper.java | 17 -- .../dict/mapper/CbamIndustryDictMapper.java | 17 -- .../mapper/CbamProdProcessDictMapper.java | 17 -- .../CbamCarbonPriceCurrencyDictService.java | 15 -- .../dict/service/CbamCountryDictService.java | 10 - .../dict/service/CbamFactorDictService.java | 7 - .../dict/service/CbamFuelDictService.java | 15 -- .../cbam/dict/service/CbamHsDictService.java | 20 -- .../dict/service/CbamIndustryDictService.java | 15 -- .../service/CbamProdProcessDictService.java | 27 --- ...bamCarbonPriceCurrencyDictServiceImpl.java | 29 --- .../impl/CbamCountryDictServiceImpl.java | 22 --- .../impl/CbamFactorDictServiceImpl.java | 19 -- .../service/impl/CbamFuelDictServiceImpl.java | 35 ---- .../service/impl/CbamHsDictServiceImpl.java | 57 ------ .../impl/CbamIndustryDictServiceImpl.java | 29 --- .../impl/CbamProdProcessDictServiceImpl.java | 65 ------- .../CbamCarbonDirectController.java | 140 -------------- .../CbamPerfluorinatedCarbonController.java | 109 ----------- .../CbamProcessAllocationController.java | 98 ---------- .../dto/CbamCarbonDirectContextDTO.java | 60 ------ .../directCarbon/dto/CbamCarbonDirectDTO.java | 94 --------- .../dto/CbamCarbonProgressDTO.java | 38 ---- .../dto/CbamPerfluorinatedCarbonDTO.java | 65 ------- .../dto/CbamProcessAllocationDTO.java | 37 ---- .../entity/CbamCarbonDirectEntity.java | 148 -------------- .../entity/CbamCarbonProgressEntity.java | 51 ----- .../CbamPerfluorinatedCarbonEntity.java | 111 ----------- .../entity/CbamProcessAllocationEntity.java | 63 ------ .../mapper/CbamCarbonDirectMapper.java | 16 -- .../CbamPerfluorinatedCarbonMapper.java | 16 -- .../mapper/CbamProcessAllocationMapper.java | 16 -- .../service/CbamCarbonDirectService.java | 30 --- .../CbamPerfluorinatedCarbonService.java | 19 -- .../service/CbamProcessAllocationService.java | 19 -- .../impl/CbamCarbonDirectServiceImpl.java | 133 ------------- .../CbamPerfluorinatedCarbonServiceImpl.java | 91 --------- .../CbamProcessAllocationServiceImpl.java | 45 ----- .../util/BurningDischargeUtil.java | 85 --------- .../util/MaterialBalanceUtil.java | 55 ------ .../util/ProcessDischargeUtil.java | 61 ------ .../CbamElectricityToolController.java | 66 ------- .../dto/CbamElectricityToolDTO.java | 62 ------ .../entity/CbamElectricityToolEntity.java | 99 ---------- .../mapper/CbamElectricityToolMapper.java | 9 - .../service/CbamElectricityToolService.java | 13 -- .../Impl/CbamElectricityToolServiceImpl.java | 52 ----- ...CbamCarbonIndirectEmissionsController.java | 92 --------- ...rbonPowerProgressAllocationController.java | 98 ---------- .../CbamPowerSummaryFuelController.java | 98 ---------- .../dto/CbamCarbonIndirectEmissionsDTO.java | 37 ---- .../CbamCarbonPowerProgressAllocationDTO.java | 52 ----- .../dto/CbamPowerSummaryFuelDTO.java | 44 ----- .../CbamCarbonIndirectEmissionsEntity.java | 56 ------ ...amCarbonPowerProgressAllocationEntity.java | 72 ------- .../entity/CbamPowerSummaryFuelEntity.java | 71 ------- .../CbamCarbonIndirectEmissionsMapper.java | 17 -- ...amCarbonPowerProgressAllocationMapper.java | 17 -- .../mapper/CbamPowerSummaryFuelMapper.java | 16 -- .../CbamCarbonIndirectEmissionsService.java | 14 -- ...mCarbonPowerProgressAllocationService.java | 20 -- .../service/CbamPowerSummaryFuelService.java | 14 -- ...bamCarbonIndirectEmissionsServiceImpl.java | 33 ---- ...bonPowerProgressAllocationServiceImpl.java | 45 ----- .../Impl/CbamPowerSummaryFuelServiceImpl.java | 28 --- .../CbamMaterialSpecificController.java | 75 -------- .../material/dto/CbamMaterialSpecificDTO.java | 50 ----- .../entity/CbamMaterialSpecificEntity.java | 76 -------- .../mapper/CbamMaterialSpecificMapper.java | 11 -- .../service/CbamMaterialSpecificService.java | 17 -- .../Impl/CbamMaterialSpecificServiceImpl.java | 46 ----- .../CbamProductAllocationController.java | 88 --------- .../dto/CbamProductAllocationDTO.java | 55 ------ .../entity/CbamProductAllocationEntity.java | 92 --------- .../mapper/CbamProductAllocationMapper.java | 9 - .../service/CbamProductAllocationService.java | 13 -- .../CbamProductAllocationServiceImpl.java | 35 ---- modules/pom.xml | 1 - 132 files changed, 6860 deletions(-) delete mode 100644 modules/cbam/pom.xml delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamProcessAllocationController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java delete mode 100644 modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java diff --git a/application/pom.xml b/application/pom.xml index 5972202..d45a2d4 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -145,10 +145,6 @@ com.thing.modules visual-design - - com.thing.modules - cbam - org.springframework.boot diff --git a/modules/cbam/pom.xml b/modules/cbam/pom.xml deleted file mode 100644 index ede5601..0000000 --- a/modules/cbam/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - com.thing - modules - 5.1 - - - com.thing.modules - cbam - jar - ThingBI Server Modules cbam - - - - UTF-8 - - - - - - - org.projectlombok - lombok - - - - com.thing.modules - thing - - - - - - - \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java deleted file mode 100644 index b95121e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.thing.cbam.baesInfoExcel.controller; - - -import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; -import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; -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.web.response.PageData; -import com.thing.common.core.web.response.Result; -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; - -@RestController -@RequestMapping("v2/cbam/industry") -@Tag(name = "基础信息A表") -@RequiredArgsConstructor -public class CbamIndustryController { - - private final CbamIndustryService service; - - @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 param) { - PageData pageList = service.getPageData(param,CbamIndustryDTO.class); - return new Result>().ok(pageList); - } - - - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamIndustryDTO dto = service.findById(id); - return new Result().ok(dto); - } - - @PostMapping("saveOrUpdate") - @Operation(summary = "新增或者修改") - @LogOperation("新增或者修改") - public Result saveOrUpdate(@RequestBody CbamIndustryDTO dto) { - return new Result().ok(service.saveOrUpdate(dto)); - } - - @PutMapping - @Operation(summary = "修改-废弃") - @LogOperation("修改") - public Result update(@RequestBody CbamIndustryDTO dto) { - //效验数据 - //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - service.updateIndustryInfo(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - service.batchDeleteByIds(ids); - return new Result<>(); - } - -// @PostMapping("export") -// @Operation(summary = "导出") -// @LogOperation("导出") -// public void export(@RequestBody Long[] ids, @RequestParam Map params, HttpServletResponse response) { -// ExcelUtils.exportExcel(service.export(ids, params), "物模型列表", "物模型", IotThingModelExcel.class, "物模型列表.xls", response); -// } - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java deleted file mode 100644 index 1a1ced5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.thing.cbam.baesInfoExcel.controller; - -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; -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 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.List; -import java.util.Map; - -/** -* 综合商品类别和相关生产过程 和 购买的原材料 表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@RestController -@RequestMapping("v2/cbam/process/material") -@Tag(name="综合商品类别和相关生产过程 和 购买的原材料 表") -@RequiredArgsConstructor -public class CbamProcessMaterialController { - - private final CbamProcessMaterialService cbamProcessMaterialService; - - @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 = cbamProcessMaterialService.getPageData(params, CbamProcessMaterialDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProcessMaterialDTO data = cbamProcessMaterialService.getByIdAs(id, CbamProcessMaterialDTO.class); - return new Result().ok(data); - } - - @GetMapping("industryIdAndType") - @Operation(summary="根据AExcel的基本信息id，查询原材料信息或者生产过程") - public Result> getByIndustryIdAndType(Long industryId,Integer type){ - List processMaterialDTOList = cbamProcessMaterialService.getByIndustryIdAndType(industryId,type); - return new Result>().ok(processMaterialDTOList); - } - - @GetMapping("industryId") - @Operation(summary="根据AExcel的基本信息id，查询原材料信息和生产过程列表") - public Result> getByIndustryId(Long industryId){ - List processMaterialDTOList = cbamProcessMaterialService.getByIndustryId(industryId); - return new Result>().ok(processMaterialDTOList); - } - -// @PostMapping -// @Operation(summary="保存或者更新") -// @LogOperation("保存或者更新") -// public Result saveOrUpdate(@RequestBody CbamProcessMaterialDTO dto){ -// //效验数据 -// ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); -// cbamProcessMaterialService.saveDto(dto); -// return new Result<>(); -// } - -// @PutMapping -// @Operation(summary="修改") -// @LogOperation("修改") -// public Result update(@RequestBody CbamProcessMaterialDTO dto){ -// //效验数据 -// ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); -// cbamProcessMaterialService.updateDto(dto); -// return new Result<>(); -// } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProcessMaterialService.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 = cbamProcessMaterialService.listAs(params, CbamProcessMaterialDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "综合商品类别和相关生产过程 和 购买的原材料 表", list, CbamProcessMaterialExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java deleted file mode 100644 index 3d5b933..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.thing.cbam.baesInfoExcel.controller; - -import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; -import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -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 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.List; -import java.util.Map; - -/** -* 生产过程和原料 与 工艺路线关联表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@RestController -@RequestMapping("v2/cbam/routerelation") -@Tag(name="生产过程和原料 与 工艺路线关联表") -@RequiredArgsConstructor -public class CbamProdRouteRelationController { - - private final CbamProdRouteRelationService cbamProdRouteRelationService; - - @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 = cbamProdRouteRelationService.getPageData(params, CbamProdRouteRelationDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProdRouteRelationDTO data = cbamProdRouteRelationService.getByIdAs(id, CbamProdRouteRelationDTO.class); - return new Result().ok(data); - } - - /* @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProdRouteRelationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProdRouteRelationService.saveDto(dto); - return new Result<>(); - }*/ - - @PostMapping - @Operation(summary="批量保存或者更新") - @LogOperation("保存") - public Result batchSaveOrUpdate(@RequestBody List list){ - //效验数据 - cbamProdRouteRelationService.batchSaveOrUpdate(list); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProdRouteRelationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProdRouteRelationService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProdRouteRelationService.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 = cbamProdRouteRelationService.listAs(params, CbamProdRouteRelationDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "生产过程和原料 与 工艺路线关联表", list, CbamProdRouteRelationExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java deleted file mode 100644 index 36edbbb..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.thing.cbam.baesInfoExcel.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -@Data -@Schema(description = "基础信息表") -public class CbamIndustryDTO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - - @Schema(description = "主键id") - private Long id; - @Schema(description = "所属行业字典id") - private Long industryDictId; - @Schema(description = "所属行业") - private String industryDict; - @Schema(description = "开始日期：11位数") - private Long startDate; - @Schema(description = "结束日期：11位数") - private Long endDate; - @Schema(description = "报告周期说明：默认情况是一整个日历年，这个是固定的，要是前段传过来就要") - private String cycleDesc; - @Schema(description = "生产工厂名称") - private String factoryName; - @Schema(description = "生产工厂名称（英文名）") - private String factoryEname; - @Schema(description = "街道编号") - private String streetNum; - @Schema(description = "在欧盟进行的主要经济活动") - private String economicActivities; - @Schema(description = "邮政编码") - private String postalCode; - @Schema(description = "邮政信箱") - private String postBox; - @Schema(description = "城市") - private String city; - @Schema(description = "国家") - private String country; - @Schema(description = "国际港口代码") - private String internationalCode; - @Schema(description = "生产坐标经度") - private String factoryLongitude; - @Schema(description = "生产坐标纬度") - private String factoryLatitude; - @Schema(description = "授权代表姓名") - private String authorizedName; - @Schema(description = "电子邮件") - private String email; - @Schema(description = "电话") - private String telephone; - @Schema(description = "生产过程：返给前端的生产过程信息") - private List cbamProductList; - @Schema(description = "原料信息：返给前端的生产过程信息") - private List cbamMaterialList; - - /*------------------------租户信息--------------------------------*/ - - /** - * 租户编码 - */ - private Long tenantCode; - - /** - * 公司id - */ - private Long companyId; - - /** - * 部门id - */ - private Long deptId; - - /*------------------------修改记录信息--------------------------------*/ - - /** - * 创建者 - */ - private Long creator; - - /** - * 创建时间 - */ - private Long createDate; - - /** - * 修改人 - */ - private Long updater; - /** - * 修改时间 - */ - private Long updateDate; - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java deleted file mode 100644 index c7b5c41..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.thing.cbam.baesInfoExcel.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* 综合商品类别和相关生产过程 和 购买的原材料 表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Data -@Schema(description = "综合商品类别和相关生产过程 和 购买的原材料 表") -public class CbamProcessMaterialDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "产品名称") - private String name; - @Schema(description = "总产量") - private String totalOutput; - @Schema(description = "HS代码") - private String hsCode; - @Schema(description = "产品生产过程字典id") - private Long productionProcessId; - @Schema(description = "产品生产过程") - private String productionProcess; - @Schema(description = "综合商品类别") - private String productCategories; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "租户编码") - private Long tenantCode; - @Schema(description = "部门ID") - private Long deptId; - private Long companyId; - @Schema(description = "创建者") - private Long creator; - @Schema(description = "创建时间") - private Long createDate; - @Schema(description = "更新者") - private Long updater; - @Schema(description = "更新时间") - private Long updateDate; - @Schema(description = "类型1.生产过程 2.原材料") - private Integer type; - @Schema(description = "生产过程分配量") - private String processAllocation; - @Schema(description = "生产工艺相关信息--由关联表得到") - private List routeRelationList; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java deleted file mode 100644 index 503c2dd..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.thing.cbam.baesInfoExcel.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-12-02 -*/ -@Data -@Schema(description = "生产过程和原料 与 工艺路线关联表") -public class CbamProdRouteRelationDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "工艺路线字典id") - private Long routeId; - @Schema(description = "排序") - private Long sort; - @Schema(description = "工艺路线名称") - private String routeName; - @Schema(description = "生产过程或原材料的id") - private Long prodMaterialId; - @Schema(description = "类型：1.生产过程 2.原料") - private Integer type; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java deleted file mode 100644 index 56ff6dc..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.thing.cbam.baesInfoExcel.entity; - -import com.mybatisflex.annotation.Table; -import com.thing.common.orm.entity.BaseInfoEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@Table("cbam_industry_info") -public class CbamIndustryEntity extends BaseInfoEntity { - - /** - * 所属行业字典id - */ - private Long industryDictId; - /** - * 所属行业 - */ - private String industryDict; - /** - * 开始日期 - */ - private Long startDate; - /** - * 结束日期 - */ - private Long endDate; - /** - * 报告周期说明：默认情况是一整个日历年 - */ - private String cycleDesc; - /** - * 生产工厂名称 - */ - private String factoryName; - - /** - * 生产工厂名称（英文名） - */ - private String factoryEname; - /** - * 街道编号 - */ - private String streetNum; - /** - * 在欧盟进行的主要经济活动 - */ - private String economicActivities; - /** - * 邮政编码 - */ - private String postalCode; - /** - * 邮政信箱 - */ - private String postBox; - /** - * 城市 - */ - private String city; - /** - * 国家 - */ - private String country; - /** - * 国际港口代码 - */ - private String internationalCode; - /** - * 生产工厂坐标(经度) - */ - private String factoryLongitude; - /** - * 生产工厂坐标(纬度) - */ - private String factoryLatitude; - /** - * 授权代表姓名 - */ - private String authorizedName; - /** - * 电子邮件 - */ - private String email; - /** - * 电话 - */ - private String telephone; - /** - * 是否涉及原料：0否1是 - */ - private Integer materialMark; - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java deleted file mode 100644 index c43fca4..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.thing.cbam.baesInfoExcel.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 综合商品类别和相关生产过程 和 购买的原材料 表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_process_material") -public class CbamProcessMaterialEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 产品名称 - */ - private String name; - /** - * 总产量 - */ - private String totalOutput; - /** - * HS代码 - */ - private String hsCode; - /** - * 产品生产过程字典id - */ - private Long productionProcessId; - /** - * 产品生产过程 - */ - private String productionProcess; - /** - * 综合商品类别 - */ - private String productCategories; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 租户编码 - */ - private Long tenantCode; - /** - * 部门ID - */ - private Long deptId; - private Long companyId; - /** - * 创建者 - */ - private Long creator; - /** - * 创建时间 - */ - private Long createDate; - /** - * 更新者 - */ - private Long updater; - /** - * 更新时间 - */ - private Long updateDate; - - /** - * 类型1.生产过程 2.原材料 - */ - private Integer type; - /** - * 生产过程分配量 - */ - private String processAllocation; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java deleted file mode 100644 index 8b56da5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.thing.cbam.baesInfoExcel.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 生产过程和原料 与 工艺路线关联表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_prod_route_relation") -public class CbamProdRouteRelationEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 工艺路线字典id - */ - private Long routeId; - /** - * 排序 - */ - private Long sort; - /** - * 工艺路线名称 - */ - private String routeName; - /** - * 生产过程或原材料的id - */ - private Long prodMaterialId; - /** - * 类型：1.生产过程 2.原料 - */ - private Integer type; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java deleted file mode 100644 index 21288dc..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.thing.cbam.baesInfoExcel.mapper; - - -import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamIndustryMapper extends PowerBaseMapper { - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java deleted file mode 100644 index 1068bdc..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.baesInfoExcel.mapper; - -import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 综合商品类别和相关生产过程 和 购买的原材料 表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Mapper -public interface CbamProcessMaterialMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java deleted file mode 100644 index 70f6a77..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.baesInfoExcel.mapper; - -import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 生产过程和原料 与 工艺路线关联表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Mapper -public interface CbamProdRouteRelationMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java deleted file mode 100644 index 370cfa0..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service; - - -import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.LinkedHashMap; - - -public interface CbamIndustryService extends IBaseService { - - CbamIndustryDTO saveOrUpdate(CbamIndustryDTO dto); - - CbamIndustryDTO findById(Long id); - - void updateIndustryInfo(CbamIndustryDTO dto); - - void batchDeleteByIds( Long[] ids); - - LinkedHashMap validateMsg(Long hyId,Long startTime,Long endTime); - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java deleted file mode 100644 index d4c3731..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service; - -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -/** - * 综合商品类别和相关生产过程 和 购买的原材料 表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -public interface CbamProcessMaterialService extends IBaseService { - - - - - List batchSaveOrUpdate(List list); - - - /** - * 根据行业id和类型查询 - * @param industryId - * @param type - * @return - */ - List getByIndustryIdAndType(Long industryId,Integer type); - - /** - * 根据行业id查询 - * @param industryId - * @return - */ - List getByIndustryId(Long industryId); - - /** - * 批量保存 - * @param list - */ - void batchSaveList(List list,Integer type); - - - /** - * 批量更新 - * @param list - */ - void batchDeleteAndSaveList(List list,Long industryId,Integer type); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java deleted file mode 100644 index 2766f0e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service; - -import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -/** - * 生产过程和原料 与 工艺路线关联表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -public interface CbamProdRouteRelationService extends IBaseService { - - List getByProdMaterialIdAndType(Long prodMaterialId, Integer type); - - List batchSaveOrUpdate(List list); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java deleted file mode 100644 index fa55945..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; -import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; -import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; -import com.thing.cbam.baesInfoExcel.mapper.CbamIndustryMapper; -import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; -import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; -import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.exception.SysException; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.common.orm.utils.IdGenerator; -import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; - -@Service -@RequiredArgsConstructor -public class CbamIndustryServiceImpl extends BaseServiceImpl implements CbamIndustryService { - -// private final CbamProductInfoService cbamProductInfoService; -// -// private final CbamMaterialService cbamMaterialService; -// -// private final CbamProdRouteRelationService cbamProdRouteRelationService; - private final CbamProcessMaterialService cbamProcessMaterialService; - private final CbamProdRouteRelationService cbamProdRouteRelationService; - - - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - //String code = (String) params.get("code"); - - Long startTime = (Long) params.get("startTime"); - Long endTime = (Long) params.get("endTime"); - String orderField = (String) params.get("orderField"); - String order = (String) params.get("order"); - wrapper.between(CbamIndustryEntity::getCreateDate, - startTime, - endTime, - !Objects.isNull(startTime) && !Objects.isNull(endTime)) - .orderBy(StringUtils.isNotBlank(orderField) ? orderField : "create_date", StringUtils.equals(order, Constant.ASC)) - ; - return wrapper; - } - - - @Override - public CbamIndustryDTO findById(Long id) { - //1.查询CBAM基础信息,包括 cbam行业，报告周期，企业信息 - CbamIndustryDTO cbamIndustryDTO = mapper.selectObjectByQueryAs(QueryWrapper.create().eq(CbamIndustryEntity::getId, id), CbamIndustryDTO.class); - if (Objects.isNull(cbamIndustryDTO)) { - throw new SysException("CBAM行业，企业信息为空"); - } - //2.查询综合商品类别和相关生产过程和相关工艺路线 - List processDTOList = cbamProcessMaterialService.getByIndustryIdAndType(cbamIndustryDTO.getId(),1); - //2.1查询综合商品类别相关工艺路线 - if(CollectionUtil.isNotEmpty(processDTOList)){ - for (CbamProcessMaterialDTO cbamProcessDTO : processDTOList) { - //查询工艺路线 - List routeRelationDTOS = cbamProdRouteRelationService.getByProdMaterialIdAndType(cbamProcessDTO.getId(), cbamProcessDTO.getType()); - if(CollectionUtil.isNotEmpty(routeRelationDTOS)){ - //将工艺路线设置到综合商品类别中 - cbamProcessDTO.setRouteRelationList(routeRelationDTOS); - } - } - cbamIndustryDTO.setCbamProductList(processDTOList); - } - //3.查询购买的原材料和相关工艺路线 - List cbamMaterialDTOList = cbamProcessMaterialService.getByIndustryIdAndType(cbamIndustryDTO.getId(),2); - //3.1查询购买的原材料的相关工艺路线 - if(CollectionUtil.isNotEmpty(cbamMaterialDTOList)){ - for (CbamProcessMaterialDTO cbamProcessMaterialDTO : cbamMaterialDTOList) { - //查询工艺路线 - List routeRelationDTOS = cbamProdRouteRelationService.getByProdMaterialIdAndType(cbamProcessMaterialDTO.getId(), cbamProcessMaterialDTO.getType()); - if(CollectionUtil.isNotEmpty(routeRelationDTOS)){ - //将工艺路线设置到原料类别中 - cbamProcessMaterialDTO.setRouteRelationList(routeRelationDTOS); - } - } - cbamIndustryDTO.setCbamMaterialList(cbamMaterialDTOList); - } - return cbamIndustryDTO; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public CbamIndustryDTO saveOrUpdate(CbamIndustryDTO dto) { - Long id = dto.getId(); - //若是存在id，则更新相关操作,否则插入相关操作 - CbamIndustryEntity cbamIndustryEntity = ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class); - if(Objects.isNull(id)){ - id = IdGenerator.nextId(); - dto.setId(id); - //1.插入相关行业企业等基本信息 - mapper.insert(cbamIndustryEntity); - }else{ - //3.更新相关行业企业等基本信息 - mapper.updateByQuery(cbamIndustryEntity,QueryWrapper.create().eq(CbamIndustryEntity::getId, dto.getId())); - } - return dto; - } - - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateIndustryInfo(CbamIndustryDTO dto) { - updateIndustry(dto); - } - - - @NotNull - private CbamIndustryDTO saveIndustry(CbamIndustryDTO dto) { - CbamIndustryEntity cbamIndustryEntity = ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class); - //1.插入相关行业企业等基本信息 - mapper.insert(cbamIndustryEntity); - //2.获取生产过程和相关工艺路线 - List cbamProductList = dto.getCbamProductList(); - if (CollectionUtil.isNotEmpty(cbamProductList)) { - cbamProcessMaterialService.batchSaveList(cbamProductList,1); - } - //3.获取购买的原材料和相关工艺路线 - List cbamMaterialList = dto.getCbamMaterialList(); - if (CollectionUtil.isNotEmpty(cbamMaterialList)) { - cbamProcessMaterialService.batchSaveList(cbamMaterialList,2); - } - dto.setId(cbamIndustryEntity.getId()); - return dto; - } - - private void updateIndustry(CbamIndustryDTO dto) { - //1.根据id查询相关行业企业等基本信息 - CbamIndustryEntity cbamIndustryEntity = mapper.selectOneById(dto.getId()); - if(Objects.isNull(cbamIndustryEntity)){ - throw new SysException("查询相关行业企业等基本信息不存在"); - } - //2.将修改的值赋值给 industryEntity 对象 - CbamIndustryEntity industryEntity = ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class); - //3.更新相关行业企业等基本信息 - mapper.updateByQuery(industryEntity,QueryWrapper.create().eq(CbamIndustryEntity::getId, dto.getId())); - //4.获取生产过程和相关工艺路线，并进行更新 - List cbamProductList = dto.getCbamProductList(); - cbamProcessMaterialService.batchDeleteAndSaveList(cbamProductList,industryEntity.getId(),1); - //5.获取购买的原材料和相关工艺路线，并进行更新 - List cbamaterialList = dto.getCbamMaterialList(); - cbamProcessMaterialService.batchDeleteAndSaveList(cbamaterialList,industryEntity.getId(),2); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchDeleteByIds(Long[] ids) { - //1.删行业基本信息 - mapper.deleteBatchByIds(Arrays.asList(ids)); - //2.删除生产过程和原料信息 - cbamProcessMaterialService.getMapper().deleteByQuery(QueryWrapper.create() - .in(CbamProcessMaterialEntity::getIndustryId,Arrays.asList(ids))); - //3.首选删除生产过程和原料信息相关联的工艺路线 - cbamProdRouteRelationService.getMapper().deleteByQuery(QueryWrapper.create() - .in(CbamProdRouteRelationEntity::getProdMaterialId,Arrays.asList(ids))); - } - - @Override - public LinkedHashMap validateMsg(Long hyId,Long startTime,Long endTime) { - LinkedHashMap resMap = new LinkedHashMap<>(); - //1.所属行业不能为空，并且是行业字典的值 - return null; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java deleted file mode 100644 index 885605d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; -import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; -import com.thing.cbam.baesInfoExcel.mapper.CbamProcessMaterialMapper; -import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; -import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 综合商品类别和相关生产过程 和 购买的原材料 表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Service -@RequiredArgsConstructor -public class CbamProcessMaterialServiceImpl extends BaseServiceImpl implements CbamProcessMaterialService { - - - private final CbamProdRouteRelationService cbamProdRouteRelationService; - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List getByIndustryIdAndType(Long industryId, Integer type) { - QueryWrapper queryWrapper = QueryWrapper.create() - .eq(CbamProcessMaterialEntity::getIndustryId, industryId) - .eq(CbamProcessMaterialEntity::getType, type); - return mapper.selectListByQueryAs(queryWrapper, CbamProcessMaterialDTO.class); - } - - @Override - public List getByIndustryId(Long industryId) { - QueryWrapper queryWrapper = QueryWrapper.create().eq(CbamProcessMaterialEntity::getIndustryId, industryId); - return mapper.selectListByQueryAs(queryWrapper, CbamProcessMaterialDTO.class); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchSaveList(List list,Integer type) { - //遍历相关生产产品或者原料列表 - for (CbamProcessMaterialDTO cbamProcessMaterialDTO : list) { - cbamProcessMaterialDTO.setType(type); - CbamProcessMaterialEntity cbamProcessMaterialEntity = ConvertUtils.sourceToTarget(cbamProcessMaterialDTO, CbamProcessMaterialEntity.class); - //1.保存产品或者原料信息 - mapper.insert(cbamProcessMaterialEntity); - //2.保存产品或者原料的生产工艺信息 - List routeRelationList = cbamProcessMaterialDTO.getRouteRelationList(); - if(CollectionUtil.isNotEmpty(routeRelationList)){ - for (CbamProdRouteRelationDTO cbamProdRouteRelationDTO : routeRelationList) { - cbamProdRouteRelationDTO.setProdMaterialId(cbamProcessMaterialEntity.getId()); - cbamProdRouteRelationDTO.setType(type); - } - //将工艺信息保存到数据库 - cbamProdRouteRelationService.saveBatch(ConvertUtils.sourceToTarget(routeRelationList, CbamProdRouteRelationEntity.class)); - } - } - } - - @Override - public List batchSaveOrUpdate(List list) { - if(CollectionUtils.isEmpty(list)){ - return list; - } - //除了id，不管有没有值，都根据 industryId 和类型（自定义1.代表 生产过程 2.代表原料） 先删除，再插入 - List industryIds = list.stream().map(CbamProcessMaterialDTO::getIndustryId).distinct().toList(); - List typeList = list.stream().map(CbamProcessMaterialDTO::getType).distinct().toList(); - mapper.deleteByQuery(QueryWrapper.create() - .in(CbamProcessMaterialEntity::getIndustryId,industryIds) - .in(CbamProcessMaterialEntity::getType,typeList)); - //再进行插入操作 - List resList = new ArrayList<>(); - for (CbamProcessMaterialDTO cbamProcessMaterialDTO : list) { - CbamProcessMaterialEntity cbamProcessMaterialEntity = ConvertUtils.sourceToTarget(cbamProcessMaterialDTO, CbamProcessMaterialEntity.class); - //1.保存产品或者原料信息 - mapper.insert(cbamProcessMaterialEntity); - //2.保存产品或者原料的生产工艺信息 - List routeRelationList = cbamProcessMaterialDTO.getRouteRelationList(); - if(CollectionUtil.isNotEmpty(routeRelationList)){ - for (CbamProdRouteRelationDTO cbamProdRouteRelationDTO : routeRelationList) { - cbamProdRouteRelationDTO.setProdMaterialId(cbamProcessMaterialEntity.getId()); - cbamProdRouteRelationDTO.setType(cbamProcessMaterialEntity.getType()); - } - //将工艺信息保存到数据库 - List routeRelationDTOS = cbamProdRouteRelationService.batchSaveOrUpdate(routeRelationList); - CbamProcessMaterialDTO processMaterialDTO = ConvertUtils.sourceToTarget(cbamProcessMaterialEntity, CbamProcessMaterialDTO.class); - processMaterialDTO.setRouteRelationList(routeRelationDTOS); - resList.add(processMaterialDTO); - } - } - return resList; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchDeleteAndSaveList(List list,Long industryId,Integer type){ - //1.先删除相关的产品或者原料信息 - mapper.deleteByQuery(QueryWrapper.create() - .in(CbamProcessMaterialEntity::getIndustryId,list.stream().map(CbamProcessMaterialDTO::getIndustryId).toList()) - .eq(CbamProcessMaterialEntity::getType,type) - ); - //2.先删除相关的产品或者原料信息 关联的 生产工艺信息 - cbamProdRouteRelationService.getMapper().deleteByQuery(QueryWrapper.create() - .in(CbamProdRouteRelationEntity::getProdMaterialId,list.stream().map(CbamProcessMaterialDTO::getId).toList()) - .eq(CbamProdRouteRelationEntity::getType,type) - ); - //3.重写保存相关的产品或者原料信息和相关联的工艺信息 - batchSaveList( list,type); - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java deleted file mode 100644 index 8a43e10..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; -import com.thing.cbam.baesInfoExcel.mapper.CbamProdRouteRelationMapper; -import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * 生产过程和原料 与 工艺路线关联表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Service -public class CbamProdRouteRelationServiceImpl extends BaseServiceImpl implements CbamProdRouteRelationService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List getByProdMaterialIdAndType(Long prodMaterialId, Integer type) { - QueryWrapper queryWrapper = QueryWrapper.create() - .eq(CbamProdRouteRelationEntity::getProdMaterialId, prodMaterialId) - .eq(CbamProdRouteRelationEntity::getType, type) - .orderBy(CbamProdRouteRelationEntity::getSort,true); - return mapper.selectListByQueryAs(queryWrapper, CbamProdRouteRelationDTO.class); - } - - @Override - public List batchSaveOrUpdate(List list) { - //除了id，不管有没有值，都根据（生产过程或者原料id） 和类型（自定义1.代表 生产过程 2.代表原料） 先删除，再插入 - List typeList = list.stream().map(CbamProdRouteRelationDTO::getType).toList(); - List prodMaterialIdList = list.stream().map(CbamProdRouteRelationDTO::getProdMaterialId).toList(); - mapper.deleteByQuery(QueryWrapper.create() - .in(CbamProdRouteRelationEntity::getProdMaterialId, prodMaterialIdList) - .in(CbamProdRouteRelationEntity::getType, typeList)); - //插入工艺路线 - List cbamProdRouteRelationEntities = ConvertUtils.sourceToTarget(list, CbamProdRouteRelationEntity.class); - mapper.insertBatch(cbamProdRouteRelationEntities); - return ConvertUtils.sourceToTarget(cbamProdRouteRelationEntities, CbamProdRouteRelationDTO.class); - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java deleted file mode 100644 index 78cbdc7..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.thing.cbam.carbonPrice.controller; - -import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; -import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService; -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.web.response.PageData; -import com.thing.common.core.web.response.Result; -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 jakarta.annotation.Resource; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("v2/price/tool") -@Tag(name = "碳价工具") -@RequiredArgsConstructor -public class CbamCarbonPriceToolController { - - @Resource - private CbamCarbonPriceToolService cbamCarbonPriceToolService; - - @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 param) { - PageData pageList = cbamCarbonPriceToolService.getPageData(param, CbamCarbonPriceToolDTO.class); - return new Result>().ok(pageList); - } - @GetMapping("{id}") - @Operation(summary = "信息") - public Result info(@PathVariable("id") String id) { - CbamCarbonPriceToolDTO dto = cbamCarbonPriceToolService.getByIdAs(id, CbamCarbonPriceToolDTO.class); - return new Result().ok(dto); - } - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonPriceToolDTO dto) { - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonPriceToolService.saveDto(dto); - return new Result<>(); - } - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonPriceToolDTO dto) { - //实验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonPriceToolService.updateDto(dto); - return new Result<>(); - } - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - AssertUtils.isArrayEmpty(ids,"id"); - cbamCarbonPriceToolService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); - *} - */ -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java deleted file mode 100644 index 1e1f14b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.thing.cbam.carbonPrice.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-11-28 -*/ -@Data -@Schema(description = "碳价工具") -public class CbamCarbonPriceToolDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "碳价工具") - private String priceTool; - @Schema(description = "其他附加说明") - private String otherInfo; - @Schema(description = "货币") - private String currency; - @Schema(description = "配额缺口占总配额的比例") - private String gapProportion; - @Schema(description = "国内碳价") - private String carbonPrice; - @Schema(description = "抵扣金额") - private String deductionAmount; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "生产过程") - private String productionProcess; - @Schema(description = "综合商品类别") - private String productCategories; - @Schema(description = "SE涵盖范围") - private String seCoverage; - @Schema(description = "抵扣金额(CNY/t)") - private String deductionAmountCny; - @Schema(description = "预期碳价(CNY/t)") - private String expectedPrice; - @Schema(description = "结果:有效的预期碳价") - private String effectivePrice; - @Schema(description = "关联cbam_process_material的生产过程") - private String process_id; - @Schema(description = "排序") - private Long sort; - - - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java deleted file mode 100644 index fa19c01..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.thing.cbam.carbonPrice.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 碳价工具 - * - * @author xc - * @since 3.0 2024-11-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_price_tool") -public class CbamCarbonPriceToolEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 碳价工具 - */ - private String priceTool; - /** - * 其他附加说明 - */ - private String otherInfo; - /** - * 货币 - */ - private String currency; - /** - * 配额缺口占总配额的比例 - */ - private String gapProportion; - /** - * 国内碳价 - */ - private String carbonPrice; - /** - * 抵扣金额 - */ - private String deductionAmount; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 生产过程 - */ - private String productionProcess; - /** - * 综合商品类别 - */ - private String productCategories; - /** - * SE涵盖范围 - */ - private String seCoverage; - /** - * 抵扣金额(CNY/t) - */ - private String deductionAmountCny; - /** - * 预期碳价(CNY/t) - */ - private String expectedPrice; - /** - * 结果:有效的预期碳价 - */ - private String effectivePrice; - /** - * 关联cbam_process_material的生产过程 - */ - private String process_id; - /** - * 排序 - */ - private Long sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java deleted file mode 100644 index c081936..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.carbonPrice.mapper; - -import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamCarbonPriceToolMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java deleted file mode 100644 index 96335e1..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.thing.cbam.carbonPrice.service; - -import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; -import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; -import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO; -import com.thing.common.orm.service.IBaseService; - -import java.util.LinkedHashMap; -import java.util.List; - -public interface CbamCarbonPriceToolService extends IBaseService { - LinkedHashMap valiteMsg(CbamCarbonPriceToolDTO cbamCarbonPriceToolDTO); -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java deleted file mode 100644 index fb5bc2c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.thing.cbam.carbonPrice.service.Impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.clickhouse.client.internal.google.common.collect.Maps; -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; -import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; -import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; -import com.thing.cbam.carbonPrice.mapper.CbamCarbonPriceToolMapper; -import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService; -import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO; -import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -@Service -public class CbamCarbonPriceToolServiceImpl extends BaseServiceImpl implements CbamCarbonPriceToolService { - private final CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService; - - public CbamCarbonPriceToolServiceImpl(CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService) { - super(); - this.cbamCarbonPriceCurrencyDictService = cbamCarbonPriceCurrencyDictService; - } - - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - @Override - public LinkedHashMap valiteMsg(CbamCarbonPriceToolDTO cbamCarbonPriceToolDTO) { - LinkedHashMap resMap = new LinkedHashMap<>(); - if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getPriceTool())) { - resMap.put("priceTool", "碳价工具不能为空"); - } - if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getOtherInfo())){ - resMap.put("otherInfo","其他附加信息不能为空"); - } - List cbamCarbonPriceCurrencyDictDTOS = cbamCarbonPriceCurrencyDictService.listAs(Maps.newHashMap(), CbamCarbonPriceCurrencyDictDTO.class); - if (CollectionUtil.isEmpty(cbamCarbonPriceCurrencyDictDTOS)) { - resMap.put("currency","货币不能为空"); - } - if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getCarbonPrice())){ - resMap.put("carbonPrice","国内碳价不能为空"); - } - if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getDeductionAmount())){ - resMap.put("deductionAmount","抵扣金额(当地货币)不能为空"); - } - return resMap; - } - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java b/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java deleted file mode 100644 index e7bfb8f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.thing.cbam.context; - -import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; -import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; -import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; -import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; -import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; -import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; -import com.thing.cbam.indirectCarbon.dto.CbamPowerSummaryFuelDTO; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.List; - -@Data -@Schema(description = "Excel所有的请求参数") -public class ContextExcelDTO { - - @Schema(description = "CBAM的行业,报告周期，企业信息") - private CbamIndustryDTO industry; - - @Schema(description = "综合商品类别和相关生产过程集合") - private List processList; - - @Schema(description = "购买的原材料集合") - private List materialList; - - @Schema(description = "是否涉及燃烧排放 和 是否涉及过程排放 和 是否涉及物料平衡 和 是否有连续排放测量系统(CEMS)") - private List carbonDirectList; - - @Schema(description = "全氟化碳PFC排放： 是否涉及斜率法 和 是否涉及过电压法") - private List perfluorinatedCarbonList; - - @Schema(description = "各生产过程中原材料/燃料的分配") - private List processAllocationList; - - @Schema(description = "间接排放量") - private List carbonIndirectEmissionsList; - - @Schema(description = "各生产过程中耗电量的分配") - private List carbonPowerProgressAllocationList; - - @Schema(description = "排放量汇总与数据质量信息 和 燃料平衡 ") - private CbamPowerSummaryFuelDTO powerSummaryFuel; - - @Schema(description = "热电联产工具 ") - private CbamElectricityToolDTO electricityTool; - - @Schema(description = "碳价工具 ") - private CbamCarbonPriceToolDTO dto; - - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java b/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java deleted file mode 100644 index 2a2d38a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.thing.cbam.context; - -import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; -import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; -import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService; -import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; -import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; -import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; -import com.thing.cbam.electricity.service.CbamElectricityToolService; -import com.thing.cbam.indirectCarbon.service.CbamCarbonIndirectEmissionsService; -import com.thing.cbam.indirectCarbon.service.CbamCarbonPowerProgressAllocationService; -import com.thing.cbam.indirectCarbon.service.CbamPowerSummaryFuelService; -import com.thing.cbam.material.service.CbamMaterialSpecificService; -import com.thing.cbam.production.service.CbamProductAllocationService; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("v2/cbam/context") -@Tag(name = "excel的上下文管理") -@RequiredArgsConstructor -public class ExcelContextManage { - - /** - * A表企业基础信息 - */ - private final CbamIndustryService cbamIndustryService; - - /** - * A表企综合商品类别和相关生产过程 - */ - private final CbamProcessMaterialService cbamProcessMaterialService; - - /** - * A表购买的原材料 - */ - private final CbamProdRouteRelationService cbamProdRouteRelationService; - - /** - * B表 是否涉及燃烧排放 和 是否涉及过程排放 和 是否涉及物料平衡 和 是否有连续排放测量系统(CEMS) - */ - private final CbamCarbonDirectService cbamCarbonDirectService; - - /** - * B表 全氟化碳PFC排放： 是否涉及斜率法 和 是否涉及过电压法 - */ - private final CbamPerfluorinatedCarbonService cbamPerfluorinatedCarbonService; - - /** - * B表--各生产过程中原材料/燃料的分配 - */ - private final CbamProcessAllocationService cbamProcessAllocationService; - - - /** - * c表--间接排放量 - */ - private final CbamCarbonIndirectEmissionsService cbamCarbonIndirectEmissionsService; - - - /** - * c表-- 各生产过程中耗电量的分配 - */ - private final CbamCarbonPowerProgressAllocationService cbamCarbonPowerProgressAllocationService; - - /** - * c表-- 排放量汇总与数据质量信息 和 燃料平衡 - */ - private final CbamPowerSummaryFuelService cbamPowerSummaryFuelService; - - /** - * d表-- 各生产过程中产品的分配 / 可测量的发热量排放量 / 废气排放量 /生产过程输出的电力 - */ - private final CbamProductAllocationService cbamProductAllocationService; - - /** - * E表-- 原材料特定隐含排放SEE /各生产过程中原材料的消耗量 - */ - private final CbamMaterialSpecificService cbamMaterialSpecificService; - - /** - * F表-- 热电联产（CHP）计算工具 以下所有 - */ - private final CbamElectricityToolService cbamElectricityToolService; - - /** - * F表-- 计算碳价格工具 - */ - private CbamCarbonPriceToolService carbonPriceToolServicevice; -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java b/modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java deleted file mode 100644 index c992989..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.thing.cbam.context; - -public class ExcelTypeDTO { - - - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java deleted file mode 100644 index b7f41da..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO; -import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService; -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 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.List; -import java.util.Map; - -/** -* 计算碳价的工具货币字典表 -* -* @author xc -* @since 3.0 2024-12-05 -*/ -@RestController -@RequestMapping("v2/cbamcarbonpricecurrencydict") -@Tag(name="计算碳价的工具货币字典表") -@RequiredArgsConstructor -public class CbamCarbonPriceCurrencyDictController { - - private final CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService; - - @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 = cbamCarbonPriceCurrencyDictService.getPageData(params, CbamCarbonPriceCurrencyDictDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonPriceCurrencyDictDTO data = cbamCarbonPriceCurrencyDictService.getByIdAs(id, CbamCarbonPriceCurrencyDictDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonPriceCurrencyDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonPriceCurrencyDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonPriceCurrencyDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonPriceCurrencyDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonPriceCurrencyDictService.batchDelete(ids); - return new Result<>(); - } - @GetMapping("list") - @Operation(summary = "货币字典表") - @Parameters({ - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> list(@Parameter(hidden = true) @RequestParam Map params){ - List list = cbamCarbonPriceCurrencyDictService.listAs(params, CbamCarbonPriceCurrencyDictDTO.class); - return new Result>().ok(list); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamCarbonPriceCurrencyDictService.listAs(params, CbamCarbonPriceCurrencyDictDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "计算碳价的工具货币字典表", list, CbamCarbonPriceCurrencyDictExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java deleted file mode 100644 index 6406910..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamCountryDictDTO; -import com.thing.cbam.dict.service.CbamCountryDictService; -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.web.response.PageData; -import com.thing.common.core.web.response.Result; -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.List; -import java.util.Map; - -@RestController -@RequestMapping("v2/cbam/country/dict") -@Tag(name = "国家字典表") -@RequiredArgsConstructor -public class CbamCountryDictController { - private final CbamCountryDictService cbamCountryDictService; - @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 param) { - PageData pageList = cbamCountryDictService.getPageData(param,CbamCountryDictDTO.class); - return new Result>().ok(pageList); - } - - - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamCountryDictDTO dto = cbamCountryDictService.getByIdAs(id,CbamCountryDictDTO.class); - return new Result().ok(dto); - } - - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCountryDictDTO dto) { - cbamCountryDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCountryDictDTO dto) { - //效验数据 - //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCountryDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCountryDictService.batchDelete(ids); - return new Result<>(); - } - @GetMapping("list") - @Operation(summary = "查询国家列表") - @Parameters({ - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> list(@Parameter(hidden = true) @RequestParam Map params){ - List list = cbamCountryDictService.listAs(params, CbamCountryDictDTO.class); - return new Result>().ok(list); - } - - } diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java deleted file mode 100644 index e7bc4f8..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamFactorDictDTO; -import com.thing.cbam.dict.service.CbamFactorDictService; -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.web.response.PageData; -import com.thing.common.core.web.response.Result; -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.List; -import java.util.Map; - -@RestController -@RequestMapping("v2/cbam/factor/dict") -@Tag(name = "电力排放因子来源") -@RequiredArgsConstructor -public class CbamFactorDictController { - private final CbamFactorDictService cbamFactorDictService; - - @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 param) { - PageData pageList = cbamFactorDictService.getPageData(param, CbamFactorDictDTO.class); - return new Result>().ok(pageList); - } - - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamFactorDictDTO dto = cbamFactorDictService.getByIdAs(id, CbamFactorDictDTO.class); - return new Result().ok(dto); - } - - @PostMapping - @Operation(summary = "save") - @LogOperation("保存") - public Result save(@RequestBody CbamFactorDictDTO dto) { - cbamFactorDictService.saveDto(dto); - return new Result<>(); - } - @PutMapping - @Operation(summary = "update") - @LogOperation("修改") - public Result update(@RequestBody CbamFactorDictDTO dto) { - cbamFactorDictService.updateDto(dto); - return new Result<>(); - } - @DeleteMapping - @Operation(summary = "delete") - @LogOperation("删除") - public Result update(@RequestBody Long[] ids) { - AssertUtils.isArrayEmpty(ids,"id"); - cbamFactorDictService.batchDelete(ids); - return new Result<>(); - } - - - @GetMapping("list") - @Operation(summary = "电力排放因子来源") - @Parameters({ - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> list(@Parameter(hidden = true) @RequestParam Map params){ - List list = cbamFactorDictService.listAs(params, CbamFactorDictDTO.class); - return new Result>().ok(list); - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java deleted file mode 100644 index 048aa20..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamFuelDictDTO; -import com.thing.cbam.dict.service.CbamFuelDictService; -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 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.List; -import java.util.Map; - -/** -* 燃料参数字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@RestController -@RequestMapping("v2/cbam/fuel") -@Tag(name="燃料参数字典表") -@RequiredArgsConstructor -public class CbamFuelDictController { - - private final CbamFuelDictService cbamFuelDictService; - - @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 = cbamFuelDictService.getPageData(params, CbamFuelDictDTO.class); - return new Result>().ok(page); - } - - @GetMapping("list") - @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> list(@Parameter(hidden = true) @RequestParam Map params){ - List list = cbamFuelDictService.listAs(params, CbamFuelDictDTO.class); - return new Result>().ok(list); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamFuelDictDTO data = cbamFuelDictService.getByIdAs(id, CbamFuelDictDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamFuelDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamFuelDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamFuelDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamFuelDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamFuelDictService.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 = cbamFuelDictService.listAs(params, CbamFuelDictDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "燃料参数字典表", list, CbamFuelDictExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java deleted file mode 100644 index 18f6162..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamHsDictDTO; -import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; -import com.thing.cbam.dict.service.CbamHsDictService; -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 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.List; -import java.util.Map; - -/** -* hs字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@RestController -@RequestMapping("v2/cbam/hs") -@Tag(name="hs字典表") -@RequiredArgsConstructor -public class CbamHsDictController { - - private final CbamHsDictService cbamHsDictService; - - @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 = cbamHsDictService.getPageData(params, CbamHsDictDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamHsDictDTO data = cbamHsDictService.getByIdAs(id, CbamHsDictDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamHsDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamHsDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamHsDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamHsDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamHsDictService.batchDelete(ids); - return new Result<>(); - } - - - - @GetMapping("process/{code}") - @Operation(summary="信息") - public Result> getByHsCode(@PathVariable("code") String code){ - List cbamHsDictDTOS = cbamHsDictService.getByHsCode(code); - return new Result>().ok(cbamHsDictDTOS); - } - - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamHsDictService.listAs(params, CbamHsDictDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "hs字典表", list, CbamHsDictExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java deleted file mode 100644 index 3da627d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamIndustryDictDTO; -import com.thing.cbam.dict.service.CbamIndustryDictService; -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 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.List; -import java.util.Map; - -/** -* 所属行业字典 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@RestController -@RequestMapping("v2/cbam/industry/dict") -@Tag(name="所属行业字典") -@RequiredArgsConstructor -public class CbamIndustryDictController { - - private final CbamIndustryDictService cbamIndustryDictService; - - @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 = cbamIndustryDictService.getPageData(params, CbamIndustryDictDTO.class); - return new Result>().ok(page); - } - - - @GetMapping("list") - @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> list(@Parameter(hidden = true) @RequestParam Map params){ - List list = cbamIndustryDictService.listAs(params, CbamIndustryDictDTO.class); - return new Result>().ok(list); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamIndustryDictDTO data = cbamIndustryDictService.getByIdAs(id, CbamIndustryDictDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamIndustryDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamIndustryDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamIndustryDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamIndustryDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamIndustryDictService.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 = cbamIndustryDictService.listAs(params, CbamIndustryDictDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "所属行业字典", list, CbamIndustryDictExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java deleted file mode 100644 index 9ce2f49..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; -import com.thing.cbam.dict.service.CbamProdProcessDictService; -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 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.List; -import java.util.Map; - -/** -* 原料（生产过程）---工艺路线映射表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@RestController -@RequestMapping("v2/cbam/prodprocess") -@Tag(name="原料（生产过程）---工艺路线映射字典表") -@RequiredArgsConstructor -public class CbamProdProcessDictController { - - private final CbamProdProcessDictService cbamProdProcessDictService; - - @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 = cbamProdProcessDictService.getPageData(params, CbamProdProcessDictDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProdProcessDictDTO data = cbamProdProcessDictService.getByIdAs(id, CbamProdProcessDictDTO.class); - return new Result().ok(data); - } - - - @GetMapping("prod/{industryId}") - @Operation(summary="根据行业查询原料") - public Result> getByIndustryId(@PathVariable("industryId") Long industryId){ - List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByIndustryId(industryId); - return new Result>().ok(cbamProdProcessDictDTOS); - } - - - - @GetMapping("route/{prodId}") - @Operation(summary="根据原料查询工艺路线") - public Result> getByProdId(@PathVariable("prodId") Long prodId){ - List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdId(prodId); - return new Result>().ok(cbamProdProcessDictDTOS); - } - - - - @PostMapping("route/list") - @Operation(summary="工艺路线的集合") - public Result> getByProdIds(@RequestBody List prodIds){ - List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdIds(prodIds); - return new Result>().ok(cbamProdProcessDictDTOS); - } - - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProdProcessDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProdProcessDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProdProcessDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProdProcessDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProdProcessDictService.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 = cbamProdProcessDictService.listAs(params, CbamProdProcessDictDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "原料（生产过程）---工艺路线映射表", list, CbamProdProcessDictExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java deleted file mode 100644 index 3815396..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.thing.cbam.dict.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -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-12-05 -*/ -@Data -@Schema(description = "计算碳价的工具货币字典表") -public class CbamCarbonPriceCurrencyDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "货币中文名称") - private String name; - @Schema(description = "货币英文名称") - private String ename; - @Schema(description = "排序") - private Long sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java deleted file mode 100644 index ff94feb..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.thing.cbam.dict.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -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-12-04 -*/ -@Data -@Schema(description = "国家字典表") -public class CbamCountryDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "国家名称") - private String name; - @Schema(description = "国家英文名称") - private String ename; - @Schema(description = "是否默认：0.默认 1.不默认") - private Integer isDefault; - @Schema(description = "排序") - private String sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java deleted file mode 100644 index 4851924..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.thing.cbam.dict.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -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-12-05 -*/ -@Data -@Schema(description = "电力排放因子来源字典表") -public class CbamFactorDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "名称") - private String name; - @Schema(description = "说明") - private String description; - @Schema(description = "排序") - private Long sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java deleted file mode 100644 index 890388c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.thing.cbam.dict.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-11-29 -*/ -@Data -@Schema(description = "燃料参数字典表") -public class CbamFuelDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "中文名") - private String name; - @Schema(description = "英文名") - private String ename; - @Schema(description = "低位发热量") - private String lowHeatAmount; - @Schema(description = "单位") - private String unit; - @Schema(description = "碳氧化率") - private String carbonOxdRate; - @Schema(description = "排放因子") - private String emissionFactor; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java deleted file mode 100644 index f51bb59..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.thing.cbam.dict.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* hs字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Data -@Schema(description = "hs字典表") -public class CbamHsDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "预留字段,可以关联") - private String name; - @Schema(description = "hs编码") - private String code; - @Schema(description = "排序") - private String sort; - @Schema(description = "类型预留字段") - private String type; - @Schema(description = "英文名称预留字段") - private String ename; - @Schema(description = "关联cbam_prod_process_dict的id") - private Long prodProcessId; -// @Schema(description = "产品字典列表") -// private List prodProcessList; - @Schema(description = "生产过程/产品字典") - private CbamProdProcessDictDTO prodProcess; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java deleted file mode 100644 index 657253f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.thing.cbam.dict.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-11-29 -*/ -@Data -@Schema(description = "所属行业字典") -public class CbamIndustryDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "中文名称") - private String name; - @Schema(description = "英文名称") - private String ename; - @Schema(description = "排序") - private Integer sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java deleted file mode 100644 index baf22a0..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.thing.cbam.dict.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* 原料（生产过程）---工艺路线映射表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Data -@Schema(description = "原料（生产过程）---工艺路线映射表") -public class CbamProdProcessDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "中文名称") - private String name; - @Schema(description = "英文名称") - private String ename; - @Schema(description = "类型") - private String type; - @Schema(description = "排序") - private Integer sort; - @Schema(description = "是否表黄：0否 1是") - private Integer tagging; - @Schema(description = "关联：当type=yl 关联 cbam_industry_dict 主键id，否则关联本表的id") - private Long pidId; - @Schema(description = "生产工艺字典列表") - private List prodRouteList; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java deleted file mode 100644 index 969ec0b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 计算碳价的工具货币字典表 - * - * @author xc - * @since 3.0 2024-12-05 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_price_currency_dict") -public class CbamCarbonPriceCurrencyDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 货币中文名称 - */ - private String name; - /** - * 货币英文名称 - */ - private String ename; - /** - * 排序 - */ - private Long sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java deleted file mode 100644 index e454e06..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 国家字典表 - * - * @author xc - * @since 3.0 2024-12-04 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_country_dict") -public class CbamCountryDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 国家名称 - */ - private String name; - /** - * 国家英文名称 - */ - private String ename; - /** - * 是否默认：0.默认 1.不默认 - */ - private Integer isDefault; - /** - * 排序 - */ - private String sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java deleted file mode 100644 index 0bfe57b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 电力排放因子来源字典表 - * - * @author xc - * @since 3.0 2024-12-05 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_factor_dict") -public class CbamFactorDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 名称 - */ - private String name; - /** - * 说明 - */ - private String description; - /** - * 排序 - */ - private Long sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java deleted file mode 100644 index fe4553a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.thing.cbam.dict.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-11-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_fuel_dict") -public class CbamFuelDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long id; - /** - * 中文名 - */ - private String name; - /** - * 英文名 - */ - private String ename; - /** - * 低位发热量 - */ - private String lowHeatAmount; - /** - * 单位 - */ - private String unit; - /** - * 碳氧化率（氧化因子） - */ - private String carbonOxdRate; - /** - * 排放因子 - */ - private String emissionFactor; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java deleted file mode 100644 index 01359eb..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * hs字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_hs_dict") -public class CbamHsDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private Long id; - /** - * 预留字段,可以关联 - */ - private String name; - /** - * hs编码 - */ - private String code; - /** - * 排序 - */ - private String sort; - /** - * 类型预留字段 - */ - private String type; - /** - * 英文名称预留字段 - */ - private String ename; - /** - * 关联cbam_prod_process_dict的id - */ - private Long prodProcessId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java deleted file mode 100644 index efd76e8..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -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-11-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_industry_dict") -public class CbamIndustryDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private Long id; - /** - * 中文名称 - */ - private String name; - /** - * 英文名称 - */ - private String ename; - /** - * 排序 - */ - private Integer sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java deleted file mode 100644 index 895a333..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -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-11-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_prod_process_dict") -public class CbamProdProcessDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private Long id; - /** - * 中文名称 - */ - private String name; - /** - * 英文名称 - */ - private String ename; - /** - * 类型 - */ - private String type; - /** - * 排序 - */ - private Integer sort; - /** - * 是否表黄：0否 1是 - */ - private Integer tagging; - /** - * 关联：当type=yl 关联 cbam_industry_dict 主键id，否则关联本表的id - */ - private Long pidId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java deleted file mode 100644 index 4665ecd..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 计算碳价的工具货币字典表 -* -* @author xc -* @since 3.0 2024-12-05 -*/ -@Mapper -public interface CbamCarbonPriceCurrencyDictMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java deleted file mode 100644 index 9a47c84..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamCountryDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamCountryDictMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java deleted file mode 100644 index ef01f74..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamFactorDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamFactorDictMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java deleted file mode 100644 index 4d4467b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamFuelDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 燃料参数字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Mapper -public interface CbamFuelDictMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java deleted file mode 100644 index 66b559f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamHsDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* hs字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Mapper -public interface CbamHsDictMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java deleted file mode 100644 index 872053b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamIndustryDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 所属行业字典 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Mapper -public interface CbamIndustryDictMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java deleted file mode 100644 index 2091bfb..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 原料（生产过程）---工艺路线映射表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Mapper -public interface CbamProdProcessDictMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java deleted file mode 100644 index 938d414..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity; -import com.thing.common.orm.service.IBaseService; - - -/** - * 计算碳价的工具货币字典表 - * - * @author xc - * @since 3.0 2024-12-05 - */ -public interface CbamCarbonPriceCurrencyDictService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java deleted file mode 100644 index eb12ee7..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.thing.cbam.dict.service; - - -import com.thing.cbam.dict.entity.CbamCountryDictEntity; -import com.thing.common.orm.service.IBaseService; - - -public interface CbamCountryDictService extends IBaseService { - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java deleted file mode 100644 index d23279d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.entity.CbamFactorDictEntity; -import com.thing.common.orm.service.IBaseService; - -public interface CbamFactorDictService extends IBaseService { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java deleted file mode 100644 index 7702ffa..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.entity.CbamFuelDictEntity; -import com.thing.common.orm.service.IBaseService; - -/** - * 燃料参数字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -public interface CbamFuelDictService extends IBaseService { - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java deleted file mode 100644 index d1f16d5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.dto.CbamHsDictDTO; -import com.thing.cbam.dict.entity.CbamHsDictEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - - -/** - * hs字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -public interface CbamHsDictService extends IBaseService { - - List getByHsCode(String code); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java deleted file mode 100644 index 971f161..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.entity.CbamIndustryDictEntity; -import com.thing.common.orm.service.IBaseService; - - -/** - * 所属行业字典 - * - * @author xc - * @since 3.0 2024-11-29 - */ -public interface CbamIndustryDictService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java deleted file mode 100644 index de667b4..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; -import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; -import com.thing.common.orm.service.IBaseService; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.List; - - -/** - * 原料（生产过程）---工艺路线映射表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -public interface CbamProdProcessDictService extends IBaseService { - - - List getByIndustryId(Long industryId); - - List getByProdId(Long prodId); - - List getByProdIds(List prodIds); - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java deleted file mode 100644 index c61dd10..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity; -import com.thing.cbam.dict.mapper.CbamCarbonPriceCurrencyDictMapper; -import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 计算碳价的工具货币字典表 - * - * @author xc - * @since 3.0 2024-12-05 - */ -@Service -public class CbamCarbonPriceCurrencyDictServiceImpl extends BaseServiceImpl implements CbamCarbonPriceCurrencyDictService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java deleted file mode 100644 index 7f51b03..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.thing.cbam.dict.service.impl; - - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.dto.CbamCountryDictDTO; -import com.thing.cbam.dict.entity.CbamCountryDictEntity; -import com.thing.cbam.dict.mapper.CbamCountryDictMapper; -import com.thing.cbam.dict.service.CbamCountryDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -@Service -public class CbamCountryDictServiceImpl extends BaseServiceImpl implements CbamCountryDictService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper queryWrapper = new QueryWrapper(); - return queryWrapper; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java deleted file mode 100644 index 6f0cb2e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamFactorDictEntity; -import com.thing.cbam.dict.mapper.CbamFactorDictMapper; -import com.thing.cbam.dict.service.CbamFactorDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public class CbamFactorDictServiceImpl extends BaseServiceImpl implements CbamFactorDictService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java deleted file mode 100644 index ec93fc2..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import cn.hutool.core.map.MapUtil; -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamFuelDictEntity; -import com.thing.cbam.dict.mapper.CbamFuelDictMapper; -import com.thing.cbam.dict.service.CbamFuelDictService; -import com.thing.common.core.constants.Constant; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 燃料参数字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Service -public class CbamFuelDictServiceImpl extends BaseServiceImpl implements CbamFuelDictService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - - String orderField = MapUtil.getStr(params, Constant.ORDER_FIELD, "sort"); - String order = MapUtil.getStr(params, Constant.ORDER, Constant.ASC); - - wrapper.orderBy(orderField, Constant.ASC.equals(order)); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java deleted file mode 100644 index 3257a24..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.dto.CbamHsDictDTO; -import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; -import com.thing.cbam.dict.entity.CbamHsDictEntity; -import com.thing.cbam.dict.mapper.CbamHsDictMapper; -import com.thing.cbam.dict.service.CbamHsDictService; -import com.thing.cbam.dict.service.CbamProdProcessDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * hs字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Service -@RequiredArgsConstructor -public class CbamHsDictServiceImpl extends BaseServiceImpl implements CbamHsDictService { - - - private final CbamProdProcessDictService cbamProdProcessDictService; - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List getByHsCode(String code) { - //1.获取hscode代码 - List cbamHsDictDTOS = mapper.selectListByQueryAs( - new QueryWrapper() - .eq(CbamHsDictEntity::getCode, code) - .orderBy(CbamHsDictEntity::getSort, true) - , CbamHsDictDTO.class); - - for (CbamHsDictDTO cbamHsDictDTO : cbamHsDictDTOS) { - //查询原料或者生产过程 - CbamProdProcessDictDTO prodDict = cbamProdProcessDictService.getByIdAs(cbamHsDictDTO.getProdProcessId(),CbamProdProcessDictDTO.class); - //查询生产工艺 - List ruteList = cbamProdProcessDictService.getByProdId(prodDict.getId()); - prodDict.setProdRouteList(ruteList); - cbamHsDictDTO.setProdProcess(prodDict); - } - return cbamHsDictDTOS; - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java deleted file mode 100644 index 32a653b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamIndustryDictEntity; -import com.thing.cbam.dict.mapper.CbamIndustryDictMapper; -import com.thing.cbam.dict.service.CbamIndustryDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 所属行业字典 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Service -public class CbamIndustryDictServiceImpl extends BaseServiceImpl implements CbamIndustryDictService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java deleted file mode 100644 index 8b85991..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; -import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; -import com.thing.cbam.dict.mapper.CbamProdProcessDictMapper; -import com.thing.cbam.dict.service.CbamProdProcessDictService; -import com.thing.common.core.constants.Constant; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * 原料（生产过程）---工艺路线映射表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Service -public class CbamProdProcessDictServiceImpl extends BaseServiceImpl implements CbamProdProcessDictService { - - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List getByIndustryId(Long industryId) { - return getByPidIdAndType(industryId, null,"yl", Constant.ASC); - } - - @Override - public List getByProdId(Long prodId) { - return getByPidIdAndType(prodId, null,"gylx", Constant.ASC); - } - - @Override - public List getByProdIds(List prodIds) { - return getByPidIdAndType(null, prodIds,"gylx", Constant.ASC); - } - - - public List getByPidIdAndType(Long pidId, List pidIds, String type, String order) { - boolean asc = true; - if (StringUtils.equalsIgnoreCase(Constant.DESC, order)) { - asc = false; - } - QueryWrapper queryWrapper = QueryWrapper.create() - .eq(CbamProdProcessDictEntity::getPidId, pidId, Objects::nonNull) - .eq(CbamProdProcessDictEntity::getPidId, pidIds, CollectionUtils::isNotEmpty) - .eq(CbamProdProcessDictEntity::getType, type) - .orderBy(CbamProdProcessDictEntity::getSort, asc); - return mapper.selectListByQueryAs(queryWrapper, CbamProdProcessDictDTO.class); - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java deleted file mode 100644 index 633e650..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.thing.cbam.directCarbon.controller; - -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectContextDTO; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; -import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; -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 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.List; -import java.util.Map; - -/** -* 直接排放量B-Excel -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@RestController -@RequestMapping("v2/cbam/carbon/direct") -@Tag(name="直接排放量B-Excel") -@RequiredArgsConstructor -public class CbamCarbonDirectController { - - private final CbamCarbonDirectService cbamCarbonDirectService; - - @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 = cbamCarbonDirectService.getPageData(params, CbamCarbonDirectDTO.class); - return new Result>().ok(page); - } - - - @GetMapping("listByIndustryId") - @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> listByIndustryId(@RequestParam Long industryId){ - List cbamCarbonDirectDTOS = cbamCarbonDirectService.listByIndustryId(industryId); - return new Result>().ok(cbamCarbonDirectDTOS); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonDirectDTO data = cbamCarbonDirectService.getByIdAs(id, CbamCarbonDirectDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存单个的tab信息-对于当前项目不建议使用") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonDirectDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonDirectService.saveDto(dto); - return new Result<>(); - } - - @PostMapping("batchSaveOrUpdate") - @Operation(summary="批量保存或者更新") - @LogOperation("批量保存或者更新") - public Result batchSaveOrUpdate(@RequestBody List carbonDirectDTOList){ - //效验数据 - cbamCarbonDirectService.batchSaveOrUpdate(carbonDirectDTOList); - return new Result<>(); - } - - @PostMapping("batchSaveOrUpdateCarbonDirect") - @Operation(summary="批量保存或者更新整个B-excel") - @LogOperation("批量保存或者更新") - public Result batchSaveOrUpdateCarbonDirect(@RequestBody CbamCarbonDirectContextDTO directContextDTO){ - return new Result().ok(cbamCarbonDirectService.batchSaveOrUpdateCarbonDirect(directContextDTO)); - } - - @PostMapping("batchUpdate") - @Operation(summary="批量更新") - @LogOperation("批量更新") - public Result batchUpdateList(@RequestBody List carbonDirectDTOList){ - //效验数据 - cbamCarbonDirectService.batchSaveOrUpdate(carbonDirectDTOList); - return new Result<>(); - } - - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonDirectDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonDirectService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonDirectService.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 = cbamCarbonDirectService.listAs(params, CbamCarbonDirectDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量B-Excel", list, CbamCarbonDirectExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java deleted file mode 100644 index 33d190b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.thing.cbam.directCarbon.controller; - -import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; -import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; -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 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.List; -import java.util.Map; - -/** -* 全氟化碳PFC排放 -* -* @author xc -* @since 3.0 2024-12-03 -*/ -@RestController -@RequestMapping("v2/cbam/perfluorinated") -@Tag(name="全氟化碳PFC排放") -@RequiredArgsConstructor -public class CbamPerfluorinatedCarbonController { - - private final CbamPerfluorinatedCarbonService cbamPerfluorinatedCarbonService; - - @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 = cbamPerfluorinatedCarbonService.getPageData(params, CbamPerfluorinatedCarbonDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamPerfluorinatedCarbonDTO data = cbamPerfluorinatedCarbonService.getByIdAs(id, CbamPerfluorinatedCarbonDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamPerfluorinatedCarbonDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamPerfluorinatedCarbonService.saveDto(dto); - return new Result<>(); - } - - - @PostMapping("batchSaveOrUpdate") - @Operation(summary="保存") - @LogOperation("保存") - public Result batchSaveOrUpdate(@RequestBody List list){ - //效验数据 - // ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamPerfluorinatedCarbonService.batchSaveOrUpdate(list); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamPerfluorinatedCarbonDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamPerfluorinatedCarbonService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamPerfluorinatedCarbonService.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 = cbamPerfluorinatedCarbonService.listAs(params, CbamPerfluorinatedCarbonDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "全氟化碳PFC排放", list, CbamPerfluorinatedCarbonExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamProcessAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamProcessAllocationController.java deleted file mode 100644 index d5096c3..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamProcessAllocationController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.thing.cbam.directCarbon.controller; - -import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; -import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; -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 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-12-02 -*/ -@RestController -@RequestMapping("v2/cbam/allocation") -@Tag(name="生产过程分配量") -@RequiredArgsConstructor -public class CbamProcessAllocationController { - - private final CbamProcessAllocationService cbamProcessAllocationService; - - @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 = cbamProcessAllocationService.getPageData(params, CbamProcessAllocationDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProcessAllocationDTO data = cbamProcessAllocationService.getByIdAs(id, CbamProcessAllocationDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProcessAllocationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProcessAllocationService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProcessAllocationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProcessAllocationService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProcessAllocationService.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 = cbamProcessAllocationService.listAs(params, CbamProcessAllocationDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "生产过程分配量", list, CbamProcessAllocationExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java deleted file mode 100644 index ae9d401..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.thing.cbam.directCarbon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* 直接排放量B-Excel -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Data -@Schema(description = "直接排放量B-Excel") -public class CbamCarbonDirectContextDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "类型：\n" + - "1.是否涉及燃烧排放\n" + - "2.是否涉及过程排放\n" + - "3.是否涉及物料平衡\n" + -// "4.是否涉及斜率法\n" + -// "5.是否涉及过电压法\n" + - "6.是否有连续排放测量系统(CEMS)\n" + - "7.各生产过程中原材料/燃料的分配") - private List carbonDirectList; - - - - @Schema(description = "类型：\n" + -// "1.是否涉及燃烧排放\n" + -// "2.是否涉及过程排放\n" + -// "3.是否涉及物料平衡\n" + - "4.是否涉及斜率法\n" + - "5.是否涉及过电压法\n" -// "6.是否有连续排放测量系统(CEMS)\n" + -// "7.各生产过程中原材料/燃料的分配" - ) - private List perfluorinatedCarbonList; - - - @Schema(description = "类型：\n" + -// "1.是否涉及燃烧排放\n" + -// "2.是否涉及过程排放\n" + -// "3.是否涉及物料平衡\n" + -// "4.是否涉及斜率法\n" + -// "5.是否涉及过电压法\n" -// "6.是否有连续排放测量系统(CEMS)\n" + - "7.各生产过程中原材料/燃料的分配" - ) - private List processAllocationList; - - - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java deleted file mode 100644 index 9b45d26..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.thing.cbam.directCarbon.dto; - -import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* 直接排放量B-Excel -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Data -@Schema(description = "直接排放量B-Excel") -public class CbamCarbonDirectDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "燃料名称/过程排放名称/物料平衡名称") - private String name; - @Schema(description = "消耗量/产量：输入") - private String consumeAmount; - @Schema(description = "消耗量单位：t 或者 1000Nm2") - private String consumeUnit; - @Schema(description = "低位发热量：燃料字典表值") - private String lowHeatVal; - @Schema(description = "低位发热量单位：燃料字典表值") - private String lowHeatUnit; - @Schema(description = "排放因子：燃料字典表值") - private String emissionFactors; - @Schema(description = "排放因子单位：燃料字典表值") - private String emissionFactorsUnit; - @Schema(description = "氧化因子/转化因子：燃料字典表值") - private String oxidationFactor; - @Schema(description = "生物量含量/生物质组分：输入") - private String biomassContent; - @Schema(description = "直接碳排量：计算") - private String directCarbonNum; - @Schema(description = "生物质燃料排放量：计算") - private String biomassFuelNum; - @Schema(description = "能量含量(化石燃料)，TJ：计算") - private String energyFossilNum; - @Schema(description = "能量含量(生物燃料)，TJ：计算") - private String energyBiologyNum; - @Schema(description = "碳含量(tC/t)") - private String carbonNum; - @Schema(description = "气体类型：CO2/N2O") - private String gasType; - @Schema(description = "生物质组分单位") - private String biomassUnit; - @Schema(description = "每小时平均温室气体浓度") - private String hourAvgGasDensity; - @Schema(description = "每小时平均温室气体浓度.单位") - private String hourAvgGasDensityUnit; - @Schema(description = "运行小时数") - private String runHours; - @Schema(description = "烟气") - private String smokeAvg; - @Schema(description = "烟气.单位") - private String smokeAvgUnit; - @Schema(description = "温室气体年排放量") - private String gasAnnualEmissions; - @Schema(description = "温室气体年排放量单位") - private String gasAnnualEmissionsUnit; - @Schema(description = "化石燃料碳排放量") - private String fossilFuelCarbon; - @Schema(description = "全球变暖潜势id") - private String globalWarmingId; - @Schema(description = "全球变暖潜势") - private String globalWarming; - @Schema(description = "关联cbam_industry_info的主键id") - private Long industryId; - @Schema(description = "类型：\n" + - "1.是否涉及燃烧排放\n" + - "2.是否涉及过程排放\n" + - "3.是否涉及物料平衡\n" + -// "4.是否涉及斜率法\n" + -// "5.是否涉及过电压法\n" + - "6.是否有连续排放测量系统(CEMS)\n" + - "7.各生产过程中原材料/燃料的分配") - private Integer type; - private Long sort; - @Schema(description = "生产过程分配量") - private String processAllocation; - @Schema(description = "铝制品：6：倾斜法 7电压法 集合") - private List perfluorinatedCarbonDTOList; - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java deleted file mode 100644 index f403b2c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.thing.cbam.directCarbon.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -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-11-27 -*/ -@Data -@Schema(description = "原料过程排放") -public class CbamCarbonProgressDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "名称") - private String name; - @Schema(description = "消耗量") - private String consumAmount; - @Schema(description = "排放因子") - private String emissionFactors; - @Schema(description = "排放源名称") - private String emissionName; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java deleted file mode 100644 index d97e02f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.thing.cbam.directCarbon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 全氟化碳PFC排放 -* -* @author xc -* @since 3.0 2024-12-03 -*/ -@Data -@Schema(description = "全氟化碳PFC排放-铝制品") -public class CbamPerfluorinatedCarbonDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "阳极类型字典id") - private Long anodeTypeId; - @Schema(description = "阳极类型") - private String anodeType; - @Schema(description = "消耗量/产量：输入") - private String consumeAmount; - @Schema(description = "化石燃料碳排放量") - private String energyFossilNum; - @Schema(description = "消耗量/产量 单位") - private String consumeAmountUnit; - @Schema(description = "化石燃料碳排放量单位") - private String energyFossilUnit; - @Schema(description = "阳极类型(其他)") - private String anodeOtherType; - @Schema(description = "A: 频率") - private String rate; - @Schema(description = "A: 持续时间") - private String duration; - @Schema(description = "A:SEF(四氟化碳，CF)") - private String sfht; - @Schema(description = "F(六氟乙烷，CzFe)") - private String sfyw; - @Schema(description = "全球变暖潜势(A:SEF(四氟化碳，CF))") - private String globalWarmingSfht; - @Schema(description = "全球变暖潜势(F(六氟乙烷，CzFe))") - private String globalWarmingSfyw; - @Schema(description = "收集评率") - private String collectRate; - @Schema(description = "关联cbam_industry_info的主键id") - private Long industryId; - @Schema(description = "类型：4：倾斜法 5 电压法") - private Integer type; - @Schema(description = "排序") - private Long sort; - @Schema(description = "B: AEO") - private String aeo; - @Schema(description = "B: OVC") - private String ovc; - @Schema(description = "B:CE") - private String ce; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java deleted file mode 100644 index 22256da..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.thing.cbam.directCarbon.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-12-02 -*/ -@Data -@Schema(description = "生产过程分配量") -public class CbamProcessAllocationDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "排放源名称") - private String name; - @Schema(description = "关联cbam_industry_info的主键id") - private Long industryId; - @Schema(description = "关联cbam_process_material的id") - private Long prodId; - @Schema(description = "关联cbam_carbon_direct的id") - private Long directId; - @Schema(description = "生产过程分配量") - private String processAllocation; - @Schema(description = "排序") - private Long sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java deleted file mode 100644 index b5cac9b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.thing.cbam.directCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 直接排放量B-Excel - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_direct") -public class CbamCarbonDirectEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 燃料名称/过程排放名称/物料平衡名称 - */ - private String name; - /** - * 消耗量/产量：输入 - */ - private String consumeAmount; - /** - * 消耗量单位：t 或者 1000Nm2 - */ - private String consumeUnit; - /** - * 低位发热量：燃料字典表值 - */ - private String lowHeatVal; - /** - * 低位发热量单位：燃料字典表值 - */ - private String lowHeatUnit; - /** - * 排放因子：燃料字典表值 - */ - private String emissionFactors; - /** - * 排放因子单位：燃料字典表值 - */ - private String emissionFactorsUnit; - /** - * 氧化因子/转化因子：燃料字典表值 - */ - private String oxidationFactor; - /** - * 生物量含量/生物质组分：输入 - */ - private String biomassContent; - /** - * 直接碳排量：计算 - */ - private String directCarbonNum; - /** - * 生物质燃料排放量：计算 - */ - private String biomassFuelNum; - /** - * 能量含量(化石燃料)，TJ：计算 - */ - private String energyFossilNum; - /** - * 能量含量(生物燃料)，TJ：计算 - */ - private String energyBiologyNum; - /** - * 碳含量(tC/t) - */ - private String carbonNum; - /** - * 气体类型：CO2/N2O - */ - private String gasType; - /** - * 生物质组分单位 - */ - private String biomassUnit; - /** - * 每小时平均温室气体浓度 - */ - private String hourAvgGasDensity; - /** - * 每小时平均温室气体浓度.单位 - */ - private String hourAvgGasDensityUnit; - /** - * 运行小时数 - */ - private String runHours; - /** - * 烟气 - */ - private String smokeAvg; - /** - * 烟气.单位 - */ - private String smokeAvgUnit; - /** - * 温室气体年排放量 - */ - private String gasAnnualEmissions; - /** - * 温室气体年排放量单位 - */ - private String gasAnnualEmissionsUnit; - /** - * 化石燃料碳排放量 - */ - private String fossilFuelCarbon; - /** - * 全球变暖潜势id - */ - private String globalWarmingId; - /** - * 全球变暖潜势 - */ - private String globalWarming; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - - /** - * 类型： - * 1.是否涉及燃烧排放 - * 2.是否涉及过程排放 - * 3.是否涉及物料平衡 - * 4.是否有连续排放测量系统(CEMS) - */ - private Integer type; - private Long sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java deleted file mode 100644 index 519d03d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.thing.cbam.directCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 原料过程排放 - * - * @author xc - * @since 3.0 2024-11-27 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_progress") -public class CbamCarbonProgressEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 名称 - */ - private String fuelName; - /** - * 消耗量 - */ - private String consumAmount; - /** - * 排放因子 - */ - private String emissionFactors; - /** - * 排放源名称 - */ - private String emissionName; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java deleted file mode 100644 index 38ae13c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.thing.cbam.directCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 全氟化碳PFC排放 - * - * @author xc - * @since 3.0 2024-12-03 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_perfluorinated_carbon") -public class CbamPerfluorinatedCarbonEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 阳极类型字典id - */ - private Long anodeTypeId; - /** - * 阳极类型 - */ - private String anodeType; - /** - * 消耗量/产量：输入 - */ - private String consumeAmount; - /** - * 化石燃料碳排放量 - */ - private String energyFossilNum; - /** - * 消耗量/产量 单位 - */ - private String consumeAmountUnit; - /** - * 化石燃料碳排放量单位 - */ - private String energyFossilUnit; - /** - * 阳极类型(其他) - */ - private String anodeOtherType; - /** - * A: 频率 - */ - private String rate; - /** - * A: 持续时间 - */ - private String duration; - /** - * A:SEF(四氟化碳，CF) - */ - private String sfht; - /** - * F(六氟乙烷，CzFe) - */ - private String sfyw; - /** - * 全球变暖潜势(A:SEF(四氟化碳，CF)) - */ - private String globalWarmingSfht; - /** - * 全球变暖潜势(F(六氟乙烷，CzFe)) - */ - private String globalWarmingSfyw; - private String collectRate; - /** - * 关联cbam_industry_info的主键id - */ - private Long industryId; - /** - * 类型：6：倾斜法 7电压法 - */ - private Integer type; - /** - * 排序 - */ - private Long sort; - /** - * B: AEO - */ - private String aeo; - /** - * B: OVC - */ - private String ovc; - /** - * B:CE - */ - private String ce; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java deleted file mode 100644 index 1ac37b6..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.thing.cbam.directCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 生产过程分配量 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_process_allocation") -public class CbamProcessAllocationEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 排放源名称 - */ - private String name; - - /** - * 关联cbam_industry_info的主键id - */ - private Long industryId; - - /** - * 关联cbam_process_material的id - */ - private Long prodId; - - /** - * 关联cbam_carbon_direct的id - */ - private Long directId; - - /** - * 生产过程分配量 - */ - private String processAllocation; - - - /** - * 排序 - */ - private Long sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java deleted file mode 100644 index b663595..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.directCarbon.mapper; - -import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 直接排放量B-Excel -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Mapper -public interface CbamCarbonDirectMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java deleted file mode 100644 index f04de87..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.directCarbon.mapper; - -import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 全氟化碳PFC排放 -* -* @author xc -* @since 3.0 2024-12-03 -*/ -@Mapper -public interface CbamPerfluorinatedCarbonMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java deleted file mode 100644 index 6e180e8..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.directCarbon.mapper; - -import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 生产过程分配量 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Mapper -public interface CbamProcessAllocationMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java deleted file mode 100644 index ddfbf5f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.thing.cbam.directCarbon.service; - -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectContextDTO; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; -import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; -import com.thing.common.orm.service.IBaseService; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - -/** - * 直接排放量B-Excel - * - * @author xc - * @since 3.0 2024-12-02 - */ -public interface CbamCarbonDirectService extends IBaseService { - - List batchSaveOrUpdate(List carbonDirectDTOList); - - CbamCarbonDirectContextDTO batchSaveOrUpdateCarbonDirect(CbamCarbonDirectContextDTO cbamCarbonDirectContextDTO); - - List listByIndustryId(Long industryId); - - void batchUpdateList(List carbonDirectDTOList); - - Map calculate(Long fuelId, String consumeAmount, String biomassContent); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java deleted file mode 100644 index f617428..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.thing.cbam.directCarbon.service; - -import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; -import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -/** - * 全氟化碳PFC排放 - * - * @author xc - * @since 3.0 2024-12-03 - */ -public interface CbamPerfluorinatedCarbonService extends IBaseService { - - List batchSaveOrUpdate(List list); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java deleted file mode 100644 index 1f2e469..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.thing.cbam.directCarbon.service; - -import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; -import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -/** - * 生产过程分配量 - * - * @author xc - * @since 3.0 2024-12-02 - */ -public interface CbamProcessAllocationService extends IBaseService { - - List batchSaveOrUpdate(List list); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java deleted file mode 100644 index 629fd5c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.thing.cbam.directCarbon.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamFuelDictEntity; -import com.thing.cbam.dict.service.CbamFuelDictService; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectContextDTO; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; -import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; -import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; -import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; -import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; -import com.thing.cbam.directCarbon.mapper.CbamCarbonDirectMapper; -import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; -import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; -import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; -import com.thing.cbam.directCarbon.util.BurningDischargeUtil; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - * 直接排放量B-Excel - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Service -@RequiredArgsConstructor -public class CbamCarbonDirectServiceImpl extends BaseServiceImpl implements CbamCarbonDirectService { - - - private final CbamFuelDictService cbamFuelDictService; - private final CbamPerfluorinatedCarbonService cbamPerfluorinatedCarbonService; - private final CbamProcessAllocationService cbamProcessAllocationService; - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List listByIndustryId(Long industryId) { - QueryWrapper queryWrapper = QueryWrapper.create().eq(CbamCarbonDirectEntity::getIndustryId, industryId) - .orderBy(CbamCarbonDirectEntity::getType, true) - .orderBy(CbamCarbonDirectEntity::getSort, true); - return mapper.selectListByQueryAs(queryWrapper, CbamCarbonDirectDTO.class); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public List batchSaveOrUpdate(List carbonDirectDTOList) { - List resList = new ArrayList<>(); - //根据type分组 - Map> carbonDirectMapList = carbonDirectDTOList.stream().collect(Collectors.groupingBy(CbamCarbonDirectDTO::getType)); - for (Map.Entry> entries : carbonDirectMapList.entrySet()) { - Integer key = entries.getKey(); - if(Objects.equals(key,1) || Objects.equals(key,2) || Objects.equals(key,3)|| Objects.equals(key,6)|| Objects.equals(key,7)){ - List values = entries.getValue(); - List industryIds = values.stream().map(CbamCarbonDirectDTO::getIndustryId).toList(); - //先删除 - mapper.deleteByQuery(QueryWrapper.create() - .in(CbamCarbonDirectEntity::getIndustryId, industryIds) - .eq(CbamCarbonDirectEntity::getType, key)); - List cbamCarbonDirectEntities = ConvertUtils.sourceToTarget(values, CbamCarbonDirectEntity.class); - mapper.insertBatch(cbamCarbonDirectEntities); - resList.addAll(ConvertUtils.sourceToTarget(cbamCarbonDirectEntities, CbamCarbonDirectDTO.class)); - } - } - return resList; - } - - @Override - public CbamCarbonDirectContextDTO batchSaveOrUpdateCarbonDirect(CbamCarbonDirectContextDTO cbamCarbonDirectContextDTO) { - CbamCarbonDirectContextDTO resDTO = new CbamCarbonDirectContextDTO(); - //处理直接碳排数据，类型是1、2、3、6 - List cbamCarbonDirectDTOS = batchSaveOrUpdate(cbamCarbonDirectContextDTO.getCarbonDirectList()); - resDTO.setCarbonDirectList(cbamCarbonDirectDTOS); - //处理直接碳排数据，类型是4、5 - List cbamPerfluorinatedCarbonDTOS = cbamPerfluorinatedCarbonService.batchSaveOrUpdate(cbamCarbonDirectContextDTO.getPerfluorinatedCarbonList()); - resDTO.setPerfluorinatedCarbonList(cbamPerfluorinatedCarbonDTOS); - //处理直接碳排数据，类型是7 - List cbamProcessAllocationDTOS = cbamProcessAllocationService.batchSaveOrUpdate(cbamCarbonDirectContextDTO.getProcessAllocationList()); - resDTO.setProcessAllocationList(cbamProcessAllocationDTOS); - return resDTO; - } - - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchUpdateList(List carbonDirectDTOList) { - //1.删除直接碳排相关的数据 - mapper.deleteByQuery(QueryWrapper.create().eq(CbamCarbonDirectEntity::getIndustryId,carbonDirectDTOList.get(0).getIndustryId())); - //2.删除各生产过程中原材料/燃料的分配 - cbamProcessAllocationService.getMapper() - .deleteByQuery(QueryWrapper.create().eq(CbamProcessAllocationEntity::getIndustryId,carbonDirectDTOList.get(0).getIndustryId())); - //重新添加相关信息 - batchSaveOrUpdate(carbonDirectDTOList); - } - - @Override - public Map calculate(Long fuelId, String consumeAmount, String biomassContent) { - Map resMap = new HashMap<>(); - //获取燃料系数字典信息 - CbamFuelDictEntity cbamFuelDict = cbamFuelDictService.getById(fuelId); - if(Objects.isNull(cbamFuelDict)){ - throw new RuntimeException("燃料系数字典信息不存在"); - } - //公用计算：消耗量*低位发热量 - String lowHeatAmount = cbamFuelDict.getLowHeatAmount(); - //1.首先先计算（第四个）----能量含量(生物质燃料)，工J =消耗量*低位发热量*生物量含量/100/1000 - BigDecimal energyBiologyNum = - BurningDischargeUtil.energyBiologyNumCalculate(consumeAmount, lowHeatAmount, biomassContent); - resMap.put("energyBiologyNum",energyBiologyNum); - //2.其次计算第三个：能量含量(化石燃料),TJ =消耗量*低位发热量/1000-能量含量(生物质燃料) - BigDecimal energyFossilNum = BurningDischargeUtil.energyHsNumCalculate(consumeAmount, lowHeatAmount, energyBiologyNum.toPlainString()); - resMap.put("energyFossilNum",energyFossilNum); - //3.生物质燃料排放量 =消耗量*低位发热量*生物量含量*排放因子/100/1000 - BigDecimal biomassFuelNum = BurningDischargeUtil.biomassFuelNumCalculate(consumeAmount, lowHeatAmount, biomassContent, cbamFuelDict.getEmissionFactor()); - resMap.put("biomassFuelNum",biomassFuelNum); - //4.直接碳排放量 =消耗量*低位发热量*氧化因子*排放因子/100/1000-生物质燃料排放量 - BigDecimal directCarbonNum = BurningDischargeUtil.directCarbonCalculate(consumeAmount, lowHeatAmount, biomassContent, cbamFuelDict.getEmissionFactor(), cbamFuelDict.getCarbonOxdRate()); - resMap.put("directCarbonNum",directCarbonNum); - return resMap; - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java deleted file mode 100644 index 6620ec2..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.thing.cbam.directCarbon.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; -import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; -import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; -import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; -import com.thing.cbam.directCarbon.mapper.CbamPerfluorinatedCarbonMapper; -import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * 全氟化碳PFC排放 - * - * @author xc - * @since 3.0 2024-12-03 - */ -@Service -@RequiredArgsConstructor -public class CbamPerfluorinatedCarbonServiceImpl extends BaseServiceImpl implements CbamPerfluorinatedCarbonService { - - private final CbamIndustryService cbamIndustryService; - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List batchSaveOrUpdate(List list) { - //只有铝制品行业有以下处理 - // type=4,5 的类型 单独 更新生产过程中的分配量 - List industryIds = list.stream().map(CbamPerfluorinatedCarbonDTO::getIndustryId).distinct().toList(); - //先删除 - mapper.deleteByQuery(QueryWrapper.create().in(CbamPerfluorinatedCarbonEntity::getIndustryId, industryIds)); - //再新增 - List perfluorinatedCarbonEntities = ConvertUtils.sourceToTarget(list, CbamPerfluorinatedCarbonEntity.class); - mapper.insertBatch(perfluorinatedCarbonEntities); - return ConvertUtils.sourceToTarget(perfluorinatedCarbonEntities, CbamPerfluorinatedCarbonDTO.class); -// if(CollectionUtils.isEmpty(list)){ -// throw new RuntimeException("铝制品行业相关《倾斜法，电压法》没有相关数据"); -// } -// //1.获取相关industryId -// Long industryId = list.get(0).getIndustryId(); -// CbamIndustryEntity cbamIndustryEntity = cbamIndustryService.getById(industryId); -// if(!StringUtils.equals(cbamIndustryEntity.getIndustryDict(), "铝行业") && !Objects.equals(cbamIndustryEntity.getIndustryDictId(), 11002L)){ -// throw new RuntimeException("非铝制品行业相关《倾斜法，电压法》行业，无需添加"); -// } -// //1.1获取id没有值的参数,即新增数据 -// List newList = list.stream().filter(carbonDirectDTO -> Objects.isNull(carbonDirectDTO.getId())).toList(); -// if(CollectionUtils.isNotEmpty(newList)){ -// mapper.insertBatch(ConvertUtils.sourceToTarget(newList, CbamPerfluorinatedCarbonEntity.class)); -// } -// //1.2 获取id有值的参数,即更新数据 -// List existList = list.stream().filter(carbonDirectDTO -> Objects.isNull(carbonDirectDTO.getId())).toList(); -// if(CollectionUtils.isEmpty(existList)){ -// return; -// } -// //2.根据industryId查询所有数据 -// List perfluorinatedCarbonEntities = -// mapper.selectListByQuery(QueryWrapper.create().eq(CbamPerfluorinatedCarbonEntity::getIndustryId, industryId)); -// //3.获取参数中需要更新的id -// List updateIds = existList.stream().map(CbamPerfluorinatedCarbonDTO::getId).toList(); -// //4.排除不需要更新的id集合,并且删除相关信息 -// if(CollectionUtils.isNotEmpty(perfluorinatedCarbonEntities)){ -// //获取不在数据库的id集合 -// List unUpdatePerfluorinatedEntities -// = perfluorinatedCarbonEntities.stream().filter(carbonDirectEntity -> !updateIds.contains(carbonDirectEntity.getId())).toList(); -// if(CollectionUtils.isNotEmpty(unUpdatePerfluorinatedEntities)){ -// mapper.deleteBatchByIds(unUpdatePerfluorinatedEntities.stream().map(CbamPerfluorinatedCarbonEntity::getId).toList()); -// } -// //获取在数据库的记录,并进行更新 -// List existPerfluorinatedCarbons = existList.stream().filter(s -> updateIds.contains(s.getId())).toList(); -// if(CollectionUtils.isNotEmpty(existPerfluorinatedCarbons)){ -// existPerfluorinatedCarbons.forEach(carbonDirectDTO -> mapper.update(ConvertUtils.sourceToTarget(carbonDirectDTO, CbamPerfluorinatedCarbonEntity.class))); -// } -// } - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java deleted file mode 100644 index 2438d43..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.thing.cbam.directCarbon.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; -import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; -import com.thing.cbam.directCarbon.mapper.CbamProcessAllocationMapper; -import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * 生产过程分配量 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Service -public class CbamProcessAllocationServiceImpl extends BaseServiceImpl implements CbamProcessAllocationService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - @Override - public List batchSaveOrUpdate(List list) { - //先删除 - List industryIds = list.stream().map(CbamProcessAllocationDTO::getIndustryId).toList(); - List prodIds = list.stream().map(CbamProcessAllocationDTO::getProdId).toList(); - List directId = list.stream().map(CbamProcessAllocationDTO::getDirectId).toList(); - mapper.deleteByQuery(new QueryWrapper() - .in(CbamProcessAllocationEntity::getIndustryId, industryIds) - .in(CbamProcessAllocationEntity::getProdId, prodIds) - .in(CbamProcessAllocationEntity::getDirectId, directId)); - //再新增 - List cbamProcessAllocationEntities = ConvertUtils.sourceToTarget(list, CbamProcessAllocationEntity.class); - mapper.insertBatch(cbamProcessAllocationEntities); - return ConvertUtils.sourceToTarget(cbamProcessAllocationEntities, CbamProcessAllocationDTO.class); - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java deleted file mode 100644 index 85bdd4d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.thing.cbam.directCarbon.util; - -import java.math.BigDecimal; -import java.math.RoundingMode; - -/** - * 燃烧排放的计算工具类 - */ -public class BurningDischargeUtil { - - /** - * 公用计算：消耗量*低位发热量 - * @param consumeAmount 消耗量 - * @param lowHeatAmount 低位发热量 - * @return 公用计算结果 - */ - public static BigDecimal commonCalculate(String consumeAmount,String lowHeatAmount) { - return new BigDecimal(consumeAmount).multiply(new BigDecimal(lowHeatAmount)); - } - - /** - * 能量含量(生物质燃料)，工J =消耗量*低位发热量*生物量含量/100/1000 - * @param consumeAmount 消耗量 - * @param lowHeatAmount 低位发热量 - * @param biomassContent 生物量含量 - * @return 公用计算结果 - */ - public static BigDecimal energyBiologyNumCalculate(String consumeAmount, String lowHeatAmount, String biomassContent) { - return commonCalculate(consumeAmount,lowHeatAmount) - .multiply(new BigDecimal(biomassContent)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP); - } - - /** - * 能量含量(化石燃料),TJ =消耗量*低位发热量/1000-能量含量(生物质燃料) - * @param consumeAmount 消耗量 - * @param lowHeatAmount 低位发热量 - * @param energyBiologyNum 能量含量(生物质燃料) - * @return 公用计算结果 - */ - public static BigDecimal energyHsNumCalculate(String consumeAmount,String lowHeatAmount,String energyBiologyNum) { - return commonCalculate(consumeAmount,lowHeatAmount) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP) - .subtract(energyBiologyNumCalculate(consumeAmount,lowHeatAmount,energyBiologyNum)); - } - - - /** - * 生物质燃料排放量 =消耗量*低位发热量*生物量含量*排放因子/100/1000 - * @param consumeAmount 消耗量 - * @param lowHeatAmount 低位发热量 - * @param biomassContent 生物量含量 - * @param emissionFactor 排放因子 - * @return 公用计算结果 - */ - public static BigDecimal biomassFuelNumCalculate(String consumeAmount,String lowHeatAmount,String biomassContent,String emissionFactor) { - return commonCalculate(consumeAmount,lowHeatAmount) - .multiply(new BigDecimal(biomassContent)) - .multiply(new BigDecimal(emissionFactor)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP); - } - - - /** - * 直接碳排放量 =消耗量*低位发热量*氧化因子*排放因子/100/1000-生物质燃料排放量 - * @param consumeAmount 消耗量 - * @param lowHeatAmount 低位发热量 - * @param biomassContent 生物量含量 - * @param emissionFactor 排放因子 - * @return 公用计算结果 - */ - public static BigDecimal directCarbonCalculate(String consumeAmount,String lowHeatAmount,String biomassContent,String emissionFactor,String carbonOxdRate) { - return commonCalculate(consumeAmount,lowHeatAmount) - .multiply(new BigDecimal(carbonOxdRate)) - .multiply(new BigDecimal(emissionFactor)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP) - .subtract(biomassFuelNumCalculate(consumeAmount,lowHeatAmount,biomassContent,emissionFactor)); - } - - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java deleted file mode 100644 index a52e5e6..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.thing.cbam.directCarbon.util; - -import java.math.BigDecimal; -import java.math.RoundingMode; - -/** - * 物料平衡计算工具类 - */ -public class MaterialBalanceUtil { - - - /** - * 公用计算：消耗量*含碳量*44/12 - * @param consumeAmount 消耗量 - * @param carbonContent 碳含量 - * @return 公用计算结果 - */ - public static BigDecimal commonCalculate(String consumeAmount,String carbonContent) { - return new BigDecimal(consumeAmount) - .multiply(new BigDecimal(carbonContent)) - .multiply(new BigDecimal(44)) - .divide(new BigDecimal(12), 2, RoundingMode.HALF_UP) - ; - } - - - /** - * 生物质燃料排放量 =消耗量*含碳量*44/12*生物量含量/100 - * @param consumeAmount 消耗量 - * @param carbonContent 碳含量 - * @param biomassContent 生物量含量 - * @return 公用计算结果 - */ - public static BigDecimal biomassFuelNumCalculate(String consumeAmount,String carbonContent, String biomassContent) { - return commonCalculate(consumeAmount, carbonContent) - .multiply(new BigDecimal(biomassContent)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP); - } - - - /** - * 直接碳排放量 ==消耗量*含碳量*44/12-生物质燃料排放量 - * @param consumeAmount 消耗量 - * @param carbonContent 碳含量 - * @param biomassContent 生物量含量 - * @return 公用计算结果 - */ - public static BigDecimal directCarbonCalculate(String consumeAmount,String carbonContent, String biomassContent) { - return commonCalculate(consumeAmount, carbonContent) - .subtract(biomassFuelNumCalculate(consumeAmount,carbonContent,biomassContent)); - } - - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java deleted file mode 100644 index 402cb71..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.thing.cbam.directCarbon.util; - -import java.math.BigDecimal; -import java.math.RoundingMode; - -/** - * 过程排放的计算工具类 - */ -public class ProcessDischargeUtil { - - - /** - * 公用计算：消耗量*排放因子*转化因子/100 - * @param consumeAmount 消耗量 - * @param emissionFactor 排放因子 - * @param conversionFactor 转换因子 - * @return 公用计算结果 - */ - public static BigDecimal commonCalculate(String consumeAmount,String emissionFactor,String conversionFactor) { - return new BigDecimal(consumeAmount) - .multiply(new BigDecimal(emissionFactor)) - .multiply(new BigDecimal(conversionFactor)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - ; - } - - - /** - * 生物质燃料排放量 ==消耗量*排放因子*转化因子/100*生物量含量/100 - * @param consumeAmount 消耗量 - * @param emissionFactor 排放因子 - * @param conversionFactor 转换因子 - * @param biomassContent 生物量含量 - * @return 公用计算结果 - */ - public static BigDecimal biomassFuelNumCalculate(String consumeAmount,String emissionFactor,String conversionFactor, String biomassContent) { - return commonCalculate( consumeAmount, emissionFactor,conversionFactor) - .multiply(new BigDecimal(biomassContent)) - .multiply(new BigDecimal(emissionFactor)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .multiply(new BigDecimal(biomassContent)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP); - } - - - /** - * 直接碳排放量 ==消耗量"排放因子*转化因子/100-生物质燃料排成量 - * @param consumeAmount 消耗量 - * @param emissionFactor 排放因子 - * @param conversionFactor 转换因子 - * @param biomassContent 生物量含量 - * @return 公用计算结果 - */ - public static BigDecimal directCarbonCalculate(String consumeAmount,String emissionFactor,String conversionFactor, String biomassContent) { - return commonCalculate( consumeAmount, emissionFactor,conversionFactor) - .subtract(biomassFuelNumCalculate(consumeAmount,emissionFactor,conversionFactor,biomassContent)); - } - - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java deleted file mode 100644 index d7f5ec5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.thing.cbam.electricity.controller; - -import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; -import com.thing.cbam.electricity.service.CbamElectricityToolService; -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.web.response.PageData; -import com.thing.common.core.web.response.Result; -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; - -@RestController -@RequestMapping("v2/cbam/electricity/tool") -@Tag(name="热电联产工具") -@RequiredArgsConstructor -public class CbamElectricityToolController { - private final CbamElectricityToolService cbamElectricityToolService; - @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 param) { - PageData pageList = cbamElectricityToolService.getPageData(param,CbamElectricityToolDTO.class); - return new Result>().ok(pageList); - } - - @GetMapping("{id}") - @Operation(summary = "信息") - public Result info(@PathVariable("id") Long id) { - CbamElectricityToolDTO dto = cbamElectricityToolService.getByIdAs(id,CbamElectricityToolDTO.class); - return new Result().ok(dto); - } - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamElectricityToolDTO dto) { - cbamElectricityToolService.saveDto(dto); - return new Result<>(); - } - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamElectricityToolDTO dto) { - cbamElectricityToolService.updateDto(dto); - return new Result<>(); - } - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - AssertUtils.isArrayEmpty(ids,"id"); - cbamElectricityToolService.batchDelete(ids); - return new Result<>(); - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java deleted file mode 100644 index ce45c27..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.thing.cbam.electricity.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -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-12-03 -*/ -@Data -@Schema(description = "热电联产工具") -public class CbamElectricityToolDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "CHP的燃料投入") - private String fuelInput; - @Schema(description = "CHP的发热量产出") - private String heatingOutput; - @Schema(description = "CHP发电量") - private String powerGener; - @Schema(description = "来自CHP机组的燃料投入量") - private String fuelUnit; - @Schema(description = "来自烟气净化过程的燃料投入量") - private String gasProcess; - @Schema(description = "发热量生产") - private String heatProd; - @Schema(description = "电力生产") - private String electProd; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "CHP发电量计算值") - private String calcuPower; - @Schema(description = "排放总量") - private String totalEmiss; - @Schema(description = "发热量电力合计") - private String totalSum; - @Schema(description = "发热量产出引起的排放量") - private String emissHeat; - @Schema(description = "排放因子,发热量") - private String factorHeat; - @Schema(description = "电力排放") - private String electEmiss; - @Schema(description = "排放因子,电力") - private String factorElect; - @Schema(description = "发热量的燃料投入") - private String inputHeat; - @Schema(description = "电力的燃料投入") - private String inputElect; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java deleted file mode 100644 index a3b9a3e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.thing.cbam.electricity.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 热电联产工具 - * - * @author xc - * @since 3.0 2024-12-03 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_electricity_tool") -public class CbamElectricityToolEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * CHP的燃料投入 - */ - private String fuelInput; - /** - * CHP的发热量产出 - */ - private String heatingOutput; - /** - * CHP发电量 - */ - private String powerGener; - /** - * 来自CHP机组的燃料投入量 - */ - private String fuelUnit; - /** - * 来自烟气净化过程的燃料投入量 - */ - private String gasProcess; - /** - * 发热量生产 - */ - private String heatProd; - /** - * 电力生产 - */ - private String electProd; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * CHP发电量计算值 - */ - private String calcuPower; - /** - * 排放总量 - */ - private String totalEmiss; - /** - * 发热量电力合计 - */ - private String totalSum; - /** - * 发热量产出引起的排放量 - */ - private String emissHeat; - /** - * 排放因子,发热量 - */ - private String factorHeat; - /** - * 电力排放 - */ - private String electEmiss; - /** - * 排放因子,电力 - */ - private String factorElect; - /** - * 发热量的燃料投入 - */ - private String inputHeat; - /** - * 电力的燃料投入 - */ - private String inputElect; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java deleted file mode 100644 index 0701963..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.electricity.mapper; - -import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamElectricityToolMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java deleted file mode 100644 index d14b18d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.thing.cbam.electricity.service; - - -import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; -import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.LinkedHashMap; - -public interface CbamElectricityToolService extends IBaseService { - - LinkedHashMap validateMsg(CbamElectricityToolDTO cbamElectricityToolDTO); -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java deleted file mode 100644 index a5e162e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.thing.cbam.electricity.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; -import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; -import com.thing.cbam.electricity.mapper.CbamElectricityToolMapper; -import com.thing.cbam.electricity.service.CbamElectricityToolService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.LinkedHashMap; -import java.util.Map; - -@Service -public class CbamElectricityToolServiceImpl extends BaseServiceImpl implements CbamElectricityToolService { - - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public LinkedHashMap validateMsg(CbamElectricityToolDTO cbamElectricityToolDTO) { - LinkedHashMap resMap = new LinkedHashMap<>(); - if (StringUtils.isBlank(cbamElectricityToolDTO.getFuelInput())){ - resMap.put("fuelInput","CHP的燃料投入不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getHeatingOutput())){ - resMap.put("heatingOutput","CHP的发热量产出不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getPowerGener())){ - resMap.put("powerGener","CHP发电量不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getFuelUnit())){ - resMap.put("fuelUnit","来自CHP机组的燃料投入量不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getGasProcess())){ - resMap.put("gasProcess","来自烟气净化过程的燃料投入量不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getHeatProd())){ - resMap.put("heatProd","发热量生产不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getElectProd())){ - resMap.put("electProd","电力生产不能为空"); - } - - return resMap; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java deleted file mode 100644 index 3dc2e7a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.thing.cbam.indirectCarbon.controller; - - -import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; -import com.thing.cbam.indirectCarbon.service.CbamCarbonIndirectEmissionsService; -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 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; - -@RestController -@RequestMapping("v2/cbam/indirect") -@Tag(name = "间接排放量") -@RequiredArgsConstructor -public class CbamCarbonIndirectEmissionsController { - - private final CbamCarbonIndirectEmissionsService cbamCarbonIndirectEmissionsService; - - @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 = cbamCarbonIndirectEmissionsService.getPageData(params, CbamCarbonIndirectEmissionsDTO.class); - return new Result>().ok(page); - } - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonIndirectEmissionsDTO data = cbamCarbonIndirectEmissionsService.getByIdAs(id, CbamCarbonIndirectEmissionsDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonIndirectEmissionsDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonIndirectEmissionsService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonIndirectEmissionsDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonIndirectEmissionsService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonIndirectEmissionsService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); - *} - */ - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java deleted file mode 100644 index 488116a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.thing.cbam.indirectCarbon.controller; - -import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; -import com.thing.cbam.indirectCarbon.service.CbamCarbonPowerProgressAllocationService; -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 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-11-28 -*/ -@RestController -@RequestMapping("v2/cbam/power/allocation") -@Tag(name="耗电量分配") -@RequiredArgsConstructor -public class CbamCarbonPowerProgressAllocationController { - - private final CbamCarbonPowerProgressAllocationService cbamCarbonPowerProgressAllocationService; - - @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 = cbamCarbonPowerProgressAllocationService.getPageData(params, CbamCarbonPowerProgressAllocationDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonPowerProgressAllocationDTO data = cbamCarbonPowerProgressAllocationService.getByIdAs(id, CbamCarbonPowerProgressAllocationDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonPowerProgressAllocationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonPowerProgressAllocationService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonPowerProgressAllocationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonPowerProgressAllocationService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonPowerProgressAllocationService.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 = cbamCarbonPowerProgressAllocationService.listAs(params, CbamCarbonPowerProgressAllocationDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "耗电量分配", list, CbamCarbonPowerProgressAllocationExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java deleted file mode 100644 index dfbfa74..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.thing.cbam.indirectCarbon.controller; - -import com.thing.cbam.indirectCarbon.dto.CbamPowerSummaryFuelDTO; -import com.thing.cbam.indirectCarbon.service.CbamPowerSummaryFuelService; -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 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-12-05 -*/ -@RestController -@RequestMapping("v2/cbam/powersummary") -@Tag(name="排放量汇总与数据质量信息与燃料平衡") -@RequiredArgsConstructor -public class CbamPowerSummaryFuelController { - - private final CbamPowerSummaryFuelService cbamPowerSummaryFuelService; - - @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 = cbamPowerSummaryFuelService.getPageData(params, CbamPowerSummaryFuelDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamPowerSummaryFuelDTO data = cbamPowerSummaryFuelService.getByIdAs(id, CbamPowerSummaryFuelDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamPowerSummaryFuelDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamPowerSummaryFuelService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamPowerSummaryFuelDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamPowerSummaryFuelService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamPowerSummaryFuelService.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 = cbamPowerSummaryFuelService.listAs(params, CbamPowerSummaryFuelDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "排放量汇总与数据质量信息 与 燃料平衡", list, CbamPowerSummaryFuelExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java deleted file mode 100644 index b12973d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.thing.cbam.indirectCarbon.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-11-28 -*/ -@Data -@Schema(description = "间接排放量") -public class CbamCarbonIndirectEmissionsDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "用电类型：\n" + - "0 - 总计\n" + - "1 - 国家电网电量\n" + - "2.第三方发电厂电量\n" + - "3.绿色电力（自建绿电）\n" + - "4.生产烟气/余热发电") - private String electricityType; - @Schema(description = "耗电量") - private String powerConsume; - @Schema(description = "电力碳排放因子") - private String electricityFactor; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java deleted file mode 100644 index 015663b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.thing.cbam.indirectCarbon.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-11-28 -*/ -@Data -@Schema(description = "耗电量分配") -public class CbamCarbonPowerProgressAllocationDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - - @Schema(description = "生产过程设备总功率") - private String powerEquip; - - @Schema(description = "设备平均运行时间") - private String averEquip; - - @Schema(description = "耗电量") - private String powerConsume; - - @Schema(description = "电力排放因子") - private String electricityEmissionFactor; - - @Schema(description = "电力排放因子的来源") - private String electricityEmissionSource; - - @Schema(description = "关联cbam_industry_info的主键id") - private Long industryId; - - @Schema(description = "关联cbam_process_material的主键id") - private Long processId; - - @Schema(description = "生产过程名称") - private String processName; - - @Schema(description = "排序") - private Long sort; - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java deleted file mode 100644 index 7fd83a4..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.thing.cbam.indirectCarbon.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-12-05 -*/ -@Data -@Schema(description = "排放量汇总与数据质量信息 与 燃料平衡") -public class CbamPowerSummaryFuelDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "有关数据质量的一般信息") - private String qualityInfo; - @Schema(description = "质量保证信息") - private String assurInfo; - @Schema(description = "电力生产燃料") - private String produFuel; - @Schema(description = "非CBAM商品生产的直接燃料 ") - private String nocbamFuel; - @Schema(description = "CBAM商品生产的直接燃料 ") - private String cbamFuel; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "使用默认值的理由（如果适用）") - private String qualityReason; - @Schema(description = "单位") - private String unit; - @Schema(description = "总燃料投入") - private String totalFuel; - @Schema(description = "其他") - private String otherFuel; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java deleted file mode 100644 index 7717f7f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.thing.cbam.indirectCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 间接排放量 - * - * @author xc - * @since 3.0 2024-11-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_indirect_emissions") -public class CbamCarbonIndirectEmissionsEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 用电类型： - * 0 - 总计 - * 1 - 国家电网电量 - * 2.第三方发电厂电量 - * 3.绿色电力（自建绿电） - * 4.生产烟气/余热发电 - */ - private String electricityType; - /** - * 耗电量 - */ - private String powerConsume; - /** - * 电力碳排放因子 - */ - private String electricityFactor="0.5568"; - /** - * 关联cbam_industry_info的主键id - */ - private Long industryId; - /** - * 排序 - */ - private Long sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java deleted file mode 100644 index 55bc725..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.thing.cbam.indirectCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 耗电量分配 - * - * @author xc - * @since 3.0 2024-11-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_power_progress_allocation") -public class CbamCarbonPowerProgressAllocationEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 生产过程设备总功率 - */ - private String powerEquip; - /** - * 设备平均运行时间 - */ - private String averEquip; - /** - * 耗电量 - */ - private String powerConsume; - /** - * 电力排放因子 - */ - private String electricityEmissionFactor; - /** - * 电力排放因子的来源 - */ - private String electricityEmissionSource; - - /** - * 关联cbam_industry_info的主键id - */ - private Long industryId; - /** - * 关联cbam_process_material的主键id - */ - private Long processId; - /** - * 生产过程名称 - */ - private String processName; - - /** - * 排序 - */ - private Long sort; - - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java deleted file mode 100644 index 381134f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.thing.cbam.indirectCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 排放量汇总与数据质量信息 与 燃料平衡 - * - * @author xc - * @since 3.0 2024-12-05 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_power_summary_fuel") -public class CbamPowerSummaryFuelEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 有关数据质量的一般信息 - */ - private String qualityInfo; - /** - * 质量保证信息 - */ - private String assurInfo; - /** - * 电力生产燃料 - */ - private String produFuel; - /** - * 非CBAM商品生产的直接燃料 - */ - private String nocbamFuel; - /** - * CBAM商品生产的直接燃料 - */ - private String cbamFuel; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 使用默认值的理由（如果适用） - */ - private String qualityReason; - /** - * 单位 - */ - private String unit; - /** - * 总燃料投入 - */ - private String totalFuel; - /** - * 其他 - */ - private String otherFuel; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java deleted file mode 100644 index 327f807..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.indirectCarbon.mapper; - -import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 间接排放量 -* -* @author xc -* @since 3.0 2024-11-28 -*/ -@Mapper -public interface CbamCarbonIndirectEmissionsMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java deleted file mode 100644 index 7cefcdc..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.indirectCarbon.mapper; - -import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 耗电量分配 -* -* @author xc -* @since 3.0 2024-11-28 -*/ -@Mapper -public interface CbamCarbonPowerProgressAllocationMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java deleted file mode 100644 index a21e2ff..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.indirectCarbon.mapper; - -import com.thing.cbam.indirectCarbon.entity.CbamPowerSummaryFuelEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 排放量汇总与数据质量信息 与 燃料平衡 -* -* @author xc -* @since 3.0 2024-12-05 -*/ -@Mapper -public interface CbamPowerSummaryFuelMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java deleted file mode 100644 index e961223..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cbam.indirectCarbon.service; - -import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; -import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -public interface CbamCarbonIndirectEmissionsService extends IBaseService { - - - List batchSaveOrUpdate(List cbamCarbonIndirectEmissionsDTOList); - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java deleted file mode 100644 index 06de4f8..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.thing.cbam.indirectCarbon.service; - -import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; -import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - - -/** - * 耗电量分配 - * - * @author xc - * @since 3.0 2024-11-28 - */ -public interface CbamCarbonPowerProgressAllocationService extends IBaseService { - - List batchSaveOrUpdate(List carbonPowerProgressAllocationDTOS); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java deleted file mode 100644 index 0430889..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cbam.indirectCarbon.service; - -import com.thing.cbam.indirectCarbon.entity.CbamPowerSummaryFuelEntity; -import com.thing.common.orm.service.IBaseService; - -/** - * 排放量汇总与数据质量信息 与 燃料平衡 - * - * @author xc - * @since 3.0 2024-12-05 - */ -public interface CbamPowerSummaryFuelService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java deleted file mode 100644 index 0b12f26..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.thing.cbam.indirectCarbon.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; -import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; -import com.thing.cbam.indirectCarbon.mapper.CbamCarbonIndirectEmissionsMapper; -import com.thing.cbam.indirectCarbon.service.CbamCarbonIndirectEmissionsService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -@Service -public class CbamCarbonIndirectEmissionsServiceImpl extends BaseServiceImpl implements CbamCarbonIndirectEmissionsService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - @Override - public List batchSaveOrUpdate(List indirectEmissionsDTOS) { - //先删除 - List industryIds = indirectEmissionsDTOS.stream().map(CbamCarbonIndirectEmissionsDTO::getIndustryId).toList(); - mapper.deleteByQuery(QueryWrapper.create().in(CbamCarbonIndirectEmissionsEntity::getIndustryId, industryIds)); - //再插入 - List insertList = ConvertUtils.sourceToTarget(indirectEmissionsDTOS, CbamCarbonIndirectEmissionsEntity.class); - mapper.insertBatch(insertList); - return ConvertUtils.sourceToTarget(insertList, CbamCarbonIndirectEmissionsDTO.class); - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java deleted file mode 100644 index e8150f1..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.thing.cbam.indirectCarbon.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; -import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; -import com.thing.cbam.indirectCarbon.mapper.CbamCarbonPowerProgressAllocationMapper; -import com.thing.cbam.indirectCarbon.service.CbamCarbonPowerProgressAllocationService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * 耗电量分配 - * - * @author xc - * @since 3.0 2024-11-28 - */ -@Service -public class CbamCarbonPowerProgressAllocationServiceImpl extends BaseServiceImpl implements CbamCarbonPowerProgressAllocationService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List batchSaveOrUpdate(List allocationDTOS) { - //先删除 - List industryIds = allocationDTOS.stream().map(CbamCarbonPowerProgressAllocationDTO::getIndustryId).toList(); - List processIds = allocationDTOS.stream().map(CbamCarbonPowerProgressAllocationDTO::getProcessId).toList(); - mapper.deleteByQuery(new QueryWrapper() - .in(CbamCarbonPowerProgressAllocationEntity::getIndustryId, industryIds) - .in(CbamCarbonPowerProgressAllocationEntity::getProcessId, processIds)); - //再插入 - List insertList = ConvertUtils.sourceToTarget(allocationDTOS, CbamCarbonPowerProgressAllocationEntity.class); - mapper.insertBatch(insertList); - return ConvertUtils.sourceToTarget(insertList, CbamCarbonPowerProgressAllocationDTO.class); - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java deleted file mode 100644 index 0a50e48..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.thing.cbam.indirectCarbon.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.indirectCarbon.entity.CbamPowerSummaryFuelEntity; -import com.thing.cbam.indirectCarbon.mapper.CbamPowerSummaryFuelMapper; -import com.thing.cbam.indirectCarbon.service.CbamPowerSummaryFuelService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 排放量汇总与数据质量信息 与 燃料平衡 - * - * @author xc - * @since 3.0 2024-12-05 - */ -@Service -public class CbamPowerSummaryFuelServiceImpl extends BaseServiceImpl implements CbamPowerSummaryFuelService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java deleted file mode 100644 index 1d27c40..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.thing.cbam.material.controller; - - -import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; -import com.thing.cbam.material.service.CbamMaterialSpecificService; -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.web.response.PageData; -import com.thing.common.core.web.response.Result; -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; - -@RestController -@RequestMapping("v2/cbam/material/specific") -@Tag(name = "原材料特定") -@RequiredArgsConstructor -public class CbamMaterialSpecificController { - private final CbamMaterialSpecificService cbamMaterialSpecificService; - - @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 param) { - PageData pageList = cbamMaterialSpecificService.getPageData(param,CbamMaterialSpecificDTO.class); - return new Result>().ok(pageList); - } - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamMaterialSpecificDTO dto = cbamMaterialSpecificService.getByIdAs(id,CbamMaterialSpecificDTO.class); - return new Result().ok(dto); - } - - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamMaterialSpecificDTO dto) { - cbamMaterialSpecificService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamMaterialSpecificDTO dto) { - //效验数据 - //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamMaterialSpecificService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamMaterialSpecificService.batchDelete(ids); - return new Result<>(); - } - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java b/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java deleted file mode 100644 index d1d70b8..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.thing.cbam.material.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -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-12-03 -*/ -@Data -@Schema(description = "原材料特定") -public class CbamMaterialSpecificDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "SEE(直接) tCO₂e/t") - private String seeDirect; - @Schema(description = "SEE(直接)来源") - private String seeSource; - @Schema(description = "单位耗电量") - private String unitPowerConsum; - @Schema(description = "单位耗电量来源") - private String consumSource; - @Schema(description = "电力排放因子") - private String electEmissionFactor; - @Schema(description = "电力排放因子来源") - private String factorSource; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "生产路线") - private String prodRoute; - @Schema(description = "产品名称|生产过程") - private String prodNameProcess; - @Schema(description = "SEE(间接) tCO₂e/t") - private String seeIndirect; - @Schema(description = "关联cbam_process_material的原材料") - private Long materialId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java b/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java deleted file mode 100644 index e5fa3e6..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.thing.cbam.material.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 购买的原材料 - * - * @author xc - * @since 3.0 2024-12-03 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_material_specific") -public class CbamMaterialSpecificEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * SEE(直接) tCO₂e/t - */ - private String seeDirect; - /** - * SEE(直接)来源 - */ - private String seeSource; - /** - * 单位耗电量 - */ - private String unitPowerConsum; - /** - * 单位耗电量来源 - */ - private String consumSource; - /** - * 电力排放因子 - */ - private String electEmissionFactor; - /** - * 电力排放因子来源 - */ - private String factorSource; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 生产路线 - */ - private String prodRoute; - /** - * 产品名称|生产过程 - */ - private String prodNameProcess; - /** - * SEE(间接) tCO₂e/t - */ - private String seeIndirect; - /** - * 关联cbam_process_material的原材料 - */ - private Long materialId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java b/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java deleted file mode 100644 index f326255..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.thing.cbam.material.mapper; - -import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - - -@Mapper -public interface CbamMaterialSpecificMapper extends PowerBaseMapper { - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java deleted file mode 100644 index 513ca0e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.material.service; - -import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; -import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.LinkedHashMap; -import java.util.List; - -public interface CbamMaterialSpecificService extends IBaseService { - - List batchSaveOrUpdate(List cbamMaterialSpecificDTOList); - - - - LinkedHashMap validateMsg(CbamMaterialSpecificDTO cbamMaterialSpecificDTO); -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java deleted file mode 100644 index 56f102e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.thing.cbam.material.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.electricity.mapper.CbamElectricityToolMapper; -import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; -import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; -import com.thing.cbam.material.mapper.CbamMaterialSpecificMapper; -import com.thing.cbam.material.service.CbamMaterialSpecificService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -@Service -public class CbamMaterialSpecificServiceImpl extends BaseServiceImpl implements CbamMaterialSpecificService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - @Override - public List batchSaveOrUpdate(List cbamMaterialSpecificDTOList) { - //先删除 - List industryIds = cbamMaterialSpecificDTOList.stream().map(CbamMaterialSpecificDTO::getIndustryId).toList(); - mapper.deleteByQuery(QueryWrapper.create().in(CbamMaterialSpecificEntity::getIndustryId,industryIds)); - //再批量新增 - List cbamMaterialSpecificEntities = ConvertUtils.sourceToTarget(cbamMaterialSpecificDTOList, CbamMaterialSpecificEntity.class); - mapper.insertBatch(cbamMaterialSpecificEntities); - return ConvertUtils.sourceToTarget(cbamMaterialSpecificEntities, CbamMaterialSpecificDTO.class); - } - - @Override - public LinkedHashMap validateMsg(CbamMaterialSpecificDTO cbamMaterialSpecificDTO) { - LinkedHashMap resultMap = new LinkedHashMap<>(); - if (StringUtils.isBlank(cbamMaterialSpecificDTO.getSeeDirect())){ - resultMap.put("seeDirect","SEE(直接)不能为空"); - } - - return resultMap; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java deleted file mode 100644 index d0c30ea..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.thing.cbam.production.controller; - -import com.thing.cbam.production.dto.CbamProductAllocationDTO; -import com.thing.cbam.production.service.CbamProductAllocationService; -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 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; - -@RestController -@RequestMapping("v2/cbam/product/allocation") -@Tag(name = "产品的分配") -@RequiredArgsConstructor -public class CbamProductAllocationController { - private final CbamProductAllocationService cbamProductAllocationService; - @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 = cbamProductAllocationService.getPageData(params, CbamProductAllocationDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamProductAllocationDTO data = cbamProductAllocationService.getByIdAs(id, CbamProductAllocationDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProductAllocationDTO dto) { - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProductAllocationService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProductAllocationDTO dto) { - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProductAllocationService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProductAllocationService.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 = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); - *} - */ -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java deleted file mode 100644 index 43bd2ea..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.thing.cbam.production.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-11-28 -*/ -@Data -@Schema(description = "d表各生产过程中产品的分配，可测量的发热量排放量，废弃排放量，输出电力排放量") -public class CbamProductAllocationDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "消耗量t:{} json格式，以产品名称（A表中校验了重名）为key，消耗量t为value") - private String consume; - @Schema(description = "产品名称|生产过程") - private String prodProcessName; - @Schema(description = "空白处的名称") - private String bankName; - @Schema(description = "单位") - private String unit; - @Schema(description = "输入量") - private String input_quantity; - @Schema(description = "输出量") - private String output_quantity; - @Schema(description = "排放量: 发热量排放量、废弃排放量、输出电力排放量") - private String emissions; - @Schema(description = "电力排放因子") - private String electricityEmissionFactor; - @Schema(description = "欧盟出口量") - private String exportVolume; - @Schema(description = "非欧盟销售量") - private String salesVolume; - @Schema(description = "剩余消耗量") - private String remainConsume; - @Schema(description = "总产量/输出总量/采购量") - private String totalOutput; - @Schema(description = "关联cbam_industry_info的主键id") - private Long industryId; - @Schema(description = "d表类型\n" + - "1.各生产过程中产品的分配\n" + - "2.可测量的发热量排放量\n" + - "3.废气排放量\n" + - "4.生产过程输出的电力\n") - private Integer type; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java deleted file mode 100644 index 078f1cf..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.thing.cbam.production.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * d表各生产过程中产品的分配 - * - * @author xc - * @since 3.0 2024-11-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@Table("cbam_product_allocation") -public class CbamProductAllocationEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator, value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 产品名称|生产过程 - */ - private String prodProcessName; - /** - * 空白处的名称 - */ - private String bankName; - - /** - * 消耗量t:{} json格式，以产品名称（A表中校验了重名）为key，消耗量t为value - */ - private String consume; - /** - * 欧盟出口量 - */ - private String exportVolume; - /** - * 非欧盟销售量 - */ - private String salesVolume; - - /** - * 剩余消耗量 - */ - private String remainConsume; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 单位 - */ - private String unit; - /** - * 输入量 - */ - private String input_quantity; - /** - * 输出量 - */ - private String output_quantity; - /** - * 排放量: 发热量排放量、废弃排放量、输出电力排放量 - */ - private String emissions; - /** - * 电力排放因子 - */ - private String electricityEmissionFactor; - /** - * d总产量/输出总量/E采购量 - */ - private String totalOutput; - /** - * d表类型\n" + - * "1.各生产过程中产品的分配\n" + - * "2.可测量的发热量排放量\n" + - * "3.废气排放量\n" + - * "4.生产过程输出的电力\n - */ - private Integer type; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java deleted file mode 100644 index 4d515f0..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.production.mapper; - -import com.thing.cbam.production.entity.CbamProductAllocationEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamProductAllocationMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java deleted file mode 100644 index cfb641b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.thing.cbam.production.service; - -import com.thing.cbam.production.dto.CbamProductAllocationDTO; -import com.thing.cbam.production.entity.CbamProductAllocationEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -public interface CbamProductAllocationService extends IBaseService { - - List batchSaveOrUpdate(List list); - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java deleted file mode 100644 index 9064a64..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.thing.cbam.production.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.production.dto.CbamProductAllocationDTO; -import com.thing.cbam.production.entity.CbamProductAllocationEntity; -import com.thing.cbam.production.mapper.CbamProductAllocationMapper; -import com.thing.cbam.production.service.CbamProductAllocationService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -@Service -public class CbamProductAllocationServiceImpl extends BaseServiceImpl implements CbamProductAllocationService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List batchSaveOrUpdate(List list) { - //先删除 - List industryIds = list.stream().map(CbamProductAllocationDTO::getIndustryId).toList(); - mapper.deleteByQuery(QueryWrapper.create().in(CbamProductAllocationEntity::getIndustryId, industryIds)); - //再插入 - List cbamProductAllocationEntities = ConvertUtils.sourceToTarget(list, CbamProductAllocationEntity.class); - mapper.insertBatch(cbamProductAllocationEntities); - return ConvertUtils.sourceToTarget(cbamProductAllocationEntities, CbamProductAllocationDTO.class); - } -} diff --git a/modules/pom.xml b/modules/pom.xml index 8febd16..eb93403 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -29,7 +29,6 @@ carbon-public cqc-service visual-design - cbam modules