diff --git a/application/pom.xml b/application/pom.xml index 5972202..d45a2d4 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -145,10 +145,6 @@ com.thing.modules visual-design - - com.thing.modules - cbam - org.springframework.boot diff --git a/modules/cbam/pom.xml b/modules/cbam/pom.xml deleted file mode 100644 index ede5601..0000000 --- a/modules/cbam/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - com.thing - modules - 5.1 - - - com.thing.modules - cbam - jar - ThingBI Server Modules cbam - - - - UTF-8 - - - - - - - org.projectlombok - lombok - - - - com.thing.modules - thing - - - - - - - \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java deleted file mode 100644 index b95121e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamIndustryController.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.thing.cbam.baesInfoExcel.controller; - - -import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; -import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("v2/cbam/industry") -@Tag(name = "基础信息A表") -@RequiredArgsConstructor -public class CbamIndustryController { - - private final CbamIndustryService service; - - @GetMapping("page") - @Operation(summary = "分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"), - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map param) { - PageData pageList = service.getPageData(param,CbamIndustryDTO.class); - return new Result>().ok(pageList); - } - - - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamIndustryDTO dto = service.findById(id); - return new Result().ok(dto); - } - - @PostMapping("saveOrUpdate") - @Operation(summary = "新增或者修改") - @LogOperation("新增或者修改") - public Result saveOrUpdate(@RequestBody CbamIndustryDTO dto) { - return new Result().ok(service.saveOrUpdate(dto)); - } - - @PutMapping - @Operation(summary = "修改-废弃") - @LogOperation("修改") - public Result update(@RequestBody CbamIndustryDTO dto) { - //效验数据 - //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - service.updateIndustryInfo(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - service.batchDeleteByIds(ids); - return new Result<>(); - } - -// @PostMapping("export") -// @Operation(summary = "导出") -// @LogOperation("导出") -// public void export(@RequestBody Long[] ids, @RequestParam Map params, HttpServletResponse response) { -// ExcelUtils.exportExcel(service.export(ids, params), "物模型列表", "物模型", IotThingModelExcel.class, "物模型列表.xls", response); -// } - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java deleted file mode 100644 index 1a1ced5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProcessMaterialController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.thing.cbam.baesInfoExcel.controller; - -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** -* 综合商品类别和相关生产过程 和 购买的原材料 表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@RestController -@RequestMapping("v2/cbam/process/material") -@Tag(name="综合商品类别和相关生产过程 和 购买的原材料 表") -@RequiredArgsConstructor -public class CbamProcessMaterialController { - - private final CbamProcessMaterialService cbamProcessMaterialService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamProcessMaterialService.getPageData(params, CbamProcessMaterialDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProcessMaterialDTO data = cbamProcessMaterialService.getByIdAs(id, CbamProcessMaterialDTO.class); - return new Result().ok(data); - } - - @GetMapping("industryIdAndType") - @Operation(summary="根据AExcel的基本信息id，查询原材料信息或者生产过程") - public Result> getByIndustryIdAndType(Long industryId,Integer type){ - List processMaterialDTOList = cbamProcessMaterialService.getByIndustryIdAndType(industryId,type); - return new Result>().ok(processMaterialDTOList); - } - - @GetMapping("industryId") - @Operation(summary="根据AExcel的基本信息id，查询原材料信息和生产过程列表") - public Result> getByIndustryId(Long industryId){ - List processMaterialDTOList = cbamProcessMaterialService.getByIndustryId(industryId); - return new Result>().ok(processMaterialDTOList); - } - -// @PostMapping -// @Operation(summary="保存或者更新") -// @LogOperation("保存或者更新") -// public Result saveOrUpdate(@RequestBody CbamProcessMaterialDTO dto){ -// //效验数据 -// ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); -// cbamProcessMaterialService.saveDto(dto); -// return new Result<>(); -// } - -// @PutMapping -// @Operation(summary="修改") -// @LogOperation("修改") -// public Result update(@RequestBody CbamProcessMaterialDTO dto){ -// //效验数据 -// ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); -// cbamProcessMaterialService.updateDto(dto); -// return new Result<>(); -// } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProcessMaterialService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamProcessMaterialService.listAs(params, CbamProcessMaterialDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "综合商品类别和相关生产过程 和 购买的原材料 表", list, CbamProcessMaterialExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java deleted file mode 100644 index 3d5b933..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/controller/CbamProdRouteRelationController.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.thing.cbam.baesInfoExcel.controller; - -import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; -import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** -* 生产过程和原料 与 工艺路线关联表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@RestController -@RequestMapping("v2/cbam/routerelation") -@Tag(name="生产过程和原料 与 工艺路线关联表") -@RequiredArgsConstructor -public class CbamProdRouteRelationController { - - private final CbamProdRouteRelationService cbamProdRouteRelationService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamProdRouteRelationService.getPageData(params, CbamProdRouteRelationDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProdRouteRelationDTO data = cbamProdRouteRelationService.getByIdAs(id, CbamProdRouteRelationDTO.class); - return new Result().ok(data); - } - - /* @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProdRouteRelationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProdRouteRelationService.saveDto(dto); - return new Result<>(); - }*/ - - @PostMapping - @Operation(summary="批量保存或者更新") - @LogOperation("保存") - public Result batchSaveOrUpdate(@RequestBody List list){ - //效验数据 - cbamProdRouteRelationService.batchSaveOrUpdate(list); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProdRouteRelationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProdRouteRelationService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProdRouteRelationService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamProdRouteRelationService.listAs(params, CbamProdRouteRelationDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "生产过程和原料 与 工艺路线关联表", list, CbamProdRouteRelationExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java deleted file mode 100644 index 36edbbb..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamIndustryDTO.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.thing.cbam.baesInfoExcel.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -@Data -@Schema(description = "基础信息表") -public class CbamIndustryDTO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - - @Schema(description = "主键id") - private Long id; - @Schema(description = "所属行业字典id") - private Long industryDictId; - @Schema(description = "所属行业") - private String industryDict; - @Schema(description = "开始日期：11位数") - private Long startDate; - @Schema(description = "结束日期：11位数") - private Long endDate; - @Schema(description = "报告周期说明：默认情况是一整个日历年，这个是固定的，要是前段传过来就要") - private String cycleDesc; - @Schema(description = "生产工厂名称") - private String factoryName; - @Schema(description = "生产工厂名称（英文名）") - private String factoryEname; - @Schema(description = "街道编号") - private String streetNum; - @Schema(description = "在欧盟进行的主要经济活动") - private String economicActivities; - @Schema(description = "邮政编码") - private String postalCode; - @Schema(description = "邮政信箱") - private String postBox; - @Schema(description = "城市") - private String city; - @Schema(description = "国家") - private String country; - @Schema(description = "国际港口代码") - private String internationalCode; - @Schema(description = "生产坐标经度") - private String factoryLongitude; - @Schema(description = "生产坐标纬度") - private String factoryLatitude; - @Schema(description = "授权代表姓名") - private String authorizedName; - @Schema(description = "电子邮件") - private String email; - @Schema(description = "电话") - private String telephone; - @Schema(description = "生产过程：返给前端的生产过程信息") - private List cbamProductList; - @Schema(description = "原料信息：返给前端的生产过程信息") - private List cbamMaterialList; - - /*------------------------租户信息--------------------------------*/ - - /** - * 租户编码 - */ - private Long tenantCode; - - /** - * 公司id - */ - private Long companyId; - - /** - * 部门id - */ - private Long deptId; - - /*------------------------修改记录信息--------------------------------*/ - - /** - * 创建者 - */ - private Long creator; - - /** - * 创建时间 - */ - private Long createDate; - - /** - * 修改人 - */ - private Long updater; - /** - * 修改时间 - */ - private Long updateDate; - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java deleted file mode 100644 index c7b5c41..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProcessMaterialDTO.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.thing.cbam.baesInfoExcel.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* 综合商品类别和相关生产过程 和 购买的原材料 表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Data -@Schema(description = "综合商品类别和相关生产过程 和 购买的原材料 表") -public class CbamProcessMaterialDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "产品名称") - private String name; - @Schema(description = "总产量") - private String totalOutput; - @Schema(description = "HS代码") - private String hsCode; - @Schema(description = "产品生产过程字典id") - private Long productionProcessId; - @Schema(description = "产品生产过程") - private String productionProcess; - @Schema(description = "综合商品类别") - private String productCategories; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "租户编码") - private Long tenantCode; - @Schema(description = "部门ID") - private Long deptId; - private Long companyId; - @Schema(description = "创建者") - private Long creator; - @Schema(description = "创建时间") - private Long createDate; - @Schema(description = "更新者") - private Long updater; - @Schema(description = "更新时间") - private Long updateDate; - @Schema(description = "类型1.生产过程 2.原材料") - private Integer type; - @Schema(description = "生产过程分配量") - private String processAllocation; - @Schema(description = "生产工艺相关信息--由关联表得到") - private List routeRelationList; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java deleted file mode 100644 index 503c2dd..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/dto/CbamProdRouteRelationDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.thing.cbam.baesInfoExcel.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 生产过程和原料 与 工艺路线关联表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Data -@Schema(description = "生产过程和原料 与 工艺路线关联表") -public class CbamProdRouteRelationDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "工艺路线字典id") - private Long routeId; - @Schema(description = "排序") - private Long sort; - @Schema(description = "工艺路线名称") - private String routeName; - @Schema(description = "生产过程或原材料的id") - private Long prodMaterialId; - @Schema(description = "类型：1.生产过程 2.原料") - private Integer type; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java deleted file mode 100644 index 56ff6dc..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamIndustryEntity.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.thing.cbam.baesInfoExcel.entity; - -import com.mybatisflex.annotation.Table; -import com.thing.common.orm.entity.BaseInfoEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@Table("cbam_industry_info") -public class CbamIndustryEntity extends BaseInfoEntity { - - /** - * 所属行业字典id - */ - private Long industryDictId; - /** - * 所属行业 - */ - private String industryDict; - /** - * 开始日期 - */ - private Long startDate; - /** - * 结束日期 - */ - private Long endDate; - /** - * 报告周期说明：默认情况是一整个日历年 - */ - private String cycleDesc; - /** - * 生产工厂名称 - */ - private String factoryName; - - /** - * 生产工厂名称（英文名） - */ - private String factoryEname; - /** - * 街道编号 - */ - private String streetNum; - /** - * 在欧盟进行的主要经济活动 - */ - private String economicActivities; - /** - * 邮政编码 - */ - private String postalCode; - /** - * 邮政信箱 - */ - private String postBox; - /** - * 城市 - */ - private String city; - /** - * 国家 - */ - private String country; - /** - * 国际港口代码 - */ - private String internationalCode; - /** - * 生产工厂坐标(经度) - */ - private String factoryLongitude; - /** - * 生产工厂坐标(纬度) - */ - private String factoryLatitude; - /** - * 授权代表姓名 - */ - private String authorizedName; - /** - * 电子邮件 - */ - private String email; - /** - * 电话 - */ - private String telephone; - /** - * 是否涉及原料：0否1是 - */ - private Integer materialMark; - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java deleted file mode 100644 index c43fca4..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProcessMaterialEntity.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.thing.cbam.baesInfoExcel.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 综合商品类别和相关生产过程 和 购买的原材料 表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_process_material") -public class CbamProcessMaterialEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 产品名称 - */ - private String name; - /** - * 总产量 - */ - private String totalOutput; - /** - * HS代码 - */ - private String hsCode; - /** - * 产品生产过程字典id - */ - private Long productionProcessId; - /** - * 产品生产过程 - */ - private String productionProcess; - /** - * 综合商品类别 - */ - private String productCategories; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 租户编码 - */ - private Long tenantCode; - /** - * 部门ID - */ - private Long deptId; - private Long companyId; - /** - * 创建者 - */ - private Long creator; - /** - * 创建时间 - */ - private Long createDate; - /** - * 更新者 - */ - private Long updater; - /** - * 更新时间 - */ - private Long updateDate; - - /** - * 类型1.生产过程 2.原材料 - */ - private Integer type; - /** - * 生产过程分配量 - */ - private String processAllocation; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java deleted file mode 100644 index 8b56da5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/entity/CbamProdRouteRelationEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.thing.cbam.baesInfoExcel.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 生产过程和原料 与 工艺路线关联表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_prod_route_relation") -public class CbamProdRouteRelationEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 工艺路线字典id - */ - private Long routeId; - /** - * 排序 - */ - private Long sort; - /** - * 工艺路线名称 - */ - private String routeName; - /** - * 生产过程或原材料的id - */ - private Long prodMaterialId; - /** - * 类型：1.生产过程 2.原料 - */ - private Integer type; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java deleted file mode 100644 index 21288dc..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamIndustryMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.thing.cbam.baesInfoExcel.mapper; - - -import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamIndustryMapper extends PowerBaseMapper { - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java deleted file mode 100644 index 1068bdc..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProcessMaterialMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.baesInfoExcel.mapper; - -import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 综合商品类别和相关生产过程 和 购买的原材料 表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Mapper -public interface CbamProcessMaterialMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java deleted file mode 100644 index 70f6a77..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/mapper/CbamProdRouteRelationMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.baesInfoExcel.mapper; - -import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 生产过程和原料 与 工艺路线关联表 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Mapper -public interface CbamProdRouteRelationMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java deleted file mode 100644 index 370cfa0..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamIndustryService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service; - - -import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.LinkedHashMap; - - -public interface CbamIndustryService extends IBaseService { - - CbamIndustryDTO saveOrUpdate(CbamIndustryDTO dto); - - CbamIndustryDTO findById(Long id); - - void updateIndustryInfo(CbamIndustryDTO dto); - - void batchDeleteByIds( Long[] ids); - - LinkedHashMap validateMsg(Long hyId,Long startTime,Long endTime); - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java deleted file mode 100644 index d4c3731..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProcessMaterialService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service; - -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -/** - * 综合商品类别和相关生产过程 和 购买的原材料 表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -public interface CbamProcessMaterialService extends IBaseService { - - - - - List batchSaveOrUpdate(List list); - - - /** - * 根据行业id和类型查询 - * @param industryId - * @param type - * @return - */ - List getByIndustryIdAndType(Long industryId,Integer type); - - /** - * 根据行业id查询 - * @param industryId - * @return - */ - List getByIndustryId(Long industryId); - - /** - * 批量保存 - * @param list - */ - void batchSaveList(List list,Integer type); - - - /** - * 批量更新 - * @param list - */ - void batchDeleteAndSaveList(List list,Long industryId,Integer type); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java deleted file mode 100644 index 2766f0e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/CbamProdRouteRelationService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service; - -import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -/** - * 生产过程和原料 与 工艺路线关联表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -public interface CbamProdRouteRelationService extends IBaseService { - - List getByProdMaterialIdAndType(Long prodMaterialId, Integer type); - - List batchSaveOrUpdate(List list); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java deleted file mode 100644 index fa55945..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamIndustryServiceImpl.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; -import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; -import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; -import com.thing.cbam.baesInfoExcel.mapper.CbamIndustryMapper; -import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; -import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; -import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.exception.SysException; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.common.orm.utils.IdGenerator; -import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; - -@Service -@RequiredArgsConstructor -public class CbamIndustryServiceImpl extends BaseServiceImpl implements CbamIndustryService { - -// private final CbamProductInfoService cbamProductInfoService; -// -// private final CbamMaterialService cbamMaterialService; -// -// private final CbamProdRouteRelationService cbamProdRouteRelationService; - private final CbamProcessMaterialService cbamProcessMaterialService; - private final CbamProdRouteRelationService cbamProdRouteRelationService; - - - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - //String code = (String) params.get("code"); - - Long startTime = (Long) params.get("startTime"); - Long endTime = (Long) params.get("endTime"); - String orderField = (String) params.get("orderField"); - String order = (String) params.get("order"); - wrapper.between(CbamIndustryEntity::getCreateDate, - startTime, - endTime, - !Objects.isNull(startTime) && !Objects.isNull(endTime)) - .orderBy(StringUtils.isNotBlank(orderField) ? orderField : "create_date", StringUtils.equals(order, Constant.ASC)) - ; - return wrapper; - } - - - @Override - public CbamIndustryDTO findById(Long id) { - //1.查询CBAM基础信息,包括 cbam行业，报告周期，企业信息 - CbamIndustryDTO cbamIndustryDTO = mapper.selectObjectByQueryAs(QueryWrapper.create().eq(CbamIndustryEntity::getId, id), CbamIndustryDTO.class); - if (Objects.isNull(cbamIndustryDTO)) { - throw new SysException("CBAM行业，企业信息为空"); - } - //2.查询综合商品类别和相关生产过程和相关工艺路线 - List processDTOList = cbamProcessMaterialService.getByIndustryIdAndType(cbamIndustryDTO.getId(),1); - //2.1查询综合商品类别相关工艺路线 - if(CollectionUtil.isNotEmpty(processDTOList)){ - for (CbamProcessMaterialDTO cbamProcessDTO : processDTOList) { - //查询工艺路线 - List routeRelationDTOS = cbamProdRouteRelationService.getByProdMaterialIdAndType(cbamProcessDTO.getId(), cbamProcessDTO.getType()); - if(CollectionUtil.isNotEmpty(routeRelationDTOS)){ - //将工艺路线设置到综合商品类别中 - cbamProcessDTO.setRouteRelationList(routeRelationDTOS); - } - } - cbamIndustryDTO.setCbamProductList(processDTOList); - } - //3.查询购买的原材料和相关工艺路线 - List cbamMaterialDTOList = cbamProcessMaterialService.getByIndustryIdAndType(cbamIndustryDTO.getId(),2); - //3.1查询购买的原材料的相关工艺路线 - if(CollectionUtil.isNotEmpty(cbamMaterialDTOList)){ - for (CbamProcessMaterialDTO cbamProcessMaterialDTO : cbamMaterialDTOList) { - //查询工艺路线 - List routeRelationDTOS = cbamProdRouteRelationService.getByProdMaterialIdAndType(cbamProcessMaterialDTO.getId(), cbamProcessMaterialDTO.getType()); - if(CollectionUtil.isNotEmpty(routeRelationDTOS)){ - //将工艺路线设置到原料类别中 - cbamProcessMaterialDTO.setRouteRelationList(routeRelationDTOS); - } - } - cbamIndustryDTO.setCbamMaterialList(cbamMaterialDTOList); - } - return cbamIndustryDTO; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public CbamIndustryDTO saveOrUpdate(CbamIndustryDTO dto) { - Long id = dto.getId(); - //若是存在id，则更新相关操作,否则插入相关操作 - CbamIndustryEntity cbamIndustryEntity = ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class); - if(Objects.isNull(id)){ - id = IdGenerator.nextId(); - dto.setId(id); - //1.插入相关行业企业等基本信息 - mapper.insert(cbamIndustryEntity); - }else{ - //3.更新相关行业企业等基本信息 - mapper.updateByQuery(cbamIndustryEntity,QueryWrapper.create().eq(CbamIndustryEntity::getId, dto.getId())); - } - return dto; - } - - - @Transactional(rollbackFor = Exception.class) - @Override - public void updateIndustryInfo(CbamIndustryDTO dto) { - updateIndustry(dto); - } - - - @NotNull - private CbamIndustryDTO saveIndustry(CbamIndustryDTO dto) { - CbamIndustryEntity cbamIndustryEntity = ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class); - //1.插入相关行业企业等基本信息 - mapper.insert(cbamIndustryEntity); - //2.获取生产过程和相关工艺路线 - List cbamProductList = dto.getCbamProductList(); - if (CollectionUtil.isNotEmpty(cbamProductList)) { - cbamProcessMaterialService.batchSaveList(cbamProductList,1); - } - //3.获取购买的原材料和相关工艺路线 - List cbamMaterialList = dto.getCbamMaterialList(); - if (CollectionUtil.isNotEmpty(cbamMaterialList)) { - cbamProcessMaterialService.batchSaveList(cbamMaterialList,2); - } - dto.setId(cbamIndustryEntity.getId()); - return dto; - } - - private void updateIndustry(CbamIndustryDTO dto) { - //1.根据id查询相关行业企业等基本信息 - CbamIndustryEntity cbamIndustryEntity = mapper.selectOneById(dto.getId()); - if(Objects.isNull(cbamIndustryEntity)){ - throw new SysException("查询相关行业企业等基本信息不存在"); - } - //2.将修改的值赋值给 industryEntity 对象 - CbamIndustryEntity industryEntity = ConvertUtils.sourceToTarget(dto, CbamIndustryEntity.class); - //3.更新相关行业企业等基本信息 - mapper.updateByQuery(industryEntity,QueryWrapper.create().eq(CbamIndustryEntity::getId, dto.getId())); - //4.获取生产过程和相关工艺路线，并进行更新 - List cbamProductList = dto.getCbamProductList(); - cbamProcessMaterialService.batchDeleteAndSaveList(cbamProductList,industryEntity.getId(),1); - //5.获取购买的原材料和相关工艺路线，并进行更新 - List cbamaterialList = dto.getCbamMaterialList(); - cbamProcessMaterialService.batchDeleteAndSaveList(cbamaterialList,industryEntity.getId(),2); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchDeleteByIds(Long[] ids) { - //1.删行业基本信息 - mapper.deleteBatchByIds(Arrays.asList(ids)); - //2.删除生产过程和原料信息 - cbamProcessMaterialService.getMapper().deleteByQuery(QueryWrapper.create() - .in(CbamProcessMaterialEntity::getIndustryId,Arrays.asList(ids))); - //3.首选删除生产过程和原料信息相关联的工艺路线 - cbamProdRouteRelationService.getMapper().deleteByQuery(QueryWrapper.create() - .in(CbamProdRouteRelationEntity::getProdMaterialId,Arrays.asList(ids))); - } - - @Override - public LinkedHashMap validateMsg(Long hyId,Long startTime,Long endTime) { - LinkedHashMap resMap = new LinkedHashMap<>(); - //1.所属行业不能为空，并且是行业字典的值 - return null; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java deleted file mode 100644 index 885605d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProcessMaterialServiceImpl.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; -import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; -import com.thing.cbam.baesInfoExcel.mapper.CbamProcessMaterialMapper; -import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; -import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 综合商品类别和相关生产过程 和 购买的原材料 表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Service -@RequiredArgsConstructor -public class CbamProcessMaterialServiceImpl extends BaseServiceImpl implements CbamProcessMaterialService { - - - private final CbamProdRouteRelationService cbamProdRouteRelationService; - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List getByIndustryIdAndType(Long industryId, Integer type) { - QueryWrapper queryWrapper = QueryWrapper.create() - .eq(CbamProcessMaterialEntity::getIndustryId, industryId) - .eq(CbamProcessMaterialEntity::getType, type); - return mapper.selectListByQueryAs(queryWrapper, CbamProcessMaterialDTO.class); - } - - @Override - public List getByIndustryId(Long industryId) { - QueryWrapper queryWrapper = QueryWrapper.create().eq(CbamProcessMaterialEntity::getIndustryId, industryId); - return mapper.selectListByQueryAs(queryWrapper, CbamProcessMaterialDTO.class); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchSaveList(List list,Integer type) { - //遍历相关生产产品或者原料列表 - for (CbamProcessMaterialDTO cbamProcessMaterialDTO : list) { - cbamProcessMaterialDTO.setType(type); - CbamProcessMaterialEntity cbamProcessMaterialEntity = ConvertUtils.sourceToTarget(cbamProcessMaterialDTO, CbamProcessMaterialEntity.class); - //1.保存产品或者原料信息 - mapper.insert(cbamProcessMaterialEntity); - //2.保存产品或者原料的生产工艺信息 - List routeRelationList = cbamProcessMaterialDTO.getRouteRelationList(); - if(CollectionUtil.isNotEmpty(routeRelationList)){ - for (CbamProdRouteRelationDTO cbamProdRouteRelationDTO : routeRelationList) { - cbamProdRouteRelationDTO.setProdMaterialId(cbamProcessMaterialEntity.getId()); - cbamProdRouteRelationDTO.setType(type); - } - //将工艺信息保存到数据库 - cbamProdRouteRelationService.saveBatch(ConvertUtils.sourceToTarget(routeRelationList, CbamProdRouteRelationEntity.class)); - } - } - } - - @Override - public List batchSaveOrUpdate(List list) { - if(CollectionUtils.isEmpty(list)){ - return list; - } - //除了id，不管有没有值，都根据 industryId 和类型（自定义1.代表 生产过程 2.代表原料） 先删除，再插入 - List industryIds = list.stream().map(CbamProcessMaterialDTO::getIndustryId).distinct().toList(); - List typeList = list.stream().map(CbamProcessMaterialDTO::getType).distinct().toList(); - mapper.deleteByQuery(QueryWrapper.create() - .in(CbamProcessMaterialEntity::getIndustryId,industryIds) - .in(CbamProcessMaterialEntity::getType,typeList)); - //再进行插入操作 - List resList = new ArrayList<>(); - for (CbamProcessMaterialDTO cbamProcessMaterialDTO : list) { - CbamProcessMaterialEntity cbamProcessMaterialEntity = ConvertUtils.sourceToTarget(cbamProcessMaterialDTO, CbamProcessMaterialEntity.class); - //1.保存产品或者原料信息 - mapper.insert(cbamProcessMaterialEntity); - //2.保存产品或者原料的生产工艺信息 - List routeRelationList = cbamProcessMaterialDTO.getRouteRelationList(); - if(CollectionUtil.isNotEmpty(routeRelationList)){ - for (CbamProdRouteRelationDTO cbamProdRouteRelationDTO : routeRelationList) { - cbamProdRouteRelationDTO.setProdMaterialId(cbamProcessMaterialEntity.getId()); - cbamProdRouteRelationDTO.setType(cbamProcessMaterialEntity.getType()); - } - //将工艺信息保存到数据库 - List routeRelationDTOS = cbamProdRouteRelationService.batchSaveOrUpdate(routeRelationList); - CbamProcessMaterialDTO processMaterialDTO = ConvertUtils.sourceToTarget(cbamProcessMaterialEntity, CbamProcessMaterialDTO.class); - processMaterialDTO.setRouteRelationList(routeRelationDTOS); - resList.add(processMaterialDTO); - } - } - return resList; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchDeleteAndSaveList(List list,Long industryId,Integer type){ - //1.先删除相关的产品或者原料信息 - mapper.deleteByQuery(QueryWrapper.create() - .in(CbamProcessMaterialEntity::getIndustryId,list.stream().map(CbamProcessMaterialDTO::getIndustryId).toList()) - .eq(CbamProcessMaterialEntity::getType,type) - ); - //2.先删除相关的产品或者原料信息 关联的 生产工艺信息 - cbamProdRouteRelationService.getMapper().deleteByQuery(QueryWrapper.create() - .in(CbamProdRouteRelationEntity::getProdMaterialId,list.stream().map(CbamProcessMaterialDTO::getId).toList()) - .eq(CbamProdRouteRelationEntity::getType,type) - ); - //3.重写保存相关的产品或者原料信息和相关联的工艺信息 - batchSaveList( list,type); - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java deleted file mode 100644 index 8a43e10..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/baesInfoExcel/service/impl/CbamProdRouteRelationServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.thing.cbam.baesInfoExcel.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.dto.CbamProdRouteRelationDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProdRouteRelationEntity; -import com.thing.cbam.baesInfoExcel.mapper.CbamProdRouteRelationMapper; -import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * 生产过程和原料 与 工艺路线关联表 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Service -public class CbamProdRouteRelationServiceImpl extends BaseServiceImpl implements CbamProdRouteRelationService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List getByProdMaterialIdAndType(Long prodMaterialId, Integer type) { - QueryWrapper queryWrapper = QueryWrapper.create() - .eq(CbamProdRouteRelationEntity::getProdMaterialId, prodMaterialId) - .eq(CbamProdRouteRelationEntity::getType, type) - .orderBy(CbamProdRouteRelationEntity::getSort,true); - return mapper.selectListByQueryAs(queryWrapper, CbamProdRouteRelationDTO.class); - } - - @Override - public List batchSaveOrUpdate(List list) { - //除了id，不管有没有值，都根据（生产过程或者原料id） 和类型（自定义1.代表 生产过程 2.代表原料） 先删除，再插入 - List typeList = list.stream().map(CbamProdRouteRelationDTO::getType).toList(); - List prodMaterialIdList = list.stream().map(CbamProdRouteRelationDTO::getProdMaterialId).toList(); - mapper.deleteByQuery(QueryWrapper.create() - .in(CbamProdRouteRelationEntity::getProdMaterialId, prodMaterialIdList) - .in(CbamProdRouteRelationEntity::getType, typeList)); - //插入工艺路线 - List cbamProdRouteRelationEntities = ConvertUtils.sourceToTarget(list, CbamProdRouteRelationEntity.class); - mapper.insertBatch(cbamProdRouteRelationEntities); - return ConvertUtils.sourceToTarget(cbamProdRouteRelationEntities, CbamProdRouteRelationDTO.class); - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java deleted file mode 100644 index 78cbdc7..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/controller/CbamCarbonPriceToolController.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.thing.cbam.carbonPrice.controller; - -import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; -import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("v2/price/tool") -@Tag(name = "碳价工具") -@RequiredArgsConstructor -public class CbamCarbonPriceToolController { - - @Resource - private CbamCarbonPriceToolService cbamCarbonPriceToolService; - - @GetMapping("page") - @Operation(summary = "分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"), - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map param) { - PageData pageList = cbamCarbonPriceToolService.getPageData(param, CbamCarbonPriceToolDTO.class); - return new Result>().ok(pageList); - } - @GetMapping("{id}") - @Operation(summary = "信息") - public Result info(@PathVariable("id") String id) { - CbamCarbonPriceToolDTO dto = cbamCarbonPriceToolService.getByIdAs(id, CbamCarbonPriceToolDTO.class); - return new Result().ok(dto); - } - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonPriceToolDTO dto) { - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonPriceToolService.saveDto(dto); - return new Result<>(); - } - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonPriceToolDTO dto) { - //实验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonPriceToolService.updateDto(dto); - return new Result<>(); - } - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - AssertUtils.isArrayEmpty(ids,"id"); - cbamCarbonPriceToolService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); - *} - */ -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java deleted file mode 100644 index 1e1f14b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/dto/CbamCarbonPriceToolDTO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.thing.cbam.carbonPrice.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 碳价工具 -* -* @author xc -* @since 3.0 2024-11-28 -*/ -@Data -@Schema(description = "碳价工具") -public class CbamCarbonPriceToolDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "碳价工具") - private String priceTool; - @Schema(description = "其他附加说明") - private String otherInfo; - @Schema(description = "货币") - private String currency; - @Schema(description = "配额缺口占总配额的比例") - private String gapProportion; - @Schema(description = "国内碳价") - private String carbonPrice; - @Schema(description = "抵扣金额") - private String deductionAmount; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "生产过程") - private String productionProcess; - @Schema(description = "综合商品类别") - private String productCategories; - @Schema(description = "SE涵盖范围") - private String seCoverage; - @Schema(description = "抵扣金额(CNY/t)") - private String deductionAmountCny; - @Schema(description = "预期碳价(CNY/t)") - private String expectedPrice; - @Schema(description = "结果:有效的预期碳价") - private String effectivePrice; - @Schema(description = "关联cbam_process_material的生产过程") - private String process_id; - @Schema(description = "排序") - private Long sort; - - - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java deleted file mode 100644 index fa19c01..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/entity/CbamCarbonPriceToolEntity.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.thing.cbam.carbonPrice.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 碳价工具 - * - * @author xc - * @since 3.0 2024-11-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_price_tool") -public class CbamCarbonPriceToolEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 碳价工具 - */ - private String priceTool; - /** - * 其他附加说明 - */ - private String otherInfo; - /** - * 货币 - */ - private String currency; - /** - * 配额缺口占总配额的比例 - */ - private String gapProportion; - /** - * 国内碳价 - */ - private String carbonPrice; - /** - * 抵扣金额 - */ - private String deductionAmount; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 生产过程 - */ - private String productionProcess; - /** - * 综合商品类别 - */ - private String productCategories; - /** - * SE涵盖范围 - */ - private String seCoverage; - /** - * 抵扣金额(CNY/t) - */ - private String deductionAmountCny; - /** - * 预期碳价(CNY/t) - */ - private String expectedPrice; - /** - * 结果:有效的预期碳价 - */ - private String effectivePrice; - /** - * 关联cbam_process_material的生产过程 - */ - private String process_id; - /** - * 排序 - */ - private Long sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java deleted file mode 100644 index c081936..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/mapper/CbamCarbonPriceToolMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.carbonPrice.mapper; - -import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamCarbonPriceToolMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java deleted file mode 100644 index 96335e1..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/CbamCarbonPriceToolService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.thing.cbam.carbonPrice.service; - -import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; -import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; -import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO; -import com.thing.common.orm.service.IBaseService; - -import java.util.LinkedHashMap; -import java.util.List; - -public interface CbamCarbonPriceToolService extends IBaseService { - LinkedHashMap valiteMsg(CbamCarbonPriceToolDTO cbamCarbonPriceToolDTO); -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java deleted file mode 100644 index fb5bc2c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/carbonPrice/service/Impl/CbamCarbonPriceToolServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.thing.cbam.carbonPrice.service.Impl; - -import cn.hutool.core.collection.CollectionUtil; -import com.clickhouse.client.internal.google.common.collect.Maps; -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.baesInfoExcel.entity.CbamProcessMaterialEntity; -import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; -import com.thing.cbam.carbonPrice.entity.CbamCarbonPriceToolEntity; -import com.thing.cbam.carbonPrice.mapper.CbamCarbonPriceToolMapper; -import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService; -import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO; -import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -@Service -public class CbamCarbonPriceToolServiceImpl extends BaseServiceImpl implements CbamCarbonPriceToolService { - private final CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService; - - public CbamCarbonPriceToolServiceImpl(CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService) { - super(); - this.cbamCarbonPriceCurrencyDictService = cbamCarbonPriceCurrencyDictService; - } - - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - @Override - public LinkedHashMap valiteMsg(CbamCarbonPriceToolDTO cbamCarbonPriceToolDTO) { - LinkedHashMap resMap = new LinkedHashMap<>(); - if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getPriceTool())) { - resMap.put("priceTool", "碳价工具不能为空"); - } - if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getOtherInfo())){ - resMap.put("otherInfo","其他附加信息不能为空"); - } - List cbamCarbonPriceCurrencyDictDTOS = cbamCarbonPriceCurrencyDictService.listAs(Maps.newHashMap(), CbamCarbonPriceCurrencyDictDTO.class); - if (CollectionUtil.isEmpty(cbamCarbonPriceCurrencyDictDTOS)) { - resMap.put("currency","货币不能为空"); - } - if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getCarbonPrice())){ - resMap.put("carbonPrice","国内碳价不能为空"); - } - if (StringUtils.isBlank(cbamCarbonPriceToolDTO.getDeductionAmount())){ - resMap.put("deductionAmount","抵扣金额(当地货币)不能为空"); - } - return resMap; - } - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java b/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java deleted file mode 100644 index e7bfb8f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/context/ContextExcelDTO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.thing.cbam.context; - -import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; -import com.thing.cbam.baesInfoExcel.dto.CbamProcessMaterialDTO; -import com.thing.cbam.carbonPrice.dto.CbamCarbonPriceToolDTO; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; -import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; -import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; -import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; -import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; -import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; -import com.thing.cbam.indirectCarbon.dto.CbamPowerSummaryFuelDTO; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.List; - -@Data -@Schema(description = "Excel所有的请求参数") -public class ContextExcelDTO { - - @Schema(description = "CBAM的行业,报告周期，企业信息") - private CbamIndustryDTO industry; - - @Schema(description = "综合商品类别和相关生产过程集合") - private List processList; - - @Schema(description = "购买的原材料集合") - private List materialList; - - @Schema(description = "是否涉及燃烧排放 和 是否涉及过程排放 和 是否涉及物料平衡 和 是否有连续排放测量系统(CEMS)") - private List carbonDirectList; - - @Schema(description = "全氟化碳PFC排放： 是否涉及斜率法 和 是否涉及过电压法") - private List perfluorinatedCarbonList; - - @Schema(description = "各生产过程中原材料/燃料的分配") - private List processAllocationList; - - @Schema(description = "间接排放量") - private List carbonIndirectEmissionsList; - - @Schema(description = "各生产过程中耗电量的分配") - private List carbonPowerProgressAllocationList; - - @Schema(description = "排放量汇总与数据质量信息 和 燃料平衡 ") - private CbamPowerSummaryFuelDTO powerSummaryFuel; - - @Schema(description = "热电联产工具 ") - private CbamElectricityToolDTO electricityTool; - - @Schema(description = "碳价工具 ") - private CbamCarbonPriceToolDTO dto; - - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java b/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java deleted file mode 100644 index 2a2d38a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelContextManage.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.thing.cbam.context; - -import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; -import com.thing.cbam.baesInfoExcel.service.CbamProcessMaterialService; -import com.thing.cbam.baesInfoExcel.service.CbamProdRouteRelationService; -import com.thing.cbam.carbonPrice.service.CbamCarbonPriceToolService; -import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; -import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; -import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; -import com.thing.cbam.electricity.service.CbamElectricityToolService; -import com.thing.cbam.indirectCarbon.service.CbamCarbonIndirectEmissionsService; -import com.thing.cbam.indirectCarbon.service.CbamCarbonPowerProgressAllocationService; -import com.thing.cbam.indirectCarbon.service.CbamPowerSummaryFuelService; -import com.thing.cbam.material.service.CbamMaterialSpecificService; -import com.thing.cbam.production.service.CbamProductAllocationService; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("v2/cbam/context") -@Tag(name = "excel的上下文管理") -@RequiredArgsConstructor -public class ExcelContextManage { - - /** - * A表企业基础信息 - */ - private final CbamIndustryService cbamIndustryService; - - /** - * A表企综合商品类别和相关生产过程 - */ - private final CbamProcessMaterialService cbamProcessMaterialService; - - /** - * A表购买的原材料 - */ - private final CbamProdRouteRelationService cbamProdRouteRelationService; - - /** - * B表 是否涉及燃烧排放 和 是否涉及过程排放 和 是否涉及物料平衡 和 是否有连续排放测量系统(CEMS) - */ - private final CbamCarbonDirectService cbamCarbonDirectService; - - /** - * B表 全氟化碳PFC排放： 是否涉及斜率法 和 是否涉及过电压法 - */ - private final CbamPerfluorinatedCarbonService cbamPerfluorinatedCarbonService; - - /** - * B表--各生产过程中原材料/燃料的分配 - */ - private final CbamProcessAllocationService cbamProcessAllocationService; - - - /** - * c表--间接排放量 - */ - private final CbamCarbonIndirectEmissionsService cbamCarbonIndirectEmissionsService; - - - /** - * c表-- 各生产过程中耗电量的分配 - */ - private final CbamCarbonPowerProgressAllocationService cbamCarbonPowerProgressAllocationService; - - /** - * c表-- 排放量汇总与数据质量信息 和 燃料平衡 - */ - private final CbamPowerSummaryFuelService cbamPowerSummaryFuelService; - - /** - * d表-- 各生产过程中产品的分配 / 可测量的发热量排放量 / 废气排放量 /生产过程输出的电力 - */ - private final CbamProductAllocationService cbamProductAllocationService; - - /** - * E表-- 原材料特定隐含排放SEE /各生产过程中原材料的消耗量 - */ - private final CbamMaterialSpecificService cbamMaterialSpecificService; - - /** - * F表-- 热电联产（CHP）计算工具 以下所有 - */ - private final CbamElectricityToolService cbamElectricityToolService; - - /** - * F表-- 计算碳价格工具 - */ - private CbamCarbonPriceToolService carbonPriceToolServicevice; -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java b/modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java deleted file mode 100644 index c992989..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/context/ExcelTypeDTO.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.thing.cbam.context; - -public class ExcelTypeDTO { - - - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java deleted file mode 100644 index b7f41da..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCarbonPriceCurrencyDictController.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamCarbonPriceCurrencyDictDTO; -import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; - - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** -* 计算碳价的工具货币字典表 -* -* @author xc -* @since 3.0 2024-12-05 -*/ -@RestController -@RequestMapping("v2/cbamcarbonpricecurrencydict") -@Tag(name="计算碳价的工具货币字典表") -@RequiredArgsConstructor -public class CbamCarbonPriceCurrencyDictController { - - private final CbamCarbonPriceCurrencyDictService cbamCarbonPriceCurrencyDictService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamCarbonPriceCurrencyDictService.getPageData(params, CbamCarbonPriceCurrencyDictDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonPriceCurrencyDictDTO data = cbamCarbonPriceCurrencyDictService.getByIdAs(id, CbamCarbonPriceCurrencyDictDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonPriceCurrencyDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonPriceCurrencyDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonPriceCurrencyDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonPriceCurrencyDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonPriceCurrencyDictService.batchDelete(ids); - return new Result<>(); - } - @GetMapping("list") - @Operation(summary = "货币字典表") - @Parameters({ - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> list(@Parameter(hidden = true) @RequestParam Map params){ - List list = cbamCarbonPriceCurrencyDictService.listAs(params, CbamCarbonPriceCurrencyDictDTO.class); - return new Result>().ok(list); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamCarbonPriceCurrencyDictService.listAs(params, CbamCarbonPriceCurrencyDictDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "计算碳价的工具货币字典表", list, CbamCarbonPriceCurrencyDictExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java deleted file mode 100644 index 6406910..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamCountryDictController.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamCountryDictDTO; -import com.thing.cbam.dict.service.CbamCountryDictService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("v2/cbam/country/dict") -@Tag(name = "国家字典表") -@RequiredArgsConstructor -public class CbamCountryDictController { - private final CbamCountryDictService cbamCountryDictService; - @GetMapping("page") - @Operation(summary = "分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"), - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map param) { - PageData pageList = cbamCountryDictService.getPageData(param,CbamCountryDictDTO.class); - return new Result>().ok(pageList); - } - - - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamCountryDictDTO dto = cbamCountryDictService.getByIdAs(id,CbamCountryDictDTO.class); - return new Result().ok(dto); - } - - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCountryDictDTO dto) { - cbamCountryDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCountryDictDTO dto) { - //效验数据 - //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCountryDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCountryDictService.batchDelete(ids); - return new Result<>(); - } - @GetMapping("list") - @Operation(summary = "查询国家列表") - @Parameters({ - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> list(@Parameter(hidden = true) @RequestParam Map params){ - List list = cbamCountryDictService.listAs(params, CbamCountryDictDTO.class); - return new Result>().ok(list); - } - - } diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java deleted file mode 100644 index e7bc4f8..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFactorDictController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamFactorDictDTO; -import com.thing.cbam.dict.service.CbamFactorDictService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("v2/cbam/factor/dict") -@Tag(name = "电力排放因子来源") -@RequiredArgsConstructor -public class CbamFactorDictController { - private final CbamFactorDictService cbamFactorDictService; - - @GetMapping("page") - @Operation(summary = "分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"), - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map param) { - PageData pageList = cbamFactorDictService.getPageData(param, CbamFactorDictDTO.class); - return new Result>().ok(pageList); - } - - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamFactorDictDTO dto = cbamFactorDictService.getByIdAs(id, CbamFactorDictDTO.class); - return new Result().ok(dto); - } - - @PostMapping - @Operation(summary = "save") - @LogOperation("保存") - public Result save(@RequestBody CbamFactorDictDTO dto) { - cbamFactorDictService.saveDto(dto); - return new Result<>(); - } - @PutMapping - @Operation(summary = "update") - @LogOperation("修改") - public Result update(@RequestBody CbamFactorDictDTO dto) { - cbamFactorDictService.updateDto(dto); - return new Result<>(); - } - @DeleteMapping - @Operation(summary = "delete") - @LogOperation("删除") - public Result update(@RequestBody Long[] ids) { - AssertUtils.isArrayEmpty(ids,"id"); - cbamFactorDictService.batchDelete(ids); - return new Result<>(); - } - - - @GetMapping("list") - @Operation(summary = "电力排放因子来源") - @Parameters({ - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> list(@Parameter(hidden = true) @RequestParam Map params){ - List list = cbamFactorDictService.listAs(params, CbamFactorDictDTO.class); - return new Result>().ok(list); - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java deleted file mode 100644 index 048aa20..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamFuelDictController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamFuelDictDTO; -import com.thing.cbam.dict.service.CbamFuelDictService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** -* 燃料参数字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@RestController -@RequestMapping("v2/cbam/fuel") -@Tag(name="燃料参数字典表") -@RequiredArgsConstructor -public class CbamFuelDictController { - - private final CbamFuelDictService cbamFuelDictService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamFuelDictService.getPageData(params, CbamFuelDictDTO.class); - return new Result>().ok(page); - } - - @GetMapping("list") - @Operation(summary="列表") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> list(@Parameter(hidden = true) @RequestParam Map params){ - List list = cbamFuelDictService.listAs(params, CbamFuelDictDTO.class); - return new Result>().ok(list); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamFuelDictDTO data = cbamFuelDictService.getByIdAs(id, CbamFuelDictDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamFuelDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamFuelDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamFuelDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamFuelDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamFuelDictService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamFuelDictService.listAs(params, CbamFuelDictDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "燃料参数字典表", list, CbamFuelDictExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java deleted file mode 100644 index 18f6162..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamHsDictController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamHsDictDTO; -import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; -import com.thing.cbam.dict.service.CbamHsDictService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; - - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** -* hs字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@RestController -@RequestMapping("v2/cbam/hs") -@Tag(name="hs字典表") -@RequiredArgsConstructor -public class CbamHsDictController { - - private final CbamHsDictService cbamHsDictService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamHsDictService.getPageData(params, CbamHsDictDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamHsDictDTO data = cbamHsDictService.getByIdAs(id, CbamHsDictDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamHsDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamHsDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamHsDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamHsDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamHsDictService.batchDelete(ids); - return new Result<>(); - } - - - - @GetMapping("process/{code}") - @Operation(summary="信息") - public Result> getByHsCode(@PathVariable("code") String code){ - List cbamHsDictDTOS = cbamHsDictService.getByHsCode(code); - return new Result>().ok(cbamHsDictDTOS); - } - - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamHsDictService.listAs(params, CbamHsDictDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "hs字典表", list, CbamHsDictExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java deleted file mode 100644 index 3da627d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamIndustryDictController.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamIndustryDictDTO; -import com.thing.cbam.dict.service.CbamIndustryDictService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; - - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** -* 所属行业字典 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@RestController -@RequestMapping("v2/cbam/industry/dict") -@Tag(name="所属行业字典") -@RequiredArgsConstructor -public class CbamIndustryDictController { - - private final CbamIndustryDictService cbamIndustryDictService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamIndustryDictService.getPageData(params, CbamIndustryDictDTO.class); - return new Result>().ok(page); - } - - - @GetMapping("list") - @Operation(summary="行业字典列表") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> list(@Parameter(hidden = true) @RequestParam Map params){ - List list = cbamIndustryDictService.listAs(params, CbamIndustryDictDTO.class); - return new Result>().ok(list); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamIndustryDictDTO data = cbamIndustryDictService.getByIdAs(id, CbamIndustryDictDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamIndustryDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamIndustryDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamIndustryDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamIndustryDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamIndustryDictService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamIndustryDictService.listAs(params, CbamIndustryDictDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "所属行业字典", list, CbamIndustryDictExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java b/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java deleted file mode 100644 index 9ce2f49..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/controller/CbamProdProcessDictController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.thing.cbam.dict.controller; - -import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; -import com.thing.cbam.dict.service.CbamProdProcessDictService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; - - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** -* 原料（生产过程）---工艺路线映射表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@RestController -@RequestMapping("v2/cbam/prodprocess") -@Tag(name="原料（生产过程）---工艺路线映射字典表") -@RequiredArgsConstructor -public class CbamProdProcessDictController { - - private final CbamProdProcessDictService cbamProdProcessDictService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamProdProcessDictService.getPageData(params, CbamProdProcessDictDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProdProcessDictDTO data = cbamProdProcessDictService.getByIdAs(id, CbamProdProcessDictDTO.class); - return new Result().ok(data); - } - - - @GetMapping("prod/{industryId}") - @Operation(summary="根据行业查询原料") - public Result> getByIndustryId(@PathVariable("industryId") Long industryId){ - List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByIndustryId(industryId); - return new Result>().ok(cbamProdProcessDictDTOS); - } - - - - @GetMapping("route/{prodId}") - @Operation(summary="根据原料查询工艺路线") - public Result> getByProdId(@PathVariable("prodId") Long prodId){ - List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdId(prodId); - return new Result>().ok(cbamProdProcessDictDTOS); - } - - - - @PostMapping("route/list") - @Operation(summary="工艺路线的集合") - public Result> getByProdIds(@RequestBody List prodIds){ - List cbamProdProcessDictDTOS = cbamProdProcessDictService.getByProdIds(prodIds); - return new Result>().ok(cbamProdProcessDictDTOS); - } - - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProdProcessDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProdProcessDictService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProdProcessDictDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProdProcessDictService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProdProcessDictService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamProdProcessDictService.listAs(params, CbamProdProcessDictDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "原料（生产过程）---工艺路线映射表", list, CbamProdProcessDictExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java deleted file mode 100644 index 3815396..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCarbonPriceCurrencyDictDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.thing.cbam.dict.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 计算碳价的工具货币字典表 -* -* @author xc -* @since 3.0 2024-12-05 -*/ -@Data -@Schema(description = "计算碳价的工具货币字典表") -public class CbamCarbonPriceCurrencyDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "货币中文名称") - private String name; - @Schema(description = "货币英文名称") - private String ename; - @Schema(description = "排序") - private Long sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java deleted file mode 100644 index ff94feb..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamCountryDictDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.thing.cbam.dict.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 国家字典表 -* -* @author xc -* @since 3.0 2024-12-04 -*/ -@Data -@Schema(description = "国家字典表") -public class CbamCountryDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "国家名称") - private String name; - @Schema(description = "国家英文名称") - private String ename; - @Schema(description = "是否默认：0.默认 1.不默认") - private Integer isDefault; - @Schema(description = "排序") - private String sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java deleted file mode 100644 index 4851924..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFactorDictDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.thing.cbam.dict.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 电力排放因子来源字典表 -* -* @author xc -* @since 3.0 2024-12-05 -*/ -@Data -@Schema(description = "电力排放因子来源字典表") -public class CbamFactorDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "名称") - private String name; - @Schema(description = "说明") - private String description; - @Schema(description = "排序") - private Long sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java deleted file mode 100644 index 890388c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamFuelDictDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.thing.cbam.dict.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 燃料参数字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Data -@Schema(description = "燃料参数字典表") -public class CbamFuelDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "中文名") - private String name; - @Schema(description = "英文名") - private String ename; - @Schema(description = "低位发热量") - private String lowHeatAmount; - @Schema(description = "单位") - private String unit; - @Schema(description = "碳氧化率") - private String carbonOxdRate; - @Schema(description = "排放因子") - private String emissionFactor; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java deleted file mode 100644 index f51bb59..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamHsDictDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.thing.cbam.dict.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* hs字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Data -@Schema(description = "hs字典表") -public class CbamHsDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "预留字段,可以关联") - private String name; - @Schema(description = "hs编码") - private String code; - @Schema(description = "排序") - private String sort; - @Schema(description = "类型预留字段") - private String type; - @Schema(description = "英文名称预留字段") - private String ename; - @Schema(description = "关联cbam_prod_process_dict的id") - private Long prodProcessId; -// @Schema(description = "产品字典列表") -// private List prodProcessList; - @Schema(description = "生产过程/产品字典") - private CbamProdProcessDictDTO prodProcess; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java deleted file mode 100644 index 657253f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamIndustryDictDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.thing.cbam.dict.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 所属行业字典 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Data -@Schema(description = "所属行业字典") -public class CbamIndustryDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "中文名称") - private String name; - @Schema(description = "英文名称") - private String ename; - @Schema(description = "排序") - private Integer sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java b/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java deleted file mode 100644 index baf22a0..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/dto/CbamProdProcessDictDTO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.thing.cbam.dict.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* 原料（生产过程）---工艺路线映射表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Data -@Schema(description = "原料（生产过程）---工艺路线映射表") -public class CbamProdProcessDictDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "中文名称") - private String name; - @Schema(description = "英文名称") - private String ename; - @Schema(description = "类型") - private String type; - @Schema(description = "排序") - private Integer sort; - @Schema(description = "是否表黄：0否 1是") - private Integer tagging; - @Schema(description = "关联：当type=yl 关联 cbam_industry_dict 主键id，否则关联本表的id") - private Long pidId; - @Schema(description = "生产工艺字典列表") - private List prodRouteList; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java deleted file mode 100644 index 969ec0b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCarbonPriceCurrencyDictEntity.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 计算碳价的工具货币字典表 - * - * @author xc - * @since 3.0 2024-12-05 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_price_currency_dict") -public class CbamCarbonPriceCurrencyDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 货币中文名称 - */ - private String name; - /** - * 货币英文名称 - */ - private String ename; - /** - * 排序 - */ - private Long sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java deleted file mode 100644 index e454e06..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamCountryDictEntity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 国家字典表 - * - * @author xc - * @since 3.0 2024-12-04 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_country_dict") -public class CbamCountryDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 国家名称 - */ - private String name; - /** - * 国家英文名称 - */ - private String ename; - /** - * 是否默认：0.默认 1.不默认 - */ - private Integer isDefault; - /** - * 排序 - */ - private String sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java deleted file mode 100644 index 0bfe57b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFactorDictEntity.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 电力排放因子来源字典表 - * - * @author xc - * @since 3.0 2024-12-05 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_factor_dict") -public class CbamFactorDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 名称 - */ - private String name; - /** - * 说明 - */ - private String description; - /** - * 排序 - */ - private Long sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java deleted file mode 100644 index fe4553a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamFuelDictEntity.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Table; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 燃料参数字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_fuel_dict") -public class CbamFuelDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long id; - /** - * 中文名 - */ - private String name; - /** - * 英文名 - */ - private String ename; - /** - * 低位发热量 - */ - private String lowHeatAmount; - /** - * 单位 - */ - private String unit; - /** - * 碳氧化率（氧化因子） - */ - private String carbonOxdRate; - /** - * 排放因子 - */ - private String emissionFactor; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java deleted file mode 100644 index 01359eb..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamHsDictEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * hs字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_hs_dict") -public class CbamHsDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private Long id; - /** - * 预留字段,可以关联 - */ - private String name; - /** - * hs编码 - */ - private String code; - /** - * 排序 - */ - private String sort; - /** - * 类型预留字段 - */ - private String type; - /** - * 英文名称预留字段 - */ - private String ename; - /** - * 关联cbam_prod_process_dict的id - */ - private Long prodProcessId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java deleted file mode 100644 index efd76e8..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamIndustryDictEntity.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 所属行业字典 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_industry_dict") -public class CbamIndustryDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private Long id; - /** - * 中文名称 - */ - private String name; - /** - * 英文名称 - */ - private String ename; - /** - * 排序 - */ - private Integer sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java b/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java deleted file mode 100644 index 895a333..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/entity/CbamProdProcessDictEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.thing.cbam.dict.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.Table; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 原料（生产过程）---工艺路线映射表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_prod_process_dict") -public class CbamProdProcessDictEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id - private Long id; - /** - * 中文名称 - */ - private String name; - /** - * 英文名称 - */ - private String ename; - /** - * 类型 - */ - private String type; - /** - * 排序 - */ - private Integer sort; - /** - * 是否表黄：0否 1是 - */ - private Integer tagging; - /** - * 关联：当type=yl 关联 cbam_industry_dict 主键id，否则关联本表的id - */ - private Long pidId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java deleted file mode 100644 index 4665ecd..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCarbonPriceCurrencyDictMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 计算碳价的工具货币字典表 -* -* @author xc -* @since 3.0 2024-12-05 -*/ -@Mapper -public interface CbamCarbonPriceCurrencyDictMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java deleted file mode 100644 index 9a47c84..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamCountryDictMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamCountryDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamCountryDictMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java deleted file mode 100644 index ef01f74..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFactorDictMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamFactorDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamFactorDictMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java deleted file mode 100644 index 4d4467b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamFuelDictMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamFuelDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 燃料参数字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Mapper -public interface CbamFuelDictMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java deleted file mode 100644 index 66b559f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamHsDictMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamHsDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* hs字典表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Mapper -public interface CbamHsDictMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java deleted file mode 100644 index 872053b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamIndustryDictMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamIndustryDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 所属行业字典 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Mapper -public interface CbamIndustryDictMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java b/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java deleted file mode 100644 index 2091bfb..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/mapper/CbamProdProcessDictMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.dict.mapper; - -import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 原料（生产过程）---工艺路线映射表 -* -* @author xc -* @since 3.0 2024-11-29 -*/ -@Mapper -public interface CbamProdProcessDictMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java deleted file mode 100644 index 938d414..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCarbonPriceCurrencyDictService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity; -import com.thing.common.orm.service.IBaseService; - - -/** - * 计算碳价的工具货币字典表 - * - * @author xc - * @since 3.0 2024-12-05 - */ -public interface CbamCarbonPriceCurrencyDictService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java deleted file mode 100644 index eb12ee7..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamCountryDictService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.thing.cbam.dict.service; - - -import com.thing.cbam.dict.entity.CbamCountryDictEntity; -import com.thing.common.orm.service.IBaseService; - - -public interface CbamCountryDictService extends IBaseService { - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java deleted file mode 100644 index d23279d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFactorDictService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.entity.CbamFactorDictEntity; -import com.thing.common.orm.service.IBaseService; - -public interface CbamFactorDictService extends IBaseService { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java deleted file mode 100644 index 7702ffa..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamFuelDictService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.entity.CbamFuelDictEntity; -import com.thing.common.orm.service.IBaseService; - -/** - * 燃料参数字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -public interface CbamFuelDictService extends IBaseService { - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java deleted file mode 100644 index d1f16d5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamHsDictService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.dto.CbamHsDictDTO; -import com.thing.cbam.dict.entity.CbamHsDictEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - - -/** - * hs字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -public interface CbamHsDictService extends IBaseService { - - List getByHsCode(String code); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java deleted file mode 100644 index 971f161..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamIndustryDictService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.entity.CbamIndustryDictEntity; -import com.thing.common.orm.service.IBaseService; - - -/** - * 所属行业字典 - * - * @author xc - * @since 3.0 2024-11-29 - */ -public interface CbamIndustryDictService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java deleted file mode 100644 index de667b4..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/CbamProdProcessDictService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.thing.cbam.dict.service; - -import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; -import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; -import com.thing.common.orm.service.IBaseService; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.List; - - -/** - * 原料（生产过程）---工艺路线映射表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -public interface CbamProdProcessDictService extends IBaseService { - - - List getByIndustryId(Long industryId); - - List getByProdId(Long prodId); - - List getByProdIds(List prodIds); - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java deleted file mode 100644 index c61dd10..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCarbonPriceCurrencyDictServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamCarbonPriceCurrencyDictEntity; -import com.thing.cbam.dict.mapper.CbamCarbonPriceCurrencyDictMapper; -import com.thing.cbam.dict.service.CbamCarbonPriceCurrencyDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 计算碳价的工具货币字典表 - * - * @author xc - * @since 3.0 2024-12-05 - */ -@Service -public class CbamCarbonPriceCurrencyDictServiceImpl extends BaseServiceImpl implements CbamCarbonPriceCurrencyDictService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java deleted file mode 100644 index 7f51b03..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamCountryDictServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.thing.cbam.dict.service.impl; - - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.dto.CbamCountryDictDTO; -import com.thing.cbam.dict.entity.CbamCountryDictEntity; -import com.thing.cbam.dict.mapper.CbamCountryDictMapper; -import com.thing.cbam.dict.service.CbamCountryDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -@Service -public class CbamCountryDictServiceImpl extends BaseServiceImpl implements CbamCountryDictService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper queryWrapper = new QueryWrapper(); - return queryWrapper; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java deleted file mode 100644 index 6f0cb2e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFactorDictServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamFactorDictEntity; -import com.thing.cbam.dict.mapper.CbamFactorDictMapper; -import com.thing.cbam.dict.service.CbamFactorDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public class CbamFactorDictServiceImpl extends BaseServiceImpl implements CbamFactorDictService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java deleted file mode 100644 index ec93fc2..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamFuelDictServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import cn.hutool.core.map.MapUtil; -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamFuelDictEntity; -import com.thing.cbam.dict.mapper.CbamFuelDictMapper; -import com.thing.cbam.dict.service.CbamFuelDictService; -import com.thing.common.core.constants.Constant; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 燃料参数字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Service -public class CbamFuelDictServiceImpl extends BaseServiceImpl implements CbamFuelDictService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - - String orderField = MapUtil.getStr(params, Constant.ORDER_FIELD, "sort"); - String order = MapUtil.getStr(params, Constant.ORDER, Constant.ASC); - - wrapper.orderBy(orderField, Constant.ASC.equals(order)); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java deleted file mode 100644 index 3257a24..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamHsDictServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.dto.CbamHsDictDTO; -import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; -import com.thing.cbam.dict.entity.CbamHsDictEntity; -import com.thing.cbam.dict.mapper.CbamHsDictMapper; -import com.thing.cbam.dict.service.CbamHsDictService; -import com.thing.cbam.dict.service.CbamProdProcessDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * hs字典表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Service -@RequiredArgsConstructor -public class CbamHsDictServiceImpl extends BaseServiceImpl implements CbamHsDictService { - - - private final CbamProdProcessDictService cbamProdProcessDictService; - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List getByHsCode(String code) { - //1.获取hscode代码 - List cbamHsDictDTOS = mapper.selectListByQueryAs( - new QueryWrapper() - .eq(CbamHsDictEntity::getCode, code) - .orderBy(CbamHsDictEntity::getSort, true) - , CbamHsDictDTO.class); - - for (CbamHsDictDTO cbamHsDictDTO : cbamHsDictDTOS) { - //查询原料或者生产过程 - CbamProdProcessDictDTO prodDict = cbamProdProcessDictService.getByIdAs(cbamHsDictDTO.getProdProcessId(),CbamProdProcessDictDTO.class); - //查询生产工艺 - List ruteList = cbamProdProcessDictService.getByProdId(prodDict.getId()); - prodDict.setProdRouteList(ruteList); - cbamHsDictDTO.setProdProcess(prodDict); - } - return cbamHsDictDTOS; - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java deleted file mode 100644 index 32a653b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamIndustryDictServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamIndustryDictEntity; -import com.thing.cbam.dict.mapper.CbamIndustryDictMapper; -import com.thing.cbam.dict.service.CbamIndustryDictService; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 所属行业字典 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Service -public class CbamIndustryDictServiceImpl extends BaseServiceImpl implements CbamIndustryDictService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java deleted file mode 100644 index 8b85991..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/dict/service/impl/CbamProdProcessDictServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.thing.cbam.dict.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.dto.CbamProdProcessDictDTO; -import com.thing.cbam.dict.entity.CbamProdProcessDictEntity; -import com.thing.cbam.dict.mapper.CbamProdProcessDictMapper; -import com.thing.cbam.dict.service.CbamProdProcessDictService; -import com.thing.common.core.constants.Constant; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * 原料（生产过程）---工艺路线映射表 - * - * @author xc - * @since 3.0 2024-11-29 - */ -@Service -public class CbamProdProcessDictServiceImpl extends BaseServiceImpl implements CbamProdProcessDictService { - - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List getByIndustryId(Long industryId) { - return getByPidIdAndType(industryId, null,"yl", Constant.ASC); - } - - @Override - public List getByProdId(Long prodId) { - return getByPidIdAndType(prodId, null,"gylx", Constant.ASC); - } - - @Override - public List getByProdIds(List prodIds) { - return getByPidIdAndType(null, prodIds,"gylx", Constant.ASC); - } - - - public List getByPidIdAndType(Long pidId, List pidIds, String type, String order) { - boolean asc = true; - if (StringUtils.equalsIgnoreCase(Constant.DESC, order)) { - asc = false; - } - QueryWrapper queryWrapper = QueryWrapper.create() - .eq(CbamProdProcessDictEntity::getPidId, pidId, Objects::nonNull) - .eq(CbamProdProcessDictEntity::getPidId, pidIds, CollectionUtils::isNotEmpty) - .eq(CbamProdProcessDictEntity::getType, type) - .orderBy(CbamProdProcessDictEntity::getSort, asc); - return mapper.selectListByQueryAs(queryWrapper, CbamProdProcessDictDTO.class); - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java deleted file mode 100644 index 633e650..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamCarbonDirectController.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.thing.cbam.directCarbon.controller; - -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectContextDTO; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; -import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** -* 直接排放量B-Excel -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@RestController -@RequestMapping("v2/cbam/carbon/direct") -@Tag(name="直接排放量B-Excel") -@RequiredArgsConstructor -public class CbamCarbonDirectController { - - private final CbamCarbonDirectService cbamCarbonDirectService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamCarbonDirectService.getPageData(params, CbamCarbonDirectDTO.class); - return new Result>().ok(page); - } - - - @GetMapping("listByIndustryId") - @Operation(summary="列表") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> listByIndustryId(@RequestParam Long industryId){ - List cbamCarbonDirectDTOS = cbamCarbonDirectService.listByIndustryId(industryId); - return new Result>().ok(cbamCarbonDirectDTOS); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonDirectDTO data = cbamCarbonDirectService.getByIdAs(id, CbamCarbonDirectDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存单个的tab信息-对于当前项目不建议使用") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonDirectDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonDirectService.saveDto(dto); - return new Result<>(); - } - - @PostMapping("batchSaveOrUpdate") - @Operation(summary="批量保存或者更新") - @LogOperation("批量保存或者更新") - public Result batchSaveOrUpdate(@RequestBody List carbonDirectDTOList){ - //效验数据 - cbamCarbonDirectService.batchSaveOrUpdate(carbonDirectDTOList); - return new Result<>(); - } - - @PostMapping("batchSaveOrUpdateCarbonDirect") - @Operation(summary="批量保存或者更新整个B-excel") - @LogOperation("批量保存或者更新") - public Result batchSaveOrUpdateCarbonDirect(@RequestBody CbamCarbonDirectContextDTO directContextDTO){ - return new Result().ok(cbamCarbonDirectService.batchSaveOrUpdateCarbonDirect(directContextDTO)); - } - - @PostMapping("batchUpdate") - @Operation(summary="批量更新") - @LogOperation("批量更新") - public Result batchUpdateList(@RequestBody List carbonDirectDTOList){ - //效验数据 - cbamCarbonDirectService.batchSaveOrUpdate(carbonDirectDTOList); - return new Result<>(); - } - - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonDirectDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonDirectService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonDirectService.batchDelete(ids); - return new Result<>(); - } - - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamCarbonDirectService.listAs(params, CbamCarbonDirectDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量B-Excel", list, CbamCarbonDirectExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java deleted file mode 100644 index 33d190b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamPerfluorinatedCarbonController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.thing.cbam.directCarbon.controller; - -import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; -import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** -* 全氟化碳PFC排放 -* -* @author xc -* @since 3.0 2024-12-03 -*/ -@RestController -@RequestMapping("v2/cbam/perfluorinated") -@Tag(name="全氟化碳PFC排放") -@RequiredArgsConstructor -public class CbamPerfluorinatedCarbonController { - - private final CbamPerfluorinatedCarbonService cbamPerfluorinatedCarbonService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamPerfluorinatedCarbonService.getPageData(params, CbamPerfluorinatedCarbonDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamPerfluorinatedCarbonDTO data = cbamPerfluorinatedCarbonService.getByIdAs(id, CbamPerfluorinatedCarbonDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamPerfluorinatedCarbonDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamPerfluorinatedCarbonService.saveDto(dto); - return new Result<>(); - } - - - @PostMapping("batchSaveOrUpdate") - @Operation(summary="保存") - @LogOperation("保存") - public Result batchSaveOrUpdate(@RequestBody List list){ - //效验数据 - // ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamPerfluorinatedCarbonService.batchSaveOrUpdate(list); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamPerfluorinatedCarbonDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamPerfluorinatedCarbonService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamPerfluorinatedCarbonService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamPerfluorinatedCarbonService.listAs(params, CbamPerfluorinatedCarbonDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "全氟化碳PFC排放", list, CbamPerfluorinatedCarbonExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamProcessAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamProcessAllocationController.java deleted file mode 100644 index d5096c3..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/controller/CbamProcessAllocationController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.thing.cbam.directCarbon.controller; - -import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; -import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* 生产过程分配量 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@RestController -@RequestMapping("v2/cbam/allocation") -@Tag(name="生产过程分配量") -@RequiredArgsConstructor -public class CbamProcessAllocationController { - - private final CbamProcessAllocationService cbamProcessAllocationService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamProcessAllocationService.getPageData(params, CbamProcessAllocationDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamProcessAllocationDTO data = cbamProcessAllocationService.getByIdAs(id, CbamProcessAllocationDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProcessAllocationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProcessAllocationService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProcessAllocationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProcessAllocationService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProcessAllocationService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamProcessAllocationService.listAs(params, CbamProcessAllocationDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "生产过程分配量", list, CbamProcessAllocationExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java deleted file mode 100644 index ae9d401..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectContextDTO.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.thing.cbam.directCarbon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* 直接排放量B-Excel -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Data -@Schema(description = "直接排放量B-Excel") -public class CbamCarbonDirectContextDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "类型：\n" + - "1.是否涉及燃烧排放\n" + - "2.是否涉及过程排放\n" + - "3.是否涉及物料平衡\n" + -// "4.是否涉及斜率法\n" + -// "5.是否涉及过电压法\n" + - "6.是否有连续排放测量系统(CEMS)\n" + - "7.各生产过程中原材料/燃料的分配") - private List carbonDirectList; - - - - @Schema(description = "类型：\n" + -// "1.是否涉及燃烧排放\n" + -// "2.是否涉及过程排放\n" + -// "3.是否涉及物料平衡\n" + - "4.是否涉及斜率法\n" + - "5.是否涉及过电压法\n" -// "6.是否有连续排放测量系统(CEMS)\n" + -// "7.各生产过程中原材料/燃料的分配" - ) - private List perfluorinatedCarbonList; - - - @Schema(description = "类型：\n" + -// "1.是否涉及燃烧排放\n" + -// "2.是否涉及过程排放\n" + -// "3.是否涉及物料平衡\n" + -// "4.是否涉及斜率法\n" + -// "5.是否涉及过电压法\n" -// "6.是否有连续排放测量系统(CEMS)\n" + - "7.各生产过程中原材料/燃料的分配" - ) - private List processAllocationList; - - - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java deleted file mode 100644 index 9b45d26..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonDirectDTO.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.thing.cbam.directCarbon.dto; - -import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; - -/** -* 直接排放量B-Excel -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Data -@Schema(description = "直接排放量B-Excel") -public class CbamCarbonDirectDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "燃料名称/过程排放名称/物料平衡名称") - private String name; - @Schema(description = "消耗量/产量：输入") - private String consumeAmount; - @Schema(description = "消耗量单位：t 或者 1000Nm2") - private String consumeUnit; - @Schema(description = "低位发热量：燃料字典表值") - private String lowHeatVal; - @Schema(description = "低位发热量单位：燃料字典表值") - private String lowHeatUnit; - @Schema(description = "排放因子：燃料字典表值") - private String emissionFactors; - @Schema(description = "排放因子单位：燃料字典表值") - private String emissionFactorsUnit; - @Schema(description = "氧化因子/转化因子：燃料字典表值") - private String oxidationFactor; - @Schema(description = "生物量含量/生物质组分：输入") - private String biomassContent; - @Schema(description = "直接碳排量：计算") - private String directCarbonNum; - @Schema(description = "生物质燃料排放量：计算") - private String biomassFuelNum; - @Schema(description = "能量含量(化石燃料)，TJ：计算") - private String energyFossilNum; - @Schema(description = "能量含量(生物燃料)，TJ：计算") - private String energyBiologyNum; - @Schema(description = "碳含量(tC/t)") - private String carbonNum; - @Schema(description = "气体类型：CO2/N2O") - private String gasType; - @Schema(description = "生物质组分单位") - private String biomassUnit; - @Schema(description = "每小时平均温室气体浓度") - private String hourAvgGasDensity; - @Schema(description = "每小时平均温室气体浓度.单位") - private String hourAvgGasDensityUnit; - @Schema(description = "运行小时数") - private String runHours; - @Schema(description = "烟气") - private String smokeAvg; - @Schema(description = "烟气.单位") - private String smokeAvgUnit; - @Schema(description = "温室气体年排放量") - private String gasAnnualEmissions; - @Schema(description = "温室气体年排放量单位") - private String gasAnnualEmissionsUnit; - @Schema(description = "化石燃料碳排放量") - private String fossilFuelCarbon; - @Schema(description = "全球变暖潜势id") - private String globalWarmingId; - @Schema(description = "全球变暖潜势") - private String globalWarming; - @Schema(description = "关联cbam_industry_info的主键id") - private Long industryId; - @Schema(description = "类型：\n" + - "1.是否涉及燃烧排放\n" + - "2.是否涉及过程排放\n" + - "3.是否涉及物料平衡\n" + -// "4.是否涉及斜率法\n" + -// "5.是否涉及过电压法\n" + - "6.是否有连续排放测量系统(CEMS)\n" + - "7.各生产过程中原材料/燃料的分配") - private Integer type; - private Long sort; - @Schema(description = "生产过程分配量") - private String processAllocation; - @Schema(description = "铝制品：6：倾斜法 7电压法 集合") - private List perfluorinatedCarbonDTOList; - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java deleted file mode 100644 index f403b2c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamCarbonProgressDTO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.thing.cbam.directCarbon.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 原料过程排放 -* -* @author xc -* @since 3.0 2024-11-27 -*/ -@Data -@Schema(description = "原料过程排放") -public class CbamCarbonProgressDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "名称") - private String name; - @Schema(description = "消耗量") - private String consumAmount; - @Schema(description = "排放因子") - private String emissionFactors; - @Schema(description = "排放源名称") - private String emissionName; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java deleted file mode 100644 index d97e02f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamPerfluorinatedCarbonDTO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.thing.cbam.directCarbon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 全氟化碳PFC排放 -* -* @author xc -* @since 3.0 2024-12-03 -*/ -@Data -@Schema(description = "全氟化碳PFC排放-铝制品") -public class CbamPerfluorinatedCarbonDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "阳极类型字典id") - private Long anodeTypeId; - @Schema(description = "阳极类型") - private String anodeType; - @Schema(description = "消耗量/产量：输入") - private String consumeAmount; - @Schema(description = "化石燃料碳排放量") - private String energyFossilNum; - @Schema(description = "消耗量/产量 单位") - private String consumeAmountUnit; - @Schema(description = "化石燃料碳排放量单位") - private String energyFossilUnit; - @Schema(description = "阳极类型(其他)") - private String anodeOtherType; - @Schema(description = "A: 频率") - private String rate; - @Schema(description = "A: 持续时间") - private String duration; - @Schema(description = "A:SEF(四氟化碳，CF)") - private String sfht; - @Schema(description = "F(六氟乙烷，CzFe)") - private String sfyw; - @Schema(description = "全球变暖潜势(A:SEF(四氟化碳，CF))") - private String globalWarmingSfht; - @Schema(description = "全球变暖潜势(F(六氟乙烷，CzFe))") - private String globalWarmingSfyw; - @Schema(description = "收集评率") - private String collectRate; - @Schema(description = "关联cbam_industry_info的主键id") - private Long industryId; - @Schema(description = "类型：4：倾斜法 5 电压法") - private Integer type; - @Schema(description = "排序") - private Long sort; - @Schema(description = "B: AEO") - private String aeo; - @Schema(description = "B: OVC") - private String ovc; - @Schema(description = "B:CE") - private String ce; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java deleted file mode 100644 index 22256da..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/dto/CbamProcessAllocationDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.thing.cbam.directCarbon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 生产过程分配量 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Data -@Schema(description = "生产过程分配量") -public class CbamProcessAllocationDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - @Schema(description = "排放源名称") - private String name; - @Schema(description = "关联cbam_industry_info的主键id") - private Long industryId; - @Schema(description = "关联cbam_process_material的id") - private Long prodId; - @Schema(description = "关联cbam_carbon_direct的id") - private Long directId; - @Schema(description = "生产过程分配量") - private String processAllocation; - @Schema(description = "排序") - private Long sort; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java deleted file mode 100644 index b5cac9b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonDirectEntity.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.thing.cbam.directCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 直接排放量B-Excel - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_direct") -public class CbamCarbonDirectEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 燃料名称/过程排放名称/物料平衡名称 - */ - private String name; - /** - * 消耗量/产量：输入 - */ - private String consumeAmount; - /** - * 消耗量单位：t 或者 1000Nm2 - */ - private String consumeUnit; - /** - * 低位发热量：燃料字典表值 - */ - private String lowHeatVal; - /** - * 低位发热量单位：燃料字典表值 - */ - private String lowHeatUnit; - /** - * 排放因子：燃料字典表值 - */ - private String emissionFactors; - /** - * 排放因子单位：燃料字典表值 - */ - private String emissionFactorsUnit; - /** - * 氧化因子/转化因子：燃料字典表值 - */ - private String oxidationFactor; - /** - * 生物量含量/生物质组分：输入 - */ - private String biomassContent; - /** - * 直接碳排量：计算 - */ - private String directCarbonNum; - /** - * 生物质燃料排放量：计算 - */ - private String biomassFuelNum; - /** - * 能量含量(化石燃料)，TJ：计算 - */ - private String energyFossilNum; - /** - * 能量含量(生物燃料)，TJ：计算 - */ - private String energyBiologyNum; - /** - * 碳含量(tC/t) - */ - private String carbonNum; - /** - * 气体类型：CO2/N2O - */ - private String gasType; - /** - * 生物质组分单位 - */ - private String biomassUnit; - /** - * 每小时平均温室气体浓度 - */ - private String hourAvgGasDensity; - /** - * 每小时平均温室气体浓度.单位 - */ - private String hourAvgGasDensityUnit; - /** - * 运行小时数 - */ - private String runHours; - /** - * 烟气 - */ - private String smokeAvg; - /** - * 烟气.单位 - */ - private String smokeAvgUnit; - /** - * 温室气体年排放量 - */ - private String gasAnnualEmissions; - /** - * 温室气体年排放量单位 - */ - private String gasAnnualEmissionsUnit; - /** - * 化石燃料碳排放量 - */ - private String fossilFuelCarbon; - /** - * 全球变暖潜势id - */ - private String globalWarmingId; - /** - * 全球变暖潜势 - */ - private String globalWarming; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - - /** - * 类型： - * 1.是否涉及燃烧排放 - * 2.是否涉及过程排放 - * 3.是否涉及物料平衡 - * 4.是否有连续排放测量系统(CEMS) - */ - private Integer type; - private Long sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java deleted file mode 100644 index 519d03d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamCarbonProgressEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.thing.cbam.directCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 原料过程排放 - * - * @author xc - * @since 3.0 2024-11-27 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_progress") -public class CbamCarbonProgressEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 名称 - */ - private String fuelName; - /** - * 消耗量 - */ - private String consumAmount; - /** - * 排放因子 - */ - private String emissionFactors; - /** - * 排放源名称 - */ - private String emissionName; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java deleted file mode 100644 index 38ae13c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamPerfluorinatedCarbonEntity.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.thing.cbam.directCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 全氟化碳PFC排放 - * - * @author xc - * @since 3.0 2024-12-03 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_perfluorinated_carbon") -public class CbamPerfluorinatedCarbonEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 阳极类型字典id - */ - private Long anodeTypeId; - /** - * 阳极类型 - */ - private String anodeType; - /** - * 消耗量/产量：输入 - */ - private String consumeAmount; - /** - * 化石燃料碳排放量 - */ - private String energyFossilNum; - /** - * 消耗量/产量 单位 - */ - private String consumeAmountUnit; - /** - * 化石燃料碳排放量单位 - */ - private String energyFossilUnit; - /** - * 阳极类型(其他) - */ - private String anodeOtherType; - /** - * A: 频率 - */ - private String rate; - /** - * A: 持续时间 - */ - private String duration; - /** - * A:SEF(四氟化碳，CF) - */ - private String sfht; - /** - * F(六氟乙烷，CzFe) - */ - private String sfyw; - /** - * 全球变暖潜势(A:SEF(四氟化碳，CF)) - */ - private String globalWarmingSfht; - /** - * 全球变暖潜势(F(六氟乙烷，CzFe)) - */ - private String globalWarmingSfyw; - private String collectRate; - /** - * 关联cbam_industry_info的主键id - */ - private Long industryId; - /** - * 类型：6：倾斜法 7电压法 - */ - private Integer type; - /** - * 排序 - */ - private Long sort; - /** - * B: AEO - */ - private String aeo; - /** - * B: OVC - */ - private String ovc; - /** - * B:CE - */ - private String ce; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java deleted file mode 100644 index 1ac37b6..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/entity/CbamProcessAllocationEntity.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.thing.cbam.directCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 生产过程分配量 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_process_allocation") -public class CbamProcessAllocationEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 排放源名称 - */ - private String name; - - /** - * 关联cbam_industry_info的主键id - */ - private Long industryId; - - /** - * 关联cbam_process_material的id - */ - private Long prodId; - - /** - * 关联cbam_carbon_direct的id - */ - private Long directId; - - /** - * 生产过程分配量 - */ - private String processAllocation; - - - /** - * 排序 - */ - private Long sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java deleted file mode 100644 index b663595..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamCarbonDirectMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.directCarbon.mapper; - -import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 直接排放量B-Excel -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Mapper -public interface CbamCarbonDirectMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java deleted file mode 100644 index f04de87..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamPerfluorinatedCarbonMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.directCarbon.mapper; - -import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 全氟化碳PFC排放 -* -* @author xc -* @since 3.0 2024-12-03 -*/ -@Mapper -public interface CbamPerfluorinatedCarbonMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java deleted file mode 100644 index 6e180e8..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/mapper/CbamProcessAllocationMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.directCarbon.mapper; - -import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 生产过程分配量 -* -* @author xc -* @since 3.0 2024-12-02 -*/ -@Mapper -public interface CbamProcessAllocationMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java deleted file mode 100644 index ddfbf5f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamCarbonDirectService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.thing.cbam.directCarbon.service; - -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectContextDTO; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; -import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; -import com.thing.common.orm.service.IBaseService; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; - -/** - * 直接排放量B-Excel - * - * @author xc - * @since 3.0 2024-12-02 - */ -public interface CbamCarbonDirectService extends IBaseService { - - List batchSaveOrUpdate(List carbonDirectDTOList); - - CbamCarbonDirectContextDTO batchSaveOrUpdateCarbonDirect(CbamCarbonDirectContextDTO cbamCarbonDirectContextDTO); - - List listByIndustryId(Long industryId); - - void batchUpdateList(List carbonDirectDTOList); - - Map calculate(Long fuelId, String consumeAmount, String biomassContent); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java deleted file mode 100644 index f617428..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamPerfluorinatedCarbonService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.thing.cbam.directCarbon.service; - -import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; -import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -/** - * 全氟化碳PFC排放 - * - * @author xc - * @since 3.0 2024-12-03 - */ -public interface CbamPerfluorinatedCarbonService extends IBaseService { - - List batchSaveOrUpdate(List list); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java deleted file mode 100644 index 1f2e469..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/CbamProcessAllocationService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.thing.cbam.directCarbon.service; - -import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; -import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -/** - * 生产过程分配量 - * - * @author xc - * @since 3.0 2024-12-02 - */ -public interface CbamProcessAllocationService extends IBaseService { - - List batchSaveOrUpdate(List list); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java deleted file mode 100644 index 629fd5c..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamCarbonDirectServiceImpl.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.thing.cbam.directCarbon.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.dict.entity.CbamFuelDictEntity; -import com.thing.cbam.dict.service.CbamFuelDictService; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectContextDTO; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; -import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; -import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; -import com.thing.cbam.directCarbon.entity.CbamCarbonDirectEntity; -import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; -import com.thing.cbam.directCarbon.mapper.CbamCarbonDirectMapper; -import com.thing.cbam.directCarbon.service.CbamCarbonDirectService; -import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; -import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; -import com.thing.cbam.directCarbon.util.BurningDischargeUtil; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.*; -import java.util.stream.Collectors; - -/** - * 直接排放量B-Excel - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Service -@RequiredArgsConstructor -public class CbamCarbonDirectServiceImpl extends BaseServiceImpl implements CbamCarbonDirectService { - - - private final CbamFuelDictService cbamFuelDictService; - private final CbamPerfluorinatedCarbonService cbamPerfluorinatedCarbonService; - private final CbamProcessAllocationService cbamProcessAllocationService; - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List listByIndustryId(Long industryId) { - QueryWrapper queryWrapper = QueryWrapper.create().eq(CbamCarbonDirectEntity::getIndustryId, industryId) - .orderBy(CbamCarbonDirectEntity::getType, true) - .orderBy(CbamCarbonDirectEntity::getSort, true); - return mapper.selectListByQueryAs(queryWrapper, CbamCarbonDirectDTO.class); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public List batchSaveOrUpdate(List carbonDirectDTOList) { - List resList = new ArrayList<>(); - //根据type分组 - Map> carbonDirectMapList = carbonDirectDTOList.stream().collect(Collectors.groupingBy(CbamCarbonDirectDTO::getType)); - for (Map.Entry> entries : carbonDirectMapList.entrySet()) { - Integer key = entries.getKey(); - if(Objects.equals(key,1) || Objects.equals(key,2) || Objects.equals(key,3)|| Objects.equals(key,6)|| Objects.equals(key,7)){ - List values = entries.getValue(); - List industryIds = values.stream().map(CbamCarbonDirectDTO::getIndustryId).toList(); - //先删除 - mapper.deleteByQuery(QueryWrapper.create() - .in(CbamCarbonDirectEntity::getIndustryId, industryIds) - .eq(CbamCarbonDirectEntity::getType, key)); - List cbamCarbonDirectEntities = ConvertUtils.sourceToTarget(values, CbamCarbonDirectEntity.class); - mapper.insertBatch(cbamCarbonDirectEntities); - resList.addAll(ConvertUtils.sourceToTarget(cbamCarbonDirectEntities, CbamCarbonDirectDTO.class)); - } - } - return resList; - } - - @Override - public CbamCarbonDirectContextDTO batchSaveOrUpdateCarbonDirect(CbamCarbonDirectContextDTO cbamCarbonDirectContextDTO) { - CbamCarbonDirectContextDTO resDTO = new CbamCarbonDirectContextDTO(); - //处理直接碳排数据，类型是1、2、3、6 - List cbamCarbonDirectDTOS = batchSaveOrUpdate(cbamCarbonDirectContextDTO.getCarbonDirectList()); - resDTO.setCarbonDirectList(cbamCarbonDirectDTOS); - //处理直接碳排数据，类型是4、5 - List cbamPerfluorinatedCarbonDTOS = cbamPerfluorinatedCarbonService.batchSaveOrUpdate(cbamCarbonDirectContextDTO.getPerfluorinatedCarbonList()); - resDTO.setPerfluorinatedCarbonList(cbamPerfluorinatedCarbonDTOS); - //处理直接碳排数据，类型是7 - List cbamProcessAllocationDTOS = cbamProcessAllocationService.batchSaveOrUpdate(cbamCarbonDirectContextDTO.getProcessAllocationList()); - resDTO.setProcessAllocationList(cbamProcessAllocationDTOS); - return resDTO; - } - - - @Transactional(rollbackFor = Exception.class) - @Override - public void batchUpdateList(List carbonDirectDTOList) { - //1.删除直接碳排相关的数据 - mapper.deleteByQuery(QueryWrapper.create().eq(CbamCarbonDirectEntity::getIndustryId,carbonDirectDTOList.get(0).getIndustryId())); - //2.删除各生产过程中原材料/燃料的分配 - cbamProcessAllocationService.getMapper() - .deleteByQuery(QueryWrapper.create().eq(CbamProcessAllocationEntity::getIndustryId,carbonDirectDTOList.get(0).getIndustryId())); - //重新添加相关信息 - batchSaveOrUpdate(carbonDirectDTOList); - } - - @Override - public Map calculate(Long fuelId, String consumeAmount, String biomassContent) { - Map resMap = new HashMap<>(); - //获取燃料系数字典信息 - CbamFuelDictEntity cbamFuelDict = cbamFuelDictService.getById(fuelId); - if(Objects.isNull(cbamFuelDict)){ - throw new RuntimeException("燃料系数字典信息不存在"); - } - //公用计算：消耗量*低位发热量 - String lowHeatAmount = cbamFuelDict.getLowHeatAmount(); - //1.首先先计算（第四个）----能量含量(生物质燃料)，工J =消耗量*低位发热量*生物量含量/100/1000 - BigDecimal energyBiologyNum = - BurningDischargeUtil.energyBiologyNumCalculate(consumeAmount, lowHeatAmount, biomassContent); - resMap.put("energyBiologyNum",energyBiologyNum); - //2.其次计算第三个：能量含量(化石燃料),TJ =消耗量*低位发热量/1000-能量含量(生物质燃料) - BigDecimal energyFossilNum = BurningDischargeUtil.energyHsNumCalculate(consumeAmount, lowHeatAmount, energyBiologyNum.toPlainString()); - resMap.put("energyFossilNum",energyFossilNum); - //3.生物质燃料排放量 =消耗量*低位发热量*生物量含量*排放因子/100/1000 - BigDecimal biomassFuelNum = BurningDischargeUtil.biomassFuelNumCalculate(consumeAmount, lowHeatAmount, biomassContent, cbamFuelDict.getEmissionFactor()); - resMap.put("biomassFuelNum",biomassFuelNum); - //4.直接碳排放量 =消耗量*低位发热量*氧化因子*排放因子/100/1000-生物质燃料排放量 - BigDecimal directCarbonNum = BurningDischargeUtil.directCarbonCalculate(consumeAmount, lowHeatAmount, biomassContent, cbamFuelDict.getEmissionFactor(), cbamFuelDict.getCarbonOxdRate()); - resMap.put("directCarbonNum",directCarbonNum); - return resMap; - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java deleted file mode 100644 index 6620ec2..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamPerfluorinatedCarbonServiceImpl.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.thing.cbam.directCarbon.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.baesInfoExcel.entity.CbamIndustryEntity; -import com.thing.cbam.baesInfoExcel.service.CbamIndustryService; -import com.thing.cbam.directCarbon.dto.CbamCarbonDirectDTO; -import com.thing.cbam.directCarbon.dto.CbamPerfluorinatedCarbonDTO; -import com.thing.cbam.directCarbon.entity.CbamPerfluorinatedCarbonEntity; -import com.thing.cbam.directCarbon.mapper.CbamPerfluorinatedCarbonMapper; -import com.thing.cbam.directCarbon.service.CbamPerfluorinatedCarbonService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * 全氟化碳PFC排放 - * - * @author xc - * @since 3.0 2024-12-03 - */ -@Service -@RequiredArgsConstructor -public class CbamPerfluorinatedCarbonServiceImpl extends BaseServiceImpl implements CbamPerfluorinatedCarbonService { - - private final CbamIndustryService cbamIndustryService; - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List batchSaveOrUpdate(List list) { - //只有铝制品行业有以下处理 - // type=4,5 的类型 单独 更新生产过程中的分配量 - List industryIds = list.stream().map(CbamPerfluorinatedCarbonDTO::getIndustryId).distinct().toList(); - //先删除 - mapper.deleteByQuery(QueryWrapper.create().in(CbamPerfluorinatedCarbonEntity::getIndustryId, industryIds)); - //再新增 - List perfluorinatedCarbonEntities = ConvertUtils.sourceToTarget(list, CbamPerfluorinatedCarbonEntity.class); - mapper.insertBatch(perfluorinatedCarbonEntities); - return ConvertUtils.sourceToTarget(perfluorinatedCarbonEntities, CbamPerfluorinatedCarbonDTO.class); -// if(CollectionUtils.isEmpty(list)){ -// throw new RuntimeException("铝制品行业相关《倾斜法，电压法》没有相关数据"); -// } -// //1.获取相关industryId -// Long industryId = list.get(0).getIndustryId(); -// CbamIndustryEntity cbamIndustryEntity = cbamIndustryService.getById(industryId); -// if(!StringUtils.equals(cbamIndustryEntity.getIndustryDict(), "铝行业") && !Objects.equals(cbamIndustryEntity.getIndustryDictId(), 11002L)){ -// throw new RuntimeException("非铝制品行业相关《倾斜法，电压法》行业，无需添加"); -// } -// //1.1获取id没有值的参数,即新增数据 -// List newList = list.stream().filter(carbonDirectDTO -> Objects.isNull(carbonDirectDTO.getId())).toList(); -// if(CollectionUtils.isNotEmpty(newList)){ -// mapper.insertBatch(ConvertUtils.sourceToTarget(newList, CbamPerfluorinatedCarbonEntity.class)); -// } -// //1.2 获取id有值的参数,即更新数据 -// List existList = list.stream().filter(carbonDirectDTO -> Objects.isNull(carbonDirectDTO.getId())).toList(); -// if(CollectionUtils.isEmpty(existList)){ -// return; -// } -// //2.根据industryId查询所有数据 -// List perfluorinatedCarbonEntities = -// mapper.selectListByQuery(QueryWrapper.create().eq(CbamPerfluorinatedCarbonEntity::getIndustryId, industryId)); -// //3.获取参数中需要更新的id -// List updateIds = existList.stream().map(CbamPerfluorinatedCarbonDTO::getId).toList(); -// //4.排除不需要更新的id集合,并且删除相关信息 -// if(CollectionUtils.isNotEmpty(perfluorinatedCarbonEntities)){ -// //获取不在数据库的id集合 -// List unUpdatePerfluorinatedEntities -// = perfluorinatedCarbonEntities.stream().filter(carbonDirectEntity -> !updateIds.contains(carbonDirectEntity.getId())).toList(); -// if(CollectionUtils.isNotEmpty(unUpdatePerfluorinatedEntities)){ -// mapper.deleteBatchByIds(unUpdatePerfluorinatedEntities.stream().map(CbamPerfluorinatedCarbonEntity::getId).toList()); -// } -// //获取在数据库的记录,并进行更新 -// List existPerfluorinatedCarbons = existList.stream().filter(s -> updateIds.contains(s.getId())).toList(); -// if(CollectionUtils.isNotEmpty(existPerfluorinatedCarbons)){ -// existPerfluorinatedCarbons.forEach(carbonDirectDTO -> mapper.update(ConvertUtils.sourceToTarget(carbonDirectDTO, CbamPerfluorinatedCarbonEntity.class))); -// } -// } - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java deleted file mode 100644 index 2438d43..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/service/impl/CbamProcessAllocationServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.thing.cbam.directCarbon.service.impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.directCarbon.dto.CbamProcessAllocationDTO; -import com.thing.cbam.directCarbon.entity.CbamProcessAllocationEntity; -import com.thing.cbam.directCarbon.mapper.CbamProcessAllocationMapper; -import com.thing.cbam.directCarbon.service.CbamProcessAllocationService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * 生产过程分配量 - * - * @author xc - * @since 3.0 2024-12-02 - */ -@Service -public class CbamProcessAllocationServiceImpl extends BaseServiceImpl implements CbamProcessAllocationService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - @Override - public List batchSaveOrUpdate(List list) { - //先删除 - List industryIds = list.stream().map(CbamProcessAllocationDTO::getIndustryId).toList(); - List prodIds = list.stream().map(CbamProcessAllocationDTO::getProdId).toList(); - List directId = list.stream().map(CbamProcessAllocationDTO::getDirectId).toList(); - mapper.deleteByQuery(new QueryWrapper() - .in(CbamProcessAllocationEntity::getIndustryId, industryIds) - .in(CbamProcessAllocationEntity::getProdId, prodIds) - .in(CbamProcessAllocationEntity::getDirectId, directId)); - //再新增 - List cbamProcessAllocationEntities = ConvertUtils.sourceToTarget(list, CbamProcessAllocationEntity.class); - mapper.insertBatch(cbamProcessAllocationEntities); - return ConvertUtils.sourceToTarget(cbamProcessAllocationEntities, CbamProcessAllocationDTO.class); - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java deleted file mode 100644 index 85bdd4d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/BurningDischargeUtil.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.thing.cbam.directCarbon.util; - -import java.math.BigDecimal; -import java.math.RoundingMode; - -/** - * 燃烧排放的计算工具类 - */ -public class BurningDischargeUtil { - - /** - * 公用计算：消耗量*低位发热量 - * @param consumeAmount 消耗量 - * @param lowHeatAmount 低位发热量 - * @return 公用计算结果 - */ - public static BigDecimal commonCalculate(String consumeAmount,String lowHeatAmount) { - return new BigDecimal(consumeAmount).multiply(new BigDecimal(lowHeatAmount)); - } - - /** - * 能量含量(生物质燃料)，工J =消耗量*低位发热量*生物量含量/100/1000 - * @param consumeAmount 消耗量 - * @param lowHeatAmount 低位发热量 - * @param biomassContent 生物量含量 - * @return 公用计算结果 - */ - public static BigDecimal energyBiologyNumCalculate(String consumeAmount, String lowHeatAmount, String biomassContent) { - return commonCalculate(consumeAmount,lowHeatAmount) - .multiply(new BigDecimal(biomassContent)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP); - } - - /** - * 能量含量(化石燃料),TJ =消耗量*低位发热量/1000-能量含量(生物质燃料) - * @param consumeAmount 消耗量 - * @param lowHeatAmount 低位发热量 - * @param energyBiologyNum 能量含量(生物质燃料) - * @return 公用计算结果 - */ - public static BigDecimal energyHsNumCalculate(String consumeAmount,String lowHeatAmount,String energyBiologyNum) { - return commonCalculate(consumeAmount,lowHeatAmount) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP) - .subtract(energyBiologyNumCalculate(consumeAmount,lowHeatAmount,energyBiologyNum)); - } - - - /** - * 生物质燃料排放量 =消耗量*低位发热量*生物量含量*排放因子/100/1000 - * @param consumeAmount 消耗量 - * @param lowHeatAmount 低位发热量 - * @param biomassContent 生物量含量 - * @param emissionFactor 排放因子 - * @return 公用计算结果 - */ - public static BigDecimal biomassFuelNumCalculate(String consumeAmount,String lowHeatAmount,String biomassContent,String emissionFactor) { - return commonCalculate(consumeAmount,lowHeatAmount) - .multiply(new BigDecimal(biomassContent)) - .multiply(new BigDecimal(emissionFactor)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP); - } - - - /** - * 直接碳排放量 =消耗量*低位发热量*氧化因子*排放因子/100/1000-生物质燃料排放量 - * @param consumeAmount 消耗量 - * @param lowHeatAmount 低位发热量 - * @param biomassContent 生物量含量 - * @param emissionFactor 排放因子 - * @return 公用计算结果 - */ - public static BigDecimal directCarbonCalculate(String consumeAmount,String lowHeatAmount,String biomassContent,String emissionFactor,String carbonOxdRate) { - return commonCalculate(consumeAmount,lowHeatAmount) - .multiply(new BigDecimal(carbonOxdRate)) - .multiply(new BigDecimal(emissionFactor)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP) - .subtract(biomassFuelNumCalculate(consumeAmount,lowHeatAmount,biomassContent,emissionFactor)); - } - - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java deleted file mode 100644 index a52e5e6..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/MaterialBalanceUtil.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.thing.cbam.directCarbon.util; - -import java.math.BigDecimal; -import java.math.RoundingMode; - -/** - * 物料平衡计算工具类 - */ -public class MaterialBalanceUtil { - - - /** - * 公用计算：消耗量*含碳量*44/12 - * @param consumeAmount 消耗量 - * @param carbonContent 碳含量 - * @return 公用计算结果 - */ - public static BigDecimal commonCalculate(String consumeAmount,String carbonContent) { - return new BigDecimal(consumeAmount) - .multiply(new BigDecimal(carbonContent)) - .multiply(new BigDecimal(44)) - .divide(new BigDecimal(12), 2, RoundingMode.HALF_UP) - ; - } - - - /** - * 生物质燃料排放量 =消耗量*含碳量*44/12*生物量含量/100 - * @param consumeAmount 消耗量 - * @param carbonContent 碳含量 - * @param biomassContent 生物量含量 - * @return 公用计算结果 - */ - public static BigDecimal biomassFuelNumCalculate(String consumeAmount,String carbonContent, String biomassContent) { - return commonCalculate(consumeAmount, carbonContent) - .multiply(new BigDecimal(biomassContent)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP); - } - - - /** - * 直接碳排放量 ==消耗量*含碳量*44/12-生物质燃料排放量 - * @param consumeAmount 消耗量 - * @param carbonContent 碳含量 - * @param biomassContent 生物量含量 - * @return 公用计算结果 - */ - public static BigDecimal directCarbonCalculate(String consumeAmount,String carbonContent, String biomassContent) { - return commonCalculate(consumeAmount, carbonContent) - .subtract(biomassFuelNumCalculate(consumeAmount,carbonContent,biomassContent)); - } - - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java b/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java deleted file mode 100644 index 402cb71..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/directCarbon/util/ProcessDischargeUtil.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.thing.cbam.directCarbon.util; - -import java.math.BigDecimal; -import java.math.RoundingMode; - -/** - * 过程排放的计算工具类 - */ -public class ProcessDischargeUtil { - - - /** - * 公用计算：消耗量*排放因子*转化因子/100 - * @param consumeAmount 消耗量 - * @param emissionFactor 排放因子 - * @param conversionFactor 转换因子 - * @return 公用计算结果 - */ - public static BigDecimal commonCalculate(String consumeAmount,String emissionFactor,String conversionFactor) { - return new BigDecimal(consumeAmount) - .multiply(new BigDecimal(emissionFactor)) - .multiply(new BigDecimal(conversionFactor)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - ; - } - - - /** - * 生物质燃料排放量 ==消耗量*排放因子*转化因子/100*生物量含量/100 - * @param consumeAmount 消耗量 - * @param emissionFactor 排放因子 - * @param conversionFactor 转换因子 - * @param biomassContent 生物量含量 - * @return 公用计算结果 - */ - public static BigDecimal biomassFuelNumCalculate(String consumeAmount,String emissionFactor,String conversionFactor, String biomassContent) { - return commonCalculate( consumeAmount, emissionFactor,conversionFactor) - .multiply(new BigDecimal(biomassContent)) - .multiply(new BigDecimal(emissionFactor)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP) - .multiply(new BigDecimal(biomassContent)) - .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP); - } - - - /** - * 直接碳排放量 ==消耗量"排放因子*转化因子/100-生物质燃料排成量 - * @param consumeAmount 消耗量 - * @param emissionFactor 排放因子 - * @param conversionFactor 转换因子 - * @param biomassContent 生物量含量 - * @return 公用计算结果 - */ - public static BigDecimal directCarbonCalculate(String consumeAmount,String emissionFactor,String conversionFactor, String biomassContent) { - return commonCalculate( consumeAmount, emissionFactor,conversionFactor) - .subtract(biomassFuelNumCalculate(consumeAmount,emissionFactor,conversionFactor,biomassContent)); - } - - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java deleted file mode 100644 index d7f5ec5..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/controller/CbamElectricityToolController.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.thing.cbam.electricity.controller; - -import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; -import com.thing.cbam.electricity.service.CbamElectricityToolService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("v2/cbam/electricity/tool") -@Tag(name="热电联产工具") -@RequiredArgsConstructor -public class CbamElectricityToolController { - private final CbamElectricityToolService cbamElectricityToolService; - @GetMapping("page") - @Operation(summary = "分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"), - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map param) { - PageData pageList = cbamElectricityToolService.getPageData(param,CbamElectricityToolDTO.class); - return new Result>().ok(pageList); - } - - @GetMapping("{id}") - @Operation(summary = "信息") - public Result info(@PathVariable("id") Long id) { - CbamElectricityToolDTO dto = cbamElectricityToolService.getByIdAs(id,CbamElectricityToolDTO.class); - return new Result().ok(dto); - } - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamElectricityToolDTO dto) { - cbamElectricityToolService.saveDto(dto); - return new Result<>(); - } - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamElectricityToolDTO dto) { - cbamElectricityToolService.updateDto(dto); - return new Result<>(); - } - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - AssertUtils.isArrayEmpty(ids,"id"); - cbamElectricityToolService.batchDelete(ids); - return new Result<>(); - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java deleted file mode 100644 index ce45c27..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/dto/CbamElectricityToolDTO.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.thing.cbam.electricity.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 热电联产工具 -* -* @author xc -* @since 3.0 2024-12-03 -*/ -@Data -@Schema(description = "热电联产工具") -public class CbamElectricityToolDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "CHP的燃料投入") - private String fuelInput; - @Schema(description = "CHP的发热量产出") - private String heatingOutput; - @Schema(description = "CHP发电量") - private String powerGener; - @Schema(description = "来自CHP机组的燃料投入量") - private String fuelUnit; - @Schema(description = "来自烟气净化过程的燃料投入量") - private String gasProcess; - @Schema(description = "发热量生产") - private String heatProd; - @Schema(description = "电力生产") - private String electProd; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "CHP发电量计算值") - private String calcuPower; - @Schema(description = "排放总量") - private String totalEmiss; - @Schema(description = "发热量电力合计") - private String totalSum; - @Schema(description = "发热量产出引起的排放量") - private String emissHeat; - @Schema(description = "排放因子,发热量") - private String factorHeat; - @Schema(description = "电力排放") - private String electEmiss; - @Schema(description = "排放因子,电力") - private String factorElect; - @Schema(description = "发热量的燃料投入") - private String inputHeat; - @Schema(description = "电力的燃料投入") - private String inputElect; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java deleted file mode 100644 index a3b9a3e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/entity/CbamElectricityToolEntity.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.thing.cbam.electricity.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 热电联产工具 - * - * @author xc - * @since 3.0 2024-12-03 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_electricity_tool") -public class CbamElectricityToolEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * CHP的燃料投入 - */ - private String fuelInput; - /** - * CHP的发热量产出 - */ - private String heatingOutput; - /** - * CHP发电量 - */ - private String powerGener; - /** - * 来自CHP机组的燃料投入量 - */ - private String fuelUnit; - /** - * 来自烟气净化过程的燃料投入量 - */ - private String gasProcess; - /** - * 发热量生产 - */ - private String heatProd; - /** - * 电力生产 - */ - private String electProd; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * CHP发电量计算值 - */ - private String calcuPower; - /** - * 排放总量 - */ - private String totalEmiss; - /** - * 发热量电力合计 - */ - private String totalSum; - /** - * 发热量产出引起的排放量 - */ - private String emissHeat; - /** - * 排放因子,发热量 - */ - private String factorHeat; - /** - * 电力排放 - */ - private String electEmiss; - /** - * 排放因子,电力 - */ - private String factorElect; - /** - * 发热量的燃料投入 - */ - private String inputHeat; - /** - * 电力的燃料投入 - */ - private String inputElect; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java deleted file mode 100644 index 0701963..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/mapper/CbamElectricityToolMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.electricity.mapper; - -import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamElectricityToolMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java deleted file mode 100644 index d14b18d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/CbamElectricityToolService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.thing.cbam.electricity.service; - - -import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; -import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.LinkedHashMap; - -public interface CbamElectricityToolService extends IBaseService { - - LinkedHashMap validateMsg(CbamElectricityToolDTO cbamElectricityToolDTO); -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java deleted file mode 100644 index a5e162e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/electricity/service/Impl/CbamElectricityToolServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.thing.cbam.electricity.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.electricity.dto.CbamElectricityToolDTO; -import com.thing.cbam.electricity.entity.CbamElectricityToolEntity; -import com.thing.cbam.electricity.mapper.CbamElectricityToolMapper; -import com.thing.cbam.electricity.service.CbamElectricityToolService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.LinkedHashMap; -import java.util.Map; - -@Service -public class CbamElectricityToolServiceImpl extends BaseServiceImpl implements CbamElectricityToolService { - - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public LinkedHashMap validateMsg(CbamElectricityToolDTO cbamElectricityToolDTO) { - LinkedHashMap resMap = new LinkedHashMap<>(); - if (StringUtils.isBlank(cbamElectricityToolDTO.getFuelInput())){ - resMap.put("fuelInput","CHP的燃料投入不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getHeatingOutput())){ - resMap.put("heatingOutput","CHP的发热量产出不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getPowerGener())){ - resMap.put("powerGener","CHP发电量不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getFuelUnit())){ - resMap.put("fuelUnit","来自CHP机组的燃料投入量不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getGasProcess())){ - resMap.put("gasProcess","来自烟气净化过程的燃料投入量不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getHeatProd())){ - resMap.put("heatProd","发热量生产不能为空"); - } - if (StringUtils.isBlank(cbamElectricityToolDTO.getElectProd())){ - resMap.put("electProd","电力生产不能为空"); - } - - return resMap; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java deleted file mode 100644 index 3dc2e7a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonIndirectEmissionsController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.thing.cbam.indirectCarbon.controller; - - -import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; -import com.thing.cbam.indirectCarbon.service.CbamCarbonIndirectEmissionsService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("v2/cbam/indirect") -@Tag(name = "间接排放量") -@RequiredArgsConstructor -public class CbamCarbonIndirectEmissionsController { - - private final CbamCarbonIndirectEmissionsService cbamCarbonIndirectEmissionsService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamCarbonIndirectEmissionsService.getPageData(params, CbamCarbonIndirectEmissionsDTO.class); - return new Result>().ok(page); - } - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonIndirectEmissionsDTO data = cbamCarbonIndirectEmissionsService.getByIdAs(id, CbamCarbonIndirectEmissionsDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonIndirectEmissionsDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonIndirectEmissionsService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonIndirectEmissionsDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonIndirectEmissionsService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonIndirectEmissionsService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); - *} - */ - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java deleted file mode 100644 index 488116a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamCarbonPowerProgressAllocationController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.thing.cbam.indirectCarbon.controller; - -import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; -import com.thing.cbam.indirectCarbon.service.CbamCarbonPowerProgressAllocationService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* 耗电量分配 -* -* @author xc -* @since 3.0 2024-11-28 -*/ -@RestController -@RequestMapping("v2/cbam/power/allocation") -@Tag(name="耗电量分配") -@RequiredArgsConstructor -public class CbamCarbonPowerProgressAllocationController { - - private final CbamCarbonPowerProgressAllocationService cbamCarbonPowerProgressAllocationService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamCarbonPowerProgressAllocationService.getPageData(params, CbamCarbonPowerProgressAllocationDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamCarbonPowerProgressAllocationDTO data = cbamCarbonPowerProgressAllocationService.getByIdAs(id, CbamCarbonPowerProgressAllocationDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamCarbonPowerProgressAllocationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamCarbonPowerProgressAllocationService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamCarbonPowerProgressAllocationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamCarbonPowerProgressAllocationService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamCarbonPowerProgressAllocationService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamCarbonPowerProgressAllocationService.listAs(params, CbamCarbonPowerProgressAllocationDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "耗电量分配", list, CbamCarbonPowerProgressAllocationExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java deleted file mode 100644 index dfbfa74..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/controller/CbamPowerSummaryFuelController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.thing.cbam.indirectCarbon.controller; - -import com.thing.cbam.indirectCarbon.dto.CbamPowerSummaryFuelDTO; -import com.thing.cbam.indirectCarbon.service.CbamPowerSummaryFuelService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* 排放量汇总与数据质量信息 与 燃料平衡 -* -* @author xc -* @since 3.0 2024-12-05 -*/ -@RestController -@RequestMapping("v2/cbam/powersummary") -@Tag(name="排放量汇总与数据质量信息与燃料平衡") -@RequiredArgsConstructor -public class CbamPowerSummaryFuelController { - - private final CbamPowerSummaryFuelService cbamPowerSummaryFuelService; - - @GetMapping("page") - @Operation(summary="分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params){ - PageData page = cbamPowerSummaryFuelService.getPageData(params, CbamPowerSummaryFuelDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary="信息") - public Result get(@PathVariable("id") Long id){ - CbamPowerSummaryFuelDTO data = cbamPowerSummaryFuelService.getByIdAs(id, CbamPowerSummaryFuelDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary="保存") - @LogOperation("保存") - public Result save(@RequestBody CbamPowerSummaryFuelDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamPowerSummaryFuelService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary="修改") - @LogOperation("修改") - public Result update(@RequestBody CbamPowerSummaryFuelDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamPowerSummaryFuelService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary="删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamPowerSummaryFuelService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamPowerSummaryFuelService.listAs(params, CbamPowerSummaryFuelDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "排放量汇总与数据质量信息 与 燃料平衡", list, CbamPowerSummaryFuelExcel.class); - *} - */ - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java deleted file mode 100644 index b12973d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonIndirectEmissionsDTO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.thing.cbam.indirectCarbon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 间接排放量 -* -* @author xc -* @since 3.0 2024-11-28 -*/ -@Data -@Schema(description = "间接排放量") -public class CbamCarbonIndirectEmissionsDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "用电类型：\n" + - "0 - 总计\n" + - "1 - 国家电网电量\n" + - "2.第三方发电厂电量\n" + - "3.绿色电力（自建绿电）\n" + - "4.生产烟气/余热发电") - private String electricityType; - @Schema(description = "耗电量") - private String powerConsume; - @Schema(description = "电力碳排放因子") - private String electricityFactor; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java deleted file mode 100644 index 015663b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamCarbonPowerProgressAllocationDTO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.thing.cbam.indirectCarbon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 耗电量分配 -* -* @author xc -* @since 3.0 2024-11-28 -*/ -@Data -@Schema(description = "耗电量分配") -public class CbamCarbonPowerProgressAllocationDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "主键") - private Long id; - - @Schema(description = "生产过程设备总功率") - private String powerEquip; - - @Schema(description = "设备平均运行时间") - private String averEquip; - - @Schema(description = "耗电量") - private String powerConsume; - - @Schema(description = "电力排放因子") - private String electricityEmissionFactor; - - @Schema(description = "电力排放因子的来源") - private String electricityEmissionSource; - - @Schema(description = "关联cbam_industry_info的主键id") - private Long industryId; - - @Schema(description = "关联cbam_process_material的主键id") - private Long processId; - - @Schema(description = "生产过程名称") - private String processName; - - @Schema(description = "排序") - private Long sort; - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java deleted file mode 100644 index 7fd83a4..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/dto/CbamPowerSummaryFuelDTO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.thing.cbam.indirectCarbon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 排放量汇总与数据质量信息 与 燃料平衡 -* -* @author xc -* @since 3.0 2024-12-05 -*/ -@Data -@Schema(description = "排放量汇总与数据质量信息 与 燃料平衡") -public class CbamPowerSummaryFuelDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "有关数据质量的一般信息") - private String qualityInfo; - @Schema(description = "质量保证信息") - private String assurInfo; - @Schema(description = "电力生产燃料") - private String produFuel; - @Schema(description = "非CBAM商品生产的直接燃料 ") - private String nocbamFuel; - @Schema(description = "CBAM商品生产的直接燃料 ") - private String cbamFuel; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "使用默认值的理由（如果适用）") - private String qualityReason; - @Schema(description = "单位") - private String unit; - @Schema(description = "总燃料投入") - private String totalFuel; - @Schema(description = "其他") - private String otherFuel; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java deleted file mode 100644 index 7717f7f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonIndirectEmissionsEntity.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.thing.cbam.indirectCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 间接排放量 - * - * @author xc - * @since 3.0 2024-11-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_carbon_indirect_emissions") -public class CbamCarbonIndirectEmissionsEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 用电类型： - * 0 - 总计 - * 1 - 国家电网电量 - * 2.第三方发电厂电量 - * 3.绿色电力（自建绿电） - * 4.生产烟气/余热发电 - */ - private String electricityType; - /** - * 耗电量 - */ - private String powerConsume; - /** - * 电力碳排放因子 - */ - private String electricityFactor="0.5568"; - /** - * 关联cbam_industry_info的主键id - */ - private Long industryId; - /** - * 排序 - */ - private Long sort; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java deleted file mode 100644 index 55bc725..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamCarbonPowerProgressAllocationEntity.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.thing.cbam.indirectCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 耗电量分配 - * - * @author xc - * @since 3.0 2024-11-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_power_progress_allocation") -public class CbamCarbonPowerProgressAllocationEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 生产过程设备总功率 - */ - private String powerEquip; - /** - * 设备平均运行时间 - */ - private String averEquip; - /** - * 耗电量 - */ - private String powerConsume; - /** - * 电力排放因子 - */ - private String electricityEmissionFactor; - /** - * 电力排放因子的来源 - */ - private String electricityEmissionSource; - - /** - * 关联cbam_industry_info的主键id - */ - private Long industryId; - /** - * 关联cbam_process_material的主键id - */ - private Long processId; - /** - * 生产过程名称 - */ - private String processName; - - /** - * 排序 - */ - private Long sort; - - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java deleted file mode 100644 index 381134f..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/entity/CbamPowerSummaryFuelEntity.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.thing.cbam.indirectCarbon.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 排放量汇总与数据质量信息 与 燃料平衡 - * - * @author xc - * @since 3.0 2024-12-05 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_power_summary_fuel") -public class CbamPowerSummaryFuelEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 有关数据质量的一般信息 - */ - private String qualityInfo; - /** - * 质量保证信息 - */ - private String assurInfo; - /** - * 电力生产燃料 - */ - private String produFuel; - /** - * 非CBAM商品生产的直接燃料 - */ - private String nocbamFuel; - /** - * CBAM商品生产的直接燃料 - */ - private String cbamFuel; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 使用默认值的理由（如果适用） - */ - private String qualityReason; - /** - * 单位 - */ - private String unit; - /** - * 总燃料投入 - */ - private String totalFuel; - /** - * 其他 - */ - private String otherFuel; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java deleted file mode 100644 index 327f807..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonIndirectEmissionsMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.indirectCarbon.mapper; - -import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 间接排放量 -* -* @author xc -* @since 3.0 2024-11-28 -*/ -@Mapper -public interface CbamCarbonIndirectEmissionsMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java deleted file mode 100644 index 7cefcdc..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamCarbonPowerProgressAllocationMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.indirectCarbon.mapper; - -import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; - -import org.apache.ibatis.annotations.Mapper; - -/** -* 耗电量分配 -* -* @author xc -* @since 3.0 2024-11-28 -*/ -@Mapper -public interface CbamCarbonPowerProgressAllocationMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java deleted file mode 100644 index a21e2ff..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/mapper/CbamPowerSummaryFuelMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.thing.cbam.indirectCarbon.mapper; - -import com.thing.cbam.indirectCarbon.entity.CbamPowerSummaryFuelEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** -* 排放量汇总与数据质量信息 与 燃料平衡 -* -* @author xc -* @since 3.0 2024-12-05 -*/ -@Mapper -public interface CbamPowerSummaryFuelMapper extends PowerBaseMapper { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java deleted file mode 100644 index e961223..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonIndirectEmissionsService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cbam.indirectCarbon.service; - -import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; -import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -public interface CbamCarbonIndirectEmissionsService extends IBaseService { - - - List batchSaveOrUpdate(List cbamCarbonIndirectEmissionsDTOList); - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java deleted file mode 100644 index 06de4f8..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamCarbonPowerProgressAllocationService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.thing.cbam.indirectCarbon.service; - -import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; -import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - - -/** - * 耗电量分配 - * - * @author xc - * @since 3.0 2024-11-28 - */ -public interface CbamCarbonPowerProgressAllocationService extends IBaseService { - - List batchSaveOrUpdate(List carbonPowerProgressAllocationDTOS); - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java deleted file mode 100644 index 0430889..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/CbamPowerSummaryFuelService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.thing.cbam.indirectCarbon.service; - -import com.thing.cbam.indirectCarbon.entity.CbamPowerSummaryFuelEntity; -import com.thing.common.orm.service.IBaseService; - -/** - * 排放量汇总与数据质量信息 与 燃料平衡 - * - * @author xc - * @since 3.0 2024-12-05 - */ -public interface CbamPowerSummaryFuelService extends IBaseService { - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java deleted file mode 100644 index 0b12f26..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonIndirectEmissionsServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.thing.cbam.indirectCarbon.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.indirectCarbon.dto.CbamCarbonIndirectEmissionsDTO; -import com.thing.cbam.indirectCarbon.entity.CbamCarbonIndirectEmissionsEntity; -import com.thing.cbam.indirectCarbon.mapper.CbamCarbonIndirectEmissionsMapper; -import com.thing.cbam.indirectCarbon.service.CbamCarbonIndirectEmissionsService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -@Service -public class CbamCarbonIndirectEmissionsServiceImpl extends BaseServiceImpl implements CbamCarbonIndirectEmissionsService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - @Override - public List batchSaveOrUpdate(List indirectEmissionsDTOS) { - //先删除 - List industryIds = indirectEmissionsDTOS.stream().map(CbamCarbonIndirectEmissionsDTO::getIndustryId).toList(); - mapper.deleteByQuery(QueryWrapper.create().in(CbamCarbonIndirectEmissionsEntity::getIndustryId, industryIds)); - //再插入 - List insertList = ConvertUtils.sourceToTarget(indirectEmissionsDTOS, CbamCarbonIndirectEmissionsEntity.class); - mapper.insertBatch(insertList); - return ConvertUtils.sourceToTarget(insertList, CbamCarbonIndirectEmissionsDTO.class); - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java deleted file mode 100644 index e8150f1..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamCarbonPowerProgressAllocationServiceImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.thing.cbam.indirectCarbon.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.indirectCarbon.dto.CbamCarbonPowerProgressAllocationDTO; -import com.thing.cbam.indirectCarbon.entity.CbamCarbonPowerProgressAllocationEntity; -import com.thing.cbam.indirectCarbon.mapper.CbamCarbonPowerProgressAllocationMapper; -import com.thing.cbam.indirectCarbon.service.CbamCarbonPowerProgressAllocationService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; - -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * 耗电量分配 - * - * @author xc - * @since 3.0 2024-11-28 - */ -@Service -public class CbamCarbonPowerProgressAllocationServiceImpl extends BaseServiceImpl implements CbamCarbonPowerProgressAllocationService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List batchSaveOrUpdate(List allocationDTOS) { - //先删除 - List industryIds = allocationDTOS.stream().map(CbamCarbonPowerProgressAllocationDTO::getIndustryId).toList(); - List processIds = allocationDTOS.stream().map(CbamCarbonPowerProgressAllocationDTO::getProcessId).toList(); - mapper.deleteByQuery(new QueryWrapper() - .in(CbamCarbonPowerProgressAllocationEntity::getIndustryId, industryIds) - .in(CbamCarbonPowerProgressAllocationEntity::getProcessId, processIds)); - //再插入 - List insertList = ConvertUtils.sourceToTarget(allocationDTOS, CbamCarbonPowerProgressAllocationEntity.class); - mapper.insertBatch(insertList); - return ConvertUtils.sourceToTarget(insertList, CbamCarbonPowerProgressAllocationDTO.class); - } -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java deleted file mode 100644 index 0a50e48..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/indirectCarbon/service/Impl/CbamPowerSummaryFuelServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.thing.cbam.indirectCarbon.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.indirectCarbon.entity.CbamPowerSummaryFuelEntity; -import com.thing.cbam.indirectCarbon.mapper.CbamPowerSummaryFuelMapper; -import com.thing.cbam.indirectCarbon.service.CbamPowerSummaryFuelService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * 排放量汇总与数据质量信息 与 燃料平衡 - * - * @author xc - * @since 3.0 2024-12-05 - */ -@Service -public class CbamPowerSummaryFuelServiceImpl extends BaseServiceImpl implements CbamPowerSummaryFuelService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java deleted file mode 100644 index 1d27c40..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialSpecificController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.thing.cbam.material.controller; - - -import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; -import com.thing.cbam.material.service.CbamMaterialSpecificService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("v2/cbam/material/specific") -@Tag(name = "原材料特定") -@RequiredArgsConstructor -public class CbamMaterialSpecificController { - private final CbamMaterialSpecificService cbamMaterialSpecificService; - - @GetMapping("page") - @Operation(summary = "分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"), - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map param) { - PageData pageList = cbamMaterialSpecificService.getPageData(param,CbamMaterialSpecificDTO.class); - return new Result>().ok(pageList); - } - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamMaterialSpecificDTO dto = cbamMaterialSpecificService.getByIdAs(id,CbamMaterialSpecificDTO.class); - return new Result().ok(dto); - } - - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamMaterialSpecificDTO dto) { - cbamMaterialSpecificService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamMaterialSpecificDTO dto) { - //效验数据 - //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamMaterialSpecificService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamMaterialSpecificService.batchDelete(ids); - return new Result<>(); - } - - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java b/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java deleted file mode 100644 index d1d70b8..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialSpecificDTO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.thing.cbam.material.dto; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.core.keygen.KeyGenerators; -import io.swagger.v3.oas.annotations.media.Schema; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 购买的原材料 -* -* @author xc -* @since 3.0 2024-12-03 -*/ -@Data -@Schema(description = "原材料特定") -public class CbamMaterialSpecificDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "SEE(直接) tCO₂e/t") - private String seeDirect; - @Schema(description = "SEE(直接)来源") - private String seeSource; - @Schema(description = "单位耗电量") - private String unitPowerConsum; - @Schema(description = "单位耗电量来源") - private String consumSource; - @Schema(description = "电力排放因子") - private String electEmissionFactor; - @Schema(description = "电力排放因子来源") - private String factorSource; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "生产路线") - private String prodRoute; - @Schema(description = "产品名称|生产过程") - private String prodNameProcess; - @Schema(description = "SEE(间接) tCO₂e/t") - private String seeIndirect; - @Schema(description = "关联cbam_process_material的原材料") - private Long materialId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java b/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java deleted file mode 100644 index e5fa3e6..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialSpecificEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.thing.cbam.material.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; - -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 购买的原材料 - * - * @author xc - * @since 3.0 2024-12-03 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper=false) -@Table("cbam_material_specific") -public class CbamMaterialSpecificEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * SEE(直接) tCO₂e/t - */ - private String seeDirect; - /** - * SEE(直接)来源 - */ - private String seeSource; - /** - * 单位耗电量 - */ - private String unitPowerConsum; - /** - * 单位耗电量来源 - */ - private String consumSource; - /** - * 电力排放因子 - */ - private String electEmissionFactor; - /** - * 电力排放因子来源 - */ - private String factorSource; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 生产路线 - */ - private String prodRoute; - /** - * 产品名称|生产过程 - */ - private String prodNameProcess; - /** - * SEE(间接) tCO₂e/t - */ - private String seeIndirect; - /** - * 关联cbam_process_material的原材料 - */ - private Long materialId; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java b/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java deleted file mode 100644 index f326255..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialSpecificMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.thing.cbam.material.mapper; - -import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - - -@Mapper -public interface CbamMaterialSpecificMapper extends PowerBaseMapper { - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java deleted file mode 100644 index 513ca0e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialSpecificService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.thing.cbam.material.service; - -import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; -import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.LinkedHashMap; -import java.util.List; - -public interface CbamMaterialSpecificService extends IBaseService { - - List batchSaveOrUpdate(List cbamMaterialSpecificDTOList); - - - - LinkedHashMap validateMsg(CbamMaterialSpecificDTO cbamMaterialSpecificDTO); -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java deleted file mode 100644 index 56f102e..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialSpecificServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.thing.cbam.material.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.electricity.mapper.CbamElectricityToolMapper; -import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; -import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; -import com.thing.cbam.material.mapper.CbamMaterialSpecificMapper; -import com.thing.cbam.material.service.CbamMaterialSpecificService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -@Service -public class CbamMaterialSpecificServiceImpl extends BaseServiceImpl implements CbamMaterialSpecificService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - @Override - public List batchSaveOrUpdate(List cbamMaterialSpecificDTOList) { - //先删除 - List industryIds = cbamMaterialSpecificDTOList.stream().map(CbamMaterialSpecificDTO::getIndustryId).toList(); - mapper.deleteByQuery(QueryWrapper.create().in(CbamMaterialSpecificEntity::getIndustryId,industryIds)); - //再批量新增 - List cbamMaterialSpecificEntities = ConvertUtils.sourceToTarget(cbamMaterialSpecificDTOList, CbamMaterialSpecificEntity.class); - mapper.insertBatch(cbamMaterialSpecificEntities); - return ConvertUtils.sourceToTarget(cbamMaterialSpecificEntities, CbamMaterialSpecificDTO.class); - } - - @Override - public LinkedHashMap validateMsg(CbamMaterialSpecificDTO cbamMaterialSpecificDTO) { - LinkedHashMap resultMap = new LinkedHashMap<>(); - if (StringUtils.isBlank(cbamMaterialSpecificDTO.getSeeDirect())){ - resultMap.put("seeDirect","SEE(直接)不能为空"); - } - - return resultMap; - } -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java b/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java deleted file mode 100644 index d0c30ea..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/controller/CbamProductAllocationController.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.thing.cbam.production.controller; - -import com.thing.cbam.production.dto.CbamProductAllocationDTO; -import com.thing.cbam.production.service.CbamProductAllocationService; -import com.thing.common.core.annotation.LogOperation; -import com.thing.common.core.constants.Constant; -import com.thing.common.core.validator.AssertUtils; -import com.thing.common.core.validator.ValidatorUtils; -import com.thing.common.core.validator.group.AddGroup; -import com.thing.common.core.validator.group.DefaultGroup; -import com.thing.common.core.validator.group.UpdateGroup; -import com.thing.common.core.web.response.PageData; -import com.thing.common.core.web.response.Result; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("v2/cbam/product/allocation") -@Tag(name = "产品的分配") -@RequiredArgsConstructor -public class CbamProductAllocationController { - private final CbamProductAllocationService cbamProductAllocationService; - @GetMapping("page") - @Operation(summary = "分页") - @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true), - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true), - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"), - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") - }) - public Result> page(@Parameter(hidden = true) @RequestParam Map params) { - PageData page = cbamProductAllocationService.getPageData(params, CbamProductAllocationDTO.class); - return new Result>().ok(page); - } - - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamProductAllocationDTO data = cbamProductAllocationService.getByIdAs(id, CbamProductAllocationDTO.class); - return new Result().ok(data); - } - - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamProductAllocationDTO dto) { - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - cbamProductAllocationService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamProductAllocationDTO dto) { - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamProductAllocationService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamProductAllocationService.batchDelete(ids); - return new Result<>(); - } - - /** - *@GetMapping("export") - *@Operation(summary="导出") - *@LogOperation("导出") - *public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception { - * List list = cbamCarbonBurnService.listAs(params, CbamCarbonBurnDTO.class); - * //ExcelUtils.exportExcelToTarget(response, null, "直接排放量", list, CbamCarbonBurnExcel.class); - *} - */ -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java b/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java deleted file mode 100644 index 43bd2ea..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/dto/CbamProductAllocationDTO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.thing.cbam.production.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** -* 产品的分配 -* -* @author xc -* @since 3.0 2024-11-28 -*/ -@Data -@Schema(description = "d表各生产过程中产品的分配，可测量的发热量排放量，废弃排放量，输出电力排放量") -public class CbamProductAllocationDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - private Long id; - @Schema(description = "消耗量t:{} json格式，以产品名称（A表中校验了重名）为key，消耗量t为value") - private String consume; - @Schema(description = "产品名称|生产过程") - private String prodProcessName; - @Schema(description = "空白处的名称") - private String bankName; - @Schema(description = "单位") - private String unit; - @Schema(description = "输入量") - private String input_quantity; - @Schema(description = "输出量") - private String output_quantity; - @Schema(description = "排放量: 发热量排放量、废弃排放量、输出电力排放量") - private String emissions; - @Schema(description = "电力排放因子") - private String electricityEmissionFactor; - @Schema(description = "欧盟出口量") - private String exportVolume; - @Schema(description = "非欧盟销售量") - private String salesVolume; - @Schema(description = "剩余消耗量") - private String remainConsume; - @Schema(description = "总产量/输出总量/采购量") - private String totalOutput; - @Schema(description = "关联cbam_industry_info的主键id") - private Long industryId; - @Schema(description = "d表类型\n" + - "1.各生产过程中产品的分配\n" + - "2.可测量的发热量排放量\n" + - "3.废气排放量\n" + - "4.生产过程输出的电力\n") - private Integer type; - -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java b/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java deleted file mode 100644 index 078f1cf..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/entity/CbamProductAllocationEntity.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.thing.cbam.production.entity; - -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import com.mybatisflex.core.keygen.KeyGenerators; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serial; -import java.io.Serializable; - -/** - * d表各生产过程中产品的分配 - * - * @author xc - * @since 3.0 2024-11-28 - */ -@Data -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@Table("cbam_product_allocation") -public class CbamProductAllocationEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator, value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 产品名称|生产过程 - */ - private String prodProcessName; - /** - * 空白处的名称 - */ - private String bankName; - - /** - * 消耗量t:{} json格式，以产品名称（A表中校验了重名）为key，消耗量t为value - */ - private String consume; - /** - * 欧盟出口量 - */ - private String exportVolume; - /** - * 非欧盟销售量 - */ - private String salesVolume; - - /** - * 剩余消耗量 - */ - private String remainConsume; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 单位 - */ - private String unit; - /** - * 输入量 - */ - private String input_quantity; - /** - * 输出量 - */ - private String output_quantity; - /** - * 排放量: 发热量排放量、废弃排放量、输出电力排放量 - */ - private String emissions; - /** - * 电力排放因子 - */ - private String electricityEmissionFactor; - /** - * d总产量/输出总量/E采购量 - */ - private String totalOutput; - /** - * d表类型\n" + - * "1.各生产过程中产品的分配\n" + - * "2.可测量的发热量排放量\n" + - * "3.废气排放量\n" + - * "4.生产过程输出的电力\n - */ - private Integer type; -} \ No newline at end of file diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java b/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java deleted file mode 100644 index 4d515f0..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/mapper/CbamProductAllocationMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.production.mapper; - -import com.thing.cbam.production.entity.CbamProductAllocationEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamProductAllocationMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java deleted file mode 100644 index cfb641b..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/CbamProductAllocationService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.thing.cbam.production.service; - -import com.thing.cbam.production.dto.CbamProductAllocationDTO; -import com.thing.cbam.production.entity.CbamProductAllocationEntity; -import com.thing.common.orm.service.IBaseService; - -import java.util.List; - -public interface CbamProductAllocationService extends IBaseService { - - List batchSaveOrUpdate(List list); - -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java deleted file mode 100644 index 9064a64..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/production/service/Impl/CbamProductAllocationServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.thing.cbam.production.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.production.dto.CbamProductAllocationDTO; -import com.thing.cbam.production.entity.CbamProductAllocationEntity; -import com.thing.cbam.production.mapper.CbamProductAllocationMapper; -import com.thing.cbam.production.service.CbamProductAllocationService; -import com.thing.common.core.utils.ConvertUtils; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -@Service -public class CbamProductAllocationServiceImpl extends BaseServiceImpl implements CbamProductAllocationService { - - @Override - public QueryWrapper getWrapper(Map params){ - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - - - @Override - public List batchSaveOrUpdate(List list) { - //先删除 - List industryIds = list.stream().map(CbamProductAllocationDTO::getIndustryId).toList(); - mapper.deleteByQuery(QueryWrapper.create().in(CbamProductAllocationEntity::getIndustryId, industryIds)); - //再插入 - List cbamProductAllocationEntities = ConvertUtils.sourceToTarget(list, CbamProductAllocationEntity.class); - mapper.insertBatch(cbamProductAllocationEntities); - return ConvertUtils.sourceToTarget(cbamProductAllocationEntities, CbamProductAllocationDTO.class); - } -} diff --git a/modules/pom.xml b/modules/pom.xml index 8febd16..eb93403 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -29,7 +29,6 @@ carbon-public cqc-service visual-design - cbam modules