调整模版

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);
     }
 }

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<SchCollectErrorLogVO> search(SearchRequest searchRequest) {
-        return iSchCollectErrorLogService.search(searchRequest);
+    public PageResult<SchCollectErrorLogVO> 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<String> ids) {
-        return iSchCollectErrorLogService.delete(ids);
+    public int delete(DeleteSchCollectErrorLogDTO deleteSchCollectErrorLogDTO) {
+        return iSchCollectErrorLogService.delete(deleteSchCollectErrorLogDTO);
     }
 }

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<SchCollectRecordVO> search(SearchRequest searchRequest) {
-        return iSchCollectRecordService.search(searchRequest);
+    public PageResult<SchCollectRecordVO> 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<String> ids) {
-        return iSchCollectRecordService.delete(ids);
+    public int delete(DeleteSchCollectRecordDTO deleteSchCollectRecordDTO) {
+        return iSchCollectRecordService.delete(deleteSchCollectRecordDTO);
     }
 }

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<SchCollectRecordRetryLogVO> search(SearchRequest searchRequest) {
-        return iSchCollectRecordRetryLogService.search(searchRequest);
+    public PageResult<SchCollectRecordRetryLogVO> 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<String> ids) {
-        return iSchCollectRecordRetryLogService.delete(ids);
+    public int delete(DeleteSchCollectRecordRetryLogDTO deleteSchCollectRecordRetryLogDTO) {
+        return iSchCollectRecordRetryLogService.delete(deleteSchCollectRecordRetryLogDTO);
     }
 }

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<SchCollectorConfigVO> search(SearchRequest searchRequest) {
-        return iSchCollectorConfigService.search(searchRequest);
+    public PageResult<SchCollectorConfigVO> 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<String> ids) {
-        return iSchCollectorConfigService.delete(ids);
+    public int delete(DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO) {
+        return iSchCollectorConfigService.delete(deleteSchCollectorConfigDTO);
     }
 }

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<SchCollectorVO> search(SearchRequest searchRequest) {
-        return iSchCollectorService.search(searchRequest);
+    public PageResult<SchCollectorVO> 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<String> ids) {
-        return iSchCollectorService.delete(ids);
+    public int delete(DeleteSchCollectorDTO deleteSchCollectorDTO) {
+        return iSchCollectorService.delete(deleteSchCollectorDTO);
     }
 }

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<SchCollectorVersionVO> search(SearchRequest searchRequest) {
-        return iSchCollectorVersionService.search(searchRequest);
+    public PageResult<SchCollectorVersionVO> 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<String> ids) {
-        return iSchCollectorVersionService.delete(ids);
+    public int delete(DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO) {
+        return iSchCollectorVersionService.delete(deleteSchCollectorVersionDTO);
     }
 }

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<SchCollectorVersionFileVO> search(SearchRequest searchRequest) {
-        return iSchCollectorVersionFileService.search(searchRequest);
+    public PageResult<SchCollectorVersionFileVO> 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<String> ids) {
-        return iSchCollectorVersionFileService.delete(ids);
+    public int delete(DeleteSchCollectorVersionFileDTO deleteSchCollectorVersionFileDTO) {
+        return iSchCollectorVersionFileService.delete(deleteSchCollectorVersionFileDTO);
     }
 }

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<SchCollectorVersionLogVO> search(SearchRequest searchRequest) {
-        return iSchCollectorVersionLogService.search(searchRequest);
+    public PageResult<SchCollectorVersionLogVO> 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<String> ids) {
-        return iSchCollectorVersionLogService.delete(ids);
+    public int delete(DeleteSchCollectorVersionLogDTO deleteSchCollectorVersionLogDTO) {
+        return iSchCollectorVersionLogService.delete(deleteSchCollectorVersionLogDTO);
     }
 }

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<SchOperationLogVO> search(SearchRequest searchRequest) {
-        return iSchOperationLogService.search(searchRequest);
+    public PageResult<SchOperationLogVO> 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<String> ids) {
-        return iSchOperationLogService.delete(ids);
+    public int delete(DeleteSchOperationLogDTO deleteSchOperationLogDTO) {
+        return iSchOperationLogService.delete(deleteSchOperationLogDTO);
     }
 }

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<SchSystemParamsVO> search(SearchRequest searchRequest) {
-        return iSchSystemParamsService.search(searchRequest);
+    public PageResult<SchSystemParamsVO> 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<String> ids) {
-        return iSchSystemParamsService.delete(ids);
+    public int delete(DeleteSchSystemParamsDTO deleteSchSystemParamsDTO) {
+        return iSchSystemParamsService.delete(deleteSchSystemParamsDTO);
     }
 }

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<SchTerminatorVO> search(SearchRequest searchRequest) {
-        return iSchTerminatorService.search(searchRequest);
+    public PageResult<SchTerminatorVO> 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<String> ids) {
-        return iSchTerminatorService.delete(ids);
+    public int delete(DeleteSchTerminatorDTO deleteSchTerminatorDTO) {
+        return iSchTerminatorService.delete(deleteSchTerminatorDTO);
     }
 }

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<SchVirtualLogVO> search(SearchRequest searchRequest) {
-        return iSchVirtualLogService.search(searchRequest);
+    public PageResult<SchVirtualLogVO> 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<String> ids) {
-        return iSchVirtualLogService.delete(ids);
+    public int delete(DeleteSchVirtualLogDTO deleteSchVirtualLogDTO) {
+        return iSchVirtualLogService.delete(deleteSchVirtualLogDTO);
     }
 }

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<SchCollectErrorLog> convertAddDOList(List<AddSchCollectErrorLogDTO> addSchCollectErrorLogDTO);
 
     @Mappings({})
