2024年12月5日17:33:18

modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java

@@ -43,7 +43,6 @@ public class CbamCarbonPriceToolController {
     }
     @GetMapping("{id}")
     @Operation(summary = "信息")
-    @LogOperation("信息")
     public Result<CbamCarbonPriceToolDTO> info(@PathVariable("id") String id) {
         CbamCarbonPriceToolDTO dto = cbamCarbonPriceToolServicevice.getByIdAs(id, CbamCarbonPriceToolDTO.class);
         return new Result<CbamCarbonPriceToolDTO>().ok(dto);
@@ -73,6 +72,7 @@ public class CbamCarbonPriceToolController {
         cbamCarbonPriceToolServicevice.batchDelete(ids);
         return new Result<>();
     }
+
     /**
      *@GetMapping("export")
      *@Operation(summary="导出")

modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java

@@ -1,5 +1,8 @@
 package com.thing.cbam.carbonPrice.dto;
 
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.core.keygen.KeyGenerators;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import lombok.Data;
@@ -19,6 +22,7 @@ public class CbamCarbonPriceToolDTO implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId)
     private Long id;
     @Schema(description = "碳价工具")
     private String priceTool;
@@ -34,5 +38,24 @@ public class CbamCarbonPriceToolDTO implements Serializable {
     private String deductionAmount;
     @Schema(description = "关联cbam_industry_information的主键id")
     private Long industryId;
+    @Schema(description = "生产过程")
+    private String productionProcess;
+    @Schema(description = "综合商品类别")
+    private String productCategories;
+    @Schema(description = "SE涵盖范围")
+    private String seCoverage;
+    @Schema(description = "抵扣金额(CNY/t)")
+    private String deductionAmountCny;
+    @Schema(description = "预期碳价(CNY/t)")
+    private String expectedPrice;
+    @Schema(description = "结果:有效的预期碳价")
+    private String effectivePrice;
+    @Schema(description = "关联cbam_process_material的生产过程")
+    private String process_id;
+    @Schema(description = "排序")
+    private Long sort;
+
+
+
 
 }

modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java

@@ -1,8 +1,10 @@
 package com.thing.cbam.carbonPrice.entity;
 
 import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 
+import com.mybatisflex.core.keygen.KeyGenerators;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,7 +26,7 @@ public class CbamCarbonPriceToolEntity implements Serializable {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	@Id
+	@Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId)
 	private Long id;
 	/**
 	 * 碳价工具
@@ -54,4 +56,37 @@ public class CbamCarbonPriceToolEntity implements Serializable {
 	 * 关联cbam_industry_information的主键id
 	 */
 	private Long industryId;
+	/**
+	 * 生产过程
+	 */
+	private String productionProcess;
+	/**
+	 * 综合商品类别
+	 */
+	private String productCategories;
+	/**
+	 * SE涵盖范围
+	 */
+	private String seCoverage;
+	/**
+	 * 抵扣金额(CNY/t)
+	 */
+	private String deductionAmountCny;
+	/**
+	 * 预期碳价(CNY/t)
+	 */
+	private String expectedPrice;
+	/**
+	 * 结果:有效的预期碳价
+	 */
+	private String effectivePrice;
+	/**
+	 * 关联cbam_process_material的生产过程
+	 */
+	private String process_id;
+	/**
+	 * 排序
+	 */
+	private Long sort;
+
 }

modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java

@@ -1,7 +1,13 @@
 package com.thing.cbam.carbonPrice.service;
 
+import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO;
 import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity;
+import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO;
 import com.thing.common.orm.service.IBaseService;
 
+import java.util.LinkedHashMap;
+import java.util.List;
+
 public interface CbamCarbonPriceToolService extends IBaseService<CbamCarbonPriceToolEntity> {
+    LinkedHashMap<String,Object> valiteMsg(CbamCarbonPriceToolDTO cbamCarbonPriceToolDTO);
 }

modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java

@@ -1,19 +1,60 @@
 package com.thing.cbam.carbonPrice.service.Impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.clickhouse.client.internal.google.common.collect.Maps;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO;
+import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity;
+import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO;
 import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity;
 import com.thing.cbam.carbonPrice.mapper.CbamCarbonPriceToolMapper;
 import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService;
