diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java b/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java deleted file mode 100644 index 3b1c51a..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/controller/CbamMaterialConsumptionController.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.thing.cbam.material.controller; - - -import com.thing.cbam.material.dto.CbamMaterialConsumptionDTO; -import com.thing.cbam.material.service.CbamMaterialConsumptionService; -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/consume") -@Tag(name = "原材料消耗量") -@RequiredArgsConstructor -public class CbamMaterialConsumptionController { - private final CbamMaterialConsumptionService cbamMaterialConsumptionService; - @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 = cbamMaterialConsumptionService.getPageData(param,CbamMaterialConsumptionDTO.class); - return new Result>().ok(pageList); - } - @GetMapping("{id}") - @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id) { - CbamMaterialConsumptionDTO dto = cbamMaterialConsumptionService.getByIdAs(id,CbamMaterialConsumptionDTO.class); - return new Result().ok(dto); - } - - @PostMapping - @Operation(summary = "保存") - @LogOperation("保存") - public Result save(@RequestBody CbamMaterialConsumptionDTO dto) { - cbamMaterialConsumptionService.saveDto(dto); - return new Result<>(); - } - - @PutMapping - @Operation(summary = "修改") - @LogOperation("修改") - public Result update(@RequestBody CbamMaterialConsumptionDTO dto) { - //效验数据 - //ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - cbamMaterialConsumptionService.updateDto(dto); - return new Result<>(); - } - - @DeleteMapping - @Operation(summary = "删除") - @LogOperation("删除") - public Result delete(@RequestBody Long[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - cbamMaterialConsumptionService.batchDelete(ids); - return new Result<>(); - } - -} 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 index ca40c95..1d27c40 100644 --- 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 @@ -1,7 +1,6 @@ package com.thing.cbam.material.controller; -import com.thing.cbam.baesInfoExcel.dto.CbamIndustryDTO; import com.thing.cbam.material.dto.CbamMaterialSpecificDTO; import com.thing.cbam.material.service.CbamMaterialSpecificService; import com.thing.common.core.annotation.LogOperation; diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java b/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java deleted file mode 100644 index ff81521..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/dto/CbamMaterialConsumptionDTO.java +++ /dev/null @@ -1,42 +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 CbamMaterialConsumptionDTO implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - @Schema(description = "采购量") - private String purchaseQuantity; - @Schema(description = "消耗量") - private String consumAmount; - @Schema(description = "非欧盟商品消耗量") - private String consumGoods; - @Schema(description = "关联cbam_industry_information的主键id") - private Long industryId; - @Schema(description = "产品名称|生产过程") - private String prodNameProcess; - @Schema(description = "剩余消耗量") - private String remainConsum; - @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/CbamMaterialConsumptionEntity.java b/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialConsumptionEntity.java deleted file mode 100644 index 653aed9..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/entity/CbamMaterialConsumptionEntity.java +++ /dev/null @@ -1,59 +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_consumption") -public class CbamMaterialConsumptionEntity implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Generator,value = KeyGenerators.snowFlakeId) - private Long id; - /** - * 采购量 - */ - private String purchaseQuantity; - /** - * 消耗量 - */ - private String consumAmount; - /** - * 非欧盟商品消耗量 - */ - private String consumGoods; - /** - * 关联cbam_industry_information的主键id - */ - private Long industryId; - /** - * 产品名称|生产过程 - */ - private String prodNameProcess; - /** - * 剩余消耗量 - */ - private String remainConsum; - /** - * 关联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/CbamMaterialConsumptionMapper.java b/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialConsumptionMapper.java deleted file mode 100644 index fe37bc4..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/mapper/CbamMaterialConsumptionMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.material.mapper; - -import com.thing.cbam.material.entity.CbamMaterialConsumptionEntity; -import com.thing.common.orm.mapper.PowerBaseMapper; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface CbamMaterialConsumptionMapper extends PowerBaseMapper { -} diff --git a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java deleted file mode 100644 index 1d00f1d..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/CbamMaterialConsumptionService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.thing.cbam.material.service; - -import com.thing.cbam.material.dto.CbamMaterialConsumptionDTO; -import com.thing.cbam.material.entity.CbamMaterialConsumptionEntity; -import com.thing.common.orm.service.IBaseService; - -public interface CbamMaterialConsumptionService extends IBaseService { - -} 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 index cd541b5..50ddceb 100644 --- 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 @@ -5,7 +5,12 @@ 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/CbamMaterialConsumptionServiceImpl.java b/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialConsumptionServiceImpl.java deleted file mode 100644 index 360bdf7..0000000 --- a/modules/cbam/src/main/java/com/thing/cbam/material/service/Impl/CbamMaterialConsumptionServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.thing.cbam.material.service.Impl; - -import com.mybatisflex.core.query.QueryWrapper; -import com.thing.cbam.material.dto.CbamMaterialConsumptionDTO; -import com.thing.cbam.material.entity.CbamMaterialConsumptionEntity; -import com.thing.cbam.material.entity.CbamMaterialSpecificEntity; -import com.thing.cbam.material.mapper.CbamMaterialConsumptionMapper; -import com.thing.cbam.material.mapper.CbamMaterialSpecificMapper; -import com.thing.cbam.material.service.CbamMaterialConsumptionService; -import com.thing.common.orm.service.impl.BaseServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public class CbamMaterialConsumptionServiceImpl extends BaseServiceImpl implements CbamMaterialConsumptionService { - @Override - public QueryWrapper getWrapper(Map params) { - QueryWrapper wrapper = new QueryWrapper(); - return wrapper; - } - -} 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 index 4ad22b1..56f102e 100644 --- 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 @@ -6,11 +6,13 @@ 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 @@ -21,6 +23,17 @@ public class CbamMaterialSpecificServiceImpl extends BaseServiceImpl 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<>(); 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 index a0bc23f..43bd2ea 100644 --- 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 @@ -41,7 +41,7 @@ public class CbamProductAllocationDTO implements Serializable { private String salesVolume; @Schema(description = "剩余消耗量") private String remainConsume; - @Schema(description = "总产量") + @Schema(description = "总产量/输出总量/采购量") private String totalOutput; @Schema(description = "关联cbam_industry_info的主键id") private Long industryId; 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 index 4a1e416..078f1cf 100644 --- 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 @@ -78,7 +78,7 @@ public class CbamProductAllocationEntity implements Serializable { */ private String electricityEmissionFactor; /** - * 总产量 + * d总产量/输出总量/E采购量 */ private String totalOutput; /**