Bexcel的铝制品功能开发

2024年12月3日14:44:44

modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java

@@ -46,15 +46,15 @@ public class CbamIndustryController {
         return new Result<CbamIndustryDTO>().ok(dto);
     }
 
-    @PostMapping
-    @Operation(summary = "保存")
-    @LogOperation("保存")
-    public Result<CbamIndustryDTO> save(@RequestBody CbamIndustryDTO dto) {
-        return new Result<CbamIndustryDTO>().ok(service.saveIndustryInfo(dto));
+    @PostMapping("saveOrUpdate")
+    @Operation(summary = "新增或者修改")
+    @LogOperation("新增或者修改")
+    public Result<CbamIndustryDTO> saveOrUpdate(@RequestBody CbamIndustryDTO dto) {
+        return new Result<CbamIndustryDTO>().ok(service.saveOrUpdate(dto));
     }
 
     @PutMapping
-    @Operation(summary = "修改")
+    @Operation(summary = "修改-废弃")
     @LogOperation("修改")
     public Result<Void> update(@RequestBody CbamIndustryDTO dto) {
         //效验数据

modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java

@@ -69,25 +69,25 @@ public class CbamProcessMaterialController {
         return new Result<List<CbamProcessMaterialDTO>>().ok(processMaterialDTOList);
     }
 
-    @PostMapping
-    @Operation(summary="保存")
-    @LogOperation("保存")
-    public Result<Void> save(@RequestBody CbamProcessMaterialDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        cbamProcessMaterialService.saveDto(dto);
-        return new Result<>();
-    }
+//    @PostMapping
+//    @Operation(summary="保存或者更新")
+//    @LogOperation("保存或者更新")
+//    public Result<Void> saveOrUpdate(@RequestBody CbamProcessMaterialDTO dto){
+//        //效验数据
+//        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+//        cbamProcessMaterialService.saveDto(dto);
+//        return new Result<>();
+//    }
 
-    @PutMapping
-    @Operation(summary="修改")
-    @LogOperation("修改")
-    public Result<Void> update(@RequestBody CbamProcessMaterialDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        cbamProcessMaterialService.updateDto(dto);
-        return new Result<>();
-    }
+//    @PutMapping
+//    @Operation(summary="修改")
+//    @LogOperation("修改")
+//    public Result<Void> update(@RequestBody CbamProcessMaterialDTO dto){
+//        //效验数据
+//        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+//        cbamProcessMaterialService.updateDto(dto);
+//        return new Result<>();
+//    }
 
     @DeleteMapping
     @Operation(summary="删除")

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<CbamProdRouteRelationDTO>().ok(data);
     }
 
-    @PostMapping
+ /*   @PostMapping
     @Operation(summary="保存")
     @LogOperation("保存")
     public Result<Void> 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<Void> batchSaveOrUpdate(@RequestBody List<CbamProdRouteRelationDTO> list){
+        //效验数据
+        cbamProdRouteRelationService.batchSaveOrUpdate(list);
+        return new Result<>();
     }
 
     @PutMapping

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<CbamProdRouteRelationDTO> routeRelationList;
+    private List<CbamProdRouteRelationDTO> routeRelationList;
 
 }

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;
 }

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<CbamIndustryEntity> {
 
+    CbamIndustryDTO saveOrUpdate(CbamIndustryDTO dto);
 
     CbamIndustryDTO findById(Long id);
 
-    CbamIndustryDTO saveIndustryInfo(CbamIndustryDTO dto);
-
     void updateIndustryInfo(CbamIndustryDTO dto);
 
     void batchDeleteByIds( Long[] ids);

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<CbamProcessMaterialEntity> {
 
+
+
+
+    List<CbamProcessMaterialDTO> batchSaveOrUpdate(List<CbamProcessMaterialDTO> list);
+
+
     /**
      * 根据行业id和类型查询
      * @param industryId
@@ -35,6 +41,7 @@ public interface CbamProcessMaterialService extends IBaseService<CbamProcessMate
      */
     void batchSaveList(List<CbamProcessMaterialDTO> list,Integer type);
 
+
     /**
      * 批量更新
      * @param list

modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java

@@ -16,4 +16,6 @@ public interface CbamProdRouteRelationService extends IBaseService<CbamProdRoute
 
     List<CbamProdRouteRelationDTO> getByProdMaterialIdAndType(Long prodMaterialId, Integer type);
 
+    List<CbamProdRouteRelationDTO> batchSaveOrUpdate(List<CbamProdRouteRelationDTO> list);
+
 }

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<CbamIndustryMapper,
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public CbamIndustryDTO saveIndustryInfo(CbamIndustryDTO dto) {
+    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);
@@ -113,9 +140,7 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl<CbamIndustryMapper,
         return dto;
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void updateIndustryInfo(CbamIndustryDTO dto) {
+    private void updateIndustry(CbamIndustryDTO dto) {
         //1.根据id查询相关行业企业等基本信息
         CbamIndustryEntity cbamIndustryEntity = mapper.selectOneById(dto.getId());
         if(Objects.isNull(cbamIndustryEntity)){
@@ -124,7 +149,7 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl<CbamIndustryMapper,
         //2.将修改的值赋值给 industryEntity 对象
         CbamIndustryEntity industryEntity = ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class);
         //3.更新相关行业企业等基本信息
-        mapper.updateByQuery(industryEntity,QueryWrapper.create().eq(CbamIndustryEntity::getId,dto.getId()));
+        mapper.updateByQuery(industryEntity,QueryWrapper.create().eq(CbamIndustryEntity::getId, dto.getId()));
         //4.获取生产过程和相关工艺路线，并进行更新
         List<CbamProcessMaterialDTO> cbamProductList = dto.getCbamProductList();
         cbamProcessMaterialService.batchDeleteAndSaveList(cbamProductList,industryEntity.getId(),1);
@@ -150,12 +175,6 @@ public class CbamIndustryServiceImpl extends BaseServiceImpl<CbamIndustryMapper,
     public LinkedHashMap<String, Object> validateMsg(Long hyId,Long startTime,Long endTime) {
         LinkedHashMap<String, Object> resMap = new LinkedHashMap<>();
         //1.所属行业不能为空，并且是行业字典的值
-
-
-
-
-
-
         return null;
     }
 }

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<CbamProcessM
         }
     }
 
+    @Override
+    public List<CbamProcessMaterialDTO> batchSaveOrUpdate(List<CbamProcessMaterialDTO> list) {
+        if(CollectionUtils.isEmpty(list)){
+            return list;
+        }
+        //除了id，不管有没有值，都根据 industryId 和类型（自定义1.代表 生产过程 2.代表原料） 先删除，再插入
+        List<Long> industryIds = list.stream().map(CbamProcessMaterialDTO::getIndustryId).distinct().toList();
+        List<Integer> typeList = list.stream().map(CbamProcessMaterialDTO::getType).distinct().toList();
+        mapper.deleteByQuery(QueryWrapper.create()
+                .in(CbamProcessMaterialEntity::getIndustryId,industryIds)
+                .in(CbamProcessMaterialEntity::getType,typeList));
+        //再进行插入操作
+        List<CbamProcessMaterialDTO> resList = new ArrayList<>();
+        for (CbamProcessMaterialDTO cbamProcessMaterialDTO : list) {
+            CbamProcessMaterialEntity cbamProcessMaterialEntity = ConvertUtils.sourceToTarget(cbamProcessMaterialDTO, CbamProcessMaterialEntity.class);
+            //1.保存产品或者原料信息
+            mapper.insert(cbamProcessMaterialEntity);
+            //2.保存产品或者原料的生产工艺信息
+            List<CbamProdRouteRelationDTO> routeRelationList = cbamProcessMaterialDTO.getRouteRelationList();
+            if(CollectionUtil.isNotEmpty(routeRelationList)){
+                for (CbamProdRouteRelationDTO cbamProdRouteRelationDTO : routeRelationList) {
+                    cbamProdRouteRelationDTO.setProdMaterialId(cbamProcessMaterialEntity.getId());
+                    cbamProdRouteRelationDTO.setType(cbamProcessMaterialEntity.getType());
+                }
+                //将工艺信息保存到数据库
+                List<CbamProdRouteRelationDTO> 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<CbamProcessMaterialDTO> list,Long industryId,Integer type){

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<CbamProdRo
                 .orderBy(CbamProdRouteRelationEntity::getSort,true);
         return mapper.selectListByQueryAs(queryWrapper, CbamProdRouteRelationDTO.class);
     }
+
+    @Override
+    public List<CbamProdRouteRelationDTO> batchSaveOrUpdate(List<CbamProdRouteRelationDTO> list) {
+        //除了id，不管有没有值，都根据（生产过程或者原料id） 和类型（自定义1.代表 生产过程 2.代表原料） 先删除，再插入
+        List<Integer> typeList = list.stream().map(CbamProdRouteRelationDTO::getType).toList();
+        List<Long> prodMaterialIdList = list.stream().map(CbamProdRouteRelationDTO::getProdMaterialId).toList();
+        mapper.deleteByQuery(QueryWrapper.create()
+                .in(CbamProdRouteRelationEntity::getProdMaterialId, prodMaterialIdList)
+                .in(CbamProdRouteRelationEntity::getType, typeList));
+        //插入工艺路线
+        List<CbamProdRouteRelationEntity> cbamProdRouteRelationEntities = ConvertUtils.sourceToTarget(list, CbamProdRouteRelationEntity.class);
+        mapper.insertBatch(cbamProdRouteRelationEntities);
+        return ConvertUtils.sourceToTarget(cbamProdRouteRelationEntities, CbamProdRouteRelationDTO.class);
+    }
 }

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<Void> batchSaveList(@RequestBody List<CbamCarbonDirectDTO> carbonDirectDTOList){
+    @PostMapping("batchSaveOrUpdate")
+    @Operation(summary="批量保存或者更新")
+    @LogOperation("批量保存或者更新")
+    public Result<Void> batchSaveOrUpdate(@RequestBody List<CbamCarbonDirectDTO> carbonDirectDTOList){
         //效验数据
-        cbamCarbonDirectService.saveList(carbonDirectDTOList);
+        cbamCarbonDirectService.batchSaveOrUpdate(carbonDirectDTOList);
         return new Result<>();
     }
 
+    @PostMapping("batchSaveOrUpdateCarbonDirect")
+    @Operation(summary="批量保存或者更新整个B-excel")
+    @LogOperation("批量保存或者更新")
+    public Result<CbamCarbonDirectContextDTO> batchSaveOrUpdateCarbonDirect(@RequestBody CbamCarbonDirectContextDTO directContextDTO){
+        return new Result<CbamCarbonDirectContextDTO>().ok(cbamCarbonDirectService.batchSaveOrUpdateCarbonDirect(directContextDTO));
+    }
+
     @PostMapping("batchUpdate")
-    @Operation(summary="更新所有的tab信息")
-    @LogOperation("更新所有的tab信息")
+    @Operation(summary="批量更新")
+    @LogOperation("批量更新")
     public Result<Void> batchUpdateList(@RequestBody List<CbamCarbonDirectDTO> carbonDirectDTOList){
         //效验数据
-        cbamCarbonDirectService.saveList(carbonDirectDTOList);
+        cbamCarbonDirectService.batchSaveOrUpdate(carbonDirectDTOList);
         return new Result<>();
     }
 

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<Void> batchSaveOrUpdate(@RequestBody List<CbamPerfluorinatedCarbonDTO> list){
+        //效验数据
+       // ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        cbamPerfluorinatedCarbonService.batchSaveOrUpdate(list);
+        return new Result<>();
+    }
+
     @PutMapping
     @Operation(summary="修改")
     @LogOperation("修改")

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<CbamCarbonDirectDTO>  carbonDirectList;
+
+
+
+    @Schema(description = "类型：\n" +
+//            "1.是否涉及燃烧排放\n" +
+//            "2.是否涉及过程排放\n" +
+//            "3.是否涉及物料平衡\n" +
+            "4.是否涉及斜率法\n" +
+            "5.是否涉及过电压法\n"
+//            "6.是否有连续排放测量系统(CEMS)\n" +
+//            "7.各生产过程中原材料/燃料的分配"
+            )
+    private List<CbamPerfluorinatedCarbonDTO>  perfluorinatedCarbonList;
+
+
+    @Schema(description = "类型：\n" +
+//            "1.是否涉及燃烧排放\n" +
+//            "2.是否涉及过程排放\n" +
+//            "3.是否涉及物料平衡\n" +
+//            "4.是否涉及斜率法\n" +
+//            "5.是否涉及过电压法\n"
+//            "6.是否有连续排放测量系统(CEMS)\n" +
+            "7.各生产过程中原材料/燃料的分配"
+            )
+    private List<CbamProcessAllocationDTO>  processAllocationList;
+
+
+
+
+}

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<CbamPerfluorinatedCarbonDTO> perfluorinatedCarbonDTOList;
 
 
 }

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")

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;
 
 }

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;
 	/**
 	 * 排序
 	 */

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;
 }

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<CbamCarbonDirectEntity> {
 
-    List<CbamCarbonDirectDTO> listByIndustryId(Long industryId);
+    List<CbamCarbonDirectDTO> batchSaveOrUpdate(List<CbamCarbonDirectDTO> carbonDirectDTOList);
+
+    CbamCarbonDirectContextDTO batchSaveOrUpdateCarbonDirect(CbamCarbonDirectContextDTO cbamCarbonDirectContextDTO);
 
-    void saveList(List<CbamCarbonDirectDTO> carbonDirectDTOList);
+    List<CbamCarbonDirectDTO> listByIndustryId(Long industryId);
 
     void batchUpdateList(List<CbamCarbonDirectDTO> carbonDirectDTOList);
 

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<CbamPerfluorinatedCarbonEntity> {
 
+    List<CbamPerfluorinatedCarbonDTO> batchSaveOrUpdate(List<CbamPerfluorinatedCarbonDTO> list);
+
 }

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<CbamProcessAllocationEntity> {
 
+    List<CbamProcessAllocationDTO> batchSaveOrUpdate(List<CbamProcessAllocationDTO> list);
+
 }

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<CbamCarbonDirec
 
 
     private final CbamFuelDictService cbamFuelDictService;
+    private final CbamPerfluorinatedCarbonService cbamPerfluorinatedCarbonService;
     private final CbamProcessAllocationService cbamProcessAllocationService;
 
     @Override
@@ -55,35 +56,43 @@ public class CbamCarbonDirectServiceImpl extends BaseServiceImpl<CbamCarbonDirec
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void saveList(List<CbamCarbonDirectDTO> carbonDirectDTOList) {
-        //插入 是否涉及燃烧排放  &&  是否涉及过程排放 &&  是否涉及物料平衡    &&  是否有连续排放测量系统(CEMS),即排除type=5的类型
-        List<CbamCarbonDirectDTO> list = carbonDirectDTOList.stream().filter(carbonDirectDTO -> !Objects.equals(carbonDirectDTO.getType(), 5)).toList();
-        List<CbamCarbonDirectEntity> cbamCarbonDirectEntities = ConvertUtils.sourceToTarget(list, CbamCarbonDirectEntity.class);
-        mapper.insertBatch(cbamCarbonDirectEntities);
-        // type=5的类型 单独 更新生产过程中的分配量
-        List<CbamCarbonDirectDTO> fiveList = carbonDirectDTOList.stream().filter(carbonDirectDTO -> Objects.equals(carbonDirectDTO.getType(), 5)).toList();
-        List<CbamProcessAllocationEntity> 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<CbamCarbonDirectDTO> batchSaveOrUpdate(List<CbamCarbonDirectDTO> carbonDirectDTOList) {
+        List<CbamCarbonDirectDTO> resList = new ArrayList<>();
+        //根据type分组
+        Map<Integer, List<CbamCarbonDirectDTO>> carbonDirectMapList = carbonDirectDTOList.stream().collect(Collectors.groupingBy(CbamCarbonDirectDTO::getType));
+        for (Map.Entry<Integer, List<CbamCarbonDirectDTO>> 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<CbamCarbonDirectDTO> values = entries.getValue();
+                List<Long> industryIds = values.stream().map(CbamCarbonDirectDTO::getIndustryId).toList();
+                //先删除
+                mapper.deleteByQuery(QueryWrapper.create()
+                        .in(CbamCarbonDirectEntity::getIndustryId, industryIds)
+                        .eq(CbamCarbonDirectEntity::getType, key));
+                List<CbamCarbonDirectEntity> 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<CbamCarbonDirectDTO> cbamCarbonDirectDTOS = batchSaveOrUpdate(cbamCarbonDirectContextDTO.getCarbonDirectList());
+        resDTO.setCarbonDirectList(cbamCarbonDirectDTOS);
+        //处理直接碳排数据，类型是4、5
+        List<CbamPerfluorinatedCarbonDTO> cbamPerfluorinatedCarbonDTOS = cbamPerfluorinatedCarbonService.batchSaveOrUpdate(cbamCarbonDirectContextDTO.getPerfluorinatedCarbonList());
+        resDTO.setPerfluorinatedCarbonList(cbamPerfluorinatedCarbonDTOS);
+        //处理直接碳排数据，类型是7
+        List<CbamProcessAllocationDTO> cbamProcessAllocationDTOS = cbamProcessAllocationService.batchSaveOrUpdate(cbamCarbonDirectContextDTO.getProcessAllocationList());
+        resDTO.setProcessAllocationList(cbamProcessAllocationDTOS);
+        return resDTO;
+    }
+
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void batchUpdateList(List<CbamCarbonDirectDTO> carbonDirectDTOList) {
@@ -93,7 +102,7 @@ public class CbamCarbonDirectServiceImpl extends BaseServiceImpl<CbamCarbonDirec
         cbamProcessAllocationService.getMapper()
                 .deleteByQuery(QueryWrapper.create().eq(CbamProcessAllocationEntity::getIndustryId,carbonDirectDTOList.get(0).getIndustryId()));
         //重新添加相关信息
-        saveList(carbonDirectDTOList);
+        batchSaveOrUpdate(carbonDirectDTOList);
     }
 
     @Override

modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java

@@ -1,13 +1,23 @@
 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排放
@@ -16,8 +26,11 @@ import java.util.Map;
  * @since 3.0 2024-12-03
  */
 @Service
+@RequiredArgsConstructor
 public class CbamPerfluorinatedCarbonServiceImpl extends BaseServiceImpl<CbamPerfluorinatedCarbonMapper, CbamPerfluorinatedCarbonEntity> implements CbamPerfluorinatedCarbonService {
 
+    private final CbamIndustryService cbamIndustryService;
+
     @Override
     public QueryWrapper getWrapper(Map<String, Object> params){
         QueryWrapper wrapper = new QueryWrapper();
@@ -25,4 +38,54 @@ public class CbamPerfluorinatedCarbonServiceImpl extends BaseServiceImpl<CbamPer
     }
 
 
+    @Override
+    public List<CbamPerfluorinatedCarbonDTO> batchSaveOrUpdate(List<CbamPerfluorinatedCarbonDTO> list) {
+        //只有铝制品行业有以下处理
+        // type=4,5 的类型 单独 更新生产过程中的分配量
+        List<Long> industryIds = list.stream().map(CbamPerfluorinatedCarbonDTO::getIndustryId).distinct().toList();
+        //先删除
+        mapper.deleteByQuery(QueryWrapper.create().in(CbamPerfluorinatedCarbonEntity::getIndustryId, industryIds));
+        //再新增
+        List<CbamPerfluorinatedCarbonEntity>  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<CbamPerfluorinatedCarbonDTO> 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<CbamPerfluorinatedCarbonDTO> existList = list.stream().filter(carbonDirectDTO -> Objects.isNull(carbonDirectDTO.getId())).toList();
+//        if(CollectionUtils.isEmpty(existList)){
+//            return;
+//        }
+//        //2.根据industryId查询所有数据
+//        List<CbamPerfluorinatedCarbonEntity> perfluorinatedCarbonEntities =
+//                mapper.selectListByQuery(QueryWrapper.create().eq(CbamPerfluorinatedCarbonEntity::getIndustryId, industryId));
+//        //3.获取参数中需要更新的id
+//        List<Long> updateIds = existList.stream().map(CbamPerfluorinatedCarbonDTO::getId).toList();
+//        //4.排除不需要更新的id集合,并且删除相关信息
+//        if(CollectionUtils.isNotEmpty(perfluorinatedCarbonEntities)){
+//            //获取不在数据库的id集合
+//            List<CbamPerfluorinatedCarbonEntity> unUpdatePerfluorinatedEntities
+//                    = perfluorinatedCarbonEntities.stream().filter(carbonDirectEntity -> !updateIds.contains(carbonDirectEntity.getId())).toList();
+//            if(CollectionUtils.isNotEmpty(unUpdatePerfluorinatedEntities)){
+//                mapper.deleteBatchByIds(unUpdatePerfluorinatedEntities.stream().map(CbamPerfluorinatedCarbonEntity::getId).toList());
+//            }
+//            //获取在数据库的记录,并进行更新
+//            List<CbamPerfluorinatedCarbonDTO> existPerfluorinatedCarbons = existList.stream().filter(s -> updateIds.contains(s.getId())).toList();
+//            if(CollectionUtils.isNotEmpty(existPerfluorinatedCarbons)){
+//                existPerfluorinatedCarbons.forEach(carbonDirectDTO -> mapper.update(ConvertUtils.sourceToTarget(carbonDirectDTO, CbamPerfluorinatedCarbonEntity.class)));
+//            }
+//        }
+    }
 }

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<CbamProces
         return wrapper;
     }
 
-
+    @Override
+    public List<CbamProcessAllocationDTO> batchSaveOrUpdate(List<CbamProcessAllocationDTO> list) {
+        //先删除
+        List<Long> industryIds = list.stream().map(CbamProcessAllocationDTO::getIndustryId).toList();
+        List<Long> prodIds = list.stream().map(CbamProcessAllocationDTO::getProdId).toList();
+        List<Long> directId = list.stream().map(CbamProcessAllocationDTO::getDirectId).toList();
+        mapper.deleteByQuery(new QueryWrapper()
+                .in(CbamProcessAllocationEntity::getIndustryId, industryIds)
+                .in(CbamProcessAllocationEntity::getProdId, prodIds)
+                .in(CbamProcessAllocationEntity::getDirectId, directId));
+        //再新增
+        List<CbamProcessAllocationEntity> cbamProcessAllocationEntities = ConvertUtils.sourceToTarget(list, CbamProcessAllocationEntity.class);
+        mapper.insertBatch(cbamProcessAllocationEntities);
+        return ConvertUtils.sourceToTarget(cbamProcessAllocationEntities, CbamProcessAllocationDTO.class);
+    }
 }

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")

modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductElectricityController.java → 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<PageData<CbamProductElectricityDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-        PageData<CbamProductElectricityDTO> page = cbamProductElectricityService.getPageData(params, CbamProductElectricityDTO.class);
-        return new Result<PageData<CbamProductElectricityDTO>>().ok(page);
+    public Result<PageData<CbamPowerSummaryFuelDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        PageData<CbamPowerSummaryFuelDTO> page = cbamPowerSummaryFuelService.getPageData(params, CbamPowerSummaryFuelDTO.class);
+        return new Result<PageData<CbamPowerSummaryFuelDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
     @Operation(summary="信息")
-    public Result<CbamProductElectricityDTO> get(@PathVariable("id") Long id){
-        CbamProductElectricityDTO data = cbamProductElectricityService.getByIdAs(id, CbamProductElectricityDTO.class);
-        return new Result<CbamProductElectricityDTO>().ok(data);
+    public Result<CbamPowerSummaryFuelDTO> get(@PathVariable("id") Long id){
+        CbamPowerSummaryFuelDTO data = cbamPowerSummaryFuelService.getByIdAs(id, CbamPowerSummaryFuelDTO.class);
+        return new Result<CbamPowerSummaryFuelDTO>().ok(data);
     }
 
     @PostMapping
     @Operation(summary="保存")
     @LogOperation("保存")
-    public Result<Void> save(@RequestBody CbamProductElectricityDTO dto){
+    public Result<Void> 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<Void> update(@RequestBody CbamProductElectricityDTO dto){
+    public Result<Void> 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<Void> 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<String, Object> params, HttpServletResponse response) throws Exception {
-      *  List<CbamProductElectricityDTO> list = cbamProductElectricityService.listAs(params, CbamProductElectricityDTO.class);
-      *  //ExcelUtils.exportExcelToTarget(response, null, "输出的电力", list, CbamProductElectricityExcel.class);
+      *  List<CbamPowerSummaryFuelDTO> list = cbamPowerSummaryFuelService.listAs(params, CbamPowerSummaryFuelDTO.class);
+      *  //ExcelUtils.exportExcelToTarget(response, null, "排放量汇总与数据质量信息  与  燃料平衡", list, CbamPowerSummaryFuelExcel.class);
       *}
       */
 

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")

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

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

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;
 }

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

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

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

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<CbamCarbonIndirectEmissionsEntity> {
+
+
+    List<CbamCarbonIndirectEmissionsDTO> batchSaveOrUpdate(List<CbamCarbonIndirectEmissionsDTO> cbamCarbonIndirectEmissionsDTOList);
+
 }

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<CbamCarbonPowerProgressAllocationEntity> {
 
+    List<CbamCarbonPowerProgressAllocationDTO> batchSaveOrUpdate(List<CbamCarbonPowerProgressAllocationDTO> carbonPowerProgressAllocationDTOS);
+
 }

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

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<Cbam
         QueryWrapper wrapper = new QueryWrapper();
         return wrapper;
     }
+
+    @Override
+    public List<CbamCarbonIndirectEmissionsDTO> batchSaveOrUpdate(List<CbamCarbonIndirectEmissionsDTO> indirectEmissionsDTOS) {
+        //先删除
+        List<Long> industryIds = indirectEmissionsDTOS.stream().map(CbamCarbonIndirectEmissionsDTO::getIndustryId).toList();
+        mapper.deleteByQuery(QueryWrapper.create().in(CbamCarbonIndirectEmissionsEntity::getIndustryId, industryIds));
+        //再插入
+        List<CbamCarbonIndirectEmissionsEntity> insertList = ConvertUtils.sourceToTarget(indirectEmissionsDTOS, CbamCarbonIndirectEmissionsEntity.class);
+        mapper.insertBatch(insertList);
+        return ConvertUtils.sourceToTarget(insertList, CbamCarbonIndirectEmissionsDTO.class);
+    }
 }

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<CbamCarbonPowerProgressAllocationDTO> batchSaveOrUpdate(List<CbamCarbonPowerProgressAllocationDTO> allocationDTOS) {
+        //先删除
+        List<Long> industryIds = allocationDTOS.stream().map(CbamCarbonPowerProgressAllocationDTO::getIndustryId).toList();
+        List<Long> processIds = allocationDTOS.stream().map(CbamCarbonPowerProgressAllocationDTO::getProcessId).toList();
+        mapper.deleteByQuery(new QueryWrapper()
+                .in(CbamCarbonPowerProgressAllocationEntity::getIndustryId, industryIds)
+                .in(CbamCarbonPowerProgressAllocationEntity::getProcessId, processIds));
+        //再插入
+        List<CbamCarbonPowerProgressAllocationEntity> insertList = ConvertUtils.sourceToTarget(allocationDTOS, CbamCarbonPowerProgressAllocationEntity.class);
+        mapper.insertBatch(insertList);
+        return ConvertUtils.sourceToTarget(insertList, CbamCarbonPowerProgressAllocationDTO.class);
+    }
 }

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<CbamPowerSummaryFuelMapper, CbamPowerSummaryFuelEntity> implements CbamPowerSummaryFuelService {
+
+    @Override
+    public QueryWrapper getWrapper(Map<String, Object> params){
+        QueryWrapper wrapper = new QueryWrapper();
+        return wrapper;
+    }
+
+
+}

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 {

modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductExhaustEmissionsController.java

@@ -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<PageData<CbamProductExhaustEmissionsDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-        PageData<CbamProductExhaustEmissionsDTO> page = cbamProductExhaustEmissionsService.getPageData(params, CbamProductExhaustEmissionsDTO.class);
-        return new Result<PageData<CbamProductExhaustEmissionsDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    @Operation(summary="信息")
-    public Result<CbamProductExhaustEmissionsDTO> get(@PathVariable("id") Long id){
-        CbamProductExhaustEmissionsDTO data = cbamProductExhaustEmissionsService.getByIdAs(id, CbamProductExhaustEmissionsDTO.class);
-        return new Result<CbamProductExhaustEmissionsDTO>().ok(data);
-    }
-
-    @PostMapping
-    @Operation(summary="保存")
-    @LogOperation("保存")
-    public Result<Void> save(@RequestBody CbamProductExhaustEmissionsDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        cbamProductExhaustEmissionsService.saveDto(dto);
-        return new Result<>();
-    }
-
-    @PutMapping
-    @Operation(summary="修改")
-    @LogOperation("修改")
-    public Result<Void> update(@RequestBody CbamProductExhaustEmissionsDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        cbamProductExhaustEmissionsService.updateDto(dto);
-        return new Result<>();
-    }
-
-    @DeleteMapping
-    @Operation(summary="删除")
-    @LogOperation("删除")
-    public Result<Void> 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<String, Object> params, HttpServletResponse response) throws Exception {
-      *  List<CbamProductExhaustEmissionsDTO> list = cbamProductExhaustEmissionsService.listAs(params, CbamProductExhaustEmissionsDTO.class);
-      *  //ExcelUtils.exportExcelToTarget(response, null, "废气排放量", list, CbamProductExhaustEmissionsExcel.class);
-      *}
-      */
-
-}

modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductHeatEmissionsController.java

@@ -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<PageData<CbamProductHeatEmissionsDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-        PageData<CbamProductHeatEmissionsDTO> page = cbamProductHeatEmissionsService.getPageData(params, CbamProductHeatEmissionsDTO.class);
-        return new Result<PageData<CbamProductHeatEmissionsDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    @Operation(summary="信息")
-    public Result<CbamProductHeatEmissionsDTO> get(@PathVariable("id") Long id){
-        CbamProductHeatEmissionsDTO data = cbamProductHeatEmissionsService.getByIdAs(id, CbamProductHeatEmissionsDTO.class);
-        return new Result<CbamProductHeatEmissionsDTO>().ok(data);
-    }
-
-    @PostMapping
-    @Operation(summary="保存")
-    @LogOperation("保存")
-    public Result<Void> save(@RequestBody CbamProductHeatEmissionsDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        cbamProductHeatEmissionsService.saveDto(dto);
-        return new Result<>();
-    }
-
-    @PutMapping
-    @Operation(summary="修改")
-    @LogOperation("修改")
-    public Result<Void> update(@RequestBody CbamProductHeatEmissionsDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        cbamProductHeatEmissionsService.updateDto(dto);
-        return new Result<>();
-    }
-
-    @DeleteMapping
-    @Operation(summary="删除")
-    @LogOperation("删除")
-    public Result<Void> 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<String, Object> params, HttpServletResponse response) throws Exception {
-     *  List<CbamCarbonBurnDTO> list = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class);
-     *  //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class);
-     *}
-     */
-}

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;
 
 }

modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductElectricityDTO.java

@@ -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;
-
-}

modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductExhaustEmissionsDTO.java

@@ -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;
-
-}

modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductHeatEmissionsDTO.java

@@ -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;
-}

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;
 }

modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductElectricityEntity.java

@@ -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;
-}

modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductExhaustEmissionsEntity.java

@@ -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;
-}

modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductHeatEmissionsEntity.java

@@ -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;
-}

modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductElectricityMapper.java

@@ -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<CbamProductElectricityEntity> {
-	
-}

modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductExhaustEmissionsMapper.java

@@ -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<CbamProductExhaustEmissionsEntity> {
-}

modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductHeatEmissionsMapper.java

@@ -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<CbamProductHeatEmissionsEntity> {
-}

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<CbamProductAllocationEntity> {
+
+    List<CbamProductAllocationDTO> batchSaveOrUpdate(List<CbamProductAllocationDTO> list);
+
 }

modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductElectricityService.java

@@ -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<CbamProductElectricityEntity> {
-}

modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductExhaustEmissionsService.java

@@ -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<CbamProductExhaustEmissionsEntity> {
-}

modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductHeatEmissionsService.java

@@ -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<CbamProductHeatEmissionsEntity> {
-}

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<CbamProductAllocationMapper, CbamProductAllocationEntity>
-        implements CbamProductAllocationService {
+public class CbamProductAllocationServiceImpl extends BaseServiceImpl<CbamProductAllocationMapper, CbamProductAllocationEntity> implements CbamProductAllocationService {
 
     @Override
     public QueryWrapper getWrapper(Map<String, Object> params){
@@ -20,4 +22,14 @@ public class CbamProductAllocationServiceImpl extends BaseServiceImpl<CbamProduc
     }
 
 
+    @Override
+    public List<CbamProductAllocationDTO> batchSaveOrUpdate(List<CbamProductAllocationDTO> list) {
+        //先删除
+        List<Long> industryIds = list.stream().map(CbamProductAllocationDTO::getIndustryId).toList();
+        mapper.deleteByQuery(QueryWrapper.create().in(CbamProductAllocationEntity::getIndustryId, industryIds));
+        //再插入
+        List<CbamProductAllocationEntity> cbamProductAllocationEntities = ConvertUtils.sourceToTarget(list, CbamProductAllocationEntity.class);
+        mapper.insertBatch(cbamProductAllocationEntities);
+        return ConvertUtils.sourceToTarget(cbamProductAllocationEntities, CbamProductAllocationDTO.class);
+    }
 }

modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductElectricityServiceImpl.java

@@ -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<CbamProductElectricityMapper, CbamProductElectricityEntity> implements CbamProductElectricityService {
-    @Override
-    public QueryWrapper getWrapper(Map<String, Object> params) {
-        QueryWrapper wrapper = new QueryWrapper();
-        return wrapper;
-    }
-}

modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductExhaustEmissionsServiceImpl.java

@@ -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<CbamProductExhaustEmissionsMapper, CbamProductExhaustEmissionsEntity>
-implements CbamProductExhaustEmissionsService {
-    @Override
-    public QueryWrapper getWrapper(Map<String, Object> params) {
-        QueryWrapper wrapper = new QueryWrapper();
-        return wrapper;
-    }
-}

modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductHeatEmissionsServiceImpl.java

@@ -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<CbamProductHeatEmissionsMapper,CbamProductHeatEmissionsEntity> implements CbamProductHeatEmissionsService{
-    @Override
-    public QueryWrapper getWrapper(Map<String, Object> params) {
-        QueryWrapper wrapper = new QueryWrapper();
-        return wrapper;
-    }
-}