From a55dd2dd7a8ae93455c503f5e9476a09219a43d2 Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 6 Dec 2024 17:44:45 +0800 Subject: [PATCH] =?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 {