-    List<SchCollectErrorLog> convertDO(List<SchCollectErrorLogDTO> schCollectErrorLogDTOList);
+    List<SchCollectErrorLog> convertEditDOList(List<EditSchCollectErrorLogDTO> editSchCollectErrorLogDTO);
 
     @Mappings({})
     SchCollectErrorLogVO convertVO(SchCollectErrorLog schCollectErrorLog);

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<SchCollectRecord> convertAddDOList(List<AddSchCollectRecordDTO> addSchCollectRecordDTO);
 
     @Mappings({})
-    List<SchCollectRecord> convertDO(List<SchCollectRecordDTO> schCollectRecordDTOList);
+    List<SchCollectRecord> convertEditDOList(List<EditSchCollectRecordDTO> editSchCollectRecordDTO);
 
     @Mappings({})
     SchCollectRecordVO convertVO(SchCollectRecord schCollectRecord);

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<SchCollectRecordRetryLog> convertAddDOList(List<AddSchCollectRecordRetryLogDTO> addSchCollectRecordRetryLogDTO);
 
     @Mappings({})
-    List<SchCollectRecordRetryLog> convertDO(List<SchCollectRecordRetryLogDTO> schCollectRecordRetryLogDTOList);
+    List<SchCollectRecordRetryLog> convertEditDOList(List<EditSchCollectRecordRetryLogDTO> editSchCollectRecordRetryLogDTO);
 
     @Mappings({})
     SchCollectRecordRetryLogVO convertVO(SchCollectRecordRetryLog schCollectRecordRetryLog);

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<SchCollectorConfig> convertAddDOList(List<AddSchCollectorConfigDTO> addSchCollectorConfigDTO);
 
     @Mappings({})
-    List<SchCollectorConfig> convertDO(List<SchCollectorConfigDTO> schCollectorConfigDTOList);
+    List<SchCollectorConfig> convertEditDOList(List<EditSchCollectorConfigDTO> editSchCollectorConfigDTO);
 
     @Mappings({})
     SchCollectorConfigVO convertVO(SchCollectorConfig schCollectorConfig);

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<SchCollector> convertAddDOList(List<AddSchCollectorDTO> addSchCollectorDTO);
 
     @Mappings({})
-    List<SchCollector> convertDO(List<SchCollectorDTO> schCollectorDTOList);
+    List<SchCollector> convertEditDOList(List<EditSchCollectorDTO> editSchCollectorDTO);
 
     @Mappings({})
     SchCollectorVO convertVO(SchCollector schCollector);

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<SchCollectorVersion> convertAddDOList(List<AddSchCollectorVersionDTO> addSchCollectorVersionDTO);
 
     @Mappings({})
