From 2a024341f0687a577f482e284b52800b668b750c Mon Sep 17 00:00:00 2001 From: beeajax <1105173470@qq.com> Date: Sat, 15 Jul 2023 22:55:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/docus/server/CodeGenerator.java | 2 +- .../SchCollectErrorLogController.java | 35 ++++---- .../SchCollectRecordController.java | 35 ++++---- .../SchCollectRecordRetryLogController.java | 39 +++++---- .../SchCollectorConfigController.java | 39 +++++---- .../controller/SchCollectorController.java | 39 +++++---- .../SchCollectorVersionController.java | 39 +++++---- .../SchCollectorVersionFileController.java | 39 +++++---- .../SchCollectorVersionLogController.java | 35 ++++---- .../controller/SchOperationLogController.java | 39 +++++---- .../controller/SchSystemParamsController.java | 39 +++++---- .../controller/SchTerminatorController.java | 39 +++++---- .../controller/SchVirtualLogController.java | 39 +++++---- .../convert/SchCollectErrorLogConvert.java | 26 ++++-- .../convert/SchCollectRecordConvert.java | 26 ++++-- .../SchCollectRecordRetryLogConvert.java | 26 ++++-- .../convert/SchCollectorConfigConvert.java | 26 ++++-- .../server/convert/SchCollectorConvert.java | 26 ++++-- .../convert/SchCollectorVersionConvert.java | 26 ++++-- .../SchCollectorVersionFileConvert.java | 26 ++++-- .../SchCollectorVersionLogConvert.java | 26 ++++-- .../convert/SchOperationLogConvert.java | 26 ++++-- .../convert/SchSystemParamsConvert.java | 26 ++++-- .../server/convert/SchTerminatorConvert.java | 26 ++++-- .../server/convert/SchVirtualLogConvert.java | 26 ++++-- .../dao/ISchCollectErrorLogDao.java | 14 ++-- .../dao/ISchCollectRecordDao.java | 14 ++-- .../dao/ISchCollectRecordRetryLogDao.java | 14 ++-- .../dao/ISchCollectorConfigDao.java | 14 ++-- .../infrastructure/dao/ISchCollectorDao.java | 14 ++-- .../dao/ISchCollectorVersionDao.java | 14 ++-- .../dao/ISchCollectorVersionFileDao.java | 14 ++-- .../dao/ISchCollectorVersionLogDao.java | 14 ++-- .../dao/ISchOperationLogDao.java | 14 ++-- .../dao/ISchSystemParamsDao.java | 14 ++-- .../infrastructure/dao/ISchTerminatorDao.java | 14 ++-- .../infrastructure/dao/ISchVirtualLogDao.java | 14 ++-- .../dao/impl/SchCollectErrorLogDaoImpl.java | 32 ++++---- .../dao/impl/SchCollectRecordDaoImpl.java | 32 ++++---- .../impl/SchCollectRecordRetryLogDaoImpl.java | 32 ++++---- .../dao/impl/SchCollectorConfigDaoImpl.java | 32 ++++---- .../dao/impl/SchCollectorDaoImpl.java | 32 ++++---- .../dao/impl/SchCollectorVersionDaoImpl.java | 32 ++++---- .../impl/SchCollectorVersionFileDaoImpl.java | 82 +++++++++---------- .../impl/SchCollectorVersionLogDaoImpl.java | 80 +++++++++--------- .../dao/impl/SchOperationLogDaoImpl.java | 32 ++++---- .../dao/impl/SchSystemParamsDaoImpl.java | 32 ++++---- .../dao/impl/SchTerminatorDaoImpl.java | 32 ++++---- .../dao/impl/SchVirtualLogDaoImpl.java | 32 ++++---- .../mapper/SchCollectErrorLogMapper.java | 2 +- .../mapper/SchCollectRecordMapper.java | 2 +- .../SchCollectRecordRetryLogMapper.java | 2 +- .../mapper/SchCollectorConfigMapper.java | 2 +- .../mapper/SchCollectorMapper.java | 2 +- .../mapper/SchCollectorVersionFileMapper.java | 2 +- .../mapper/SchCollectorVersionLogMapper.java | 2 +- .../mapper/SchCollectorVersionMapper.java | 2 +- .../mapper/SchOperationLogMapper.java | 2 +- .../mapper/SchSystemParamsMapper.java | 2 +- .../mapper/SchTerminatorMapper.java | 2 +- .../mapper/SchVirtualLogMapper.java | 2 +- .../service/ISchCollectErrorLogService.java | 30 ++++--- .../ISchCollectRecordRetryLogService.java | 30 ++++--- .../service/ISchCollectRecordService.java | 30 ++++--- .../service/ISchCollectorConfigService.java | 30 ++++--- .../server/service/ISchCollectorService.java | 30 ++++--- .../ISchCollectorVersionFileService.java | 30 ++++--- .../ISchCollectorVersionLogService.java | 30 ++++--- .../service/ISchCollectorVersionService.java | 30 ++++--- .../service/ISchOperationLogService.java | 30 ++++--- .../service/ISchSystemParamsService.java | 30 ++++--- .../server/service/ISchTerminatorService.java | 30 ++++--- .../server/service/ISchVirtualLogService.java | 28 +++---- .../impl/SchCollectErrorLogServiceImpl.java | 40 ++++----- .../SchCollectRecordRetryLogServiceImpl.java | 35 ++++---- .../impl/SchCollectRecordServiceImpl.java | 40 ++++----- .../impl/SchCollectorConfigServiceImpl.java | 35 ++++---- .../service/impl/SchCollectorServiceImpl.java | 40 ++++----- .../SchCollectorVersionFileServiceImpl.java | 40 ++++----- .../SchCollectorVersionLogServiceImpl.java | 40 ++++----- .../impl/SchCollectorVersionServiceImpl.java | 40 ++++----- .../impl/SchOperationLogServiceImpl.java | 40 ++++----- .../impl/SchSystemParamsServiceImpl.java | 40 ++++----- .../impl/SchTerminatorServiceImpl.java | 40 ++++----- .../impl/SchVirtualLogServiceImpl.java | 40 ++++----- .../SchCollectErrorLogApi.java | 40 ++++----- .../SchCollectRecordApi.java | 43 +++++----- .../SchCollectRecordRetryLogApi.java | 43 +++++----- .../SchCollectorApi.java | 43 +++++----- .../SchCollectorConfigApi.java | 43 +++++----- .../SchCollectorVersionApi.java | 43 +++++----- .../SchCollectorVersionFileApi.java | 43 +++++----- .../SchCollectorVersionLogApi.java | 43 +++++----- .../SchOperationLogApi.java | 43 +++++----- .../SchSystemParamsApi.java | 43 +++++----- .../SchTerminatorApi.java | 40 ++++----- .../SchVirtualLogApi.java | 43 +++++----- .../SchCollectorVersionFileDTO.java | 51 ------------ .../AddSchCollectErrorLogDTO.java | 62 ++++++++++++++ .../DeleteSchCollectErrorLogDTO.java | 28 +++++++ .../EditSchCollectErrorLogDTO.java} | 21 +++-- .../schcollector/AddSchCollectorDTO.java | 50 +++++++++++ .../schcollector/DeleteSchCollectorDTO.java | 28 +++++++ .../EditSchCollectorDTO.java} | 22 +++-- .../AddSchCollectorConfigDTO.java | 44 ++++++++++ .../DeleteSchCollectorConfigDTO.java | 28 +++++++ .../EditSchCollectorConfigDTO.java} | 21 +++-- .../AddSchCollectorVersionDTO.java | 41 ++++++++++ .../DeleteSchCollectorVersionDTO.java | 28 +++++++ .../EditSchCollectorVersionDTO.java} | 21 +++-- .../AddSchCollectorVersionFileDTO.java | 59 +++++++++++++ .../DeleteSchCollectorVersionFileDTO.java | 28 +++++++ .../EditSchCollectorVersionFileDTO.java | 59 +++++++++++++ .../AddSchCollectorVersionLogDTO.java} | 21 +++-- .../DeleteSchCollectorVersionLogDTO.java | 28 +++++++ .../EditSchCollectorVersionLogDTO.java | 56 +++++++++++++ .../AddSchCollectRecordDTO.java | 74 +++++++++++++++++ .../DeleteSchCollectRecordDTO.java | 28 +++++++ .../EditSchCollectRecordDTO.java} | 21 +++-- .../AddSchCollectRecordRetryLogDTO.java} | 22 +++-- .../DeleteSchCollectRecordRetryLogDTO.java | 28 +++++++ .../EditSchCollectRecordRetryLogDTO.java | 68 +++++++++++++++ .../AddSchOperationLogDTO.java | 50 +++++++++++ .../DeleteSchOperationLogDTO.java | 28 +++++++ .../EditSchOperationLogDTO.java} | 21 +++-- .../AddSchSystemParamsDTO.java | 59 +++++++++++++ .../DeleteSchSystemParamsDTO.java | 28 +++++++ .../EditSchSystemParamsDTO.java} | 21 +++-- .../schterminator/AddSchTerminatorDTO.java | 65 +++++++++++++++ .../schterminator/DeleteSchTerminatorDTO.java | 28 +++++++ .../EditSchTerminatorDTO.java} | 21 +++-- .../schvirtuallog/AddSchVirtualLogDTO.java | 59 +++++++++++++ .../schvirtuallog/DeleteSchVirtualLogDTO.java | 28 +++++++ .../EditSchVirtualLogDTO.java} | 21 +++-- .../SchCollectErrorLog.java | 7 +- .../SchCollectRecord.java | 7 +- .../SchCollectRecordRetryLog.java | 7 +- .../scheduling.management/SchCollector.java | 7 +- .../SchCollectorConfig.java | 7 +- .../SchCollectorVersion.java | 7 +- .../SchCollectorVersionFile.java | 9 +- .../SchCollectorVersionLog.java | 7 +- .../SchOperationLog.java | 7 +- .../SchSystemParams.java | 7 +- .../scheduling.management/SchTerminator.java | 7 +- .../scheduling.management/SchVirtualLog.java | 7 +- .../SchCollectErrorLogVO.java | 17 ++-- .../SchCollectRecordRetryLogVO.java | 18 ++-- .../SchCollectRecordVO.java | 17 ++-- .../SchCollectorConfigVO.java | 17 ++-- .../scheduling.management/SchCollectorVO.java | 18 ++-- .../SchCollectorVersionFileVO.java | 21 +++-- .../SchCollectorVersionLogVO.java | 17 ++-- .../SchCollectorVersionVO.java | 17 ++-- .../SchOperationLogVO.java | 17 ++-- .../SchSystemParamsVO.java | 17 ++-- .../SchTerminatorVO.java | 17 ++-- .../SchVirtualLogVO.java | 17 ++-- 158 files changed, 2875 insertions(+), 1569 deletions(-) delete mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionFileDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/AddSchCollectErrorLogDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/DeleteSchCollectErrorLogDTO.java rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchCollectErrorLogDTO.java => schcollecterrorlog/EditSchCollectErrorLogDTO.java} (75%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/AddSchCollectorDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/DeleteSchCollectorDTO.java rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchCollectorDTO.java => schcollector/EditSchCollectorDTO.java} (70%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/AddSchCollectorConfigDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/DeleteSchCollectorConfigDTO.java rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchCollectorConfigDTO.java => schcollectorconfig/EditSchCollectorConfigDTO.java} (65%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/AddSchCollectorVersionDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/DeleteSchCollectorVersionDTO.java rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchCollectorVersionDTO.java => schcollectorversion/EditSchCollectorVersionDTO.java} (60%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/AddSchCollectorVersionFileDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/DeleteSchCollectorVersionFileDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/EditSchCollectorVersionFileDTO.java rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchCollectorVersionLogDTO.java => schcollectorversionlog/AddSchCollectorVersionLogDTO.java} (69%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/DeleteSchCollectorVersionLogDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/EditSchCollectorVersionLogDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/AddSchCollectRecordDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/DeleteSchCollectRecordDTO.java rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchCollectRecordDTO.java => schcollectrecord/EditSchCollectRecordDTO.java} (81%) rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchCollectRecordRetryLogDTO.java => schcollectrecordretrylog/AddSchCollectRecordRetryLogDTO.java} (76%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/DeleteSchCollectRecordRetryLogDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/EditSchCollectRecordRetryLogDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/AddSchOperationLogDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/DeleteSchOperationLogDTO.java rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchOperationLogDTO.java => schoperationlog/EditSchOperationLogDTO.java} (69%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/AddSchSystemParamsDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/DeleteSchSystemParamsDTO.java rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchSystemParamsDTO.java => schsystemparams/EditSchSystemParamsDTO.java} (75%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/AddSchTerminatorDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/DeleteSchTerminatorDTO.java rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchTerminatorDTO.java => schterminator/EditSchTerminatorDTO.java} (80%) create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/AddSchVirtualLogDTO.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/DeleteSchVirtualLogDTO.java rename docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/{SchVirtualLogDTO.java => schvirtuallog/EditSchVirtualLogDTO.java} (76%) diff --git a/collector-scheduling-management/src/main/java/com/docus/server/CodeGenerator.java b/collector-scheduling-management/src/main/java/com/docus/server/CodeGenerator.java index b073bdd..d63d09c 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/CodeGenerator.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/CodeGenerator.java @@ -27,7 +27,7 @@ public class CodeGenerator { AutoGenerator defaultConfig = BaseCodeGenerator.getDefaultConfig(); defaultConfig.getGlobalConfig().setSwagger2(true); defaultConfig.getStrategy().setEntityLombokModel(true); - defaultConfig.getStrategy().setInclude("sch_collect_error_log","sch_collect_record","sch_collect_record_retry_log","sch_collector","sch_collector_config","sch_collector_version","sch_collector_version_file","sch_collector_version_log","sch_operation_log","sch_system_params","sch_terminator","sch_virtual_log");//需要生成的表，可指定多个，留空为全部生成 + defaultConfig.getStrategy().setInclude("sch_virtual_log", "sch_collect_error_log", "sch_collect_record", "sch_collect_record_retry_log", "sch_collector", "sch_collector_config", "sch_collector_version", "sch_collector_version_file", "sch_collector_version_log", "sch_operation_log", "sch_system_params", "sch_terminator");//需要生成的表，可指定多个，留空为全部生成 BaseCodeGenerator.generate(defaultConfig); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectErrorLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectErrorLogController.java index e5f785d..570114b 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectErrorLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectErrorLogController.java @@ -1,21 +1,22 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.api.scheduling.management.SchCollectErrorLogApi; -import com.docus.server.dto.scheduling.management.SchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.AddSchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.DeleteSchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO; import com.docus.server.service.ISchCollectErrorLogService; import com.docus.server.vo.scheduling.management.SchCollectErrorLogVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; /** * 采集器异常日志 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchCollectErrorLogController implements SchCollectErrorLogApi { @@ -34,46 +35,46 @@ public class SchCollectErrorLogController implements SchCollectErrorLogApi { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchCollectErrorLogService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchCollectErrorLogService.search(searchDTO); } /** * 新增 * - * @param schCollectErrorLogDTO 编辑参数 + * @param addSchCollectErrorLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectErrorLogDTO schCollectErrorLogDTO) { - return iSchCollectErrorLogService.add(schCollectErrorLogDTO); + public boolean add(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO) { + return iSchCollectErrorLogService.add(addSchCollectErrorLogDTO); } /** * 编辑 * - * @param schCollectErrorLogDTO 编辑参数 + * @param editSchCollectErrorLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectErrorLogDTO schCollectErrorLogDTO) { - return iSchCollectErrorLogService.edit(schCollectErrorLogDTO); + public boolean edit(EditSchCollectErrorLogDTO editSchCollectErrorLogDTO) { + return iSchCollectErrorLogService.edit(editSchCollectErrorLogDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectErrorLogDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectErrorLogService.delete(ids); + public int delete(DeleteSchCollectErrorLogDTO deleteSchCollectErrorLogDTO) { + return iSchCollectErrorLogService.delete(deleteSchCollectErrorLogDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java index 25c775d..da64462 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java @@ -1,21 +1,22 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.api.scheduling.management.SchCollectRecordApi; -import com.docus.server.dto.scheduling.management.SchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.DeleteSchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO; import com.docus.server.service.ISchCollectRecordService; import com.docus.server.vo.scheduling.management.SchCollectRecordVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; /** * 采集记录表 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchCollectRecordController implements SchCollectRecordApi { @@ -34,46 +35,46 @@ public class SchCollectRecordController implements SchCollectRecordApi { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchCollectRecordService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchCollectRecordService.search(searchDTO); } /** * 新增 * - * @param schCollectRecordDTO 编辑参数 + * @param addSchCollectRecordDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectRecordDTO schCollectRecordDTO) { - return iSchCollectRecordService.add(schCollectRecordDTO); + public boolean add(AddSchCollectRecordDTO addSchCollectRecordDTO) { + return iSchCollectRecordService.add(addSchCollectRecordDTO); } /** * 编辑 * - * @param schCollectRecordDTO 编辑参数 + * @param editSchCollectRecordDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectRecordDTO schCollectRecordDTO) { - return iSchCollectRecordService.edit(schCollectRecordDTO); + public boolean edit(EditSchCollectRecordDTO editSchCollectRecordDTO) { + return iSchCollectRecordService.edit(editSchCollectRecordDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectRecordDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectRecordService.delete(ids); + public int delete(DeleteSchCollectRecordDTO deleteSchCollectRecordDTO) { + return iSchCollectRecordService.delete(deleteSchCollectRecordDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordRetryLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordRetryLogController.java index 13314c5..c257f15 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordRetryLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordRetryLogController.java @@ -1,11 +1,14 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.AddSchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.EditSchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.DeleteSchCollectRecordRetryLogDTO; +import com.docus.server.vo.scheduling.management.SchCollectRecordRetryLogVO; +import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog; import com.docus.server.api.scheduling.management.SchCollectRecordRetryLogApi; -import com.docus.server.dto.scheduling.management.SchCollectRecordRetryLogDTO; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.service.ISchCollectRecordRetryLogService; -import com.docus.server.vo.scheduling.management.SchCollectRecordRetryLogVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -15,7 +18,7 @@ import java.util.List; * 采集记录表重试表 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchCollectRecordRetryLogController implements SchCollectRecordRetryLogApi { @@ -34,46 +37,46 @@ public class SchCollectRecordRetryLogController implements SchCollectRecordRetry } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchCollectRecordRetryLogService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchCollectRecordRetryLogService.search(searchDTO); } /** * 新增 * - * @param schCollectRecordRetryLogDTO 编辑参数 + * @param addSchCollectRecordRetryLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectRecordRetryLogDTO schCollectRecordRetryLogDTO) { - return iSchCollectRecordRetryLogService.add(schCollectRecordRetryLogDTO); + public boolean add(AddSchCollectRecordRetryLogDTO addSchCollectRecordRetryLogDTO) { + return iSchCollectRecordRetryLogService.add(addSchCollectRecordRetryLogDTO); } /** * 编辑 * - * @param schCollectRecordRetryLogDTO 编辑参数 + * @param editSchCollectRecordRetryLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectRecordRetryLogDTO schCollectRecordRetryLogDTO) { - return iSchCollectRecordRetryLogService.edit(schCollectRecordRetryLogDTO); + public boolean edit(EditSchCollectRecordRetryLogDTO editSchCollectRecordRetryLogDTO) { + return iSchCollectRecordRetryLogService.edit(editSchCollectRecordRetryLogDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectRecordRetryLogDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectRecordRetryLogService.delete(ids); + public int delete(DeleteSchCollectRecordRetryLogDTO deleteSchCollectRecordRetryLogDTO) { + return iSchCollectRecordRetryLogService.delete(deleteSchCollectRecordRetryLogDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorConfigController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorConfigController.java index 2a6b5a2..0567ac3 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorConfigController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorConfigController.java @@ -1,11 +1,14 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.scheduling.management.schcollectorconfig.AddSchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.EditSchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.DeleteSchCollectorConfigDTO; +import com.docus.server.vo.scheduling.management.SchCollectorConfigVO; +import com.docus.server.entity.scheduling.management.SchCollectorConfig; import com.docus.server.api.scheduling.management.SchCollectorConfigApi; -import com.docus.server.dto.scheduling.management.SchCollectorConfigDTO; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.service.ISchCollectorConfigService; -import com.docus.server.vo.scheduling.management.SchCollectorConfigVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -15,7 +18,7 @@ import java.util.List; * 采集器配置 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchCollectorConfigController implements SchCollectorConfigApi { @@ -34,46 +37,46 @@ public class SchCollectorConfigController implements SchCollectorConfigApi { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchCollectorConfigService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchCollectorConfigService.search(searchDTO); } /** * 新增 * - * @param schCollectorConfigDTO 编辑参数 + * @param addSchCollectorConfigDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectorConfigDTO schCollectorConfigDTO) { - return iSchCollectorConfigService.add(schCollectorConfigDTO); + public boolean add(AddSchCollectorConfigDTO addSchCollectorConfigDTO) { + return iSchCollectorConfigService.add(addSchCollectorConfigDTO); } /** * 编辑 * - * @param schCollectorConfigDTO 编辑参数 + * @param editSchCollectorConfigDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectorConfigDTO schCollectorConfigDTO) { - return iSchCollectorConfigService.edit(schCollectorConfigDTO); + public boolean edit(EditSchCollectorConfigDTO editSchCollectorConfigDTO) { + return iSchCollectorConfigService.edit(editSchCollectorConfigDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorConfigDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectorConfigService.delete(ids); + public int delete(DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO) { + return iSchCollectorConfigService.delete(deleteSchCollectorConfigDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java index bc8a1a7..3abc9ec 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java @@ -1,11 +1,14 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO; +import com.docus.server.vo.scheduling.management.SchCollectorVO; +import com.docus.server.entity.scheduling.management.SchCollector; import com.docus.server.api.scheduling.management.SchCollectorApi; -import com.docus.server.dto.scheduling.management.SchCollectorDTO; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.service.ISchCollectorService; -import com.docus.server.vo.scheduling.management.SchCollectorVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -15,7 +18,7 @@ import java.util.List; * 采集器管理 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchCollectorController implements SchCollectorApi { @@ -34,46 +37,46 @@ public class SchCollectorController implements SchCollectorApi { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchCollectorService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchCollectorService.search(searchDTO); } /** * 新增 * - * @param schCollectorDTO 编辑参数 + * @param addSchCollectorDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectorDTO schCollectorDTO) { - return iSchCollectorService.add(schCollectorDTO); + public boolean add(AddSchCollectorDTO addSchCollectorDTO) { + return iSchCollectorService.add(addSchCollectorDTO); } /** * 编辑 * - * @param schCollectorDTO 编辑参数 + * @param editSchCollectorDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectorDTO schCollectorDTO) { - return iSchCollectorService.edit(schCollectorDTO); + public boolean edit(EditSchCollectorDTO editSchCollectorDTO) { + return iSchCollectorService.edit(editSchCollectorDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectorService.delete(ids); + public int delete(DeleteSchCollectorDTO deleteSchCollectorDTO) { + return iSchCollectorService.delete(deleteSchCollectorDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionController.java index b251360..cecc239 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionController.java @@ -1,11 +1,14 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.scheduling.management.schcollectorversion.AddSchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.EditSchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.DeleteSchCollectorVersionDTO; +import com.docus.server.vo.scheduling.management.SchCollectorVersionVO; +import com.docus.server.entity.scheduling.management.SchCollectorVersion; import com.docus.server.api.scheduling.management.SchCollectorVersionApi; -import com.docus.server.dto.scheduling.management.SchCollectorVersionDTO; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.service.ISchCollectorVersionService; -import com.docus.server.vo.scheduling.management.SchCollectorVersionVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -15,7 +18,7 @@ import java.util.List; * 采集器版本列表管理 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchCollectorVersionController implements SchCollectorVersionApi { @@ -34,46 +37,46 @@ public class SchCollectorVersionController implements SchCollectorVersionApi { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchCollectorVersionService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchCollectorVersionService.search(searchDTO); } /** * 新增 * - * @param schCollectorVersionDTO 编辑参数 + * @param addSchCollectorVersionDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectorVersionDTO schCollectorVersionDTO) { - return iSchCollectorVersionService.add(schCollectorVersionDTO); + public boolean add(AddSchCollectorVersionDTO addSchCollectorVersionDTO) { + return iSchCollectorVersionService.add(addSchCollectorVersionDTO); } /** * 编辑 * - * @param schCollectorVersionDTO 编辑参数 + * @param editSchCollectorVersionDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectorVersionDTO schCollectorVersionDTO) { - return iSchCollectorVersionService.edit(schCollectorVersionDTO); + public boolean edit(EditSchCollectorVersionDTO editSchCollectorVersionDTO) { + return iSchCollectorVersionService.edit(editSchCollectorVersionDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectorVersionService.delete(ids); + public int delete(DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO) { + return iSchCollectorVersionService.delete(deleteSchCollectorVersionDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionFileController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionFileController.java index 5147028..dde1476 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionFileController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionFileController.java @@ -1,11 +1,14 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.AddSchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.EditSchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.DeleteSchCollectorVersionFileDTO; +import com.docus.server.vo.scheduling.management.SchCollectorVersionFileVO; +import com.docus.server.entity.scheduling.management.SchCollectorVersionFile; import com.docus.server.api.scheduling.management.SchCollectorVersionFileApi; -import com.docus.server.dto.scheduling.management.SchCollectorVersionFileDTO; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.service.ISchCollectorVersionFileService; -import com.docus.server.vo.scheduling.management.SchCollectorVersionFileVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -15,7 +18,7 @@ import java.util.List; * 采集器版本列表更新包管理 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchCollectorVersionFileController implements SchCollectorVersionFileApi { @@ -34,46 +37,46 @@ public class SchCollectorVersionFileController implements SchCollectorVersionFil } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchCollectorVersionFileService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchCollectorVersionFileService.search(searchDTO); } /** * 新增 * - * @param schCollectorVersionFileDTO 编辑参数 + * @param addSchCollectorVersionFileDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectorVersionFileDTO schCollectorVersionFileDTO) { - return iSchCollectorVersionFileService.add(schCollectorVersionFileDTO); + public boolean add(AddSchCollectorVersionFileDTO addSchCollectorVersionFileDTO) { + return iSchCollectorVersionFileService.add(addSchCollectorVersionFileDTO); } /** * 编辑 * - * @param schCollectorVersionFileDTO 编辑参数 + * @param editSchCollectorVersionFileDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectorVersionFileDTO schCollectorVersionFileDTO) { - return iSchCollectorVersionFileService.edit(schCollectorVersionFileDTO); + public boolean edit(EditSchCollectorVersionFileDTO editSchCollectorVersionFileDTO) { + return iSchCollectorVersionFileService.edit(editSchCollectorVersionFileDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionFileDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectorVersionFileService.delete(ids); + public int delete(DeleteSchCollectorVersionFileDTO deleteSchCollectorVersionFileDTO) { + return iSchCollectorVersionFileService.delete(deleteSchCollectorVersionFileDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionLogController.java index 7bc1a64..db505e8 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionLogController.java @@ -1,21 +1,22 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.api.scheduling.management.SchCollectorVersionLogApi; -import com.docus.server.dto.scheduling.management.SchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.AddSchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.DeleteSchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.EditSchCollectorVersionLogDTO; import com.docus.server.service.ISchCollectorVersionLogService; import com.docus.server.vo.scheduling.management.SchCollectorVersionLogVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; /** * 采集器版本更新日志管理 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchCollectorVersionLogController implements SchCollectorVersionLogApi { @@ -34,46 +35,46 @@ public class SchCollectorVersionLogController implements SchCollectorVersionLogA } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchCollectorVersionLogService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchCollectorVersionLogService.search(searchDTO); } /** * 新增 * - * @param schCollectorVersionLogDTO 编辑参数 + * @param addSchCollectorVersionLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectorVersionLogDTO schCollectorVersionLogDTO) { - return iSchCollectorVersionLogService.add(schCollectorVersionLogDTO); + public boolean add(AddSchCollectorVersionLogDTO addSchCollectorVersionLogDTO) { + return iSchCollectorVersionLogService.add(addSchCollectorVersionLogDTO); } /** * 编辑 * - * @param schCollectorVersionLogDTO 编辑参数 + * @param editSchCollectorVersionLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectorVersionLogDTO schCollectorVersionLogDTO) { - return iSchCollectorVersionLogService.edit(schCollectorVersionLogDTO); + public boolean edit(EditSchCollectorVersionLogDTO editSchCollectorVersionLogDTO) { + return iSchCollectorVersionLogService.edit(editSchCollectorVersionLogDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionLogDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectorVersionLogService.delete(ids); + public int delete(DeleteSchCollectorVersionLogDTO deleteSchCollectorVersionLogDTO) { + return iSchCollectorVersionLogService.delete(deleteSchCollectorVersionLogDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchOperationLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchOperationLogController.java index e44b884..5574afd 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchOperationLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchOperationLogController.java @@ -1,11 +1,14 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.scheduling.management.schoperationlog.AddSchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.EditSchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.DeleteSchOperationLogDTO; +import com.docus.server.vo.scheduling.management.SchOperationLogVO; +import com.docus.server.entity.scheduling.management.SchOperationLog; import com.docus.server.api.scheduling.management.SchOperationLogApi; -import com.docus.server.dto.scheduling.management.SchOperationLogDTO; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.service.ISchOperationLogService; -import com.docus.server.vo.scheduling.management.SchOperationLogVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -15,7 +18,7 @@ import java.util.List; * 采集调度器操作日志 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchOperationLogController implements SchOperationLogApi { @@ -34,46 +37,46 @@ public class SchOperationLogController implements SchOperationLogApi { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchOperationLogService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchOperationLogService.search(searchDTO); } /** * 新增 * - * @param schOperationLogDTO 编辑参数 + * @param addSchOperationLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchOperationLogDTO schOperationLogDTO) { - return iSchOperationLogService.add(schOperationLogDTO); + public boolean add(AddSchOperationLogDTO addSchOperationLogDTO) { + return iSchOperationLogService.add(addSchOperationLogDTO); } /** * 编辑 * - * @param schOperationLogDTO 编辑参数 + * @param editSchOperationLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchOperationLogDTO schOperationLogDTO) { - return iSchOperationLogService.edit(schOperationLogDTO); + public boolean edit(EditSchOperationLogDTO editSchOperationLogDTO) { + return iSchOperationLogService.edit(editSchOperationLogDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchOperationLogDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchOperationLogService.delete(ids); + public int delete(DeleteSchOperationLogDTO deleteSchOperationLogDTO) { + return iSchOperationLogService.delete(deleteSchOperationLogDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchSystemParamsController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchSystemParamsController.java index 0da1654..d3912d5 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchSystemParamsController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchSystemParamsController.java @@ -1,11 +1,14 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.scheduling.management.schsystemparams.AddSchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.EditSchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.DeleteSchSystemParamsDTO; +import com.docus.server.vo.scheduling.management.SchSystemParamsVO; +import com.docus.server.entity.scheduling.management.SchSystemParams; import com.docus.server.api.scheduling.management.SchSystemParamsApi; -import com.docus.server.dto.scheduling.management.SchSystemParamsDTO; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.service.ISchSystemParamsService; -import com.docus.server.vo.scheduling.management.SchSystemParamsVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -15,7 +18,7 @@ import java.util.List; * 系统参数表 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchSystemParamsController implements SchSystemParamsApi { @@ -34,46 +37,46 @@ public class SchSystemParamsController implements SchSystemParamsApi { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchSystemParamsService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchSystemParamsService.search(searchDTO); } /** * 新增 * - * @param schSystemParamsDTO 编辑参数 + * @param addSchSystemParamsDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchSystemParamsDTO schSystemParamsDTO) { - return iSchSystemParamsService.add(schSystemParamsDTO); + public boolean add(AddSchSystemParamsDTO addSchSystemParamsDTO) { + return iSchSystemParamsService.add(addSchSystemParamsDTO); } /** * 编辑 * - * @param schSystemParamsDTO 编辑参数 + * @param editSchSystemParamsDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchSystemParamsDTO schSystemParamsDTO) { - return iSchSystemParamsService.edit(schSystemParamsDTO); + public boolean edit(EditSchSystemParamsDTO editSchSystemParamsDTO) { + return iSchSystemParamsService.edit(editSchSystemParamsDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchSystemParamsDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchSystemParamsService.delete(ids); + public int delete(DeleteSchSystemParamsDTO deleteSchSystemParamsDTO) { + return iSchSystemParamsService.delete(deleteSchSystemParamsDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchTerminatorController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchTerminatorController.java index 15b5d80..252f7de 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchTerminatorController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchTerminatorController.java @@ -1,11 +1,14 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.scheduling.management.schterminator.AddSchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.EditSchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.DeleteSchTerminatorDTO; +import com.docus.server.vo.scheduling.management.SchTerminatorVO; +import com.docus.server.entity.scheduling.management.SchTerminator; import com.docus.server.api.scheduling.management.SchTerminatorApi; -import com.docus.server.dto.scheduling.management.SchTerminatorDTO; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.service.ISchTerminatorService; -import com.docus.server.vo.scheduling.management.SchTerminatorVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -15,7 +18,7 @@ import java.util.List; * 执行管理器 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchTerminatorController implements SchTerminatorApi { @@ -34,46 +37,46 @@ public class SchTerminatorController implements SchTerminatorApi { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchTerminatorService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchTerminatorService.search(searchDTO); } /** * 新增 * - * @param schTerminatorDTO 编辑参数 + * @param addSchTerminatorDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchTerminatorDTO schTerminatorDTO) { - return iSchTerminatorService.add(schTerminatorDTO); + public boolean add(AddSchTerminatorDTO addSchTerminatorDTO) { + return iSchTerminatorService.add(addSchTerminatorDTO); } /** * 编辑 * - * @param schTerminatorDTO 编辑参数 + * @param editSchTerminatorDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchTerminatorDTO schTerminatorDTO) { - return iSchTerminatorService.edit(schTerminatorDTO); + public boolean edit(EditSchTerminatorDTO editSchTerminatorDTO) { + return iSchTerminatorService.edit(editSchTerminatorDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchTerminatorDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchTerminatorService.delete(ids); + public int delete(DeleteSchTerminatorDTO deleteSchTerminatorDTO) { + return iSchTerminatorService.delete(deleteSchTerminatorDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchVirtualLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchVirtualLogController.java index 162119a..0a58d17 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchVirtualLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchVirtualLogController.java @@ -1,11 +1,14 @@ package com.docus.server.controller; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.scheduling.management.schvirtuallog.AddSchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.EditSchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.DeleteSchVirtualLogDTO; +import com.docus.server.vo.scheduling.management.SchVirtualLogVO; +import com.docus.server.entity.scheduling.management.SchVirtualLog; import com.docus.server.api.scheduling.management.SchVirtualLogApi; -import com.docus.server.dto.scheduling.management.SchVirtualLogDTO; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import com.docus.server.service.ISchVirtualLogService; -import com.docus.server.vo.scheduling.management.SchVirtualLogVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -15,7 +18,7 @@ import java.util.List; * 虚拟机使用情况 控制器类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @RestController public class SchVirtualLogController implements SchVirtualLogApi { @@ -34,46 +37,46 @@ public class SchVirtualLogController implements SchVirtualLogApi { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return iSchVirtualLogService.search(searchRequest); + public PageResult search(SearchDTO searchDTO) { + return iSchVirtualLogService.search(searchDTO); } /** * 新增 * - * @param schVirtualLogDTO 编辑参数 + * @param addSchVirtualLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchVirtualLogDTO schVirtualLogDTO) { - return iSchVirtualLogService.add(schVirtualLogDTO); + public boolean add(AddSchVirtualLogDTO addSchVirtualLogDTO) { + return iSchVirtualLogService.add(addSchVirtualLogDTO); } /** * 编辑 * - * @param schVirtualLogDTO 编辑参数 + * @param editSchVirtualLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchVirtualLogDTO schVirtualLogDTO) { - return iSchVirtualLogService.edit(schVirtualLogDTO); + public boolean edit(EditSchVirtualLogDTO editSchVirtualLogDTO) { + return iSchVirtualLogService.edit(editSchVirtualLogDTO); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchVirtualLogDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchVirtualLogService.delete(ids); + public int delete(DeleteSchVirtualLogDTO deleteSchVirtualLogDTO) { + return iSchVirtualLogService.delete(deleteSchVirtualLogDTO); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectErrorLogConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectErrorLogConvert.java index 34b613f..0c2f007 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectErrorLogConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectErrorLogConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectErrorLogDTO; import com.docus.server.entity.scheduling.management.SchCollectErrorLog; + import com.docus.server.dto.scheduling.management.schcollecterrorlog.AddSchCollectErrorLogDTO; + import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO; + import com.docus.server.dto.scheduling.management.schcollecterrorlog.DeleteSchCollectErrorLogDTO; import com.docus.server.vo.scheduling.management.SchCollectErrorLogVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 采集器异常日志 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器异常日志 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchCollectErrorLogConvert { SchCollectErrorLogConvert INSTANCE = Mappers.getMapper(SchCollectErrorLogConvert.class); @Mappings({}) - SchCollectErrorLog convertDO(SchCollectErrorLogDTO schCollectErrorLogDTO); + SchCollectErrorLog convertDO(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO); + + @Mappings({}) + SchCollectErrorLog convertDO(EditSchCollectErrorLogDTO editSchCollectErrorLogDTO); + + @Mappings({}) + List convertAddDOList(List addSchCollectErrorLogDTO); @Mappings({}) - List convertDO(List schCollectErrorLogDTOList); + List convertEditDOList(List editSchCollectErrorLogDTO); @Mappings({}) SchCollectErrorLogVO convertVO(SchCollectErrorLog schCollectErrorLog); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectRecordConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectRecordConvert.java index 2bc90a3..2e6112a 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectRecordConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectRecordConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectRecordDTO; import com.docus.server.entity.scheduling.management.SchCollectRecord; + import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollectRecordDTO; + import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO; + import com.docus.server.dto.scheduling.management.schcollectrecord.DeleteSchCollectRecordDTO; import com.docus.server.vo.scheduling.management.SchCollectRecordVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 采集记录表 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集记录表 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchCollectRecordConvert { SchCollectRecordConvert INSTANCE = Mappers.getMapper(SchCollectRecordConvert.class); @Mappings({}) - SchCollectRecord convertDO(SchCollectRecordDTO schCollectRecordDTO); + SchCollectRecord convertDO(AddSchCollectRecordDTO addSchCollectRecordDTO); + + @Mappings({}) + SchCollectRecord convertDO(EditSchCollectRecordDTO editSchCollectRecordDTO); + + @Mappings({}) + List convertAddDOList(List addSchCollectRecordDTO); @Mappings({}) - List convertDO(List schCollectRecordDTOList); + List convertEditDOList(List editSchCollectRecordDTO); @Mappings({}) SchCollectRecordVO convertVO(SchCollectRecord schCollectRecord); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectRecordRetryLogConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectRecordRetryLogConvert.java index 9dda327..c88885f 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectRecordRetryLogConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectRecordRetryLogConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectRecordRetryLogDTO; import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog; + import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.AddSchCollectRecordRetryLogDTO; + import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.EditSchCollectRecordRetryLogDTO; + import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.DeleteSchCollectRecordRetryLogDTO; import com.docus.server.vo.scheduling.management.SchCollectRecordRetryLogVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 采集记录表重试表 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集记录表重试表 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchCollectRecordRetryLogConvert { SchCollectRecordRetryLogConvert INSTANCE = Mappers.getMapper(SchCollectRecordRetryLogConvert.class); @Mappings({}) - SchCollectRecordRetryLog convertDO(SchCollectRecordRetryLogDTO schCollectRecordRetryLogDTO); + SchCollectRecordRetryLog convertDO(AddSchCollectRecordRetryLogDTO addSchCollectRecordRetryLogDTO); + + @Mappings({}) + SchCollectRecordRetryLog convertDO(EditSchCollectRecordRetryLogDTO editSchCollectRecordRetryLogDTO); + + @Mappings({}) + List convertAddDOList(List addSchCollectRecordRetryLogDTO); @Mappings({}) - List convertDO(List schCollectRecordRetryLogDTOList); + List convertEditDOList(List editSchCollectRecordRetryLogDTO); @Mappings({}) SchCollectRecordRetryLogVO convertVO(SchCollectRecordRetryLog schCollectRecordRetryLog); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorConfigConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorConfigConvert.java index f7f5e7f..87b916f 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorConfigConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorConfigConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorConfigDTO; import com.docus.server.entity.scheduling.management.SchCollectorConfig; + import com.docus.server.dto.scheduling.management.schcollectorconfig.AddSchCollectorConfigDTO; + import com.docus.server.dto.scheduling.management.schcollectorconfig.EditSchCollectorConfigDTO; + import com.docus.server.dto.scheduling.management.schcollectorconfig.DeleteSchCollectorConfigDTO; import com.docus.server.vo.scheduling.management.SchCollectorConfigVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 采集器配置 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器配置 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchCollectorConfigConvert { SchCollectorConfigConvert INSTANCE = Mappers.getMapper(SchCollectorConfigConvert.class); @Mappings({}) - SchCollectorConfig convertDO(SchCollectorConfigDTO schCollectorConfigDTO); + SchCollectorConfig convertDO(AddSchCollectorConfigDTO addSchCollectorConfigDTO); + + @Mappings({}) + SchCollectorConfig convertDO(EditSchCollectorConfigDTO editSchCollectorConfigDTO); + + @Mappings({}) + List convertAddDOList(List addSchCollectorConfigDTO); @Mappings({}) - List convertDO(List schCollectorConfigDTOList); + List convertEditDOList(List editSchCollectorConfigDTO); @Mappings({}) SchCollectorConfigVO convertVO(SchCollectorConfig schCollectorConfig); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorConvert.java index d82ccda..fdaa6a0 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorDTO; import com.docus.server.entity.scheduling.management.SchCollector; + import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDTO; + import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO; + import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO; import com.docus.server.vo.scheduling.management.SchCollectorVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 采集器管理 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器管理 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchCollectorConvert { SchCollectorConvert INSTANCE = Mappers.getMapper(SchCollectorConvert.class); @Mappings({}) - SchCollector convertDO(SchCollectorDTO schCollectorDTO); + SchCollector convertDO(AddSchCollectorDTO addSchCollectorDTO); + + @Mappings({}) + SchCollector convertDO(EditSchCollectorDTO editSchCollectorDTO); + + @Mappings({}) + List convertAddDOList(List addSchCollectorDTO); @Mappings({}) - List convertDO(List schCollectorDTOList); + List convertEditDOList(List editSchCollectorDTO); @Mappings({}) SchCollectorVO convertVO(SchCollector schCollector); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionConvert.java index 4803be9..201ec7b 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorVersionDTO; import com.docus.server.entity.scheduling.management.SchCollectorVersion; + import com.docus.server.dto.scheduling.management.schcollectorversion.AddSchCollectorVersionDTO; + import com.docus.server.dto.scheduling.management.schcollectorversion.EditSchCollectorVersionDTO; + import com.docus.server.dto.scheduling.management.schcollectorversion.DeleteSchCollectorVersionDTO; import com.docus.server.vo.scheduling.management.SchCollectorVersionVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 采集器版本列表管理 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器版本列表管理 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchCollectorVersionConvert { SchCollectorVersionConvert INSTANCE = Mappers.getMapper(SchCollectorVersionConvert.class); @Mappings({}) - SchCollectorVersion convertDO(SchCollectorVersionDTO schCollectorVersionDTO); + SchCollectorVersion convertDO(AddSchCollectorVersionDTO addSchCollectorVersionDTO); + + @Mappings({}) + SchCollectorVersion convertDO(EditSchCollectorVersionDTO editSchCollectorVersionDTO); + + @Mappings({}) + List convertAddDOList(List addSchCollectorVersionDTO); @Mappings({}) - List convertDO(List schCollectorVersionDTOList); + List convertEditDOList(List editSchCollectorVersionDTO); @Mappings({}) SchCollectorVersionVO convertVO(SchCollectorVersion schCollectorVersion); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionFileConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionFileConvert.java index 8e26011..3587e91 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionFileConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionFileConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorVersionFileDTO; import com.docus.server.entity.scheduling.management.SchCollectorVersionFile; + import com.docus.server.dto.scheduling.management.schcollectorversionfile.AddSchCollectorVersionFileDTO; + import com.docus.server.dto.scheduling.management.schcollectorversionfile.EditSchCollectorVersionFileDTO; + import com.docus.server.dto.scheduling.management.schcollectorversionfile.DeleteSchCollectorVersionFileDTO; import com.docus.server.vo.scheduling.management.SchCollectorVersionFileVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 采集器版本列表更新包管理 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器版本列表更新包管理 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchCollectorVersionFileConvert { SchCollectorVersionFileConvert INSTANCE = Mappers.getMapper(SchCollectorVersionFileConvert.class); @Mappings({}) - SchCollectorVersionFile convertDO(SchCollectorVersionFileDTO schCollectorVersionFileDTO); + SchCollectorVersionFile convertDO(AddSchCollectorVersionFileDTO addSchCollectorVersionFileDTO); + + @Mappings({}) + SchCollectorVersionFile convertDO(EditSchCollectorVersionFileDTO editSchCollectorVersionFileDTO); + + @Mappings({}) + List convertAddDOList(List addSchCollectorVersionFileDTO); @Mappings({}) - List convertDO(List schCollectorVersionFileDTOList); + List convertEditDOList(List editSchCollectorVersionFileDTO); @Mappings({}) SchCollectorVersionFileVO convertVO(SchCollectorVersionFile schCollectorVersionFile); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionLogConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionLogConvert.java index 997e387..16b43da 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionLogConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchCollectorVersionLogConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorVersionLogDTO; import com.docus.server.entity.scheduling.management.SchCollectorVersionLog; + import com.docus.server.dto.scheduling.management.schcollectorversionlog.AddSchCollectorVersionLogDTO; + import com.docus.server.dto.scheduling.management.schcollectorversionlog.EditSchCollectorVersionLogDTO; + import com.docus.server.dto.scheduling.management.schcollectorversionlog.DeleteSchCollectorVersionLogDTO; import com.docus.server.vo.scheduling.management.SchCollectorVersionLogVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 采集器版本更新日志管理 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器版本更新日志管理 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchCollectorVersionLogConvert { SchCollectorVersionLogConvert INSTANCE = Mappers.getMapper(SchCollectorVersionLogConvert.class); @Mappings({}) - SchCollectorVersionLog convertDO(SchCollectorVersionLogDTO schCollectorVersionLogDTO); + SchCollectorVersionLog convertDO(AddSchCollectorVersionLogDTO addSchCollectorVersionLogDTO); + + @Mappings({}) + SchCollectorVersionLog convertDO(EditSchCollectorVersionLogDTO editSchCollectorVersionLogDTO); + + @Mappings({}) + List convertAddDOList(List addSchCollectorVersionLogDTO); @Mappings({}) - List convertDO(List schCollectorVersionLogDTOList); + List convertEditDOList(List editSchCollectorVersionLogDTO); @Mappings({}) SchCollectorVersionLogVO convertVO(SchCollectorVersionLog schCollectorVersionLog); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchOperationLogConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchOperationLogConvert.java index ba1ca5e..c263747 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchOperationLogConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchOperationLogConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchOperationLogDTO; import com.docus.server.entity.scheduling.management.SchOperationLog; + import com.docus.server.dto.scheduling.management.schoperationlog.AddSchOperationLogDTO; + import com.docus.server.dto.scheduling.management.schoperationlog.EditSchOperationLogDTO; + import com.docus.server.dto.scheduling.management.schoperationlog.DeleteSchOperationLogDTO; import com.docus.server.vo.scheduling.management.SchOperationLogVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 采集调度器操作日志 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集调度器操作日志 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchOperationLogConvert { SchOperationLogConvert INSTANCE = Mappers.getMapper(SchOperationLogConvert.class); @Mappings({}) - SchOperationLog convertDO(SchOperationLogDTO schOperationLogDTO); + SchOperationLog convertDO(AddSchOperationLogDTO addSchOperationLogDTO); + + @Mappings({}) + SchOperationLog convertDO(EditSchOperationLogDTO editSchOperationLogDTO); + + @Mappings({}) + List convertAddDOList(List addSchOperationLogDTO); @Mappings({}) - List convertDO(List schOperationLogDTOList); + List convertEditDOList(List editSchOperationLogDTO); @Mappings({}) SchOperationLogVO convertVO(SchOperationLog schOperationLog); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchSystemParamsConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchSystemParamsConvert.java index 18e3014..b858705 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchSystemParamsConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchSystemParamsConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchSystemParamsDTO; import com.docus.server.entity.scheduling.management.SchSystemParams; + import com.docus.server.dto.scheduling.management.schsystemparams.AddSchSystemParamsDTO; + import com.docus.server.dto.scheduling.management.schsystemparams.EditSchSystemParamsDTO; + import com.docus.server.dto.scheduling.management.schsystemparams.DeleteSchSystemParamsDTO; import com.docus.server.vo.scheduling.management.SchSystemParamsVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 系统参数表 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 系统参数表 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchSystemParamsConvert { SchSystemParamsConvert INSTANCE = Mappers.getMapper(SchSystemParamsConvert.class); @Mappings({}) - SchSystemParams convertDO(SchSystemParamsDTO schSystemParamsDTO); + SchSystemParams convertDO(AddSchSystemParamsDTO addSchSystemParamsDTO); + + @Mappings({}) + SchSystemParams convertDO(EditSchSystemParamsDTO editSchSystemParamsDTO); + + @Mappings({}) + List convertAddDOList(List addSchSystemParamsDTO); @Mappings({}) - List convertDO(List schSystemParamsDTOList); + List convertEditDOList(List editSchSystemParamsDTO); @Mappings({}) SchSystemParamsVO convertVO(SchSystemParams schSystemParams); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchTerminatorConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchTerminatorConvert.java index 2cfaf46..f21f231 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchTerminatorConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchTerminatorConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchTerminatorDTO; import com.docus.server.entity.scheduling.management.SchTerminator; + import com.docus.server.dto.scheduling.management.schterminator.AddSchTerminatorDTO; + import com.docus.server.dto.scheduling.management.schterminator.EditSchTerminatorDTO; + import com.docus.server.dto.scheduling.management.schterminator.DeleteSchTerminatorDTO; import com.docus.server.vo.scheduling.management.SchTerminatorVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 执行管理器 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 执行管理器 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchTerminatorConvert { SchTerminatorConvert INSTANCE = Mappers.getMapper(SchTerminatorConvert.class); @Mappings({}) - SchTerminator convertDO(SchTerminatorDTO schTerminatorDTO); + SchTerminator convertDO(AddSchTerminatorDTO addSchTerminatorDTO); + + @Mappings({}) + SchTerminator convertDO(EditSchTerminatorDTO editSchTerminatorDTO); + + @Mappings({}) + List convertAddDOList(List addSchTerminatorDTO); @Mappings({}) - List convertDO(List schTerminatorDTOList); + List convertEditDOList(List editSchTerminatorDTO); @Mappings({}) SchTerminatorVO convertVO(SchTerminator schTerminator); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchVirtualLogConvert.java b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchVirtualLogConvert.java index e42f4ab..1e30309 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/convert/SchVirtualLogConvert.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/convert/SchVirtualLogConvert.java @@ -1,9 +1,12 @@ package com.docus.server.convert; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchVirtualLogDTO; import com.docus.server.entity.scheduling.management.SchVirtualLog; + import com.docus.server.dto.scheduling.management.schvirtuallog.AddSchVirtualLogDTO; + import com.docus.server.dto.scheduling.management.schvirtuallog.EditSchVirtualLogDTO; + import com.docus.server.dto.scheduling.management.schvirtuallog.DeleteSchVirtualLogDTO; import com.docus.server.vo.scheduling.management.SchVirtualLogVO; + import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; @@ -11,21 +14,28 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 虚拟机使用情况 服务转换器 - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 虚拟机使用情况 服务转换器 +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Mapper public interface SchVirtualLogConvert { SchVirtualLogConvert INSTANCE = Mappers.getMapper(SchVirtualLogConvert.class); @Mappings({}) - SchVirtualLog convertDO(SchVirtualLogDTO schVirtualLogDTO); + SchVirtualLog convertDO(AddSchVirtualLogDTO addSchVirtualLogDTO); + + @Mappings({}) + SchVirtualLog convertDO(EditSchVirtualLogDTO editSchVirtualLogDTO); + + @Mappings({}) + List convertAddDOList(List addSchVirtualLogDTO); @Mappings({}) - List convertDO(List schVirtualLogDTOList); + List convertEditDOList(List editSchVirtualLogDTO); @Mappings({}) SchVirtualLogVO convertVO(SchVirtualLog schVirtualLog); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectErrorLogDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectErrorLogDao.java index 6f77188..4130f69 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectErrorLogDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectErrorLogDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchCollectErrorLog; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchCollectErrorLog; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 采集器异常日志 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectErrorLogDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchCollectErrorLogDao extends IBaseDao { * @param ids 主键ids * @return 成功或失败 */ - int delete(List ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectRecordDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectRecordDao.java index 040969b..2549887 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectRecordDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectRecordDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchCollectRecord; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchCollectRecord; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 采集记录表 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectRecordDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchCollectRecordDao extends IBaseDao { * @param ids 主键ids * @return 成功或失败 */ - int delete(List ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectRecordRetryLogDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectRecordRetryLogDao.java index 61f5526..92ca2d4 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectRecordRetryLogDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectRecordRetryLogDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 采集记录表重试表 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectRecordRetryLogDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchCollectRecordRetryLogDao extends IBaseDao ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorConfigDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorConfigDao.java index 552e8e6..ca092b1 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorConfigDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorConfigDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchCollectorConfig; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchCollectorConfig; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 采集器配置 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectorConfigDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchCollectorConfigDao extends IBaseDao { * @param ids 主键ids * @return 成功或失败 */ - int delete(List ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorDao.java index 9cc29b9..dbbbe67 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchCollector; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchCollector; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 采集器管理 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectorDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchCollectorDao extends IBaseDao { * @param ids 主键ids * @return 成功或失败 */ - int delete(List ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionDao.java index f5a051c..0863933 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchCollectorVersion; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchCollectorVersion; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 采集器版本列表管理 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectorVersionDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchCollectorVersionDao extends IBaseDao { * @param ids 主键ids * @return 成功或失败 */ - int delete(List ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionFileDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionFileDao.java index 39a94b0..fe49328 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionFileDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionFileDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchCollectorVersionFile; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchCollectorVersionFile; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 采集器版本列表更新包管理 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectorVersionFileDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchCollectorVersionFileDao extends IBaseDao ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionLogDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionLogDao.java index 2dc30b2..4b74ab1 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionLogDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchCollectorVersionLogDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchCollectorVersionLog; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchCollectorVersionLog; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 采集器版本更新日志管理 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectorVersionLogDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchCollectorVersionLogDao extends IBaseDao ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchOperationLogDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchOperationLogDao.java index 55bf19b..7a161ef 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchOperationLogDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchOperationLogDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchOperationLog; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchOperationLog; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 采集调度器操作日志 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchOperationLogDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchOperationLogDao extends IBaseDao { * @param ids 主键ids * @return 成功或失败 */ - int delete(List ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchSystemParamsDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchSystemParamsDao.java index c9c8ea3..38388cf 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchSystemParamsDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchSystemParamsDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchSystemParams; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchSystemParams; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 系统参数表 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchSystemParamsDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchSystemParamsDao extends IBaseDao { * @param ids 主键ids * @return 成功或失败 */ - int delete(List ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchTerminatorDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchTerminatorDao.java index ec4072f..cc6ffea 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchTerminatorDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchTerminatorDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchTerminator; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchTerminator; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 执行管理器 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchTerminatorDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchTerminatorDao extends IBaseDao { * @param ids 主键ids * @return 成功或失败 */ - int delete(List ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchVirtualLogDao.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchVirtualLogDao.java index 8da371f..bf65afb 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchVirtualLogDao.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/ISchVirtualLogDao.java @@ -1,9 +1,9 @@ package com.docus.server.infrastructure.dao; +import com.docus.server.entity.scheduling.management.SchVirtualLog; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.entity.scheduling.management.SchVirtualLog; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * 虚拟机使用情况 数据访问接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchVirtualLogDao extends IBaseDao { /** @@ -44,14 +44,14 @@ public interface ISchVirtualLogDao extends IBaseDao { * @param ids 主键ids * @return 成功或失败 */ - int delete(List ids); + int delete(List ids); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectErrorLogDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectErrorLogDaoImpl.java index 0a86aee..a6a50a7 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectErrorLogDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectErrorLogDaoImpl.java @@ -3,11 +3,11 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchCollectErrorLog; -import com.docus.server.infrastructure.dao.ISchCollectErrorLogDao; import com.docus.server.infrastructure.mapper.SchCollectErrorLogMapper; +import com.docus.server.infrastructure.dao.ISchCollectErrorLogDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.List; * 采集器异常日志 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchCollectErrorLogDaoImpl extends BaseDaoImpl implements ISchCollectErrorLogDao { @@ -63,36 +63,36 @@ public class SchCollectErrorLogDaoImpl extends BaseDaoImpl ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchCollectErrorLog::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchCollectErrorLog::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchCollectErrorLog::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchCollectErrorLog::getxxx, searchRequest. getKeyword()); + //query. like(SchCollectErrorLog::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchCollectErrorLog::getxx1, searchRequest. getKeyword()) - // оr(). like(SchCollectErrorLog::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchCollectErrorLog::getxx1, searchDTO.getKeyword()) + // оr(). like(SchCollectErrorLog::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectRecordDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectRecordDaoImpl.java index d9f8ffd..27b004b 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectRecordDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectRecordDaoImpl.java @@ -3,11 +3,11 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchCollectRecord; -import com.docus.server.infrastructure.dao.ISchCollectRecordDao; import com.docus.server.infrastructure.mapper.SchCollectRecordMapper; +import com.docus.server.infrastructure.dao.ISchCollectRecordDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.List; * 采集记录表 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchCollectRecordDaoImpl extends BaseDaoImpl implements ISchCollectRecordDao { @@ -63,36 +63,36 @@ public class SchCollectRecordDaoImpl extends BaseDaoImpl ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchCollectRecord::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchCollectRecord::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchCollectRecord::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchCollectRecord::getxxx, searchRequest. getKeyword()); + //query. like(SchCollectRecord::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchCollectRecord::getxx1, searchRequest. getKeyword()) - // оr(). like(SchCollectRecord::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchCollectRecord::getxx1, searchDTO.getKeyword()) + // оr(). like(SchCollectRecord::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectRecordRetryLogDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectRecordRetryLogDaoImpl.java index d4ff55a..9707146 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectRecordRetryLogDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectRecordRetryLogDaoImpl.java @@ -3,11 +3,11 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog; -import com.docus.server.infrastructure.dao.ISchCollectRecordRetryLogDao; import com.docus.server.infrastructure.mapper.SchCollectRecordRetryLogMapper; +import com.docus.server.infrastructure.dao.ISchCollectRecordRetryLogDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.List; * 采集记录表重试表 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchCollectRecordRetryLogDaoImpl extends BaseDaoImpl implements ISchCollectRecordRetryLogDao { @@ -63,36 +63,36 @@ public class SchCollectRecordRetryLogDaoImpl extends BaseDaoImpl ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchCollectRecordRetryLog::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchCollectRecordRetryLog::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchCollectRecordRetryLog::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchCollectRecordRetryLog::getxxx, searchRequest. getKeyword()); + //query. like(SchCollectRecordRetryLog::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchCollectRecordRetryLog::getxx1, searchRequest. getKeyword()) - // оr(). like(SchCollectRecordRetryLog::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchCollectRecordRetryLog::getxx1, searchDTO.getKeyword()) + // оr(). like(SchCollectRecordRetryLog::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorConfigDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorConfigDaoImpl.java index f1d62bf..1054f46 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorConfigDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorConfigDaoImpl.java @@ -3,11 +3,11 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchCollectorConfig; -import com.docus.server.infrastructure.dao.ISchCollectorConfigDao; import com.docus.server.infrastructure.mapper.SchCollectorConfigMapper; +import com.docus.server.infrastructure.dao.ISchCollectorConfigDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.List; * 采集器配置 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchCollectorConfigDaoImpl extends BaseDaoImpl implements ISchCollectorConfigDao { @@ -63,36 +63,36 @@ public class SchCollectorConfigDaoImpl extends BaseDaoImpl ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchCollectorConfig::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchCollectorConfig::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchCollectorConfig::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchCollectorConfig::getxxx, searchRequest. getKeyword()); + //query. like(SchCollectorConfig::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchCollectorConfig::getxx1, searchRequest. getKeyword()) - // оr(). like(SchCollectorConfig::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchCollectorConfig::getxx1, searchDTO.getKeyword()) + // оr(). like(SchCollectorConfig::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorDaoImpl.java index 54b4da2..15d6ec7 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorDaoImpl.java @@ -3,11 +3,11 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchCollector; -import com.docus.server.infrastructure.dao.ISchCollectorDao; import com.docus.server.infrastructure.mapper.SchCollectorMapper; +import com.docus.server.infrastructure.dao.ISchCollectorDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.List; * 采集器管理 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchCollectorDaoImpl extends BaseDaoImpl implements ISchCollectorDao { @@ -63,36 +63,36 @@ public class SchCollectorDaoImpl extends BaseDaoImpl ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchCollector::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchCollector::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchCollector::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchCollector::getxxx, searchRequest. getKeyword()); + //query. like(SchCollector::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchCollector::getxx1, searchRequest. getKeyword()) - // оr(). like(SchCollector::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchCollector::getxx1, searchDTO.getKeyword()) + // оr(). like(SchCollector::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionDaoImpl.java index 7f2b915..44da822 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionDaoImpl.java @@ -3,11 +3,11 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchCollectorVersion; -import com.docus.server.infrastructure.dao.ISchCollectorVersionDao; import com.docus.server.infrastructure.mapper.SchCollectorVersionMapper; +import com.docus.server.infrastructure.dao.ISchCollectorVersionDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.List; * 采集器版本列表管理 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchCollectorVersionDaoImpl extends BaseDaoImpl implements ISchCollectorVersionDao { @@ -63,36 +63,36 @@ public class SchCollectorVersionDaoImpl extends BaseDaoImpl ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchCollectorVersion::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchCollectorVersion::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchCollectorVersion::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchCollectorVersion::getxxx, searchRequest. getKeyword()); + //query. like(SchCollectorVersion::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchCollectorVersion::getxx1, searchRequest. getKeyword()) - // оr(). like(SchCollectorVersion::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchCollectorVersion::getxx1, searchDTO.getKeyword()) + // оr(). like(SchCollectorVersion::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionFileDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionFileDaoImpl.java index 0b8e690..141808b 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionFileDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionFileDaoImpl.java @@ -3,96 +3,90 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchCollectorVersionFile; -import com.docus.server.infrastructure.dao.ISchCollectorVersionFileDao; import com.docus.server.infrastructure.mapper.SchCollectorVersionFileMapper; +import com.docus.server.infrastructure.dao.ISchCollectorVersionFileDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; - import java.util.Date; import java.util.List; - /** + * * 采集器版本列表更新包管理 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchCollectorVersionFileDaoImpl extends BaseDaoImpl implements ISchCollectorVersionFileDao { /** - * 按主键查询 - * - * @param id 主键Id - * @return 实体 - */ + *按主键查询 + * @param id 主键Id + * @return 实体 + */ @Override public SchCollectorVersionFile findById(String id) { return super.findById(id); } /** - * 新增 - * - * @param schCollectorVersionFile 编辑参数 - * @return 成功或失败 - */ + * 新增 + * @param schCollectorVersionFile 编辑参数 + * @return 成功或失败 + */ @Override - public boolean add(SchCollectorVersionFile schCollectorVersionFile) { + public boolean add(SchCollectorVersionFile schCollectorVersionFile) { return super.save(schCollectorVersionFile); } /** - * 编辑 - * - * @param schCollectorVersionFile 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * @param schCollectorVersionFile 编辑参数 + * @return 成功或失败 + */ @Override - public boolean edit(SchCollectorVersionFile schCollectorVersionFile) { + public boolean edit(SchCollectorVersionFile schCollectorVersionFile) { return super.updateById(schCollectorVersionFile); } /** - * 批量删除 - * - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ @Override - public int delete(List ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 - * - * @param searchRequest 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); - LambdaQueryWrapper query = Wrappers.lambdaQuery(); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchCollectorVersionFile::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchCollectorVersionFile::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchCollectorVersionFile::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchCollectorVersionFile::getxxx, searchRequest. getKeyword()); + //query. like(SchCollectorVersionFile::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchCollectorVersionFile::getxx1, searchRequest. getKeyword()) - // оr(). like(SchCollectorVersionFile::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchCollectorVersionFile::getxx1, searchDTO.getKeyword()) + // оr(). like(SchCollectorVersionFile::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionLogDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionLogDaoImpl.java index e94c86a..6f2a135 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionLogDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchCollectorVersionLogDaoImpl.java @@ -3,90 +3,96 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchCollectorVersionLog; import com.docus.server.infrastructure.mapper.SchCollectorVersionLogMapper; import com.docus.server.infrastructure.dao.ISchCollectorVersionLogDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; + import java.util.Date; import java.util.List; + /** - * * 采集器版本更新日志管理 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchCollectorVersionLogDaoImpl extends BaseDaoImpl implements ISchCollectorVersionLogDao { /** - *按主键查询 - * @param id 主键Id - * @return 实体 - */ + * 按主键查询 + * + * @param id 主键Id + * @return 实体 + */ @Override public SchCollectorVersionLog findById(String id) { return super.findById(id); } /** - * 新增 - * @param schCollectorVersionLog 编辑参数 - * @return 成功或失败 - */ + * 新增 + * + * @param schCollectorVersionLog 编辑参数 + * @return 成功或失败 + */ @Override - public boolean add(SchCollectorVersionLog schCollectorVersionLog) { + public boolean add(SchCollectorVersionLog schCollectorVersionLog) { return super.save(schCollectorVersionLog); } /** - * 编辑 - * @param schCollectorVersionLog 编辑参数 - * @return 成功或失败 - */ + * 编辑 + * + * @param schCollectorVersionLog 编辑参数 + * @return 成功或失败 + */ @Override - public boolean edit(SchCollectorVersionLog schCollectorVersionLog) { + public boolean edit(SchCollectorVersionLog schCollectorVersionLog) { return super.updateById(schCollectorVersionLog); } /** - * 批量删除 - * @param ids 主键ids - * @return 成功或失败 - */ + * 批量删除 + * + * @param ids 主键ids + * @return 成功或失败 + */ @Override - public int delete(List ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 - * @param searchRequest 搜索参数 - * @return 分页列表 - */ + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); - LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchCollectorVersionLog::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchCollectorVersionLog::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest. getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchCollectorVersionLog::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchCollectorVersionLog::getxxx, searchRequest. getKeyword()); + //query. like(SchCollectorVersionLog::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchCollectorVersionLog::getxx1, searchRequest. getKeyword()) - // оr(). like(SchCollectorVersionLog::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchCollectorVersionLog::getxx1, searchDTO.getKeyword()) + // оr(). like(SchCollectorVersionLog::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchOperationLogDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchOperationLogDaoImpl.java index 4ea18f9..1eaf45e 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchOperationLogDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchOperationLogDaoImpl.java @@ -3,11 +3,11 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchOperationLog; -import com.docus.server.infrastructure.dao.ISchOperationLogDao; import com.docus.server.infrastructure.mapper.SchOperationLogMapper; +import com.docus.server.infrastructure.dao.ISchOperationLogDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.List; * 采集调度器操作日志 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchOperationLogDaoImpl extends BaseDaoImpl implements ISchOperationLogDao { @@ -63,36 +63,36 @@ public class SchOperationLogDaoImpl extends BaseDaoImpl ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchOperationLog::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchOperationLog::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchOperationLog::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchOperationLog::getxxx, searchRequest. getKeyword()); + //query. like(SchOperationLog::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchOperationLog::getxx1, searchRequest. getKeyword()) - // оr(). like(SchOperationLog::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchOperationLog::getxx1, searchDTO.getKeyword()) + // оr(). like(SchOperationLog::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchSystemParamsDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchSystemParamsDaoImpl.java index 53effec..b38bbe6 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchSystemParamsDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchSystemParamsDaoImpl.java @@ -3,11 +3,11 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchSystemParams; -import com.docus.server.infrastructure.dao.ISchSystemParamsDao; import com.docus.server.infrastructure.mapper.SchSystemParamsMapper; +import com.docus.server.infrastructure.dao.ISchSystemParamsDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.List; * 系统参数表 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchSystemParamsDaoImpl extends BaseDaoImpl implements ISchSystemParamsDao { @@ -63,36 +63,36 @@ public class SchSystemParamsDaoImpl extends BaseDaoImpl ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchSystemParams::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchSystemParams::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchSystemParams::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchSystemParams::getxxx, searchRequest. getKeyword()); + //query. like(SchSystemParams::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchSystemParams::getxx1, searchRequest. getKeyword()) - // оr(). like(SchSystemParams::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchSystemParams::getxx1, searchDTO.getKeyword()) + // оr(). like(SchSystemParams::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchTerminatorDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchTerminatorDaoImpl.java index 32a7e5d..efa8a5d 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchTerminatorDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchTerminatorDaoImpl.java @@ -3,11 +3,11 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchTerminator; -import com.docus.server.infrastructure.dao.ISchTerminatorDao; import com.docus.server.infrastructure.mapper.SchTerminatorMapper; +import com.docus.server.infrastructure.dao.ISchTerminatorDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.List; * 执行管理器 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchTerminatorDaoImpl extends BaseDaoImpl implements ISchTerminatorDao { @@ -63,36 +63,36 @@ public class SchTerminatorDaoImpl extends BaseDaoImpl ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchTerminator::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchTerminator::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchTerminator::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchTerminator::getxxx, searchRequest. getKeyword()); + //query. like(SchTerminator::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchTerminator::getxx1, searchRequest. getKeyword()) - // оr(). like(SchTerminator::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchTerminator::getxx1, searchDTO.getKeyword()) + // оr(). like(SchTerminator::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchVirtualLogDaoImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchVirtualLogDaoImpl.java index 24e8960..f411408 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchVirtualLogDaoImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/dao/impl/SchVirtualLogDaoImpl.java @@ -3,11 +3,11 @@ package com.docus.server.infrastructure.dao.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.scheduling.management.SchVirtualLog; -import com.docus.server.infrastructure.dao.ISchVirtualLogDao; import com.docus.server.infrastructure.mapper.SchVirtualLogMapper; +import com.docus.server.infrastructure.dao.ISchVirtualLogDao; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Repository; @@ -18,7 +18,7 @@ import java.util.List; * 虚拟机使用情况 数据访问实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Repository public class SchVirtualLogDaoImpl extends BaseDaoImpl implements ISchVirtualLogDao { @@ -63,36 +63,36 @@ public class SchVirtualLogDaoImpl extends BaseDaoImpl ids) { + public int delete(List ids) { return super.deleteByIds(ids); } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { + public PageResult search(SearchDTO searchDTO) { //分页 - PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize()); + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); LambdaQueryWrapper query = Wrappers.lambdaQuery(); //时间范围，默认按createTime - if (searchRequest.getBeginTime() != null) { - query.ge(SchVirtualLog::getCreateTime, searchRequest.getBeginTime()); + if (searchDTO.getBeginTime() != null) { + query.ge(SchVirtualLog::getCreateTime, searchDTO.getBeginTime()); } - if (searchRequest.getEndTime() != null) { - Date endTime = searchRequest.getEndTime(); + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); query.le(SchVirtualLog::getCreateTime, endTime); } //关键字比较，多个列or - //if (!StringUtils.isEmpty(searchRequest.getKeyword())) { + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { //单个列用like - //query. like(SchVirtualLog::getxxx, searchRequest. getKeyword()); + //query. like(SchVirtualLog::getxxx, searchDTO.getKeyword()); //多个列用like - //query. and(sub -> sub.like(SchVirtualLog::getxx1, searchRequest. getKeyword()) - // оr(). like(SchVirtualLog::getXX2, searchRequest. getKeyword())) + //query. and(sub -> sub.like(SchVirtualLog::getxx1, searchDTO.getKeyword()) + // оr(). like(SchVirtualLog::getXX2, searchDTO.getKeyword())) //); //} //默认createTime倒序排序 diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectErrorLogMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectErrorLogMapper.java index 5473b8e..edae3c3 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectErrorLogMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectErrorLogMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 采集器异常日志 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchCollectErrorLogMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectRecordMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectRecordMapper.java index 54a9e55..6ffdc55 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectRecordMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectRecordMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 采集记录表 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchCollectRecordMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectRecordRetryLogMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectRecordRetryLogMapper.java index 1b8d982..9759a7d 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectRecordRetryLogMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectRecordRetryLogMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 采集记录表重试表 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchCollectRecordRetryLogMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorConfigMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorConfigMapper.java index c853678..70ffe03 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorConfigMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorConfigMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 采集器配置 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchCollectorConfigMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorMapper.java index ab6699c..f23ff29 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 采集器管理 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchCollectorMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionFileMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionFileMapper.java index cdd46b9..eabc60e 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionFileMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionFileMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 采集器版本列表更新包管理 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchCollectorVersionFileMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionLogMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionLogMapper.java index d6ecf83..55c8ca1 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionLogMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionLogMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 采集器版本更新日志管理 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchCollectorVersionLogMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionMapper.java index 3a2b902..452219e 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchCollectorVersionMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 采集器版本列表管理 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchCollectorVersionMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchOperationLogMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchOperationLogMapper.java index d691281..97ef0f1 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchOperationLogMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchOperationLogMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 采集调度器操作日志 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchOperationLogMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchSystemParamsMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchSystemParamsMapper.java index 072e1e4..7305c16 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchSystemParamsMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchSystemParamsMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 系统参数表 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchSystemParamsMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchTerminatorMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchTerminatorMapper.java index baecd75..910a074 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchTerminatorMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchTerminatorMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 执行管理器 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchTerminatorMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchVirtualLogMapper.java b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchVirtualLogMapper.java index 633893f..168b239 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchVirtualLogMapper.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/infrastructure/mapper/SchVirtualLogMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Mapper; * 虚拟机使用情况 Mapper 接口 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Mapper public interface SchVirtualLogMapper extends BaseMapper { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectErrorLogService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectErrorLogService.java index b5f33b9..b39963d 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectErrorLogService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectErrorLogService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.AddSchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.DeleteSchCollectErrorLogDTO; import com.docus.server.vo.scheduling.management.SchCollectErrorLogVO; +import com.docus.server.entity.scheduling.management.SchCollectErrorLog; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 采集器异常日志 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectErrorLogService { /** @@ -25,32 +29,32 @@ public interface ISchCollectErrorLogService { /** * 新增 * - * @param schCollectErrorLogDTO 新增参数 + * @param addSchCollectErrorLogDTO 新增参数 * @return 成功或失败 */ - boolean add(SchCollectErrorLogDTO schCollectErrorLogDTO); + boolean add(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO); /** * 编辑 * - * @param schCollectErrorLogDTO 编辑参数 + * @param editSchCollectErrorLogDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchCollectErrorLogDTO schCollectErrorLogDTO); + boolean edit(EditSchCollectErrorLogDTO editSchCollectErrorLogDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectErrorLogDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchCollectErrorLogDTO deleteSchCollectErrorLogDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectRecordRetryLogService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectRecordRetryLogService.java index 3d71d97..634fbcd 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectRecordRetryLogService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectRecordRetryLogService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.AddSchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.EditSchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.DeleteSchCollectRecordRetryLogDTO; import com.docus.server.vo.scheduling.management.SchCollectRecordRetryLogVO; +import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 采集记录表重试表 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectRecordRetryLogService { /** @@ -25,32 +29,32 @@ public interface ISchCollectRecordRetryLogService { /** * 新增 * - * @param schCollectRecordRetryLogDTO 新增参数 + * @param addSchCollectRecordRetryLogDTO 新增参数 * @return 成功或失败 */ - boolean add(SchCollectRecordRetryLogDTO schCollectRecordRetryLogDTO); + boolean add(AddSchCollectRecordRetryLogDTO addSchCollectRecordRetryLogDTO); /** * 编辑 * - * @param schCollectRecordRetryLogDTO 编辑参数 + * @param editSchCollectRecordRetryLogDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchCollectRecordRetryLogDTO schCollectRecordRetryLogDTO); + boolean edit(EditSchCollectRecordRetryLogDTO editSchCollectRecordRetryLogDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectRecordRetryLogDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchCollectRecordRetryLogDTO deleteSchCollectRecordRetryLogDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectRecordService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectRecordService.java index 162b514..1978257 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectRecordService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectRecordService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.DeleteSchCollectRecordDTO; import com.docus.server.vo.scheduling.management.SchCollectRecordVO; +import com.docus.server.entity.scheduling.management.SchCollectRecord; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 采集记录表 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectRecordService { /** @@ -25,32 +29,32 @@ public interface ISchCollectRecordService { /** * 新增 * - * @param schCollectRecordDTO 新增参数 + * @param addSchCollectRecordDTO 新增参数 * @return 成功或失败 */ - boolean add(SchCollectRecordDTO schCollectRecordDTO); + boolean add(AddSchCollectRecordDTO addSchCollectRecordDTO); /** * 编辑 * - * @param schCollectRecordDTO 编辑参数 + * @param editSchCollectRecordDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchCollectRecordDTO schCollectRecordDTO); + boolean edit(EditSchCollectRecordDTO editSchCollectRecordDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectRecordDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchCollectRecordDTO deleteSchCollectRecordDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorConfigService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorConfigService.java index ac458ac..29d198c 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorConfigService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorConfigService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.AddSchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.EditSchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.DeleteSchCollectorConfigDTO; import com.docus.server.vo.scheduling.management.SchCollectorConfigVO; +import com.docus.server.entity.scheduling.management.SchCollectorConfig; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 采集器配置 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectorConfigService { /** @@ -25,32 +29,32 @@ public interface ISchCollectorConfigService { /** * 新增 * - * @param schCollectorConfigDTO 新增参数 + * @param addSchCollectorConfigDTO 新增参数 * @return 成功或失败 */ - boolean add(SchCollectorConfigDTO schCollectorConfigDTO); + boolean add(AddSchCollectorConfigDTO addSchCollectorConfigDTO); /** * 编辑 * - * @param schCollectorConfigDTO 编辑参数 + * @param editSchCollectorConfigDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchCollectorConfigDTO schCollectorConfigDTO); + boolean edit(EditSchCollectorConfigDTO editSchCollectorConfigDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorConfigDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorService.java index fda38ab..e6488db 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO; import com.docus.server.vo.scheduling.management.SchCollectorVO; +import com.docus.server.entity.scheduling.management.SchCollector; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 采集器管理 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectorService { /** @@ -25,32 +29,32 @@ public interface ISchCollectorService { /** * 新增 * - * @param schCollectorDTO 新增参数 + * @param addSchCollectorDTO 新增参数 * @return 成功或失败 */ - boolean add(SchCollectorDTO schCollectorDTO); + boolean add(AddSchCollectorDTO addSchCollectorDTO); /** * 编辑 * - * @param schCollectorDTO 编辑参数 + * @param editSchCollectorDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchCollectorDTO schCollectorDTO); + boolean edit(EditSchCollectorDTO editSchCollectorDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchCollectorDTO deleteSchCollectorDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionFileService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionFileService.java index 4c5a402..5ab4df3 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionFileService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionFileService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.AddSchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.EditSchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.DeleteSchCollectorVersionFileDTO; import com.docus.server.vo.scheduling.management.SchCollectorVersionFileVO; +import com.docus.server.entity.scheduling.management.SchCollectorVersionFile; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 采集器版本列表更新包管理 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectorVersionFileService { /** @@ -25,32 +29,32 @@ public interface ISchCollectorVersionFileService { /** * 新增 * - * @param schCollectorVersionFileDTO 新增参数 + * @param addSchCollectorVersionFileDTO 新增参数 * @return 成功或失败 */ - boolean add(SchCollectorVersionFileDTO schCollectorVersionFileDTO); + boolean add(AddSchCollectorVersionFileDTO addSchCollectorVersionFileDTO); /** * 编辑 * - * @param schCollectorVersionFileDTO 编辑参数 + * @param editSchCollectorVersionFileDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchCollectorVersionFileDTO schCollectorVersionFileDTO); + boolean edit(EditSchCollectorVersionFileDTO editSchCollectorVersionFileDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionFileDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchCollectorVersionFileDTO deleteSchCollectorVersionFileDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionLogService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionLogService.java index 8051eac..57cc418 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionLogService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionLogService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.AddSchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.EditSchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.DeleteSchCollectorVersionLogDTO; import com.docus.server.vo.scheduling.management.SchCollectorVersionLogVO; +import com.docus.server.entity.scheduling.management.SchCollectorVersionLog; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 采集器版本更新日志管理 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectorVersionLogService { /** @@ -25,32 +29,32 @@ public interface ISchCollectorVersionLogService { /** * 新增 * - * @param schCollectorVersionLogDTO 新增参数 + * @param addSchCollectorVersionLogDTO 新增参数 * @return 成功或失败 */ - boolean add(SchCollectorVersionLogDTO schCollectorVersionLogDTO); + boolean add(AddSchCollectorVersionLogDTO addSchCollectorVersionLogDTO); /** * 编辑 * - * @param schCollectorVersionLogDTO 编辑参数 + * @param editSchCollectorVersionLogDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchCollectorVersionLogDTO schCollectorVersionLogDTO); + boolean edit(EditSchCollectorVersionLogDTO editSchCollectorVersionLogDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionLogDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchCollectorVersionLogDTO deleteSchCollectorVersionLogDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionService.java index 72f4054..ed719a5 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorVersionService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.AddSchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.EditSchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.DeleteSchCollectorVersionDTO; import com.docus.server.vo.scheduling.management.SchCollectorVersionVO; +import com.docus.server.entity.scheduling.management.SchCollectorVersion; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 采集器版本列表管理 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchCollectorVersionService { /** @@ -25,32 +29,32 @@ public interface ISchCollectorVersionService { /** * 新增 * - * @param schCollectorVersionDTO 新增参数 + * @param addSchCollectorVersionDTO 新增参数 * @return 成功或失败 */ - boolean add(SchCollectorVersionDTO schCollectorVersionDTO); + boolean add(AddSchCollectorVersionDTO addSchCollectorVersionDTO); /** * 编辑 * - * @param schCollectorVersionDTO 编辑参数 + * @param editSchCollectorVersionDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchCollectorVersionDTO schCollectorVersionDTO); + boolean edit(EditSchCollectorVersionDTO editSchCollectorVersionDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchOperationLogService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchOperationLogService.java index 009e5e2..a84d43b 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchOperationLogService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchOperationLogService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.AddSchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.EditSchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.DeleteSchOperationLogDTO; import com.docus.server.vo.scheduling.management.SchOperationLogVO; +import com.docus.server.entity.scheduling.management.SchOperationLog; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 采集调度器操作日志 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchOperationLogService { /** @@ -25,32 +29,32 @@ public interface ISchOperationLogService { /** * 新增 * - * @param schOperationLogDTO 新增参数 + * @param addSchOperationLogDTO 新增参数 * @return 成功或失败 */ - boolean add(SchOperationLogDTO schOperationLogDTO); + boolean add(AddSchOperationLogDTO addSchOperationLogDTO); /** * 编辑 * - * @param schOperationLogDTO 编辑参数 + * @param editSchOperationLogDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchOperationLogDTO schOperationLogDTO); + boolean edit(EditSchOperationLogDTO editSchOperationLogDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchOperationLogDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchOperationLogDTO deleteSchOperationLogDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchSystemParamsService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchSystemParamsService.java index 600655f..5fb4d0d 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchSystemParamsService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchSystemParamsService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.AddSchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.EditSchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.DeleteSchSystemParamsDTO; import com.docus.server.vo.scheduling.management.SchSystemParamsVO; +import com.docus.server.entity.scheduling.management.SchSystemParams; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 系统参数表 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchSystemParamsService { /** @@ -25,32 +29,32 @@ public interface ISchSystemParamsService { /** * 新增 * - * @param schSystemParamsDTO 新增参数 + * @param addSchSystemParamsDTO 新增参数 * @return 成功或失败 */ - boolean add(SchSystemParamsDTO schSystemParamsDTO); + boolean add(AddSchSystemParamsDTO addSchSystemParamsDTO); /** * 编辑 * - * @param schSystemParamsDTO 编辑参数 + * @param editSchSystemParamsDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchSystemParamsDTO schSystemParamsDTO); + boolean edit(EditSchSystemParamsDTO editSchSystemParamsDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchSystemParamsDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchSystemParamsDTO deleteSchSystemParamsDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchTerminatorService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchTerminatorService.java index e820657..0682296 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchTerminatorService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchTerminatorService.java @@ -1,9 +1,13 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.AddSchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.EditSchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.DeleteSchTerminatorDTO; import com.docus.server.vo.scheduling.management.SchTerminatorVO; +import com.docus.server.entity.scheduling.management.SchTerminator; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import java.util.List; @@ -11,7 +15,7 @@ import java.util.List; * 执行管理器 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchTerminatorService { /** @@ -25,32 +29,32 @@ public interface ISchTerminatorService { /** * 新增 * - * @param schTerminatorDTO 新增参数 + * @param addSchTerminatorDTO 新增参数 * @return 成功或失败 */ - boolean add(SchTerminatorDTO schTerminatorDTO); + boolean add(AddSchTerminatorDTO addSchTerminatorDTO); /** * 编辑 * - * @param schTerminatorDTO 编辑参数 + * @param editSchTerminatorDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchTerminatorDTO schTerminatorDTO); + boolean edit(EditSchTerminatorDTO editSchTerminatorDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchTerminatorDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchTerminatorDTO deleteSchTerminatorDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchVirtualLogService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchVirtualLogService.java index dceb08f..af0bc0e 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchVirtualLogService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchVirtualLogService.java @@ -1,17 +1,17 @@ package com.docus.server.service; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.AddSchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.DeleteSchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.EditSchVirtualLogDTO; import com.docus.server.vo.scheduling.management.SchVirtualLogVO; -import java.util.List; - /** * 虚拟机使用情况 服务接口 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ public interface ISchVirtualLogService { /** @@ -25,32 +25,32 @@ public interface ISchVirtualLogService { /** * 新增 * - * @param schVirtualLogDTO 新增参数 + * @param addSchVirtualLogDTO 新增参数 * @return 成功或失败 */ - boolean add(SchVirtualLogDTO schVirtualLogDTO); + boolean add(AddSchVirtualLogDTO addSchVirtualLogDTO); /** * 编辑 * - * @param schVirtualLogDTO 编辑参数 + * @param editSchVirtualLogDTO 编辑参数 * @return 成功或失败 */ - boolean edit(SchVirtualLogDTO schVirtualLogDTO); + boolean edit(EditSchVirtualLogDTO editSchVirtualLogDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchVirtualLogDTO 删除参数 * @return 成功或失败 */ - int delete(List ids); + int delete(DeleteSchVirtualLogDTO deleteSchVirtualLogDTO); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - PageResult search(SearchRequest searchRequest); + PageResult search(SearchDTO searchDTO); } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectErrorLogServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectErrorLogServiceImpl.java index b8e70c9..c0d9cda 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectErrorLogServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectErrorLogServiceImpl.java @@ -1,14 +1,16 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.SchCollectErrorLogConvert; -import com.docus.server.dto.scheduling.management.SchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.AddSchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.DeleteSchCollectErrorLogDTO; +import com.docus.server.vo.scheduling.management.SchCollectErrorLogVO; import com.docus.server.entity.scheduling.management.SchCollectErrorLog; +import com.docus.server.convert.SchCollectErrorLogConvert; import com.docus.server.infrastructure.dao.ISchCollectErrorLogDao; import com.docus.server.service.ISchCollectErrorLogService; -import com.docus.server.vo.scheduling.management.SchCollectErrorLogVO; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import javax.annotation.Resource; import java.util.List; @@ -17,7 +19,7 @@ import java.util.List; * 采集器异常日志 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchCollectErrorLogServiceImpl implements ISchCollectErrorLogService { @@ -36,49 +38,49 @@ public class SchCollectErrorLogServiceImpl implements ISchCollectErrorLogService } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchCollectErrorLogConvert.INSTANCE.convertVO(iSchCollectErrorLogDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchCollectErrorLogConvert.INSTANCE.convertVO(iSchCollectErrorLogDao.search(searchDTO)); } /** * 新增 * - * @param schCollectErrorLogDTO 编辑参数 + * @param addSchCollectErrorLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectErrorLogDTO schCollectErrorLogDTO) { - SchCollectErrorLog schCollectErrorLog = SchCollectErrorLogConvert.INSTANCE.convertDO(schCollectErrorLogDTO); + public boolean add(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO) { + SchCollectErrorLog schCollectErrorLog = SchCollectErrorLogConvert.INSTANCE.convertDO(addSchCollectErrorLogDTO); return iSchCollectErrorLogDao.add(schCollectErrorLog); } /** * 编辑 * - * @param schCollectErrorLogDTO 编辑参数 + * @param editSchCollectErrorLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectErrorLogDTO schCollectErrorLogDTO) { - SchCollectErrorLog schCollectErrorLog = SchCollectErrorLogConvert.INSTANCE.convertDO(schCollectErrorLogDTO); + public boolean edit(EditSchCollectErrorLogDTO editSchCollectErrorLogDTO) { + SchCollectErrorLog schCollectErrorLog = SchCollectErrorLogConvert.INSTANCE.convertDO(editSchCollectErrorLogDTO); return iSchCollectErrorLogDao.edit(schCollectErrorLog); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectErrorLogDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectErrorLogDao.delete(ids); + public int delete(DeleteSchCollectErrorLogDTO deleteSchCollectErrorLogDTO) { + return iSchCollectErrorLogDao.delete(deleteSchCollectErrorLogDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectRecordRetryLogServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectRecordRetryLogServiceImpl.java index 21c9e57..c2d5cb4 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectRecordRetryLogServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectRecordRetryLogServiceImpl.java @@ -1,9 +1,11 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.convert.SchCollectRecordRetryLogConvert; -import com.docus.server.dto.scheduling.management.SchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.AddSchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.DeleteSchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.EditSchCollectRecordRetryLogDTO; import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog; import com.docus.server.infrastructure.dao.ISchCollectRecordRetryLogDao; import com.docus.server.service.ISchCollectRecordRetryLogService; @@ -11,13 +13,12 @@ import com.docus.server.vo.scheduling.management.SchCollectRecordRetryLogVO; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; /** * 采集记录表重试表 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchCollectRecordRetryLogServiceImpl implements ISchCollectRecordRetryLogService { @@ -36,49 +37,49 @@ public class SchCollectRecordRetryLogServiceImpl implements ISchCollectRecordRet } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchCollectRecordRetryLogConvert.INSTANCE.convertVO(iSchCollectRecordRetryLogDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchCollectRecordRetryLogConvert.INSTANCE.convertVO(iSchCollectRecordRetryLogDao.search(searchDTO)); } /** * 新增 * - * @param schCollectRecordRetryLogDTO 编辑参数 + * @param addSchCollectRecordRetryLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectRecordRetryLogDTO schCollectRecordRetryLogDTO) { - SchCollectRecordRetryLog schCollectRecordRetryLog = SchCollectRecordRetryLogConvert.INSTANCE.convertDO(schCollectRecordRetryLogDTO); + public boolean add(AddSchCollectRecordRetryLogDTO addSchCollectRecordRetryLogDTO) { + SchCollectRecordRetryLog schCollectRecordRetryLog = SchCollectRecordRetryLogConvert.INSTANCE.convertDO(addSchCollectRecordRetryLogDTO); return iSchCollectRecordRetryLogDao.add(schCollectRecordRetryLog); } /** * 编辑 * - * @param schCollectRecordRetryLogDTO 编辑参数 + * @param editSchCollectRecordRetryLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectRecordRetryLogDTO schCollectRecordRetryLogDTO) { - SchCollectRecordRetryLog schCollectRecordRetryLog = SchCollectRecordRetryLogConvert.INSTANCE.convertDO(schCollectRecordRetryLogDTO); + public boolean edit(EditSchCollectRecordRetryLogDTO editSchCollectRecordRetryLogDTO) { + SchCollectRecordRetryLog schCollectRecordRetryLog = SchCollectRecordRetryLogConvert.INSTANCE.convertDO(editSchCollectRecordRetryLogDTO); return iSchCollectRecordRetryLogDao.edit(schCollectRecordRetryLog); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectRecordRetryLogDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectRecordRetryLogDao.delete(ids); + public int delete(DeleteSchCollectRecordRetryLogDTO deleteSchCollectRecordRetryLogDTO) { + return iSchCollectRecordRetryLogDao.delete(deleteSchCollectRecordRetryLogDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectRecordServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectRecordServiceImpl.java index d96c38f..05ca032 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectRecordServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectRecordServiceImpl.java @@ -1,14 +1,16 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.SchCollectRecordConvert; -import com.docus.server.dto.scheduling.management.SchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.DeleteSchCollectRecordDTO; +import com.docus.server.vo.scheduling.management.SchCollectRecordVO; import com.docus.server.entity.scheduling.management.SchCollectRecord; +import com.docus.server.convert.SchCollectRecordConvert; import com.docus.server.infrastructure.dao.ISchCollectRecordDao; import com.docus.server.service.ISchCollectRecordService; -import com.docus.server.vo.scheduling.management.SchCollectRecordVO; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import javax.annotation.Resource; import java.util.List; @@ -17,7 +19,7 @@ import java.util.List; * 采集记录表 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchCollectRecordServiceImpl implements ISchCollectRecordService { @@ -36,49 +38,49 @@ public class SchCollectRecordServiceImpl implements ISchCollectRecordService { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchCollectRecordConvert.INSTANCE.convertVO(iSchCollectRecordDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchCollectRecordConvert.INSTANCE.convertVO(iSchCollectRecordDao.search(searchDTO)); } /** * 新增 * - * @param schCollectRecordDTO 编辑参数 + * @param addSchCollectRecordDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectRecordDTO schCollectRecordDTO) { - SchCollectRecord schCollectRecord = SchCollectRecordConvert.INSTANCE.convertDO(schCollectRecordDTO); + public boolean add(AddSchCollectRecordDTO addSchCollectRecordDTO) { + SchCollectRecord schCollectRecord = SchCollectRecordConvert.INSTANCE.convertDO(addSchCollectRecordDTO); return iSchCollectRecordDao.add(schCollectRecord); } /** * 编辑 * - * @param schCollectRecordDTO 编辑参数 + * @param editSchCollectRecordDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectRecordDTO schCollectRecordDTO) { - SchCollectRecord schCollectRecord = SchCollectRecordConvert.INSTANCE.convertDO(schCollectRecordDTO); + public boolean edit(EditSchCollectRecordDTO editSchCollectRecordDTO) { + SchCollectRecord schCollectRecord = SchCollectRecordConvert.INSTANCE.convertDO(editSchCollectRecordDTO); return iSchCollectRecordDao.edit(schCollectRecord); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectRecordDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectRecordDao.delete(ids); + public int delete(DeleteSchCollectRecordDTO deleteSchCollectRecordDTO) { + return iSchCollectRecordDao.delete(deleteSchCollectRecordDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorConfigServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorConfigServiceImpl.java index 45682f7..414bb1f 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorConfigServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorConfigServiceImpl.java @@ -1,9 +1,11 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.convert.SchCollectorConfigConvert; -import com.docus.server.dto.scheduling.management.SchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.AddSchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.DeleteSchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.EditSchCollectorConfigDTO; import com.docus.server.entity.scheduling.management.SchCollectorConfig; import com.docus.server.infrastructure.dao.ISchCollectorConfigDao; import com.docus.server.service.ISchCollectorConfigService; @@ -11,13 +13,12 @@ import com.docus.server.vo.scheduling.management.SchCollectorConfigVO; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; /** * 采集器配置 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchCollectorConfigServiceImpl implements ISchCollectorConfigService { @@ -36,49 +37,49 @@ public class SchCollectorConfigServiceImpl implements ISchCollectorConfigService } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchCollectorConfigConvert.INSTANCE.convertVO(iSchCollectorConfigDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchCollectorConfigConvert.INSTANCE.convertVO(iSchCollectorConfigDao.search(searchDTO)); } /** * 新增 * - * @param schCollectorConfigDTO 编辑参数 + * @param addSchCollectorConfigDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectorConfigDTO schCollectorConfigDTO) { - SchCollectorConfig schCollectorConfig = SchCollectorConfigConvert.INSTANCE.convertDO(schCollectorConfigDTO); + public boolean add(AddSchCollectorConfigDTO addSchCollectorConfigDTO) { + SchCollectorConfig schCollectorConfig = SchCollectorConfigConvert.INSTANCE.convertDO(addSchCollectorConfigDTO); return iSchCollectorConfigDao.add(schCollectorConfig); } /** * 编辑 * - * @param schCollectorConfigDTO 编辑参数 + * @param editSchCollectorConfigDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectorConfigDTO schCollectorConfigDTO) { - SchCollectorConfig schCollectorConfig = SchCollectorConfigConvert.INSTANCE.convertDO(schCollectorConfigDTO); + public boolean edit(EditSchCollectorConfigDTO editSchCollectorConfigDTO) { + SchCollectorConfig schCollectorConfig = SchCollectorConfigConvert.INSTANCE.convertDO(editSchCollectorConfigDTO); return iSchCollectorConfigDao.edit(schCollectorConfig); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorConfigDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectorConfigDao.delete(ids); + public int delete(DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO) { + return iSchCollectorConfigDao.delete(deleteSchCollectorConfigDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorServiceImpl.java index 4703e28..7db08d6 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorServiceImpl.java @@ -1,14 +1,16 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.SchCollectorConvert; -import com.docus.server.dto.scheduling.management.SchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO; +import com.docus.server.vo.scheduling.management.SchCollectorVO; import com.docus.server.entity.scheduling.management.SchCollector; +import com.docus.server.convert.SchCollectorConvert; import com.docus.server.infrastructure.dao.ISchCollectorDao; import com.docus.server.service.ISchCollectorService; -import com.docus.server.vo.scheduling.management.SchCollectorVO; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import javax.annotation.Resource; import java.util.List; @@ -17,7 +19,7 @@ import java.util.List; * 采集器管理 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchCollectorServiceImpl implements ISchCollectorService { @@ -36,49 +38,49 @@ public class SchCollectorServiceImpl implements ISchCollectorService { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchCollectorConvert.INSTANCE.convertVO(iSchCollectorDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchCollectorConvert.INSTANCE.convertVO(iSchCollectorDao.search(searchDTO)); } /** * 新增 * - * @param schCollectorDTO 编辑参数 + * @param addSchCollectorDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectorDTO schCollectorDTO) { - SchCollector schCollector = SchCollectorConvert.INSTANCE.convertDO(schCollectorDTO); + public boolean add(AddSchCollectorDTO addSchCollectorDTO) { + SchCollector schCollector = SchCollectorConvert.INSTANCE.convertDO(addSchCollectorDTO); return iSchCollectorDao.add(schCollector); } /** * 编辑 * - * @param schCollectorDTO 编辑参数 + * @param editSchCollectorDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectorDTO schCollectorDTO) { - SchCollector schCollector = SchCollectorConvert.INSTANCE.convertDO(schCollectorDTO); + public boolean edit(EditSchCollectorDTO editSchCollectorDTO) { + SchCollector schCollector = SchCollectorConvert.INSTANCE.convertDO(editSchCollectorDTO); return iSchCollectorDao.edit(schCollector); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectorDao.delete(ids); + public int delete(DeleteSchCollectorDTO deleteSchCollectorDTO) { + return iSchCollectorDao.delete(deleteSchCollectorDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionFileServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionFileServiceImpl.java index 89f858b..7ed698b 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionFileServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionFileServiceImpl.java @@ -1,14 +1,16 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.SchCollectorVersionFileConvert; -import com.docus.server.dto.scheduling.management.SchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.AddSchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.EditSchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.DeleteSchCollectorVersionFileDTO; +import com.docus.server.vo.scheduling.management.SchCollectorVersionFileVO; import com.docus.server.entity.scheduling.management.SchCollectorVersionFile; +import com.docus.server.convert.SchCollectorVersionFileConvert; import com.docus.server.infrastructure.dao.ISchCollectorVersionFileDao; import com.docus.server.service.ISchCollectorVersionFileService; -import com.docus.server.vo.scheduling.management.SchCollectorVersionFileVO; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import javax.annotation.Resource; import java.util.List; @@ -17,7 +19,7 @@ import java.util.List; * 采集器版本列表更新包管理 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchCollectorVersionFileServiceImpl implements ISchCollectorVersionFileService { @@ -36,49 +38,49 @@ public class SchCollectorVersionFileServiceImpl implements ISchCollectorVersionF } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchCollectorVersionFileConvert.INSTANCE.convertVO(iSchCollectorVersionFileDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchCollectorVersionFileConvert.INSTANCE.convertVO(iSchCollectorVersionFileDao.search(searchDTO)); } /** * 新增 * - * @param schCollectorVersionFileDTO 编辑参数 + * @param addSchCollectorVersionFileDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectorVersionFileDTO schCollectorVersionFileDTO) { - SchCollectorVersionFile schCollectorVersionFile = SchCollectorVersionFileConvert.INSTANCE.convertDO(schCollectorVersionFileDTO); + public boolean add(AddSchCollectorVersionFileDTO addSchCollectorVersionFileDTO) { + SchCollectorVersionFile schCollectorVersionFile = SchCollectorVersionFileConvert.INSTANCE.convertDO(addSchCollectorVersionFileDTO); return iSchCollectorVersionFileDao.add(schCollectorVersionFile); } /** * 编辑 * - * @param schCollectorVersionFileDTO 编辑参数 + * @param editSchCollectorVersionFileDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectorVersionFileDTO schCollectorVersionFileDTO) { - SchCollectorVersionFile schCollectorVersionFile = SchCollectorVersionFileConvert.INSTANCE.convertDO(schCollectorVersionFileDTO); + public boolean edit(EditSchCollectorVersionFileDTO editSchCollectorVersionFileDTO) { + SchCollectorVersionFile schCollectorVersionFile = SchCollectorVersionFileConvert.INSTANCE.convertDO(editSchCollectorVersionFileDTO); return iSchCollectorVersionFileDao.edit(schCollectorVersionFile); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionFileDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectorVersionFileDao.delete(ids); + public int delete(DeleteSchCollectorVersionFileDTO deleteSchCollectorVersionFileDTO) { + return iSchCollectorVersionFileDao.delete(deleteSchCollectorVersionFileDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionLogServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionLogServiceImpl.java index 69647b2..43e6908 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionLogServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionLogServiceImpl.java @@ -1,14 +1,16 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.SchCollectorVersionLogConvert; -import com.docus.server.dto.scheduling.management.SchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.AddSchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.EditSchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.DeleteSchCollectorVersionLogDTO; +import com.docus.server.vo.scheduling.management.SchCollectorVersionLogVO; import com.docus.server.entity.scheduling.management.SchCollectorVersionLog; +import com.docus.server.convert.SchCollectorVersionLogConvert; import com.docus.server.infrastructure.dao.ISchCollectorVersionLogDao; import com.docus.server.service.ISchCollectorVersionLogService; -import com.docus.server.vo.scheduling.management.SchCollectorVersionLogVO; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import javax.annotation.Resource; import java.util.List; @@ -17,7 +19,7 @@ import java.util.List; * 采集器版本更新日志管理 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchCollectorVersionLogServiceImpl implements ISchCollectorVersionLogService { @@ -36,49 +38,49 @@ public class SchCollectorVersionLogServiceImpl implements ISchCollectorVersionLo } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchCollectorVersionLogConvert.INSTANCE.convertVO(iSchCollectorVersionLogDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchCollectorVersionLogConvert.INSTANCE.convertVO(iSchCollectorVersionLogDao.search(searchDTO)); } /** * 新增 * - * @param schCollectorVersionLogDTO 编辑参数 + * @param addSchCollectorVersionLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectorVersionLogDTO schCollectorVersionLogDTO) { - SchCollectorVersionLog schCollectorVersionLog = SchCollectorVersionLogConvert.INSTANCE.convertDO(schCollectorVersionLogDTO); + public boolean add(AddSchCollectorVersionLogDTO addSchCollectorVersionLogDTO) { + SchCollectorVersionLog schCollectorVersionLog = SchCollectorVersionLogConvert.INSTANCE.convertDO(addSchCollectorVersionLogDTO); return iSchCollectorVersionLogDao.add(schCollectorVersionLog); } /** * 编辑 * - * @param schCollectorVersionLogDTO 编辑参数 + * @param editSchCollectorVersionLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectorVersionLogDTO schCollectorVersionLogDTO) { - SchCollectorVersionLog schCollectorVersionLog = SchCollectorVersionLogConvert.INSTANCE.convertDO(schCollectorVersionLogDTO); + public boolean edit(EditSchCollectorVersionLogDTO editSchCollectorVersionLogDTO) { + SchCollectorVersionLog schCollectorVersionLog = SchCollectorVersionLogConvert.INSTANCE.convertDO(editSchCollectorVersionLogDTO); return iSchCollectorVersionLogDao.edit(schCollectorVersionLog); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionLogDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectorVersionLogDao.delete(ids); + public int delete(DeleteSchCollectorVersionLogDTO deleteSchCollectorVersionLogDTO) { + return iSchCollectorVersionLogDao.delete(deleteSchCollectorVersionLogDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionServiceImpl.java index 8d85b45..5be94ac 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorVersionServiceImpl.java @@ -1,14 +1,16 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.SchCollectorVersionConvert; -import com.docus.server.dto.scheduling.management.SchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.AddSchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.EditSchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.DeleteSchCollectorVersionDTO; +import com.docus.server.vo.scheduling.management.SchCollectorVersionVO; import com.docus.server.entity.scheduling.management.SchCollectorVersion; +import com.docus.server.convert.SchCollectorVersionConvert; import com.docus.server.infrastructure.dao.ISchCollectorVersionDao; import com.docus.server.service.ISchCollectorVersionService; -import com.docus.server.vo.scheduling.management.SchCollectorVersionVO; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import javax.annotation.Resource; import java.util.List; @@ -17,7 +19,7 @@ import java.util.List; * 采集器版本列表管理 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchCollectorVersionServiceImpl implements ISchCollectorVersionService { @@ -36,49 +38,49 @@ public class SchCollectorVersionServiceImpl implements ISchCollectorVersionServi } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchCollectorVersionConvert.INSTANCE.convertVO(iSchCollectorVersionDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchCollectorVersionConvert.INSTANCE.convertVO(iSchCollectorVersionDao.search(searchDTO)); } /** * 新增 * - * @param schCollectorVersionDTO 编辑参数 + * @param addSchCollectorVersionDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchCollectorVersionDTO schCollectorVersionDTO) { - SchCollectorVersion schCollectorVersion = SchCollectorVersionConvert.INSTANCE.convertDO(schCollectorVersionDTO); + public boolean add(AddSchCollectorVersionDTO addSchCollectorVersionDTO) { + SchCollectorVersion schCollectorVersion = SchCollectorVersionConvert.INSTANCE.convertDO(addSchCollectorVersionDTO); return iSchCollectorVersionDao.add(schCollectorVersion); } /** * 编辑 * - * @param schCollectorVersionDTO 编辑参数 + * @param editSchCollectorVersionDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchCollectorVersionDTO schCollectorVersionDTO) { - SchCollectorVersion schCollectorVersion = SchCollectorVersionConvert.INSTANCE.convertDO(schCollectorVersionDTO); + public boolean edit(EditSchCollectorVersionDTO editSchCollectorVersionDTO) { + SchCollectorVersion schCollectorVersion = SchCollectorVersionConvert.INSTANCE.convertDO(editSchCollectorVersionDTO); return iSchCollectorVersionDao.edit(schCollectorVersion); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchCollectorVersionDao.delete(ids); + public int delete(DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO) { + return iSchCollectorVersionDao.delete(deleteSchCollectorVersionDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchOperationLogServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchOperationLogServiceImpl.java index 80c7d10..713dce2 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchOperationLogServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchOperationLogServiceImpl.java @@ -1,14 +1,16 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.SchOperationLogConvert; -import com.docus.server.dto.scheduling.management.SchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.AddSchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.EditSchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.DeleteSchOperationLogDTO; +import com.docus.server.vo.scheduling.management.SchOperationLogVO; import com.docus.server.entity.scheduling.management.SchOperationLog; +import com.docus.server.convert.SchOperationLogConvert; import com.docus.server.infrastructure.dao.ISchOperationLogDao; import com.docus.server.service.ISchOperationLogService; -import com.docus.server.vo.scheduling.management.SchOperationLogVO; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import javax.annotation.Resource; import java.util.List; @@ -17,7 +19,7 @@ import java.util.List; * 采集调度器操作日志 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchOperationLogServiceImpl implements ISchOperationLogService { @@ -36,49 +38,49 @@ public class SchOperationLogServiceImpl implements ISchOperationLogService { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchOperationLogConvert.INSTANCE.convertVO(iSchOperationLogDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchOperationLogConvert.INSTANCE.convertVO(iSchOperationLogDao.search(searchDTO)); } /** * 新增 * - * @param schOperationLogDTO 编辑参数 + * @param addSchOperationLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchOperationLogDTO schOperationLogDTO) { - SchOperationLog schOperationLog = SchOperationLogConvert.INSTANCE.convertDO(schOperationLogDTO); + public boolean add(AddSchOperationLogDTO addSchOperationLogDTO) { + SchOperationLog schOperationLog = SchOperationLogConvert.INSTANCE.convertDO(addSchOperationLogDTO); return iSchOperationLogDao.add(schOperationLog); } /** * 编辑 * - * @param schOperationLogDTO 编辑参数 + * @param editSchOperationLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchOperationLogDTO schOperationLogDTO) { - SchOperationLog schOperationLog = SchOperationLogConvert.INSTANCE.convertDO(schOperationLogDTO); + public boolean edit(EditSchOperationLogDTO editSchOperationLogDTO) { + SchOperationLog schOperationLog = SchOperationLogConvert.INSTANCE.convertDO(editSchOperationLogDTO); return iSchOperationLogDao.edit(schOperationLog); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchOperationLogDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchOperationLogDao.delete(ids); + public int delete(DeleteSchOperationLogDTO deleteSchOperationLogDTO) { + return iSchOperationLogDao.delete(deleteSchOperationLogDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchSystemParamsServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchSystemParamsServiceImpl.java index c649593..8231955 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchSystemParamsServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchSystemParamsServiceImpl.java @@ -1,14 +1,16 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.SchSystemParamsConvert; -import com.docus.server.dto.scheduling.management.SchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.AddSchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.EditSchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.DeleteSchSystemParamsDTO; +import com.docus.server.vo.scheduling.management.SchSystemParamsVO; import com.docus.server.entity.scheduling.management.SchSystemParams; +import com.docus.server.convert.SchSystemParamsConvert; import com.docus.server.infrastructure.dao.ISchSystemParamsDao; import com.docus.server.service.ISchSystemParamsService; -import com.docus.server.vo.scheduling.management.SchSystemParamsVO; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import javax.annotation.Resource; import java.util.List; @@ -17,7 +19,7 @@ import java.util.List; * 系统参数表 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchSystemParamsServiceImpl implements ISchSystemParamsService { @@ -36,49 +38,49 @@ public class SchSystemParamsServiceImpl implements ISchSystemParamsService { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchSystemParamsConvert.INSTANCE.convertVO(iSchSystemParamsDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchSystemParamsConvert.INSTANCE.convertVO(iSchSystemParamsDao.search(searchDTO)); } /** * 新增 * - * @param schSystemParamsDTO 编辑参数 + * @param addSchSystemParamsDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchSystemParamsDTO schSystemParamsDTO) { - SchSystemParams schSystemParams = SchSystemParamsConvert.INSTANCE.convertDO(schSystemParamsDTO); + public boolean add(AddSchSystemParamsDTO addSchSystemParamsDTO) { + SchSystemParams schSystemParams = SchSystemParamsConvert.INSTANCE.convertDO(addSchSystemParamsDTO); return iSchSystemParamsDao.add(schSystemParams); } /** * 编辑 * - * @param schSystemParamsDTO 编辑参数 + * @param editSchSystemParamsDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchSystemParamsDTO schSystemParamsDTO) { - SchSystemParams schSystemParams = SchSystemParamsConvert.INSTANCE.convertDO(schSystemParamsDTO); + public boolean edit(EditSchSystemParamsDTO editSchSystemParamsDTO) { + SchSystemParams schSystemParams = SchSystemParamsConvert.INSTANCE.convertDO(editSchSystemParamsDTO); return iSchSystemParamsDao.edit(schSystemParams); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchSystemParamsDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchSystemParamsDao.delete(ids); + public int delete(DeleteSchSystemParamsDTO deleteSchSystemParamsDTO) { + return iSchSystemParamsDao.delete(deleteSchSystemParamsDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchTerminatorServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchTerminatorServiceImpl.java index 146a0ed..4723763 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchTerminatorServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchTerminatorServiceImpl.java @@ -1,14 +1,16 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.SchTerminatorConvert; -import com.docus.server.dto.scheduling.management.SchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.AddSchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.EditSchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.DeleteSchTerminatorDTO; +import com.docus.server.vo.scheduling.management.SchTerminatorVO; import com.docus.server.entity.scheduling.management.SchTerminator; +import com.docus.server.convert.SchTerminatorConvert; import com.docus.server.infrastructure.dao.ISchTerminatorDao; import com.docus.server.service.ISchTerminatorService; -import com.docus.server.vo.scheduling.management.SchTerminatorVO; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import javax.annotation.Resource; import java.util.List; @@ -17,7 +19,7 @@ import java.util.List; * 执行管理器 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchTerminatorServiceImpl implements ISchTerminatorService { @@ -36,49 +38,49 @@ public class SchTerminatorServiceImpl implements ISchTerminatorService { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchTerminatorConvert.INSTANCE.convertVO(iSchTerminatorDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchTerminatorConvert.INSTANCE.convertVO(iSchTerminatorDao.search(searchDTO)); } /** * 新增 * - * @param schTerminatorDTO 编辑参数 + * @param addSchTerminatorDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchTerminatorDTO schTerminatorDTO) { - SchTerminator schTerminator = SchTerminatorConvert.INSTANCE.convertDO(schTerminatorDTO); + public boolean add(AddSchTerminatorDTO addSchTerminatorDTO) { + SchTerminator schTerminator = SchTerminatorConvert.INSTANCE.convertDO(addSchTerminatorDTO); return iSchTerminatorDao.add(schTerminator); } /** * 编辑 * - * @param schTerminatorDTO 编辑参数 + * @param editSchTerminatorDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchTerminatorDTO schTerminatorDTO) { - SchTerminator schTerminator = SchTerminatorConvert.INSTANCE.convertDO(schTerminatorDTO); + public boolean edit(EditSchTerminatorDTO editSchTerminatorDTO) { + SchTerminator schTerminator = SchTerminatorConvert.INSTANCE.convertDO(editSchTerminatorDTO); return iSchTerminatorDao.edit(schTerminator); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchTerminatorDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchTerminatorDao.delete(ids); + public int delete(DeleteSchTerminatorDTO deleteSchTerminatorDTO) { + return iSchTerminatorDao.delete(deleteSchTerminatorDTO.getIds()); } } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchVirtualLogServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchVirtualLogServiceImpl.java index 8989950..eeab9fa 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchVirtualLogServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchVirtualLogServiceImpl.java @@ -1,14 +1,16 @@ package com.docus.server.service.impl; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.convert.SchVirtualLogConvert; -import com.docus.server.dto.scheduling.management.SchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.AddSchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.EditSchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.DeleteSchVirtualLogDTO; +import com.docus.server.vo.scheduling.management.SchVirtualLogVO; import com.docus.server.entity.scheduling.management.SchVirtualLog; +import com.docus.server.convert.SchVirtualLogConvert; import com.docus.server.infrastructure.dao.ISchVirtualLogDao; import com.docus.server.service.ISchVirtualLogService; -import com.docus.server.vo.scheduling.management.SchVirtualLogVO; import org.springframework.stereotype.Service; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; import javax.annotation.Resource; import java.util.List; @@ -17,7 +19,7 @@ import java.util.List; * 虚拟机使用情况 服务实现类 * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Service public class SchVirtualLogServiceImpl implements ISchVirtualLogService { @@ -36,49 +38,49 @@ public class SchVirtualLogServiceImpl implements ISchVirtualLogService { } /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ @Override - public PageResult search(SearchRequest searchRequest) { - return SchVirtualLogConvert.INSTANCE.convertVO(iSchVirtualLogDao.search(searchRequest)); + public PageResult search(SearchDTO searchDTO) { + return SchVirtualLogConvert.INSTANCE.convertVO(iSchVirtualLogDao.search(searchDTO)); } /** * 新增 * - * @param schVirtualLogDTO 编辑参数 + * @param addSchVirtualLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean add(SchVirtualLogDTO schVirtualLogDTO) { - SchVirtualLog schVirtualLog = SchVirtualLogConvert.INSTANCE.convertDO(schVirtualLogDTO); + public boolean add(AddSchVirtualLogDTO addSchVirtualLogDTO) { + SchVirtualLog schVirtualLog = SchVirtualLogConvert.INSTANCE.convertDO(addSchVirtualLogDTO); return iSchVirtualLogDao.add(schVirtualLog); } /** * 编辑 * - * @param schVirtualLogDTO 编辑参数 + * @param editSchVirtualLogDTO 编辑参数 * @return 成功或失败 */ @Override - public boolean edit(SchVirtualLogDTO schVirtualLogDTO) { - SchVirtualLog schVirtualLog = SchVirtualLogConvert.INSTANCE.convertDO(schVirtualLogDTO); + public boolean edit(EditSchVirtualLogDTO editSchVirtualLogDTO) { + SchVirtualLog schVirtualLog = SchVirtualLogConvert.INSTANCE.convertDO(editSchVirtualLogDTO); return iSchVirtualLogDao.edit(schVirtualLog); } /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchVirtualLogDTO 删除参数 * @return 成功或失败 */ @Override - public int delete(List ids) { - return iSchVirtualLogDao.delete(ids); + public int delete(DeleteSchVirtualLogDTO deleteSchVirtualLogDTO) { + return iSchVirtualLogDao.delete(deleteSchVirtualLogDTO.getIds()); } } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectErrorLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectErrorLogApi.java index 0d889b1..f376677 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectErrorLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectErrorLogApi.java @@ -1,32 +1,26 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.AddSchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.DeleteSchCollectErrorLogDTO; +import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO; import com.docus.server.vo.scheduling.management.SchCollectErrorLogVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -import java.util.List; +import org.springframework.web.bind.annotation.*; /** * 采集器异常日志 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "采集器异常日志任务管理接口", tags = "采集器异常日志任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectErrorLogApi") -@RequestMapping("/sch/collectErrorLog") +@RequestMapping("/schCollectErrorLog") public interface SchCollectErrorLogApi { /** @@ -40,42 +34,42 @@ public interface SchCollectErrorLogApi { SchCollectErrorLogVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schCollectErrorLogDTO 新增参数 + * @param addSchCollectErrorLogDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchCollectErrorLogDTO schCollectErrorLogDTO); + boolean add(@RequestBody AddSchCollectErrorLogDTO addSchCollectErrorLogDTO); /** * 编辑 * - * @param schCollectErrorLogDTO 编辑参数 + * @param editSchCollectErrorLogDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchCollectErrorLogDTO schCollectErrorLogDTO); + boolean edit(@RequestBody EditSchCollectErrorLogDTO editSchCollectErrorLogDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectErrorLogDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchCollectErrorLogDTO deleteSchCollectErrorLogDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordApi.java index f3bf0dc..83cd0c0 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordApi.java @@ -1,19 +1,16 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.AddSchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.EditSchCollectRecordDTO; +import com.docus.server.dto.scheduling.management.schcollectrecord.DeleteSchCollectRecordDTO; import com.docus.server.vo.scheduling.management.SchCollectRecordVO; +import com.docus.server.entity.scheduling.management.SchCollectRecord; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -22,11 +19,11 @@ import java.util.List; * 采集记录表 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "采集记录表任务管理接口", tags = "采集记录表任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectRecordApi") -@RequestMapping("/sch/collectRecord") +@RequestMapping("/schCollectRecord") public interface SchCollectRecordApi { /** @@ -40,42 +37,42 @@ public interface SchCollectRecordApi { SchCollectRecordVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schCollectRecordDTO 新增参数 + * @param addSchCollectRecordDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchCollectRecordDTO schCollectRecordDTO); + boolean add(@RequestBody AddSchCollectRecordDTO addSchCollectRecordDTO); /** * 编辑 * - * @param schCollectRecordDTO 编辑参数 + * @param editSchCollectRecordDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchCollectRecordDTO schCollectRecordDTO); + boolean edit(@RequestBody EditSchCollectRecordDTO editSchCollectRecordDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectRecordDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchCollectRecordDTO deleteSchCollectRecordDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordRetryLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordRetryLogApi.java index 742570d..3e33d51 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordRetryLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordRetryLogApi.java @@ -1,19 +1,16 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.AddSchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.EditSchCollectRecordRetryLogDTO; +import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.DeleteSchCollectRecordRetryLogDTO; import com.docus.server.vo.scheduling.management.SchCollectRecordRetryLogVO; +import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -22,11 +19,11 @@ import java.util.List; * 采集记录表重试表 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "采集记录表重试表任务管理接口", tags = "采集记录表重试表任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectRecordRetryLogApi") -@RequestMapping("/sch/collectRecordRetryLog") +@RequestMapping("/schCollectRecordRetryLog") public interface SchCollectRecordRetryLogApi { /** @@ -40,42 +37,42 @@ public interface SchCollectRecordRetryLogApi { SchCollectRecordRetryLogVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schCollectRecordRetryLogDTO 新增参数 + * @param addSchCollectRecordRetryLogDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchCollectRecordRetryLogDTO schCollectRecordRetryLogDTO); + boolean add(@RequestBody AddSchCollectRecordRetryLogDTO addSchCollectRecordRetryLogDTO); /** * 编辑 * - * @param schCollectRecordRetryLogDTO 编辑参数 + * @param editSchCollectRecordRetryLogDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchCollectRecordRetryLogDTO schCollectRecordRetryLogDTO); + boolean edit(@RequestBody EditSchCollectRecordRetryLogDTO editSchCollectRecordRetryLogDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectRecordRetryLogDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchCollectRecordRetryLogDTO deleteSchCollectRecordRetryLogDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java index 5ee3e55..18b2328 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java @@ -1,19 +1,16 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO; +import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO; import com.docus.server.vo.scheduling.management.SchCollectorVO; +import com.docus.server.entity.scheduling.management.SchCollector; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -22,11 +19,11 @@ import java.util.List; * 采集器管理 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "采集器管理任务管理接口", tags = "采集器管理任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorApi") -@RequestMapping("/sch/collector") +@RequestMapping("/schCollector") public interface SchCollectorApi { /** @@ -40,42 +37,42 @@ public interface SchCollectorApi { SchCollectorVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schCollectorDTO 新增参数 + * @param addSchCollectorDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchCollectorDTO schCollectorDTO); + boolean add(@RequestBody AddSchCollectorDTO addSchCollectorDTO); /** * 编辑 * - * @param schCollectorDTO 编辑参数 + * @param editSchCollectorDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchCollectorDTO schCollectorDTO); + boolean edit(@RequestBody EditSchCollectorDTO editSchCollectorDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchCollectorDTO deleteSchCollectorDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorConfigApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorConfigApi.java index ad7dce9..74eb063 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorConfigApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorConfigApi.java @@ -1,19 +1,16 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.AddSchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.EditSchCollectorConfigDTO; +import com.docus.server.dto.scheduling.management.schcollectorconfig.DeleteSchCollectorConfigDTO; import com.docus.server.vo.scheduling.management.SchCollectorConfigVO; +import com.docus.server.entity.scheduling.management.SchCollectorConfig; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -22,11 +19,11 @@ import java.util.List; * 采集器配置 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "采集器配置任务管理接口", tags = "采集器配置任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorConfigApi") -@RequestMapping("/sch/collectorConfig") +@RequestMapping("/schCollectorConfig") public interface SchCollectorConfigApi { /** @@ -40,42 +37,42 @@ public interface SchCollectorConfigApi { SchCollectorConfigVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schCollectorConfigDTO 新增参数 + * @param addSchCollectorConfigDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchCollectorConfigDTO schCollectorConfigDTO); + boolean add(@RequestBody AddSchCollectorConfigDTO addSchCollectorConfigDTO); /** * 编辑 * - * @param schCollectorConfigDTO 编辑参数 + * @param editSchCollectorConfigDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchCollectorConfigDTO schCollectorConfigDTO); + boolean edit(@RequestBody EditSchCollectorConfigDTO editSchCollectorConfigDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorConfigDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionApi.java index 2b7ca5d..167e264 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionApi.java @@ -1,19 +1,16 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.AddSchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.EditSchCollectorVersionDTO; +import com.docus.server.dto.scheduling.management.schcollectorversion.DeleteSchCollectorVersionDTO; import com.docus.server.vo.scheduling.management.SchCollectorVersionVO; +import com.docus.server.entity.scheduling.management.SchCollectorVersion; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -22,11 +19,11 @@ import java.util.List; * 采集器版本列表管理 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "采集器版本列表管理任务管理接口", tags = "采集器版本列表管理任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorVersionApi") -@RequestMapping("/sch/collectorVersion") +@RequestMapping("/schCollectorVersion") public interface SchCollectorVersionApi { /** @@ -40,42 +37,42 @@ public interface SchCollectorVersionApi { SchCollectorVersionVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schCollectorVersionDTO 新增参数 + * @param addSchCollectorVersionDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchCollectorVersionDTO schCollectorVersionDTO); + boolean add(@RequestBody AddSchCollectorVersionDTO addSchCollectorVersionDTO); /** * 编辑 * - * @param schCollectorVersionDTO 编辑参数 + * @param editSchCollectorVersionDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchCollectorVersionDTO schCollectorVersionDTO); + boolean edit(@RequestBody EditSchCollectorVersionDTO editSchCollectorVersionDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionFileApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionFileApi.java index d1388ad..32997b6 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionFileApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionFileApi.java @@ -1,19 +1,16 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.AddSchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.EditSchCollectorVersionFileDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionfile.DeleteSchCollectorVersionFileDTO; import com.docus.server.vo.scheduling.management.SchCollectorVersionFileVO; +import com.docus.server.entity.scheduling.management.SchCollectorVersionFile; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -22,11 +19,11 @@ import java.util.List; * 采集器版本列表更新包管理 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "采集器版本列表更新包管理任务管理接口", tags = "采集器版本列表更新包管理任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorVersionFileApi") -@RequestMapping("/sch/collectorVersionFile") +@RequestMapping("/schCollectorVersionFile") public interface SchCollectorVersionFileApi { /** @@ -40,42 +37,42 @@ public interface SchCollectorVersionFileApi { SchCollectorVersionFileVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schCollectorVersionFileDTO 新增参数 + * @param addSchCollectorVersionFileDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchCollectorVersionFileDTO schCollectorVersionFileDTO); + boolean add(@RequestBody AddSchCollectorVersionFileDTO addSchCollectorVersionFileDTO); /** * 编辑 * - * @param schCollectorVersionFileDTO 编辑参数 + * @param editSchCollectorVersionFileDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchCollectorVersionFileDTO schCollectorVersionFileDTO); + boolean edit(@RequestBody EditSchCollectorVersionFileDTO editSchCollectorVersionFileDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionFileDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchCollectorVersionFileDTO deleteSchCollectorVersionFileDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionLogApi.java index 0bdd347..6485360 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionLogApi.java @@ -1,19 +1,16 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.AddSchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.EditSchCollectorVersionLogDTO; +import com.docus.server.dto.scheduling.management.schcollectorversionlog.DeleteSchCollectorVersionLogDTO; import com.docus.server.vo.scheduling.management.SchCollectorVersionLogVO; +import com.docus.server.entity.scheduling.management.SchCollectorVersionLog; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -22,11 +19,11 @@ import java.util.List; * 采集器版本更新日志管理 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "采集器版本更新日志管理任务管理接口", tags = "采集器版本更新日志管理任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorVersionLogApi") -@RequestMapping("/sch/collectorVersionLog") +@RequestMapping("/schCollectorVersionLog") public interface SchCollectorVersionLogApi { /** @@ -40,42 +37,42 @@ public interface SchCollectorVersionLogApi { SchCollectorVersionLogVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schCollectorVersionLogDTO 新增参数 + * @param addSchCollectorVersionLogDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchCollectorVersionLogDTO schCollectorVersionLogDTO); + boolean add(@RequestBody AddSchCollectorVersionLogDTO addSchCollectorVersionLogDTO); /** * 编辑 * - * @param schCollectorVersionLogDTO 编辑参数 + * @param editSchCollectorVersionLogDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchCollectorVersionLogDTO schCollectorVersionLogDTO); + boolean edit(@RequestBody EditSchCollectorVersionLogDTO editSchCollectorVersionLogDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchCollectorVersionLogDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchCollectorVersionLogDTO deleteSchCollectorVersionLogDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchOperationLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchOperationLogApi.java index a2c90cd..a32df80 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchOperationLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchOperationLogApi.java @@ -1,19 +1,16 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.AddSchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.EditSchOperationLogDTO; +import com.docus.server.dto.scheduling.management.schoperationlog.DeleteSchOperationLogDTO; import com.docus.server.vo.scheduling.management.SchOperationLogVO; +import com.docus.server.entity.scheduling.management.SchOperationLog; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -22,11 +19,11 @@ import java.util.List; * 采集调度器操作日志 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "采集调度器操作日志任务管理接口", tags = "采集调度器操作日志任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchOperationLogApi") -@RequestMapping("/sch/operationLog") +@RequestMapping("/schOperationLog") public interface SchOperationLogApi { /** @@ -40,42 +37,42 @@ public interface SchOperationLogApi { SchOperationLogVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schOperationLogDTO 新增参数 + * @param addSchOperationLogDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchOperationLogDTO schOperationLogDTO); + boolean add(@RequestBody AddSchOperationLogDTO addSchOperationLogDTO); /** * 编辑 * - * @param schOperationLogDTO 编辑参数 + * @param editSchOperationLogDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchOperationLogDTO schOperationLogDTO); + boolean edit(@RequestBody EditSchOperationLogDTO editSchOperationLogDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchOperationLogDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchOperationLogDTO deleteSchOperationLogDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchSystemParamsApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchSystemParamsApi.java index e35d646..f47f6f1 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchSystemParamsApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchSystemParamsApi.java @@ -1,19 +1,16 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.AddSchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.EditSchSystemParamsDTO; +import com.docus.server.dto.scheduling.management.schsystemparams.DeleteSchSystemParamsDTO; import com.docus.server.vo.scheduling.management.SchSystemParamsVO; +import com.docus.server.entity.scheduling.management.SchSystemParams; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -22,11 +19,11 @@ import java.util.List; * 系统参数表 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "系统参数表任务管理接口", tags = "系统参数表任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchSystemParamsApi") -@RequestMapping("/sch/systemParams") +@RequestMapping("/schSystemParams") public interface SchSystemParamsApi { /** @@ -40,42 +37,42 @@ public interface SchSystemParamsApi { SchSystemParamsVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schSystemParamsDTO 新增参数 + * @param addSchSystemParamsDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchSystemParamsDTO schSystemParamsDTO); + boolean add(@RequestBody AddSchSystemParamsDTO addSchSystemParamsDTO); /** * 编辑 * - * @param schSystemParamsDTO 编辑参数 + * @param editSchSystemParamsDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchSystemParamsDTO schSystemParamsDTO); + boolean edit(@RequestBody EditSchSystemParamsDTO editSchSystemParamsDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchSystemParamsDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchSystemParamsDTO deleteSchSystemParamsDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchTerminatorApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchTerminatorApi.java index 6dbb79f..d2912d0 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchTerminatorApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchTerminatorApi.java @@ -1,32 +1,26 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; +import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.AddSchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.DeleteSchTerminatorDTO; +import com.docus.server.dto.scheduling.management.schterminator.EditSchTerminatorDTO; import com.docus.server.vo.scheduling.management.SchTerminatorVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -import java.util.List; +import org.springframework.web.bind.annotation.*; /** * 执行管理器 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "执行管理器任务管理接口", tags = "执行管理器任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchTerminatorApi") -@RequestMapping("/sch/terminator") +@RequestMapping("/schTerminator") public interface SchTerminatorApi { /** @@ -40,42 +34,42 @@ public interface SchTerminatorApi { SchTerminatorVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schTerminatorDTO 新增参数 + * @param addSchTerminatorDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchTerminatorDTO schTerminatorDTO); + boolean add(@RequestBody AddSchTerminatorDTO addSchTerminatorDTO); /** * 编辑 * - * @param schTerminatorDTO 编辑参数 + * @param editSchTerminatorDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchTerminatorDTO schTerminatorDTO); + boolean edit(@RequestBody EditSchTerminatorDTO editSchTerminatorDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchTerminatorDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchTerminatorDTO deleteSchTerminatorDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchVirtualLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchVirtualLogApi.java index e7bc9f0..7a0f6ce 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchVirtualLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchVirtualLogApi.java @@ -1,19 +1,16 @@ package com.docus.server.api.scheduling.management; -import com.docus.infrastructure.web.request.SearchRequest; -import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.dto.scheduling.management.SchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.AddSchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.EditSchVirtualLogDTO; +import com.docus.server.dto.scheduling.management.schvirtuallog.DeleteSchVirtualLogDTO; import com.docus.server.vo.scheduling.management.SchVirtualLogVO; +import com.docus.server.entity.scheduling.management.SchVirtualLog; +import org.springframework.cloud.openfeign.FeignClient; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -22,11 +19,11 @@ import java.util.List; * 虚拟机使用情况 API * * @author AutoGenerator - * @since 2023-07-14 + * @since 2023-07-15 */ @Api(value = "虚拟机使用情况任务管理接口", tags = "虚拟机使用情况任务管理接口") @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchVirtualLogApi") -@RequestMapping("/sch/virtualLog") +@RequestMapping("/schVirtualLog") public interface SchVirtualLogApi { /** @@ -40,42 +37,42 @@ public interface SchVirtualLogApi { SchVirtualLogVO findById(@PathVariable(value = "id") String id); /** - * 关键字搜素 + * 关键字搜索 * - * @param searchRequest 搜索参数 + * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @ApiOperation("关键字搜索") @PostMapping("/search") - PageResult search(@RequestBody SearchRequest searchRequest); + PageResult search(@RequestBody SearchDTO searchDTO); /** * 新增 * - * @param schVirtualLogDTO 新增参数 + * @param addSchVirtualLogDTO 新增参数 * @return 成功或失败 */ @ApiOperation("新增") @PostMapping("/add") - boolean add(@RequestBody SchVirtualLogDTO schVirtualLogDTO); + boolean add(@RequestBody AddSchVirtualLogDTO addSchVirtualLogDTO); /** * 编辑 * - * @param schVirtualLogDTO 编辑参数 + * @param editSchVirtualLogDTO 编辑参数 * @return 成功或失败 */ @ApiOperation("编辑") @PutMapping("/edit") - boolean edit(@RequestBody SchVirtualLogDTO schVirtualLogDTO); + boolean edit(@RequestBody EditSchVirtualLogDTO editSchVirtualLogDTO); /** * 批量删除 * - * @param ids 主键ids + * @param deleteSchVirtualLogDTO 删除参数 * @return 成功或失败 */ @ApiOperation("批量删除") @DeleteMapping("/delete") - int delete(@RequestBody List ids); + int delete(@RequestBody DeleteSchVirtualLogDTO deleteSchVirtualLogDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionFileDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionFileDTO.java deleted file mode 100644 index 36e1f1a..0000000 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionFileDTO.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.docus.server.dto.scheduling.management; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 采集器版本列表更新包管理 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ -@Data -@ApiModel(value = "SchCollectorVersionFileDTO对象", description = "采集器版本列表更新包管理") -public class SchCollectorVersionFileDTO implements Serializable { - - @ApiModelProperty(value = "主键") - private Long id; - - @ApiModelProperty(value = "采集器管理版本id") - private Long collectorVersionId; - - @ApiModelProperty(value = "采集器管理id") - private Long collectorId; - - @ApiModelProperty(value = "文件标题") - private String fileTitle; - - @ApiModelProperty(value = "文件目录 单纯文件夹路径，不带文件名，如：F:\嘉时\新建文件夹\") - private String imagePath; - - @ApiModelProperty(value = "文件名称") - private String fileName; - - @ApiModelProperty(value = "文件大小") - private Integer fileSize; - - @ApiModelProperty(value = "文件类型") - private String fileType; - - @ApiModelProperty(value = "是否作废 1：是；0：否") - private Integer state; - - @ApiModelProperty(value = "入库时间") - private LocalDateTime createTime; - - @ApiModelProperty(value = "入库更新时间") - private LocalDateTime updateTime; -} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/AddSchCollectErrorLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/AddSchCollectErrorLogDTO.java new file mode 100644 index 0000000..70fe63f --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/AddSchCollectErrorLogDTO.java @@ -0,0 +1,62 @@ +package com.docus.server.dto.scheduling.management.schcollecterrorlog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 采集器异常日志 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="AddSchCollectErrorLogDTO对象", description="采集器异常日志") +public class AddSchCollectErrorLogDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "采集器终端ip") + private String terminatorIp; + + @ApiModelProperty(value = "采集器id") + private Long collectorId; + + @ApiModelProperty(value = "采集记录主键id") + private Long collectRecordId; + + @ApiModelProperty(value = "任务id") + private Long taskId; + + @ApiModelProperty(value = "0：不是重试任务，1：是重试任务") + private String isRetryTask; + + @ApiModelProperty(value = "异常等级") + private String level; + + @ApiModelProperty(value = "异常描述") + private String description; + + @ApiModelProperty(value = "异常信息") + private String exceptionInfo; + + @ApiModelProperty(value = "本地存储路径") + private String screenPath; + + @ApiModelProperty(value = "产生时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/DeleteSchCollectErrorLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/DeleteSchCollectErrorLogDTO.java new file mode 100644 index 0000000..bbd074a --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/DeleteSchCollectErrorLogDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schcollecterrorlog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 采集器异常日志 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchCollectErrorLogDTO对象", description="采集器异常日志") +public class DeleteSchCollectErrorLogDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectErrorLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/EditSchCollectErrorLogDTO.java similarity index 75% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectErrorLogDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/EditSchCollectErrorLogDTO.java index 3e00a1f..f2a499b 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectErrorLogDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollecterrorlog/EditSchCollectErrorLogDTO.java @@ -1,21 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schcollecterrorlog; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器异常日志 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器异常日志 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectErrorLogDTO对象", description = "采集器异常日志") -public class SchCollectErrorLogDTO implements Serializable { +@ApiModel(value="EditSchCollectErrorLogDTO对象", description="采集器异常日志") +public class EditSchCollectErrorLogDTO implements Serializable { @ApiModelProperty(value = "主键") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/AddSchCollectorDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/AddSchCollectorDTO.java new file mode 100644 index 0000000..c29e623 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/AddSchCollectorDTO.java @@ -0,0 +1,50 @@ +package com.docus.server.dto.scheduling.management.schcollector; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 采集器管理 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="AddSchCollectorDTO对象", description="采集器管理") +public class AddSchCollectorDTO implements Serializable { + + @ApiModelProperty(value = "主键（采集器id）") + private Long id; + + @ApiModelProperty(value = "采集器id") + private Long collectorVersionId; + + @ApiModelProperty(value = "采集语言") + private String collectLanguage; + + @ApiModelProperty(value = "采集器类型") + private CollectTypeEnum collectType; + + @ApiModelProperty(value = "启动方式") + private String startMode; + + @ApiModelProperty(value = "采集器任务超时时间") + private Long taskTimeout; + + @ApiModelProperty(value = "入库时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/DeleteSchCollectorDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/DeleteSchCollectorDTO.java new file mode 100644 index 0000000..825a64e --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/DeleteSchCollectorDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schcollector; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 采集器管理 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchCollectorDTO对象", description="采集器管理") +public class DeleteSchCollectorDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/EditSchCollectorDTO.java similarity index 70% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/EditSchCollectorDTO.java index f2ee088..05826e7 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollector/EditSchCollectorDTO.java @@ -1,22 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schcollector; -import com.docus.server.enums.CollectTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器管理 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器管理 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectorDTO对象", description = "采集器管理") -public class SchCollectorDTO implements Serializable { +@ApiModel(value="EditSchCollectorDTO对象", description="采集器管理") +public class EditSchCollectorDTO implements Serializable { @ApiModelProperty(value = "主键（采集器id）") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/AddSchCollectorConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/AddSchCollectorConfigDTO.java new file mode 100644 index 0000000..85e786e --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/AddSchCollectorConfigDTO.java @@ -0,0 +1,44 @@ +package com.docus.server.dto.scheduling.management.schcollectorconfig; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 采集器配置 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="AddSchCollectorConfigDTO对象", description="采集器配置") +public class AddSchCollectorConfigDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "采集器id") + private Long collectorId; + + @ApiModelProperty(value = "配置类型，0：采集器公共配置，1：采集器私有配置") + private String configType; + + @ApiModelProperty(value = "配置参数") + private String configJson; + + @ApiModelProperty(value = "产生时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/DeleteSchCollectorConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/DeleteSchCollectorConfigDTO.java new file mode 100644 index 0000000..6d714b7 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/DeleteSchCollectorConfigDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schcollectorconfig; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 采集器配置 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchCollectorConfigDTO对象", description="采集器配置") +public class DeleteSchCollectorConfigDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorConfigDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/EditSchCollectorConfigDTO.java similarity index 65% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorConfigDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/EditSchCollectorConfigDTO.java index 3c94abb..d22974f 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorConfigDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorconfig/EditSchCollectorConfigDTO.java @@ -1,21 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schcollectorconfig; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器配置 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器配置 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectorConfigDTO对象", description = "采集器配置") -public class SchCollectorConfigDTO implements Serializable { +@ApiModel(value="EditSchCollectorConfigDTO对象", description="采集器配置") +public class EditSchCollectorConfigDTO implements Serializable { @ApiModelProperty(value = "主键") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/AddSchCollectorVersionDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/AddSchCollectorVersionDTO.java new file mode 100644 index 0000000..41f2058 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/AddSchCollectorVersionDTO.java @@ -0,0 +1,41 @@ +package com.docus.server.dto.scheduling.management.schcollectorversion; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 采集器版本列表管理 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="AddSchCollectorVersionDTO对象", description="采集器版本列表管理") +public class AddSchCollectorVersionDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "采集器管理id") + private Long collectorId; + + @ApiModelProperty(value = "版本号") + private String collectVersion; + + @ApiModelProperty(value = "入库时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/DeleteSchCollectorVersionDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/DeleteSchCollectorVersionDTO.java new file mode 100644 index 0000000..a0c73bd --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/DeleteSchCollectorVersionDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schcollectorversion; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 采集器版本列表管理 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchCollectorVersionDTO对象", description="采集器版本列表管理") +public class DeleteSchCollectorVersionDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/EditSchCollectorVersionDTO.java similarity index 60% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/EditSchCollectorVersionDTO.java index c0eab10..9dda749 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversion/EditSchCollectorVersionDTO.java @@ -1,21 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schcollectorversion; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器版本列表管理 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器版本列表管理 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectorVersionDTO对象", description = "采集器版本列表管理") -public class SchCollectorVersionDTO implements Serializable { +@ApiModel(value="EditSchCollectorVersionDTO对象", description="采集器版本列表管理") +public class EditSchCollectorVersionDTO implements Serializable { @ApiModelProperty(value = "主键") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/AddSchCollectorVersionFileDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/AddSchCollectorVersionFileDTO.java new file mode 100644 index 0000000..756ad3f --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/AddSchCollectorVersionFileDTO.java @@ -0,0 +1,59 @@ +package com.docus.server.dto.scheduling.management.schcollectorversionfile; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 采集器版本列表更新包管理 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="AddSchCollectorVersionFileDTO对象", description="采集器版本列表更新包管理") +public class AddSchCollectorVersionFileDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "采集器管理版本id") + private Long collectorVersionId; + + @ApiModelProperty(value = "采集器管理id") + private Long collectorId; + + @ApiModelProperty(value = "文件标题") + private String fileTitle; + + @ApiModelProperty(value = "文件目录 单纯文件夹路径，不带文件名，如：F:\\嘉时\\新建文件夹\\") + private String imagePath; + + @ApiModelProperty(value = "文件名称") + private String fileName; + + @ApiModelProperty(value = "文件大小") + private Integer fileSize; + + @ApiModelProperty(value = "文件类型") + private String fileType; + + @ApiModelProperty(value = "是否作废 1：是；0：否") + private Integer state; + + @ApiModelProperty(value = "入库时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/DeleteSchCollectorVersionFileDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/DeleteSchCollectorVersionFileDTO.java new file mode 100644 index 0000000..0201adc --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/DeleteSchCollectorVersionFileDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schcollectorversionfile; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 采集器版本列表更新包管理 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchCollectorVersionFileDTO对象", description="采集器版本列表更新包管理") +public class DeleteSchCollectorVersionFileDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/EditSchCollectorVersionFileDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/EditSchCollectorVersionFileDTO.java new file mode 100644 index 0000000..c404480 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionfile/EditSchCollectorVersionFileDTO.java @@ -0,0 +1,59 @@ +package com.docus.server.dto.scheduling.management.schcollectorversionfile; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 采集器版本列表更新包管理 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="EditSchCollectorVersionFileDTO对象", description="采集器版本列表更新包管理") +public class EditSchCollectorVersionFileDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "采集器管理版本id") + private Long collectorVersionId; + + @ApiModelProperty(value = "采集器管理id") + private Long collectorId; + + @ApiModelProperty(value = "文件标题") + private String fileTitle; + + @ApiModelProperty(value = "文件目录 单纯文件夹路径，不带文件名，如：F:\\嘉时\\新建文件夹\\") + private String imagePath; + + @ApiModelProperty(value = "文件名称") + private String fileName; + + @ApiModelProperty(value = "文件大小") + private Integer fileSize; + + @ApiModelProperty(value = "文件类型") + private String fileType; + + @ApiModelProperty(value = "是否作废 1：是；0：否") + private Integer state; + + @ApiModelProperty(value = "入库时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/AddSchCollectorVersionLogDTO.java similarity index 69% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionLogDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/AddSchCollectorVersionLogDTO.java index 476d8b6..cf8a198 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionLogDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/AddSchCollectorVersionLogDTO.java @@ -1,21 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schcollectorversionlog; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器版本更新日志管理 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器版本更新日志管理 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectorVersionLogDTO对象", description = "采集器版本更新日志管理") -public class SchCollectorVersionLogDTO implements Serializable { +@ApiModel(value="AddSchCollectorVersionLogDTO对象", description="采集器版本更新日志管理") +public class AddSchCollectorVersionLogDTO implements Serializable { @ApiModelProperty(value = "主键") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/DeleteSchCollectorVersionLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/DeleteSchCollectorVersionLogDTO.java new file mode 100644 index 0000000..5f0802f --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/DeleteSchCollectorVersionLogDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schcollectorversionlog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 采集器版本更新日志管理 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchCollectorVersionLogDTO对象", description="采集器版本更新日志管理") +public class DeleteSchCollectorVersionLogDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/EditSchCollectorVersionLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/EditSchCollectorVersionLogDTO.java new file mode 100644 index 0000000..96f048c --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectorversionlog/EditSchCollectorVersionLogDTO.java @@ -0,0 +1,56 @@ +package com.docus.server.dto.scheduling.management.schcollectorversionlog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 采集器版本更新日志管理 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="EditSchCollectorVersionLogDTO对象", description="采集器版本更新日志管理") +public class EditSchCollectorVersionLogDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "采集器管理版本id") + private Long collectorVersionId; + + @ApiModelProperty(value = "采集器管理id") + private Long collectorId; + + @ApiModelProperty(value = "操作模块") + private String operationModule; + + @ApiModelProperty(value = "操作类型") + private String operationType; + + @ApiModelProperty(value = "操作描述") + private String operationDesc; + + @ApiModelProperty(value = "操作内容") + private String operationContent; + + @ApiModelProperty(value = "执行状态0：成功，1:失败") + private Integer state; + + @ApiModelProperty(value = "入库时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/AddSchCollectRecordDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/AddSchCollectRecordDTO.java new file mode 100644 index 0000000..c9f00ab --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/AddSchCollectRecordDTO.java @@ -0,0 +1,74 @@ +package com.docus.server.dto.scheduling.management.schcollectrecord; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 采集记录表 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="AddSchCollectRecordDTO对象", description="采集记录表") +public class AddSchCollectRecordDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "终端主键") + private Long terminatorId; + + @ApiModelProperty(value = "采集器类型") + private String collectorType; + + @ApiModelProperty(value = "任务id") + private Long taskId; + + @ApiModelProperty(value = "任务名称") + private String taskName; + + @ApiModelProperty(value = "任务描述") + private String taskMemo; + + @ApiModelProperty(value = "任务起始时间范围") + private LocalDateTime startTime; + + @ApiModelProperty(value = "任务结束时间范围") + private LocalDateTime endTime; + + @ApiModelProperty(value = "任务耗时时间,单位：毫秒") + private Long elapsedTime; + + @ApiModelProperty(value = "任务详细信息") + private String taskDetailInfo; + + @ApiModelProperty(value = "任务执行状态，0：成功，1：失败") + private String taskExecState; + + @ApiModelProperty(value = "子任务执行状态：0：接收，1：启动，2：异常，3：推迟，4：完成，5：作废") + private String subTaskExecState; + + @ApiModelProperty(value = "最近一次任务执行失败原因") + private String lastTaskErrorMsg; + + @ApiModelProperty(value = "入库时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "redis队列任务原始报文") + private String taskOriginJson; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/DeleteSchCollectRecordDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/DeleteSchCollectRecordDTO.java new file mode 100644 index 0000000..cbace31 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/DeleteSchCollectRecordDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schcollectrecord; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 采集记录表 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchCollectRecordDTO对象", description="采集记录表") +public class DeleteSchCollectRecordDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectRecordDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/EditSchCollectRecordDTO.java similarity index 81% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectRecordDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/EditSchCollectRecordDTO.java index e749826..753a0d8 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectRecordDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecord/EditSchCollectRecordDTO.java @@ -1,21 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schcollectrecord; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集记录表 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集记录表 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectRecordDTO对象", description = "采集记录表") -public class SchCollectRecordDTO implements Serializable { +@ApiModel(value="EditSchCollectRecordDTO对象", description="采集记录表") +public class EditSchCollectRecordDTO implements Serializable { @ApiModelProperty(value = "主键") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectRecordRetryLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/AddSchCollectRecordRetryLogDTO.java similarity index 76% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectRecordRetryLogDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/AddSchCollectRecordRetryLogDTO.java index bea5168..3e81d1d 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectRecordRetryLogDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/AddSchCollectRecordRetryLogDTO.java @@ -1,22 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schcollectrecordretrylog; -import com.docus.server.enums.CollectTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集记录表重试表 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集记录表重试表 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectRecordRetryLogDTO对象", description = "采集记录表重试表") -public class SchCollectRecordRetryLogDTO implements Serializable { +@ApiModel(value="AddSchCollectRecordRetryLogDTO对象", description="采集记录表重试表") +public class AddSchCollectRecordRetryLogDTO implements Serializable { @ApiModelProperty(value = "主键") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/DeleteSchCollectRecordRetryLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/DeleteSchCollectRecordRetryLogDTO.java new file mode 100644 index 0000000..e62d363 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/DeleteSchCollectRecordRetryLogDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schcollectrecordretrylog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 采集记录表重试表 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchCollectRecordRetryLogDTO对象", description="采集记录表重试表") +public class DeleteSchCollectRecordRetryLogDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/EditSchCollectRecordRetryLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/EditSchCollectRecordRetryLogDTO.java new file mode 100644 index 0000000..01b71b6 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schcollectrecordretrylog/EditSchCollectRecordRetryLogDTO.java @@ -0,0 +1,68 @@ +package com.docus.server.dto.scheduling.management.schcollectrecordretrylog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 采集记录表重试表 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="EditSchCollectRecordRetryLogDTO对象", description="采集记录表重试表") +public class EditSchCollectRecordRetryLogDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "采集记录表id") + private Long collectRecordId; + + @ApiModelProperty(value = "终端主键") + private Long terminatorId; + + @ApiModelProperty(value = "采集器类型") + private CollectTypeEnum collectType; + + @ApiModelProperty(value = "任务id") + private Long taskId; + + @ApiModelProperty(value = "任务名称") + private String taskName; + + @ApiModelProperty(value = "任务描述") + private String taskMemo; + + @ApiModelProperty(value = "数据起始时间范围") + private LocalDateTime startTime; + + @ApiModelProperty(value = "数据结束时间范围") + private LocalDateTime endTime; + + @ApiModelProperty(value = "任务详细信息") + private String taskDetailInfo; + + @ApiModelProperty(value = "任务执行状态，0：成功，1：失败") + private String taskExecState; + + @ApiModelProperty(value = "最近一次任务执行失败原因") + private String lastTaskErrorMsg; + + @ApiModelProperty(value = "入库时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/AddSchOperationLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/AddSchOperationLogDTO.java new file mode 100644 index 0000000..6402b2c --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/AddSchOperationLogDTO.java @@ -0,0 +1,50 @@ +package com.docus.server.dto.scheduling.management.schoperationlog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 采集调度器操作日志 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="AddSchOperationLogDTO对象", description="采集调度器操作日志") +public class AddSchOperationLogDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "操作模块") + private String operationModule; + + @ApiModelProperty(value = "操作类型") + private String operationType; + + @ApiModelProperty(value = "操作描述") + private String operationDesc; + + @ApiModelProperty(value = "操作内容") + private String operationContent; + + @ApiModelProperty(value = "执行状态0：成功，1:失败") + private Integer state; + + @ApiModelProperty(value = "入库时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/DeleteSchOperationLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/DeleteSchOperationLogDTO.java new file mode 100644 index 0000000..9c6ca65 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/DeleteSchOperationLogDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schoperationlog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 采集调度器操作日志 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchOperationLogDTO对象", description="采集调度器操作日志") +public class DeleteSchOperationLogDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchOperationLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/EditSchOperationLogDTO.java similarity index 69% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchOperationLogDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/EditSchOperationLogDTO.java index 3998846..f782d54 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchOperationLogDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schoperationlog/EditSchOperationLogDTO.java @@ -1,21 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schoperationlog; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集调度器操作日志 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集调度器操作日志 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchOperationLogDTO对象", description = "采集调度器操作日志") -public class SchOperationLogDTO implements Serializable { +@ApiModel(value="EditSchOperationLogDTO对象", description="采集调度器操作日志") +public class EditSchOperationLogDTO implements Serializable { @ApiModelProperty(value = "主键") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/AddSchSystemParamsDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/AddSchSystemParamsDTO.java new file mode 100644 index 0000000..d35de53 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/AddSchSystemParamsDTO.java @@ -0,0 +1,59 @@ +package com.docus.server.dto.scheduling.management.schsystemparams; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 系统参数表 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="AddSchSystemParamsDTO对象", description="系统参数表") +public class AddSchSystemParamsDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "父主键") + private Long parentId; + + @ApiModelProperty(value = "系统参数编号") + private String paramCode; + + @ApiModelProperty(value = "系统参数名称") + private String paramName; + + @ApiModelProperty(value = "系统参数说明，如说明参数值得格式要求") + private String paramInfo; + + @ApiModelProperty(value = "系统参数值") + private String paramValue; + + @ApiModelProperty(value = "系统参数分组") + private String paramGroup; + + @ApiModelProperty(value = "排序号，用于分组内排序") + private Integer sortNo; + + @ApiModelProperty(value = "是否需要加密，0：不需要，1：需要") + private String needEncrypt; + + @ApiModelProperty(value = "入库时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/DeleteSchSystemParamsDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/DeleteSchSystemParamsDTO.java new file mode 100644 index 0000000..e5e8a52 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/DeleteSchSystemParamsDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schsystemparams; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 系统参数表 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchSystemParamsDTO对象", description="系统参数表") +public class DeleteSchSystemParamsDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchSystemParamsDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/EditSchSystemParamsDTO.java similarity index 75% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchSystemParamsDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/EditSchSystemParamsDTO.java index 809ece2..6c45b91 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchSystemParamsDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schsystemparams/EditSchSystemParamsDTO.java @@ -1,21 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schsystemparams; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 系统参数表 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 系统参数表 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchSystemParamsDTO对象", description = "系统参数表") -public class SchSystemParamsDTO implements Serializable { +@ApiModel(value="EditSchSystemParamsDTO对象", description="系统参数表") +public class EditSchSystemParamsDTO implements Serializable { @ApiModelProperty(value = "主键") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/AddSchTerminatorDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/AddSchTerminatorDTO.java new file mode 100644 index 0000000..8ffe9ca --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/AddSchTerminatorDTO.java @@ -0,0 +1,65 @@ +package com.docus.server.dto.scheduling.management.schterminator; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 执行管理器 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="AddSchTerminatorDTO对象", description="执行管理器") +public class AddSchTerminatorDTO implements Serializable { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "终端IP") + private String terminatorIp; + + @ApiModelProperty(value = "资源管理器名称") + private String terminatorName; + + @ApiModelProperty(value = "只干某些任务，任务偏好属性") + private String onlyCollectorIds; + + @ApiModelProperty(value = "优先干某些任务，任务偏好属性（优先给哪个采集器，若不空闲再给任意采集器）") + private String priorityCollectorIds; + + @ApiModelProperty(value = "是否限制采集器类型，0：否，1：是") + private String restrictState; + + @ApiModelProperty(value = "忙闲状态，0：空闲，1：繁忙") + private String busyState; + + @ApiModelProperty(value = "在线状态，0：离线，1：在线") + private String onlineState; + + @ApiModelProperty(value = "最近任务执行时间") + private LocalDateTime lastTaskExecTime; + + @ApiModelProperty(value = "正在执行任务的名称") + private String executingTaskName; + + @ApiModelProperty(value = "最近一次任务执行失败原因") + private String lastTaskErrorMsg; + + @ApiModelProperty(value = "入库时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "入库更新时间") + private LocalDateTime updateTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/DeleteSchTerminatorDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/DeleteSchTerminatorDTO.java new file mode 100644 index 0000000..f40bb00 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/DeleteSchTerminatorDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schterminator; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 执行管理器 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchTerminatorDTO对象", description="执行管理器") +public class DeleteSchTerminatorDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchTerminatorDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/EditSchTerminatorDTO.java similarity index 80% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchTerminatorDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/EditSchTerminatorDTO.java index 214cffe..a1a4730 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchTerminatorDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schterminator/EditSchTerminatorDTO.java @@ -1,21 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schterminator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 执行管理器 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 执行管理器 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchTerminatorDTO对象", description = "执行管理器") -public class SchTerminatorDTO implements Serializable { +@ApiModel(value="EditSchTerminatorDTO对象", description="执行管理器") +public class EditSchTerminatorDTO implements Serializable { @ApiModelProperty(value = "主键") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/AddSchVirtualLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/AddSchVirtualLogDTO.java new file mode 100644 index 0000000..a2deffb --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/AddSchVirtualLogDTO.java @@ -0,0 +1,59 @@ +package com.docus.server.dto.scheduling.management.schvirtuallog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 虚拟机使用情况 AddDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="AddSchVirtualLogDTO对象", description="虚拟机使用情况") +public class AddSchVirtualLogDTO implements Serializable { + + @ApiModelProperty(value = "终端id") + private Long id; + + @ApiModelProperty(value = "CPU使用率") + private String cpuUtilization; + + @ApiModelProperty(value = "物理内存总量（单位：MB）") + private Double memoryTotal; + + @ApiModelProperty(value = "物理内存余量（单位：MB）") + private Double memoryAllowance; + + @ApiModelProperty(value = "当前网络上行速率(KBPS)") + private String uplinkRate; + + @ApiModelProperty(value = "当前网络下行速率") + private String descendingRate; + + @ApiModelProperty(value = "采集器终端ip地址") + private String ip; + + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + + @ApiModelProperty(value = "客户端创建时间") + private LocalDateTime clientTime; + + @ApiModelProperty(value = "多个磁盘大小（单位：MB），当前使用量和总容量（单位：MB）") + private String diskJson; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/DeleteSchVirtualLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/DeleteSchVirtualLogDTO.java new file mode 100644 index 0000000..ab1942e --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/DeleteSchVirtualLogDTO.java @@ -0,0 +1,28 @@ +package com.docus.server.dto.scheduling.management.schvirtuallog; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.util.List; + +/** +* +* 虚拟机使用情况 DeleteDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ +@Data +@ApiModel(value="DeleteSchVirtualLogDTO对象", description="虚拟机使用情况") +public class DeleteSchVirtualLogDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchVirtualLogDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/EditSchVirtualLogDTO.java similarity index 76% rename from docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchVirtualLogDTO.java rename to docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/EditSchVirtualLogDTO.java index c387f5c..0bb2db4 100644 --- a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchVirtualLogDTO.java +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/schvirtuallog/EditSchVirtualLogDTO.java @@ -1,21 +1,26 @@ -package com.docus.server.dto.scheduling.management; +package com.docus.server.dto.scheduling.management.schvirtuallog; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 虚拟机使用情况 DTO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 虚拟机使用情况 EditDTO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchVirtualLogDTO对象", description = "虚拟机使用情况") -public class SchVirtualLogDTO implements Serializable { +@ApiModel(value="EditSchVirtualLogDTO对象", description="虚拟机使用情况") +public class EditSchVirtualLogDTO implements Serializable { @ApiModelProperty(value = "终端id") private Long id; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectErrorLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectErrorLog.java index bd9cfed..365150e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectErrorLog.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectErrorLog.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 采集器异常日志 - *

+* +* 采集器异常日志 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectRecord.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectRecord.java index 6c0a61c..78cb9ad 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectRecord.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectRecord.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 采集记录表 - *

+* +* 采集记录表 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectRecordRetryLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectRecordRetryLog.java index 516dce5..e3898da 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectRecordRetryLog.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectRecordRetryLog.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 采集记录表重试表 - *

+* +* 采集记录表重试表 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollector.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollector.java index 750741e..9395345 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollector.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollector.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 采集器管理 - *

+* +* 采集器管理 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorConfig.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorConfig.java index 97a7ac5..5049cb8 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorConfig.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorConfig.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 采集器配置 - *

+* +* 采集器配置 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersion.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersion.java index d7802cc..b8d6392 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersion.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersion.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 采集器版本列表管理 - *

+* +* 采集器版本列表管理 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersionFile.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersionFile.java index 89a7847..13182ce 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersionFile.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersionFile.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 采集器版本列表更新包管理 - *

+* +* 采集器版本列表更新包管理 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) @@ -44,7 +43,7 @@ public class SchCollectorVersionFile implements Serializable { @TableField("file_title") private String fileTitle; - @ApiModelProperty(value = "文件目录 单纯文件夹路径，不带文件名，如：F:\嘉时\新建文件夹\") + @ApiModelProperty(value = "文件目录 单纯文件夹路径，不带文件名，如：F:\\嘉时\\新建文件夹\\") @TableField("image_path") private String imagePath; diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersionLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersionLog.java index 9363d5d..2728e23 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersionLog.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchCollectorVersionLog.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 采集器版本更新日志管理 - *

+* +* 采集器版本更新日志管理 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchOperationLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchOperationLog.java index 5decddc..88be2e7 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchOperationLog.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchOperationLog.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 采集调度器操作日志 - *

+* +* 采集调度器操作日志 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchSystemParams.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchSystemParams.java index ba7424d..b356a66 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchSystemParams.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchSystemParams.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 系统参数表 - *

+* +* 系统参数表 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchTerminator.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchTerminator.java index 5026b0f..6261bca 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchTerminator.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchTerminator.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 执行管理器 - *

+* +* 执行管理器 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchVirtualLog.java b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchVirtualLog.java index 823649c..54c0a52 100644 --- a/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchVirtualLog.java +++ b/docus-client-interface/src/main/java/com/docus/server/entity/scheduling.management/SchVirtualLog.java @@ -15,12 +15,11 @@ import lombok.experimental.Accessors; import com.docus.server.enums.*; /** -*

- * 虚拟机使用情况 - *

+* +* 虚拟机使用情况 * * @author AutoGenerator -* @since 2023-07-14 +* @since 2023-07-15 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectErrorLogVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectErrorLogVO.java index 03e2d22..c0c0c6f 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectErrorLogVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectErrorLogVO.java @@ -3,18 +3,23 @@ package com.docus.server.vo.scheduling.management; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器异常日志 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器异常日志 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectErrorLogVO对象", description = "采集器异常日志") +@ApiModel(value="SchCollectErrorLogVO对象", description="采集器异常日志") public class SchCollectErrorLogVO implements Serializable { @ApiModelProperty(value = "主键") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectRecordRetryLogVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectRecordRetryLogVO.java index ddef776..606c93c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectRecordRetryLogVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectRecordRetryLogVO.java @@ -1,21 +1,25 @@ package com.docus.server.vo.scheduling.management; -import com.docus.server.enums.CollectTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集记录表重试表 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集记录表重试表 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectRecordRetryLogVO对象", description = "采集记录表重试表") +@ApiModel(value="SchCollectRecordRetryLogVO对象", description="采集记录表重试表") public class SchCollectRecordRetryLogVO implements Serializable { @ApiModelProperty(value = "主键") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectRecordVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectRecordVO.java index fb3a9af..a6b054c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectRecordVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectRecordVO.java @@ -3,18 +3,23 @@ package com.docus.server.vo.scheduling.management; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集记录表 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集记录表 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectRecordVO对象", description = "采集记录表") +@ApiModel(value="SchCollectRecordVO对象", description="采集记录表") public class SchCollectRecordVO implements Serializable { @ApiModelProperty(value = "主键") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorConfigVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorConfigVO.java index 7058728..247c335 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorConfigVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorConfigVO.java @@ -3,18 +3,23 @@ package com.docus.server.vo.scheduling.management; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器配置 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器配置 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectorConfigVO对象", description = "采集器配置") +@ApiModel(value="SchCollectorConfigVO对象", description="采集器配置") public class SchCollectorConfigVO implements Serializable { @ApiModelProperty(value = "主键") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVO.java index 17bbca7..f522132 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVO.java @@ -1,21 +1,25 @@ package com.docus.server.vo.scheduling.management; -import com.docus.server.enums.CollectTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器管理 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器管理 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectorVO对象", description = "采集器管理") +@ApiModel(value="SchCollectorVO对象", description="采集器管理") public class SchCollectorVO implements Serializable { @ApiModelProperty(value = "主键（采集器id）") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionFileVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionFileVO.java index fbc1884..0f42f03 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionFileVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionFileVO.java @@ -3,18 +3,23 @@ package com.docus.server.vo.scheduling.management; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器版本列表更新包管理 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器版本列表更新包管理 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectorVersionFileVO对象", description = "采集器版本列表更新包管理") +@ApiModel(value="SchCollectorVersionFileVO对象", description="采集器版本列表更新包管理") public class SchCollectorVersionFileVO implements Serializable { @ApiModelProperty(value = "主键") @@ -29,7 +34,7 @@ public class SchCollectorVersionFileVO implements Serializable { @ApiModelProperty(value = "文件标题") private String fileTitle; - @ApiModelProperty(value = "文件目录 单纯文件夹路径，不带文件名") + @ApiModelProperty(value = "文件目录 单纯文件夹路径，不带文件名，如：F:\\嘉时\\新建文件夹\\") private String imagePath; @ApiModelProperty(value = "文件名称") @@ -49,4 +54,6 @@ public class SchCollectorVersionFileVO implements Serializable { @ApiModelProperty(value = "入库更新时间") private LocalDateTime updateTime; + + } diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionLogVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionLogVO.java index 59b2fdf..8731384 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionLogVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionLogVO.java @@ -3,18 +3,23 @@ package com.docus.server.vo.scheduling.management; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器版本更新日志管理 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器版本更新日志管理 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectorVersionLogVO对象", description = "采集器版本更新日志管理") +@ApiModel(value="SchCollectorVersionLogVO对象", description="采集器版本更新日志管理") public class SchCollectorVersionLogVO implements Serializable { @ApiModelProperty(value = "主键") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionVO.java index 09e8b74..676477e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchCollectorVersionVO.java @@ -3,18 +3,23 @@ package com.docus.server.vo.scheduling.management; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集器版本列表管理 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集器版本列表管理 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchCollectorVersionVO对象", description = "采集器版本列表管理") +@ApiModel(value="SchCollectorVersionVO对象", description="采集器版本列表管理") public class SchCollectorVersionVO implements Serializable { @ApiModelProperty(value = "主键") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchOperationLogVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchOperationLogVO.java index bc03166..76d5e50 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchOperationLogVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchOperationLogVO.java @@ -3,18 +3,23 @@ package com.docus.server.vo.scheduling.management; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 采集调度器操作日志 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 采集调度器操作日志 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchOperationLogVO对象", description = "采集调度器操作日志") +@ApiModel(value="SchOperationLogVO对象", description="采集调度器操作日志") public class SchOperationLogVO implements Serializable { @ApiModelProperty(value = "主键") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchSystemParamsVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchSystemParamsVO.java index a33329b..fe3d349 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchSystemParamsVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchSystemParamsVO.java @@ -3,18 +3,23 @@ package com.docus.server.vo.scheduling.management; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 系统参数表 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 系统参数表 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchSystemParamsVO对象", description = "系统参数表") +@ApiModel(value="SchSystemParamsVO对象", description="系统参数表") public class SchSystemParamsVO implements Serializable { @ApiModelProperty(value = "主键") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchTerminatorVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchTerminatorVO.java index 759a72a..90c7330 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchTerminatorVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchTerminatorVO.java @@ -3,18 +3,23 @@ package com.docus.server.vo.scheduling.management; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 执行管理器 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 执行管理器 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchTerminatorVO对象", description = "执行管理器") +@ApiModel(value="SchTerminatorVO对象", description="执行管理器") public class SchTerminatorVO implements Serializable { @ApiModelProperty(value = "主键") diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchVirtualLogVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchVirtualLogVO.java index 71b547a..310dea1 100644 --- a/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchVirtualLogVO.java +++ b/docus-client-interface/src/main/java/com/docus/server/vo/scheduling.management/SchVirtualLogVO.java @@ -3,18 +3,23 @@ package com.docus.server.vo.scheduling.management; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; import java.io.Serializable; import java.time.LocalDateTime; /** - * 虚拟机使用情况 VO - * - * @author AutoGenerator - * @since 2023-07-14 - */ +* +* 虚拟机使用情况 VO +* +* @author AutoGenerator +* @since 2023-07-15 +*/ @Data -@ApiModel(value = "SchVirtualLogVO对象", description = "虚拟机使用情况") +@ApiModel(value="SchVirtualLogVO对象", description="虚拟机使用情况") public class SchVirtualLogVO implements Serializable { @ApiModelProperty(value = "终端id")