diff --git a/collector-scheduling-management/src/main/java/com/docus/server/DefaultWebConfig.java b/collector-scheduling-management/src/main/java/com/docus/server/DefaultWebConfig.java deleted file mode 100644 index 412d59d..0000000 --- a/collector-scheduling-management/src/main/java/com/docus/server/DefaultWebConfig.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.docus.server; - -import com.docus.infrastructure.WebConfig; -import com.docus.infrastructure.web.json.JsonSerializerModule; -import com.docus.server.common.serializer.DefJsonSerializerModule; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.StringHttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.web.client.RestTemplate; - -import java.nio.charset.Charset; -import java.util.List; - -@Configuration -public class DefaultWebConfig extends WebConfig { - - @Override - public JsonSerializerModule jsonSerializerModu1e() { - super.jsonSerializerModu1e(); - return new DefJsonSerializerModule(); - } - - //http请求工具 restTemplate - @ConditionalOnMissingBean - @Bean - public RestTemplate restTemplate() { - SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory(); - requestFactory.setReadTimeout(3 * 60 * 1000); - requestFactory.setConnectTimeout(3 * 60 * 1000); - RestTemplate restTemplate = new RestTemplate(requestFactory); - ObjectMapper objectMapper = new ObjectMapper(); - //]忽略未定义的属性 - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - List> messageConverters = restTemplate.getMessageConverters(); - messageConverters.removeIf(converter -> converter instanceof StringHttpMessageConverter); - messageConverters.add(1, new StringHttpMessageConverter(Charset.forName("UTF-8"))); - HttpMessageConverter jsonConverter = messageConverters.stream() - .filter(p -> p instanceof MappingJackson2HttpMessageConverter).findFirst().orElse(null); - if (jsonConverter != null) { - ((MappingJackson2HttpMessageConverter) jsonConverter).setObjectMapper(objectMapper); - } - return restTemplate; - } -} diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/CommMsgController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/CommMsgController.java index 437f03c..a2a230f 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/CommMsgController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/CommMsgController.java @@ -3,6 +3,8 @@ package com.docus.server.controller; import com.docus.server.api.scheduling.management.CommMsgApi; import com.docus.server.dto.scheduling.management.schterminator.CommMsgDTO; import com.docus.server.service.ICommMsgService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -13,11 +15,13 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "通用消息TCP接口", tags = "通用消息TCP接口") @RestController public class CommMsgController implements CommMsgApi { @Resource private ICommMsgService iCommMsgService; + @ApiOperation("向客户端发送TCP命令") @Override public void clientCommand(CommMsgDTO commMsgDTO) { iCommMsgService.clientCommand(commMsgDTO); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectErrorLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectErrorLogController.java index ca41df1..ca49314 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectErrorLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectErrorLogController.java @@ -8,6 +8,8 @@ import com.docus.server.dto.scheduling.management.schcollecterrorlog.DeleteSchCo import com.docus.server.dto.scheduling.management.schcollecterrorlog.EditSchCollectErrorLogDTO; import com.docus.server.service.ISchCollectErrorLogService; import com.docus.server.vo.scheduling.management.schcollecterrorlog.SchCollectErrorLogVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -19,6 +21,7 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "采集器异常日志接口", tags = "采集器异常日志接口") @RestController public class SchCollectErrorLogController implements SchCollectErrorLogApi { @Resource @@ -30,6 +33,7 @@ public class SchCollectErrorLogController implements SchCollectErrorLogApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchCollectErrorLogVO findById(String id) { return iSchCollectErrorLogService.findById(id); @@ -41,6 +45,7 @@ public class SchCollectErrorLogController implements SchCollectErrorLogApi { * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchCollectErrorLogService.search(searchDTO); @@ -52,6 +57,7 @@ public class SchCollectErrorLogController implements SchCollectErrorLogApi { * @param addSchCollectErrorLogDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public boolean add(AddSchCollectErrorLogDTO addSchCollectErrorLogDTO, MultipartFile[] multipartFiles) throws Exception { return iSchCollectErrorLogService.add(addSchCollectErrorLogDTO, multipartFiles); @@ -63,6 +69,7 @@ public class SchCollectErrorLogController implements SchCollectErrorLogApi { * @param editSchCollectErrorLogDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public boolean edit(EditSchCollectErrorLogDTO editSchCollectErrorLogDTO) { return iSchCollectErrorLogService.edit(editSchCollectErrorLogDTO); @@ -74,6 +81,7 @@ public class SchCollectErrorLogController implements SchCollectErrorLogApi { * @param deleteSchCollectErrorLogDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchCollectErrorLogDTO deleteSchCollectErrorLogDTO) { return iSchCollectErrorLogService.delete(deleteSchCollectErrorLogDTO); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java index a016ceb..21d14d5 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordController.java @@ -17,6 +17,8 @@ import com.docus.server.entity.scheduling.management.SchCollectRecord; import com.docus.server.enums.RetryTaskEnum; import com.docus.server.service.ISchCollectRecordService; import com.docus.server.vo.scheduling.management.schcollectrecord.SchCollectRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -27,6 +29,7 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "采集记录表管理接口", tags = "采集记录表管理接口") @RestController public class SchCollectRecordController implements SchCollectRecordApi { @Resource @@ -40,6 +43,7 @@ public class SchCollectRecordController implements SchCollectRecordApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchCollectRecordVO findById(String id) { return iSchCollectRecordService.findById(id); @@ -51,6 +55,7 @@ public class SchCollectRecordController implements SchCollectRecordApi { * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchCollectRecordService.search(searchDTO); @@ -62,6 +67,7 @@ public class SchCollectRecordController implements SchCollectRecordApi { * @param addSchCollectRecordDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public SchCollectRecord add(AddSchCollectRecordDTO addSchCollectRecordDTO) { return iSchCollectRecordService.add(addSchCollectRecordDTO); @@ -73,6 +79,7 @@ public class SchCollectRecordController implements SchCollectRecordApi { * @param editSchCollectRecordDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @TrackGroup(group = "SchCollectRecordController-edit", processor = ChannelProcessor.class) @Override public void edit(EditSchCollectRecordDTO editSchCollectRecordDTO) { @@ -85,11 +92,13 @@ public class SchCollectRecordController implements SchCollectRecordApi { * @param deleteSchCollectRecordDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchCollectRecordDTO deleteSchCollectRecordDTO) { return iSchCollectRecordService.delete(deleteSchCollectRecordDTO); } + @ApiOperation("任务重试") @Override public void retryTask(RetrySchCollectRecordDTO retrySchCollectRecordDTO) { ReportDownTwoDTO report = JSON.fromJSON(retrySchCollectRecordDTO.getTaskOriginJson(), ReportDownTwoDTO.class); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordRetryLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordRetryLogController.java index cad13fa..458988a 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordRetryLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectRecordRetryLogController.java @@ -9,6 +9,8 @@ import com.docus.server.dto.scheduling.management.schcollectrecordretrylog.EditS import com.docus.server.entity.scheduling.management.SchCollectRecordRetryLog; import com.docus.server.service.ISchCollectRecordRetryLogService; import com.docus.server.vo.scheduling.management.schcollectrecordretrylog.SchCollectRecordRetryLogVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -19,6 +21,7 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "采集记录表重试表管理接口", tags = "采集记录表重试表管理接口") @RestController public class SchCollectRecordRetryLogController implements SchCollectRecordRetryLogApi { @Resource @@ -30,6 +33,7 @@ public class SchCollectRecordRetryLogController implements SchCollectRecordRetry * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchCollectRecordRetryLogVO findById(String id) { return iSchCollectRecordRetryLogService.findById(id); @@ -41,6 +45,7 @@ public class SchCollectRecordRetryLogController implements SchCollectRecordRetry * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchCollectRecordRetryLogService.search(searchDTO); @@ -52,6 +57,7 @@ public class SchCollectRecordRetryLogController implements SchCollectRecordRetry * @param addSchCollectRecordRetryLogDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public SchCollectRecordRetryLog add(AddSchCollectRecordRetryLogDTO addSchCollectRecordRetryLogDTO) { return iSchCollectRecordRetryLogService.add(addSchCollectRecordRetryLogDTO); @@ -63,6 +69,7 @@ public class SchCollectRecordRetryLogController implements SchCollectRecordRetry * @param editSchCollectRecordRetryLogDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public boolean edit(EditSchCollectRecordRetryLogDTO editSchCollectRecordRetryLogDTO) { return iSchCollectRecordRetryLogService.edit(editSchCollectRecordRetryLogDTO); @@ -74,6 +81,7 @@ public class SchCollectRecordRetryLogController implements SchCollectRecordRetry * @param deleteSchCollectRecordRetryLogDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchCollectRecordRetryLogDTO deleteSchCollectRecordRetryLogDTO) { return iSchCollectRecordRetryLogService.delete(deleteSchCollectRecordRetryLogDTO); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorConfigController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorConfigController.java index a9be5b8..1d9ebea 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorConfigController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorConfigController.java @@ -10,6 +10,8 @@ import com.docus.server.dto.scheduling.management.schcollectorconfig.EditSchColl import com.docus.server.service.ISchCollectorConfigService; import com.docus.server.vo.scheduling.management.schcollectorconfig.SchCollectorConfigVO; import com.google.common.collect.Maps; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -22,6 +24,7 @@ import java.util.List; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "采集器配置管理接口", tags = "采集器配置管理接口") @RestController public class SchCollectorConfigController implements SchCollectorConfigApi { @Resource @@ -33,11 +36,13 @@ public class SchCollectorConfigController implements SchCollectorConfigApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchCollectorConfigVO findById(String id) { return iSchCollectorConfigService.findById(id); } + @ApiOperation("查询所有") @Override public List findAll() { return iSchCollectorConfigService.findAll(); @@ -49,6 +54,7 @@ public class SchCollectorConfigController implements SchCollectorConfigApi { * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchCollectorConfigService.search(searchDTO); @@ -60,6 +66,7 @@ public class SchCollectorConfigController implements SchCollectorConfigApi { * @param addSchCollectorConfigDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public boolean add(AddSchCollectorConfigDTO addSchCollectorConfigDTO) { return iSchCollectorConfigService.add(addSchCollectorConfigDTO); @@ -71,6 +78,7 @@ public class SchCollectorConfigController implements SchCollectorConfigApi { * @param editSchCollectorConfigDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public boolean edit(EditSchCollectorConfigDTO editSchCollectorConfigDTO) { return iSchCollectorConfigService.edit(editSchCollectorConfigDTO); @@ -82,6 +90,7 @@ public class SchCollectorConfigController implements SchCollectorConfigApi { * @param deleteSchCollectorConfigDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO) { return iSchCollectorConfigService.delete(deleteSchCollectorConfigDTO); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java index 7ec4947..1590dc0 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java @@ -12,6 +12,8 @@ import com.docus.server.dto.scheduling.management.schcollector.UpdateSchCollecto import com.docus.server.service.ISchCollectorService; import com.docus.server.vo.scheduling.management.schcollector.LoadSchCollectorVO; import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -23,11 +25,13 @@ import java.util.List; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "采集器管理接口", tags = "采集器管理接口") @RestController public class SchCollectorController implements SchCollectorApi { @Resource private ISchCollectorService iSchCollectorService; + @ApiOperation("查询全部") @Override public List findAll() { return iSchCollectorService.findAll(); @@ -39,6 +43,7 @@ public class SchCollectorController implements SchCollectorApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchCollectorVO findById(String id) { return iSchCollectorService.findById(id); @@ -50,6 +55,7 @@ public class SchCollectorController implements SchCollectorApi { * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchCollectorService.search(searchDTO); @@ -61,6 +67,7 @@ public class SchCollectorController implements SchCollectorApi { * @param addSchCollectorDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public boolean add(AddSchCollectorDTO addSchCollectorDTO) { return iSchCollectorService.add(addSchCollectorDTO); @@ -72,6 +79,7 @@ public class SchCollectorController implements SchCollectorApi { * @param editSchCollectorDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public boolean edit(EditSchCollectorDTO editSchCollectorDTO) { return iSchCollectorService.edit(editSchCollectorDTO); @@ -83,6 +91,7 @@ public class SchCollectorController implements SchCollectorApi { * @param deleteSchCollectorDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchCollectorDTO deleteSchCollectorDTO) { return iSchCollectorService.delete(deleteSchCollectorDTO); @@ -93,6 +102,7 @@ public class SchCollectorController implements SchCollectorApi { * * @return 成功或失败 */ + @ApiOperation("选为当前版本并更新") @TrackLogGroup(group = "采集器管理", action = "更新", desc = "更新采集器版本", processor = CollectorVersionProcessor.class) @Override public boolean updateVersion(UpdateSchCollectorDTO updateDTO) { diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionController.java index 0ceb4d2..f05b663 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionController.java @@ -9,6 +9,8 @@ import com.docus.server.dto.scheduling.management.schcollectorversion.EditSchCol import com.docus.server.service.ISchCollectorService; import com.docus.server.service.ISchCollectorVersionService; import com.docus.server.vo.scheduling.management.schcollectorversion.SchCollectorVersionVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -19,6 +21,7 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "采集器版本列表管理接口", tags = "采集器版本列表管理接口") @RestController public class SchCollectorVersionController implements SchCollectorVersionApi { @Resource @@ -32,6 +35,7 @@ public class SchCollectorVersionController implements SchCollectorVersionApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchCollectorVersionVO findById(String id) { return iSchCollectorVersionService.findById(id); @@ -43,6 +47,7 @@ public class SchCollectorVersionController implements SchCollectorVersionApi { * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchCollectorVersionService.search(searchDTO); @@ -54,6 +59,7 @@ public class SchCollectorVersionController implements SchCollectorVersionApi { * @param addSchCollectorVersionDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public boolean add(AddSchCollectorVersionDTO addSchCollectorVersionDTO) { return iSchCollectorVersionService.add(addSchCollectorVersionDTO); @@ -65,6 +71,7 @@ public class SchCollectorVersionController implements SchCollectorVersionApi { * @param editSchCollectorVersionDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public boolean edit(EditSchCollectorVersionDTO editSchCollectorVersionDTO) { return iSchCollectorVersionService.edit(editSchCollectorVersionDTO); @@ -76,6 +83,7 @@ public class SchCollectorVersionController implements SchCollectorVersionApi { * @param deleteSchCollectorVersionDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO) { return iSchCollectorVersionService.delete(deleteSchCollectorVersionDTO); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionFileController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionFileController.java index 4e33b9f..93ec1db 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionFileController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionFileController.java @@ -14,6 +14,8 @@ import com.docus.server.entity.scheduling.management.SchCollectorVersion; import com.docus.server.service.ISchCollectorVersionFileService; import com.docus.server.service.ISchCollectorVersionService; import com.docus.server.vo.scheduling.management.schcollectorversionfile.SchCollectorVersionFileVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -26,6 +28,7 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "采集器版本列表更新包管理接口", tags = "采集器版本列表更新包管理接口") @RestController @Slf4j public class SchCollectorVersionFileController implements SchCollectorVersionFileApi { @@ -40,6 +43,7 @@ public class SchCollectorVersionFileController implements SchCollectorVersionFil * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchCollectorVersionFileVO findById(String id) { return iSchCollectorVersionFileService.findById(id); @@ -51,6 +55,7 @@ public class SchCollectorVersionFileController implements SchCollectorVersionFil * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchCollectorVersionFileService.search(searchDTO); @@ -62,6 +67,7 @@ public class SchCollectorVersionFileController implements SchCollectorVersionFil * @param addDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public boolean add(AddSchCollectorVersionFileDTO addDTO, MultipartFile[] multipartFiles) throws Exception { if (fileValid(multipartFiles, addDTO)) { @@ -96,6 +102,7 @@ public class SchCollectorVersionFileController implements SchCollectorVersionFil * @param editSchCollectorVersionFileDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public boolean edit(EditSchCollectorVersionFileDTO editSchCollectorVersionFileDTO) { return iSchCollectorVersionFileService.edit(editSchCollectorVersionFileDTO); @@ -107,6 +114,7 @@ public class SchCollectorVersionFileController implements SchCollectorVersionFil * @param deleteSchCollectorVersionFileDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchCollectorVersionFileDTO deleteSchCollectorVersionFileDTO) { return iSchCollectorVersionFileService.delete(deleteSchCollectorVersionFileDTO); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionLogController.java index b9430cd..a8c072b 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorVersionLogController.java @@ -8,6 +8,8 @@ import com.docus.server.dto.scheduling.management.schcollectorversionlog.DeleteS import com.docus.server.dto.scheduling.management.schcollectorversionlog.EditSchCollectorVersionLogDTO; import com.docus.server.service.ISchCollectorVersionLogService; import com.docus.server.vo.scheduling.management.schcollectorversionlog.SchCollectorVersionLogVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -18,6 +20,7 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "采集器版本更新日志管理接口", tags = "采集器版本更新日志管理接口") @RestController public class SchCollectorVersionLogController implements SchCollectorVersionLogApi { @Resource @@ -29,6 +32,7 @@ public class SchCollectorVersionLogController implements SchCollectorVersionLogA * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchCollectorVersionLogVO findById(String id) { return iSchCollectorVersionLogService.findById(id); @@ -40,6 +44,7 @@ public class SchCollectorVersionLogController implements SchCollectorVersionLogA * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchCollectorVersionLogService.search(searchDTO); @@ -51,6 +56,7 @@ public class SchCollectorVersionLogController implements SchCollectorVersionLogA * @param addSchCollectorVersionLogDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public boolean add(AddSchCollectorVersionLogDTO addSchCollectorVersionLogDTO) { return iSchCollectorVersionLogService.add(addSchCollectorVersionLogDTO); @@ -62,6 +68,7 @@ public class SchCollectorVersionLogController implements SchCollectorVersionLogA * @param editSchCollectorVersionLogDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public boolean edit(EditSchCollectorVersionLogDTO editSchCollectorVersionLogDTO) { return iSchCollectorVersionLogService.edit(editSchCollectorVersionLogDTO); @@ -73,6 +80,7 @@ public class SchCollectorVersionLogController implements SchCollectorVersionLogA * @param deleteSchCollectorVersionLogDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchCollectorVersionLogDTO deleteSchCollectorVersionLogDTO) { return iSchCollectorVersionLogService.delete(deleteSchCollectorVersionLogDTO); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchOperationLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchOperationLogController.java index ab44752..3b92ad5 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchOperationLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchOperationLogController.java @@ -8,6 +8,8 @@ import com.docus.server.dto.scheduling.management.schoperationlog.DeleteSchOpera import com.docus.server.dto.scheduling.management.schoperationlog.EditSchOperationLogDTO; import com.docus.server.service.ISchOperationLogService; import com.docus.server.vo.scheduling.management.schoperationlog.SchOperationLogVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -18,6 +20,7 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "采集调度器操作日志接口", tags = "采集调度器操作日志接口") @RestController public class SchOperationLogController implements SchOperationLogApi { @Resource @@ -29,6 +32,7 @@ public class SchOperationLogController implements SchOperationLogApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchOperationLogVO findById(String id) { return iSchOperationLogService.findById(id); @@ -40,6 +44,7 @@ public class SchOperationLogController implements SchOperationLogApi { * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchOperationLogService.search(searchDTO); @@ -51,6 +56,7 @@ public class SchOperationLogController implements SchOperationLogApi { * @param addSchOperationLogDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public boolean add(AddSchOperationLogDTO addSchOperationLogDTO) { return iSchOperationLogService.add(addSchOperationLogDTO); @@ -62,6 +68,7 @@ public class SchOperationLogController implements SchOperationLogApi { * @param editSchOperationLogDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public boolean edit(EditSchOperationLogDTO editSchOperationLogDTO) { return iSchOperationLogService.edit(editSchOperationLogDTO); @@ -73,6 +80,7 @@ public class SchOperationLogController implements SchOperationLogApi { * @param deleteSchOperationLogDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchOperationLogDTO deleteSchOperationLogDTO) { return iSchOperationLogService.delete(deleteSchOperationLogDTO); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchSystemParamsController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchSystemParamsController.java index 78ec4cf..279b559 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchSystemParamsController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchSystemParamsController.java @@ -8,6 +8,8 @@ import com.docus.server.dto.scheduling.management.schsystemparams.DeleteSchSyste import com.docus.server.dto.scheduling.management.schsystemparams.EditSchSystemParamsDTO; import com.docus.server.service.ISchSystemParamsService; import com.docus.server.vo.scheduling.management.schsystemparams.SchSystemParamsVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -18,6 +20,7 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "系统参数表管理接口", tags = "系统参数表管理接口") @RestController public class SchSystemParamsController implements SchSystemParamsApi { @Resource @@ -29,6 +32,7 @@ public class SchSystemParamsController implements SchSystemParamsApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchSystemParamsVO findById(String id) { return iSchSystemParamsService.findById(id); @@ -40,6 +44,7 @@ public class SchSystemParamsController implements SchSystemParamsApi { * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchSystemParamsService.search(searchDTO); @@ -51,6 +56,7 @@ public class SchSystemParamsController implements SchSystemParamsApi { * @param addSchSystemParamsDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public boolean add(AddSchSystemParamsDTO addSchSystemParamsDTO) { return iSchSystemParamsService.add(addSchSystemParamsDTO); @@ -62,6 +68,7 @@ public class SchSystemParamsController implements SchSystemParamsApi { * @param editSchSystemParamsDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public boolean edit(EditSchSystemParamsDTO editSchSystemParamsDTO) { return iSchSystemParamsService.edit(editSchSystemParamsDTO); @@ -73,6 +80,7 @@ public class SchSystemParamsController implements SchSystemParamsApi { * @param deleteSchSystemParamsDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchSystemParamsDTO deleteSchSystemParamsDTO) { return iSchSystemParamsService.delete(deleteSchSystemParamsDTO); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchTerminatorController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchTerminatorController.java index d1ef838..df1389f 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchTerminatorController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchTerminatorController.java @@ -11,6 +11,8 @@ import com.docus.server.dto.scheduling.management.schterminator.DeleteSchTermina import com.docus.server.dto.scheduling.management.schterminator.EditSchTerminatorDTO; import com.docus.server.service.ISchTerminatorService; import com.docus.server.vo.scheduling.management.schterminator.SchTerminatorVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -21,6 +23,7 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "终端管理器管理接口", tags = "终端管理器管理接口") @RestController public class SchTerminatorController implements SchTerminatorApi { @Resource @@ -34,6 +37,7 @@ public class SchTerminatorController implements SchTerminatorApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchTerminatorVO findById(String id) { return iSchTerminatorService.findById(id); @@ -45,6 +49,7 @@ public class SchTerminatorController implements SchTerminatorApi { * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchTerminatorService.search(searchDTO); @@ -56,6 +61,7 @@ public class SchTerminatorController implements SchTerminatorApi { * @param addSchTerminatorDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public boolean add(AddSchTerminatorDTO addSchTerminatorDTO) { return iSchTerminatorService.add(addSchTerminatorDTO); @@ -66,6 +72,7 @@ public class SchTerminatorController implements SchTerminatorApi { * * @param editSchTerminatorDTO 编辑参数 */ + @ApiOperation("编辑") @TrackGroup(group = "SchTerminatorController", processor = ChannelProcessor.class) @Override public void edit(EditSchTerminatorDTO editSchTerminatorDTO) { @@ -78,6 +85,7 @@ public class SchTerminatorController implements SchTerminatorApi { * @param deleteSchTerminatorDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchTerminatorDTO deleteSchTerminatorDTO) { return iSchTerminatorService.delete(deleteSchTerminatorDTO); diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchVirtualLogController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchVirtualLogController.java index e7d7b29..25c2c65 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchVirtualLogController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchVirtualLogController.java @@ -8,6 +8,8 @@ import com.docus.server.dto.scheduling.management.schvirtuallog.DeleteSchVirtual import com.docus.server.dto.scheduling.management.schvirtuallog.EditSchVirtualLogDTO; import com.docus.server.service.ISchVirtualLogService; import com.docus.server.vo.scheduling.management.schvirtuallog.SchVirtualLogVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -18,6 +20,7 @@ import javax.annotation.Resource; * @author AutoGenerator * @since 2023-07-15 */ +@Api(value = "虚拟机使用情况管理接口", tags = "虚拟机使用情况管理接口") @RestController public class SchVirtualLogController implements SchVirtualLogApi { @Resource @@ -29,6 +32,7 @@ public class SchVirtualLogController implements SchVirtualLogApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public SchVirtualLogVO findById(String id) { return iSchVirtualLogService.findById(id); @@ -40,6 +44,7 @@ public class SchVirtualLogController implements SchVirtualLogApi { * @param searchDTO 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜索") @Override public PageResult search(SearchDTO searchDTO) { return iSchVirtualLogService.search(searchDTO); @@ -51,6 +56,7 @@ public class SchVirtualLogController implements SchVirtualLogApi { * @param addSchVirtualLogDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public void add(AddSchVirtualLogDTO addSchVirtualLogDTO) { iSchVirtualLogService.add(addSchVirtualLogDTO); @@ -62,6 +68,7 @@ public class SchVirtualLogController implements SchVirtualLogApi { * @param editSchVirtualLogDTO 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public void edit(EditSchVirtualLogDTO editSchVirtualLogDTO) { iSchVirtualLogService.edit(editSchVirtualLogDTO); @@ -73,6 +80,7 @@ public class SchVirtualLogController implements SchVirtualLogApi { * @param deleteSchVirtualLogDTO 删除参数 * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(DeleteSchVirtualLogDTO deleteSchVirtualLogDTO) { return iSchVirtualLogService.delete(deleteSchVirtualLogDTO); diff --git a/collector-scheduling-management/src/main/resources/bootstrap.yml b/collector-scheduling-management/src/main/resources/bootstrap.yml index 5de0b5b..bd1812f 100644 --- a/collector-scheduling-management/src/main/resources/bootstrap.yml +++ b/collector-scheduling-management/src/main/resources/bootstrap.yml @@ -52,7 +52,7 @@ mybatis-plus: netty: server: - port: 65535 + port: 2222 boss-thread-count: 1 worker-thread-count: 20 reader-idle-time-seconds: 30 diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigController.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigController.java index e0c4898..fbea3db 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigController.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigController.java @@ -14,6 +14,7 @@ import java.util.List; * Controller * Generated on 2023-06-28 */ +@Api(value = "主动消息任务管理接口", tags = "主动消息任务管理接口") @RestController public class TaskConfigController implements TaskConfigApi { @Resource @@ -25,6 +26,7 @@ public class TaskConfigController implements TaskConfigApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public TaskConfig find(String id) { return taskConfigService.getTaskConfigById(id); @@ -36,6 +38,7 @@ public class TaskConfigController implements TaskConfigApi { * @param searchRequest 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜素") @Override public PageResult search(SearchRequest searchRequest) { return taskConfigService.search(searchRequest); @@ -47,6 +50,7 @@ public class TaskConfigController implements TaskConfigApi { * @param taskConfig 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增或编辑") @Override public boolean saveOrUpdate(TaskConfig taskConfig) { return taskConfigService.updateTaskConfig(taskConfig); @@ -58,16 +62,19 @@ public class TaskConfigController implements TaskConfigApi { * @param ids 主键ids * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(List ids) { return taskConfigService.deleteTaskConfig(ids); } + @ApiOperation("查询范围批量重试") @Override public void searchRetry(SearchRequest searchRequest) throws Exception { taskConfigService.searchRetry(searchRequest); } + @ApiOperation("根据主键批量重试") @Override public void findRetry(List ids) throws Exception { taskConfigService.findRetry(ids); diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigRetryLogController.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigRetryLogController.java index db2b069..dcf48c0 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigRetryLogController.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigRetryLogController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController; * 主动任务配置重试表 Controller * Generated on 2023-06-29 */ +@Api(value = "主动消息任务重试日志管理接口", tags = "主动消息任务重试日志管理接口") @RestController public class TaskConfigRetryLogController implements TaskConfigRetryLogApi { @Autowired @@ -23,6 +24,7 @@ public class TaskConfigRetryLogController implements TaskConfigRetryLogApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public TaskConfigRetryLog find(String id) { return taskConfigRetryLogService.findById(id); @@ -34,6 +36,7 @@ public class TaskConfigRetryLogController implements TaskConfigRetryLogApi { * @param searchRequest 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜素") @Override public PageResult search(SearchRequest searchRequest) { return taskConfigRetryLogService.search(searchRequest); diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigTestController.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigTestController.java index 892ded1..0b5ca64 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigTestController.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskConfigTestController.java @@ -18,6 +18,7 @@ import java.util.List; * @author AutoGenerator * @since 2023-07-05 */ +@Api(value = "主动任务测试对象任务管理接口", tags = "主动任务测试对象任务管理接口") @RestController public class TaskConfigTestController implements TaskConfigTestApi { @Resource @@ -29,6 +30,7 @@ public class TaskConfigTestController implements TaskConfigTestApi { * @param id 主键Id * @return 实体 */ + @ApiOperation("按主键查询") @Override public TaskConfigTest findById(String id) { return iTaskConfigTestService.findById(id); @@ -40,6 +42,7 @@ public class TaskConfigTestController implements TaskConfigTestApi { * @param searchRequest 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜素") @Override public PageResult search(SearchRequest searchRequest) { return iTaskConfigTestService.search(searchRequest); @@ -51,6 +54,7 @@ public class TaskConfigTestController implements TaskConfigTestApi { * @param taskConfigTest 编辑参数 * @return 成功或失败 */ + @ApiOperation("新增") @Override public boolean add(TaskConfigTest taskConfigTest) { return iTaskConfigTestService.add(taskConfigTest); @@ -62,6 +66,7 @@ public class TaskConfigTestController implements TaskConfigTestApi { * @param taskConfigTest 编辑参数 * @return 成功或失败 */ + @ApiOperation("编辑") @Override public boolean edit(TaskConfigTest taskConfigTest) { return iTaskConfigTestService.edit(taskConfigTest); @@ -73,6 +78,7 @@ public class TaskConfigTestController implements TaskConfigTestApi { * @param ids 主键ids * @return 成功或失败 */ + @ApiOperation("批量删除") @Override public int delete(List ids) { return iTaskConfigTestService.delete(ids); diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageController.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageController.java index e10a7a7..3e98d5f 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageController.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageController.java @@ -15,6 +15,7 @@ import java.util.List; * 被动接收任务表 Controller * Generated on 2023-06-28 */ +@Api(value = "被动消息任务管理接口", tags = "被动消息任务管理接口") @RestController public class TaskMessageController implements TaskMessageApi { @Resource @@ -26,6 +27,7 @@ public class TaskMessageController implements TaskMessageApi { * @param id 主键Id * @return实体 */ + @ApiOperation("按主键查询") @Override public TaskMessageVO find(String id) { return taskMessageService.findById(id); @@ -37,6 +39,7 @@ public class TaskMessageController implements TaskMessageApi { * @param searchRequest 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜素") @Override public PageResult search(SearchRequest searchRequest) { return taskMessageService.search(searchRequest); @@ -47,6 +50,7 @@ public class TaskMessageController implements TaskMessageApi { * * @param searchRequest 搜索参数 */ + @ApiOperation("查询范围批量重试") @Override public void searchRetry(SearchRequest searchRequest) throws Exception { taskMessageService.searchRetry(searchRequest); @@ -55,11 +59,13 @@ public class TaskMessageController implements TaskMessageApi { /** * 根据主键批量重试 */ + @ApiOperation("根据主键批量重试") @Override public void findRetry(List ids) throws Exception { taskMessageService.findRetry(ids); } + @ApiOperation("任务类型查询") @Override public CollectTypeEnum[] findType() { return CollectTypeEnum.values(); diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageRetryLogController.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageRetryLogController.java index a32e2ec..9e56523 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageRetryLogController.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/controller/TaskMessageRetryLogController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController; * 任务消息重试表 Controller * Generated on 2023-06-28 */ +@Api(value = "被动消息任务重试日志管理接口", tags = "被动消息任务重试日志管理接口") @RestController public class TaskMessageRetryLogController implements TaskMessageRetryLogApi { @Autowired @@ -23,6 +24,7 @@ public class TaskMessageRetryLogController implements TaskMessageRetryLogApi { * @param id 主键Id * @return实体 */ + @ApiOperation("按主键查询") @Override public TaskMessageRetryLog find(String id) { return taskMessageRetryLogService.findById(id); @@ -33,6 +35,7 @@ public class TaskMessageRetryLogController implements TaskMessageRetryLogApi { * @param searchRequest 搜索参数 * @return 分页列表 */ + @ApiOperation("关键字搜素") @Override public PageResult search(SearchRequest searchRequest) { return taskMessageRetryLogService.search(searchRequest); diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IFileUploadService.java b/docus-api-common/src/main/java/com/docus/server/common/service/IFileUploadService.java similarity index 91% rename from docus-segmentation/src/main/java/com/docus/server/service/IFileUploadService.java rename to docus-api-common/src/main/java/com/docus/server/common/service/IFileUploadService.java index 00e46ec..bd63561 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IFileUploadService.java +++ b/docus-api-common/src/main/java/com/docus/server/common/service/IFileUploadService.java @@ -1,4 +1,4 @@ -package com.docus.server.service; +package com.docus.server.common.service; import com.docus.server.vo.scheduling.management.schcollectorversionfile.UploadFileVO; import org.springframework.web.multipart.MultipartFile; diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/FileUploadServiceImpl.java b/docus-api-common/src/main/java/com/docus/server/common/service/impl/FileUploadServiceImpl.java similarity index 95% rename from docus-segmentation/src/main/java/com/docus/server/service/impl/FileUploadServiceImpl.java rename to docus-api-common/src/main/java/com/docus/server/common/service/impl/FileUploadServiceImpl.java index 647a2bb..eea7d50 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/FileUploadServiceImpl.java +++ b/docus-api-common/src/main/java/com/docus/server/common/service/impl/FileUploadServiceImpl.java @@ -1,10 +1,10 @@ -package com.docus.server.service.impl; +package com.docus.server.common.service.impl; import cn.hutool.core.util.StrUtil; import com.docus.core.util.Func; import com.docus.infrastructure.web.exception.ApiException; import com.docus.infrastructure.web.exception.ExceptionCode; -import com.docus.server.service.IFileUploadService; +import com.docus.server.common.service.IFileUploadService; import com.docus.server.vo.scheduling.management.schcollectorversionfile.UploadFileVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -24,14 +24,14 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -@Service +@Service("commonFileUploadServiceImpl") @Slf4j public class FileUploadServiceImpl implements IFileUploadService { @Value("${file.uploadFolder:D://docus/}") private String saveFilePath; - private static final String COLLECTOR_PACKAGES = "collector_packages"; + private static final String UPLOAD_FOLDER = "upload"; private static DateTimeFormatter ymdDtf = DateTimeFormatter.ofPattern("yyyyMMdd"); @@ -39,7 +39,7 @@ public class FileUploadServiceImpl implements IFileUploadService { public List uploadFile(MultipartFile[] multipartFiles, String pathKey) throws Exception { if (Func.isBlank(pathKey)) { - pathKey = COLLECTOR_PACKAGES; + pathKey = UPLOAD_FOLDER; } List uploadFileVOList = new ArrayList<>(); diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java index b2f57a6..e8378fe 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigApi.java @@ -3,8 +3,6 @@ package com.docus.server.api.archivefile; import com.docus.infrastructure.web.request.SearchRequest; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.entity.TaskConfig; -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; @@ -20,7 +18,6 @@ import java.util.List; * API * Generated on 2023-06-28 */ -@Api(value = "主动消息任务管理接口", tags = "主动消息任务管理接口") @FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskConfigApi") @RequestMapping("/collect/taskConfig") public interface TaskConfigApi { @@ -31,7 +28,6 @@ public interface TaskConfigApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") @GetMapping("/find/{id}") TaskConfig find(@PathVariable(value = "id") String id); @@ -41,7 +37,6 @@ public interface TaskConfigApi { * @param searchRequest 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") @PostMapping("/search") PageResult search(@RequestBody SearchRequest searchRequest); @@ -51,7 +46,6 @@ public interface TaskConfigApi { * @param taskConfig 编辑参数 * @return 成功或失败 */ - @ApiOperation("新增或编辑") @PostMapping("/saveOrUpdate") boolean saveOrUpdate(@RequestBody TaskConfig taskConfig); @@ -61,7 +55,6 @@ public interface TaskConfigApi { * @param ids 主键ids * @return 成功或失败 */ - @ApiOperation("批量删除") @DeleteMapping("/delete") int delete(@RequestBody List ids); @@ -70,14 +63,12 @@ public interface TaskConfigApi { * * @param searchRequest 搜索参数 */ - @ApiOperation("查询范围批量重试") @PostMapping("/search/retry") void searchRetry(@RequestBody SearchRequest searchRequest) throws Exception; /** * 根据主键批量重试 */ - @ApiOperation("根据主键批量重试") @PostMapping("/find/retry") void findRetry(@RequestBody List ids) throws Exception; } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java index 8940be8..af1024e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskConfigRetryLogApi.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * 主动任务配置重试表 API * Generated on 2023-06-29 */ -@Api(value = "主动消息任务重试日志管理接口", tags = "主动消息任务重试日志管理接口") + @FeignClient(value = "tsms-auth-api", contextId = "tsms-auth-api.TaskConfigRetryLogApi") @RequestMapping("/collect/taskConfigRetryLog") public interface TaskConfigRetryLogApi { @@ -28,7 +28,7 @@ public interface TaskConfigRetryLogApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") TaskConfigRetryLog find(@PathVariable(value = "id") String id); @@ -38,7 +38,7 @@ public interface TaskConfigRetryLogApi { * @param searchRequest 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @PostMapping("/search") PageResult search(@RequestBody SearchRequest searchRequest); diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java index 3bf8d58..fe6aa79 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageApi.java @@ -20,7 +20,7 @@ import java.util.List; * 被动接收任务表 API * Generated on 2023-06-28 */ -@Api(value = "被动消息任务管理接口", tags = "被动消息任务管理接口") + @FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskMessageApi") @RequestMapping("/collect/taskMessage") public interface TaskMessageApi { @@ -31,7 +31,7 @@ public interface TaskMessageApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") TaskMessageVO find(@PathVariable(value = "id") String id); @@ -41,7 +41,7 @@ public interface TaskMessageApi { * @param searchRequest 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @PostMapping("/search") PageResult search(@RequestBody SearchRequest searchRequest); @@ -50,21 +50,21 @@ public interface TaskMessageApi { * * @param searchRequest 搜索参数 */ - @ApiOperation("查询范围批量重试") + @PostMapping("/search/retry") void searchRetry(@RequestBody SearchRequest searchRequest) throws Exception; /** * 根据主键批量重试 */ - @ApiOperation("根据主键批量重试") + @PostMapping("/find/retry") void findRetry(@RequestBody List ids) throws Exception; /** * 任务类型查询 */ - @ApiOperation("任务类型查询") + @GetMapping("/find/type") CollectTypeEnum[] findType(); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java index 7999766..6f8ba40 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/archivefile/TaskMessageRetryLogApi.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * 任务消息重试表 API * Generated on 2023-06-28 */ -@Api(value = "被动消息任务重试日志管理接口", tags = "被动消息任务重试日志管理接口") + @FeignClient(value = "docus-collector-api", contextId = "docus-collector-api.TaskMessageRetryLogApi") @RequestMapping("/collect/taskMessageRetryLog") public interface TaskMessageRetryLogApi { @@ -28,7 +28,7 @@ public interface TaskMessageRetryLogApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") TaskMessageRetryLog find(@PathVariable(value = "id") String id); @@ -37,7 +37,7 @@ public interface TaskMessageRetryLogApi { * @param searchRequest 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @PostMapping("/search") PageResult search(@RequestBody SearchRequest searchRequest); diff --git a/docus-client-interface/src/main/java/com/docus/server/api/auth/TaskConfigTestApi.java b/docus-client-interface/src/main/java/com/docus/server/api/auth/TaskConfigTestApi.java index 41a6c8a..be8cc04 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/auth/TaskConfigTestApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/auth/TaskConfigTestApi.java @@ -25,7 +25,7 @@ import java.util.List; * @author AutoGenerator * @since 2023-07-05 */ -@Api(value = "主动任务测试对象任务管理接口", tags = "主动任务测试对象任务管理接口") + @FeignClient(value = "common-docus/docus-archivefile", contextId = "common-docus/docus-archivefile.TaskConfigTestApi") @RequestMapping("/taskConfigTest") public interface TaskConfigTestApi { @@ -36,7 +36,7 @@ public interface TaskConfigTestApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") TaskConfigTest findById(@PathVariable(value = "id") String id); @@ -46,7 +46,7 @@ public interface TaskConfigTestApi { * @param searchRequest 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜素") + @PostMapping("/search") PageResult search(@RequestBody SearchRequest searchRequest); @@ -56,7 +56,7 @@ public interface TaskConfigTestApi { * @param taskConfigTest 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") boolean add(@RequestBody TaskConfigTest taskConfigTest); @@ -66,7 +66,7 @@ public interface TaskConfigTestApi { * @param taskConfigTest 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") boolean edit(@RequestBody TaskConfigTest taskConfigTest); @@ -76,7 +76,7 @@ public interface TaskConfigTestApi { * @param ids 主键ids * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody List ids); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/CommMsgApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/CommMsgApi.java index fe47fc7..a520fcd 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/CommMsgApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/CommMsgApi.java @@ -1,8 +1,6 @@ package com.docus.server.api.scheduling.management; import com.docus.server.dto.scheduling.management.schterminator.CommMsgDTO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -15,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "通用消息TCP接口", tags = "通用消息TCP接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.CommMsgApi") @RequestMapping("/sch/commMsg") public interface CommMsgApi { @@ -25,7 +23,7 @@ public interface CommMsgApi { * * @param commMsgDTO 消息体 */ - @ApiOperation("向客户端发送TCP命令") + @PostMapping("/clientCommand") void clientCommand(@RequestBody CommMsgDTO commMsgDTO); diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectErrorLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectErrorLogApi.java index afa5306..87ce48c 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectErrorLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectErrorLogApi.java @@ -6,10 +6,8 @@ import com.docus.server.dto.scheduling.management.schcollecterrorlog.AddSchColle 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.schcollecterrorlog.SchCollectErrorLogVO; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; @@ -29,7 +27,7 @@ import org.springframework.web.multipart.MultipartFile; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "采集器异常日志接口", tags = "采集器异常日志接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectErrorLogApi") @RequestMapping("/sch/collectErrorLog") public interface SchCollectErrorLogApi { @@ -40,7 +38,7 @@ public interface SchCollectErrorLogApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchCollectErrorLogVO findById(@PathVariable(value = "id") String id); @@ -50,7 +48,7 @@ public interface SchCollectErrorLogApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -60,7 +58,7 @@ public interface SchCollectErrorLogApi { * @param addSchCollectErrorLogDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") @ApiImplicitParams({ @ApiImplicitParam(name = "screenImage", value = "文件", required = true, dataTypeClass = MultipartFile.class) @@ -73,7 +71,7 @@ public interface SchCollectErrorLogApi { * @param editSchCollectErrorLogDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") boolean edit(@RequestBody EditSchCollectErrorLogDTO editSchCollectErrorLogDTO); @@ -83,7 +81,7 @@ public interface SchCollectErrorLogApi { * @param deleteSchCollectErrorLogDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchCollectErrorLogDTO deleteSchCollectErrorLogDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordApi.java index 0499af0..326c06f 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordApi.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "采集记录表管理接口", tags = "采集记录表管理接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectRecordApi") @RequestMapping("/sch/collectRecord") public interface SchCollectRecordApi { @@ -37,7 +37,7 @@ public interface SchCollectRecordApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchCollectRecordVO findById(@PathVariable(value = "id") String id); @@ -47,7 +47,7 @@ public interface SchCollectRecordApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -57,7 +57,7 @@ public interface SchCollectRecordApi { * @param addSchCollectRecordDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") SchCollectRecord add(@RequestBody AddSchCollectRecordDTO addSchCollectRecordDTO); @@ -67,7 +67,7 @@ public interface SchCollectRecordApi { * @param editSchCollectRecordDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") void edit(@RequestBody EditSchCollectRecordDTO editSchCollectRecordDTO); @@ -77,7 +77,7 @@ public interface SchCollectRecordApi { * @param deleteSchCollectRecordDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchCollectRecordDTO deleteSchCollectRecordDTO); @@ -86,7 +86,7 @@ public interface SchCollectRecordApi { * * @param addSchCollectRecordDTO 新增参数 */ - @ApiOperation("任务重试") + @PostMapping("/retryTask") void retryTask(@RequestBody RetrySchCollectRecordDTO addSchCollectRecordDTO); diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordRetryLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordRetryLogApi.java index 4fdf2f8..4cf563a 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordRetryLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectRecordRetryLogApi.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "采集记录表重试表管理接口", tags = "采集记录表重试表管理接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectRecordRetryLogApi") @RequestMapping("/sch/collectRecordRetryLog") public interface SchCollectRecordRetryLogApi { @@ -36,7 +36,7 @@ public interface SchCollectRecordRetryLogApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchCollectRecordRetryLogVO findById(@PathVariable(value = "id") String id); @@ -46,7 +46,7 @@ public interface SchCollectRecordRetryLogApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -56,7 +56,7 @@ public interface SchCollectRecordRetryLogApi { * @param addSchCollectRecordRetryLogDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") SchCollectRecordRetryLog add(@RequestBody AddSchCollectRecordRetryLogDTO addSchCollectRecordRetryLogDTO); @@ -66,7 +66,7 @@ public interface SchCollectRecordRetryLogApi { * @param editSchCollectRecordRetryLogDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") boolean edit(@RequestBody EditSchCollectRecordRetryLogDTO editSchCollectRecordRetryLogDTO); @@ -76,7 +76,7 @@ public interface SchCollectRecordRetryLogApi { * @param deleteSchCollectRecordRetryLogDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchCollectRecordRetryLogDTO deleteSchCollectRecordRetryLogDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java index 13945e9..f8d1dd6 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java @@ -28,7 +28,7 @@ import java.util.List; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "采集器管理接口", tags = "采集器管理接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorApi") @RequestMapping("/sch/collector") public interface SchCollectorApi { @@ -37,7 +37,7 @@ public interface SchCollectorApi { * * @return 实体 */ - @ApiOperation("查询全部") + @GetMapping("/find/all") List findAll(); @@ -47,7 +47,7 @@ public interface SchCollectorApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchCollectorVO findById(@PathVariable(value = "id") String id); @@ -57,7 +57,7 @@ public interface SchCollectorApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -67,7 +67,7 @@ public interface SchCollectorApi { * @param addSchCollectorDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") boolean add(@RequestBody AddSchCollectorDTO addSchCollectorDTO); @@ -77,7 +77,7 @@ public interface SchCollectorApi { * @param editSchCollectorDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") boolean edit(@RequestBody EditSchCollectorDTO editSchCollectorDTO); @@ -87,7 +87,7 @@ public interface SchCollectorApi { * @param deleteSchCollectorDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchCollectorDTO deleteSchCollectorDTO); @@ -97,7 +97,7 @@ public interface SchCollectorApi { * @param updateDTO 版本更新参数 * @return 成功或失败 */ - @ApiOperation("选为当前版本并更新") + @PutMapping("/updateVersion") boolean updateVersion(@RequestBody UpdateSchCollectorDTO updateDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorConfigApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorConfigApi.java index fdd8596..aa04119 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorConfigApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorConfigApi.java @@ -26,7 +26,7 @@ import java.util.List; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "采集器配置管理接口", tags = "采集器配置管理接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorConfigApi") @RequestMapping("/sch/collectorConfig") public interface SchCollectorConfigApi { @@ -37,7 +37,7 @@ public interface SchCollectorConfigApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchCollectorConfigVO findById(@PathVariable(value = "id") String id); @@ -46,7 +46,7 @@ public interface SchCollectorConfigApi { * * @return SchCollectorConfigVO 配置 */ - @ApiOperation("查询所有") + @GetMapping("/findAll") List findAll(); @@ -56,7 +56,7 @@ public interface SchCollectorConfigApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -66,7 +66,7 @@ public interface SchCollectorConfigApi { * @param addSchCollectorConfigDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") boolean add(@RequestBody AddSchCollectorConfigDTO addSchCollectorConfigDTO); @@ -76,7 +76,7 @@ public interface SchCollectorConfigApi { * @param editSchCollectorConfigDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") boolean edit(@RequestBody EditSchCollectorConfigDTO editSchCollectorConfigDTO); @@ -86,7 +86,7 @@ public interface SchCollectorConfigApi { * @param deleteSchCollectorConfigDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchCollectorConfigDTO deleteSchCollectorConfigDTO); diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionApi.java index a3587f2..1bc55f8 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionApi.java @@ -6,8 +6,6 @@ import com.docus.server.dto.scheduling.management.schcollectorversion.AddSchColl import com.docus.server.dto.scheduling.management.schcollectorversion.DeleteSchCollectorVersionDTO; import com.docus.server.dto.scheduling.management.schcollectorversion.EditSchCollectorVersionDTO; import com.docus.server.vo.scheduling.management.schcollectorversion.SchCollectorVersionVO; -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; @@ -24,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "采集器版本列表管理接口", tags = "采集器版本列表管理接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorVersionApi") @RequestMapping("/sch/collectorVersion") public interface SchCollectorVersionApi { @@ -35,7 +33,7 @@ public interface SchCollectorVersionApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchCollectorVersionVO findById(@PathVariable(value = "id") String id); @@ -45,7 +43,7 @@ public interface SchCollectorVersionApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -55,7 +53,7 @@ public interface SchCollectorVersionApi { * @param addSchCollectorVersionDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") boolean add(@RequestBody AddSchCollectorVersionDTO addSchCollectorVersionDTO); @@ -65,7 +63,7 @@ public interface SchCollectorVersionApi { * @param editSchCollectorVersionDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") boolean edit(@RequestBody EditSchCollectorVersionDTO editSchCollectorVersionDTO); @@ -75,7 +73,7 @@ public interface SchCollectorVersionApi { * @param deleteSchCollectorVersionDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchCollectorVersionDTO deleteSchCollectorVersionDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionFileApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionFileApi.java index ea6efcd..57c00fc 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionFileApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionFileApi.java @@ -6,7 +6,6 @@ import com.docus.server.dto.scheduling.management.schcollectorversionfile.AddSch import com.docus.server.dto.scheduling.management.schcollectorversionfile.DeleteSchCollectorVersionFileDTO; import com.docus.server.dto.scheduling.management.schcollectorversionfile.EditSchCollectorVersionFileDTO; import com.docus.server.vo.scheduling.management.schcollectorversionfile.SchCollectorVersionFileVO; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -29,7 +28,7 @@ import org.springframework.web.multipart.MultipartFile; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "采集器版本列表更新包管理接口", tags = "采集器版本列表更新包管理接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorVersionFileApi") @RequestMapping("/sch/collectorVersionFile") public interface SchCollectorVersionFileApi { @@ -40,7 +39,7 @@ public interface SchCollectorVersionFileApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchCollectorVersionFileVO findById(@PathVariable(value = "id") String id); @@ -50,7 +49,7 @@ public interface SchCollectorVersionFileApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -60,7 +59,7 @@ public interface SchCollectorVersionFileApi { * @param addSchCollectorVersionFileDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") @ApiImplicitParams({ @ApiImplicitParam(name = "files", value = "文件", required = true, dataTypeClass = MultipartFile.class) @@ -73,7 +72,7 @@ public interface SchCollectorVersionFileApi { * @param editSchCollectorVersionFileDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") boolean edit(@RequestBody EditSchCollectorVersionFileDTO editSchCollectorVersionFileDTO); @@ -83,7 +82,7 @@ public interface SchCollectorVersionFileApi { * @param deleteSchCollectorVersionFileDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchCollectorVersionFileDTO deleteSchCollectorVersionFileDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionLogApi.java index 3fc9b3f..930e830 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorVersionLogApi.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "采集器版本更新日志管理接口", tags = "采集器版本更新日志管理接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorVersionLogApi") @RequestMapping("/sch/collectorVersionLog") public interface SchCollectorVersionLogApi { @@ -35,7 +35,7 @@ public interface SchCollectorVersionLogApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchCollectorVersionLogVO findById(@PathVariable(value = "id") String id); @@ -45,7 +45,7 @@ public interface SchCollectorVersionLogApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -55,7 +55,7 @@ public interface SchCollectorVersionLogApi { * @param addSchCollectorVersionLogDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") boolean add(@RequestBody AddSchCollectorVersionLogDTO addSchCollectorVersionLogDTO); @@ -65,7 +65,7 @@ public interface SchCollectorVersionLogApi { * @param editSchCollectorVersionLogDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") boolean edit(@RequestBody EditSchCollectorVersionLogDTO editSchCollectorVersionLogDTO); @@ -75,7 +75,7 @@ public interface SchCollectorVersionLogApi { * @param deleteSchCollectorVersionLogDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchCollectorVersionLogDTO deleteSchCollectorVersionLogDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchOperationLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchOperationLogApi.java index 493df5f..e479199 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchOperationLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchOperationLogApi.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "采集调度器操作日志接口", tags = "采集调度器操作日志接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchOperationLogApi") @RequestMapping("/sch/operationLog") public interface SchOperationLogApi { @@ -35,7 +35,7 @@ public interface SchOperationLogApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchOperationLogVO findById(@PathVariable(value = "id") String id); @@ -45,7 +45,7 @@ public interface SchOperationLogApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -55,7 +55,7 @@ public interface SchOperationLogApi { * @param addSchOperationLogDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") boolean add(@RequestBody AddSchOperationLogDTO addSchOperationLogDTO); @@ -65,7 +65,7 @@ public interface SchOperationLogApi { * @param editSchOperationLogDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") boolean edit(@RequestBody EditSchOperationLogDTO editSchOperationLogDTO); @@ -75,7 +75,7 @@ public interface SchOperationLogApi { * @param deleteSchOperationLogDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchOperationLogDTO deleteSchOperationLogDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchSystemParamsApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchSystemParamsApi.java index 361e583..6b6e70a 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchSystemParamsApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchSystemParamsApi.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "系统参数表管理接口", tags = "系统参数表管理接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchSystemParamsApi") @RequestMapping("/sch/systemParams") public interface SchSystemParamsApi { @@ -35,7 +35,7 @@ public interface SchSystemParamsApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchSystemParamsVO findById(@PathVariable(value = "id") String id); @@ -45,7 +45,7 @@ public interface SchSystemParamsApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -55,7 +55,7 @@ public interface SchSystemParamsApi { * @param addSchSystemParamsDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") boolean add(@RequestBody AddSchSystemParamsDTO addSchSystemParamsDTO); @@ -65,7 +65,7 @@ public interface SchSystemParamsApi { * @param editSchSystemParamsDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") boolean edit(@RequestBody EditSchSystemParamsDTO editSchSystemParamsDTO); @@ -75,7 +75,7 @@ public interface SchSystemParamsApi { * @param deleteSchSystemParamsDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchSystemParamsDTO deleteSchSystemParamsDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchTerminatorApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchTerminatorApi.java index 2de1882..915db6a 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchTerminatorApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchTerminatorApi.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "终端管理器管理接口", tags = "终端管理器管理接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchTerminatorApi") @RequestMapping("/sch/terminator") public interface SchTerminatorApi { @@ -35,7 +35,7 @@ public interface SchTerminatorApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchTerminatorVO findById(@PathVariable(value = "id") String id); @@ -45,7 +45,7 @@ public interface SchTerminatorApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -55,7 +55,7 @@ public interface SchTerminatorApi { * @param addSchTerminatorDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") boolean add(@RequestBody AddSchTerminatorDTO addSchTerminatorDTO); @@ -64,7 +64,7 @@ public interface SchTerminatorApi { * * @param editSchTerminatorDTO 编辑参数 */ - @ApiOperation("编辑") + @PutMapping("/edit") void edit(@RequestBody EditSchTerminatorDTO editSchTerminatorDTO); @@ -74,7 +74,7 @@ public interface SchTerminatorApi { * @param deleteSchTerminatorDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchTerminatorDTO deleteSchTerminatorDTO); diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchVirtualLogApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchVirtualLogApi.java index 868a7fb..fa42e17 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchVirtualLogApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchVirtualLogApi.java @@ -6,8 +6,6 @@ import com.docus.server.dto.scheduling.management.schvirtuallog.AddSchVirtualLog 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.schvirtuallog.SchVirtualLogVO; -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; @@ -24,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "虚拟机使用情况管理接口", tags = "虚拟机使用情况管理接口") + @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchVirtualLogApi") @RequestMapping("/sch/virtualLog") public interface SchVirtualLogApi { @@ -35,7 +33,7 @@ public interface SchVirtualLogApi { * @param id 主键id * @return 实体 */ - @ApiOperation("按主键查询") + @GetMapping("/find/{id}") SchVirtualLogVO findById(@PathVariable(value = "id") String id); @@ -45,7 +43,7 @@ public interface SchVirtualLogApi { * @param searchDTO 搜索参数 * @return 分页列表 */ - @ApiOperation("关键字搜索") + @PostMapping("/search") PageResult search(@RequestBody SearchDTO searchDTO); @@ -55,7 +53,7 @@ public interface SchVirtualLogApi { * @param addSchVirtualLogDTO 新增参数 * @return 成功或失败 */ - @ApiOperation("新增") + @PostMapping("/add") void add(@RequestBody AddSchVirtualLogDTO addSchVirtualLogDTO); @@ -65,7 +63,7 @@ public interface SchVirtualLogApi { * @param editSchVirtualLogDTO 编辑参数 * @return 成功或失败 */ - @ApiOperation("编辑") + @PutMapping("/edit") void edit(@RequestBody EditSchVirtualLogDTO editSchVirtualLogDTO); @@ -75,7 +73,7 @@ public interface SchVirtualLogApi { * @param deleteSchVirtualLogDTO 删除参数 * @return 成功或失败 */ - @ApiOperation("批量删除") + @DeleteMapping("/delete") int delete(@RequestBody DeleteSchVirtualLogDTO deleteSchVirtualLogDTO); } diff --git a/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java new file mode 100644 index 0000000..d2fcdf2 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/api/segmentation/OcrSpRuleApi.java @@ -0,0 +1,83 @@ +package com.docus.server.api.segmentation; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.dto.segmentation.ocrsprule.AddOcrSpRuleDTO; +import com.docus.server.dto.segmentation.ocrsprule.DeleteOcrSpRuleDTO; +import com.docus.server.dto.segmentation.ocrsprule.EditOcrSpRuleDTO; +import com.docus.server.vo.segmentation.ocrsprule.OcrSpRuleVO; +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; + + +/** + * 特殊策略表 API + * + * @author AutoGenerator + * @since 2023-08-21 + */ +@FeignClient(value = "docus-segmentation", contextId = "docus-segmentation.OcrSpRuleApi") +@RequestMapping("/ocrSpRule") +public interface OcrSpRuleApi { + + /** + * 按主键查询 + * + * @param id 主键id + * @return 实体 + */ + @GetMapping("/find/{id}") + OcrSpRuleVO findById(@PathVariable(value = "id") Long id); + + /** + * 查询所有 + * + * @return 实体 + */ + @GetMapping("/findAll") + List findAll(); + + /** + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @PostMapping("/search") + PageResult search(@RequestBody SearchDTO searchDTO); + + /** + * 新增 + * + * @param addOcrSpRuleDTO 新增参数 + * @return 成功或失败 + */ + @PostMapping("/add") + boolean add(@RequestBody AddOcrSpRuleDTO addOcrSpRuleDTO); + + /** + * 编辑 + * + * @param editOcrSpRuleDTO 编辑参数 + * @return 成功或失败 + */ + @PutMapping("/edit") + boolean edit(@RequestBody EditOcrSpRuleDTO editOcrSpRuleDTO); + + /** + * 批量删除 + * + * @param deleteOcrSpRuleDTO 删除参数 + * @return 成功或失败 + */ + @DeleteMapping("/delete") + int delete(@RequestBody DeleteOcrSpRuleDTO deleteOcrSpRuleDTO); +} diff --git a/docus-client-interface/src/main/java/com/docus/server/api/taskdistribute/TaskDistributeApi.java b/docus-client-interface/src/main/java/com/docus/server/api/taskdistribute/TaskDistributeApi.java index 06e7e22..808775e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/taskdistribute/TaskDistributeApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/taskdistribute/TaskDistributeApi.java @@ -1,8 +1,6 @@ package com.docus.server.api.taskdistribute; import com.docus.server.dto.scheduling.management.schcollector.task.ReportDownTwoDTO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -15,12 +13,12 @@ import org.springframework.web.bind.annotation.RequestParam; * @author AutoGenerator * @since 2023-07-15 */ -@Api(value = "任务平台接口", tags = "任务平台接口") +//@Api(value = "任务平台接口", tags = "任务平台接口") @FeignClient(url = "${taskdistribute.api.url:http://222.76.205.50:9296}", name = "collector-scheduling-management.TaskDistributeApi") @RequestMapping("/api") public interface TaskDistributeApi { - @ApiOperation("向客户端发送TCP命令") + // @ApiOperation("向客户端发送TCP命令") @GetMapping("/noviewtask/GetTask") ReportDownTwoDTO getTask(@RequestParam String collectid); diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/AddOcrSpRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/AddOcrSpRuleDTO.java new file mode 100644 index 0000000..c100e68 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/AddOcrSpRuleDTO.java @@ -0,0 +1,44 @@ +package com.docus.server.dto.segmentation.ocrsprule; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +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-08-21 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="AddOcrSpRuleDTO对象", description="特殊策略表") +public class AddOcrSpRuleDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Integer id; + + @ApiModelProperty(value = "") + private String assortId; + + @ApiModelProperty(value = "规则开始json") + private String startJson; + + @ApiModelProperty(value = "规则结束json") + private String endJson; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/DeleteOcrSpRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/DeleteOcrSpRuleDTO.java new file mode 100644 index 0000000..ff0e14d --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/DeleteOcrSpRuleDTO.java @@ -0,0 +1,34 @@ +package com.docus.server.dto.segmentation.ocrsprule; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +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-08-21 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="DeleteOcrSpRuleDTO对象", description="特殊策略表") +public class DeleteOcrSpRuleDTO implements Serializable { + + @ApiModelProperty(value = "ids") + private List ids; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/EditOcrSpRuleDTO.java b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/EditOcrSpRuleDTO.java new file mode 100644 index 0000000..b1e192f --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/segmentation/ocrsprule/EditOcrSpRuleDTO.java @@ -0,0 +1,44 @@ +package com.docus.server.dto.segmentation.ocrsprule; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 特殊策略表 EditDTO +* +* @author AutoGenerator +* @since 2023-08-21 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="EditOcrSpRuleDTO对象", description="特殊策略表") +public class EditOcrSpRuleDTO implements Serializable { + + @ApiModelProperty(value = "id") + private Integer id; + + @ApiModelProperty(value = "") + private String assortId; + + @ApiModelProperty(value = "规则开始json") + private String startJson; + + @ApiModelProperty(value = "规则结束json") + private String endJson; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpRule.java b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpRule.java new file mode 100644 index 0000000..3a6a41a --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/entity/segmentation/OcrSpRule.java @@ -0,0 +1,52 @@ +package com.docus.server.entity.segmentation; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +/** +* +* 特殊策略表 +* +* @author AutoGenerator +* @since 2023-08-21 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +@TableName("ocr_sp_rule") +@ApiModel(value="OcrSpRule对象", description="特殊策略表") +public class OcrSpRule implements Serializable { + + @ApiModelProperty(value = "id") + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private Integer id; + + @ApiModelProperty(value = "") + @TableField("assort_id") + private String assortId; + + @ApiModelProperty(value = "规则开始json") + @TableField("start_json") + private String startJson; + + @ApiModelProperty(value = "规则结束json") + @TableField("end_json") + private String endJson; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrsprule/OcrSpRuleVO.java b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrsprule/OcrSpRuleVO.java new file mode 100644 index 0000000..1f86fc4 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/vo/segmentation/ocrsprule/OcrSpRuleVO.java @@ -0,0 +1,44 @@ +package com.docus.server.vo.segmentation.ocrsprule; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import com.docus.server.enums.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** +* +* 特殊策略表 VO +* +* @author AutoGenerator +* @since 2023-08-21 +*/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value="OcrSpRuleVO对象", description="特殊策略表") +public class OcrSpRuleVO implements Serializable { + + @ApiModelProperty(value = "id") + private Integer id; + + @ApiModelProperty(value = "") + private String assortId; + + @ApiModelProperty(value = "规则开始json") + private String startJson; + + @ApiModelProperty(value = "规则结束json") + private String endJson; + + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/CodeGenerator.java b/docus-segmentation/src/main/java/com/docus/server/CodeGenerator.java index bbe9875..78c64dc 100644 --- a/docus-segmentation/src/main/java/com/docus/server/CodeGenerator.java +++ b/docus-segmentation/src/main/java/com/docus/server/CodeGenerator.java @@ -19,15 +19,15 @@ public class CodeGenerator { enumColumnMap.put("FLAG", "FlagEnum"); enumColumnMap.put("collect_type", "CollectTypeEnum"); BaseCodeGenerator.setEnumColumnMap(enumColumnMap); - BaseCodeGenerator.setModuleName("collector-scheduling-management");//多个module，需要指定modulename + BaseCodeGenerator.setModuleName("docus-segmentation");//多个module，需要指定modulename //指定entity生成到独立module里，并生成 api interface BaseCodeGenerator.setClientInterfaceModuleName("docus-client-interface"); - BaseCodeGenerator.setClientInterfaceSubFolder("scheduling.management");//文件夹 + BaseCodeGenerator.setClientInterfaceSubFolder("segmentation");//文件夹 BaseCodeGenerator.setClientInterfaceBasePackage("com.docus.server"); AutoGenerator defaultConfig = BaseCodeGenerator.getDefaultConfig(); defaultConfig.getGlobalConfig().setSwagger2(true); defaultConfig.getStrategy().setEntityLombokModel(true); - defaultConfig.getStrategy().setInclude("sch_collector_copy1");//需要生成的表，可指定多个，留空为全部生成 + defaultConfig.getStrategy().setInclude("ocr_sp_rule");//需要生成的表，可指定多个，留空为全部生成 BaseCodeGenerator.generate(defaultConfig); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/SegmentationBootstrap.java b/docus-segmentation/src/main/java/com/docus/server/SegmentationBootstrap.java index 607f354..04595f1 100644 --- a/docus-segmentation/src/main/java/com/docus/server/SegmentationBootstrap.java +++ b/docus-segmentation/src/main/java/com/docus/server/SegmentationBootstrap.java @@ -6,7 +6,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableAsync; @EnableAsync -@EnableFeignClients(basePackages = {"com.docus.core.excel.feign", "com.docus.server.api"}) +@EnableFeignClients(basePackages = {"com.docus.core.excel.feign", "com.docus.server.api.segmentation"}) @SpringBootApplication(scanBasePackages = {"com.docus"}) public class SegmentationBootstrap { public static void main(String[] args) { diff --git a/docus-segmentation/src/main/java/com/docus/server/common/SchVirtualLogTask.java b/docus-segmentation/src/main/java/com/docus/server/common/SchVirtualLogTask.java deleted file mode 100644 index fccaf57..0000000 --- a/docus-segmentation/src/main/java/com/docus/server/common/SchVirtualLogTask.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.docus.server.common; - -import com.alibaba.fastjson.JSONObject; -import com.docus.server.api.scheduling.management.SchVirtualLogApi; -import com.docus.server.common.utils.SystemInfoUtils; -import com.docus.server.dto.scheduling.management.schvirtuallog.AddSchVirtualLogDTO; -import com.xxl.job.core.util.IpUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.Date; - -@Component -@Slf4j -public class SchVirtualLogTask { - - @Resource - private SchVirtualLogApi schVirtualLogApi; - - //定时任务 - // 5 * * * * ? 在每分钟的5秒执行 - @Scheduled(cron = "${docus.vm-task-cron}") - public void runTask() { - try { - log.info("收集虚拟机信息定时任务： 开始执行"); - - JSONObject info = SystemInfoUtils.getInfo(); - - AddSchVirtualLogDTO addSchVirtualLogDTO = new AddSchVirtualLogDTO(); - addSchVirtualLogDTO.setCpuUtilization((String) ((JSONObject) info.get("cpuInfo")).get("cSys")); - addSchVirtualLogDTO.setMemoryTotal((String) ((JSONObject) info.get("memInfo")).get("total")); - addSchVirtualLogDTO.setMemoryAllowance((String) ((JSONObject) info.get("memInfo")).get("free")); - addSchVirtualLogDTO.setUplinkRate((String) ((JSONObject) info.get("networkInfo")).get("txPercent")); - addSchVirtualLogDTO.setDescendingRate((String) ((JSONObject) info.get("networkInfo")).get("rxPercent")); - addSchVirtualLogDTO.setIp(IpUtil.getIp()); - addSchVirtualLogDTO.setClientTime(new Date()); - addSchVirtualLogDTO.setDiskJson(info.get("sysFileInfo").toString()); - schVirtualLogApi.add(addSchVirtualLogDTO); - System.out.println(info); - - log.info("收集虚拟机信息定时任务： 执行完毕"); - } catch (Exception e) { - log.error("收集虚拟机信息定时任务执行出错", e); - } - - } - - -} - diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java b/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java index 2956091..f8a8318 100644 --- a/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java +++ b/docus-segmentation/src/main/java/com/docus/server/controller/FileController.java @@ -1,6 +1,6 @@ package com.docus.server.controller; -import com.docus.server.service.IFileUploadService; +import com.docus.server.common.service.IFileUploadService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpRuleController.java b/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpRuleController.java new file mode 100644 index 0000000..4491e15 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/controller/OcrSpRuleController.java @@ -0,0 +1,100 @@ +package com.docus.server.controller; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.api.segmentation.OcrSpRuleApi; +import com.docus.server.dto.segmentation.ocrsprule.AddOcrSpRuleDTO; +import com.docus.server.dto.segmentation.ocrsprule.DeleteOcrSpRuleDTO; +import com.docus.server.dto.segmentation.ocrsprule.EditOcrSpRuleDTO; +import com.docus.server.service.IOcrSpRuleService; +import com.docus.server.vo.segmentation.ocrsprule.OcrSpRuleVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 特殊策略表 控制器类 + * + * @author AutoGenerator + * @since 2023-08-21 + */ +@Api(value = "特殊策略表任务管理接口", tags = "特殊策略表任务管理接口") +@RestController +public class OcrSpRuleController implements OcrSpRuleApi { + @Resource + private IOcrSpRuleService iOcrSpRuleService; + + /** + * 按主键查询 + * + * @param id 主键Id + * @return 实体 + */ + @ApiOperation("按主键查询") + @Override + public OcrSpRuleVO findById(Long id) { + return iOcrSpRuleService.findById(id); + } + + /** + * 查询所有 + * + * @return 实体 + */ + @ApiOperation("查询所有") + @Override + public List findAll() { + return iOcrSpRuleService.findAll(); + } + + /** + * 关键字搜索 + * + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @ApiOperation("关键字搜索") + @Override + public PageResult search(SearchDTO searchDTO) { + return iOcrSpRuleService.search(searchDTO); + } + + /** + * 新增 + * + * @param addOcrSpRuleDTO 编辑参数 + * @return 成功或失败 + */ + @ApiOperation("新增") + @Override + public boolean add(AddOcrSpRuleDTO addOcrSpRuleDTO) { + return iOcrSpRuleService.add(addOcrSpRuleDTO); + } + + /** + * 编辑 + * + * @param editOcrSpRuleDTO 编辑参数 + * @return 成功或失败 + */ + @ApiOperation("编辑") + @Override + public boolean edit(EditOcrSpRuleDTO editOcrSpRuleDTO) { + return iOcrSpRuleService.edit(editOcrSpRuleDTO); + } + + /** + * 批量删除 + * + * @param deleteOcrSpRuleDTO 删除参数 + * @return 成功或失败 + */ + @ApiOperation("批量删除") + @Override + public int delete(DeleteOcrSpRuleDTO deleteOcrSpRuleDTO) { + return iOcrSpRuleService.delete(deleteOcrSpRuleDTO); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpRuleConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpRuleConvert.java new file mode 100644 index 0000000..9d50144 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/convert/OcrSpRuleConvert.java @@ -0,0 +1,49 @@ +package com.docus.server.convert; + +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrSpRule; + import com.docus.server.dto.segmentation.ocrsprule.AddOcrSpRuleDTO; + import com.docus.server.dto.segmentation.ocrsprule.EditOcrSpRuleDTO; + import com.docus.server.dto.segmentation.ocrsprule.DeleteOcrSpRuleDTO; +import com.docus.server.vo.segmentation.ocrsprule.OcrSpRuleVO; + +import org.mapstruct.Mapper; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** +* +* 特殊策略表 服务转换器 +* +* @author AutoGenerator +* @since 2023-08-21 +*/ +@Mapper +public interface OcrSpRuleConvert { + + OcrSpRuleConvert INSTANCE = Mappers.getMapper(OcrSpRuleConvert.class); + + @Mappings({}) + OcrSpRule convertDO(AddOcrSpRuleDTO addOcrSpRuleDTO); + + @Mappings({}) + OcrSpRule convertDO(EditOcrSpRuleDTO editOcrSpRuleDTO); + + @Mappings({}) + List convertAddDOList(List addOcrSpRuleDTO); + + @Mappings({}) + List convertEditDOList(List editOcrSpRuleDTO); + + @Mappings({}) + OcrSpRuleVO convertVO(OcrSpRule ocrSpRule); + + @Mappings({}) + List convertVO(List ocrSpRuleList); + + @Mappings({}) + PageResult convertVO(PageResult pageResult); +} + diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpRuleDao.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpRuleDao.java new file mode 100644 index 0000000..db581dd --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/IOcrSpRuleDao.java @@ -0,0 +1,52 @@ +package com.docus.server.infrastructure.dao; +import com.docus.server.entity.segmentation.OcrSpRule; +import com.docus.infrastructure.core.db.dao.IBaseDao; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import java.util.List; +/** + * + * 特殊策略表 数据访问接口 + * + * @author AutoGenerator + * @since 2023-08-21 + */ +public interface IOcrSpRuleDao extends IBaseDao { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrSpRule findById(Long id); + /** + * 新增 + * @param ocrSpRule 新增参数 + * @return 成功或失败 + */ + boolean add(OcrSpRule ocrSpRule); + /** + * 编辑 + * @param ocrSpRule 编辑参数 + * @return 成功或失败 + */ + boolean edit(OcrSpRule ocrSpRule); + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + int delete(List ids); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + int findByIdAndName(Long id, String name); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpRuleDaoImpl.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpRuleDaoImpl.java new file mode 100644 index 0000000..b805985 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/dao/impl/OcrSpRuleDaoImpl.java @@ -0,0 +1,117 @@ +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.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.entity.segmentation.OcrSpRule; +import com.docus.server.infrastructure.dao.IOcrSpRuleDao; +import com.docus.server.infrastructure.mapper.OcrSpRuleMapper; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Repository; + +import java.util.Date; +import java.util.List; + +/** + * + * 特殊策略表 数据访问实现类 + * + * @author AutoGenerator + * @since 2023-08-21 + */ +@Repository +public class OcrSpRuleDaoImpl extends BaseDaoImpl implements IOcrSpRuleDao { + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrSpRule findById(Long id) { + return super.findById(id); + } + + /** + * 新增 + * @param ocrSpRule 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean add(OcrSpRule ocrSpRule) { + return super.save(ocrSpRule); + } + + /** + * 编辑 + * @param ocrSpRule 编辑参数 + * @return 成功或失败 + */ + @Override + public boolean edit(OcrSpRule ocrSpRule) { + return super.updateById(ocrSpRule); + } + + /** + * 批量删除 + * @param ids 主键ids + * @return 成功或失败 + */ + @Override + public int delete(List ids) { + return super.deleteByIds(ids); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + //分页 + PageHelper.startPage(searchDTO.getPageNum(), searchDTO.getPageSize()); + LambdaQueryWrapper query = Wrappers.lambdaQuery() ; + //时间范围，默认按createTime + if (searchDTO.getBeginTime() != null) { +// query.ge(OcrSpRule::getCreateTime, searchDTO.getBeginTime()); + } + if (searchDTO.getEndTime() != null) { + Date endTime = searchDTO.getEndTime(); +// query.le(OcrSpRule::getCreateTime, endTime); + } + //关键字比较，多个列or + //if (!StringUtils.isEmpty(searchDTO.getKeyword())) { + //单个列用like + //query. like(OcrSpRule::getxxx, searchDTO.getKeyword()); + //多个列用like + //query. and(sub -> sub.like(OcrSpRule::getxx1, searchDTO.getKeyword()) + // оr(). like(OcrSpRule::getXX2, searchDTO.getKeyword())) + //); + //} + //默认createTime倒序排序 +// query.orderByDesc(OcrSpRule::getCreateTime); + List list = super.find(query); + return new PageResult<>(list); + } + /** + * 名称不重复 + * @param id 主键 + * @param name 名称 + * @return 名称重复数量 + */ + @Override + public int findByIdAndName(Long id, String name) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (id != null) { + query.ne(OcrSpRule::getId, id); + } + //if (Func.isNotBlank(name)) { + // query.eq(OcrSpRule::getName, name); + //} + + return baseMapper.selectCount(query); + } +} diff --git a/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpRuleMapper.java b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpRuleMapper.java new file mode 100644 index 0000000..ef06de1 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/infrastructure/mapper/OcrSpRuleMapper.java @@ -0,0 +1,17 @@ +package com.docus.server.infrastructure.mapper; + +import com.docus.server.entity.segmentation.OcrSpRule; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* +* 特殊策略表 Mapper 接口 +* +* @author AutoGenerator +* @since 2023-08-21 +*/ +@Mapper +public interface OcrSpRuleMapper extends BaseMapper { + +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpRuleService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpRuleService.java new file mode 100644 index 0000000..62fc84e --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrSpRuleService.java @@ -0,0 +1,57 @@ +package com.docus.server.service; + +import com.docus.server.dto.segmentation.ocrsprule.AddOcrSpRuleDTO; +import com.docus.server.dto.segmentation.ocrsprule.EditOcrSpRuleDTO; +import com.docus.server.dto.segmentation.ocrsprule.DeleteOcrSpRuleDTO; +import com.docus.server.vo.segmentation.ocrsprule.OcrSpRuleVO; +import com.docus.server.entity.segmentation.OcrSpRule; + +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; + +import java.util.List; + +/** +* +* 特殊策略表 服务接口 +* +* @author AutoGenerator +* @since 2023-08-21 +*/ +public interface IOcrSpRuleService { + /** + * 按主键查询 + * @param id 主键id + * @return 实体 + */ + OcrSpRuleVO findById(Long id); + /** + * 查询所有 + * @return 实体 + */ + List findAll(); + /** + * 新增 + * @param addOcrSpRuleDTO 新增参数 + * @return 成功或失败 + */ + boolean add(AddOcrSpRuleDTO addOcrSpRuleDTO); + /** + * 编辑 + * @param editOcrSpRuleDTO 编辑参数 + * @return 成功或失败 + */ + boolean edit(EditOcrSpRuleDTO editOcrSpRuleDTO); + /** + * 批量删除 + * @param deleteOcrSpRuleDTO 删除参数 + * @return 成功或失败 + */ + int delete(DeleteOcrSpRuleDTO deleteOcrSpRuleDTO); + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + PageResult search(SearchDTO searchDTO); +} diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpRuleServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpRuleServiceImpl.java new file mode 100644 index 0000000..4b639f2 --- /dev/null +++ b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrSpRuleServiceImpl.java @@ -0,0 +1,140 @@ +package com.docus.server.service.impl; + +import com.docus.infrastructure.redis.service.IdService; +import com.docus.infrastructure.web.request.SearchDTO; +import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.convert.OcrSpRuleConvert; +import com.docus.server.dto.segmentation.ocrsprule.AddOcrSpRuleDTO; +import com.docus.server.dto.segmentation.ocrsprule.DeleteOcrSpRuleDTO; +import com.docus.server.dto.segmentation.ocrsprule.EditOcrSpRuleDTO; +import com.docus.server.entity.segmentation.OcrSpRule; +import com.docus.server.infrastructure.dao.IOcrSpRuleDao; +import com.docus.server.service.IOcrSpRuleService; +import com.docus.server.vo.segmentation.ocrsprule.OcrSpRuleVO; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + * + * 特殊策略表 服务实现类 + * + * @author AutoGenerator + * @since 2023-08-21 + */ +@Service +public class OcrSpRuleServiceImpl implements IOcrSpRuleService { + @Resource + private IOcrSpRuleDao iOcrSpRuleDao; + @Resource + private IdService idService; + + /** + *按主键查询 + * @param id 主键Id + * @return 实体 + */ + @Override + public OcrSpRuleVO findById(Long id) { + return OcrSpRuleConvert.INSTANCE.convertVO(iOcrSpRuleDao.findById(id)); + } + + /** + *查询所有 + * @return 实体 + */ + @Override + public List findAll() { + return OcrSpRuleConvert.INSTANCE.convertVO(iOcrSpRuleDao.findAll()); + } + + /** + * 关键字搜索 + * @param searchDTO 搜索参数 + * @return 分页列表 + */ + @Override + public PageResult search(SearchDTO searchDTO) { + return OcrSpRuleConvert.INSTANCE.convertVO(iOcrSpRuleDao.search(searchDTO)); + + //PageResult result = OcrSpRuleConvert.INSTANCE.convertVO(iOcrSpRuleDao.search(searchDTO)); + + //if (CollectionUtils.isEmpty(result.getList())) { + //return new PageResult<>(); + //} + + //Map map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId)); + + //result.getList().forEach(p -> { + // String collectorId = String.valueOf(p.getCollectorId()); + // if (map.containsKey(collectorId)) { + // p.setCollectorName(map.get(collectorId).getParamName()); + // } + //}); + + //return result; + } + + /** + * 新增 + * @param addOcrSpRuleDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(AddOcrSpRuleDTO addOcrSpRuleDTO) { + OcrSpRule ocrSpRule =OcrSpRuleConvert.INSTANCE.convertDO(addOcrSpRuleDTO); + ocrSpRule.setId(1); + return iOcrSpRuleDao.add(ocrSpRule); + + // String name = addOcrSpRuleDTO.getName(); + + //OcrSpRule ocrSpRule = iOcrSpRuleDao.findOneBy("name", name); + + //if (Func.notNull(ocrSpRule)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "特殊策略表已经存在"); + // } + + // OcrSpRule ocrSpRule =OcrSpRuleConvert.INSTANCE.convertDO(addOcrSpRuleDTO); + // ocrSpRule.setId(idService.getDateSeq()); + + // return iOcrSpRuleDao.add(schCollector); + + } + + /** + * 编辑 + * @param editOcrSpRuleDTO 编辑参数 + * @return 成功或失败 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean edit(EditOcrSpRuleDTO editOcrSpRuleDTO) { + OcrSpRule ocrSpRule =OcrSpRuleConvert.INSTANCE.convertDO(editOcrSpRuleDTO); + return iOcrSpRuleDao.edit(ocrSpRule); + + // Long id = editOcrSpRuleDTO.getId(); + + // OcrSpRule ocrSpRule = iOcrSpRuleDao.findById(id); + + // if (Func.isNull(ocrSpRule)) { + // throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "特殊策略表，无法更新！"); + // } + + // ocrSpRule.setUpdateTime(LocalDateTime.now()); + // return iOcrSpRuleDao.edit(ocrSpRule); + } + + /** + * 批量删除 + * @param deleteOcrSpRuleDTO 删除参数 + * @return 成功或失败 + */ + @Override + public int delete(DeleteOcrSpRuleDTO deleteOcrSpRuleDTO) { + return iOcrSpRuleDao.delete(deleteOcrSpRuleDTO.getIds()); + } +} + diff --git a/docus-segmentation/src/main/resources/application.properties b/docus-segmentation/src/main/resources/application.properties index bde7d71..b940360 100644 --- a/docus-segmentation/src/main/resources/application.properties +++ b/docus-segmentation/src/main/resources/application.properties @@ -2,7 +2,7 @@ api.base-package=com.docus.server spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://db.docus.cn:3306/docus-collector-scheduling?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai +spring.datasource.url=jdbc:mysql://db.docus.cn:3306/docus_ocr?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai spring.datasource.username=docus spring.datasource.password=docus702 diff --git a/docus-segmentation/src/main/resources/bootstrap.yml b/docus-segmentation/src/main/resources/bootstrap.yml index 4546456..6f91123 100644 --- a/docus-segmentation/src/main/resources/bootstrap.yml +++ b/docus-segmentation/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: 9116 + port: 9115 spring: profiles: active: dev @@ -12,7 +12,7 @@ spring: datasource: #公司病案的文件服务数据库 master: - url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus-collector-scheduling?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai + url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus-ocr?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: docus password: docus702 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy diff --git a/docus-segmentation/src/main/resources/logback.xml b/docus-segmentation/src/main/resources/logback.xml index 1c6a406..6d23488 100644 --- a/docus-segmentation/src/main/resources/logback.xml +++ b/docus-segmentation/src/main/resources/logback.xml @@ -1,6 +1,6 @@ - collector-terminal-management[0] + docus-segmentation diff --git a/docus-segmentation/src/main/resources/mapper/OcrSpRuleMapper.xml b/docus-segmentation/src/main/resources/mapper/OcrSpRuleMapper.xml new file mode 100644 index 0000000..53c80be --- /dev/null +++ b/docus-segmentation/src/main/resources/mapper/OcrSpRuleMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + id, assort_id, start_json, end_json + + +