-    List<SchCollectorVersion> convertDO(List<SchCollectorVersionDTO> schCollectorVersionDTOList);
+    List<SchCollectorVersion> convertEditDOList(List<EditSchCollectorVersionDTO> editSchCollectorVersionDTO);
 
     @Mappings({})
     SchCollectorVersionVO convertVO(SchCollectorVersion schCollectorVersion);

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<SchCollectorVersionFile> convertAddDOList(List<AddSchCollectorVersionFileDTO> addSchCollectorVersionFileDTO);
 
     @Mappings({})
-    List<SchCollectorVersionFile> convertDO(List<SchCollectorVersionFileDTO> schCollectorVersionFileDTOList);
+    List<SchCollectorVersionFile> convertEditDOList(List<EditSchCollectorVersionFileDTO> editSchCollectorVersionFileDTO);
 
     @Mappings({})
     SchCollectorVersionFileVO convertVO(SchCollectorVersionFile schCollectorVersionFile);

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<SchCollectorVersionLog> convertAddDOList(List<AddSchCollectorVersionLogDTO> addSchCollectorVersionLogDTO);
 
     @Mappings({})
-    List<SchCollectorVersionLog> convertDO(List<SchCollectorVersionLogDTO> schCollectorVersionLogDTOList);
+    List<SchCollectorVersionLog> convertEditDOList(List<EditSchCollectorVersionLogDTO> editSchCollectorVersionLogDTO);
 
     @Mappings({})
     SchCollectorVersionLogVO convertVO(SchCollectorVersionLog schCollectorVersionLog);

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<SchOperationLog> convertAddDOList(List<AddSchOperationLogDTO> addSchOperationLogDTO);
 
     @Mappings({})
-    List<SchOperationLog> convertDO(List<SchOperationLogDTO> schOperationLogDTOList);
+    List<SchOperationLog> convertEditDOList(List<EditSchOperationLogDTO> editSchOperationLogDTO);
 
     @Mappings({})
     SchOperationLogVO convertVO(SchOperationLog schOperationLog);

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<SchSystemParams> convertAddDOList(List<AddSchSystemParamsDTO> addSchSystemParamsDTO);
 
     @Mappings({})
-    List<SchSystemParams> convertDO(List<SchSystemParamsDTO> schSystemParamsDTOList);
+    List<SchSystemParams> convertEditDOList(List<EditSchSystemParamsDTO> editSchSystemParamsDTO);
 
     @Mappings({})
     SchSystemParamsVO convertVO(SchSystemParams schSystemParams);

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<SchTerminator> convertAddDOList(List<AddSchTerminatorDTO> addSchTerminatorDTO);
 
     @Mappings({})
-    List<SchTerminator> convertDO(List<SchTerminatorDTO> schTerminatorDTOList);
+    List<SchTerminator> convertEditDOList(List<EditSchTerminatorDTO> editSchTerminatorDTO);
 
     @Mappings({})
     SchTerminatorVO convertVO(SchTerminator schTerminator);

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<SchVirtualLog> convertAddDOList(List<AddSchVirtualLogDTO> addSchVirtualLogDTO);
 
     @Mappings({})
