From bf14e6bb89575ac3da7808de3d5cc46754509cbe Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Thu, 21 Mar 2024 21:37:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EmDeviceController.java | 66 ++++++++++ .../coal/emDevice/dto/CreateEmDeviceDto.java | 36 ++++++ .../coal/emDevice/dto/EmDeviceDto.java | 26 ++++ .../coal/emDevice/dto/UpdateEmDeviceDto.java | 33 +++++ .../coal/emDevice/entity/EmDeviceEntity.java | 50 ++++++++ .../coal/emDevice/mapper/EmDeviceMapper.java | 19 +++ .../repository/EmDeviceRepository.java | 9 ++ .../emDevice/service/EmDeviceService.java | 120 +++++++++++++++++ .../controller/EmDeviceDataController.java | 54 ++++++++ .../dto/CreateEmDeviceDataDto.java | 65 ++++++++++ .../emDeviceData/dto/EmDeviceDataDto.java | 65 ++++++++++ .../dto/UpdateEmDeviceDataDto.java | 65 ++++++++++ .../entity/EmDeviceDataEntity.java | 73 +++++++++++ .../mapper/EmDeviceDataMapper.java | 23 ++++ .../repository/EmDeviceDataRepository.java | 9 ++ .../service/EmDeviceDataService.java | 73 +++++++++++ .../EmDeviceSupplierController.java | 66 ++++++++++ .../dto/CreateEmDeviceSupplierDto.java | 8 ++ .../dto/EmDeviceSupplierDto.java | 12 ++ .../dto/UpdateEmDeviceSupplierDto.java | 8 ++ .../entity/EmDeviceSupplierEntity.java | 28 ++++ .../mapper/EmDeviceSupplierMapper.java | 23 ++++ .../EmDeviceSupplierRepository.java | 9 ++ .../service/EmDeviceSupplierService.java | 121 ++++++++++++++++++ src/main/resources/config/dictionary.json | 12 ++ .../scripts/dict/enum/emDeviceDataDict.groovy | 17 +++ .../scripts/dict/enum/emDeviceDict.groovy | 17 +++ .../dict/enum/emDeviceSupplierDict.groovy | 17 +++ 28 files changed, 1124 insertions(+) create mode 100644 src/main/java/cn/lihongjie/coal/emDevice/controller/EmDeviceController.java create mode 100644 src/main/java/cn/lihongjie/coal/emDevice/dto/CreateEmDeviceDto.java create mode 100644 src/main/java/cn/lihongjie/coal/emDevice/dto/EmDeviceDto.java create mode 100644 src/main/java/cn/lihongjie/coal/emDevice/dto/UpdateEmDeviceDto.java create mode 100644 src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java create mode 100644 src/main/java/cn/lihongjie/coal/emDevice/mapper/EmDeviceMapper.java create mode 100644 src/main/java/cn/lihongjie/coal/emDevice/repository/EmDeviceRepository.java create mode 100644 src/main/java/cn/lihongjie/coal/emDevice/service/EmDeviceService.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceData/controller/EmDeviceDataController.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceData/dto/CreateEmDeviceDataDto.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceData/dto/EmDeviceDataDto.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceData/dto/UpdateEmDeviceDataDto.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceData/entity/EmDeviceDataEntity.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceData/mapper/EmDeviceDataMapper.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceData/repository/EmDeviceDataRepository.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceData/service/EmDeviceDataService.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceSupplier/controller/EmDeviceSupplierController.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/CreateEmDeviceSupplierDto.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/EmDeviceSupplierDto.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/UpdateEmDeviceSupplierDto.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceSupplier/entity/EmDeviceSupplierEntity.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceSupplier/mapper/EmDeviceSupplierMapper.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceSupplier/repository/EmDeviceSupplierRepository.java create mode 100644 src/main/java/cn/lihongjie/coal/emDeviceSupplier/service/EmDeviceSupplierService.java create mode 100644 src/main/resources/scripts/dict/enum/emDeviceDataDict.groovy create mode 100644 src/main/resources/scripts/dict/enum/emDeviceDict.groovy create mode 100644 src/main/resources/scripts/dict/enum/emDeviceSupplierDict.groovy diff --git a/src/main/java/cn/lihongjie/coal/emDevice/controller/EmDeviceController.java b/src/main/java/cn/lihongjie/coal/emDevice/controller/EmDeviceController.java new file mode 100644 index 00000000..39782a1f --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDevice/controller/EmDeviceController.java @@ -0,0 +1,66 @@ +package cn.lihongjie.coal.emDevice.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.emDevice.dto.CreateEmDeviceDto; +import cn.lihongjie.coal.emDevice.dto.EmDeviceDto; +import cn.lihongjie.coal.emDevice.dto.UpdateEmDeviceDto; +import cn.lihongjie.coal.emDevice.service.EmDeviceService; + +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("/emDevice") +@SysLog(module = "环保设备管理") +@Slf4j +@OrgScope +public class EmDeviceController { + @Autowired private EmDeviceService service; + + @PostMapping("/create") + public EmDeviceDto create(@RequestBody CreateEmDeviceDto request) { + return this.service.create(request); + } + + @PostMapping("/update") + public EmDeviceDto update(@RequestBody UpdateEmDeviceDto request) { + return this.service.update(request); + } + + @PostMapping("/delete") + public Object delete(@RequestBody IdRequest request) { + this.service.delete(request); + return true; + } + + @PostMapping("/getById") + public EmDeviceDto getById(@RequestBody IdRequest request) { + return this.service.getById(request.getId()); + } + + @PostMapping("/list") + public Page list(@RequestBody CommonQuery request) { + return this.service.list(request); + } + + @PostMapping("/archive") + public Object archive(@RequestBody IdRequest request) { + this.service.archive(request); + return true; + } + + @PostMapping("/unarchive") + public Object unarchive(@RequestBody IdRequest request) { + this.service.unarchive(request); + return true; + } +} diff --git a/src/main/java/cn/lihongjie/coal/emDevice/dto/CreateEmDeviceDto.java b/src/main/java/cn/lihongjie/coal/emDevice/dto/CreateEmDeviceDto.java new file mode 100644 index 00000000..c4c1468a --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDevice/dto/CreateEmDeviceDto.java @@ -0,0 +1,36 @@ +package cn.lihongjie.coal.emDevice.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.emDevice.entity.EmDeviceEntity; +import cn.lihongjie.coal.errorMsg.ErrorMsgCode; +import cn.lihongjie.coal.validator.OrgUniq; +import cn.lihongjie.coal.validator.RequireCode; +import cn.lihongjie.coal.validator.RequireName; + +import jakarta.persistence.ManyToOne; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +@Data +@RequireName +@RequireCode + +@OrgUniq(fields = {"code"}, message = ErrorMsgCode.UNIQ_CODE, entityClass = EmDeviceEntity.class) +@OrgUniq(fields = {"name"}, message = ErrorMsgCode.UNIQ_NAME, entityClass = EmDeviceEntity.class) +public class CreateEmDeviceDto extends OrgCommonDto { + + String supplier; + + @ManyToOne + String thirdAccount; + + @Comment("设备类型") + private String deviceType; + + private String location; + + + +} diff --git a/src/main/java/cn/lihongjie/coal/emDevice/dto/EmDeviceDto.java b/src/main/java/cn/lihongjie/coal/emDevice/dto/EmDeviceDto.java new file mode 100644 index 00000000..fe0dfb34 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDevice/dto/EmDeviceDto.java @@ -0,0 +1,26 @@ +package cn.lihongjie.coal.emDevice.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.emDeviceSupplier.dto.EmDeviceSupplierDto; +import cn.lihongjie.coal.thirdAccount.dto.ThirdAccountDto; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +@Data +public class EmDeviceDto extends OrgCommonDto { + + + EmDeviceSupplierDto supplier; + + ThirdAccountDto thirdAccount; + + @Comment("设备类型") + private String deviceType; + + private String location; + private String archiveStatus; + + private String archiveStatusName; +} diff --git a/src/main/java/cn/lihongjie/coal/emDevice/dto/UpdateEmDeviceDto.java b/src/main/java/cn/lihongjie/coal/emDevice/dto/UpdateEmDeviceDto.java new file mode 100644 index 00000000..b8260661 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDevice/dto/UpdateEmDeviceDto.java @@ -0,0 +1,33 @@ +package cn.lihongjie.coal.emDevice.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.emDevice.entity.EmDeviceEntity; +import cn.lihongjie.coal.errorMsg.ErrorMsgCode; +import cn.lihongjie.coal.validator.OrgUniq; +import cn.lihongjie.coal.validator.RequireCode; +import cn.lihongjie.coal.validator.RequireName; + +import jakarta.persistence.ManyToOne; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +@Data +@RequireName +@RequireCode + +@OrgUniq(fields = {"code"}, message = ErrorMsgCode.UNIQ_CODE, entityClass = EmDeviceEntity.class) +@OrgUniq(fields = {"name"}, message = ErrorMsgCode.UNIQ_NAME, entityClass = EmDeviceEntity.class) +public class UpdateEmDeviceDto extends OrgCommonDto { + + String supplier; + + @ManyToOne + String thirdAccount; + + @Comment("设备类型") + private String deviceType; + + private String location; +} diff --git a/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java b/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java new file mode 100644 index 00000000..eb092321 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDevice/entity/EmDeviceEntity.java @@ -0,0 +1,50 @@ +package cn.lihongjie.coal.emDevice.entity; + +import cn.lihongjie.coal.base.entity.OrgCommonEntity; +import cn.lihongjie.coal.emDeviceSupplier.entity.EmDeviceSupplierEntity; +import cn.lihongjie.coal.thirdAccount.entity.ThirdAccountEntity; + +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; + +import lombok.Data; + +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Formula; + +@Data +@Entity +public class EmDeviceEntity extends OrgCommonEntity { + + @ManyToOne EmDeviceSupplierEntity supplier; + + @ManyToOne ThirdAccountEntity thirdAccount; + + @Comment("设备类型") + private String deviceType; + + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'em.device.type'\n" + + " and i.code = device_type)") + private String deviceTypeName; + + private String location; + + @Comment("归档状态") + @ColumnDefault("'0'") + private String archiveStatus = "0"; + + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'archiveStatus'\n" + + " and i.code = archive_status)") + private String archiveStatusName; +} diff --git a/src/main/java/cn/lihongjie/coal/emDevice/mapper/EmDeviceMapper.java b/src/main/java/cn/lihongjie/coal/emDevice/mapper/EmDeviceMapper.java new file mode 100644 index 00000000..48ee614e --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDevice/mapper/EmDeviceMapper.java @@ -0,0 +1,19 @@ +package cn.lihongjie.coal.emDevice.mapper; + +import cn.lihongjie.coal.base.mapper.BaseMapper; +import cn.lihongjie.coal.base.mapper.CommonEntityMapper; +import cn.lihongjie.coal.base.mapper.CommonMapper; +import cn.lihongjie.coal.emDevice.dto.CreateEmDeviceDto; +import cn.lihongjie.coal.emDevice.dto.EmDeviceDto; +import cn.lihongjie.coal.emDevice.dto.UpdateEmDeviceDto; +import cn.lihongjie.coal.emDevice.entity.EmDeviceEntity; + +import org.mapstruct.Mapper; +import org.mapstruct.control.DeepClone; + +@Mapper( + componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING, + uses = {CommonMapper.class, CommonEntityMapper.class}, + mappingControl = DeepClone.class) +public interface EmDeviceMapper + extends BaseMapper {} diff --git a/src/main/java/cn/lihongjie/coal/emDevice/repository/EmDeviceRepository.java b/src/main/java/cn/lihongjie/coal/emDevice/repository/EmDeviceRepository.java new file mode 100644 index 00000000..fd097226 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDevice/repository/EmDeviceRepository.java @@ -0,0 +1,9 @@ +package cn.lihongjie.coal.emDevice.repository; + +import cn.lihongjie.coal.base.dao.BaseRepository; +import cn.lihongjie.coal.emDevice.entity.EmDeviceEntity; + +import org.springframework.stereotype.Repository; + +@Repository +public interface EmDeviceRepository extends BaseRepository {} diff --git a/src/main/java/cn/lihongjie/coal/emDevice/service/EmDeviceService.java b/src/main/java/cn/lihongjie/coal/emDevice/service/EmDeviceService.java new file mode 100644 index 00000000..3aad3bb2 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDevice/service/EmDeviceService.java @@ -0,0 +1,120 @@ +package cn.lihongjie.coal.emDevice.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.common.ArchiveUtils; +import cn.lihongjie.coal.dbFunctions.DbFunctionService; +import cn.lihongjie.coal.emDevice.dto.CreateEmDeviceDto; +import cn.lihongjie.coal.emDevice.dto.EmDeviceDto; +import cn.lihongjie.coal.emDevice.dto.UpdateEmDeviceDto; +import cn.lihongjie.coal.emDevice.entity.EmDeviceEntity; +import cn.lihongjie.coal.emDevice.mapper.EmDeviceMapper; +import cn.lihongjie.coal.emDevice.repository.EmDeviceRepository; +import cn.lihongjie.coal.exception.BizException; + +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; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Slf4j +@Transactional +public class EmDeviceService extends BaseService { + @Autowired private EmDeviceRepository repository; + + @Autowired private EmDeviceMapper mapper; + + @Autowired private ConversionService conversionService; + + @Autowired private DbFunctionService dbFunctionService; + + public EmDeviceDto create(CreateEmDeviceDto request) { + EmDeviceEntity entity = mapper.toEntity(request); + + this.repository.save(entity); + return getById(entity.getId()); + } + + public EmDeviceDto update(UpdateEmDeviceDto request) { + EmDeviceEntity entity = this.repository.get(request.getId()); + ArchiveUtils.checkArchiveStatus( + entity, + EmDeviceEntity::getArchiveStatus, + x -> "0", + (e, actual, expected) -> { + throw new BizException("数据 " + "已归档，无法编辑"); + }); + this.mapper.updateEntity(entity, request); + + this.repository.save(entity); + + return getById(entity.getId()); + } + + public void delete(IdRequest request) { + ArchiveUtils.checkArchiveStatus( + this.repository::findAllById, + request.getIds(), + EmDeviceEntity::getArchiveStatus, + x -> "0", + (e, actual, expected) -> { + throw new BizException("数据 " + "已归档，无法删除"); + }); + this.repository.deleteAllById(request.getIds()); + } + + public EmDeviceDto getById(String id) { + EmDeviceEntity 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); + } + + public void archive(IdRequest dto) { + this.repository.findAllById(dto.getIds()).stream() + .peek( + x -> + ArchiveUtils.checkArchiveStatus( + x, + EmDeviceEntity::getArchiveStatus, + y -> "0", + (e, actual, expected) -> { + throw new BizException("数据 " + "已归档，无法再次归档"); + })) + .peek(x -> x.setArchiveStatus("1")) + .forEach(this.repository::save); + } + + public void unarchive(IdRequest dto) { + this.repository.findAllById(dto.getIds()).stream() + .peek( + x -> + ArchiveUtils.checkArchiveStatus( + x, + EmDeviceEntity::getArchiveStatus, + y -> "1", + (e, actual, expected) -> { + throw new BizException("数据" + "未归档，无法取消归档"); + })) + .peek(x -> x.setArchiveStatus("0")) + .forEach(this.repository::save); + } +} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceData/controller/EmDeviceDataController.java b/src/main/java/cn/lihongjie/coal/emDeviceData/controller/EmDeviceDataController.java new file mode 100644 index 00000000..300fffad --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceData/controller/EmDeviceDataController.java @@ -0,0 +1,54 @@ +package cn.lihongjie.coal.emDeviceData.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.emDeviceData.dto.CreateEmDeviceDataDto; +import cn.lihongjie.coal.emDeviceData.dto.EmDeviceDataDto; +import cn.lihongjie.coal.emDeviceData.dto.UpdateEmDeviceDataDto; +import cn.lihongjie.coal.emDeviceData.service.EmDeviceDataService; + +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("/emDeviceData") +@SysLog(module = "环保设备数据") +@Slf4j +@OrgScope +public class EmDeviceDataController { + @Autowired private EmDeviceDataService service; + + @PostMapping("/create") + public EmDeviceDataDto create(@RequestBody CreateEmDeviceDataDto request) { + return this.service.create(request); + } + + @PostMapping("/update") + public EmDeviceDataDto update(@RequestBody UpdateEmDeviceDataDto request) { + return this.service.update(request); + } + + @PostMapping("/delete") + public Object delete(@RequestBody IdRequest request) { + this.service.delete(request); + return true; + } + + @PostMapping("/getById") + public EmDeviceDataDto getById(@RequestBody IdRequest request) { + return this.service.getById(request.getId()); + } + + @PostMapping("/list") + public Page list(@RequestBody CommonQuery request) { + return this.service.list(request); + } +} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceData/dto/CreateEmDeviceDataDto.java b/src/main/java/cn/lihongjie/coal/emDeviceData/dto/CreateEmDeviceDataDto.java new file mode 100644 index 00000000..676c48d0 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceData/dto/CreateEmDeviceDataDto.java @@ -0,0 +1,65 @@ +package cn.lihongjie.coal.emDeviceData.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +import java.time.LocalDateTime; + +@Data +public class CreateEmDeviceDataDto extends OrgCommonDto { + + private String deviceId; + + private LocalDateTime time; + + @Comment("Pm2.5") + private Double pm25; + + @Comment("Pm10") + private Double pm10; + + @Comment("噪声") + private Double noise; + + @Comment("温度") + private Double tem; + + @Comment("湿度") + private Double hum; + + @Comment("风力") + private Double wp; + + @Comment("风速") + private Double ws; + + @Comment("八风向") + private Double wd8; + + @Comment("风向") + private Double wd360; + + @Comment("悬浮微粒") + private Double tsp; + + @Comment("大气压") + private Double atm; + + @Comment("光照") + private Double lux; + + @Comment("一氧化碳") + private Double co; + + @Comment("二氧化硫") + private Double so2; + + @Comment("二氧化氮") + private Double no2; + + @Comment("臭氧") + private Double o3; +} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceData/dto/EmDeviceDataDto.java b/src/main/java/cn/lihongjie/coal/emDeviceData/dto/EmDeviceDataDto.java new file mode 100644 index 00000000..a7315639 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceData/dto/EmDeviceDataDto.java @@ -0,0 +1,65 @@ +package cn.lihongjie.coal.emDeviceData.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +import java.time.LocalDateTime; + +@Data +public class EmDeviceDataDto extends OrgCommonDto { + + private String deviceId; + + private LocalDateTime time; + + @Comment("Pm2.5") + private Double pm25; + + @Comment("Pm10") + private Double pm10; + + @Comment("噪声") + private Double noise; + + @Comment("温度") + private Double tem; + + @Comment("湿度") + private Double hum; + + @Comment("风力") + private Double wp; + + @Comment("风速") + private Double ws; + + @Comment("八风向") + private Double wd8; + + @Comment("风向") + private Double wd360; + + @Comment("悬浮微粒") + private Double tsp; + + @Comment("大气压") + private Double atm; + + @Comment("光照") + private Double lux; + + @Comment("一氧化碳") + private Double co; + + @Comment("二氧化硫") + private Double so2; + + @Comment("二氧化氮") + private Double no2; + + @Comment("臭氧") + private Double o3; +} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceData/dto/UpdateEmDeviceDataDto.java b/src/main/java/cn/lihongjie/coal/emDeviceData/dto/UpdateEmDeviceDataDto.java new file mode 100644 index 00000000..8450f0f0 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceData/dto/UpdateEmDeviceDataDto.java @@ -0,0 +1,65 @@ +package cn.lihongjie.coal.emDeviceData.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +import java.time.LocalDateTime; + +@Data +public class UpdateEmDeviceDataDto extends OrgCommonDto { + private String deviceId; + + private LocalDateTime time; + + @Comment("Pm2.5") + private Double pm25; + + @Comment("Pm10") + private Double pm10; + + @Comment("噪声") + private Double noise; + + @Comment("温度") + private Double tem; + + @Comment("湿度") + private Double hum; + + @Comment("风力") + private Double wp; + + @Comment("风速") + private Double ws; + + @Comment("八风向") + private Double wd8; + + @Comment("风向") + private Double wd360; + + @Comment("悬浮微粒") + private Double tsp; + + @Comment("大气压") + private Double atm; + + @Comment("光照") + private Double lux; + + @Comment("一氧化碳") + private Double co; + + @Comment("二氧化硫") + private Double so2; + + @Comment("二氧化氮") + private Double no2; + + @Comment("臭氧") + private Double o3; + +} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceData/entity/EmDeviceDataEntity.java b/src/main/java/cn/lihongjie/coal/emDeviceData/entity/EmDeviceDataEntity.java new file mode 100644 index 00000000..10ae07e0 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceData/entity/EmDeviceDataEntity.java @@ -0,0 +1,73 @@ +package cn.lihongjie.coal.emDeviceData.entity; + +import cn.lihongjie.coal.base.entity.OrgCommonEntity; + +import jakarta.persistence.Entity; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +import java.time.LocalDateTime; + +/** + * pm25 float Pm2.5 pm10 float Pm10 noise float 噪声 tem float 温度 hum float 湿度 wp float 风力 ws float 风速 + * wd8 float 八风向 wd360 float 风向 tsp float 悬浮微粒 atm float 大气压 lux float 光照 co float 一氧化碳 so2 float + * 二氧化硫 no2 float 二氧化氮 o3 float 臭氧 + */ +@Data +@Entity +public class EmDeviceDataEntity extends OrgCommonEntity { + + private String deviceId; + + private LocalDateTime time; + + @Comment("Pm2.5") + private Double pm25; + + @Comment("Pm10") + private Double pm10; + + @Comment("噪声") + private Double noise; + + @Comment("温度") + private Double tem; + + @Comment("湿度") + private Double hum; + + @Comment("风力") + private Double wp; + + @Comment("风速") + private Double ws; + + @Comment("八风向") + private Double wd8; + + @Comment("风向") + private Double wd360; + + @Comment("悬浮微粒") + private Double tsp; + + @Comment("大气压") + private Double atm; + + @Comment("光照") + private Double lux; + + @Comment("一氧化碳") + private Double co; + + @Comment("二氧化硫") + private Double so2; + + @Comment("二氧化氮") + private Double no2; + + @Comment("臭氧") + private Double o3; +} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceData/mapper/EmDeviceDataMapper.java b/src/main/java/cn/lihongjie/coal/emDeviceData/mapper/EmDeviceDataMapper.java new file mode 100644 index 00000000..14686f31 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceData/mapper/EmDeviceDataMapper.java @@ -0,0 +1,23 @@ +package cn.lihongjie.coal.emDeviceData.mapper; + +import cn.lihongjie.coal.base.mapper.BaseMapper; +import cn.lihongjie.coal.base.mapper.CommonEntityMapper; +import cn.lihongjie.coal.base.mapper.CommonMapper; +import cn.lihongjie.coal.emDeviceData.dto.CreateEmDeviceDataDto; +import cn.lihongjie.coal.emDeviceData.dto.EmDeviceDataDto; +import cn.lihongjie.coal.emDeviceData.dto.UpdateEmDeviceDataDto; +import cn.lihongjie.coal.emDeviceData.entity.EmDeviceDataEntity; + +import org.mapstruct.Mapper; +import org.mapstruct.control.DeepClone; + +@Mapper( + componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING, + uses = {CommonMapper.class, CommonEntityMapper.class}, + mappingControl = DeepClone.class) +public interface EmDeviceDataMapper + extends BaseMapper< + EmDeviceDataEntity, + EmDeviceDataDto, + CreateEmDeviceDataDto, + UpdateEmDeviceDataDto> {} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceData/repository/EmDeviceDataRepository.java b/src/main/java/cn/lihongjie/coal/emDeviceData/repository/EmDeviceDataRepository.java new file mode 100644 index 00000000..8b0984a0 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceData/repository/EmDeviceDataRepository.java @@ -0,0 +1,9 @@ +package cn.lihongjie.coal.emDeviceData.repository; + +import cn.lihongjie.coal.base.dao.BaseRepository; +import cn.lihongjie.coal.emDeviceData.entity.EmDeviceDataEntity; + +import org.springframework.stereotype.Repository; + +@Repository +public interface EmDeviceDataRepository extends BaseRepository {} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceData/service/EmDeviceDataService.java b/src/main/java/cn/lihongjie/coal/emDeviceData/service/EmDeviceDataService.java new file mode 100644 index 00000000..0062a603 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceData/service/EmDeviceDataService.java @@ -0,0 +1,73 @@ +package cn.lihongjie.coal.emDeviceData.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.dbFunctions.DbFunctionService; +import cn.lihongjie.coal.emDeviceData.dto.CreateEmDeviceDataDto; +import cn.lihongjie.coal.emDeviceData.dto.EmDeviceDataDto; +import cn.lihongjie.coal.emDeviceData.dto.UpdateEmDeviceDataDto; +import cn.lihongjie.coal.emDeviceData.entity.EmDeviceDataEntity; +import cn.lihongjie.coal.emDeviceData.mapper.EmDeviceDataMapper; +import cn.lihongjie.coal.emDeviceData.repository.EmDeviceDataRepository; + +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; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Slf4j +@Transactional +public class EmDeviceDataService extends BaseService { + @Autowired private EmDeviceDataRepository repository; + + @Autowired private EmDeviceDataMapper mapper; + + @Autowired private ConversionService conversionService; + + @Autowired private DbFunctionService dbFunctionService; + + public EmDeviceDataDto create(CreateEmDeviceDataDto request) { + EmDeviceDataEntity entity = mapper.toEntity(request); + + this.repository.save(entity); + return getById(entity.getId()); + } + + public EmDeviceDataDto update(UpdateEmDeviceDataDto request) { + EmDeviceDataEntity 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 EmDeviceDataDto getById(String id) { + EmDeviceDataEntity 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/emDeviceSupplier/controller/EmDeviceSupplierController.java b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/controller/EmDeviceSupplierController.java new file mode 100644 index 00000000..7689e0ed --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/controller/EmDeviceSupplierController.java @@ -0,0 +1,66 @@ +package cn.lihongjie.coal.emDeviceSupplier.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.emDeviceSupplier.dto.CreateEmDeviceSupplierDto; +import cn.lihongjie.coal.emDeviceSupplier.dto.EmDeviceSupplierDto; +import cn.lihongjie.coal.emDeviceSupplier.dto.UpdateEmDeviceSupplierDto; +import cn.lihongjie.coal.emDeviceSupplier.service.EmDeviceSupplierService; + +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("/emDeviceSupplier") +@SysLog(module = "环保设备供应商") +@Slf4j +@OrgScope +public class EmDeviceSupplierController { + @Autowired private EmDeviceSupplierService service; + + @PostMapping("/create") + public EmDeviceSupplierDto create(@RequestBody CreateEmDeviceSupplierDto request) { + return this.service.create(request); + } + + @PostMapping("/update") + public EmDeviceSupplierDto update(@RequestBody UpdateEmDeviceSupplierDto request) { + return this.service.update(request); + } + + @PostMapping("/delete") + public Object delete(@RequestBody IdRequest request) { + this.service.delete(request); + return true; + } + + @PostMapping("/getById") + public EmDeviceSupplierDto getById(@RequestBody IdRequest request) { + return this.service.getById(request.getId()); + } + + @PostMapping("/list") + public Page list(@RequestBody CommonQuery request) { + return this.service.list(request); + } + + @PostMapping("/archive") + public Object archive(@RequestBody IdRequest request) { + this.service.archive(request); + return true; + } + + @PostMapping("/unarchive") + public Object unarchive(@RequestBody IdRequest request) { + this.service.unarchive(request); + return true; + } +} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/CreateEmDeviceSupplierDto.java b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/CreateEmDeviceSupplierDto.java new file mode 100644 index 00000000..d3a2941b --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/CreateEmDeviceSupplierDto.java @@ -0,0 +1,8 @@ +package cn.lihongjie.coal.emDeviceSupplier.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import lombok.Data; + +@Data +public class CreateEmDeviceSupplierDto extends OrgCommonDto {} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/EmDeviceSupplierDto.java b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/EmDeviceSupplierDto.java new file mode 100644 index 00000000..dbdc65d2 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/EmDeviceSupplierDto.java @@ -0,0 +1,12 @@ +package cn.lihongjie.coal.emDeviceSupplier.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import lombok.Data; + +@Data +public class EmDeviceSupplierDto extends OrgCommonDto { + private String archiveStatus; + + private String archiveStatusName; +} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/UpdateEmDeviceSupplierDto.java b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/UpdateEmDeviceSupplierDto.java new file mode 100644 index 00000000..7f1ddc48 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/UpdateEmDeviceSupplierDto.java @@ -0,0 +1,8 @@ +package cn.lihongjie.coal.emDeviceSupplier.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import lombok.Data; + +@Data +public class UpdateEmDeviceSupplierDto extends OrgCommonDto {} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/entity/EmDeviceSupplierEntity.java b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/entity/EmDeviceSupplierEntity.java new file mode 100644 index 00000000..a9eb6178 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/entity/EmDeviceSupplierEntity.java @@ -0,0 +1,28 @@ +package cn.lihongjie.coal.emDeviceSupplier.entity; + +import cn.lihongjie.coal.base.entity.OrgCommonEntity; + +import jakarta.persistence.Entity; + +import lombok.Data; + +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Formula; + +@Data +@Entity +public class EmDeviceSupplierEntity extends OrgCommonEntity { + @Comment("归档状态") + @ColumnDefault("'0'") + private String archiveStatus = "0"; + + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'archiveStatus'\n" + + " and i.code = archive_status)") + private String archiveStatusName; +} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/mapper/EmDeviceSupplierMapper.java b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/mapper/EmDeviceSupplierMapper.java new file mode 100644 index 00000000..8c8f6570 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/mapper/EmDeviceSupplierMapper.java @@ -0,0 +1,23 @@ +package cn.lihongjie.coal.emDeviceSupplier.mapper; + +import cn.lihongjie.coal.base.mapper.BaseMapper; +import cn.lihongjie.coal.base.mapper.CommonEntityMapper; +import cn.lihongjie.coal.base.mapper.CommonMapper; +import cn.lihongjie.coal.emDeviceSupplier.dto.CreateEmDeviceSupplierDto; +import cn.lihongjie.coal.emDeviceSupplier.dto.EmDeviceSupplierDto; +import cn.lihongjie.coal.emDeviceSupplier.dto.UpdateEmDeviceSupplierDto; +import cn.lihongjie.coal.emDeviceSupplier.entity.EmDeviceSupplierEntity; + +import org.mapstruct.Mapper; +import org.mapstruct.control.DeepClone; + +@Mapper( + componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING, + uses = {CommonMapper.class, CommonEntityMapper.class}, + mappingControl = DeepClone.class) +public interface EmDeviceSupplierMapper + extends BaseMapper< + EmDeviceSupplierEntity, + EmDeviceSupplierDto, + CreateEmDeviceSupplierDto, + UpdateEmDeviceSupplierDto> {} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/repository/EmDeviceSupplierRepository.java b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/repository/EmDeviceSupplierRepository.java new file mode 100644 index 00000000..aa3dc3ae --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/repository/EmDeviceSupplierRepository.java @@ -0,0 +1,9 @@ +package cn.lihongjie.coal.emDeviceSupplier.repository; + +import cn.lihongjie.coal.base.dao.BaseRepository; +import cn.lihongjie.coal.emDeviceSupplier.entity.EmDeviceSupplierEntity; + +import org.springframework.stereotype.Repository; + +@Repository +public interface EmDeviceSupplierRepository extends BaseRepository {} diff --git a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/service/EmDeviceSupplierService.java b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/service/EmDeviceSupplierService.java new file mode 100644 index 00000000..9d98acc5 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/service/EmDeviceSupplierService.java @@ -0,0 +1,121 @@ +package cn.lihongjie.coal.emDeviceSupplier.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.common.ArchiveUtils; +import cn.lihongjie.coal.dbFunctions.DbFunctionService; +import cn.lihongjie.coal.emDeviceSupplier.dto.CreateEmDeviceSupplierDto; +import cn.lihongjie.coal.emDeviceSupplier.dto.EmDeviceSupplierDto; +import cn.lihongjie.coal.emDeviceSupplier.dto.UpdateEmDeviceSupplierDto; +import cn.lihongjie.coal.emDeviceSupplier.entity.EmDeviceSupplierEntity; +import cn.lihongjie.coal.emDeviceSupplier.mapper.EmDeviceSupplierMapper; +import cn.lihongjie.coal.emDeviceSupplier.repository.EmDeviceSupplierRepository; +import cn.lihongjie.coal.exception.BizException; + +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; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Slf4j +@Transactional +public class EmDeviceSupplierService + extends BaseService { + @Autowired private EmDeviceSupplierRepository repository; + + @Autowired private EmDeviceSupplierMapper mapper; + + @Autowired private ConversionService conversionService; + + @Autowired private DbFunctionService dbFunctionService; + + public EmDeviceSupplierDto create(CreateEmDeviceSupplierDto request) { + EmDeviceSupplierEntity entity = mapper.toEntity(request); + + this.repository.save(entity); + return getById(entity.getId()); + } + + public EmDeviceSupplierDto update(UpdateEmDeviceSupplierDto request) { + EmDeviceSupplierEntity entity = this.repository.get(request.getId()); + ArchiveUtils.checkArchiveStatus( + entity, + EmDeviceSupplierEntity::getArchiveStatus, + x -> "0", + (e, actual, expected) -> { + throw new BizException("数据 " + "已归档，无法编辑"); + }); + this.mapper.updateEntity(entity, request); + + this.repository.save(entity); + + return getById(entity.getId()); + } + + public void delete(IdRequest request) { + ArchiveUtils.checkArchiveStatus( + this.repository::findAllById, + request.getIds(), + EmDeviceSupplierEntity::getArchiveStatus, + x -> "0", + (e, actual, expected) -> { + throw new BizException("数据 " + "已归档，无法删除"); + }); + this.repository.deleteAllById(request.getIds()); + } + + public EmDeviceSupplierDto getById(String id) { + EmDeviceSupplierEntity 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); + } + + public void archive(IdRequest dto) { + this.repository.findAllById(dto.getIds()).stream() + .peek( + x -> + ArchiveUtils.checkArchiveStatus( + x, + EmDeviceSupplierEntity::getArchiveStatus, + y -> "0", + (e, actual, expected) -> { + throw new BizException("数据 " + "已归档，无法再次归档"); + })) + .peek(x -> x.setArchiveStatus("1")) + .forEach(this.repository::save); + } + + public void unarchive(IdRequest dto) { + this.repository.findAllById(dto.getIds()).stream() + .peek( + x -> + ArchiveUtils.checkArchiveStatus( + x, + EmDeviceSupplierEntity::getArchiveStatus, + y -> "1", + (e, actual, expected) -> { + throw new BizException("数据" + "未归档，无法取消归档"); + })) + .peek(x -> x.setArchiveStatus("0")) + .forEach(this.repository::save); + } +} diff --git a/src/main/resources/config/dictionary.json b/src/main/resources/config/dictionary.json index 58a0ffda..0eece571 100644 --- a/src/main/resources/config/dictionary.json +++ b/src/main/resources/config/dictionary.json @@ -2529,6 +2529,18 @@ } ] }, + + { + "code": "em.device.type", + "name": "环保设备类型", + "item": [ + { + "code": "1", + "name": "扬尘检测设备" + } + + ] + }, { "code": "thirdAccount.type", "name": "第三方账号类型", diff --git a/src/main/resources/scripts/dict/enum/emDeviceDataDict.groovy b/src/main/resources/scripts/dict/enum/emDeviceDataDict.groovy new file mode 100644 index 00000000..e1b46d6b --- /dev/null +++ b/src/main/resources/scripts/dict/enum/emDeviceDataDict.groovy @@ -0,0 +1,17 @@ + +package scripts.dict + +import cn.lihongjie.coal.base.dto.CommonQuery +import cn.lihongjie.coal.emDeviceData.controller.EmDeviceDataController +import org.springframework.context.ApplicationContext + +ApplicationContext ioc = ioc + +def controller = ioc.getBean(EmDeviceDataController.class) + + + + +return controller.list(new CommonQuery()) + + diff --git a/src/main/resources/scripts/dict/enum/emDeviceDict.groovy b/src/main/resources/scripts/dict/enum/emDeviceDict.groovy new file mode 100644 index 00000000..37049f08 --- /dev/null +++ b/src/main/resources/scripts/dict/enum/emDeviceDict.groovy @@ -0,0 +1,17 @@ + +package scripts.dict + +import cn.lihongjie.coal.base.dto.CommonQuery +import cn.lihongjie.coal.emDevice.controller.EmDeviceController +import org.springframework.context.ApplicationContext + +ApplicationContext ioc = ioc + +def controller = ioc.getBean(EmDeviceController.class) + + + + +return controller.list(new CommonQuery()) + + diff --git a/src/main/resources/scripts/dict/enum/emDeviceSupplierDict.groovy b/src/main/resources/scripts/dict/enum/emDeviceSupplierDict.groovy new file mode 100644 index 00000000..d7c4adb1 --- /dev/null +++ b/src/main/resources/scripts/dict/enum/emDeviceSupplierDict.groovy @@ -0,0 +1,17 @@ + +package scripts.dict + +import cn.lihongjie.coal.base.dto.CommonQuery +import cn.lihongjie.coal.emDeviceSupplier.controller.EmDeviceSupplierController +import org.springframework.context.ApplicationContext + +ApplicationContext ioc = ioc + +def controller = ioc.getBean(EmDeviceSupplierController.class) + + + + +return controller.list(new CommonQuery()) + +