From a21078da68310ad5544500a39bf5e76ede8c6a46 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Tue, 1 Aug 2023 21:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=A1=E7=AE=97=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoalWashingDailyAnalysisController.java | 62 ++++++++++++++ .../coal/dto/CoalWashingDailyAnalysisDto.java | 64 +++++++++++++++ .../CreateCoalWashingDailyAnalysisDto.java | 64 +++++++++++++++ .../UpdateCoalWashingDailyAnalysisDto.java | 64 +++++++++++++++ .../CoalWashingDailyAnalysisEntity.java | 4 +- .../coal/mapper/CoalParameterDefMapper.java | 6 +- .../CoalWashingDailyAnalysisMapper.java | 27 +++++++ .../coal/mapper/DepartmentMapper.java | 6 +- .../coal/mapper/DictionaryMapper.java | 6 +- .../coal/mapper/OrganizationMapper.java | 6 +- .../coal/mapper/PermissionMapper.java | 6 +- .../lihongjie/coal/mapper/ResourceMapper.java | 6 +- .../cn/lihongjie/coal/mapper/RoleMapper.java | 6 +- .../cn/lihongjie/coal/mapper/RoundMapper.java | 4 +- .../lihongjie/coal/mapper/SupplierMapper.java | 6 +- .../coal/mapper/SysConfigMapper.java | 6 +- .../lihongjie/coal/mapper/SysLogMapper.java | 6 +- .../cn/lihongjie/coal/mapper/UserMapper.java | 4 +- .../CoalWashingDailyAnalysisService.java | 81 ++++++++++++++++++- 19 files changed, 409 insertions(+), 25 deletions(-) create mode 100644 src/main/java/cn/lihongjie/coal/controller/CoalWashingDailyAnalysisController.java create mode 100644 src/main/java/cn/lihongjie/coal/dto/CoalWashingDailyAnalysisDto.java create mode 100644 src/main/java/cn/lihongjie/coal/dto/CreateCoalWashingDailyAnalysisDto.java create mode 100644 src/main/java/cn/lihongjie/coal/dto/UpdateCoalWashingDailyAnalysisDto.java create mode 100644 src/main/java/cn/lihongjie/coal/mapper/CoalWashingDailyAnalysisMapper.java diff --git a/src/main/java/cn/lihongjie/coal/controller/CoalWashingDailyAnalysisController.java b/src/main/java/cn/lihongjie/coal/controller/CoalWashingDailyAnalysisController.java new file mode 100644 index 00000000..208198ba --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/controller/CoalWashingDailyAnalysisController.java @@ -0,0 +1,62 @@ +package cn.lihongjie.coal.controller; + +import cn.lihongjie.coal.annotation.Anonymous; +import cn.lihongjie.coal.annotation.SysLog; +import cn.lihongjie.coal.dto.CommonQuery; +import cn.lihongjie.coal.dto.IdRequest; +import cn.lihongjie.coal.dto.CreateCoalWashingDailyAnalysisDto; +import cn.lihongjie.coal.dto.UpdateCoalWashingDailyAnalysisDto; +import cn.lihongjie.coal.dto.CoalWashingDailyAnalysisDto; +import cn.lihongjie.coal.service.CoalWashingDailyAnalysisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping("/coalWashingDailyAnalysis") +@RestController +@SysLog(module = "洗煤报告表") +@Anonymous +public class CoalWashingDailyAnalysisController { + + @Autowired + CoalWashingDailyAnalysisService service; + @PostMapping("/calculate") + @SysLog(action = "计算") + public CoalWashingDailyAnalysisDto calculate(@RequestBody CreateCoalWashingDailyAnalysisDto dto) { + return this.service.calculate(dto); + } + @PostMapping("/create") + @SysLog(action = "新增") + public CoalWashingDailyAnalysisDto create(@RequestBody CreateCoalWashingDailyAnalysisDto dto) { + return this.service.create(dto); + } + + @PostMapping("/update") + @SysLog(action = "编辑") + public CoalWashingDailyAnalysisDto update(@RequestBody UpdateCoalWashingDailyAnalysisDto dto) { + return this.service.update(dto); + } + + + @PostMapping("/delete") + @SysLog(action = "删除") + public Object delete(@RequestBody IdRequest dto) { + this.service.delete(dto); + return null; + } + + + @PostMapping("/list") + public Page list(@RequestBody CommonQuery dto) { + return this.service.list(dto); + } + + + @PostMapping("/getById") + public CoalWashingDailyAnalysisDto getById(@RequestBody IdRequest dto) { + return this.service.getById(dto.getId()); + } +} diff --git a/src/main/java/cn/lihongjie/coal/dto/CoalWashingDailyAnalysisDto.java b/src/main/java/cn/lihongjie/coal/dto/CoalWashingDailyAnalysisDto.java new file mode 100644 index 00000000..85e738d7 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dto/CoalWashingDailyAnalysisDto.java @@ -0,0 +1,64 @@ +package cn.lihongjie.coal.dto; + +import cn.lihongjie.coal.dto.base.OrgCommonDto; +import cn.lihongjie.coal.entity.CoalWashingDailyAnalysisItemVo; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.ForeignKey; +import lombok.Data; +import org.hibernate.annotations.Comment; + +import java.time.LocalDate; +import java.util.List; + +/** + * + */ +@Data +@Comment("洗煤报告表") +public class CoalWashingDailyAnalysisDto extends OrgCommonDto { + + + @Comment("日期") + private LocalDate date; + + @ElementCollection + @Comment("用户手动录入的记录") + @CollectionTable( foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private List inputItems; + + + @ElementCollection + @Comment("连续平均值") + @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private List rollingAvgItems; + + + @Comment("目标大堆 灰") + private Double ddp1; + + + @Comment("目标大堆 硫") + private Double ddp2; + + + @Comment("目标大堆 挥发") + private Double ddp3; + + + @Comment("目标大堆 粘结") + private Double ddp4; + + + @Comment("目标大堆 备用") + private Double ddp5; + + @Comment("产量初始值") + private Double initTotalNumber = 0.0; + + + + + +} diff --git a/src/main/java/cn/lihongjie/coal/dto/CreateCoalWashingDailyAnalysisDto.java b/src/main/java/cn/lihongjie/coal/dto/CreateCoalWashingDailyAnalysisDto.java new file mode 100644 index 00000000..09bf60f6 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dto/CreateCoalWashingDailyAnalysisDto.java @@ -0,0 +1,64 @@ +package cn.lihongjie.coal.dto; + +import cn.lihongjie.coal.dto.base.OrgCommonDto; +import cn.lihongjie.coal.entity.CoalWashingDailyAnalysisItemVo; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.ForeignKey; +import lombok.Data; +import org.hibernate.annotations.Comment; + +import java.time.LocalDate; +import java.util.List; + +/** + * + */ +@Data +@Comment("洗煤报告表") +public class CreateCoalWashingDailyAnalysisDto extends OrgCommonDto { + + + @Comment("日期") + private LocalDate date; + + @ElementCollection + @Comment("用户手动录入的记录") + @CollectionTable( foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private List inputItems; + + + @ElementCollection + @Comment("连续平均值") + @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private List rollingAvgItems; + + + @Comment("目标大堆 灰") + private Double ddp1; + + + @Comment("目标大堆 硫") + private Double ddp2; + + + @Comment("目标大堆 挥发") + private Double ddp3; + + + @Comment("目标大堆 粘结") + private Double ddp4; + + + @Comment("目标大堆 备用") + private Double ddp5; + + @Comment("产量初始值") + private Double initTotalNumber = 0.0; + + + + + +} diff --git a/src/main/java/cn/lihongjie/coal/dto/UpdateCoalWashingDailyAnalysisDto.java b/src/main/java/cn/lihongjie/coal/dto/UpdateCoalWashingDailyAnalysisDto.java new file mode 100644 index 00000000..1c1121f1 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dto/UpdateCoalWashingDailyAnalysisDto.java @@ -0,0 +1,64 @@ +package cn.lihongjie.coal.dto; + +import cn.lihongjie.coal.dto.base.OrgCommonDto; +import cn.lihongjie.coal.entity.CoalWashingDailyAnalysisItemVo; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.ForeignKey; +import lombok.Data; +import org.hibernate.annotations.Comment; + +import java.time.LocalDate; +import java.util.List; + +/** + * + */ +@Data +@Comment("洗煤报告表") +public class UpdateCoalWashingDailyAnalysisDto extends OrgCommonDto { + + + @Comment("日期") + private LocalDate date; + + @ElementCollection + @Comment("用户手动录入的记录") + @CollectionTable( foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private List inputItems; + + + @ElementCollection + @Comment("连续平均值") + @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private List rollingAvgItems; + + + @Comment("目标大堆 灰") + private Double ddp1; + + + @Comment("目标大堆 硫") + private Double ddp2; + + + @Comment("目标大堆 挥发") + private Double ddp3; + + + @Comment("目标大堆 粘结") + private Double ddp4; + + + @Comment("目标大堆 备用") + private Double ddp5; + + @Comment("产量初始值") + private Double initTotalNumber = 0.0; + + + + + +} diff --git a/src/main/java/cn/lihongjie/coal/entity/CoalWashingDailyAnalysisEntity.java b/src/main/java/cn/lihongjie/coal/entity/CoalWashingDailyAnalysisEntity.java index 479ec47f..9b88bd8d 100644 --- a/src/main/java/cn/lihongjie/coal/entity/CoalWashingDailyAnalysisEntity.java +++ b/src/main/java/cn/lihongjie/coal/entity/CoalWashingDailyAnalysisEntity.java @@ -26,13 +26,13 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity { @ElementCollection @Comment("用户手动录入的记录") - @CollectionTable(name = "CoalWashingDailyAnalysisItem", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) private List inputItems; @ElementCollection @Comment("连续平均值") - @CollectionTable(name = "CoalWashingDailyAnalysisItem", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + @CollectionTable( foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) private List rollingAvgItems; diff --git a/src/main/java/cn/lihongjie/coal/mapper/CoalParameterDefMapper.java b/src/main/java/cn/lihongjie/coal/mapper/CoalParameterDefMapper.java index 28cca44d..7c10e8ca 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/CoalParameterDefMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/CoalParameterDefMapper.java @@ -1,17 +1,19 @@ package cn.lihongjie.coal.mapper; +import cn.lihongjie.coal.dto.CoalParameterDefDto; import cn.lihongjie.coal.dto.CreateCoalParameterDefDto; import cn.lihongjie.coal.dto.UpdateCoalParameterDefDto; -import cn.lihongjie.coal.dto.CoalParameterDefDto; import cn.lihongjie.coal.entity.CoalParameterDefEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface CoalParameterDefMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/CoalWashingDailyAnalysisMapper.java b/src/main/java/cn/lihongjie/coal/mapper/CoalWashingDailyAnalysisMapper.java new file mode 100644 index 00000000..40578b83 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/mapper/CoalWashingDailyAnalysisMapper.java @@ -0,0 +1,27 @@ +package cn.lihongjie.coal.mapper; + + +import cn.lihongjie.coal.dto.CreateCoalWashingDailyAnalysisDto; +import cn.lihongjie.coal.dto.UpdateCoalWashingDailyAnalysisDto; +import cn.lihongjie.coal.dto.CoalWashingDailyAnalysisDto; +import cn.lihongjie.coal.entity.CoalWashingDailyAnalysisEntity; +import org.mapstruct.Mapper; +import org.mapstruct.MappingConstants; +import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; + +@Mapper( + componentModel = MappingConstants.ComponentModel.SPRING, + uses = {CommonMapper.class}, + mappingControl = DeepClone.class + + +) +public interface CoalWashingDailyAnalysisMapper { + CoalWashingDailyAnalysisDto toDto(CoalWashingDailyAnalysisEntity user); + + CoalWashingDailyAnalysisEntity toEntity(CreateCoalWashingDailyAnalysisDto request); + + + void updateEntity(@MappingTarget CoalWashingDailyAnalysisEntity entity, UpdateCoalWashingDailyAnalysisDto dto); +} diff --git a/src/main/java/cn/lihongjie/coal/mapper/DepartmentMapper.java b/src/main/java/cn/lihongjie/coal/mapper/DepartmentMapper.java index 92067cc5..406e1ab6 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/DepartmentMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/DepartmentMapper.java @@ -2,16 +2,18 @@ package cn.lihongjie.coal.mapper; import cn.lihongjie.coal.dto.CreateDepartmentDto; -import cn.lihongjie.coal.dto.UpdateDepartmentDto; import cn.lihongjie.coal.dto.DepartmentDto; +import cn.lihongjie.coal.dto.UpdateDepartmentDto; import cn.lihongjie.coal.entity.DepartmentEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface DepartmentMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/DictionaryMapper.java b/src/main/java/cn/lihongjie/coal/mapper/DictionaryMapper.java index 4d918933..9c71b5a7 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/DictionaryMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/DictionaryMapper.java @@ -2,16 +2,18 @@ package cn.lihongjie.coal.mapper; import cn.lihongjie.coal.dto.CreateDictionaryDto; -import cn.lihongjie.coal.dto.UpdateDictionaryDto; import cn.lihongjie.coal.dto.DictionaryDto; +import cn.lihongjie.coal.dto.UpdateDictionaryDto; import cn.lihongjie.coal.entity.DictionaryEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface DictionaryMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/OrganizationMapper.java b/src/main/java/cn/lihongjie/coal/mapper/OrganizationMapper.java index 557c15be..eace084b 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/OrganizationMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/OrganizationMapper.java @@ -2,16 +2,18 @@ package cn.lihongjie.coal.mapper; import cn.lihongjie.coal.dto.CreateOrganizationDto; -import cn.lihongjie.coal.dto.UpdateOrganizationDto; import cn.lihongjie.coal.dto.OrganizationDto; +import cn.lihongjie.coal.dto.UpdateOrganizationDto; import cn.lihongjie.coal.entity.OrganizationEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface OrganizationMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/PermissionMapper.java b/src/main/java/cn/lihongjie/coal/mapper/PermissionMapper.java index ad3e4ed7..f211df41 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/PermissionMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/PermissionMapper.java @@ -2,16 +2,18 @@ package cn.lihongjie.coal.mapper; import cn.lihongjie.coal.dto.CreatePermissionDto; -import cn.lihongjie.coal.dto.UpdatePermissionDto; import cn.lihongjie.coal.dto.PermissionDto; +import cn.lihongjie.coal.dto.UpdatePermissionDto; import cn.lihongjie.coal.entity.PermissionEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface PermissionMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/ResourceMapper.java b/src/main/java/cn/lihongjie/coal/mapper/ResourceMapper.java index 0381e703..d4469217 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/ResourceMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/ResourceMapper.java @@ -2,16 +2,18 @@ package cn.lihongjie.coal.mapper; import cn.lihongjie.coal.dto.CreateResourceDto; -import cn.lihongjie.coal.dto.UpdateResourceDto; import cn.lihongjie.coal.dto.ResourceDto; +import cn.lihongjie.coal.dto.UpdateResourceDto; import cn.lihongjie.coal.entity.ResourceEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface ResourceMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/RoleMapper.java b/src/main/java/cn/lihongjie/coal/mapper/RoleMapper.java index 690770c9..9415f0f9 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/RoleMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/RoleMapper.java @@ -2,16 +2,18 @@ package cn.lihongjie.coal.mapper; import cn.lihongjie.coal.dto.CreateRoleDto; -import cn.lihongjie.coal.dto.UpdateRoleDto; import cn.lihongjie.coal.dto.RoleDto; +import cn.lihongjie.coal.dto.UpdateRoleDto; import cn.lihongjie.coal.entity.RoleEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface RoleMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/RoundMapper.java b/src/main/java/cn/lihongjie/coal/mapper/RoundMapper.java index 3517407d..ba28b4c8 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/RoundMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/RoundMapper.java @@ -4,13 +4,15 @@ import cn.lihongjie.coal.entity.CoalWashingDailyAnalysisEntity; import cn.lihongjie.coal.entity.CoalWashingDailyAnalysisItemVo; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; +import org.mapstruct.control.DeepClone; import java.math.BigDecimal; import java.math.RoundingMode; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface RoundMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/SupplierMapper.java b/src/main/java/cn/lihongjie/coal/mapper/SupplierMapper.java index b48cb6f3..6c1383f6 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/SupplierMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/SupplierMapper.java @@ -2,16 +2,18 @@ package cn.lihongjie.coal.mapper; import cn.lihongjie.coal.dto.CreateSupplierDto; -import cn.lihongjie.coal.dto.UpdateSupplierDto; import cn.lihongjie.coal.dto.SupplierDto; +import cn.lihongjie.coal.dto.UpdateSupplierDto; import cn.lihongjie.coal.entity.SupplierEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface SupplierMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/SysConfigMapper.java b/src/main/java/cn/lihongjie/coal/mapper/SysConfigMapper.java index c51b1f5d..79ce3d41 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/SysConfigMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/SysConfigMapper.java @@ -2,16 +2,18 @@ package cn.lihongjie.coal.mapper; import cn.lihongjie.coal.dto.CreateSysConfigDto; -import cn.lihongjie.coal.dto.UpdateSysConfigDto; import cn.lihongjie.coal.dto.SysConfigDto; +import cn.lihongjie.coal.dto.UpdateSysConfigDto; import cn.lihongjie.coal.entity.SysConfigEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface SysConfigMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/SysLogMapper.java b/src/main/java/cn/lihongjie/coal/mapper/SysLogMapper.java index 8621e308..70d15c25 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/SysLogMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/SysLogMapper.java @@ -2,16 +2,18 @@ package cn.lihongjie.coal.mapper; import cn.lihongjie.coal.dto.CreateSysLogDto; -import cn.lihongjie.coal.dto.UpdateSysLogDto; import cn.lihongjie.coal.dto.SysLogDto; +import cn.lihongjie.coal.dto.UpdateSysLogDto; import cn.lihongjie.coal.entity.SysLogEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface SysLogMapper { diff --git a/src/main/java/cn/lihongjie/coal/mapper/UserMapper.java b/src/main/java/cn/lihongjie/coal/mapper/UserMapper.java index 9b3d5367..7b84aa05 100644 --- a/src/main/java/cn/lihongjie/coal/mapper/UserMapper.java +++ b/src/main/java/cn/lihongjie/coal/mapper/UserMapper.java @@ -8,10 +8,12 @@ import cn.lihongjie.coal.entity.UserEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; import org.mapstruct.MappingTarget; +import org.mapstruct.control.DeepClone; @Mapper( componentModel = MappingConstants.ComponentModel.SPRING, - uses = {CommonMapper.class} + uses = {CommonMapper.class}, + mappingControl = DeepClone.class ) public interface UserMapper { diff --git a/src/main/java/cn/lihongjie/coal/service/CoalWashingDailyAnalysisService.java b/src/main/java/cn/lihongjie/coal/service/CoalWashingDailyAnalysisService.java index 4c28faa9..bd138962 100644 --- a/src/main/java/cn/lihongjie/coal/service/CoalWashingDailyAnalysisService.java +++ b/src/main/java/cn/lihongjie/coal/service/CoalWashingDailyAnalysisService.java @@ -1,11 +1,90 @@ package cn.lihongjie.coal.service; import cn.lihongjie.coal.dao.CoalWashingDailyAnalysisRepository; +import cn.lihongjie.coal.dto.*; import cn.lihongjie.coal.entity.CoalWashingDailyAnalysisEntity; +import cn.lihongjie.coal.mapper.CoalWashingDailyAnalysisMapper; +import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.convert.ConversionService; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; @Service @Slf4j -public class CoalWashingDailyAnalysisService extends BaseService< CoalWashingDailyAnalysisEntity,CoalWashingDailyAnalysisRepository>{ +public class CoalWashingDailyAnalysisService extends BaseService { + + @Autowired + CoalWashingDailyAnalysisRepository repository; + + @Autowired + CoalWashingDailyAnalysisMapper mapper; + + + @PostConstruct + public void init() { + + + } + + + public CoalWashingDailyAnalysisDto create(CreateCoalWashingDailyAnalysisDto request) { + + + CoalWashingDailyAnalysisEntity entity = mapper.toEntity(request); + + + this.repository.save(entity); + return getById(entity.getId()); + + } + public CoalWashingDailyAnalysisDto calculate(CreateCoalWashingDailyAnalysisDto request) { + + + CoalWashingDailyAnalysisEntity entity = mapper.toEntity(request); + + entity.rollingAvg(); + + return mapper.toDto(entity); + + } + + public CoalWashingDailyAnalysisDto update(UpdateCoalWashingDailyAnalysisDto request) { + CoalWashingDailyAnalysisEntity entity = this.repository.get(request.getId()); + this.mapper.updateEntity(entity, request); + + return null; + } + + + public void delete(IdRequest request) { + + this.repository.deleteAllById(request.getIds()); + + } + + + public CoalWashingDailyAnalysisDto getById(String id) { + + CoalWashingDailyAnalysisEntity entity = repository.get(id); + + + return mapper.toDto(entity); + } + + + @Autowired + ConversionService conversionService; + + public Page list(CommonQuery query) { + + Page page = repository.findAll(query.specification(conversionService), PageRequest.of(query.getPageNo(), query.getPageSize(), Sort.by(query.getOrders()))); + + + return page.map(this.mapper::toDto); + + } }