diff --git a/src/main/java/cn/lihongjie/coal/dataCollectorLog/controller/DataCollectorLogController.java b/src/main/java/cn/lihongjie/coal/dataCollectorLog/controller/DataCollectorLogController.java new file mode 100644 index 00000000..d2146567 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollectorLog/controller/DataCollectorLogController.java @@ -0,0 +1,54 @@ +package cn.lihongjie.coal.dataCollectorLog.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.dataCollectorLog.dto.CreateDataCollectorLogDto; +import cn.lihongjie.coal.dataCollectorLog.dto.DataCollectorLogDto; +import cn.lihongjie.coal.dataCollectorLog.dto.UpdateDataCollectorLogDto; +import cn.lihongjie.coal.dataCollectorLog.service.DataCollectorLogService; + +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("/dataCollectorLog") +@SysLog(module = "数据采集器日志") +@Slf4j +@OrgScope +public class DataCollectorLogController { + @Autowired private DataCollectorLogService service; + + @PostMapping("/create") + public DataCollectorLogDto create(@RequestBody CreateDataCollectorLogDto request) { + return this.service.create(request); + } + + @PostMapping("/update") + public DataCollectorLogDto update(@RequestBody UpdateDataCollectorLogDto request) { + return this.service.update(request); + } + + @PostMapping("/delete") + public Object delete(@RequestBody IdRequest request) { + this.service.delete(request); + return true; + } + + @PostMapping("/getById") + public DataCollectorLogDto 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/dataCollectorLog/dto/CreateDataCollectorLogDto.java b/src/main/java/cn/lihongjie/coal/dataCollectorLog/dto/CreateDataCollectorLogDto.java new file mode 100644 index 00000000..e4e270bf --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollectorLog/dto/CreateDataCollectorLogDto.java @@ -0,0 +1,26 @@ +package cn.lihongjie.coal.dataCollectorLog.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import jakarta.persistence.ManyToOne; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +@Data +public class CreateDataCollectorLogDto extends OrgCommonDto { + + @ManyToOne + private String dataCollector; + + @Comment("日志类型") + private String type; + + @Comment("日志内容") + private String content; + + + @Comment("日志时间") + private java.time.LocalDateTime logTime; +} diff --git a/src/main/java/cn/lihongjie/coal/dataCollectorLog/dto/DataCollectorLogDto.java b/src/main/java/cn/lihongjie/coal/dataCollectorLog/dto/DataCollectorLogDto.java new file mode 100644 index 00000000..ed35e3c7 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollectorLog/dto/DataCollectorLogDto.java @@ -0,0 +1,28 @@ +package cn.lihongjie.coal.dataCollectorLog.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.dataCollector.dto.DataCollectorDto; + +import jakarta.persistence.ManyToOne; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +@Data +public class DataCollectorLogDto extends OrgCommonDto { + + @ManyToOne + private DataCollectorDto dataCollector; + + @Comment("日志类型") + private String type; + + @Comment("日志内容") + private String content; + + + @Comment("日志时间") + private java.time.LocalDateTime logTime; + +} diff --git a/src/main/java/cn/lihongjie/coal/dataCollectorLog/dto/UpdateDataCollectorLogDto.java b/src/main/java/cn/lihongjie/coal/dataCollectorLog/dto/UpdateDataCollectorLogDto.java new file mode 100644 index 00000000..350a8a7b --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollectorLog/dto/UpdateDataCollectorLogDto.java @@ -0,0 +1,26 @@ +package cn.lihongjie.coal.dataCollectorLog.dto; + +import cn.lihongjie.coal.base.dto.OrgCommonDto; + +import jakarta.persistence.ManyToOne; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +@Data +public class UpdateDataCollectorLogDto extends OrgCommonDto { + + @ManyToOne + private String dataCollector; + + @Comment("日志类型") + private String type; + + @Comment("日志内容") + private String content; + + + @Comment("日志时间") + private java.time.LocalDateTime logTime; +} diff --git a/src/main/java/cn/lihongjie/coal/dataCollectorLog/entity/DataCollectorLogEntity.java b/src/main/java/cn/lihongjie/coal/dataCollectorLog/entity/DataCollectorLogEntity.java new file mode 100644 index 00000000..f85f49c4 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollectorLog/entity/DataCollectorLogEntity.java @@ -0,0 +1,30 @@ +package cn.lihongjie.coal.dataCollectorLog.entity; + +import cn.lihongjie.coal.base.entity.OrgCommonEntity; + +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +@Data +@Entity +public class DataCollectorLogEntity extends OrgCommonEntity { + + + @ManyToOne + private cn.lihongjie.coal.dataCollector.entity.DataCollectorEntity dataCollector; + + @Comment("日志类型") + private String type; + + @Comment("日志内容") + private String content; + + + @Comment("日志时间") + private java.time.LocalDateTime logTime; + +} diff --git a/src/main/java/cn/lihongjie/coal/dataCollectorLog/mapper/DataCollectorLogMapper.java b/src/main/java/cn/lihongjie/coal/dataCollectorLog/mapper/DataCollectorLogMapper.java new file mode 100644 index 00000000..c75f6c9d --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollectorLog/mapper/DataCollectorLogMapper.java @@ -0,0 +1,23 @@ +package cn.lihongjie.coal.dataCollectorLog.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.dataCollectorLog.dto.CreateDataCollectorLogDto; +import cn.lihongjie.coal.dataCollectorLog.dto.DataCollectorLogDto; +import cn.lihongjie.coal.dataCollectorLog.dto.UpdateDataCollectorLogDto; +import cn.lihongjie.coal.dataCollectorLog.entity.DataCollectorLogEntity; + +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 DataCollectorLogMapper + extends BaseMapper< + DataCollectorLogEntity, + DataCollectorLogDto, + CreateDataCollectorLogDto, + UpdateDataCollectorLogDto> {} diff --git a/src/main/java/cn/lihongjie/coal/dataCollectorLog/repository/DataCollectorLogRepository.java b/src/main/java/cn/lihongjie/coal/dataCollectorLog/repository/DataCollectorLogRepository.java new file mode 100644 index 00000000..2745a4bf --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollectorLog/repository/DataCollectorLogRepository.java @@ -0,0 +1,9 @@ +package cn.lihongjie.coal.dataCollectorLog.repository; + +import cn.lihongjie.coal.base.dao.BaseRepository; +import cn.lihongjie.coal.dataCollectorLog.entity.DataCollectorLogEntity; + +import org.springframework.stereotype.Repository; + +@Repository +public interface DataCollectorLogRepository extends BaseRepository {} diff --git a/src/main/java/cn/lihongjie/coal/dataCollectorLog/service/DataCollectorLogService.java b/src/main/java/cn/lihongjie/coal/dataCollectorLog/service/DataCollectorLogService.java new file mode 100644 index 00000000..5e48c4c9 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollectorLog/service/DataCollectorLogService.java @@ -0,0 +1,74 @@ +package cn.lihongjie.coal.dataCollectorLog.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.dataCollectorLog.dto.CreateDataCollectorLogDto; +import cn.lihongjie.coal.dataCollectorLog.dto.DataCollectorLogDto; +import cn.lihongjie.coal.dataCollectorLog.dto.UpdateDataCollectorLogDto; +import cn.lihongjie.coal.dataCollectorLog.entity.DataCollectorLogEntity; +import cn.lihongjie.coal.dataCollectorLog.mapper.DataCollectorLogMapper; +import cn.lihongjie.coal.dataCollectorLog.repository.DataCollectorLogRepository; +import cn.lihongjie.coal.dbFunctions.DbFunctionService; + +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 DataCollectorLogService + extends BaseService { + @Autowired private DataCollectorLogRepository repository; + + @Autowired private DataCollectorLogMapper mapper; + + @Autowired private ConversionService conversionService; + + @Autowired private DbFunctionService dbFunctionService; + + public DataCollectorLogDto create(CreateDataCollectorLogDto request) { + DataCollectorLogEntity entity = mapper.toEntity(request); + + this.repository.save(entity); + return getById(entity.getId()); + } + + public DataCollectorLogDto update(UpdateDataCollectorLogDto request) { + DataCollectorLogEntity 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 DataCollectorLogDto getById(String id) { + DataCollectorLogEntity 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/dataCollectorLogDict.groovy b/src/main/resources/scripts/dict/enum/dataCollectorLogDict.groovy new file mode 100644 index 00000000..05730d2c --- /dev/null +++ b/src/main/resources/scripts/dict/enum/dataCollectorLogDict.groovy @@ -0,0 +1,17 @@ + +package scripts.dict + +import cn.lihongjie.coal.base.dto.CommonQuery +import cn.lihongjie.coal.dataCollectorLog.controller.DataCollectorLogController +import org.springframework.context.ApplicationContext + +ApplicationContext ioc = ioc + +def controller = ioc.getBean(DataCollectorLogController.class) + + + + +return controller.list(new CommonQuery()) + +