-    List<SchVirtualLog> convertDO(List<SchVirtualLogDTO> schVirtualLogDTOList);
+    List<SchVirtualLog> convertEditDOList(List<EditSchVirtualLogDTO> editSchVirtualLogDTO);
 
     @Mappings({})
     SchVirtualLogVO convertVO(SchVirtualLog schVirtualLog);

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<SchCollectErrorLog> {
     /**
@@ -44,14 +44,14 @@ public interface ISchCollectErrorLogDao extends IBaseDao<SchCollectErrorLog> {
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectErrorLog> search(SearchRequest searchRequest);
+    PageResult<SchCollectErrorLog> search(SearchDTO searchDTO);
 
 }

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<SchCollectRecord> {
     /**
@@ -44,14 +44,14 @@ public interface ISchCollectRecordDao extends IBaseDao<SchCollectRecord> {
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectRecord> search(SearchRequest searchRequest);
+    PageResult<SchCollectRecord> search(SearchDTO searchDTO);
 
 }

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<SchCollectRecordRetryLog> {
     /**
@@ -44,14 +44,14 @@ public interface ISchCollectRecordRetryLogDao extends IBaseDao<SchCollectRecordR
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectRecordRetryLog> search(SearchRequest searchRequest);
+    PageResult<SchCollectRecordRetryLog> search(SearchDTO searchDTO);
 
 }

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<SchCollectorConfig> {
     /**
@@ -44,14 +44,14 @@ public interface ISchCollectorConfigDao extends IBaseDao<SchCollectorConfig> {
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectorConfig> search(SearchRequest searchRequest);
+    PageResult<SchCollectorConfig> search(SearchDTO searchDTO);
 
 }

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<SchCollector> {
     /**
@@ -44,14 +44,14 @@ public interface ISchCollectorDao extends IBaseDao<SchCollector> {
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollector> search(SearchRequest searchRequest);
+    PageResult<SchCollector> search(SearchDTO searchDTO);
 
 }

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<SchCollectorVersion> {
     /**
@@ -44,14 +44,14 @@ public interface ISchCollectorVersionDao extends IBaseDao<SchCollectorVersion> {
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectorVersion> search(SearchRequest searchRequest);
+    PageResult<SchCollectorVersion> search(SearchDTO searchDTO);
 
 }

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<SchCollectorVersionFile> {
     /**
@@ -44,14 +44,14 @@ public interface ISchCollectorVersionFileDao extends IBaseDao<SchCollectorVersio
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectorVersionFile> search(SearchRequest searchRequest);
+    PageResult<SchCollectorVersionFile> search(SearchDTO searchDTO);
 
 }

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<SchCollectorVersionLog> {
     /**
@@ -44,14 +44,14 @@ public interface ISchCollectorVersionLogDao extends IBaseDao<SchCollectorVersion
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectorVersionLog> search(SearchRequest searchRequest);
+    PageResult<SchCollectorVersionLog> search(SearchDTO searchDTO);
 
 }

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<SchOperationLog> {
     /**
@@ -44,14 +44,14 @@ public interface ISchOperationLogDao extends IBaseDao<SchOperationLog> {
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchOperationLog> search(SearchRequest searchRequest);
+    PageResult<SchOperationLog> search(SearchDTO searchDTO);
 
 }

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<SchSystemParams> {
     /**
@@ -44,14 +44,14 @@ public interface ISchSystemParamsDao extends IBaseDao<SchSystemParams> {
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchSystemParams> search(SearchRequest searchRequest);
+    PageResult<SchSystemParams> search(SearchDTO searchDTO);
 
 }

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<SchTerminator> {
     /**
@@ -44,14 +44,14 @@ public interface ISchTerminatorDao extends IBaseDao<SchTerminator> {
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchTerminator> search(SearchRequest searchRequest);
+    PageResult<SchTerminator> search(SearchDTO searchDTO);
 
 }

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<SchVirtualLog> {
     /**
@@ -44,14 +44,14 @@ public interface ISchVirtualLogDao extends IBaseDao<SchVirtualLog> {
      * @param ids 主键ids
      * @return 成功或失败
      */
-    int delete(List<String> ids);
+    int delete(List<Long> ids);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchVirtualLog> search(SearchRequest searchRequest);
+    PageResult<SchVirtualLog> search(SearchDTO searchDTO);
 
 }

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<SchCollectErrorLogMapper, SchCollectErrorLog> implements ISchCollectErrorLogDao {
@@ -63,36 +63,36 @@ public class SchCollectErrorLogDaoImpl extends BaseDaoImpl<SchCollectErrorLogMap
      * @return 成功或失败
      */
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
     @Override
-    public PageResult<SchCollectErrorLog> search(SearchRequest searchRequest) {
+    public PageResult<SchCollectErrorLog> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<SchCollectErrorLog> 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倒序排序

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<SchCollectRecordMapper, SchCollectRecord> implements ISchCollectRecordDao {
@@ -63,36 +63,36 @@ public class SchCollectRecordDaoImpl extends BaseDaoImpl<SchCollectRecordMapper,
      * @return 成功或失败
      */
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
     @Override
-    public PageResult<SchCollectRecord> search(SearchRequest searchRequest) {
+    public PageResult<SchCollectRecord> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<SchCollectRecord> 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倒序排序

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<SchCollectRecordRetryLogMapper, SchCollectRecordRetryLog> implements ISchCollectRecordRetryLogDao {
@@ -63,36 +63,36 @@ public class SchCollectRecordRetryLogDaoImpl extends BaseDaoImpl<SchCollectRecor
      * @return 成功或失败
      */
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
     @Override
-    public PageResult<SchCollectRecordRetryLog> search(SearchRequest searchRequest) {
+    public PageResult<SchCollectRecordRetryLog> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<SchCollectRecordRetryLog> 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倒序排序

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<SchCollectorConfigMapper, SchCollectorConfig> implements ISchCollectorConfigDao {
@@ -63,36 +63,36 @@ public class SchCollectorConfigDaoImpl extends BaseDaoImpl<SchCollectorConfigMap
      * @return 成功或失败
      */
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
     @Override
-    public PageResult<SchCollectorConfig> search(SearchRequest searchRequest) {
+    public PageResult<SchCollectorConfig> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<SchCollectorConfig> 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倒序排序

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<SchCollectorMapper, SchCollector> implements ISchCollectorDao {
@@ -63,36 +63,36 @@ public class SchCollectorDaoImpl extends BaseDaoImpl<SchCollectorMapper, SchColl
      * @return 成功或失败
      */
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
     @Override
-    public PageResult<SchCollector> search(SearchRequest searchRequest) {
+    public PageResult<SchCollector> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<SchCollector> 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倒序排序

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<SchCollectorVersionMapper, SchCollectorVersion> implements ISchCollectorVersionDao {
@@ -63,36 +63,36 @@ public class SchCollectorVersionDaoImpl extends BaseDaoImpl<SchCollectorVersionM
      * @return 成功或失败
      */
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
     @Override
-    public PageResult<SchCollectorVersion> search(SearchRequest searchRequest) {
+    public PageResult<SchCollectorVersion> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<SchCollectorVersion> 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倒序排序

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<SchCollectorVersionFileMapper, SchCollectorVersionFile> 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<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
-     *
-     * @param searchRequest 搜索参数
-     * @return 分页列表
-     */
+    * 关键字搜索
+    * @param searchDTO 搜索参数
+    * @return 分页列表
+    */
     @Override
-    public PageResult<SchCollectorVersionFile> search(SearchRequest searchRequest) {
+    public PageResult<SchCollectorVersionFile> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
-        LambdaQueryWrapper<SchCollectorVersionFile> query = Wrappers.lambdaQuery();
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
+        LambdaQueryWrapper<SchCollectorVersionFile> 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倒序排序

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<SchCollectorVersionLogMapper, SchCollectorVersionLog> 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<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-    * 关键字搜素
-    * @param searchRequest 搜索参数
-    * @return 分页列表
-    */
+     * 关键字搜索
+     *
+     * @param searchDTO 搜索参数
+     * @return 分页列表
+     */
     @Override
-    public PageResult<SchCollectorVersionLog> search(SearchRequest searchRequest) {
+    public PageResult<SchCollectorVersionLog> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
-        LambdaQueryWrapper<SchCollectorVersionLog> query = Wrappers.lambdaQuery() ;
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
+        LambdaQueryWrapper<SchCollectorVersionLog> 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倒序排序

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<SchOperationLogMapper, SchOperationLog> implements ISchOperationLogDao {
@@ -63,36 +63,36 @@ public class SchOperationLogDaoImpl extends BaseDaoImpl<SchOperationLogMapper, S
      * @return 成功或失败
      */
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
     @Override
-    public PageResult<SchOperationLog> search(SearchRequest searchRequest) {
+    public PageResult<SchOperationLog> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<SchOperationLog> 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倒序排序

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<SchSystemParamsMapper, SchSystemParams> implements ISchSystemParamsDao {
@@ -63,36 +63,36 @@ public class SchSystemParamsDaoImpl extends BaseDaoImpl<SchSystemParamsMapper, S
      * @return 成功或失败
      */
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
     @Override
-    public PageResult<SchSystemParams> search(SearchRequest searchRequest) {
+    public PageResult<SchSystemParams> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<SchSystemParams> 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倒序排序

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<SchTerminatorMapper, SchTerminator> implements ISchTerminatorDao {
@@ -63,36 +63,36 @@ public class SchTerminatorDaoImpl extends BaseDaoImpl<SchTerminatorMapper, SchTe
      * @return 成功或失败
      */
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
     @Override
-    public PageResult<SchTerminator> search(SearchRequest searchRequest) {
+    public PageResult<SchTerminator> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<SchTerminator> 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倒序排序

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<SchVirtualLogMapper, SchVirtualLog> implements ISchVirtualLogDao {
@@ -63,36 +63,36 @@ public class SchVirtualLogDaoImpl extends BaseDaoImpl<SchVirtualLogMapper, SchVi
      * @return 成功或失败
      */
     @Override
-    public int delete(List<String> ids) {
+    public int delete(List<Long> ids) {
         return super.deleteByIds(ids);
     }
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
     @Override
-    public PageResult<SchVirtualLog> search(SearchRequest searchRequest) {
+    public PageResult<SchVirtualLog> search(SearchDTO searchDTO) {
         //分页
-        PageHelper.startPage(searchRequest.getPageNum(), searchRequest.getPageSize());
+        PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize());
         LambdaQueryWrapper<SchVirtualLog> 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倒序排序

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<SchCollectErrorLog> {

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<SchCollectRecord> {

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<SchCollectRecordRetryLog> {

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<SchCollectorConfig> {

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<SchCollector> {

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<SchCollectorVersionFile> {

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<SchCollectorVersionLog> {

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<SchCollectorVersion> {

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<SchOperationLog> {

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<SchSystemParams> {

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<SchTerminator> {

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<SchVirtualLog> {

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<String> ids);
+    int delete(DeleteSchCollectErrorLogDTO deleteSchCollectErrorLogDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectErrorLogVO> search(SearchRequest searchRequest);
+    PageResult<SchCollectErrorLogVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchCollectRecordRetryLogDTO deleteSchCollectRecordRetryLogDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectRecordRetryLogVO> search(SearchRequest searchRequest);
+    PageResult<SchCollectRecordRetryLogVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchCollectRecordDTO deleteSchCollectRecordDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectRecordVO> search(SearchRequest searchRequest);
+    PageResult<SchCollectRecordVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectorConfigVO> search(SearchRequest searchRequest);
+    PageResult<SchCollectorConfigVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchCollectorDTO deleteSchCollectorDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectorVO> search(SearchRequest searchRequest);
+    PageResult<SchCollectorVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchCollectorVersionFileDTO deleteSchCollectorVersionFileDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectorVersionFileVO> search(SearchRequest searchRequest);
+    PageResult<SchCollectorVersionFileVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchCollectorVersionLogDTO deleteSchCollectorVersionLogDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectorVersionLogVO> search(SearchRequest searchRequest);
+    PageResult<SchCollectorVersionLogVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchCollectorVersionVO> search(SearchRequest searchRequest);
+    PageResult<SchCollectorVersionVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchOperationLogDTO deleteSchOperationLogDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchOperationLogVO> search(SearchRequest searchRequest);
+    PageResult<SchOperationLogVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchSystemParamsDTO deleteSchSystemParamsDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchSystemParamsVO> search(SearchRequest searchRequest);
+    PageResult<SchSystemParamsVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchTerminatorDTO deleteSchTerminatorDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchTerminatorVO> search(SearchRequest searchRequest);
+    PageResult<SchTerminatorVO> search(SearchDTO searchDTO);
 }

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<String> ids);
+    int delete(DeleteSchVirtualLogDTO deleteSchVirtualLogDTO);
 
     /**
-     * 关键字搜素
+     * 关键字搜索
      *
-     * @param searchRequest 搜索参数
+     * @param searchDTO 搜索参数
      * @return 分页列表
      */
-    PageResult<SchVirtualLogVO> search(SearchRequest searchRequest);
+    PageResult<SchVirtualLogVO> search(SearchDTO searchDTO);
 }

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<SchCollectErrorLogVO> search(SearchRequest searchRequest) {
-        return SchCollectErrorLogConvert.INSTANCE.convertVO(iSchCollectErrorLogDao.search(searchRequest));
+    public PageResult<SchCollectErrorLogVO> 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<String> ids) {
-        return iSchCollectErrorLogDao.delete(ids);
+    public int delete(DeleteSchCollectErrorLogDTO deleteSchCollectErrorLogDTO) {
+        return iSchCollectErrorLogDao.delete(deleteSchCollectErrorLogDTO.getIds());
     }
 }
 

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<SchCollectRecordRetryLogVO> search(SearchRequest searchRequest) {
-        return SchCollectRecordRetryLogConvert.INSTANCE.convertVO(iSchCollectRecordRetryLogDao.search(searchRequest));
+    public PageResult<SchCollectRecordRetryLogVO> 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<String> ids) {
-        return iSchCollectRecordRetryLogDao.delete(ids);
+    public int delete(DeleteSchCollectRecordRetryLogDTO deleteSchCollectRecordRetryLogDTO) {
+        return iSchCollectRecordRetryLogDao.delete(deleteSchCollectRecordRetryLogDTO.getIds());
     }
 }
 

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<SchCollectRecordVO> search(SearchRequest searchRequest) {
-        return SchCollectRecordConvert.INSTANCE.convertVO(iSchCollectRecordDao.search(searchRequest));
+    public PageResult<SchCollectRecordVO> 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<String> ids) {
-        return iSchCollectRecordDao.delete(ids);
+    public int delete(DeleteSchCollectRecordDTO deleteSchCollectRecordDTO) {
+        return iSchCollectRecordDao.delete(deleteSchCollectRecordDTO.getIds());
     }
 }
 

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<SchCollectorConfigVO> search(SearchRequest searchRequest) {
-        return SchCollectorConfigConvert.INSTANCE.convertVO(iSchCollectorConfigDao.search(searchRequest));
+    public PageResult<SchCollectorConfigVO> 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<String> ids) {
-        return iSchCollectorConfigDao.delete(ids);
+    public int delete(DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO) {
+        return iSchCollectorConfigDao.delete(deleteSchCollectorConfigDTO.getIds());
     }
 }
 

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<SchCollectorVO> search(SearchRequest searchRequest) {
-        return SchCollectorConvert.INSTANCE.convertVO(iSchCollectorDao.search(searchRequest));
+    public PageResult<SchCollectorVO> 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<String> ids) {
-        return iSchCollectorDao.delete(ids);
+    public int delete(DeleteSchCollectorDTO deleteSchCollectorDTO) {
+        return iSchCollectorDao.delete(deleteSchCollectorDTO.getIds());
     }
 }
 

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<SchCollectorVersionFileVO> search(SearchRequest searchRequest) {
-        return SchCollectorVersionFileConvert.INSTANCE.convertVO(iSchCollectorVersionFileDao.search(searchRequest));
+    public PageResult<SchCollectorVersionFileVO> 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<String> ids) {
-        return iSchCollectorVersionFileDao.delete(ids);
+    public int delete(DeleteSchCollectorVersionFileDTO deleteSchCollectorVersionFileDTO) {
+        return iSchCollectorVersionFileDao.delete(deleteSchCollectorVersionFileDTO.getIds());
     }
 }
 

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<SchCollectorVersionLogVO> search(SearchRequest searchRequest) {
-        return SchCollectorVersionLogConvert.INSTANCE.convertVO(iSchCollectorVersionLogDao.search(searchRequest));
+    public PageResult<SchCollectorVersionLogVO> 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<String> ids) {
-        return iSchCollectorVersionLogDao.delete(ids);
+    public int delete(DeleteSchCollectorVersionLogDTO deleteSchCollectorVersionLogDTO) {
+        return iSchCollectorVersionLogDao.delete(deleteSchCollectorVersionLogDTO.getIds());
     }
 }
 

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<SchCollectorVersionVO> search(SearchRequest searchRequest) {
-        return SchCollectorVersionConvert.INSTANCE.convertVO(iSchCollectorVersionDao.search(searchRequest));
+    public PageResult<SchCollectorVersionVO> 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<String> ids) {
-        return iSchCollectorVersionDao.delete(ids);
+    public int delete(DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO) {
+        return iSchCollectorVersionDao.delete(deleteSchCollectorVersionDTO.getIds());
     }
 }
 

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<SchOperationLogVO> search(SearchRequest searchRequest) {
-        return SchOperationLogConvert.INSTANCE.convertVO(iSchOperationLogDao.search(searchRequest));
+    public PageResult<SchOperationLogVO> 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<String> ids) {
-        return iSchOperationLogDao.delete(ids);
+    public int delete(DeleteSchOperationLogDTO deleteSchOperationLogDTO) {
+        return iSchOperationLogDao.delete(deleteSchOperationLogDTO.getIds());
     }
 }
 

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<SchSystemParamsVO> search(SearchRequest searchRequest) {
-        return SchSystemParamsConvert.INSTANCE.convertVO(iSchSystemParamsDao.search(searchRequest));
+    public PageResult<SchSystemParamsVO> 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<String> ids) {
-        return iSchSystemParamsDao.delete(ids);
+    public int delete(DeleteSchSystemParamsDTO deleteSchSystemParamsDTO) {
+        return iSchSystemParamsDao.delete(deleteSchSystemParamsDTO.getIds());
     }
 }
 

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<SchTerminatorVO> search(SearchRequest searchRequest) {
-        return SchTerminatorConvert.INSTANCE.convertVO(iSchTerminatorDao.search(searchRequest));
+    public PageResult<SchTerminatorVO> 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<String> ids) {
-        return iSchTerminatorDao.delete(ids);
+    public int delete(DeleteSchTerminatorDTO deleteSchTerminatorDTO) {
+        return iSchTerminatorDao.delete(deleteSchTerminatorDTO.getIds());
     }
 }
 

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<SchVirtualLogVO> search(SearchRequest searchRequest) {
-        return SchVirtualLogConvert.INSTANCE.convertVO(iSchVirtualLogDao.search(searchRequest));
+    public PageResult<SchVirtualLogVO> 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<String> ids) {
-        return iSchVirtualLogDao.delete(ids);
+    public int delete(DeleteSchVirtualLogDTO deleteSchVirtualLogDTO) {
+        return iSchVirtualLogDao.delete(deleteSchVirtualLogDTO.getIds());
     }
 }
 

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<SchCollectErrorLogVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchCollectErrorLogVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchCollectErrorLogDTO deleteSchCollectErrorLogDTO);
 }

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<SchCollectRecordVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchCollectRecordVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchCollectRecordDTO deleteSchCollectRecordDTO);
 }

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<SchCollectRecordRetryLogVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchCollectRecordRetryLogVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchCollectRecordRetryLogDTO deleteSchCollectRecordRetryLogDTO);
 }

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<SchCollectorVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchCollectorVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchCollectorDTO deleteSchCollectorDTO);
 }

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<SchCollectorConfigVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchCollectorConfigVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO);
 }

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<SchCollectorVersionVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchCollectorVersionVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO);
 }

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<SchCollectorVersionFileVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchCollectorVersionFileVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchCollectorVersionFileDTO deleteSchCollectorVersionFileDTO);
 }

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<SchCollectorVersionLogVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchCollectorVersionLogVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchCollectorVersionLogDTO deleteSchCollectorVersionLogDTO);
 }

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<SchOperationLogVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchOperationLogVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchOperationLogDTO deleteSchOperationLogDTO);
 }

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<SchSystemParamsVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchSystemParamsVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchSystemParamsDTO deleteSchSystemParamsDTO);
 }

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<SchTerminatorVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchTerminatorVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchTerminatorDTO deleteSchTerminatorDTO);
 }

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<SchVirtualLogVO> search(@RequestBody SearchRequest searchRequest);
+    PageResult<SchVirtualLogVO> 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<String> ids);
+    int delete(@RequestBody DeleteSchVirtualLogDTO deleteSchVirtualLogDTO);
 }

docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/SchCollectorVersionFileDTO.java

@@ -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;
-}

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;
+
+
+}

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<Long> ids;
+
+}