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 { + + + + +}