+import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO;
+import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
 public class CbamCarbonPriceToolServiceImpl extends BaseServiceImpl<CbamCarbonPriceToolMapper, CbamCarbonPriceToolEntity> implements CbamCarbonPriceToolService {
+    private final CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService;
+
+    public CbamCarbonPriceToolServiceImpl(CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService) {
+        super();
+        this.cbamCarbonPriceCurrencyDictService = cbamCarbonPriceCurrencyDictService;
+    }
+
     @Override
     public QueryWrapper getWrapper(Map<String, Object> params) {
         QueryWrapper wrapper = new QueryWrapper();
         return wrapper;
     }
+
+    @Override
+    public LinkedHashMap<String, Object> valiteMsg(CbamCarbonPriceToolDTO cbamCarbonPriceToolDTO) {
+        LinkedHashMap<String, Object> resMap = new LinkedHashMap<>();
+        if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getPriceTool())) {
+            resMap.put("priceTool", "碳价工具不能为空");
+        }
+        if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getOtherInfo())){
+            resMap.put("otherInfo","其他附加信息不能为空");
+        }
+        List<CbamCarbonPriceCurrencyDictDTO> cbamCarbonPriceCurrencyDictDTOS = cbamCarbonPriceCurrencyDictService.listAs(Maps.newHashMap(), CbamCarbonPriceCurrencyDictDTO.class);
+        if (CollectionUtil.isEmpty(cbamCarbonPriceCurrencyDictDTOS)) {
+            resMap.put("currency","货币不能为空");
+        }
+        if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getCarbonPrice())){
+            resMap.put("carbonPrice","国内碳价不能为空");
+        }
+        if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getDeductionAmount())){
+            resMap.put("deductionAmount","抵扣金额(当地货币)不能为空");
+        }
+        return resMap;
+    }
+
 }

modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java

@@ -0,0 +1,110 @@
+package com.thing.cbam.dict.controller;
+
+import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO;
+import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService;
+import com.thing.common.core.annotation.LogOperation;
+import com.thing.common.core.constants.Constant;
+import com.thing.common.core.validator.AssertUtils;
+import com.thing.common.core.validator.ValidatorUtils;
+import com.thing.common.core.validator.group.AddGroup;
+import com.thing.common.core.validator.group.DefaultGroup;
+import com.thing.common.core.validator.group.UpdateGroup;
+import com.thing.common.core.web.response.PageData;
+import com.thing.common.core.web.response.Result;
+
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* 计算碳价的工具货币字典表
+*
+* @author xc 
+* @since 3.0 2024-12-05
+*/
+@RestController
+@RequestMapping("v2/cbamcarbonpricecurrencydict")
+@Tag(name="计算碳价的工具货币字典表")
+@RequiredArgsConstructor
+public class CbamCarbonPriceCurrencyDictController {
+    
+    private final CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService;
+
+    @GetMapping("page")
+    @Operation(summary="分页")
+    @Parameters({
+        @Parameter(name = Constant.PAGE, description = "当前页码，从1开始",  required = true) ,
+        @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+        @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+        @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
+    })
+    public Result<PageData<CbamCarbonPriceCurrencyDictDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        PageData<CbamCarbonPriceCurrencyDictDTO> page = cbamCarbonPriceCurrencyDictService.getPageData(params, CbamCarbonPriceCurrencyDictDTO.class);
+        return new Result<PageData<CbamCarbonPriceCurrencyDictDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @Operation(summary="信息")
+    public Result<CbamCarbonPriceCurrencyDictDTO> get(@PathVariable("id") Long id){
+        CbamCarbonPriceCurrencyDictDTO data = cbamCarbonPriceCurrencyDictService.getByIdAs(id, CbamCarbonPriceCurrencyDictDTO.class);
+        return new Result<CbamCarbonPriceCurrencyDictDTO>().ok(data);
+    }
+
+    @PostMapping
+    @Operation(summary="保存")
+    @LogOperation("保存")
+    public Result<Void> save(@RequestBody CbamCarbonPriceCurrencyDictDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        cbamCarbonPriceCurrencyDictService.saveDto(dto);
+        return new Result<>();
+    }
+
+    @PutMapping
+    @Operation(summary="修改")
+    @LogOperation("修改")
+    public Result<Void> update(@RequestBody CbamCarbonPriceCurrencyDictDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        cbamCarbonPriceCurrencyDictService.updateDto(dto);
+        return new Result<>();
+    }
+
+    @DeleteMapping
+    @Operation(summary="删除")
+    @LogOperation("删除")
+    public Result<Void> delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        cbamCarbonPriceCurrencyDictService.batchDelete(ids);
+        return new Result<>();
+    }
+    @GetMapping("list")
+    @Operation(summary = "货币字典表")
+    @Parameters({
+            @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+            @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
+    })
+    public Result<List<CbamCarbonPriceCurrencyDictDTO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        List<CbamCarbonPriceCurrencyDictDTO> list = cbamCarbonPriceCurrencyDictService.listAs(params, CbamCarbonPriceCurrencyDictDTO.class);
+        return new Result<List<CbamCarbonPriceCurrencyDictDTO>>().ok(list);
+    }
+
+    /**
+      *@GetMapping("export")
+      *@Operation(summary="导出")
+      *@LogOperation("导出")
+      *public void export(@Parameter(hidden = true) @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+      *  List<CbamCarbonPriceCurrencyDictDTO> list = cbamCarbonPriceCurrencyDictService.listAs(params, CbamCarbonPriceCurrencyDictDTO.class);
+      *  //ExcelUtils.exportExcelToTarget(response, null, "计算碳价的工具货币字典表", list, CbamCarbonPriceCurrencyDictExcel.class);
+      *}
+      */
+
+}

modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java

@@ -0,0 +1,34 @@
+package com.thing.cbam.dict.dto;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.core.keygen.KeyGenerators;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+* 计算碳价的工具货币字典表
+*
+* @author xc 
+* @since 3.0 2024-12-05
+*/
+@Data
+@Schema(description = "计算碳价的工具货币字典表")
+public class CbamCarbonPriceCurrencyDictDTO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId)
+    private Long id;
+    @Schema(description = "货币中文名称")
+    private String name;
+    @Schema(description = "货币英文名称")
+    private String ename;
+    @Schema(description = "排序")
+    private Long sort;
+
+}

modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java

@@ -29,6 +29,6 @@ public class CbamFactorDictDTO implements Serializable {
     @Schema(description = "说明")
     private String description;
     @Schema(description = "排序")
-    private String sort;
+    private Long sort;
 
 }

modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java

@@ -0,0 +1,43 @@
+package com.thing.cbam.dict.entity;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+
+import com.mybatisflex.core.keygen.KeyGenerators;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 计算碳价的工具货币字典表
+ *
+ * @author xc 
+ * @since 3.0 2024-12-05
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper=false)
+@Table("cbam_carbon_price_currency_dict")
+public class CbamCarbonPriceCurrencyDictEntity implements Serializable {
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId)
+	private Long id;
+	/**
+	 * 货币中文名称
+	 */
+	private String name;
+	/**
+	 * 货币英文名称
+	 */
+	private String ename;
+	/**
+	 * 排序
+	 */
+	private Long sort;
+}

modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java

@@ -39,5 +39,5 @@ public class CbamFactorDictEntity implements Serializable {
 	/**
 	 * 排序
 	 */
-	private String sort;
+	private Long sort;
 }

modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java

@@ -0,0 +1,17 @@
+package com.thing.cbam.dict.mapper;
+
+import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity;
+import com.thing.common.orm.mapper.PowerBaseMapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* 计算碳价的工具货币字典表
+*
+* @author xc 
+* @since 3.0 2024-12-05
+*/
+@Mapper
+public interface CbamCarbonPriceCurrencyDictMapper extends PowerBaseMapper<CbamCarbonPriceCurrencyDictEntity> {
+	
+}

modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java

@@ -0,0 +1,15 @@
+package com.thing.cbam.dict.service;
+
+import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity;
+import com.thing.common.orm.service.IBaseService;
+
+
+/**
+ * 计算碳价的工具货币字典表
+ *
+ * @author xc 
+ * @since 3.0 2024-12-05
+ */
+public interface CbamCarbonPriceCurrencyDictService extends IBaseService<CbamCarbonPriceCurrencyDictEntity> {
+
+}

modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java

@@ -0,0 +1,29 @@
+package com.thing.cbam.dict.service.impl;
+
+import com.mybatisflex.core.query.QueryWrapper;
+import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity;
+import com.thing.cbam.dict.mapper.CbamCarbonPriceCurrencyDictMapper;
+import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService;
+import com.thing.common.orm.service.impl.BaseServiceImpl;
+
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 计算碳价的工具货币字典表
+ *
+ * @author xc 
+ * @since 3.0 2024-12-05
+ */
+@Service
+public class CbamCarbonPriceCurrencyDictServiceImpl extends BaseServiceImpl<CbamCarbonPriceCurrencyDictMapper, CbamCarbonPriceCurrencyDictEntity> implements CbamCarbonPriceCurrencyDictService {
+
+    @Override
+    public QueryWrapper getWrapper(Map<String, Object> params){
+        QueryWrapper wrapper = new QueryWrapper();
+        return wrapper;
+    }
+
+
+}

modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java

@@ -1,5 +1,8 @@
 package com.thing.cbam.directCarbon.dto;
 
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.core.keygen.KeyGenerators;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import lombok.Data;
@@ -19,6 +22,7 @@ public class CbamCarbonProgressDTO implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId)
     private Long id;
     @Schema(description = "名称")
     private String name;

modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java

@@ -12,5 +12,6 @@ public interface CbamMaterialSpecificService extends IBaseService<CbamMaterialSp
   List<CbamMaterialSpecificDTO> batchSaveOrUpdate(List<CbamMaterialSpecificDTO> cbamMaterialSpecificDTOList);
 
 
+
   LinkedHashMap<String,Object> validateMsg(CbamMaterialSpecificDTO cbamMaterialSpecificDTO);
 }