From f4a78c09a4aa81f380d739c966a749c550fb2211 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Tue, 12 Sep 2023 20:54:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=85=A4=E6=BA=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=92=8C=E7=85=A4=E6=BA=90=E6=8A=A5=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coal/base/mapper/CommonMapper.java | 11 +++ .../controller/CoalInfoController.java | 60 ++++++++++++++++ .../coal/coalInfo/dto/CoalInfoDto.java | 18 +++++ .../coal/coalInfo/dto/CreateCoalInfoDto.java | 17 +++++ .../coal/coalInfo/dto/UpdateCoalInfoDto.java | 16 +++++ .../coal/coalInfo/entity/CoalInfoEntity.java | 24 +++++++ .../coal/coalInfo/mapper/CoalInfoMapper.java | 18 +++++ .../repository/CoalInfoRepository.java | 9 +++ .../coalInfo/service/CoalInfoService.java | 72 +++++++++++++++++++ .../controller/CoalPriceController.java | 60 ++++++++++++++++ .../coal/coalPrice/dto/CoalPriceDto.java | 18 +++++ .../coalPrice/dto/CreateCoalPriceDto.java | 16 +++++ .../coalPrice/dto/UpdateCoalPriceDto.java | 16 +++++ .../coalPrice/entity/CoalPriceEntity.java | 22 ++++++ .../coalPrice/mapper/CoalPriceMapper.java | 18 +++++ .../repository/CoalPriceRepository.java | 9 +++ .../coalPrice/service/CoalPriceService.java | 72 +++++++++++++++++++ .../scripts/dict/enum/supplierDict.groovy | 15 ++++ 18 files changed, 491 insertions(+) create mode 100644 src/main/java/cn/lihongjie/coal/coalInfo/controller/CoalInfoController.java create mode 100644 src/main/java/cn/lihongjie/coal/coalInfo/dto/CoalInfoDto.java create mode 100644 src/main/java/cn/lihongjie/coal/coalInfo/dto/CreateCoalInfoDto.java create mode 100644 src/main/java/cn/lihongjie/coal/coalInfo/dto/UpdateCoalInfoDto.java create mode 100644 src/main/java/cn/lihongjie/coal/coalInfo/entity/CoalInfoEntity.java create mode 100644 src/main/java/cn/lihongjie/coal/coalInfo/mapper/CoalInfoMapper.java create mode 100644 src/main/java/cn/lihongjie/coal/coalInfo/repository/CoalInfoRepository.java create mode 100644 src/main/java/cn/lihongjie/coal/coalInfo/service/CoalInfoService.java create mode 100644 src/main/java/cn/lihongjie/coal/coalPrice/controller/CoalPriceController.java create mode 100644 src/main/java/cn/lihongjie/coal/coalPrice/dto/CoalPriceDto.java create mode 100644 src/main/java/cn/lihongjie/coal/coalPrice/dto/CreateCoalPriceDto.java create mode 100644 src/main/java/cn/lihongjie/coal/coalPrice/dto/UpdateCoalPriceDto.java create mode 100644 src/main/java/cn/lihongjie/coal/coalPrice/entity/CoalPriceEntity.java create mode 100644 src/main/java/cn/lihongjie/coal/coalPrice/mapper/CoalPriceMapper.java create mode 100644 src/main/java/cn/lihongjie/coal/coalPrice/repository/CoalPriceRepository.java create mode 100644 src/main/java/cn/lihongjie/coal/coalPrice/service/CoalPriceService.java create mode 100644 src/main/resources/scripts/dict/enum/supplierDict.groovy diff --git a/src/main/java/cn/lihongjie/coal/base/mapper/CommonMapper.java b/src/main/java/cn/lihongjie/coal/base/mapper/CommonMapper.java index 5565d17c..c40c04dd 100644 --- a/src/main/java/cn/lihongjie/coal/base/mapper/CommonMapper.java +++ b/src/main/java/cn/lihongjie/coal/base/mapper/CommonMapper.java @@ -9,6 +9,7 @@ import cn.lihongjie.coal.permission.entity.PermissionEntity; import cn.lihongjie.coal.resource.entity.ResourceEntity; import cn.lihongjie.coal.role.entity.RoleEntity; import cn.lihongjie.coal.script.entity.ScriptEntity; +import cn.lihongjie.coal.supplier.entity.SupplierEntity; import cn.lihongjie.coal.syslog.entity.SysLogEntity; import cn.lihongjie.coal.user.entity.UserEntity; import org.apache.commons.lang3.StringUtils; @@ -129,7 +130,17 @@ public interface CommonMapper { return e; } + public default SupplierEntity createSupplier(String id) { + if (StringUtils.isEmpty(id)) { + + return null; + } + SupplierEntity e = new SupplierEntity(); + e.setId(id); + return e; + + } public default String toString(Object o) { diff --git a/src/main/java/cn/lihongjie/coal/coalInfo/controller/CoalInfoController.java b/src/main/java/cn/lihongjie/coal/coalInfo/controller/CoalInfoController.java new file mode 100644 index 00000000..2a56f97a --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalInfo/controller/CoalInfoController.java @@ -0,0 +1,60 @@ +package cn.lihongjie.coal.coalInfo.controller; + +import cn.lihongjie.coal.annotation.OrgScope; +import cn.lihongjie.coal.annotation.SysLog; +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.coalInfo.dto.CoalInfoDto; +import cn.lihongjie.coal.coalInfo.dto.CreateCoalInfoDto; +import cn.lihongjie.coal.coalInfo.dto.UpdateCoalInfoDto; +import cn.lihongjie.coal.coalInfo.service.CoalInfoService; +import java.lang.Object; +import java.lang.String; +import lombok.extern.slf4j.Slf4j; +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; + +@RestController +@RequestMapping("/coalInfo") +@SysLog( + module = "煤源信息" +) +@Slf4j +@OrgScope +public class CoalInfoController { + @Autowired + private CoalInfoService service; + + @PostMapping("/create") + public CoalInfoDto create(@RequestBody CreateCoalInfoDto request) { + return this.service.create(request) + ; + } + + @PostMapping("/update") + public CoalInfoDto update(@RequestBody UpdateCoalInfoDto request) { + return this.service.update(request) + ; + } + + @PostMapping("/delete") + public Object delete(@RequestBody IdRequest request) { + this.service.delete(request); + return true + ; + } + + public CoalInfoDto getById(@RequestBody String request) { + return this.service.getById(request) + ; + } + + public Page list(@RequestBody CommonQuery request) { + return this.service.list(request) + ; + } +} diff --git a/src/main/java/cn/lihongjie/coal/coalInfo/dto/CoalInfoDto.java b/src/main/java/cn/lihongjie/coal/coalInfo/dto/CoalInfoDto.java new file mode 100644 index 00000000..6da5e6a9 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalInfo/dto/CoalInfoDto.java @@ -0,0 +1,18 @@ +package cn.lihongjie.coal.coalInfo.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.supplier.entity.SupplierEntity; +import lombok.Data; +import org.hibernate.annotations.Comment; + +@Data +public class CoalInfoDto extends OrgCommonDto { + + @Comment("供应商") + private SupplierEntity supplier; + + + + @Comment("初始报价") + private Double initPrice; +} diff --git a/src/main/java/cn/lihongjie/coal/coalInfo/dto/CreateCoalInfoDto.java b/src/main/java/cn/lihongjie/coal/coalInfo/dto/CreateCoalInfoDto.java new file mode 100644 index 00000000..7bf33024 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalInfo/dto/CreateCoalInfoDto.java @@ -0,0 +1,17 @@ +package cn.lihongjie.coal.coalInfo.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; +import lombok.Data; +import org.hibernate.annotations.Comment; + +@Data +public class CreateCoalInfoDto extends OrgCommonDto { + + @Comment("供应商") + private String supplier; + + + + @Comment("初始报价") + private Double initPrice; +} diff --git a/src/main/java/cn/lihongjie/coal/coalInfo/dto/UpdateCoalInfoDto.java b/src/main/java/cn/lihongjie/coal/coalInfo/dto/UpdateCoalInfoDto.java new file mode 100644 index 00000000..8a5fbbb4 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalInfo/dto/UpdateCoalInfoDto.java @@ -0,0 +1,16 @@ +package cn.lihongjie.coal.coalInfo.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; +import lombok.Data; +import org.hibernate.annotations.Comment; + +@Data +public class UpdateCoalInfoDto extends OrgCommonDto { + @Comment("供应商") + private String supplier; + + + + @Comment("初始报价") + private Double initPrice; +} diff --git a/src/main/java/cn/lihongjie/coal/coalInfo/entity/CoalInfoEntity.java b/src/main/java/cn/lihongjie/coal/coalInfo/entity/CoalInfoEntity.java new file mode 100644 index 00000000..f912c088 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalInfo/entity/CoalInfoEntity.java @@ -0,0 +1,24 @@ +package cn.lihongjie.coal.coalInfo.entity; + +import cn.lihongjie.coal.base.entity.OrgCommonEntity; +import cn.lihongjie.coal.supplier.entity.SupplierEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import lombok.Data; +import org.hibernate.annotations.Comment; + +@Data +@Entity +public class CoalInfoEntity extends OrgCommonEntity { + + @ManyToOne + @Comment("供应商") + private SupplierEntity supplier; + + + + @Comment("初始报价") + private Double initPrice; + + +} diff --git a/src/main/java/cn/lihongjie/coal/coalInfo/mapper/CoalInfoMapper.java b/src/main/java/cn/lihongjie/coal/coalInfo/mapper/CoalInfoMapper.java new file mode 100644 index 00000000..5617f70f --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalInfo/mapper/CoalInfoMapper.java @@ -0,0 +1,18 @@ +package cn.lihongjie.coal.coalInfo.mapper; + +import cn.lihongjie.coal.base.mapper.BaseMapper; +import cn.lihongjie.coal.base.mapper.CommonMapper; +import cn.lihongjie.coal.coalInfo.dto.CoalInfoDto; +import cn.lihongjie.coal.coalInfo.dto.CreateCoalInfoDto; +import cn.lihongjie.coal.coalInfo.dto.UpdateCoalInfoDto; +import cn.lihongjie.coal.coalInfo.entity.CoalInfoEntity; +import org.mapstruct.Mapper; +import org.mapstruct.control.DeepClone; + +@Mapper( + componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING, + uses = {CommonMapper.class}, + mappingControl = DeepClone.class +) +public interface CoalInfoMapper extends BaseMapper { +} diff --git a/src/main/java/cn/lihongjie/coal/coalInfo/repository/CoalInfoRepository.java b/src/main/java/cn/lihongjie/coal/coalInfo/repository/CoalInfoRepository.java new file mode 100644 index 00000000..87256737 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalInfo/repository/CoalInfoRepository.java @@ -0,0 +1,9 @@ +package cn.lihongjie.coal.coalInfo.repository; + +import cn.lihongjie.coal.base.dao.BaseRepository; +import cn.lihongjie.coal.coalInfo.entity.CoalInfoEntity; +import org.springframework.stereotype.Repository; + +@Repository +public interface CoalInfoRepository extends BaseRepository { +} diff --git a/src/main/java/cn/lihongjie/coal/coalInfo/service/CoalInfoService.java b/src/main/java/cn/lihongjie/coal/coalInfo/service/CoalInfoService.java new file mode 100644 index 00000000..ae3c61cd --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalInfo/service/CoalInfoService.java @@ -0,0 +1,72 @@ +package cn.lihongjie.coal.coalInfo.service; + +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.base.service.BaseService; +import cn.lihongjie.coal.coalInfo.dto.CoalInfoDto; +import cn.lihongjie.coal.coalInfo.dto.CreateCoalInfoDto; +import cn.lihongjie.coal.coalInfo.dto.UpdateCoalInfoDto; +import cn.lihongjie.coal.coalInfo.entity.CoalInfoEntity; +import cn.lihongjie.coal.coalInfo.mapper.CoalInfoMapper; +import cn.lihongjie.coal.coalInfo.repository.CoalInfoRepository; +import java.lang.String; +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 CoalInfoService extends BaseService { + @Autowired + private CoalInfoRepository repository; + + @Autowired + private CoalInfoMapper mapper; + + @Autowired + private ConversionService conversionService; + + public CoalInfoDto create(CreateCoalInfoDto request) { + CoalInfoEntity entity = mapper.toEntity(request); + + + this.repository.save(entity); + return getById(entity.getId()) + ; + } + + public CoalInfoDto update(UpdateCoalInfoDto request) { + CoalInfoEntity entity = this.repository.get(request.getId()); + this.mapper.updateEntity(entity, request); + + this.repository.save(entity); + + return getById(entity.getId()) + ; + } + + public void delete(IdRequest request) { + this.repository.deleteAllById(request.getIds()) + ; + } + + public CoalInfoDto getById(String id) { + CoalInfoEntity entity = repository.get(id); + + + return mapper.toDto(entity) + ; + } + + 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) + ; + } +} diff --git a/src/main/java/cn/lihongjie/coal/coalPrice/controller/CoalPriceController.java b/src/main/java/cn/lihongjie/coal/coalPrice/controller/CoalPriceController.java new file mode 100644 index 00000000..08d36654 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalPrice/controller/CoalPriceController.java @@ -0,0 +1,60 @@ +package cn.lihongjie.coal.coalPrice.controller; + +import cn.lihongjie.coal.annotation.OrgScope; +import cn.lihongjie.coal.annotation.SysLog; +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.coalPrice.dto.CoalPriceDto; +import cn.lihongjie.coal.coalPrice.dto.CreateCoalPriceDto; +import cn.lihongjie.coal.coalPrice.dto.UpdateCoalPriceDto; +import cn.lihongjie.coal.coalPrice.service.CoalPriceService; +import java.lang.Object; +import java.lang.String; +import lombok.extern.slf4j.Slf4j; +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; + +@RestController +@RequestMapping("/coalPrice") +@SysLog( + module = "煤源价格记录" +) +@Slf4j +@OrgScope +public class CoalPriceController { + @Autowired + private CoalPriceService service; + + @PostMapping("/create") + public CoalPriceDto create(@RequestBody CreateCoalPriceDto request) { + return this.service.create(request) + ; + } + + @PostMapping("/update") + public CoalPriceDto update(@RequestBody UpdateCoalPriceDto request) { + return this.service.update(request) + ; + } + + @PostMapping("/delete") + public Object delete(@RequestBody IdRequest request) { + this.service.delete(request); + return true + ; + } + + public CoalPriceDto getById(@RequestBody String request) { + return this.service.getById(request) + ; + } + + public Page list(@RequestBody CommonQuery request) { + return this.service.list(request) + ; + } +} diff --git a/src/main/java/cn/lihongjie/coal/coalPrice/dto/CoalPriceDto.java b/src/main/java/cn/lihongjie/coal/coalPrice/dto/CoalPriceDto.java new file mode 100644 index 00000000..127db487 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalPrice/dto/CoalPriceDto.java @@ -0,0 +1,18 @@ +package cn.lihongjie.coal.coalPrice.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.coalInfo.entity.CoalInfoEntity; +import jakarta.persistence.ManyToOne; +import lombok.Data; +import org.hibernate.annotations.Comment; + +@Data +public class CoalPriceDto extends OrgCommonDto { + @Comment("煤源") + private CoalInfoEntity coalInfo; + + + + @Comment("价格") + private Double price; +} diff --git a/src/main/java/cn/lihongjie/coal/coalPrice/dto/CreateCoalPriceDto.java b/src/main/java/cn/lihongjie/coal/coalPrice/dto/CreateCoalPriceDto.java new file mode 100644 index 00000000..89ed4493 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalPrice/dto/CreateCoalPriceDto.java @@ -0,0 +1,16 @@ +package cn.lihongjie.coal.coalPrice.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; +import lombok.Data; +import org.hibernate.annotations.Comment; + +@Data +public class CreateCoalPriceDto extends OrgCommonDto { + @Comment("煤源") + private String coalInfo; + + + + @Comment("价格") + private Double price; +} diff --git a/src/main/java/cn/lihongjie/coal/coalPrice/dto/UpdateCoalPriceDto.java b/src/main/java/cn/lihongjie/coal/coalPrice/dto/UpdateCoalPriceDto.java new file mode 100644 index 00000000..d1c1c079 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalPrice/dto/UpdateCoalPriceDto.java @@ -0,0 +1,16 @@ +package cn.lihongjie.coal.coalPrice.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; +import lombok.Data; +import org.hibernate.annotations.Comment; + +@Data +public class UpdateCoalPriceDto extends OrgCommonDto { + @Comment("煤源") + private String coalInfo; + + + + @Comment("价格") + private Double price; +} diff --git a/src/main/java/cn/lihongjie/coal/coalPrice/entity/CoalPriceEntity.java b/src/main/java/cn/lihongjie/coal/coalPrice/entity/CoalPriceEntity.java new file mode 100644 index 00000000..57738a4f --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalPrice/entity/CoalPriceEntity.java @@ -0,0 +1,22 @@ +package cn.lihongjie.coal.coalPrice.entity; + +import cn.lihongjie.coal.base.entity.OrgCommonEntity; +import cn.lihongjie.coal.coalInfo.entity.CoalInfoEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import lombok.Data; +import org.hibernate.annotations.Comment; + +@Data +@Entity +public class CoalPriceEntity extends OrgCommonEntity { + + @Comment("煤源") + @ManyToOne + private CoalInfoEntity coalInfo; + + + + @Comment("价格") + private Double price; +} diff --git a/src/main/java/cn/lihongjie/coal/coalPrice/mapper/CoalPriceMapper.java b/src/main/java/cn/lihongjie/coal/coalPrice/mapper/CoalPriceMapper.java new file mode 100644 index 00000000..6030a336 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalPrice/mapper/CoalPriceMapper.java @@ -0,0 +1,18 @@ +package cn.lihongjie.coal.coalPrice.mapper; + +import cn.lihongjie.coal.base.mapper.BaseMapper; +import cn.lihongjie.coal.base.mapper.CommonMapper; +import cn.lihongjie.coal.coalPrice.dto.CoalPriceDto; +import cn.lihongjie.coal.coalPrice.dto.CreateCoalPriceDto; +import cn.lihongjie.coal.coalPrice.dto.UpdateCoalPriceDto; +import cn.lihongjie.coal.coalPrice.entity.CoalPriceEntity; +import org.mapstruct.Mapper; +import org.mapstruct.control.DeepClone; + +@Mapper( + componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING, + uses = {CommonMapper.class}, + mappingControl = DeepClone.class +) +public interface CoalPriceMapper extends BaseMapper { +} diff --git a/src/main/java/cn/lihongjie/coal/coalPrice/repository/CoalPriceRepository.java b/src/main/java/cn/lihongjie/coal/coalPrice/repository/CoalPriceRepository.java new file mode 100644 index 00000000..f78b45c8 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalPrice/repository/CoalPriceRepository.java @@ -0,0 +1,9 @@ +package cn.lihongjie.coal.coalPrice.repository; + +import cn.lihongjie.coal.base.dao.BaseRepository; +import cn.lihongjie.coal.coalPrice.entity.CoalPriceEntity; +import org.springframework.stereotype.Repository; + +@Repository +public interface CoalPriceRepository extends BaseRepository { +} diff --git a/src/main/java/cn/lihongjie/coal/coalPrice/service/CoalPriceService.java b/src/main/java/cn/lihongjie/coal/coalPrice/service/CoalPriceService.java new file mode 100644 index 00000000..65946570 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/coalPrice/service/CoalPriceService.java @@ -0,0 +1,72 @@ +package cn.lihongjie.coal.coalPrice.service; + +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.base.service.BaseService; +import cn.lihongjie.coal.coalPrice.dto.CoalPriceDto; +import cn.lihongjie.coal.coalPrice.dto.CreateCoalPriceDto; +import cn.lihongjie.coal.coalPrice.dto.UpdateCoalPriceDto; +import cn.lihongjie.coal.coalPrice.entity.CoalPriceEntity; +import cn.lihongjie.coal.coalPrice.mapper.CoalPriceMapper; +import cn.lihongjie.coal.coalPrice.repository.CoalPriceRepository; +import java.lang.String; +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 CoalPriceService extends BaseService { + @Autowired + private CoalPriceRepository repository; + + @Autowired + private CoalPriceMapper mapper; + + @Autowired + private ConversionService conversionService; + + public CoalPriceDto create(CreateCoalPriceDto request) { + CoalPriceEntity entity = mapper.toEntity(request); + + + this.repository.save(entity); + return getById(entity.getId()) + ; + } + + public CoalPriceDto update(UpdateCoalPriceDto request) { + CoalPriceEntity entity = this.repository.get(request.getId()); + this.mapper.updateEntity(entity, request); + + this.repository.save(entity); + + return getById(entity.getId()) + ; + } + + public void delete(IdRequest request) { + this.repository.deleteAllById(request.getIds()) + ; + } + + public CoalPriceDto getById(String id) { + CoalPriceEntity entity = repository.get(id); + + + return mapper.toDto(entity) + ; + } + + 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) + ; + } +} diff --git a/src/main/resources/scripts/dict/enum/supplierDict.groovy b/src/main/resources/scripts/dict/enum/supplierDict.groovy new file mode 100644 index 00000000..c008058f --- /dev/null +++ b/src/main/resources/scripts/dict/enum/supplierDict.groovy @@ -0,0 +1,15 @@ +package scripts.dict + +import cn.lihongjie.coal.base.dto.CommonQuery +import cn.lihongjie.coal.supplier.controller.SupplierController +import org.springframework.context.ApplicationContext + +ApplicationContext ioc = ioc; + +def controller = ioc.getBean(SupplierController.class) + + + + +return controller.list(new CommonQuery()) +