From 27de488927b8e393fb1de62034dc07c281cb394b Mon Sep 17 00:00:00 2001 From: liu Date: Thu, 30 May 2024 10:32:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7jdk17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 --- virtual-patient-common/pom.xml | 6 +-- .../supervision/config/JwtInterceptor.java | 11 +--- .../com/supervision/config/Knife4jConfig.java | 51 ------------------ .../config/SwaggerConfiguration.java | 52 ++++++++++++++++++ .../com/supervision/config/WebConfig.java | 16 +++--- .../com/supervision/domain/GlobalResult.java | 4 -- virtual-patient-graph/pom.xml | 5 ++ .../controller/GraphNebulaController.java | 12 ++--- .../controller/AttributeController.java | 14 ++--- .../controller/AttributeManageController.java | 12 ++--- .../nebula/controller/EdgeController.java | 8 +-- .../controller/EdgeManageController.java | 10 ++-- .../controller/GraphFileController.java | 12 ++--- .../nebula/controller/SpaceController.java | 14 ++--- .../nebula/controller/SubGraphController.java | 8 +-- .../nebula/controller/TagEdgeController.java | 12 ++--- .../nebula/controller/VertexController.java | 16 +++--- .../controller/VertexManageController.java | 10 ++-- .../com/supervision/nebula/dto/ImportDto.java | 12 ++--- .../nebula/dto/NebulaVertexJsonResult.java | 21 ++++---- .../supervision/nebula/dto/PageBeanDto.java | 10 ++-- .../nebula/dto/graph/AttributeBean.java | 9 ++-- .../nebula/dto/graph/GraphAddAttribute.java | 21 ++++---- .../nebula/dto/graph/GraphCreateEdge.java | 18 +++---- .../nebula/dto/graph/GraphCreateIndex.java | 18 +++---- .../nebula/dto/graph/GraphCreateSpace.java | 19 ++++--- .../nebula/dto/graph/GraphCreateTag.java | 16 +++--- .../nebula/dto/graph/GraphDelAttribute.java | 14 ++--- .../nebula/dto/graph/GraphDeleteEdge.java | 14 ++--- .../nebula/dto/graph/GraphDeleteSpace.java | 8 +-- .../nebula/dto/graph/GraphDeleteVertex.java | 10 ++-- .../nebula/dto/graph/GraphDropAttribute.java | 12 ++--- .../nebula/dto/graph/GraphExpand.java | 21 ++++---- .../nebula/dto/graph/GraphInsertEdge.java | 18 +++---- .../nebula/dto/graph/GraphInsertVertex.java | 16 +++--- .../nebula/dto/graph/GraphPageAttribute.java | 9 ++-- .../nebula/dto/graph/GraphPageEdge.java | 11 ++-- .../nebula/dto/graph/GraphRelationInsert.java | 11 ++-- .../nebula/dto/graph/GraphShowAttribute.java | 10 ++-- .../nebula/dto/graph/GraphShowIndex.java | 9 ++-- .../nebula/dto/graph/GraphShowInfo.java | 12 ++--- .../nebula/dto/graph/GraphSpace.java | 7 ++- .../nebula/dto/graph/GraphUpdateEdge.java | 18 +++---- .../nebula/dto/graph/GraphUpdateSpace.java | 11 ++-- .../nebula/dto/graph/GraphUpdateTagColor.java | 14 ++--- .../nebula/dto/graph/GraphUpdateVertex.java | 16 +++--- .../dto/graph/GraphVertexAnalysisResult.java | 10 ++-- .../dto/graph/GraphVertexAnalysisWord.java | 10 ++-- .../dto/graph/GraphVertexFullQuery.java | 14 ++--- .../dto/graph/GraphVertexPathQuery.java | 23 ++++---- .../graph/GraphVertexTatAttributeQuery.java | 13 +++-- .../dto/graph/GraphVertexTatsQuery.java | 11 ++-- .../nebula/dto/graph/PropertyBean.java | 15 +++--- .../supervision/nebula/vo/AttributeVo.java | 19 ++++--- .../com/supervision/nebula/vo/CommonVo.java | 11 ++-- .../supervision/nebula/vo/DetailSpace.java | 12 ++--- .../main/java/com/supervision/vo/EdgeVO.java | 13 ++--- .../main/java/com/supervision/vo/GraphVO.java | 12 ++--- .../main/java/com/supervision/vo/NodeVO.java | 20 +++---- .../java/com/supervision/vo/TreeNodeVO.java | 22 ++++---- virtual-patient-manage/pom.xml | 8 ++- .../config/AncillaryItemManageController.java | 17 +++--- .../AskQuestionLibraryManageController.java | 27 +++++----- .../config/CommonDicManageController.java | 9 ++-- .../config/DrugManageController.java | 31 +++++------ .../PhysicalLocationManageController.java | 13 ++--- .../config/PhysicalToolManageController.java | 20 ++++--- .../config/TreatmentPlanManageController.java | 33 ++++++------ .../DiseaseAncillaryManageController.java | 16 +++--- .../DiseaseManageController.java | 20 +++---- .../DiseasePhysicalManageController.java | 18 +++---- .../DiseaseQuestionManageController.java | 15 +++--- .../DiseaseTreatmentPlanManageController.java | 30 ++++++----- .../file/DirectoryInfoManageController.java | 25 ++++----- .../controller/file/FileManageController.java | 13 ++--- .../file/MaterialLibraryManageController.java | 25 +++++---- .../MedicalRecManageController.java | 53 +++++++++---------- .../ProcessRecordController.java | 14 ++--- .../QaKnowledgeManageController.java | 6 +-- .../manage/controller/system/UserManager.java | 14 ++--- .../pojo/vo/MedicalAnswerVideoResVo.java | 11 ++-- .../manage/pojo/vo/MedicalRecInfoVO.java | 13 +++-- .../manage/pojo/vo/MedicalRecManageVO.java | 11 ++-- .../manage/pojo/vo/MedicalRecQaVO.java | 23 ++++---- .../manage/pojo/vo/PhysicalToolVO.java | 10 ++-- .../pojo/vo/UploadQuestionLibraryResVo.java | 9 ++-- .../supervision/dto/DiseaseAncillaryDto.java | 4 +- .../supervision/model/AskPatientAnswer.java | 24 +++++---- .../model/AskTemplateQuestionLibrary.java | 11 ++-- .../model/ConfigAncillaryItem.java | 41 +++++++------- .../com/supervision/model/ConfigDrug.java | 8 +-- .../model/ConfigPhysicalLocation.java | 19 ++++--- .../supervision/model/ConfigPhysicalTool.java | 25 +++++---- .../model/ConfigTreatmentPlan.java | 22 ++++---- .../model/DefaultPhysicalIndicator.java | 15 +++--- .../model/DiagnosisAncillaryRecord.java | 30 +++++------ .../model/DiagnosisPhysicalRecord.java | 29 +++++----- .../supervision/model/DiagnosisPrimary.java | 23 ++++---- .../model/DiagnosisPrimaryRelation.java | 20 +++---- .../supervision/model/DiagnosisQaRecord.java | 37 ++++++------- .../java/com/supervision/model/Disease.java | 29 +++++----- .../supervision/model/DiseaseAncillary.java | 33 ++++++------ .../supervision/model/DiseasePhysical.java | 33 ++++++------ .../supervision/model/DiseaseQuestion.java | 6 +-- .../model/DiseaseTreatmentPlan.java | 7 +-- .../supervision/model/MaterialLibrary.java | 20 +++---- .../com/supervision/model/MedicalRec.java | 16 +++--- .../java/com/supervision/model/Patient.java | 27 +++++----- .../java/com/supervision/model/Process.java | 25 +++++---- .../supervision/model/ProcessEvaluation.java | 21 ++++---- .../com/supervision/model/RasaModelInfo.java | 23 ++++---- .../main/java/com/supervision/model/User.java | 25 ++++----- .../vo/ask/AncillaryItemReqVo.java | 9 ++-- .../vo/ask/AskAncillaryHistoryResVO.java | 30 +++++------ .../vo/ask/AskPhysicalHistoryResVO.java | 24 ++++----- .../vo/ask/ConfigAncillaryItemResVO.java | 6 +-- .../vo/ask/DiagnosisAncillaryRecordVo.java | 4 +- .../vo/ask/DiagnosisPhysicalRecordVo.java | 6 +-- .../vo/ask/DiagnosisPrimaryVO.java | 8 +-- .../ask/DiagnosticBasisForPrimaryResVO.java | 23 ++++---- .../vo/ask/ModifyPrimaryDiseaseInfoReqVO.java | 9 ++-- .../vo/ask/ProcessMedicalViewDetailResVo.java | 15 +++--- .../vo/ask/TreatmentPlanRecordVo.java | 6 +-- .../vo/manage/AskQuestionLibraryReqVo.java | 15 +++--- .../vo/manage/AskQuestionLibraryResVo.java | 22 ++++---- .../vo/manage/ConfigDrugResVo.java | 4 +- .../vo/manage/DiseaseAncillaryReqVo.java | 4 +- .../vo/manage/DiseaseAncillaryResVo.java | 10 ++-- .../manage/DiseasePhysicalLocationNodeVo.java | 17 +++--- .../vo/manage/DiseasePhysicalReqVo.java | 5 +- .../vo/manage/DiseasePhysicalResVo.java | 16 +++--- .../vo/manage/DiseaseQuestionResVo.java | 10 ++-- .../supervision/vo/manage/DiseaseReqVo.java | 14 ++--- .../vo/manage/DiseaseTreatmentPlanReqVo.java | 8 +-- .../vo/manage/DiseaseTreatmentPlanResVo.java | 12 ++--- .../manage/DiseaseTreatmentPlanTreeNode.java | 11 ++-- .../vo/manage/MaterialLibraryResVo.java | 4 +- .../vo/manage/PhysicalLocationNode.java | 4 +- .../vo/manage/TreatmentPlanTreeNode.java | 8 +-- .../com/supervision/vo/rasa/RasaTalkVo.java | 5 +- .../vo/result/ConfigAncillaryItemVo.java | 8 +-- .../vo/result/DiagnoseProcessReqVo.java | 9 ++-- .../vo/result/DiagnoseProcessResVo.java | 31 +++++------ .../vo/result/ProcessRecordVO.java | 27 ++++------ virtual-patient-rasa/pom.xml | 9 ++-- .../rasa/controller/RasaCmdController.java | 24 +++++---- .../rasa/controller/RasaFileController.java | 10 ++-- .../rasa/controller/RasaTalkController.java | 10 ++-- .../rasa/controller/Text2vecController.java | 11 ++-- .../rasa/pojo/dto/Text2vecDataVo.java | 7 +-- .../rasa/pojo/dto/Text2vecMatchesReq.java | 7 +-- .../rasa/pojo/dto/Text2vecMatchesRes.java | 9 ++-- .../rasa/pojo/vo/RasaCmdArgumentVo.java | 3 -- virtual-patient-web/pom.xml | 4 ++ .../controller/AskAncillaryController.java | 22 ++++---- .../supervision/controller/AskController.java | 10 ++-- .../AskDiagnosisResultController.java | 10 ++-- .../controller/AskPatientController.java | 10 ++-- .../controller/AskPhysicalController.java | 17 +++--- .../controller/AskPrimaryController.java | 33 ++++++------ .../controller/AskProcessController.java | 18 +++---- .../controller/DiagnoseHallController.java | 20 +++---- .../DiagnosisQaRecordController.java | 12 ++--- .../controller/MedicalRecordController.java | 22 ++++---- .../controller/TreatmentPlanController.java | 33 ++++++------ .../controller/UserController.java | 13 +++-- .../pojo/vo/AskAncillaryBatchReqVO.java | 9 ++-- .../pojo/vo/AskAncillaryResultReqVO.java | 12 ++--- .../pojo/vo/AskPhysicalResultReqVO.java | 14 ++--- .../pojo/vo/BasisConfirmResultResVO.java | 10 ++-- .../pojo/vo/BasisDiagnosisNodeResVO.java | 11 ++-- .../vo/BasisIdentificationResultResVO.java | 7 +-- .../pojo/vo/BasisPrimaryResultResVO.java | 7 +-- .../com/supervision/pojo/vo/ChartNodeVO.java | 17 +++--- .../com/supervision/pojo/vo/ChooseNode.java | 2 +- .../supervision/pojo/vo/DealPlanResVO.java | 6 +-- .../pojo/vo/DiagnosisDiseaseResultNodeVO.java | 12 ++--- .../pojo/vo/DiagnosisResultResVO.java | 15 +++--- .../vo/DiagnosticBasisForPrimaryReqVO.java | 11 ++-- .../pojo/vo/ExpertDiagnosisResultResVO.java | 12 ++--- .../supervision/pojo/vo/FinishAskReqVO.java | 6 +-- .../com/supervision/pojo/vo/LoginResVO.java | 14 ++--- .../pojo/vo/PrimaryConfirmNodeReqVO.java | 9 ++-- .../pojo/vo/PrimaryConfirmReqVO.java | 7 +-- .../supervision/pojo/vo/RadarChartResVO.java | 17 +++--- .../pojo/vo/RecordForPrimaryChooseVO.java | 12 ++--- .../pojo/vo/SaveDiagnosisPrimaryReqVO.java | 20 +++---- .../com/supervision/pojo/vo/TalkReqVO.java | 13 +++-- .../supervision/pojo/vo/TalkResultResVO.java | 19 +++---- .../supervision/pojo/vo/TalkVideoReqVO.java | 7 +-- .../supervision/pojo/vo/UserInfoReqVo.java | 11 ++-- .../supervision/pojo/vo/UserInfoResVo.java | 13 ++--- .../service/AskPrimaryService.java | 5 +- .../src/main/resources/application.yml | 20 ++++++- .../src/main/resources/bootstrap-dev.yml | 4 +- 196 files changed, 1462 insertions(+), 1484 deletions(-) delete mode 100644 virtual-patient-common/src/main/java/com/supervision/config/Knife4jConfig.java create mode 100644 virtual-patient-common/src/main/java/com/supervision/config/SwaggerConfiguration.java diff --git a/pom.xml b/pom.xml index 32a0ad48..20f88d6e 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,6 @@ 4.1.2 2.3.31 8.0.26 - 1.5.22 2.2.5 8.5.7 4.9.0 @@ -152,11 +151,6 @@ ${poi-ooxml.version} - - io.swagger - swagger-annotations - ${io-swagger.version} - io.minio diff --git a/virtual-patient-common/pom.xml b/virtual-patient-common/pom.xml index 8fc78ff2..c9f86858 100644 --- a/virtual-patient-common/pom.xml +++ b/virtual-patient-common/pom.xml @@ -36,6 +36,7 @@ knife4j-openapi3-jakarta-spring-boot-starter + org.springframework.boot spring-boot-starter-data-redis @@ -113,11 +114,6 @@ okhttp - - io.swagger - swagger-annotations - - diff --git a/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java b/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java index 4a7f1c7e..1784db6c 100644 --- a/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java +++ b/virtual-patient-common/src/main/java/com/supervision/config/JwtInterceptor.java @@ -11,7 +11,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpStatus; import org.springframework.lang.Nullable; import org.springframework.web.servlet.HandlerInterceptor; @@ -22,20 +21,14 @@ import java.util.Map; @Slf4j public class JwtInterceptor implements HandlerInterceptor { - private final RedisTemplate redisTemplate; - - public JwtInterceptor(RedisTemplate redisTemplate) { - this.redisTemplate = redisTemplate; - } - - @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { //请求消息头获取用户ID String token = request.getHeader("token"); if (StrUtil.isBlank(token)) { // 如果是swagger来的接口,说明这里是测试的,会伪造一个用户 - if (StrUtil.isNotBlank(request.getHeader("Knife4j-Gateway-Code"))) { + String referer = request.getHeader("Referer"); + if (StrUtil.isNotBlank(referer) && StrUtil.contains(referer, "doc.html")) { cacheAuth(JWTUtil.parseToken(devActiveUser())); return true; } else { diff --git a/virtual-patient-common/src/main/java/com/supervision/config/Knife4jConfig.java b/virtual-patient-common/src/main/java/com/supervision/config/Knife4jConfig.java deleted file mode 100644 index a9ff6873..00000000 --- a/virtual-patient-common/src/main/java/com/supervision/config/Knife4jConfig.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 文 件 名: Knife4jConfig - * 版 权: - * 描 述: <描述> - * 修 改 人: RedName - * 修改时间: 2022/8/5 - * 跟踪单号: <跟踪单号> - * 修改单号: <修改单号> - * 修改内容: <修改内容> - */ -package com.supervision.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.Contact; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; - -/** - * <功能详细描述> - * - * @author ljt - * @version [版本号, 2022/8/5] - * @see [相关类/方法] - * @since [产品/模块版本] - */ -@Configuration -@EnableSwagger2WebMvc -public class Knife4jConfig { - @Bean(value = "defaultApi2") - public Docket defaultApi2() { - return new Docket(DocumentationType.SWAGGER_2) - .apiInfo(this.apiInfo()) - .useDefaultResponseMessages(false) - .select() - .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class)) - .paths(PathSelectors.any()).build(); - - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder().title("API文档").description("API文档").contact(new Contact("", "", "")) - .version("1.0.0").build(); - } -} diff --git a/virtual-patient-common/src/main/java/com/supervision/config/SwaggerConfiguration.java b/virtual-patient-common/src/main/java/com/supervision/config/SwaggerConfiguration.java new file mode 100644 index 00000000..745de407 --- /dev/null +++ b/virtual-patient-common/src/main/java/com/supervision/config/SwaggerConfiguration.java @@ -0,0 +1,52 @@ +package com.supervision.config; + +import cn.hutool.core.util.RandomUtil; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.info.License; +import org.springdoc.core.customizers.GlobalOpenApiCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.HashMap; +import java.util.Map; + +@Configuration +public class SwaggerConfiguration { + + /** + * 根据@Tag 上的排序，写入x-order + * + * @return the global open api customizer + */ + @Bean + public GlobalOpenApiCustomizer orderGlobalOpenApiCustomizer() { + return openApi -> { + if (openApi.getTags() != null) { + openApi.getTags().forEach(tag -> { + Map map = new HashMap<>(); + map.put("x-order", RandomUtil.randomInt(0, 100)); + tag.setExtensions(map); + }); + } + if (openApi.getPaths() != null) { + openApi.addExtension("x-test123", "333"); + openApi.getPaths().addExtension("x-abb", RandomUtil.randomInt(1, 100)); + } + + }; + } + + @Bean + public OpenAPI customOpenAPI() { + return new OpenAPI() + .info(new Info() + .title("XXX用户系统API") + .version("1.0") + + .description("Knife4j集成springdoc-openapi示例") + .termsOfService("http://doc.xiaominfo.com") + .license(new License().name("Apache 2.0") + .url("http://doc.xiaominfo.com"))); + } +} diff --git a/virtual-patient-common/src/main/java/com/supervision/config/WebConfig.java b/virtual-patient-common/src/main/java/com/supervision/config/WebConfig.java index 16da077e..a521d70f 100644 --- a/virtual-patient-common/src/main/java/com/supervision/config/WebConfig.java +++ b/virtual-patient-common/src/main/java/com/supervision/config/WebConfig.java @@ -6,10 +6,8 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -21,23 +19,23 @@ import java.util.List; @Configuration public class WebConfig implements WebMvcConfigurer { - @Autowired - private RedisTemplate redisTemplate; @Override public void addInterceptors(InterceptorRegistry registry) { // 添加权限拦截器 - registry.addInterceptor(new JwtInterceptor(redisTemplate)) - .addPathPatterns("/**") - .excludePathPatterns(ignorePathPatterns()); +// registry.addInterceptor(new JwtInterceptor()) +// .addPathPatterns("/**") +// .excludePathPatterns(ignorePathPatterns()); } public List ignorePathPatterns() { List paths = new ArrayList<>(); paths.add("/swagger-resources/**"); paths.add("/webjars/**"); - paths.add("/v2/**"); + paths.add("/v3/**"); paths.add("/swagger-ui.html/**"); + paths.add("/swagger-ui/**"); + paths.add("/webjars/"); paths.add("/doc.html/**"); paths.add("/error"); paths.add("/favicon.ico"); @@ -49,7 +47,7 @@ public class WebConfig implements WebMvcConfigurer { paths.add("/medicalRecManage/downloadMedicalAnswerTemplate"); paths.add("/qaKnowledge/**"); // 开发环境,放开不校验token.每次修改这里需要重启(热部署不行) -// paths.add("/**"); + paths.add("/**"); return paths; } diff --git a/virtual-patient-common/src/main/java/com/supervision/domain/GlobalResult.java b/virtual-patient-common/src/main/java/com/supervision/domain/GlobalResult.java index 5117bdad..86311704 100644 --- a/virtual-patient-common/src/main/java/com/supervision/domain/GlobalResult.java +++ b/virtual-patient-common/src/main/java/com/supervision/domain/GlobalResult.java @@ -1,19 +1,15 @@ package com.supervision.domain; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.http.HttpStatus; @Data -@ApiModel public class GlobalResult { private int code = 200; private String msg = "success"; - @ApiModelProperty private T data; diff --git a/virtual-patient-graph/pom.xml b/virtual-patient-graph/pom.xml index ba2e89f9..b3b9038a 100644 --- a/virtual-patient-graph/pom.xml +++ b/virtual-patient-graph/pom.xml @@ -38,6 +38,11 @@ spring-cloud-starter-openfeign + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config diff --git a/virtual-patient-graph/src/main/java/com/supervision/controller/GraphNebulaController.java b/virtual-patient-graph/src/main/java/com/supervision/controller/GraphNebulaController.java index 21c5e0d4..6598e535 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/controller/GraphNebulaController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/controller/GraphNebulaController.java @@ -3,29 +3,29 @@ package com.supervision.controller; import com.supervision.service.GraphNebulaService; import com.supervision.vo.GraphVO; import com.supervision.vo.TreeNodeVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Api(tags = "Nebula图谱") +@Tag(name = "Nebula图谱") @RestController("nebulaGraph") @RequiredArgsConstructor public class GraphNebulaController { private final GraphNebulaService graphNebulaService; - @ApiOperation("创建图谱") + @Operation(summary = "创建图谱") @GetMapping("createGraph") public void createGraph(String processId) { graphNebulaService.creatGraphByNebula(processId); } - @ApiOperation("查询图谱") + @Operation(summary = "查询图谱") @GetMapping("queryGraph") public GraphVO queryGraph(String processId, Integer level) { GraphVO graphVO = graphNebulaService.queryGraph(processId, level); @@ -34,7 +34,7 @@ public class GraphNebulaController { } - @ApiOperation("查询树形结构图") + @Operation(summary = "查询树形结构图") @GetMapping("queryTreeGraph") public List queryTreeGraph(String processId, Integer level) { return graphNebulaService.queryTreeGraph(processId, level); diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/AttributeController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/AttributeController.java index a89b9b47..2ece84e9 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/AttributeController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/AttributeController.java @@ -8,8 +8,8 @@ import com.supervision.nebula.dto.graph.GraphShowInfo; import com.supervision.nebula.service.AttributeService; import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.vo.AttributeVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -21,7 +21,7 @@ import java.util.List; @SuppressWarnings("ALL") @RestController @RequestMapping("/attribute") -@Api(tags = "属性查询控制器") +@Tag(name = "属性查询控制器") @RequiredArgsConstructor public class AttributeController { @@ -30,25 +30,25 @@ public class AttributeController { private final AttributeService attributeService; @PostMapping("/list") - @ApiOperation("属性查询(spaces tags edges列表)") + @Operation(summary = "属性查询(spaces tags edges列表)") public List showAttribute(@RequestBody GraphShowAttribute graphShowAttribute) { return attributeService.showAttribute(graphShowAttribute); } @PostMapping("/page") - @ApiOperation("属性分页查询 tags edges 分页列表") + @Operation(summary = "属性分页查询 tags edges 分页列表") public PageInfo pageListAttribute(@RequestBody GraphPageAttribute graphPageAttribute) { return attributeService.pageListAttribute(graphPageAttribute); } @PostMapping("/listProperty") - @ApiOperation("属性的子属性列表查询 tag edge 的属性列表查询") + @Operation(summary = "属性的子属性列表查询 tag edge 的属性列表查询") public List showAttributeInfo(@RequestBody GraphShowInfo graphShowInfo) { return attributeService.showAttributeInfo(graphShowInfo); } @PostMapping("/propertyInfo") - @ApiOperation("属性的详细信息") + @Operation(summary = "属性的详细信息") public List showCreateAttributeInfo(@RequestBody GraphShowInfo graphShowInfo) { return attributeService.showCreateAttributeInfo(graphShowInfo); } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/AttributeManageController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/AttributeManageController.java index 130cef2c..20b0ef70 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/AttributeManageController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/AttributeManageController.java @@ -8,8 +8,8 @@ import com.supervision.nebula.service.AttributeService; import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.vo.CommonVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -23,7 +23,7 @@ import java.util.List; */ @RestController @RequestMapping("/attribute") -@Api(tags = "属性编辑控制器") +@Tag(name = "属性编辑控制器") @RequiredArgsConstructor public class AttributeManageController { @@ -32,19 +32,19 @@ public class AttributeManageController { private final AttributeService attributeService; @PostMapping("/dropAttribute") - @ApiOperation("删除属性(删除 space空间 tag标签 edge边类型)") + @Operation(summary = "删除属性(删除 space空间 tag标签 edge边类型)") public List dropAttribute(@RequestBody GraphDropAttribute graphDropAttribute) { return attributeService.dropAttribute(graphDropAttribute); } @PostMapping("/addAttributeProperty") - @ApiOperation("增加属性的子属性(tag标签的属性 edge边类型的属性)") + @Operation(summary = "增加属性的子属性(tag标签的属性 edge边类型的属性)") public List addAttributeProperty(@RequestBody GraphAddAttribute graphAddAttribute) { return attributeService.addAttributeProperty(graphAddAttribute); } @PostMapping("/delAttributeProperty") - @ApiOperation("删除属性的子属性(tag标签的属性 edge边类型的属性)") + @Operation(summary = "删除属性的子属性(tag标签的属性 edge边类型的属性)") public List delAttributeProperty(@RequestBody GraphDelAttribute graphDelAttribute) { return graphCommonService.executeJson(NebulaUtil.delAttributeProperty(graphDelAttribute), CommonVo.class); } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/EdgeController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/EdgeController.java index 5101c751..915bd16c 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/EdgeController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/EdgeController.java @@ -5,8 +5,8 @@ import com.supervision.nebula.dto.NebulaVertexJsonResult; import com.supervision.nebula.dto.graph.GraphSpace; import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.util.NebulaUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -21,7 +21,7 @@ import java.util.List; * @ClassName: VertexController */ @RestController -@Api(tags = "边edge查询控制器") +@Tag(name = "边edge查询控制器") @RequestMapping("/edge") @RequiredArgsConstructor public class EdgeController { @@ -29,7 +29,7 @@ public class EdgeController { private final GraphCommonService graphCommonService; @PostMapping("/listEdge") - @ApiOperation("查询插入的边edge(绑定关系查询)") + @Operation(summary = "查询插入的边edge(绑定关系查询)") public List listEdge(@RequestBody GraphSpace graphSpace) { return graphCommonService.executeJson(NebulaUtil.listEdge(graphSpace), NebulaVertexJsonResult.class); } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/EdgeManageController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/EdgeManageController.java index 347fada5..ca2e1d1f 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/EdgeManageController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/EdgeManageController.java @@ -6,8 +6,8 @@ import com.supervision.nebula.dto.graph.GraphInsertEdge; import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.vo.CommonVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -22,7 +22,7 @@ import java.util.List; * @ClassName: VertexController */ @RestController -@Api(tags = "边edge管理控制器") +@Tag(name = "边edge管理控制器") @RequestMapping("/edge") @RequiredArgsConstructor public class EdgeManageController { @@ -30,14 +30,14 @@ public class EdgeManageController { private final GraphCommonService graphCommonService; @PostMapping("/insertEdge") - @ApiOperation("插入边edge(关系编辑-绑定两个点的关系)") + @Operation(summary = "插入边edge(关系编辑-绑定两个点的关系)") public List insertEdge(@RequestBody GraphInsertEdge graphInsertEdge) { String vidType = graphCommonService.getVidType(graphInsertEdge.getSpace()); return graphCommonService.executeJson(NebulaUtil.insertEdge(graphInsertEdge, vidType), CommonVo.class); } @PostMapping("/deleteEdge") - @ApiOperation("删除边edge(解除关系编辑-解除两个点的关系)") + @Operation(summary = "删除边edge(解除关系编辑-解除两个点的关系)") public List deleteEdge(@RequestBody GraphDeleteEdge graphDeleteEdge) { String vidType = graphCommonService.getVidType(graphDeleteEdge.getSpace()); return graphCommonService.executeJson(NebulaUtil.deleteEdge(graphDeleteEdge, vidType), CommonVo.class); diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/GraphFileController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/GraphFileController.java index 85eecd9d..dfd06b5c 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/GraphFileController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/GraphFileController.java @@ -4,8 +4,8 @@ package com.supervision.nebula.controller; import com.supervision.nebula.dto.ImportBean; import com.supervision.nebula.entity.GraphFile; import com.supervision.nebula.service.GraphFileService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.MediaType; @@ -21,7 +21,7 @@ import java.io.IOException; * @since 2022-08-23 09:09:26 */ @RestController -@Api(tags = "文件控制器") +@Tag(name = "文件控制器") @RequestMapping("graphFile") public class GraphFileController { @@ -35,19 +35,19 @@ public class GraphFileController { * @return 文件实例对象 */ - @ApiOperation("文件上传--可以不做,这里为了预览数据") + @Operation(summary = "文件上传--可以不做,这里为了预览数据") @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public GraphFile uploadFile(@RequestParam("file") MultipartFile file) { return this.graphFileService.uploadFile(file); } - @ApiOperation("文件导入--执行nebula import插件") + @Operation(summary = "文件导入--执行nebula import插件") @PostMapping("/import") public Boolean importFile(@RequestBody ImportBean importBean) throws IOException { return this.graphFileService.importFile(importBean); } - @ApiOperation("模板下载,可以填充数据") + @Operation(summary = "模板下载,可以填充数据") @GetMapping("/template") public void template(@RequestParam String space, HttpServletResponse response) { graphFileService.template(space, response); diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/SpaceController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/SpaceController.java index 0eaf43bd..918c20c7 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/SpaceController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/SpaceController.java @@ -10,8 +10,8 @@ import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.vo.AttributeVo; import com.supervision.nebula.vo.CommonVo; import com.supervision.nebula.vo.DetailSpace; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -25,7 +25,7 @@ import java.util.List; * space控制器 */ @RestController -@Api(tags = "图谱space控制器") +@Tag(name = "图谱space控制器") @RequestMapping("/space") @RequiredArgsConstructor public class SpaceController { @@ -36,26 +36,26 @@ public class SpaceController { @PostMapping("/create") - @ApiOperation("创建图谱") + @Operation(summary = "创建图谱") public String createSpace(@RequestBody GraphCreateSpace graphCreateSpace) { return spaceService.createSpace(graphCreateSpace); } @PostMapping("/use") - @ApiOperation("切换图谱") + @Operation(summary = "切换图谱") public List useSpace(@RequestBody GraphCreateSpace graphCreateSpace) { return graphCommonService.executeJson(NebulaUtil.useSpace(graphCreateSpace.getSpace()), CommonVo.class); } @PostMapping("/list") - @ApiOperation("卡片展示列表(图谱详情)") + @Operation(summary = "卡片展示列表(图谱详情)") public List detailSpace(@RequestBody GraphShowAttribute graphShowAttribute) { return spaceService.detailSpace(graphShowAttribute); } @PostMapping("/info") - @ApiOperation("查询某个空间的信息") + @Operation(summary = "查询某个空间的信息") public List spaceInfo(@RequestBody GraphSpace graphSpace) { return spaceService.spaceInfo(graphSpace.getSpace()); } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/SubGraphController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/SubGraphController.java index cc612e88..91295b31 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/SubGraphController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/SubGraphController.java @@ -3,15 +3,15 @@ package com.supervision.nebula.controller; import cn.hutool.json.JSONObject; import com.supervision.nebula.service.GraphCommonService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@Api(tags = "子图查询控制器") +@Tag(name = "子图查询控制器") @RequestMapping("/subGraph") @RequiredArgsConstructor public class SubGraphController { @@ -19,7 +19,7 @@ public class SubGraphController { private final GraphCommonService graphCommonService; @PostMapping("querySubGraph") - @ApiOperation("子图查询") + @Operation(summary = "子图查询") public JSONObject querySubGraph() { String subgraphQuery = "use subgraph;GET SUBGRAPH 100 STEPS FROM \"player101\" YIELD VERTICES AS `vertices_`, EDGES AS `edges_`;"; // return JSONUtil.parseObj(s); diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/TagEdgeController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/TagEdgeController.java index 3a393fec..850ea289 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/TagEdgeController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/TagEdgeController.java @@ -6,8 +6,8 @@ import com.supervision.nebula.dto.graph.GraphCreateTag; import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.vo.CommonVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -21,7 +21,7 @@ import java.util.List; * 点类型标签tag控制器 */ @RestController -@Api(tags = "标签tag edge 新增控制器") +@Tag(name = "标签tag edge 新增控制器") @RequestMapping("/tagEdge") public class TagEdgeController { @@ -29,20 +29,20 @@ public class TagEdgeController { GraphCommonService graphCommonService; @PostMapping("/createTag") - @ApiOperation("创建tag") + @Operation(summary = "创建tag") public List createTagEdge(@RequestBody GraphCreateTag graphCreateTag) { return graphCommonService.executeJson(NebulaUtil.createTag(graphCreateTag), CommonVo.class); } @PostMapping("/createEdge") - @ApiOperation("创建edge") + @Operation(summary = "创建edge") public List createEdge(@RequestBody GraphCreateTag graphCreateTag) { return graphCommonService.executeJson(NebulaUtil.createEdge(graphCreateTag), CommonVo.class); } @PostMapping("/createIndex") - @ApiOperation("创建索引") + @Operation(summary = "创建索引") public List createIndex(@RequestBody GraphCreateIndex graphCreateIndex) { return graphCommonService.executeJson(NebulaUtil.createIndex(graphCreateIndex), CommonVo.class); } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/VertexController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/VertexController.java index 17401c1f..d14a88ab 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/VertexController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/VertexController.java @@ -7,8 +7,8 @@ import com.supervision.nebula.dto.NebulaVertexJsonResult; import com.supervision.nebula.dto.graph.*; import com.supervision.nebula.service.VertexService; import com.supervision.nebula.vo.AttributeVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -25,7 +25,7 @@ import java.util.Map; * @author fulin */ @RestController -@Api(tags = "点查询(实体)控制器") +@Tag(name = "点查询(实体)控制器") @RequestMapping("/vertex") @RequiredArgsConstructor public class VertexController { @@ -33,25 +33,25 @@ public class VertexController { private final VertexService vertexService; @PostMapping("/vertexList") - @ApiOperation("查询创建的点列表") + @Operation(summary = "查询创建的点列表") public List vertexList(@RequestBody GraphSpace graphSpace) { return vertexService.vertexList(graphSpace.getSpace()); } @PostMapping("/vertexTagsQuery") - @ApiOperation("根据tag标签查询点") + @Operation(summary = "根据tag标签查询点") public List vertexTagsQuery(@RequestBody GraphVertexTatsQuery graphVertexTatsQuery) { return vertexService.vertexTagsQuery(graphVertexTatsQuery); } @PostMapping("/vertexTagAttributeQuery") - @ApiOperation("根据tag标签属性查询点(先要保证该标签属性已经建立索引)") + @Operation(summary = "根据tag标签属性查询点(先要保证该标签属性已经建立索引)") public List vertexTagAttributeQuery(@RequestBody GraphVertexTatAttributeQuery graphVertexTatAttributeQuery) { return vertexService.vertexTagAttributeQuery(graphVertexTatAttributeQuery); } @PostMapping("/expandQuery") - @ApiOperation("根据点以及边信息扩展查询") + @Operation(summary = "根据点以及边信息扩展查询") public GraphData vertexExpandQuery(@RequestBody GraphExpand graphExpand) { List data = vertexService.vertexExpandQuery(graphExpand); JSONArray objects = JSONUtil.parseArray(JSONUtil.toJsonStr(data)); @@ -59,7 +59,7 @@ public class VertexController { } @PostMapping("/page") - @ApiOperation("查询创建的点分页列表") + @Operation(summary = "查询创建的点分页列表") public Map vertexPage(@RequestBody GraphVertexTatsQuery graphVertexTatsQuery) { return vertexService.vertexPage(graphVertexTatsQuery); } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/VertexManageController.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/VertexManageController.java index e4815e20..62a69800 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/VertexManageController.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/controller/VertexManageController.java @@ -6,8 +6,8 @@ import com.supervision.nebula.dto.graph.GraphInsertVertex; import com.supervision.nebula.service.GraphCommonService; import com.supervision.nebula.util.NebulaUtil; import com.supervision.nebula.vo.CommonVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -21,7 +21,7 @@ import java.util.List; * 点控制器 */ @RestController -@Api(tags = "点编辑(实体)控制器") +@Tag(name = "点编辑(实体)控制器") @RequestMapping("/vertex") @RequiredArgsConstructor public class VertexManageController { @@ -29,14 +29,14 @@ public class VertexManageController { private final GraphCommonService graphCommonService; @PostMapping("/createVertex") - @ApiOperation("创建点(需要附加标签tag信息)") + @Operation(summary = "创建点(需要附加标签tag信息)") public List createVertex(@RequestBody GraphInsertVertex graphInsertVertex) { String vidType = graphCommonService.getVidType(graphInsertVertex.getSpace()); return graphCommonService.executeJson(NebulaUtil.insertVertex(graphInsertVertex, vidType), CommonVo.class); } @PostMapping("/deleteVertex") - @ApiOperation("删除点(根据点id删除)") + @Operation(summary = "删除点(根据点id删除)") public List deleteVertex(@RequestBody GraphDeleteVertex graphDeleteVertex) { String vidType = graphCommonService.getVidType(graphDeleteVertex.getSpace()); return graphCommonService.executeJson(NebulaUtil.deleteVertex(graphDeleteVertex, vidType), CommonVo.class); diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/ImportDto.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/ImportDto.java index 07a3bab8..0cbd8d39 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/ImportDto.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/ImportDto.java @@ -1,23 +1,23 @@ package com.supervision.nebula.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** * @ClassName: ImportDto */ @Data -@ApiModel("数据导入入参") +@Schema(name = "数据导入入参") public class ImportDto { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "attribute可选值: tag标签/edge边类型", example = "tag", required = true) + @Schema(name = "attribute可选值: tag标签/edge边类型", example = "tag", required = true) private String attribute; - @ApiModelProperty(value = "属性名称", example = "t1", required = true) + @Schema(name = "属性名称", example = "t1", required = true) private String attributeName; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/NebulaVertexJsonResult.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/NebulaVertexJsonResult.java index 7a43aa8c..d43f1a31 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/NebulaVertexJsonResult.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/NebulaVertexJsonResult.java @@ -2,8 +2,7 @@ package com.supervision.nebula.dto; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.LinkedHashMap; @@ -18,15 +17,15 @@ import java.util.Set; * @author fulin by 2022/3/29 */ @Data -@ApiModel("返回类") +@Schema(name = "返回类") public class NebulaVertexJsonResult { - @ApiModelProperty(value = "空间名称") + @Schema(name = "空间名称") private String spaceName; - @ApiModelProperty(value = "潜伏期") + @Schema(name = "潜伏期") private int latencyInUs; - @ApiModelProperty(value = "数据集合") + @Schema(name = "数据集合") private List data; - @ApiModelProperty(value = "字段") + @Schema(name = "字段") private List columns; public Set toFailureTroubleshootingVos() { @@ -57,17 +56,17 @@ public class NebulaVertexJsonResult { @Data public static class OneData { - @ApiModelProperty(value = "元数据") + @Schema(name = "元数据") private List meta; - @ApiModelProperty(value = "属性名称: 属性值") + @Schema(name = "属性名称: 属性值") private List> row; } @Data public static class OneMeta { - @ApiModelProperty(value = "id") + @Schema(name = "id") private String id; - @ApiModelProperty(value = "类型") + @Schema(name = "类型") private String type; } } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/PageBeanDto.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/PageBeanDto.java index a394bf0c..67225ecc 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/PageBeanDto.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/PageBeanDto.java @@ -1,20 +1,20 @@ package com.supervision.nebula.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** * @Descriptin: 分页参数入参 * @ClassName: PageBeanDto */ -@ApiModel("分页参数入参") +@Schema(name = "分页参数入参") @Data public class PageBeanDto { - @ApiModelProperty(value = "页码:从1开始", example = "1", required = false) + @Schema(name = "页码:从1开始", example = "1", required = false) private Integer pageNum = 1; - @ApiModelProperty(value = "分页条数", example = "10", required = false) + @Schema(name = "分页条数", example = "10", required = false) private Integer pageSize = 10; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/AttributeBean.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/AttributeBean.java index 547cdc7f..611f2d6f 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/AttributeBean.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/AttributeBean.java @@ -1,27 +1,26 @@ package com.supervision.nebula.dto.graph; import cn.hutool.core.util.StrUtil; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** * @Descriptin: * @ClassName: AttributeBean */ -@ApiModel("属性入参") +@Schema(name = "属性入参") @Data public class AttributeBean { /** * 属性名称 **/ - @ApiModelProperty(value = "tag/edge的属性名称", example = "p3", required = true) + @Schema(name = "tag/edge的属性名称", example = "p3", required = true) private String propertyName; /** * 属性类型 (int bool string double .........) **/ - @ApiModelProperty(value = "索引长度:属性为string 必须有长度,其他类型不可传入 ", example = "30", required = true) + @Schema(name = "索引长度:属性为string 必须有长度,其他类型不可传入 ", example = "30", required = true) private String indexLength; public String getPropertyName() { diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphAddAttribute.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphAddAttribute.java index 502680de..fbf70fe4 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphAddAttribute.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphAddAttribute.java @@ -2,8 +2,7 @@ package com.supervision.nebula.dto.graph; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,32 +12,32 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("修改属性实体") +@Schema(name = "修改属性实体") public class GraphAddAttribute { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "attribute可选值: tag标签/edge边类型", example = "tag", required = true) + @Schema(name = "attribute可选值: tag标签/edge边类型", example = "tag", required = true) private String attribute; - @ApiModelProperty(value = "属性名称", example = "t1", required = true) + @Schema(name = "属性名称", example = "t1", required = true) private String attributeName; - @ApiModelProperty(value = "tag/edge的属性名称", example = "p5") + @Schema(name = "tag/edge的属性名称", example = "p5") private String propertyName; - @ApiModelProperty(value = "属性类型,add 必传该类型 可选值: int bool string double .........", example = "string", required = false) + @Schema(name = "属性类型,add 必传该类型 可选值: int bool string double .........", example = "string", required = false) private String propertyType; - @ApiModelProperty(value = "是否可为空: NOT NULL 或者 NULL", example = "NULL") + @Schema(name = "是否可为空: NOT NULL 或者 NULL", example = "NULL") private String isNull; - @ApiModelProperty(value = "默认值") + @Schema(name = "默认值") private Object defaultValue; - @ApiModelProperty(value = "描述") + @Schema(name = "描述") private String common; public Object getDefaultValue() { diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateEdge.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateEdge.java index 12492342..d0f9ffa5 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateEdge.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateEdge.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,27 +13,27 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("创建tag edge入参") +@Schema(name = "创建tag edge入参") public class GraphCreateEdge { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi") + @Schema(name = "空间名称", example = "flceshi") private String space; - @ApiModelProperty(value = "创建类型: tag/edge", example = "tag") + @Schema(name = "创建类型: tag/edge", example = "tag") private String type; - @ApiModelProperty(value = "tag/edge名称", example = "demo") + @Schema(name = "tag/edge名称", example = "demo") private String tagEdgeName; - @ApiModelProperty(value = "tag/edge描述", example = "备注") + @Schema(name = "tag/edge描述", example = "备注") private String tagEdgeComment; - @ApiModelProperty(value = "属性集合") + @Schema(name = "属性集合") private List propertyList; - @ApiModelProperty(value = "颜色") + @Schema(name = "颜色") private String color; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateIndex.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateIndex.java index 2e99c463..600f64c4 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateIndex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateIndex.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,27 +13,27 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("创建索引入参") +@Schema(name = "创建索引入参") public class GraphCreateIndex { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi") private String space; - @ApiModelProperty(value = "创建类型: tag/edge", example = "tag", required = true) + @Schema(name = "创建类型: tag/edge", example = "tag") private String type; - @ApiModelProperty(value = "索引名称", example = "name_index", required = true) + @Schema(name = "索引名称", example = "name_index") private String indexName; - @ApiModelProperty(value = "tag/edge名称", example = "t1", required = true) + @Schema(name = "tag/edge名称", example = "t1") private String tagEdgeName; - @ApiModelProperty(value = "索引描述描述", example = "备注") + @Schema(name = "索引描述描述", example = "备注") private String comment; - @ApiModelProperty(value = "属性集合") + @Schema(name = "属性集合") private List attributeBeanList; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateSpace.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateSpace.java index e0fa1408..c529ef0c 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateSpace.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateSpace.java @@ -1,8 +1,7 @@ package com.supervision.nebula.dto.graph; import cn.hutool.core.util.StrUtil; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,45 +11,45 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("创建空间实体") +@Schema(name = "创建空间实体") public class GraphCreateSpace { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; /** * 空间中文名称 **/ - @ApiModelProperty(value = "空间中文名称", example = "付琳测试", required = true) + @Schema(name = "空间中文名称", example = "付琳测试", required = true) private String spaceChineseName; /** * 分片数量 **/ - @ApiModelProperty(value = "分片数量", example = "1") + @Schema(name = "分片数量", example = "1") private Integer partitionNum; /** * 分片数量 **/ - @ApiModelProperty(value = "副本数量", example = "1") + @Schema(name = "副本数量", example = "1") private Integer replicaFactor; /** * 类型 **/ - @ApiModelProperty(value = "点类型:INT64,FIXED_STRING", example = "INT64") + @Schema(name = "点类型:INT64,FIXED_STRING", example = "INT64") private String fixedType = "INT64"; /** * 类型大小 **/ - @ApiModelProperty(value = "类型长度,FIXED_STRING 此字段必填 如32,64") + @Schema(name = "类型长度,FIXED_STRING 此字段必填 如32,64") private String size = ""; /** * 描述 **/ - @ApiModelProperty(value = "描述") + @Schema(name = "描述") private String comment; public String getSize() { diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateTag.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateTag.java index b53cf43d..32227f70 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateTag.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphCreateTag.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,24 +13,24 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("创建tag edge入参") +@Schema(name = "创建tag edge入参") public class GraphCreateTag { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi") + @Schema(name = "空间名称", example = "flceshi") private String space; - @ApiModelProperty(value = "tag/edge名称", example = "demo") + @Schema(name = "tag/edge名称", example = "demo") private String tagEdgeName; - @ApiModelProperty(value = "tag/edge描述", example = "备注") + @Schema(name = "tag/edge描述", example = "备注") private String tagEdgeComment; - @ApiModelProperty(value = "属性集合") + @Schema(name = "属性集合") private List propertyList; - @ApiModelProperty(value = "颜色") + @Schema(name = "颜色") private String color; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDelAttribute.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDelAttribute.java index 4320a0de..3436d90f 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDelAttribute.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDelAttribute.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,19 +13,19 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("删除属性实体") +@Schema(name = "删除属性实体") public class GraphDelAttribute { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "attribute可选值: tag标签/edge边类型", example = "tag", required = true) + @Schema(name = "attribute可选值: tag标签/edge边类型", example = "tag", required = true) private String attribute; - @ApiModelProperty(value = "属性名称", example = "t1", required = true) + @Schema(name = "属性名称", example = "t1", required = true) private String attributeName; - @ApiModelProperty(value = "tag/edge的属性名称 支持批量") + @Schema(name = "tag/edge的属性名称 支持批量") private List propertyNameList; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteEdge.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteEdge.java index 2f823019..bbca5ed8 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteEdge.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteEdge.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -11,22 +11,22 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("删除边入参") +@Schema(name = "删除边入参") public class GraphDeleteEdge { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "边类型edge名称", example = "e1", required = true) + @Schema(name = "边类型edge名称", example = "e1", required = true) private String edgeName; - @ApiModelProperty(value = "点的起始VID", example = "11", required = true) + @Schema(name = "点的起始VID", example = "11", required = true) private Object srcVid; - @ApiModelProperty(value = "点的目的VID", example = "12", required = true) + @Schema(name = "点的目的VID", example = "12", required = true) private Object dstVid; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteSpace.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteSpace.java index 606aeb3d..812cbc05 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteSpace.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteSpace.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -11,13 +11,13 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("删除空间实体") +@Schema(name = "删除空间实体") public class GraphDeleteSpace { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteVertex.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteVertex.java index ffe0af73..709170c3 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDeleteVertex.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -11,16 +11,16 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("删除点入参") +@Schema(name = "删除点入参") public class GraphDeleteVertex { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "vertex 点id", required = true) + @Schema(name = "vertex 点id", required = true) private Object vid; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDropAttribute.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDropAttribute.java index ad9dd1f6..15824828 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDropAttribute.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphDropAttribute.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -11,16 +11,16 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("删除属性实体") +@Schema(name = "删除属性实体") public class GraphDropAttribute { - @ApiModelProperty(value = "空间名称", example = "flceshi1", required = true) + @Schema(name = "空间名称", example = "flceshi1", required = true) private String space; - @ApiModelProperty(value = "属性名称", example = "flceshi1", required = true) + @Schema(name = "属性名称", example = "flceshi1", required = true) private String attributeName; - @ApiModelProperty(value = "attribute可选值:space空间/tag标签/edge边类型", example = "space", required = true) + @Schema(name = "attribute可选值:space空间/tag标签/edge边类型", example = "space", required = true) private String attribute; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphExpand.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphExpand.java index 39cc0743..2945a895 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphExpand.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphExpand.java @@ -1,8 +1,7 @@ package com.supervision.nebula.dto.graph; import cn.hutool.core.util.StrUtil; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import lombok.AllArgsConstructor; @@ -16,35 +15,35 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("扩展查询入参实体") +@Schema(name = "扩展查询入参实体") public class GraphExpand { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "边类型集合", required = true) + @Schema(name = "边类型集合", required = true) private List edgeList; - @ApiModelProperty(value = "方向: OUTFLOW(流出);INFLOW(流入);TWO-WAY(双向);", example = "TWO-WAY", required = true) + @Schema(name = "方向: OUTFLOW(流出);INFLOW(流入);TWO-WAY(双向);", example = "TWO-WAY", required = true) private String direction; - @ApiModelProperty(value = "步数开始(单步/范围的开始)", example = "1", required = true) + @Schema(name = "步数开始(单步/范围的开始)", example = "1", required = true) private Integer stepStart; - @ApiModelProperty(value = "步数结束(范围的结束;可无)", example = "2") + @Schema(name = "步数结束(范围的结束;可无)", example = "2") @Min(1) private Integer stepEnd; - @ApiModelProperty(value = "结果条数", example = "100", required = true) + @Schema(name = "结果条数", example = "100", required = true) @Max(Integer.MAX_VALUE) @Min(1) private Integer resultSize = Integer.MAX_VALUE; - @ApiModelProperty(value = "扩展点id集合", required = true) + @Schema(name = "扩展点id集合", required = true) private List vidList; - @ApiModelProperty(value = "条件(可为空)", example = " l.name CONTAINS '1' ", required = false) + @Schema(name = "条件(可为空)", example = " l.name CONTAINS '1' ", required = false) private String condition; public String getStepEndResult() { diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphInsertEdge.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphInsertEdge.java index 9e03ad64..c7f77b00 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphInsertEdge.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphInsertEdge.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,27 +13,27 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("插入边入参") +@Schema(name = "插入边入参") public class GraphInsertEdge { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "边类型edge名称", example = "e1", required = true) + @Schema(name = "边类型edge名称", example = "e1", required = true) private String edgeName; - @ApiModelProperty(value = "边类型edge属性集合", required = false) + @Schema(name = "边类型edge属性集合", required = false) private List edgeList; - @ApiModelProperty(value = "点的起始VID", example = "11", required = true) + @Schema(name = "点的起始VID", example = "11", required = true) private String srcVid; - @ApiModelProperty(value = "点的目的VID", example = "12", required = true) + @Schema(name = "点的目的VID", example = "12", required = true) private String dstVid; - @ApiModelProperty(value = "边edge的属性值集合", required = false) + @Schema(name = "边edge的属性值集合", required = false) private List edgeValueList; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphInsertVertex.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphInsertVertex.java index c37d6b8f..760f1564 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphInsertVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphInsertVertex.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,24 +13,24 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("创建点入参") +@Schema(name = "创建点入参") public class GraphInsertVertex { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "标签tag名称", example = "t1", required = true) + @Schema(name = "标签tag名称", example = "t1", required = true) private String tagName; - @ApiModelProperty(value = "标签tag属性集合", required = false) + @Schema(name = "标签tag属性集合", required = false) private List tagList; - @ApiModelProperty(value = "点的VID", required = true) + @Schema(name = "点的VID", required = true) private Object tagVid; - @ApiModelProperty(value = "标签tag的属性值集合", required = false) + @Schema(name = "标签tag的属性值集合", required = false) private List tagValueList; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphPageAttribute.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphPageAttribute.java index 5919ecd6..ad692f58 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphPageAttribute.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphPageAttribute.java @@ -1,8 +1,7 @@ package com.supervision.nebula.dto.graph; import com.supervision.nebula.dto.PageBeanDto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,13 +11,13 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("查询属性分页查询入参") +@Schema(name = "查询属性分页查询入参") public class GraphPageAttribute extends PageBeanDto { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "attribute可选值:tags标签/edges边类型", example = "tags", required = true) + @Schema(name = "attribute可选值:tags标签/edges边类型", example = "tags", required = true) private String attribute; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphPageEdge.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphPageEdge.java index 84dde137..3f7b684c 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphPageEdge.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphPageEdge.java @@ -1,8 +1,7 @@ package com.supervision.nebula.dto.graph; import com.supervision.nebula.dto.PageBeanDto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,20 +11,20 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("查询边分页入参") +@Schema(name = "查询边分页入参") public class GraphPageEdge extends PageBeanDto { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi") private String space; - @ApiModelProperty(value = "边类型edge", required = false) + @Schema(name = "边类型edge") private String edge; - @ApiModelProperty(value = "起点或者终点ID", required = false) + @Schema(name = "起点或者终点ID") private String vid; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphRelationInsert.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphRelationInsert.java index dc914021..053baf84 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphRelationInsert.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphRelationInsert.java @@ -1,6 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -11,15 +12,15 @@ import lombok.Data; @Data public class GraphRelationInsert { - @ApiModelProperty(value = "空间名称", example = "movies", required = true) + @Schema(name = "空间名称", example = "movies", required = true) private String space; - @ApiModelProperty(value = "开始标签", required = true) + @Schema(name = "开始标签", required = true) private String tagStart; - @ApiModelProperty(value = "边类型", required = true) + @Schema(name = "边类型", required = true) private String edge; - @ApiModelProperty(value = "结束标签", required = true) + @Schema(name = "结束标签", required = true) private String tagEnd; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowAttribute.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowAttribute.java index ad535c7a..9c0740ba 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowAttribute.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowAttribute.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -11,18 +11,18 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("查询相关属性入参") +@Schema(name = "查询相关属性入参") public class GraphShowAttribute { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = false) + @Schema(name = "空间名称", example = "flceshi", required = false) private String space; /** * attributes: spaces/tags/edges **/ - @ApiModelProperty(value = "attribute可选值:spaces空间/tags标签/edges边类型", example = "spaces", required = true) + @Schema(name = "attribute可选值:spaces空间/tags标签/edges边类型", example = "spaces", required = true) private String attribute; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowIndex.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowIndex.java index 267dc8d5..01cc6e5d 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowIndex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowIndex.java @@ -1,8 +1,7 @@ package com.supervision.nebula.dto.graph; import com.supervision.nebula.dto.PageBeanDto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @EqualsAndHashCode(callSuper = true) @@ -10,18 +9,18 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("查询索引入参") +@Schema(name = "查询索引入参") public class GraphShowIndex extends PageBeanDto { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; /** * attribute: tag/edge **/ - @ApiModelProperty(value = "属性可选: tag/edge/fulltext", example = "tag", required = true) + @Schema(name = "属性可选: tag/edge/fulltext", example = "tag", required = true) private String attribute; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowInfo.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowInfo.java index c74d845c..da8b7650 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowInfo.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphShowInfo.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -11,25 +11,25 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("属性详情查询入参") +@Schema(name = "属性详情查询入参") public class GraphShowInfo { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi") + @Schema(name = "空间名称", example = "flceshi") private String space; /** * attribute: tag /edge **/ - @ApiModelProperty(value = "属性类型:tag/edge", example = "tag") + @Schema(name = "属性类型:tag/edge", example = "tag") private String attribute; /** * attributeName: tag 名称/edge 名称 **/ - @ApiModelProperty(value = "属性名称") + @Schema(name = "属性名称") private String attributeName; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphSpace.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphSpace.java index a21cee3e..90ac71a3 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphSpace.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphSpace.java @@ -2,8 +2,7 @@ package com.supervision.nebula.dto.graph; import com.supervision.nebula.dto.PageBeanDto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,9 +12,9 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("通用入参实体") +@Schema(name = "通用入参实体") public class GraphSpace extends PageBeanDto { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateEdge.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateEdge.java index 201b616d..3adad8b6 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateEdge.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateEdge.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,28 +13,28 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("修改边入参") +@Schema(name = "修改边入参") public class GraphUpdateEdge { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "边类型edge名称", example = "e1", required = true) + @Schema(name = "边类型edge名称", example = "e1", required = true) private String edgeName; - @ApiModelProperty(value = "边类型edge属性集合", required = false) + @Schema(name = "边类型edge属性集合", required = false) private List edgeList; - @ApiModelProperty(value = "点的起始VID", required = true) + @Schema(name = "点的起始VID", required = true) private Object srcVid; - @ApiModelProperty(value = "点的目的VID", required = true) + @Schema(name = "点的目的VID", required = true) private Object dstVid; - @ApiModelProperty(value = "边edge的属性值集合", required = false) + @Schema(name = "边edge的属性值集合", required = false) private List edgeValueList; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateSpace.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateSpace.java index 1a12d449..09411f4b 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateSpace.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateSpace.java @@ -1,8 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,15 +11,15 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("修改空间备注入参实体") +@Schema(name = "修改空间备注入参实体") public class GraphUpdateSpace { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "空间中文名称", example = "空间中文名称", required = true) + @Schema(name = "空间中文名称", example = "空间中文名称", required = true) private String spaceChineseName; - @ApiModelProperty(value = "空间备注", example = "备注信息", required = true) + @Schema(name = "空间备注", example = "备注信息", required = true) private String spaceComment; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateTagColor.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateTagColor.java index 2bf48db9..76ae81c4 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateTagColor.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateTagColor.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -11,21 +11,21 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("修改tag颜色入参") +@Schema(name = "修改tag颜色入参") public class GraphUpdateTagColor { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi") + @Schema(name = "空间名称", example = "flceshi") private String space; - @ApiModelProperty(value = "类型: tag/edge", example = "tag") + @Schema(name = "类型: tag/edge", example = "tag") private String type; - @ApiModelProperty(value = "tag/edge名称", example = "demo") + @Schema(name = "tag/edge名称", example = "demo") private String tagEdgeName; - @ApiModelProperty(value = "颜色") + @Schema(name = "颜色") private String color; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateVertex.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateVertex.java index d4c288e3..a275ae31 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateVertex.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphUpdateVertex.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,26 +13,26 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("修改点入参") +@Schema(name = "修改点入参") public class GraphUpdateVertex { /** * 空间名称 **/ - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "标签tag名称", example = "t1", required = true) + @Schema(name = "标签tag名称", example = "t1", required = true) private String tagName; - @ApiModelProperty(value = "标签tag属性集合", required = true) + @Schema(name = "标签tag属性集合", required = true) private List tagList; /** * point的key **/ - @ApiModelProperty(value = "点的VID", example = "11", required = true) + @Schema(name = "点的VID", example = "11", required = true) private Object pointKey; - @ApiModelProperty(value = "标签tag的属性值集合", required = true) + @Schema(name = "标签tag的属性值集合", required = true) private List tagValueList; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexAnalysisResult.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexAnalysisResult.java index 34c919dd..53d52135 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexAnalysisResult.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexAnalysisResult.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,12 +13,12 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("归因分析查询入参") +@Schema(name = "归因分析查询入参") public class GraphVertexAnalysisResult { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi") private String space; - @ApiModelProperty(value = "查询关键字集合", required = true) + @Schema(name = "查询关键字集合") private List wordList; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexAnalysisWord.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexAnalysisWord.java index f0fc1576..b14deb4b 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexAnalysisWord.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexAnalysisWord.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -11,12 +11,12 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("解析文字入参") +@Schema(name = "解析文字入参") public class GraphVertexAnalysisWord { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "查询关键字", required = true) + @Schema(name = "查询关键字", required = true) private String word; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexFullQuery.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexFullQuery.java index 699161af..ab9cfd25 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexFullQuery.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexFullQuery.java @@ -1,7 +1,7 @@ package com.supervision.nebula.dto.graph; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,18 +13,18 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("全文检索") +@Schema(name = "全文检索") public class GraphVertexFullQuery { - @ApiModelProperty(value = "空间名称", example = "movies", required = true) + @Schema(name = "空间名称", example = "movies", required = true) private String space; - @ApiModelProperty(value = "查询关键字", required = true) + @Schema(name = "查询关键字", required = true) private String word; - @ApiModelProperty(value = "标签集合", required = false) + @Schema(name = "标签集合", required = false) private List tagList; - @ApiModelProperty(value = "查询最大条数", required = true) + @Schema(name = "查询最大条数", required = true) private Integer resultSize; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexPathQuery.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexPathQuery.java index f48a529b..7aa445fa 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexPathQuery.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexPathQuery.java @@ -1,8 +1,7 @@ package com.supervision.nebula.dto.graph; import cn.hutool.core.util.StrUtil; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,34 +13,34 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("路径检索") +@Schema(name = "路径检索") public class GraphVertexPathQuery { - @ApiModelProperty(value = "空间名称", example = "movies", required = true) + @Schema(name = "空间名称", example = "movies", required = true) private String space; - @ApiModelProperty(value = "路径查找类型: SHORTEST最短 | ALL所有 | NOLOOP非循环", example = "ALL", required = true) + @Schema(name = "路径查找类型: SHORTEST最短 | ALL所有 | NOLOOP非循环", example = "ALL", required = true) private String pathType; - @ApiModelProperty(value = "变类型集合", required = true) + @Schema(name = "变类型集合", required = true) private List edgeList; - @ApiModelProperty(value = "点的起始VID", required = true) + @Schema(name = "点的起始VID", required = true) private List srcVid; - @ApiModelProperty(value = "点的目的VID", required = true) + @Schema(name = "点的目的VID", required = true) private List dstVid; - @ApiModelProperty(value = "查询方向: REVERSELY反向 | BIDIRECT双向 | 空 正向", example = "BIDIRECT", required = true) + @Schema(name = "查询方向: REVERSELY反向 | BIDIRECT双向 | 空 正向", example = "BIDIRECT", required = true) private String direct; - @ApiModelProperty(value = "最大步数", example = "3", required = true) + @Schema(name = "最大步数", example = "3", required = true) private Integer step; - @ApiModelProperty(value = "查询最大条数", required = true) + @Schema(name = "查询最大条数", required = true) private Integer resultSize; - @ApiModelProperty(value = "筛选条件", required = true) + @Schema(name = "筛选条件", required = true) private String condition; public String getEdgeList() { diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatAttributeQuery.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatAttributeQuery.java index 528fedbf..d355affa 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatAttributeQuery.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatAttributeQuery.java @@ -1,8 +1,7 @@ package com.supervision.nebula.dto.graph; import cn.hutool.core.util.StrUtil; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import lombok.AllArgsConstructor; @@ -15,19 +14,19 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("根据tag标签查询点入参实体") +@Schema(name = "根据tag标签查询点入参实体") public class GraphVertexTatAttributeQuery { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "标签", example = "t1", required = true) + @Schema(name = "标签", example = "t1", required = true) private String tag; - @ApiModelProperty(value = "执行条件", required = true) + @Schema(name = "执行条件", required = true) private String condition; - @ApiModelProperty(value = "结果条数", example = "100", required = true) + @Schema(name = "结果条数", example = "100", required = true) @Max(Integer.MAX_VALUE) @Min(1) private Integer resultSize = Integer.MAX_VALUE; diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatsQuery.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatsQuery.java index b74a2ae1..ac37d87a 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatsQuery.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/GraphVertexTatsQuery.java @@ -2,8 +2,7 @@ package com.supervision.nebula.dto.graph; import com.supervision.nebula.dto.PageBeanDto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,15 +12,15 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -@ApiModel("根据tag标签查询点入参实体") +@Schema(name = "根据tag标签查询点入参实体") public class GraphVertexTatsQuery extends PageBeanDto { - @ApiModelProperty(value = "空间名称", example = "flceshi", required = true) + @Schema(name = "空间名称", example = "flceshi", required = true) private String space; - @ApiModelProperty(value = "标签", required = false) + @Schema(name = "标签", required = false) private String tag; - @ApiModelProperty(value = "点id", required = false) + @Schema(name = "点id", required = false) private Object pointKey; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/PropertyBean.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/PropertyBean.java index 0aa6e676..7b4a404b 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/PropertyBean.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/dto/graph/PropertyBean.java @@ -1,44 +1,43 @@ package com.supervision.nebula.dto.graph; import cn.hutool.core.util.ObjectUtil; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** * @Descriptin: * @ClassName: PropertyBean */ -@ApiModel("属性实体") +@Schema(name = "属性实体") @Data public class PropertyBean { /** * 属性名称 **/ - @ApiModelProperty(value = "tag/edge属性名称", example = "name", required = true) + @Schema(name = "tag/edge属性名称", example = "name", required = true) private String propertyName; /** * 属性类型 (int bool string double .........) **/ - @ApiModelProperty(value = "tag/edge属性类型可选:int bool string double", example = "string", required = true) + @Schema(name = "tag/edge属性类型可选:int bool string double", example = "string", required = true) private String propertyType; /** * 属性描述 **/ - @ApiModelProperty(value = "属性描述", example = "名称") + @Schema(name = "属性描述", example = "名称") private String propertyComment; /** * 是否可为空 (NOT NULL 或者 NULL) **/ - @ApiModelProperty(value = "是否可为空: NOT NULL 或者 NULL", example = "NULL") + @Schema(name = "是否可为空: NOT NULL 或者 NULL", example = "NULL") private String isNull; /** * 默认值 **/ - @ApiModelProperty(value = "默认值", example = "NULL") + @Schema(name = "默认值", example = "NULL") private Object defaultValue; public Object getDefaultValue() { diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/AttributeVo.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/AttributeVo.java index 1e82cdc7..4943733b 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/AttributeVo.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/AttributeVo.java @@ -1,7 +1,7 @@ package com.supervision.nebula.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; import java.util.Map; @@ -10,7 +10,7 @@ import java.util.Map; * @Descriptin: 11 * @ClassName: aaa */ -@ApiModel("属性查询返回类") +@Schema(name = "属性查询返回类") public class AttributeVo { /** @@ -21,14 +21,13 @@ public class AttributeVo { * errors : {"code":0} */ - @ApiModelProperty("空间名称") + @Schema(name = "空间名称") private String spaceName; - @ApiModelProperty() private int latencyInUs; private ErrorsBean errors; - @ApiModelProperty("查询返回属性集合") + @Schema(name = "查询返回属性集合") private List data; - @ApiModelProperty("返回字段名集合") + @Schema(name = "返回字段名集合") private List columns; private Map> fieldMap; @@ -84,7 +83,7 @@ public class AttributeVo { /** * code : 0 */ - @ApiModelProperty("错误码0正常") + @Schema(name = "错误码0正常") private int code; public int getCode() { @@ -97,9 +96,9 @@ public class AttributeVo { } public static class DataBean { - @ApiModelProperty("元数据") + @Schema(name = "元数据") private List meta; - @ApiModelProperty("字段值集合") + @Schema(name = "字段值集合") private List row; public List getMeta() { diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/CommonVo.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/CommonVo.java index e78f0be7..8c2891d7 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/CommonVo.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/CommonVo.java @@ -1,13 +1,13 @@ package com.supervision.nebula.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; /** * @Descriptin: 通用返回类 * @ClassName: CommonVo */ -@ApiModel("操作通用返回类") +@Schema(name = "操作通用返回类") public class CommonVo { /** @@ -16,9 +16,8 @@ public class CommonVo { * errors : {"code":0} */ - @ApiModelProperty("空间名称") + @Schema(name = "空间名称") private String spaceName; - @ApiModelProperty() private int latencyInUs; private ErrorsBean errors; @@ -50,7 +49,7 @@ public class CommonVo { /** * code : 0 */ - @ApiModelProperty("错误码0正常") + @Schema(name = "错误码0正常") private int code; public int getCode() { diff --git a/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/DetailSpace.java b/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/DetailSpace.java index 64ae14db..18d7bd2d 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/DetailSpace.java +++ b/virtual-patient-graph/src/main/java/com/supervision/nebula/vo/DetailSpace.java @@ -1,24 +1,24 @@ package com.supervision.nebula.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** * @Descriptin: 图空间详情 * @ClassName: DetailSpace */ -@ApiModel("图空间详情实体") +@Schema(name = "图空间详情实体") @Data public class DetailSpace { - @ApiModelProperty("空间名称") + @Schema(name = "空间名称") private String space; - @ApiModelProperty("标签个数") + @Schema(name = "标签个数") private Integer tagsNum; - @ApiModelProperty("边类型个数") + @Schema(name = "边类型个数") private Integer edgesNum; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/vo/EdgeVO.java b/virtual-patient-graph/src/main/java/com/supervision/vo/EdgeVO.java index b384ddac..10244cf3 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/vo/EdgeVO.java +++ b/virtual-patient-graph/src/main/java/com/supervision/vo/EdgeVO.java @@ -1,6 +1,7 @@ package com.supervision.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.Map; @@ -8,17 +9,17 @@ import java.util.Map; @Data public class EdgeVO { - @ApiModelProperty("来源节点ID") + @Schema(name = "来源节点ID") private String source; - @ApiModelProperty("目标节点ID") + @Schema(name = "目标节点ID") private String target; - @ApiModelProperty("连线展示的名称,可能为空") + @Schema(name = "连线展示的名称,可能为空") private String name; - @ApiModelProperty("连线展示的名称,=name,前端需要") + @Schema(name = "连线展示的名称,=name,前端需要") private String label; - @ApiModelProperty("连线所拥有的属性") + @Schema(name = "连线所拥有的属性") private Map params; } diff --git a/virtual-patient-graph/src/main/java/com/supervision/vo/GraphVO.java b/virtual-patient-graph/src/main/java/com/supervision/vo/GraphVO.java index 87faa1f6..a4a0a2c2 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/vo/GraphVO.java +++ b/virtual-patient-graph/src/main/java/com/supervision/vo/GraphVO.java @@ -1,7 +1,7 @@ package com.supervision.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -11,16 +11,16 @@ import java.util.List; @Data @NoArgsConstructor @AllArgsConstructor -@ApiModel +@Schema public class GraphVO { - @ApiModelProperty("节点") + @Schema(name = "节点") private List nodes; - @ApiModelProperty("关系") + @Schema(name = "关系") private List edges; - @ApiModelProperty("图例的List") + @Schema(name = "图例的List") private List legendList; private String graphTree; diff --git a/virtual-patient-graph/src/main/java/com/supervision/vo/NodeVO.java b/virtual-patient-graph/src/main/java/com/supervision/vo/NodeVO.java index 917842b8..ae8edfa3 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/vo/NodeVO.java +++ b/virtual-patient-graph/src/main/java/com/supervision/vo/NodeVO.java @@ -1,29 +1,29 @@ package com.supervision.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.LinkedHashMap; import java.util.Map; @Data -@ApiModel +@Schema public class NodeVO { - @ApiModelProperty("节点ID") + @Schema(name = "节点ID") private String id; - @ApiModelProperty("节点值(页面展示)") + @Schema(name = "节点值(页面展示)") private String nodeValue; - @ApiModelProperty("节点颜色") + @Schema(name = "节点颜色") private String nodeColour; - @ApiModelProperty("节点级别 1 2 3 4级") + @Schema(name = "节点级别 1 2 3 4级") private Integer nodeLevel; - @ApiModelProperty("节点类型") + @Schema(name = "节点类型") private String nodeType; - @ApiModelProperty("节点描述") + @Schema(name = "节点描述") private String nodeDesc; - @ApiModelProperty("节点拥有的属性列表") + @Schema(name = "节点拥有的属性列表") private Map params = new LinkedHashMap<>(); } diff --git a/virtual-patient-graph/src/main/java/com/supervision/vo/TreeNodeVO.java b/virtual-patient-graph/src/main/java/com/supervision/vo/TreeNodeVO.java index 1910e798..551093c5 100644 --- a/virtual-patient-graph/src/main/java/com/supervision/vo/TreeNodeVO.java +++ b/virtual-patient-graph/src/main/java/com/supervision/vo/TreeNodeVO.java @@ -1,7 +1,7 @@ package com.supervision.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.LinkedHashMap; @@ -9,33 +9,33 @@ import java.util.List; import java.util.Map; @Data -@ApiModel +@Schema public class TreeNodeVO { - @ApiModelProperty("图谱ID") + @Schema(name = "图谱ID") private String id; - @ApiModelProperty("节点值") + @Schema(name = "节点值") private String nodeValue; - @ApiModelProperty("节点颜色") + @Schema(name = "节点颜色") private String nodeColour; - @ApiModelProperty("节点级别") + @Schema(name = "节点级别") private Integer nodeLevel; - @ApiModelProperty("节点类型") + @Schema(name = "节点类型") private String nodeType; - @ApiModelProperty("节点描述") + @Schema(name = "节点描述") private String nodeDesc; - @ApiModelProperty("节点的属性列表") + @Schema(name = "节点的属性列表") private Map params = new LinkedHashMap<>(); /** * 子节点 */ - @ApiModelProperty("子节点") + @Schema(name = "子节点") private List children; } diff --git a/virtual-patient-manage/pom.xml b/virtual-patient-manage/pom.xml index 0df4167f..5fbb47ba 100644 --- a/virtual-patient-manage/pom.xml +++ b/virtual-patient-manage/pom.xml @@ -63,16 +63,14 @@ test - - - com.alibaba.nacos - nacos-common + org.springframework.cloud + spring-cloud-starter-openfeign org.springframework.cloud - spring-cloud-starter-openfeign + spring-cloud-starter-loadbalancer diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AncillaryItemManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AncillaryItemManageController.java index 5012f2bf..1fae21fb 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AncillaryItemManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AncillaryItemManageController.java @@ -1,20 +1,19 @@ package com.supervision.manage.controller.config; -import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.manage.service.AncillaryItemManageService; import com.supervision.model.ConfigAncillaryItem; import com.supervision.vo.ask.AncillaryItemReqVo; import com.supervision.vo.ask.ConfigAncillaryItemResVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "辅助检查项管理") +@Tag(name = "辅助检查项管理") @RestController @RequestMapping("ancillaryItem") @RequiredArgsConstructor @@ -22,31 +21,31 @@ public class AncillaryItemManageController { private final AncillaryItemManageService ancillaryItemManageService; - @ApiOperation("查询辅助检查项目列表") + @Operation(summary = "查询辅助检查项目列表") @GetMapping("queryAncillaryItemList") public List queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) { return ancillaryItemManageService.queryAncillaryItemList(ancillaryItemReqVo); } - @ApiOperation("分页查询辅助检查") + @Operation(summary = "分页查询辅助检查") @GetMapping("queryAncillaryPage") public IPage queryAncillaryPage(String name, String type, Integer pageNum, Integer pageSize) { return ancillaryItemManageService.queryAncillaryPage(name, type, pageNum, pageSize); } - @ApiOperation("保存辅助检查项") + @Operation(summary = "保存辅助检查项") @PostMapping("saveAncillaryItem") public void saveAncillaryItem(@RequestBody ConfigAncillaryItem configAncillaryItem) { ancillaryItemManageService.saveAncillaryItem(configAncillaryItem); } - @ApiOperation("修改辅助检查项") + @Operation(summary = "修改辅助检查项") @PostMapping("modifyAncillaryItem") public void modifyAncillaryItem(@RequestBody ConfigAncillaryItem configAncillaryItem) { ancillaryItemManageService.modifyAncillaryItem(configAncillaryItem); } - @ApiOperation("删除辅助检查项") + @Operation(summary = "删除辅助检查项") @GetMapping("deleteAncillaryItem") public void deleteAncillaryItem(String id){ ancillaryItemManageService.deleteAncillaryItem(id); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java index 63740401..23014d81 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/AskQuestionLibraryManageController.java @@ -8,9 +8,9 @@ import com.supervision.model.AskTemplateQuestionLibrary; import com.supervision.model.CommonDic; import com.supervision.vo.manage.AskQuestionLibraryReqVo; import com.supervision.vo.manage.AskQuestionLibraryResVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -18,14 +18,15 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; -@Api(tags = "问题库管理") +@Tag(name = "问题库管理") @RestController @RequestMapping("/aqLibrary") @RequiredArgsConstructor public class AskQuestionLibraryManageController { private final AskQuestionLibraryManageService askQuestionLibraryManageService; - @ApiOperation("查询问题库列表") + + @Operation(summary = "查询问题库列表") @GetMapping("/queryList") public List queryList(AskQuestionLibraryReqVo askQuestionLibraryReqVo) { @@ -33,7 +34,7 @@ public class AskQuestionLibraryManageController { } - @ApiOperation("分页查询问题库列表") + @Operation(summary = "分页查询问题库列表") @GetMapping("/queryPageList") public Page queryPageList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, @@ -44,7 +45,7 @@ public class AskQuestionLibraryManageController { } - @ApiOperation("保存问题库信息") + @Operation(summary = "保存问题库信息") @PostMapping("/saveQuestionLibrary") public String saveQuestionLibrary(@RequestBody AskTemplateQuestionLibrary askTemplateQuestionLibrary) { @@ -53,7 +54,7 @@ public class AskQuestionLibraryManageController { } - @ApiOperation("更新问题库信息") + @Operation(summary = "更新问题库信息") @PutMapping("/updateQuestionLibrary") public boolean updateQuestionLibrary(@RequestBody AskTemplateQuestionLibrary askTemplateQuestionLibrary) { @@ -61,7 +62,7 @@ public class AskQuestionLibraryManageController { } - @ApiOperation("删除问题库信息") + @Operation(summary = "删除问题库信息") @DeleteMapping("/deleteQuestionLibrary") public boolean deleteQuestionLibrary(@RequestParam("id") String id) { @@ -69,7 +70,7 @@ public class AskQuestionLibraryManageController { } - @ApiOperation("查询问题类目编码列表") + @Operation(summary = "查询问题类目编码列表") @GetMapping("/queryItemList") public List queryItemList() { @@ -77,14 +78,14 @@ public class AskQuestionLibraryManageController { } - @ApiOperation("导入问题库信息") + @Operation(summary = "导入问题库信息") @PostMapping("/uploadQuestionLibrary") - public UploadQuestionLibraryResVo uploadQuestionLibrary(@ApiParam("文件") @RequestParam("file") MultipartFile multipartFile) throws Exception { + public UploadQuestionLibraryResVo uploadQuestionLibrary(@Parameter(name = "文件") @RequestParam("file") MultipartFile multipartFile) throws Exception { return askQuestionLibraryManageService.uploadQuestionLibrary(multipartFile); } - @ApiOperation("下载问题库导入模板") + @Operation(summary = "下载问题库导入模板") @GetMapping("/downloadQuestionLibraryTemplate") public void downloadQuestionLibraryTemplate(HttpServletResponse response) throws Exception { diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/CommonDicManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/CommonDicManageController.java index ea98fcff..15c32fb0 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/CommonDicManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/CommonDicManageController.java @@ -2,8 +2,8 @@ package com.supervision.manage.controller.config; import com.supervision.dto.CommonDictTreeDTO; import com.supervision.service.CommonDicService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -11,14 +11,15 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Api(tags = "通用字典管理") +@Tag(name = "通用字典管理") @RestController @RequestMapping("/commonDic") @RequiredArgsConstructor public class CommonDicManageController { private final CommonDicService commonDicService; - @ApiOperation("查询字典树") + + @Operation(summary = "查询字典树") @GetMapping("/queryCommonDictTree") public List queryAncillaryItemList(String groupCode) { return commonDicService.queryCommonDictTree(groupCode); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/DrugManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/DrugManageController.java index 8dbfd971..e4ac9cfe 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/DrugManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/DrugManageController.java @@ -3,20 +3,21 @@ package com.supervision.manage.controller.config; import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.manage.service.DrugManageService; import com.supervision.model.ConfigDrug; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -@Api(tags = "药物管理") +@Tag(name = "药物管理") @RestController @RequestMapping("/drugManage") @RequiredArgsConstructor public class DrugManageController { private final DrugManageService drugManageService; - @ApiOperation("新增药物信息") + + @Operation(summary = "新增药物信息") @PostMapping("/save") public String saveDrug(@RequestBody ConfigDrug configDrug) { @@ -24,28 +25,28 @@ public class DrugManageController { return result.getId(); } - @ApiOperation("删除药物信息") + @Operation(summary = "删除药物信息") @DeleteMapping("/delete") - public boolean deleteDrug(@ApiParam("药品id")@RequestParam("id") String id) { + public boolean deleteDrug(@Parameter(name = "药品id") @RequestParam("id") String id) { return drugManageService.deleteDrugById(id); } - @ApiOperation("修改药物信息") + @Operation(summary = "修改药物信息") @PutMapping("/update") public boolean updateDrug(@RequestBody ConfigDrug configDrug) { return drugManageService.updateDrug(configDrug); } - @ApiOperation("分页查询药物信息") + @Operation(summary = "分页查询药物信息") @GetMapping("/queryPageList") - public IPage queryPageList(@RequestParam(defaultValue = "1")Integer pageNum, - @RequestParam(defaultValue = "10")Integer pageSize, - @ApiParam("药品名称") @RequestParam(required = false) String drugName, - @ApiParam("一级措施id") @RequestParam(required = false) String firstMeasuresId, - @ApiParam("剂型") @RequestParam(required = false) String dosageForm ) { + public IPage queryPageList(@RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "10") Integer pageSize, + @Parameter(name = "药品名称") @RequestParam(required = false) String drugName, + @Parameter(name = "一级措施id") @RequestParam(required = false) String firstMeasuresId, + @Parameter(name = "剂型") @RequestParam(required = false) String dosageForm) { - return drugManageService.queryPageList(pageNum, pageSize, drugName,firstMeasuresId,dosageForm); + return drugManageService.queryPageList(pageNum, pageSize, drugName, firstMeasuresId, dosageForm); } } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalLocationManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalLocationManageController.java index 8f4406a4..08c641b0 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalLocationManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalLocationManageController.java @@ -3,9 +3,9 @@ package com.supervision.manage.controller.config; import com.supervision.manage.service.PhysicalLocationManageService; import com.supervision.vo.manage.PhysicalLocationNode; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -13,14 +13,15 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Api(tags = "身体位置管理") +@Tag(name = "身体位置管理") @RestController @RequestMapping("physicalLocation") @RequiredArgsConstructor public class PhysicalLocationManageController { private final PhysicalLocationManageService physicalLocationManageService; - @ApiOperation("查询身体部位树") + + @Operation(summary = "查询身体部位树") @GetMapping("/queryTree") public List queryTree() { @@ -28,7 +29,7 @@ public class PhysicalLocationManageController { } - @ApiModelProperty("查询体格检查身体部位配置树(支持已配置部位)") + @Schema(name = "查询体格检查身体部位配置树(支持已配置部位)") @GetMapping("queryLocationTreeForPhysicalConfig") public List queryLocationTreeForPhysicalConfig(String physicalId) { return physicalLocationManageService.queryLocationTreeForPhysicalConfig(physicalId); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalToolManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalToolManageController.java index b58b7b77..1b2b5c4b 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalToolManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/PhysicalToolManageController.java @@ -5,15 +5,14 @@ import com.supervision.manage.pojo.vo.PhysicalToolVO; import com.supervision.manage.service.PhysicalToolManageService; import com.supervision.model.ConfigPhysicalTool; import com.supervision.vo.ask.ConfigPhysicalToolResVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "体格检查工具管理") +@Tag(name = "体格检查工具管理") @RestController @RequestMapping("physicalTool") @RequiredArgsConstructor @@ -21,41 +20,40 @@ public class PhysicalToolManageController { private final PhysicalToolManageService physicalToolManageService; - @ApiOperation(value = "查询体格检查的工具列表") + @Operation(summary = "查询体格检查的工具列表") @GetMapping("queryPhysicalToolList") public List queryPhysicalToolList() { return physicalToolManageService.queryPhysicalToolList(); } - @ApiOperation("体格检查分页查询") + @Operation(summary = "体格检查分页查询") @GetMapping("queryPhysicalPage") public IPage queryConfigPhysicalToolPage(String toolName, String type, Integer requireLocation, Integer pageNum, Integer pageSize) { return physicalToolManageService.queryConfigPhysicalToolPage(toolName, type, requireLocation, pageNum, pageSize); } - @ApiOperation("查询体格检查工具详细信息") + @Operation(summary = "查询体格检查工具详细信息") @GetMapping("queryConfigPhysicalToolDetail") public PhysicalToolVO queryConfigPhysicalToolDetail(String id) { return physicalToolManageService.queryConfigPhysicalToolDetail(id); } - - @ApiOperation("保存体格工具") + @Operation(summary = "保存体格工具") @PostMapping("saveConfigPhysicalTool") public void saveConfigPhysicalTool(@RequestBody PhysicalToolVO physicalToolVO) { physicalToolManageService.saveConfigPhysicalTool(physicalToolVO); } - @ApiOperation("修改体格工具") + @Operation(summary = "修改体格工具") @PostMapping("modifyConfigPhysicalTool") public void modifyConfigPhysicalTool(@RequestBody PhysicalToolVO physicalToolVO) { physicalToolManageService.modifyConfigPhysicalTool(physicalToolVO); } - @ApiOperation("删除体格工具") + @Operation(summary = "删除体格工具") @GetMapping("deleteConfigPhysicalTool") public void deleteConfigPhysicalTool(String id) { physicalToolManageService.deleteConfigPhysicalTool(id); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java index 79374948..3c74ff20 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/config/TreatmentPlanManageController.java @@ -2,19 +2,18 @@ package com.supervision.manage.controller.config; import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.manage.service.ConfigTreatmentPlanManageService; -import com.supervision.model.ConfigDrug; -import com.supervision.vo.manage.TreatmentPlanTreeNode; import com.supervision.model.ConfigTreatmentPlan; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import com.supervision.vo.manage.TreatmentPlanTreeNode; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "处置计划管理") +@Tag(name = "处置计划管理") @RestController @RequestMapping("treatmentPlan") @RequiredArgsConstructor @@ -22,35 +21,35 @@ public class TreatmentPlanManageController { private final ConfigTreatmentPlanManageService configTreatmentPlanManageService; - @ApiOperation("查询处置计划树") + @Operation(summary = "查询处置计划树") @GetMapping("/queryTree") - public List queryTree(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod) { + public List queryTree(@Parameter(name = "处置方式") @RequestParam(required = false) Integer disposalMethod) { return configTreatmentPlanManageService.queryTree(disposalMethod); } - @ApiOperation("根据id查询处置计划详情") + @Operation(summary = "根据id查询处置计划详情") @GetMapping("/findById") - public ConfigTreatmentPlan findById(@ApiParam("主键") @RequestParam String id) { + public ConfigTreatmentPlan findById(@Parameter(name = "主键") @RequestParam String id) { return configTreatmentPlanManageService.findById(id); } - @ApiOperation("分页查询处置计划列表") + @Operation(summary = "分页查询处置计划列表") @GetMapping("/queryPageList") public IPage queryPageList(@RequestParam(defaultValue = "1")Integer pageNum, - @RequestParam(defaultValue = "10")Integer pageSize, - @ApiParam("处置方式(0门诊 1住院)") - @RequestParam(required = false) Integer disposalMethod) { + @RequestParam(defaultValue = "10")Integer pageSize, + @Parameter(name = "处置方式(0门诊 1住院)") + @RequestParam(required = false) Integer disposalMethod) { return configTreatmentPlanManageService.queryPageList(pageNum, pageSize, disposalMethod); } - @ApiOperation("保存处置计划") + @Operation(summary = "保存处置计划") @PostMapping("/save") public String saveTreatmentPlan(@RequestBody ConfigTreatmentPlan configTreatmentPlan) { @@ -58,14 +57,14 @@ public class TreatmentPlanManageController { return result.getId(); } - @ApiOperation("删除处置计划") + @Operation(summary = "删除处置计划") @DeleteMapping("/delete") public boolean deleteTreatmentPlan(@RequestParam("id") String id) { return configTreatmentPlanManageService.deleteTreatmentPlan(id); } - @ApiOperation("修改处置计划") + @Operation(summary = "修改处置计划") @PutMapping("/update") public boolean updateTreatmentPlan(@RequestBody ConfigTreatmentPlan configDrug) { diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseAncillaryManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseAncillaryManageController.java index 7f82d888..7886c7e7 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseAncillaryManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseAncillaryManageController.java @@ -6,15 +6,15 @@ import com.supervision.vo.ask.AncillaryItemReqVo; import com.supervision.vo.ask.ConfigAncillaryItemResVO; import com.supervision.vo.manage.DiseaseAncillaryReqVo; import com.supervision.vo.manage.DiseaseAncillaryResVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "疾病辅助检查管理") +@Tag(name = "疾病辅助检查管理") @RestController @RequestMapping("diseaseAncillary") @RequiredArgsConstructor @@ -22,7 +22,7 @@ public class DiseaseAncillaryManageController { private final DiseaseAncillaryManageService diseaseAncillaryManageService; - @ApiOperation("新增辅助检查信息") + @Operation(summary = "新增辅助检查信息") @PostMapping("/save") public String saveAncillary(@RequestBody DiseaseAncillaryReqVo diseaseAncillary) { @@ -33,7 +33,7 @@ public class DiseaseAncillaryManageController { } - @ApiOperation("删除疾病辅助检查信息") + @Operation(summary = "删除疾病辅助检查信息") @DeleteMapping("/delete") public boolean deleteDiseaseAncillary(@RequestParam("id") String id) { @@ -42,7 +42,7 @@ public class DiseaseAncillaryManageController { } - @ApiOperation("修改辅助检查信息") + @Operation(summary = "修改辅助检查信息") @PutMapping("/update") public boolean updateAncillary(@RequestBody DiseaseAncillaryReqVo diseaseAncillary) { @@ -51,7 +51,7 @@ public class DiseaseAncillaryManageController { } - @ApiOperation("根据疾病id查询疾病辅助检查信息列表") + @Operation(summary = "根据疾病id查询疾病辅助检查信息列表") @GetMapping("/queryListByDiseaseId") public List queryListByDiseaseId(@RequestParam("diseaseId") String diseaseId) { @@ -59,7 +59,7 @@ public class DiseaseAncillaryManageController { } - @ApiOperation("查询疾病辅助检查项目列表") + @Operation(summary = "查询疾病辅助检查项目列表") @GetMapping("queryAncillaryItemList") public List queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) { return diseaseAncillaryManageService.queryAncillaryItemList(ancillaryItemReqVo); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseManageController.java index 9868cbe4..caae14cc 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseManageController.java @@ -1,15 +1,17 @@ package com.supervision.manage.controller.diseasemanage; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.manage.service.DiseaseManageService; import com.supervision.model.Disease; import com.supervision.vo.manage.DiseaseReqVo; -import io.swagger.annotations.*; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.SchemaProperty; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -@Api(tags = "疾病管理") +@Tag(name = "疾病管理") @RestController @RequestMapping("disease") @RequiredArgsConstructor @@ -20,22 +22,22 @@ public class DiseaseManageController { @PostMapping("/save") - @ApiOperation("新增疾病") - @ApiModelProperty + @Operation(summary = "新增疾病") + @SchemaProperty public Disease saveDisease(@RequestBody Disease disease) { return diseaseManageService.saveDisease(disease); } - @ApiOperation("删除疾病") + @Operation(summary = "删除疾病") @DeleteMapping("/delete") - public boolean deleteDisease(@ApiParam("疾病id") @RequestParam String id) { + public boolean deleteDisease(@Parameter(name = "疾病id") @RequestParam String id) { return diseaseManageService.deleteDisease(id); } - @ApiOperation("修改疾病信息") + @Operation(summary = "修改疾病信息") @PutMapping("/update") public boolean updateDisease(@RequestBody Disease disease) { @@ -44,7 +46,7 @@ public class DiseaseManageController { } - @ApiOperation("查询分页疾病列表") + @Operation(summary = "查询分页疾病列表") @GetMapping("/queryPageList") public IPage queryPageList(@RequestParam(defaultValue = "1")Integer pageNum, @RequestParam(defaultValue = "10")Integer pageSize, diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseasePhysicalManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseasePhysicalManageController.java index acb4a902..a0723a4d 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseasePhysicalManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseasePhysicalManageController.java @@ -2,18 +2,18 @@ package com.supervision.manage.controller.diseasemanage; import com.supervision.manage.service.DiseasePhysicalManageService; +import com.supervision.model.DiseasePhysical; import com.supervision.vo.manage.DiseasePhysicalLocationNodeVo; import com.supervision.vo.manage.DiseasePhysicalReqVo; import com.supervision.vo.manage.DiseasePhysicalResVo; -import com.supervision.model.DiseasePhysical; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "疾病体格检查管理") +@Tag(name = "疾病体格检查管理") @RestController @RequestMapping("/diseasePhysical") @RequiredArgsConstructor @@ -22,7 +22,7 @@ public class DiseasePhysicalManageController { private final DiseasePhysicalManageService diseasePhysicalManageService; - @ApiOperation("新增体格检查信息") + @Operation(summary = "新增体格检查信息") @PostMapping("/save") public String savePhysical(@RequestBody DiseasePhysicalReqVo diseasePhysical) { @@ -31,7 +31,7 @@ public class DiseasePhysicalManageController { return result.getId(); } - @ApiOperation("删除体格检查") + @Operation(summary = "删除体格检查") @DeleteMapping("/delete") public boolean deletePhysical(@RequestParam String id) { @@ -39,7 +39,7 @@ public class DiseasePhysicalManageController { } - @ApiOperation("修改体格检查信息") + @Operation(summary = "修改体格检查信息") @PutMapping("/update") public boolean updatePhysical(@RequestBody DiseasePhysicalReqVo diseasePhysical) { @@ -48,7 +48,7 @@ public class DiseasePhysicalManageController { } - @ApiOperation("根据疾病id查询体格检查列表") + @Operation(summary = "根据疾病id查询体格检查列表") @GetMapping("/queryListByDiseaseId") public List queryListByDiseaseId(@RequestParam("diseaseId") String diseaseId) { @@ -56,7 +56,7 @@ public class DiseasePhysicalManageController { } - @ApiOperation("查询疾病身体部位树") + @Operation(summary = "查询疾病身体部位树") @GetMapping("/queryTree") public List queryTree(@RequestParam("diseaseId") String diseaseId, @RequestParam(value = "toolId",required = false) String toolId) { diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java index 55ed8325..78b9de42 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseQuestionManageController.java @@ -6,14 +6,14 @@ import com.supervision.model.DiseaseQuestion; import com.supervision.vo.manage.AskQuestionLibraryReqVo; import com.supervision.vo.manage.AskQuestionLibraryResVo; import com.supervision.vo.manage.DiseaseQuestionResVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "疾病问题管理") +@Tag(name = "疾病问题管理") @RestController @RequestMapping("diseaseQuestion") @RequiredArgsConstructor @@ -22,7 +22,7 @@ public class DiseaseQuestionManageController { private final DiseaseQuestionManageService diseaseQuestionManageService; - @ApiOperation("保存疾病问题信息") + @Operation(summary = "保存疾病问题信息") @PostMapping("/batchSave") public boolean batchSaveQuestionList(@RequestBody List diseaseQuestionList) { @@ -31,7 +31,7 @@ public class DiseaseQuestionManageController { } - @ApiOperation("删除疾病问题") + @Operation(summary = "删除疾病问题") @DeleteMapping("/delete") public boolean deleteDiseaseQuestion(@RequestParam String id) { @@ -40,8 +40,7 @@ public class DiseaseQuestionManageController { } - - @ApiOperation("根据疾病id查询问题库信息列表") + @Operation(summary = "根据疾病id查询问题库信息列表") @GetMapping("/queryListByDiseaseId") public List queryPageByDiseaseId(@RequestParam("diseaseId") String diseaseId) { @@ -49,7 +48,7 @@ public class DiseaseQuestionManageController { } - @ApiOperation("分页查询问题库列表(排除已选择的问题)") + @Operation(summary = "分页查询问题库列表(排除已选择的问题)") @GetMapping("/queryQaLibPageList") public Page queryQaLibPageList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize, diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java index aedadbc8..c44f79f9 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/diseasemanage/DiseaseTreatmentPlanManageController.java @@ -4,16 +4,18 @@ package com.supervision.manage.controller.diseasemanage; import cn.hutool.core.collection.CollUtil; import com.supervision.manage.service.DiseaseTreatmentPlanManageService; import com.supervision.model.DiseaseTreatmentPlan; -import com.supervision.vo.manage.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import com.supervision.vo.manage.DiseaseTreatmentPlanReqVo; +import com.supervision.vo.manage.DiseaseTreatmentPlanResVo; +import com.supervision.vo.manage.DiseaseTreatmentPlanTreeNode; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "疾病处置计划管理") +@Tag(name = "疾病处置计划管理") @RestController @RequestMapping("/diseaseTreatmentPlan") @RequiredArgsConstructor @@ -22,7 +24,7 @@ public class DiseaseTreatmentPlanManageController { private final DiseaseTreatmentPlanManageService diseaseTreatmentPlanManageService; - @ApiOperation("保存处置信息") + @Operation(summary = "保存处置信息") @PostMapping("/save") public String saveTreatmentPlan(@RequestBody DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) { // 适配前端传入数据 @@ -32,7 +34,7 @@ public class DiseaseTreatmentPlanManageController { } - @ApiOperation("批量保存处置信息") + @Operation(summary = "批量保存处置信息") @PostMapping("/batchSave") public boolean batchSaveTreatmentPlan(@RequestBody List diseaseTreatmentPlanList) { @@ -40,7 +42,7 @@ public class DiseaseTreatmentPlanManageController { return true; } - @ApiOperation("根据疾病id查询疾病处置信息列表") + @Operation(summary = "根据疾病id查询疾病处置信息列表") @GetMapping("/queryListByDiseaseId") public List queryListByDiseaseId(String diseaseId) { @@ -57,7 +59,7 @@ public class DiseaseTreatmentPlanManageController { } - @ApiOperation("删除疾病处置计划") + @Operation(summary = "删除疾病处置计划") @DeleteMapping("/delete") public boolean deleteDiseaseTreatmentPlan(@RequestParam("id") String id) { @@ -65,7 +67,7 @@ public class DiseaseTreatmentPlanManageController { } - @ApiOperation("修改处置计划") + @Operation(summary = "修改处置计划") @PutMapping("/update") public boolean updateDiseaseTreatmentPlan(@RequestBody DiseaseTreatmentPlanReqVo diseaseTreatmentPlan) { // 适配前端传入数据 @@ -74,12 +76,12 @@ public class DiseaseTreatmentPlanManageController { } - @ApiOperation("查询处置计划树") + @Operation(summary = "查询处置计划树") @GetMapping("/queryTree") - public List queryTree(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod, - @ApiParam("疾病id") String diseaseId) { + public List queryTree(@Parameter(name = "处置方式") @RequestParam(required = false) Integer disposalMethod, + @Parameter(name = "疾病id") String diseaseId) { - return diseaseTreatmentPlanManageService.queryDiseaseTreatmentPlanTree(disposalMethod,diseaseId); + return diseaseTreatmentPlanManageService.queryDiseaseTreatmentPlanTree(disposalMethod, diseaseId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/DirectoryInfoManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/DirectoryInfoManageController.java index 20251e7b..fd7b7fc3 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/DirectoryInfoManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/DirectoryInfoManageController.java @@ -3,15 +3,15 @@ package com.supervision.manage.controller.file; import com.supervision.manage.pojo.vo.DirectoryInfoVO; import com.supervision.manage.service.DirectoryInfoManageService; import com.supervision.model.DirectoryInfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "文件目录管理") +@Tag(name = "文件目录管理") @RestController @RequestMapping("/directoryManage") @RequiredArgsConstructor @@ -19,7 +19,8 @@ public class DirectoryInfoManageController { private final DirectoryInfoManageService directoryInfoManageService; - @ApiOperation("新增文件目录") + + @Operation(summary = "新增文件目录") @PostMapping("/addDirectory") public String addDirectory(@RequestBody DirectoryInfo directoryInfo) { @@ -28,15 +29,15 @@ public class DirectoryInfoManageController { } - @ApiOperation("删除文件目录") + @Operation(summary = "删除文件目录") @DeleteMapping("/deleteDirectory") - public boolean deleteDirectory(@ApiParam("目录ID") @RequestParam("directoryId") String directoryId) { + public boolean deleteDirectory(@Parameter(name = "目录ID") @RequestParam("directoryId") String directoryId) { return directoryInfoManageService.deleteDirectory(directoryId); } - @ApiOperation("修改文件目录") + @Operation(summary = "修改文件目录") @PutMapping("/updateDirectory") public boolean updateDirectory(@RequestBody DirectoryInfo directoryInfo) { @@ -45,12 +46,12 @@ public class DirectoryInfoManageController { } - @ApiOperation("查询文件目录") + @Operation(summary = "查询文件目录") @GetMapping("/getFileDirectory") - public List getFileDirectory(@ApiParam("父级目录ID") @RequestParam(value = "parentDirId",required = false) String parentDirId, - @ApiParam("文件名称") @RequestParam(value = "fileName",required = false) String fileName) { + public List getFileDirectory(@Parameter(name = "父级目录ID") @RequestParam(value = "parentDirId", required = false) String parentDirId, + @Parameter(name = "文件名称") @RequestParam(value = "fileName", required = false) String fileName) { - return directoryInfoManageService.getFileDirectory(parentDirId,fileName); + return directoryInfoManageService.getFileDirectory(parentDirId, fileName); } } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/FileManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/FileManageController.java index 6a930398..37d958a9 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/FileManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/FileManageController.java @@ -2,22 +2,23 @@ package com.supervision.manage.controller.file; import com.supervision.manage.service.FileManageService; import com.supervision.model.FileResource; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -@Api(tags = "文件管理") +@Tag(name = "文件管理") @RestController @RequestMapping("/fileManage") @RequiredArgsConstructor public class FileManageController { private final FileManageService fileManageService; - @ApiOperation("上传文件") + + @Operation(summary = "上传文件") @PostMapping("/uploadFile") public FileResource uploadFile(@RequestParam("file") MultipartFile multipartFile) throws Exception { @@ -25,7 +26,7 @@ public class FileManageController { } - @ApiOperation("下载文件") + @Operation(summary = "下载文件") @GetMapping("/downloadFile") public void downloadFile(@RequestParam String fileId, HttpServletResponse response) throws Exception { @@ -33,7 +34,7 @@ public class FileManageController { } - @ApiOperation("删除文件") + @Operation(summary = "删除文件") @DeleteMapping("/deleteFile") public boolean deleteFile(@RequestParam String fileId) throws Exception { diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/MaterialLibraryManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/MaterialLibraryManageController.java index 12577836..7525e0c7 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/MaterialLibraryManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/file/MaterialLibraryManageController.java @@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.manage.service.MaterialLibraryManageService; import com.supervision.model.MaterialLibrary; import com.supervision.vo.manage.MaterialLibraryResVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "素材库管理") +@Tag(name = "素材库管理") @RestController @RequestMapping("/materialLibrary") @RequiredArgsConstructor @@ -20,7 +20,7 @@ public class MaterialLibraryManageController { private final MaterialLibraryManageService materialLibraryManageService; - @ApiOperation("上传素材") + @Operation(summary = "上传素材") @PostMapping("/uploadMaterial") public void uploadMaterial(@RequestBody List materialLibraryList) throws Exception { @@ -28,26 +28,25 @@ public class MaterialLibraryManageController { } - @ApiOperation("素材管理分页查询") + @Operation(summary = "素材管理分页查询") @GetMapping("queryMedicalRecPage") public IPage queryMaterialPage(MaterialLibrary materialLibrary, - @ApiParam("页码") @RequestParam(name="pageNum",defaultValue = "1") Integer pageNum, - @ApiParam("每页大小") @RequestParam(name="pageSize",defaultValue = "10")Integer pageSize) { + @Parameter(name = "页码") @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @Parameter(name = "每页大小") @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - return materialLibraryManageService.queryMaterialPage(materialLibrary,pageNum, pageSize); + return materialLibraryManageService.queryMaterialPage(materialLibrary, pageNum, pageSize); } - - @ApiOperation("删除素材") + @Operation(summary = "删除素材") @DeleteMapping("/deleteMaterial") - public boolean deleteMaterial(@ApiParam("素材id") @RequestParam("id") String id) throws Exception { + public boolean deleteMaterial(@Parameter(name = "素材id") @RequestParam("id") String id) throws Exception { return materialLibraryManageService.deleteMaterial(id); } - @ApiOperation("修改素材") + @Operation(summary = "修改素材") @PutMapping("/updateMaterial") public boolean updateMaterial(@RequestBody MaterialLibrary materialLibrary) { diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java index d6451fc5..9f07ad1a 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java @@ -11,9 +11,9 @@ import com.supervision.vo.manage.DiseaseAncillaryResVo; import com.supervision.vo.manage.DiseasePhysicalResVo; import com.supervision.vo.manage.DiseaseTreatmentPlanResVo; import com.supervision.vo.manage.MedicalRecPageResVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -21,7 +21,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; -@Api(tags = "病历管理") +@Tag(name = "病历管理") @RestController @RequestMapping("/medicalRecManage") @RequiredArgsConstructor @@ -29,93 +29,93 @@ public class MedicalRecManageController { private final MedicalRecManageService medicalRecManageService; - @ApiOperation("初步诊断下拉列表联想(这个接口查询所有疾病,包含复合疾病)") + @Operation(summary = "初步诊断下拉列表联想(这个接口查询所有疾病,包含复合疾病)") @GetMapping("queryDiseaseListByDropList") public List queryDiseaseListByDropList() { return medicalRecManageService.queryDiseaseListByDropList(); } - @ApiOperation("初步诊断下拉列表联想(这个接口只查询单一疾病)") + @Operation(summary = "初步诊断下拉列表联想(这个接口只查询单一疾病)") @GetMapping("querySingleDiseaseListByDropList") public List querySingleDiseaseListByDropList() { return medicalRecManageService.querySingleDiseaseListByDropList(); } - @ApiOperation("病历管理分页查询") + @Operation(summary = "病历管理分页查询") @GetMapping("queryMedicalRecPage") - public IPage queryMedicalRecManagePage(@ApiParam("主诉") String selfDescKeyword, - @ApiParam("性别") String gender, - @ApiParam("疾病ID") String diseaseId, + public IPage queryMedicalRecManagePage(@Parameter(name = "主诉") String selfDescKeyword, + @Parameter(name = "性别") String gender, + @Parameter(name = "疾病ID") String diseaseId, Integer pageNum, Integer pageSize) { return medicalRecManageService.queryMedicalRecManagePage(selfDescKeyword, gender, diseaseId, pageNum, pageSize); } - @ApiOperation("创建病历") + @Operation(summary = "创建病历") @PostMapping("createMedicalRec") public void createMedicalRec(@RequestBody MedicalRecManageVO reqVO) { medicalRecManageService.createMedicalRec(reqVO); } - @ApiOperation("创建疾病时可选的的疾病列表") + @Operation(summary = "创建疾病时可选的的疾病列表") @GetMapping("queryDiseaseListByCreat") public List queryDiseaseListByCreat() { return medicalRecManageService.queryDiseaseListByCreat(); } - @ApiOperation("创建病历时查看配置的辅助检查项") + @Operation(summary = "创建病历时查看配置的辅助检查项") @GetMapping("queryDiseaseAncillaryByCreat") public List queryDiseaseAncillaryByCreat(String diseaseId){ return medicalRecManageService.queryDiseaseAncillaryByCreat(diseaseId); } - @ApiOperation("创建病历时查看配置的体格检查项") + @Operation(summary = "创建病历时查看配置的体格检查项") @GetMapping("queryDiseasePhysicalByCreat") public List queryDiseasePhysicalByCreat(String diseaseId){ return medicalRecManageService.queryDiseasePhysicalByCreat(diseaseId); } - @ApiOperation("创建病历时查看配置的处置计划") + @Operation(summary = "创建病历时查看配置的处置计划") @GetMapping("queryDiseaseTreatmentPlanByCreat") public List queryDiseaseTreatmentPlanByCreat(String diseaseId){ return medicalRecManageService.queryDiseaseTreatmentPlanByCreat(diseaseId); } - @ApiOperation("创建病历时,根据疾病ID查询配置的问题") + @Operation(summary = "创建病历时,根据疾病ID查询配置的问题") @GetMapping("queryQuestionListByCreat") public List queryQuestionListByCreat(String diseaseId) { return medicalRecManageService.queryQuestionListByCreat(diseaseId); } - @ApiOperation("修改病历") + @Operation(summary = "修改病历") @PostMapping("modifyMedicalRec") public void modifyMedicalRec(@RequestBody MedicalRecManageVO reqVO) { medicalRecManageService.modifyMedicalRec(reqVO); } - @ApiOperation("查询病例详细信息") + @Operation(summary = "查询病例详细信息") @GetMapping("queryMedicalRecInfo") public MedicalRecInfoVO queryMedicalRecInfo(String id) { return medicalRecManageService.queryMedicalRecInfo(id); } - @ApiOperation("删除病历") + @Operation(summary = "删除病历") @GetMapping("deleteMedicalRec") public void deleteMedicalRec(String id) { medicalRecManageService.deleteMedicalRec(id); } - @ApiOperation("预导入疾病问题回答") + @Operation(summary = "预导入疾病问题回答") @PostMapping("/preUploadMedicalAnswer") - public MedicalAnswerVideoResVo uploadMedicalAnswer(@ApiParam("文件") @RequestParam("file") MultipartFile multipartFile, - @ApiParam("病例id") @RequestParam(value = "medicalRecId",required = false) String medicalRecId) throws Exception { + public MedicalAnswerVideoResVo uploadMedicalAnswer(@Parameter(name = "文件") @RequestParam("file") MultipartFile multipartFile, + @Parameter(name = "病例id") @RequestParam(value = "medicalRecId", required = false) String medicalRecId) throws Exception { return medicalRecManageService.preUploadMedicalAnswer(multipartFile, medicalRecId); } - @ApiOperation("下载疾病问题导入模板") + @Operation(summary = "下载疾病问题导入模板") @GetMapping("/downloadMedicalAnswerTemplate") public void downloadMedicalAnswerTemplate(HttpServletResponse response) throws Exception { @@ -123,11 +123,10 @@ public class MedicalRecManageController { } - - @ApiOperation("查询病例默认问题") + @Operation(summary = "查询病例默认问题") @GetMapping("/queryMedicalDefaultAnswer") - public List queryMedicalDefaultAnswer(@ApiParam("病例id") - @RequestParam(value = "medicalRecId",required = false) String medicalRecId) { + public List queryMedicalDefaultAnswer(@Parameter(name = "病例id") + @RequestParam(value = "medicalRecId", required = false) String medicalRecId) { return medicalRecManageService.queryMedicalDefaultAnswer(medicalRecId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/processrecord/ProcessRecordController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/processrecord/ProcessRecordController.java index c46829f0..4daf4601 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/processrecord/ProcessRecordController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/processrecord/ProcessRecordController.java @@ -1,15 +1,15 @@ package com.supervision.manage.controller.processrecord; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.supervision.manage.service.ProcessRecordService; import com.supervision.model.ProcessEvaluation; import com.supervision.vo.result.ProcessRecordVO; -import com.supervision.manage.service.ProcessRecordService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -@Api(tags = "问诊病案管理") +@Tag(name = "问诊病案管理") @RestController @RequestMapping("processRecord") @RequiredArgsConstructor @@ -18,19 +18,19 @@ public class ProcessRecordController { private final ProcessRecordService processRecordService; - @ApiOperation("分页查询病案管理") + @Operation(summary = "分页查询病案管理") @GetMapping("queryProcessRecordPage") public IPage queryProcessRecordPage(String studentName, String medicalRecNo, String diseaseType, Integer pageNum, Integer pageSize) { return processRecordService.queryProcessRecordPage(studentName, medicalRecNo, diseaseType, pageNum, pageSize); } - @ApiOperation("保存或更新考核病案评估") + @Operation(summary = "保存或更新考核病案评估") @PostMapping("saveProcessEvaluation") public ProcessEvaluation saveOrUpdateProcessEvaluation(@RequestBody ProcessEvaluation processEvaluation){ return processRecordService.saveOrUpdateProcessEvaluation(processEvaluation); } - @ApiOperation("查询考核病案评估") + @Operation(summary = "查询考核病案评估") @GetMapping("queryProcessEvaluation") public ProcessEvaluation queryProcessEvaluation(String processId){ return processRecordService.queryProcessEvaluation(processId); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/qaKnowledge/QaKnowledgeManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/qaKnowledge/QaKnowledgeManageController.java index 233a19ca..5c302741 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/qaKnowledge/QaKnowledgeManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/qaKnowledge/QaKnowledgeManageController.java @@ -3,7 +3,7 @@ package com.supervision.manage.controller.qaKnowledge; import com.supervision.dto.QaKnowledgeDTO; import com.supervision.manage.service.QaKnowledgeManageService; import com.supervision.service.AskTemplateQuestionLibraryService; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -20,13 +20,13 @@ public class QaKnowledgeManageController { private final QaKnowledgeManageService qaKnowledgeManageService; - @ApiOperation("获取问答知识库") + @Operation(summary = "获取问答知识库") @GetMapping("queryQaKnowledge") public List queryQaKnowledge() { return askTemplateQuestionLibraryService.queryQaKnowledge(); } - @ApiOperation("手动刷新知识库") + @Operation(summary = "手动刷新知识库") @GetMapping("refreshQaKnowledge") public void refreshQaKnowledge() { qaKnowledgeManageService.refreshQaKnowledge(); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/system/UserManager.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/system/UserManager.java index 2565671c..c34b8165 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/system/UserManager.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/system/UserManager.java @@ -8,14 +8,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.exception.BusinessException; import com.supervision.model.User; import com.supervision.service.UserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.Optional; -@Api(tags = "用户管理") +@Tag(name = "用户管理") @RestController @RequestMapping("userManage") @RequiredArgsConstructor @@ -23,14 +23,14 @@ public class UserManager { private final UserService userService; - @ApiOperation("查询用户列表") + @Operation(summary = "查询用户列表") @GetMapping("queryUserPage") public IPage queryUserPage(String userName, Integer roleCode, Integer pageNum, Integer pageSize) { return userService.lambdaQuery().like(StrUtil.isNotBlank(userName), User::getName, userName) .eq(ObjectUtil.isNotEmpty(roleCode), User::getRoleCode, roleCode).page(new Page<>(pageNum, pageSize)); } - @ApiOperation("保存用户") + @Operation(summary = "保存用户") @PostMapping("saveUser") public void saveUser(@RequestBody User user) { Assert.notBlank(user.getAccount(), "用户账户不能为空"); @@ -43,7 +43,7 @@ public class UserManager { userService.save(user); } - @ApiOperation("更新用户") + @Operation(summary = "更新用户") @PostMapping("updateUser") public void updateUser(@RequestBody User user) { Assert.notBlank(user.getId(), "ID不能为空"); @@ -59,7 +59,7 @@ public class UserManager { userService.updateById(user); } - @ApiOperation("停用用户") + @Operation(summary = "停用用户") @GetMapping("deactivateUser") public User deactivateUser(String id) { User old = Optional.ofNullable(userService.getById(id)).orElseThrow(() -> new BusinessException("用户不存在")); diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalAnswerVideoResVo.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalAnswerVideoResVo.java index 9eea9d2d..ae28e8a9 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalAnswerVideoResVo.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalAnswerVideoResVo.java @@ -1,6 +1,7 @@ package com.supervision.manage.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -8,15 +9,15 @@ import java.util.List; @Data public class MedicalAnswerVideoResVo { - @ApiModelProperty("成功个数") + @Schema(name = "成功个数") private int totalCount; - @ApiModelProperty("失败个数") + @Schema(name = "失败个数") private int failCount; - @ApiModelProperty("文件id") + @Schema(name = "文件id") private String fileId; - @ApiModelProperty("应答策略") + @Schema(name = "应答策略") private List qaList; } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoVO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoVO.java index 5d55ebf8..e116916f 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoVO.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoVO.java @@ -3,8 +3,7 @@ package com.supervision.manage.pojo.vo; import com.supervision.vo.manage.DiseaseAncillaryResVo; import com.supervision.vo.manage.DiseasePhysicalResVo; import com.supervision.vo.manage.DiseaseTreatmentPlanResVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,19 +11,19 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "病历管理详细信息", parent = MedicalRecManageVO.class) +@Schema(name = "病历管理详细信息", implementation = MedicalRecManageVO.class) public class MedicalRecInfoVO extends MedicalRecManageVO { - @ApiModelProperty("疾病名称") + @Schema(name = "疾病名称") private String diseaseName; - @ApiModelProperty("辅助检查") + @Schema(name = "辅助检查") private List ancillaryList; - @ApiModelProperty("体格检查") + @Schema(name = "体格检查") private List physicalList; - @ApiModelProperty("处置计划列表") + @Schema(name = "处置计划列表") private List treatmentPlanList; } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java index 9d2c80b8..ba5010c5 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecManageVO.java @@ -1,8 +1,7 @@ package com.supervision.manage.pojo.vo; import com.supervision.model.MedicalRec; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,17 +10,17 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(value = "病历管理创建及新建", parent = MedicalRec.class) +@Schema(name = "病历管理创建及新建", implementation = MedicalRec.class) public class MedicalRecManageVO extends MedicalRec { @NotBlank(message = "疾病不能为空") - @ApiModelProperty("step:1 疾病ID") + @Schema(name = "step:1 疾病ID") private String diseaseId; - @ApiModelProperty("step:4 应答策略") + @Schema(name = "step:4 应答策略") private List qaList; - @ApiModelProperty("step:4 应答策略(默认回答)") + @Schema(name = "step:4 应答策略(默认回答)") private List defaultQaList; } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java index f36999ea..6bdeda3f 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecQaVO.java @@ -1,6 +1,7 @@ package com.supervision.manage.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -8,37 +9,37 @@ import java.util.List; @Data public class MedicalRecQaVO { - @ApiModelProperty("本条问答ID,对应vp_ask_patient_answer表ID,更新必填") + @Schema(name = "本条问答ID,对应vp_ask_patient_answer表ID,更新必填") private String id; /** * 问题库问题ID */ - @ApiModelProperty(" 问题库问题ID,新增更新时必填") + @Schema(name = " 问题库问题ID,新增更新时必填") private String libraryQuestionId; - @ApiModelProperty("问题,新增更新时不需要") + @Schema(name = "问题,新增更新时不需要") private List questionList; - @ApiModelProperty("字典ID,新增更新时不需要") + @Schema(name = "字典ID,新增更新时不需要") private Long dictId; - @ApiModelProperty("问题类目,新增更新时不需要") + @Schema(name = "问题类目,新增更新时不需要") private String dictNamePath; - @ApiModelProperty("默认回答,新增更新时不需要") + @Schema(name = "默认回答,新增更新时不需要") private String defaultAnswer; - @ApiModelProperty("回答的资源id,新增更新时需要") + @Schema(name = "回答的资源id,新增更新时需要") private String answerResourceId; - @ApiModelProperty("回答的资源视频名,新增更新时需要") + @Schema(name = "回答的资源视频名,新增更新时需要") private String answerResourceName; - @ApiModelProperty("针对病例的特定回答,新增更新时必填") + @Schema(name = "针对病例的特定回答,新增更新时必填") private String medicalRecAnswer; - @ApiModelProperty(value = "回答类型",hidden = true) + @Schema(name = "回答类型", hidden = true) private Integer answerType; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/PhysicalToolVO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/PhysicalToolVO.java index 3ca18bcb..66c89e96 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/PhysicalToolVO.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/PhysicalToolVO.java @@ -1,10 +1,8 @@ package com.supervision.manage.pojo.vo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.supervision.model.ConfigPhysicalTool; import com.supervision.model.DefaultPhysicalIndicator; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,13 +10,13 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data -@ApiModel(parent = ConfigPhysicalTool.class) +@Schema(implementation = ConfigPhysicalTool.class) public class PhysicalToolVO extends ConfigPhysicalTool { - @ApiModelProperty("需要部位正常值列表") + @Schema(name = "需要部位正常值列表") private List defaultPhysicalIndicatorList; - @ApiModelProperty("无需部位的正常值") + @Schema(name = "无需部位的正常值") private DefaultPhysicalIndicator noLocationDefaultPhysicalIndicator; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/UploadQuestionLibraryResVo.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/UploadQuestionLibraryResVo.java index 180f450f..e1c7d67d 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/UploadQuestionLibraryResVo.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/UploadQuestionLibraryResVo.java @@ -1,18 +1,19 @@ package com.supervision.manage.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class UploadQuestionLibraryResVo { - @ApiModelProperty("总数据条数") + @Schema(name = "总数据条数") private int totalCount; - @ApiModelProperty("失败数据条数") + @Schema(name = "失败数据条数") private int failCount; - @ApiModelProperty("文件id") + @Schema(name = "文件id") private String fileId; } diff --git a/virtual-patient-model/src/main/java/com/supervision/dto/DiseaseAncillaryDto.java b/virtual-patient-model/src/main/java/com/supervision/dto/DiseaseAncillaryDto.java index f488fe58..f387d860 100644 --- a/virtual-patient-model/src/main/java/com/supervision/dto/DiseaseAncillaryDto.java +++ b/virtual-patient-model/src/main/java/com/supervision/dto/DiseaseAncillaryDto.java @@ -1,7 +1,7 @@ package com.supervision.dto; import com.supervision.model.DiseaseAncillary; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,6 +10,6 @@ import lombok.EqualsAndHashCode; public class DiseaseAncillaryDto extends DiseaseAncillary { - @ApiModelProperty("项目中文名") + @Schema(name = "项目中文名") private String itemName; } diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java b/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java index e8239290..0afc8cf5 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java @@ -1,14 +1,16 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 诊断问询-针对患者的回复 * @TableName vp_ask_patient_answer @@ -23,30 +25,30 @@ public class AskPatientAnswer extends Model implements Seriali private String id; - @ApiModelProperty("病例id") + @Schema(name = "病例id") private String medicalId; /** * 问题库问题ID */ - @ApiModelProperty(" 问题库问题ID") + @Schema(name = " 问题库问题ID") private String libraryQuestionId; private String code; - @ApiModelProperty("问题") + @Schema(name = "问题") private String question; /** * 回答 */ - @ApiModelProperty(" 回答") + @Schema(name = " 回答") private String answer; - @ApiModelProperty("回答资源id") + @Schema(name = "回答资源id") private String answerResourceId; - @ApiModelProperty("回答类型 0:默认回答 1:自定义回答") + @Schema(name = "回答类型 0:默认回答 1:自定义回答") private Integer answerType; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java b/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java index a3fecfa8..c49a5fbd 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java @@ -1,15 +1,16 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.supervision.handler.StringListTypeHandler; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; -import com.supervision.handler.StringListTypeHandler; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 诊断问询意图问题库 * @TableName vp_ask_template_question_library diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java index 66e8b3a2..48ff5a21 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java @@ -1,17 +1,18 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.supervision.handler.StringListTypeHandler; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -import com.supervision.handler.StringListTypeHandler; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 辅助检查项目配置表 * @@ -19,7 +20,7 @@ import lombok.Data; */ @TableName(value = "vp_config_ancillary_item", autoResultMap = true) @Data -@ApiModel +@Schema public class ConfigAncillaryItem implements Serializable { /** * 主键 @@ -30,57 +31,57 @@ public class ConfigAncillaryItem implements Serializable { /** * 类型 */ - @ApiModelProperty("类型") + @Schema(name = "类型") private String type; /** * 编码 */ - @ApiModelProperty("编码") + @Schema(name = "编码") private String code; /** * 类别 */ - @ApiModelProperty("类别") + @Schema(name = "类别") private String itemClass; /** * 检查名称 */ - @ApiModelProperty("检查名称") + @Schema(name = "检查名称") private String itemName; - @ApiModelProperty("检查部位名称") + @Schema(name = "检查部位名称") private String locationName; - @ApiModelProperty("英文名") + @Schema(name = "英文名") private String itemNameEn; - @ApiModelProperty("检查价格") + @Schema(name = "检查价格") private BigDecimal price; - @ApiModelProperty("关键词") + @Schema(name = "关键词") private String keyword; - @ApiModelProperty("说明") + @Schema(name = "说明") private String description; /** * 该项检查描述信息 */ - @ApiModelProperty("该项检查描述信息") + @Schema(name = "该项检查描述信息") private String info; - @ApiModelProperty("呼出问题") + @Schema(name = "呼出问题") @TableField(typeHandler = StringListTypeHandler.class) private List callOutQuestion; - @ApiModelProperty("检查类型排序") + @Schema(name = "检查类型排序") private Integer typePriority; - @ApiModelProperty("item排序") + @Schema(name = "item排序") private Integer itemPriority; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java index 5c1ccad9..51b0c053 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java @@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 药品配置表 * @TableName vp_config_drug @@ -33,7 +33,7 @@ public class ConfigDrug implements Serializable { */ private String drugNameEn; - @ApiModelProperty("一级措施id") + @Schema(name = "一级措施id") private String firstMeasuresId; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java index ba32ad90..caf052b3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java @@ -4,20 +4,19 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 体格检查位置表配置表 * @TableName vp_config_physical_location */ @TableName(value ="vp_config_physical_location") @Data -@ApiModel +@Schema public class ConfigPhysicalLocation implements Serializable { /** * 主键 @@ -28,26 +27,26 @@ public class ConfigPhysicalLocation implements Serializable { /** * 编码 */ - @ApiModelProperty("编码") + @Schema(name = "编码") private String code; /** * 位置分类 */ - @ApiModelProperty("位置分类") + @Schema(name = "位置分类") private String locationClass; /** * 位置名称 */ - @ApiModelProperty("位置名称") + @Schema(name = "位置名称") private String locationName; - @ApiModelProperty("部位层级") + @Schema(name = "部位层级") private String level; - @ApiModelProperty("父级Id") + @Schema(name = "父级Id") private String parentId; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java index 452c66cb..b556cf6c 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.supervision.handler.StringListTypeHandler; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -20,7 +19,7 @@ import java.util.List; */ @TableName(value = "vp_config_physical_tool", autoResultMap = true) @Data -@ApiModel +@Schema public class ConfigPhysicalTool implements Serializable { /** * 主键 @@ -31,45 +30,45 @@ public class ConfigPhysicalTool implements Serializable { /** * 体格检查类别 */ - @ApiModelProperty("体格检查类别") + @Schema(name = "体格检查类别") private String type; /** * 体格检查工具编码 */ - @ApiModelProperty("体格检查工具编码") + @Schema(name = "体格检查工具编码") private String code; /** * 体格检查工具名称 */ - @ApiModelProperty("体格检查工具名称") + @Schema(name = "体格检查工具名称") private String toolName; - @ApiModelProperty("体格检查工具图表的base64") + @Schema(name = "体格检查工具图表的base64") private String iconBase64; /** * 是否需要具体部位(0否1是) */ - @ApiModelProperty("是否需要具体部位(0否1是)") + @Schema(name = "是否需要具体部位(0否1是)") private Integer requireLocation; - @ApiModelProperty("呼出问题") + @Schema(name = "呼出问题") @TableField(typeHandler = StringListTypeHandler.class) private List callOutQuestion; - @ApiModelProperty("检查类型排序") + @Schema(name = "检查类型排序") private Integer typePriority; - @ApiModelProperty("code排序") + @Schema(name = "code排序") private Integer codePriority; - @ApiModelProperty("关键词") + @Schema(name = "关键词") private String keyword; - @ApiModelProperty("说明") + @Schema(name = "说明") private String description; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java index fb5217eb..2628c590 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java @@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.supervision.handler.StringListTypeHandler; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; -import com.supervision.handler.StringListTypeHandler; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 处置计划表 * @TableName vp_treatment_plan @@ -25,29 +25,29 @@ public class ConfigTreatmentPlan implements Serializable { @TableId private String id; - @ApiModelProperty("处置计划id") + @Schema(name = "处置计划id") private String disposalPlanId; /** * 处置计划： @see com.supervision.manage.constant.DisposalPlanEnum */ - @ApiModelProperty("处置计划") + @Schema(name = "处置计划") private String disposalPlan; - @ApiModelProperty("处置方式(0门诊 1住院)") + @Schema(name = "处置方式(0门诊 1住院)") private Integer disposalMethod; - @ApiModelProperty("一级措施id") + @Schema(name = "一级措施id") private String firstMeasuresId; - @ApiModelProperty("一级措施") + @Schema(name = "一级措施") private String firstMeasures; /** * 目前只有药物才会存在二级措施 */ - @ApiModelProperty("二级措施") + @Schema(name = "二级措施") private String secondMeasures; /** @@ -56,7 +56,7 @@ public class ConfigTreatmentPlan implements Serializable { * @since dev_2.1.0 */ @Deprecated - @ApiModelProperty("推荐用药") + @Schema(name = "推荐用药") @TableField(typeHandler = StringListTypeHandler.class) private List recommendedMedication; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DefaultPhysicalIndicator.java b/virtual-patient-model/src/main/java/com/supervision/model/DefaultPhysicalIndicator.java index f6c2ebe2..fe70e6c6 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DefaultPhysicalIndicator.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DefaultPhysicalIndicator.java @@ -3,8 +3,7 @@ package com.supervision.model; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -16,7 +15,7 @@ import java.time.LocalDateTime; */ @TableName(value ="vp_default_physical_indicator") @Data -@ApiModel +@Schema public class DefaultPhysicalIndicator implements Serializable { /** * 主键 @@ -26,31 +25,31 @@ public class DefaultPhysicalIndicator implements Serializable { /** * 工具id或项目id */ - @ApiModelProperty("工具id或项目id") + @Schema(name = "工具id或项目id") private String itemId; /** * 位置id */ - @ApiModelProperty("位置id") + @Schema(name = "位置id") private String locationId; /** * 性别 码值参考字典表 */ - @ApiModelProperty("性别 码值参考字典表 暂不填") + @Schema(name = "性别 码值参考字典表 暂不填") private String gender; /** * 年龄范围 码值参考 字典表 AGE_RANGE */ - @ApiModelProperty("年龄范围 码值参考 字典表 AGE_RANGE 暂不填") + @Schema(name = "年龄范围 码值参考 字典表 AGE_RANGE 暂不填") private String ageRange; /** * 指标值 */ - @ApiModelProperty("指标值") + @Schema(name = "指标值") private String indicatorValue; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java index 5259f683..e8d951c9 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java @@ -1,23 +1,23 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.apache.ibatis.annotations.Insert; - /** * 辅助检查记录表 * @TableName vp_diagnosis_ancillary_record */ @TableName(value ="vp_diagnosis_ancillary_record") @Data -@ApiModel +@Schema public class DiagnosisAncillaryRecord extends Model implements Serializable { /** * 主键 @@ -28,34 +28,34 @@ public class DiagnosisAncillaryRecord extends Model im /** * 流程ID */ - @ApiModelProperty("流程ID") + @Schema(name = "流程ID") private String processId; /** * 辅助检查项ID */ - @ApiModelProperty("辅助检查项ID") + @Schema(name = "辅助检查项ID") private String ancillaryId; /** * 项目ID */ - @ApiModelProperty("项目ID") + @Schema(name = "项目ID") private String itemId; /** * 检查结果 */ - @ApiModelProperty("检查结果") + @Schema(name = "检查结果") private String result; - @ApiModelProperty("诊断判读结果") + @Schema(name = "诊断判读结果") private String assessmentResult; - @ApiModelProperty("是否是证实诊断依据(0否1是)") + @Schema(name = "是否是证实诊断依据(0否1是)") private Integer basisConfirmFlag; - @ApiModelProperty("是否是鉴别依据(0否1是)") + @Schema(name = "是否是鉴别依据(0否1是)") private Integer basisIdentificationFlag; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java index fd171f7a..61f71ab3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java @@ -1,22 +1,23 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 体格检查记录 * @TableName vp_diagnosis_physical_record */ @TableName(value ="vp_diagnosis_physical_record") @Data -@ApiModel +@Schema public class DiagnosisPhysicalRecord extends Model implements Serializable { /** * 主键 @@ -27,37 +28,37 @@ public class DiagnosisPhysicalRecord extends Model impl /** * 诊断进程ID */ - @ApiModelProperty("诊断进程ID") + @Schema(name = "诊断进程ID") private String processId; /** * 体格检查项ID */ - @ApiModelProperty("体格检查项ID") + @Schema(name = "体格检查项ID") private String physicalId; /** * 体格检查工具ID */ - @ApiModelProperty("体格检查工具ID") + @Schema(name = "体格检查工具ID") private String toolId; /** * 体格检查部位ID */ - @ApiModelProperty("体格检查部位ID") + @Schema(name = "体格检查部位ID") private String locationId; /** * 体格检查结果 */ - @ApiModelProperty("体格检查结果") + @Schema(name = "体格检查结果") private String result; - @ApiModelProperty("是否是证实诊断依据(0否1是)") + @Schema(name = "是否是证实诊断依据(0否1是)") private Integer basisConfirmFlag; - @ApiModelProperty("是否是鉴别依据(0否1是)") + @Schema(name = "是否是鉴别依据(0否1是)") private Integer basisIdentificationFlag; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java index e273f9f3..ce31d21f 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java @@ -1,21 +1,22 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 初步诊断表 * @TableName vp_diagnosis_primary */ @TableName(value ="vp_diagnosis_primary") @Data -@ApiModel +@Schema public class DiagnosisPrimary implements Serializable { /** * 主键 @@ -26,23 +27,23 @@ public class DiagnosisPrimary implements Serializable { /** * 诊断流程ID */ - @ApiModelProperty("诊断流程ID") + @Schema(name = "诊断流程ID") private String processId; /** * 初步诊断疾病,关联disease表ID */ - @ApiModelProperty("初步诊断疾病ID,关联disease表ID") + @Schema(name = "初步诊断疾病ID,关联disease表ID") private String primaryDiagnosisId; - @ApiModelProperty("初步诊断疾病名称,对应disease_name_alias,注意,这里不存在于数据库中") + @Schema(name = "初步诊断疾病名称,对应disease_name_alias,注意,这里不存在于数据库中") @TableField(exist = false) private String primaryDiagnosisName; - @ApiModelProperty("是否排除(0否1是)") + @Schema(name = "是否排除(0否1是)") private Integer excludeFlag; - @ApiModelProperty("患者病情(初步诊断填写)") + @Schema(name = "患者病情(初步诊断填写)") private String patientDiseaseInfo; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimaryRelation.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimaryRelation.java index d9266267..6311b184 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimaryRelation.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimaryRelation.java @@ -1,14 +1,16 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 初步诊断依据关系表 * @TableName vp_diagnosis_primary_relation @@ -25,25 +27,25 @@ public class DiagnosisPrimaryRelation extends Model im /** * 问诊流程ID */ - @ApiModelProperty("问诊流程ID,新增时不填") + @Schema(name = "问诊流程ID,新增时不填") private String processId; /** * 初步诊断ID */ - @ApiModelProperty("初步诊断ID,新增时不填") + @Schema(name = "初步诊断ID,新增时不填") private String primaryId; /** * 1 问诊(vp_diagnosis_qa_record) 2 体格检查(vp_diagnosis_physical_record) 3 辅助检查(vp_diagnosis_ancillary_record) */ - @ApiModelProperty("1 问诊 2 体格检查 3 辅助检查") + @Schema(name = "1 问诊 2 体格检查 3 辅助检查") private Integer type; /** * 关联关系ID */ - @ApiModelProperty("关联关系ID") + @Schema(name = "关联关系ID") private String relationId; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java index f8093a4b..a2707ca2 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java @@ -1,16 +1,17 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.*; - -import java.io.Serializable; -import java.time.LocalDateTime; - +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.time.LocalDateTime; + /** * 诊断问答记录表 * @TableName vp_diagnosis_qa_record @@ -18,7 +19,7 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @TableName(value ="vp_diagnosis_qa_record") @Data -@ApiModel +@Schema public class DiagnosisQaRecord extends Model implements Serializable { /** * 主键 @@ -29,52 +30,52 @@ public class DiagnosisQaRecord extends Model implements Seria /** * 诊断进程ID */ - @ApiModelProperty("诊断进程ID") + @Schema(name = "诊断进程ID") private String processId; - @ApiModelProperty("问答类型:default,patient,如果patient,说明是病历配置的回答,打勾") + @Schema(name = "问答类型:default,patient,如果patient,说明是病历配置的回答,打勾") private String answerType; /** * 问题答案表ID */ - @ApiModelProperty("问题答案表ID,default:vp_ask_template_question_library的主键,patient:vp_ask_patient_answer主键") + @Schema(name = "问题答案表ID,default:vp_ask_template_question_library的主键,patient:vp_ask_patient_answer主键") private String answerId; /** * 问题 */ - @ApiModelProperty("问题") + @Schema(name = "问题") private String question; /** * 问题ID */ - @ApiModelProperty("问题ID") + @Schema(name = "问题ID") private String questionLibraryId; /** * 问题语音文件ID */ - @ApiModelProperty("问题语音文件ID") + @Schema(name = "问题语音文件ID") private String questionWavId; /** * 回答 */ - @ApiModelProperty("回答") + @Schema(name = "回答") private String answer; /** * 回答语音文件ID */ - @ApiModelProperty("回答语音文件ID") + @Schema(name = "回答语音文件ID") private String answerWavId; - @ApiModelProperty("是否是证实诊断依据(0否1是)") + @Schema(name = "是否是证实诊断依据(0否1是)") private Integer basisConfirmFlag; - @ApiModelProperty("是否是鉴别依据(0否1是)") + @Schema(name = "是否是鉴别依据(0否1是)") private Integer basisIdentificationFlag; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java index 6d63133e..279b669b 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java @@ -1,23 +1,24 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.supervision.handler.StringListTypeHandler; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; -import com.supervision.handler.StringListTypeHandler; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 疾病名称 * @TableName vp_disease */ @TableName(value ="vp_disease", autoResultMap = true) @Data -@ApiModel +@Schema public class Disease implements Serializable { /** * 主键 @@ -26,34 +27,34 @@ public class Disease implements Serializable { private String id; - @ApiModelProperty("疾病名称") + @Schema(name = "疾病名称") private String diseaseName; - @ApiModelProperty("疾病分类别名") + @Schema(name = "疾病分类别名") private String diseaseNameAlias; /** * 疾病编码 */ - @ApiModelProperty("疾病编码") + @Schema(name = "疾病编码") private String code; - @ApiModelProperty("包含的疾病id") + @Schema(name = "包含的疾病id") @TableField(typeHandler = StringListTypeHandler.class) private List containDiseaseIds; /** * 状态 0未训练 1已训练 */ - @ApiModelProperty("状态 0未训练 1已训练") + @Schema(name = "状态 0未训练 1已训练") private Integer status; - @ApiModelProperty("疾病类型 0单一疾病 1 复合疾病") + @Schema(name = "疾病类型 0单一疾病 1 复合疾病") private Integer diseaseType; - @ApiModelProperty("症状") + @Schema(name = "症状") private String symptom; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java index 360409fb..bdbeb45a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java @@ -4,20 +4,19 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 疾病辅助检查 * @TableName vp_disease_ancillary */ @TableName(value ="vp_disease_ancillary") @Data -@ApiModel +@Schema public class DiseaseAncillary implements Serializable { /** * 主键 @@ -28,35 +27,35 @@ public class DiseaseAncillary implements Serializable { /** * 病历ID */ - @ApiModelProperty("疾病id") + @Schema(name = "疾病id") private String diseaseId; /** * 工具ID */ - @ApiModelProperty("工具ID") + @Schema(name = "工具ID") private String itemId; - @ApiModelProperty("初步诊断依据(0否1是)") + @Schema(name = "初步诊断依据(0否1是)") private Integer primarilyDiagnosisCriteriaFlag; - @ApiModelProperty("是否是证实诊断依据(0否1是)") + @Schema(name = "是否是证实诊断依据(0否1是)") private Integer basisConfirmFlag; - @ApiModelProperty("是否是鉴别依据(0否1是)") + @Schema(name = "是否是鉴别依据(0否1是)") private Integer basisIdentificationFlag; - @ApiModelProperty("全面检查 0否1是") + @Schema(name = "全面检查 0否1是") private Integer fullCheckFlag; - @ApiModelProperty("是否诊断判读 0否1是") + @Schema(name = "是否诊断判读 0否1是") private Integer diagnosisAssessmentFlag; - @ApiModelProperty("预期诊断结果 0正常 1 不正常") + @Schema(name = "预期诊断结果 0正常 1 不正常") private Integer expectedDiagnosisResult; - @ApiModelProperty("是否必查(0否1是)") + @Schema(name = "是否必查(0否1是)") private Integer requireCheckFlag; /** @@ -64,7 +63,7 @@ public class DiseaseAncillary implements Serializable { * 当预期结果为正常：结果值为正常结果； * 当预期结果为不正常：结果值为不正常结果； */ - @ApiModelProperty("结果") + @Schema(name = "结果") private String result; /** @@ -72,13 +71,13 @@ public class DiseaseAncillary implements Serializable { * 只有当预期结果为异常时，才会有值 */ - @ApiModelProperty("正常结果") + @Schema(name = "正常结果") private String normalResult; /** * 说明 */ - @ApiModelProperty("说明") + @Schema(name = "说明") private String description; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java index 51d9e38a..5bd66301 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -17,7 +16,7 @@ import java.time.LocalDateTime; */ @TableName(value ="vp_disease_physical") @Data -@ApiModel +@Schema public class DiseasePhysical implements Serializable { /** * 主键 @@ -28,37 +27,37 @@ public class DiseasePhysical implements Serializable { /** * 病历ID */ - @ApiModelProperty("疾病id") + @Schema(name = "疾病id") private String diseaseId; /** * 工具ID */ - @ApiModelProperty("工具ID") + @Schema(name = "工具ID") private String toolId; /** * 检查部位ID */ - @ApiModelProperty("检查部位ID") + @Schema(name = "检查部位ID") private String locationId; - @ApiModelProperty("初步诊断依据(0否1是)") + @Schema(name = "初步诊断依据(0否1是)") private Integer primarilyDiagnosisCriteriaFlag; - @ApiModelProperty("是否是证实诊断依据(0否1是)") + @Schema(name = "是否是证实诊断依据(0否1是)") private Integer basisConfirmFlag; - @ApiModelProperty("是否是鉴别依据(0否1是)") + @Schema(name = "是否是鉴别依据(0否1是)") private Integer basisIdentificationFlag; - @ApiModelProperty("全面检查 0正常 1 不正常") + @Schema(name = "全面检查 0正常 1 不正常") private Integer fullCheckFlag; - @ApiModelProperty("是否必查 (0否1是)") + @Schema(name = "是否必查 (0否1是)") private Integer requireCheckFlag; - @ApiModelProperty("是否诊断判读 0否1是") + @Schema(name = "是否诊断判读 0否1是") private Integer diagnosisAssessmentFlag; /** @@ -66,25 +65,25 @@ public class DiseasePhysical implements Serializable { * 现在有了result，normalResult就不用区分结果是否正确了 */ @Deprecated - @ApiModelProperty("是否预期诊断结果 0正常 1 不正常") + @Schema(name = "是否预期诊断结果 0正常 1 不正常") private Integer expectedDiagnosisResult; - @ApiModelProperty("部位诊断结果 0正常 1 不正常") + @Schema(name = "部位诊断结果 0正常 1 不正常") private Integer locationDiagnosisFlag; /** * 结果(异常结果) */ - @ApiModelProperty("结果") + @Schema(name = "结果") private String result; - @ApiModelProperty("正常结果") + @Schema(name = "正常结果") private String normalResult; /** * 表征 */ - @ApiModelProperty("表征 默认诊断结果") + @Schema(name = "表征 默认诊断结果") private String trait; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java index 09ce106b..d7f6758e 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java @@ -3,12 +3,10 @@ package com.supervision.model; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; /** * 疾病问题关联表 diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java index 61908849..06fc2e5c 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java @@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; /** * 疾病处置计划关联表 diff --git a/virtual-patient-model/src/main/java/com/supervision/model/MaterialLibrary.java b/virtual-patient-model/src/main/java/com/supervision/model/MaterialLibrary.java index 5bc28d35..b81f3502 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/MaterialLibrary.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/MaterialLibrary.java @@ -3,12 +3,12 @@ package com.supervision.model; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 素材库表 * @TableName vp_material_library @@ -24,50 +24,46 @@ public class MaterialLibrary implements Serializable { /** * 文件资源id 对应vp_file_resource的主键 */ - @ApiModelProperty("文件资源id") + @Schema(name = "文件资源id") private String fileResourceId; /** * 素材名称;不采用vp_file_resource中的file_name字段 */ - @ApiModelProperty("素材名称 必填") + @Schema(name = "素材名称 必填") private String materialName; - @ApiModelProperty("素材类型 0:图片 1:视频 2:音频 必填") + @Schema(name = "素材类型 0:图片 1:视频 2:音频 必填") private Integer materialType; - @ApiModelProperty("目录id") + @Schema(name = "目录id") private String directoryId; - @ApiModelProperty("素材描述") + @Schema(name = "素材描述") private String materialDesc; /** * 创建人ID */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(hidden = true) private String createUserId; /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(hidden = true) private LocalDateTime createTime; /** * 更新人 */ @TableField(fill = FieldFill.INSERT_UPDATE) - @ApiModelProperty(hidden = true) private String updateUserId; /** * 更新时间 */ @TableField(fill = FieldFill.INSERT_UPDATE) - @ApiModelProperty(hidden = true) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java b/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java index 1b44129c..34fd12a6 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java @@ -4,14 +4,12 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; - -import com.baomidou.mybatisplus.extension.activerecord.Model; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; /** * 病历表 @@ -118,16 +116,16 @@ public class MedicalRec extends Model implements Serializable { */ private String symptoms; - @ApiModelProperty("初步诊断依据") + @Schema(name = "初步诊断依据") private String primarilyDiagnosisCriteria; - @ApiModelProperty("证实诊断依据") + @Schema(name = "证实诊断依据") private String confirmDiagnosisCriteria; - @ApiModelProperty("鉴别诊断依据") + @Schema(name = "鉴别诊断依据") private String differentialDiagnosisCriteria; - @ApiModelProperty("全面检查") + @Schema(name = "全面检查") private String fullCheck; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Patient.java b/virtual-patient-model/src/main/java/com/supervision/model/Patient.java index 2effabf2..e090d676 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Patient.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Patient.java @@ -6,16 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.supervision.handler.StringListTypeHandler; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.List; /** * 病人表 @@ -25,7 +22,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @TableName(value = "vp_patient") @Data -@ApiModel +@Schema @JsonIgnoreProperties(ignoreUnknown = true) public class Patient extends Model implements Serializable { /** @@ -37,49 +34,49 @@ public class Patient extends Model implements Serializable { /** * 病人名称 */ - @ApiModelProperty("病人名称") + @Schema(name = "病人名称") private String name; /** * 性别 */ - @ApiModelProperty("性别") + @Schema(name = "性别") private String gender; /** * 病人年龄 */ - @ApiModelProperty("病人年龄") + @Schema(name = "病人年龄") private Integer age; /** * 症状 */ - @ApiModelProperty("症状") + @Schema(name = "症状") private String symptoms; /** * 身高 */ - @ApiModelProperty("身高") + @Schema(name = "身高") private BigDecimal height; /** * 体重 */ - @ApiModelProperty("体重") + @Schema(name = "体重") private BigDecimal weight; - @ApiModelProperty("婚姻") + @Schema(name = "婚姻") private String marriage; - @ApiModelProperty("职业") + @Schema(name = "职业") private String profession; - @ApiModelProperty("地址") + @Schema(name = "地址") private String address; - @ApiModelProperty("资源id") + @Schema(name = "资源id") private String resourceId; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Process.java b/virtual-patient-model/src/main/java/com/supervision/model/Process.java index f72856bf..a6565226 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Process.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Process.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -17,7 +16,7 @@ import java.time.LocalDateTime; */ @TableName(value ="vp_process") @Data -@ApiModel +@Schema public class Process implements Serializable { /** * 主键 @@ -28,25 +27,25 @@ public class Process implements Serializable { /** * 病人ID */ - @ApiModelProperty("病人ID") + @Schema(name = "病人ID") private String patientId; - @ApiModelProperty("病历ID") + @Schema(name = "病历ID") private String medicalRecId; - @ApiModelProperty("疾病ID") + @Schema(name = "疾病ID") private String diseaseId; - @ApiModelProperty("问诊编号") + @Schema(name = "问诊编号") private String processNo; /** * 用户ID */ - @ApiModelProperty("用户ID") + @Schema(name = "用户ID") private String userId; - @ApiModelProperty("图谱关联的ID") + @Schema(name = "图谱关联的ID") private String graphId; /** @@ -55,16 +54,16 @@ public class Process implements Serializable { * 问诊结束：处置结束，系统自动评估，就是系统已评估 * 教师已评估:后台系统教师评估 */ - @ApiModelProperty("任务状态 0:待问诊 1:待处置 2:问诊结束(系统已评估) 3 已评估(教师已评估)") + @Schema(name = "任务状态 0:待问诊 1:待处置 2:问诊结束(系统已评估) 3 已评估(教师已评估)") private Integer status; - @ApiModelProperty("实例类型 0：学习实例 1:考核实例") + @Schema(name = "实例类型 0：学习实例 1:考核实例") private Integer processType; - @ApiModelProperty("结束问诊时间") + @Schema(name = "结束问诊时间") private LocalDateTime finishAskTime; - @ApiModelProperty("删除标识 0:未删除 1:删除") + @Schema(name = "删除标识 0:未删除 1:删除") private Integer deleteFlag; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java b/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java index 4e315e61..86b2e9e6 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java @@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -17,7 +16,7 @@ import java.time.LocalDateTime; */ @TableName(value ="vp_process_evaluation") @Data -@ApiModel +@Schema public class ProcessEvaluation implements Serializable { /** * 主键 @@ -28,49 +27,49 @@ public class ProcessEvaluation implements Serializable { /** * 流程id */ - @ApiModelProperty("流程id") + @Schema(name = "流程id") private String processId; /** * 评分概述 */ - @ApiModelProperty("评分概述") + @Schema(name = "评分概述") private String overview; /** * 预期诊断评估 */ - @ApiModelProperty("预期诊断评估") + @Schema(name = "预期诊断评估") private String expectDiagnosis; /** * 初步诊断评估 */ - @ApiModelProperty("初步诊断评估") + @Schema(name = "初步诊断评估") private String primarilyDiagnosis; /** * 证实诊断评估 */ - @ApiModelProperty("证实诊断评估") + @Schema(name = "证实诊断评估") private String confirmDiagnosis; /** * 鉴别依据评估 */ - @ApiModelProperty("鉴别依据评估") + @Schema(name = "鉴别依据评估") private String differentialDiagnosis; /** * 全面检查评估 */ - @ApiModelProperty("全面检查评估") + @Schema(name = "全面检查评估") private String fullCheck; /** * 处置方案评估 */ - @ApiModelProperty("处置方案评估") + @Schema(name = "处置方案评估") private String treatmentPlan; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/RasaModelInfo.java b/virtual-patient-model/src/main/java/com/supervision/model/RasaModelInfo.java index e61dda7d..e63125cf 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/RasaModelInfo.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/RasaModelInfo.java @@ -5,8 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.supervision.handler.StringListTypeHandler; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -19,7 +18,7 @@ import java.util.List; */ @TableName(value ="vp_rasa_model_info" ,autoResultMap = true) @Data -@ApiModel +@Schema public class RasaModelInfo implements Serializable { /** @@ -31,49 +30,49 @@ public class RasaModelInfo implements Serializable { /** * 模型ID 与vp_disease的主键进行关联 */ - @ApiModelProperty("模型ID") + @Schema(name = "模型ID") private String modelId; /** * 中文注释 */ - @ApiModelProperty("中文注释") + @Schema(name = "中文注释") private String description; /** * 模型对应的端口号 */ - @ApiModelProperty("模型对应的端口号") + @Schema(name = "模型对应的端口号") private Integer port; /** * 训练状态 0:训练失败 1:训练成功 */ - @ApiModelProperty("训练状态") + @Schema(name = "训练状态") private Integer tranStatus; /** * 启动状态 -1:未启动 0:启动失败 1:启动成功 */ - @ApiModelProperty("启动状态") + @Schema(name = "启动状态") private Integer serverStatus; - @ApiModelProperty("执行train shell命令") + @Schema(name = "执行train shell命令") @TableField(typeHandler = StringListTypeHandler.class) private List trainCmd; - @ApiModelProperty("执行run shell命令") + @Schema(name = "执行run shell命令") @TableField(typeHandler = StringListTypeHandler.class) private List runCmd; - @ApiModelProperty("训练日志") + @Schema(name = "训练日志") private String trainLog; - @ApiModelProperty("运行日志") + @Schema(name = "运行日志") private String runLog; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/User.java b/virtual-patient-model/src/main/java/com/supervision/model/User.java index 82252172..9c4259a3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/User.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/User.java @@ -1,21 +1,22 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * 用户表 * @TableName vp_user */ @TableName(value ="vp_user") @Data -@ApiModel +@Schema public class User implements Serializable { /** * 主键 @@ -26,31 +27,31 @@ public class User implements Serializable { /** * 用户账户 */ - @ApiModelProperty("用户账户") + @Schema(name = "用户账户") private String account; /** * 用户名称 */ - @ApiModelProperty("用户名称") + @Schema(name = "用户名称") private String name; /** * 用户密码 */ - @ApiModelProperty("用户密码") + @Schema(name = "用户密码") private String password; /** * 用户角色编码，0管理员 1普通用户 */ - @ApiModelProperty("用户角色编码，0管理员 1普通用户 2运营人员") + @Schema(name = "用户角色编码，0管理员 1普通用户 2运营人员") private String roleCode; - @ApiModelProperty("账号状态 0正常 1停用") + @Schema(name = "账号状态 0正常 1停用") private Integer status; - @ApiModelProperty("最近登录时间") + @Schema(name = "最近登录时间") private LocalDateTime recentLoginTime; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/AncillaryItemReqVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/AncillaryItemReqVo.java index df17a6ed..c79a919d 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/AncillaryItemReqVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/AncillaryItemReqVo.java @@ -1,18 +1,19 @@ package com.supervision.vo.ask; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class AncillaryItemReqVo { - @ApiModelProperty("流程id") + @Schema(name = "流程id") private String processId; - @ApiModelProperty("疾病id") + @Schema(name = "疾病id") private String diseaseId; - @ApiModelProperty("搜索关键字") + @Schema(name = "搜索关键字") private String keyWord; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskAncillaryHistoryResVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskAncillaryHistoryResVO.java index 4fc4a8b9..551a49de 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskAncillaryHistoryResVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskAncillaryHistoryResVO.java @@ -1,49 +1,45 @@ package com.supervision.vo.ask; -import com.fasterxml.jackson.annotation.JsonFilter; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.supervision.model.DiagnosisPrimary; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; import java.util.List; @Data -@ApiModel +@Schema public class AskAncillaryHistoryResVO { - @ApiModelProperty("辅助检查记录ID") + @Schema(name = "辅助检查记录ID") private String id; - @ApiModelProperty("类目") + @Schema(name = "类目") private String type; - @ApiModelProperty("辅助检查项名称") + @Schema(name = "辅助检查项名称") private String itemName; - @ApiModelProperty("辅助检查项ID") + @Schema(name = "辅助检查项ID") private String itemId; - @ApiModelProperty("辅助检查项结果") + @Schema(name = "辅助检查项结果") private String result; - @ApiModelProperty("位置名称") + @Schema(name = "位置名称") private String locationName; - @ApiModelProperty("关联的初步诊断ID") + @Schema(name = "关联的初步诊断ID") private String primaryId; - @ApiModelProperty("是否诊断判读 0不需要 1需要") + @Schema(name = "是否诊断判读 0不需要 1需要") private Integer diagnosisAssessmentFlag; - @ApiModelProperty("诊断判读结果") + @Schema(name = "诊断判读结果") private String assessmentResult; - @ApiModelProperty("关联的初步诊断") + @Schema(name = "关联的初步诊断") private List primaryList; - @ApiModelProperty("检查时间") + @Schema(name = "检查时间") private LocalDateTime createTime; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskPhysicalHistoryResVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskPhysicalHistoryResVO.java index 81ded927..35e97b63 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskPhysicalHistoryResVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/AskPhysicalHistoryResVO.java @@ -1,39 +1,39 @@ package com.supervision.vo.ask; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; @Data -@ApiModel +@Schema public class AskPhysicalHistoryResVO { - @ApiModelProperty("体格检查记录ID") + @Schema(name = "体格检查记录ID") private String id; - @ApiModelProperty("体格检查工具名称") + @Schema(name = "体格检查工具名称") private String toolName; - @ApiModelProperty("类目") + @Schema(name = "类目") private String type; - @ApiModelProperty("体格检查工具ID") + @Schema(name = "体格检查工具ID") private String toolId; - @ApiModelProperty("体格检查位置ID") + @Schema(name = "体格检查位置ID") private String locationId; - @ApiModelProperty("体格检查位置名称") + @Schema(name = "体格检查位置名称") private String locationName; - @ApiModelProperty("体格检查结果") + @Schema(name = "体格检查结果") private String result; - @ApiModelProperty("关联的初步诊断的疾病名称") + @Schema(name = "关联的初步诊断的疾病名称") private String diseaseName; - @ApiModelProperty("检查时间") + @Schema(name = "检查时间") private LocalDateTime createTime; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java index 2c6f7e34..711ec2b5 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java @@ -1,7 +1,7 @@ package com.supervision.vo.ask; import com.supervision.vo.result.ConfigAncillaryItemVo; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -17,13 +17,13 @@ public class ConfigAncillaryItemResVO { private String itemName; - @ApiModelProperty("标识 true:已选择 false:未选择") + @Schema(name = "标识 true:已选择 false:未选择") private boolean flag; private int priority; private List itemList; - @ApiModelProperty("检查项id路径") + @Schema(name = "检查项id路径") private List itemIdPath; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisAncillaryRecordVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisAncillaryRecordVo.java index 37a3877e..ad344275 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisAncillaryRecordVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisAncillaryRecordVo.java @@ -1,7 +1,7 @@ package com.supervision.vo.ask; import com.supervision.model.DiagnosisAncillaryRecord; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,6 +10,6 @@ import lombok.EqualsAndHashCode; public class DiagnosisAncillaryRecordVo extends DiagnosisAncillaryRecord { - @ApiModelProperty("辅助检查项中文名") + @Schema(name = "辅助检查项中文名") private String ancillaryName; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPhysicalRecordVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPhysicalRecordVo.java index b2ad7a02..4659c629 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPhysicalRecordVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPhysicalRecordVo.java @@ -1,7 +1,7 @@ package com.supervision.vo.ask; import com.supervision.model.DiagnosisPhysicalRecord; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,11 +10,11 @@ import lombok.EqualsAndHashCode; public class DiagnosisPhysicalRecordVo extends DiagnosisPhysicalRecord { - @ApiModelProperty("体格检查工具名") + @Schema(name = "体格检查工具名") private String toolName; - @ApiModelProperty("体格检查部位名") + @Schema(name = "体格检查部位名") private String locationName; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPrimaryVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPrimaryVO.java index c54b579e..33bac14c 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPrimaryVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosisPrimaryVO.java @@ -1,7 +1,7 @@ package com.supervision.vo.ask; import com.supervision.model.DiagnosisPrimary; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,13 +13,13 @@ public class DiagnosisPrimaryVO extends DiagnosisPrimary { private String primaryDiseaseName; - @ApiModelProperty("问诊选中的ID列表") + @Schema(name = "问诊选中的ID列表") private List askIdList; - @ApiModelProperty("辅助检查选中的ID列表") + @Schema(name = "辅助检查选中的ID列表") private List ancillaryIdList; - @ApiModelProperty("体格检查选中的ID列表") + @Schema(name = "体格检查选中的ID列表") private List physicalIdList; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosticBasisForPrimaryResVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosticBasisForPrimaryResVO.java index b5767563..6184681b 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosticBasisForPrimaryResVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/DiagnosticBasisForPrimaryResVO.java @@ -1,40 +1,39 @@ package com.supervision.vo.ask; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; -import java.util.Set; @Data public class DiagnosticBasisForPrimaryResVO { - @ApiModelProperty("本项ID") + @Schema(name = "本项ID") private String id; - @ApiModelProperty("阶段,1问诊 2体格检查 3辅助检查") + @Schema(name = "阶段,1问诊 2体格检查 3辅助检查") private Integer type; - @ApiModelProperty("身体部位") + @Schema(name = "身体部位") private String locationName; - @ApiModelProperty("检查类目") + @Schema(name = "检查类目") private String category; - @ApiModelProperty("问诊项目") + @Schema(name = "问诊项目") private String item; - @ApiModelProperty("初步诊断名称") + @Schema(name = "初步诊断名称") private String primaryName; - @ApiModelProperty("初步诊断ID列表") + @Schema(name = "初步诊断ID列表") private List primaryIdList; - @ApiModelProperty("是否是证实诊断依据(0否1是)") + @Schema(name = "是否是证实诊断依据(0否1是)") private Integer basisConfirmFlag; - @ApiModelProperty("是否是鉴别依据(0否1是)") + @Schema(name = "是否是鉴别依据(0否1是)") private Integer basisIdentificationFlag; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java index e149279c..2b396d4e 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ModifyPrimaryDiseaseInfoReqVO.java @@ -1,6 +1,7 @@ package com.supervision.vo.ask; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -14,12 +15,12 @@ public class ModifyPrimaryDiseaseInfoReqVO { private String patientDiseaseInfo; - @ApiModelProperty("问诊ID列表") + @Schema(name = "问诊ID列表") private List askIdList; - @ApiModelProperty("辅助检查ID列表") + @Schema(name = "辅助检查ID列表") private List ancillaryIdList; - @ApiModelProperty("体格检查ID列表") + @Schema(name = "体格检查ID列表") private List physicalIdList; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalViewDetailResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalViewDetailResVo.java index de2944fd..5c9abb1d 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalViewDetailResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ProcessMedicalViewDetailResVo.java @@ -1,6 +1,7 @@ package com.supervision.vo.ask; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,21 +10,21 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) -public class ProcessMedicalViewDetailResVo extends ProcessMedicalResVo{ +public class ProcessMedicalViewDetailResVo extends ProcessMedicalResVo { - @ApiModelProperty("初步诊断疾病名") + @Schema(name = "初步诊断疾病名") private List primaryDiseaseNameList; - @ApiModelProperty("体格检查名列表") + @Schema(name = "体格检查名列表") private List physicalDiagnosisNameList; - @ApiModelProperty("辅助检查名列表") + @Schema(name = "辅助检查名列表") private List ancillaryDiagnosisNameList; - @ApiModelProperty("用户名") + @Schema(name = "用户名") private String userName; - @ApiModelProperty("结束问诊日期") + @Schema(name = "结束问诊日期") private LocalDateTime finishDiagnosisTime; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/TreatmentPlanRecordVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/TreatmentPlanRecordVo.java index 83f99ed9..6e29aad1 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/TreatmentPlanRecordVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/TreatmentPlanRecordVo.java @@ -1,16 +1,16 @@ package com.supervision.vo.ask; import com.supervision.model.TreatmentPlanRecord; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) public class TreatmentPlanRecordVo extends TreatmentPlanRecord { - @ApiModelProperty("结果标识 0:错误 1:正确") + @Schema(name = "结果标识 0:错误 1:正确") private Integer flag; - @ApiModelProperty("处置计划名") + @Schema(name = "处置计划名") private String disposalPlanName; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryReqVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryReqVo.java index 4d5b69b1..edda7684 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryReqVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryReqVo.java @@ -1,15 +1,16 @@ package com.supervision.vo.manage; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class AskQuestionLibraryReqVo { - @ApiModelProperty("编码") + @Schema(name = "编码") private String code; - @ApiModelProperty("疾病id") + @Schema(name = "疾病id") private String diseaseId; /** @@ -17,16 +18,16 @@ public class AskQuestionLibraryReqVo { * 主要用于rasa语料识别，不直接被用户使用 */ @Deprecated - @ApiModelProperty(name = "问题",hidden = true) + @Schema(name = "问题", hidden = true) private String question; - @ApiModelProperty("问题") + @Schema(name = "问题") private String description; - @ApiModelProperty("问题类目字典id") + @Schema(name = "问题类目字典id") private String dictId; - @ApiModelProperty("默认回答资源id") + @Schema(name = "默认回答资源id") private String defaultAnswerResourceId; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java index 078777be..283a881f 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/AskQuestionLibraryResVo.java @@ -1,7 +1,7 @@ package com.supervision.vo.manage; import cn.hutool.core.util.StrUtil; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.ArrayList; @@ -10,34 +10,34 @@ import java.util.List; @Data public class AskQuestionLibraryResVo { - @ApiModelProperty("主键") + @Schema(name = "主键") private String id; - @ApiModelProperty("问题库ID") + @Schema(name = "问题库ID") private String libraryQuestionId; - @ApiModelProperty("编码") + @Schema(name = "编码") private String code; - @ApiModelProperty("问题类目id") + @Schema(name = "问题类目id") private String dictId; - @ApiModelProperty(value = "问题类目父级id") + @Schema(name = "问题类目父级id") private String parentDictId; - @ApiModelProperty("由用户传入的问题生成的问题列表") + @Schema(name = "由用户传入的问题生成的问题列表") private List question; - @ApiModelProperty("用户设置的问题") + @Schema(name = "用户设置的问题") private String description; - @ApiModelProperty("默认回答") + @Schema(name = "默认回答") private String defaultAnswer; - @ApiModelProperty("问题类目名") + @Schema(name = "问题类目名") private String nameZhPath; - @ApiModelProperty("类目名") + @Schema(name = "类目名") private String nameZh; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/ConfigDrugResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/ConfigDrugResVo.java index 27f1ac55..444f51ca 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/ConfigDrugResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/ConfigDrugResVo.java @@ -1,7 +1,7 @@ package com.supervision.vo.manage; import com.supervision.model.ConfigDrug; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,6 +9,6 @@ import lombok.EqualsAndHashCode; @Data public class ConfigDrugResVo extends ConfigDrug { - @ApiModelProperty("剂型中文名") + @Schema(name = "剂型中文名") private String dosageFormDesc; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryReqVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryReqVo.java index 49b5ad37..a3b10c1a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryReqVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryReqVo.java @@ -1,7 +1,7 @@ package com.supervision.vo.manage; import com.supervision.model.DiseaseAncillary; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,7 +13,7 @@ import java.util.List; public class DiseaseAncillaryReqVo extends DiseaseAncillary { - @ApiModelProperty("诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据") + @Schema(name = "诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据") private List diagnosticCriteria; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java index 5fe28226..3b37b6f8 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java @@ -2,7 +2,7 @@ package com.supervision.vo.manage; import cn.hutool.crypto.digest.MD5; import com.supervision.model.DiseaseAncillary; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,16 +13,16 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class DiseaseAncillaryResVo extends DiseaseAncillary { - @ApiModelProperty("项目名称") + @Schema(name = "项目名称") private String itemName; - @ApiModelProperty("项目类型") + @Schema(name = "项目类型") private String itemType; - @ApiModelProperty("项目id路径") + @Schema(name = "项目id路径") private List itemIdPath; - @ApiModelProperty("诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据") + @Schema(name = "诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据") private List diagnosticCriteria; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalLocationNodeVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalLocationNodeVo.java index 67b3fa9a..76629ab5 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalLocationNodeVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalLocationNodeVo.java @@ -1,7 +1,6 @@ package com.supervision.vo.manage; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -17,32 +16,32 @@ public class DiseasePhysicalLocationNodeVo { /** * 编码 */ - @ApiModelProperty("编码") + @Schema(name = "编码") private String code; /** * 位置分类 */ - @ApiModelProperty("位置分类") + @Schema(name = "位置分类") private String locationClass; /** * 位置名称 */ - @ApiModelProperty("位置名称") + @Schema(name = "位置名称") private String locationName; - @ApiModelProperty("部位层级") + @Schema(name = "部位层级") private String level; - @ApiModelProperty("父级Id") + @Schema(name = "父级Id") private String parentId; - @ApiModelProperty("标识 true:已选择 false:未选择") + @Schema(name = "标识 true:已选择 false:未选择") private boolean flag; - @ApiModelProperty("检查结果默认值") + @Schema(name = "检查结果默认值") private String indicatorValue; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalReqVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalReqVo.java index 64c250e0..abf0e0d6 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalReqVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalReqVo.java @@ -1,8 +1,7 @@ package com.supervision.vo.manage; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.supervision.model.DiseasePhysical; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,7 +13,7 @@ import java.util.List; public class DiseasePhysicalReqVo extends DiseasePhysical { - @ApiModelProperty("诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据") + @Schema(name = "诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据") private List diagnosticCriteria; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalResVo.java index 9aa2cc4c..837d30cc 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalResVo.java @@ -3,7 +3,7 @@ package com.supervision.vo.manage; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.MD5; import com.supervision.model.DiseasePhysical; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,25 +14,25 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class DiseasePhysicalResVo extends DiseasePhysical { - @ApiModelProperty("工具名称") + @Schema(name = "工具名称") private String toolName; - @ApiModelProperty("工具类型") + @Schema(name = "工具类型") private String toolType; - @ApiModelProperty("工具父级id") + @Schema(name = "工具父级id") private String toolParentId; - @ApiModelProperty("身体部位名称") + @Schema(name = "身体部位名称") private String locationName; - @ApiModelProperty("工具id路径") + @Schema(name = "工具id路径") private List toolIdPath; - @ApiModelProperty("身体部位id路径") + @Schema(name = "身体部位id路径") private List locationIdPath; - @ApiModelProperty("诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据") + @Schema(name = "诊断依据 0：初步诊断依据 1：证实诊断依据 2：鉴别诊断依据 3：全面诊断依据") private List diagnosticCriteria; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java index a79f54da..f32cb69e 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java @@ -1,7 +1,7 @@ package com.supervision.vo.manage; import com.supervision.model.DiseaseQuestion; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,16 +12,16 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class DiseaseQuestionResVo extends DiseaseQuestion { - @ApiModelProperty("类目编码") + @Schema(name = "类目编码") private String itemCode; - @ApiModelProperty("类目名称") + @Schema(name = "类目名称") private String itemName; - @ApiModelProperty("问题列表") + @Schema(name = "问题列表") private List questionList; - @ApiModelProperty("回答内容") + @Schema(name = "回答内容") private String answer; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseReqVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseReqVo.java index 01fe7cdc..26a98264 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseReqVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseReqVo.java @@ -1,26 +1,26 @@ package com.supervision.vo.manage; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel +@Schema public class DiseaseReqVo { - @ApiModelProperty("类目名称") + @Schema(name = "类目名称") private String code; - @ApiModelProperty("分类名称") + @Schema(name = "分类名称") private String diseaseName; - @ApiModelProperty("症状") + @Schema(name = "症状") private String symptom; - @ApiModelProperty("疾病类型 0单一疾病 1 复合疾病,默认值为0") + @Schema(name = "疾病类型 0单一疾病 1 复合疾病,默认值为0") private Integer diseaseType; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanReqVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanReqVo.java index 117b5003..92b8b65b 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanReqVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanReqVo.java @@ -1,7 +1,7 @@ package com.supervision.vo.manage; import com.supervision.model.DiseaseTreatmentPlan; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,12 +11,12 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class DiseaseTreatmentPlanReqVo extends DiseaseTreatmentPlan { - @ApiModelProperty("药物列表") + @Schema(name = "药物列表") private List drugIds; - @ApiModelProperty("一级措施id") + @Schema(name = "一级措施id") private String firstMeasuresId; - @ApiModelProperty("处置方式 处置方式(0门诊 1住院)") + @Schema(name = "处置方式 处置方式(0门诊 1住院)") private String disposalMethod; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanResVo.java index 6e7cb79f..5ce2bca3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanResVo.java @@ -1,7 +1,7 @@ package com.supervision.vo.manage; import com.supervision.model.ConfigTreatmentPlan; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,20 +12,20 @@ import java.util.List; public class DiseaseTreatmentPlanResVo extends ConfigTreatmentPlan { - @ApiModelProperty("主键") + @Schema(name = "主键") private String id; - @ApiModelProperty("疾病id") + @Schema(name = "疾病id") private String diseaseId; // @Deprecated -// @ApiModelProperty("计划id") +// @Schema(name = "计划id") // private String planId; - @ApiModelProperty("计划id 用来代替planId") + @Schema(name = "计划id 用来代替planId") private String treatmentPlanId; - @ApiModelProperty("药物列表") + @Schema(name = "药物列表") private List drugIds; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanTreeNode.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanTreeNode.java index 578cc6c3..5635a6b4 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanTreeNode.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseTreatmentPlanTreeNode.java @@ -3,9 +3,8 @@ package com.supervision.vo.manage; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import lombok.EqualsAndHashCode; import java.util.ArrayList; import java.util.List; @@ -13,16 +12,16 @@ import java.util.List; @Data public class DiseaseTreatmentPlanTreeNode { - @ApiModelProperty("处置计划id") + @Schema(name = "处置计划id") private String id; - @ApiModelProperty("节点名称") + @Schema(name = "节点名称") private String name; - @ApiModelProperty("标识 true:已选择 false:未选择") + @Schema(name = "标识 true:已选择 false:未选择") private boolean flag; - @ApiModelProperty("子节点") + @Schema(name = "子节点") private List child; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/MaterialLibraryResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/MaterialLibraryResVo.java index 07d5ae0b..5c1fe9a8 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/MaterialLibraryResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/MaterialLibraryResVo.java @@ -1,7 +1,7 @@ package com.supervision.vo.manage; import com.supervision.model.MaterialLibrary; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,6 +9,6 @@ import lombok.EqualsAndHashCode; @Data public class MaterialLibraryResVo extends MaterialLibrary { - @ApiModelProperty("目录名称") + @Schema(name = "目录名称") private String directoryName; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/PhysicalLocationNode.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/PhysicalLocationNode.java index 16b7321c..2b4fc916 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/PhysicalLocationNode.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/PhysicalLocationNode.java @@ -1,7 +1,7 @@ package com.supervision.vo.manage; import com.supervision.model.ConfigPhysicalLocation; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,7 +13,7 @@ public class PhysicalLocationNode extends ConfigPhysicalLocation{ private List child; - @ApiModelProperty("是否被选中,1已被选中") + @Schema(name = "是否被选中,1已被选中") private Integer choose = 0; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanTreeNode.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanTreeNode.java index 0599b99b..8797625d 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanTreeNode.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanTreeNode.java @@ -3,7 +3,7 @@ package com.supervision.vo.manage; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.ArrayList; @@ -12,13 +12,13 @@ import java.util.List; @Data public class TreatmentPlanTreeNode { - @ApiModelProperty("处置计划id") + @Schema(name = "处置计划id") private String id; - @ApiModelProperty("节点名称") + @Schema(name = "节点名称") private String name; - @ApiModelProperty("子节点") + @Schema(name = "子节点") private List child; diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/rasa/RasaTalkVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/rasa/RasaTalkVo.java index 08a4f6c8..4edfb10b 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/rasa/RasaTalkVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/rasa/RasaTalkVo.java @@ -1,6 +1,7 @@ package com.supervision.vo.rasa; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data @@ -18,7 +19,7 @@ public class RasaTalkVo { /** * 模型id */ - @ApiModelProperty(hidden = true) + @Schema(name = "模型ID") private String modelId = "1"; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/result/ConfigAncillaryItemVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/result/ConfigAncillaryItemVo.java index 35876bfa..76db5720 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/result/ConfigAncillaryItemVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/result/ConfigAncillaryItemVo.java @@ -1,7 +1,7 @@ package com.supervision.vo.result; import com.supervision.model.ConfigAncillaryItem; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,13 +11,13 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class ConfigAncillaryItemVo extends ConfigAncillaryItem { - @ApiModelProperty("执行状态; 0: 未检查 1: 已检查") + @Schema(name = "执行状态; 0: 未检查 1: 已检查") private Integer execStatus; - @ApiModelProperty("标识 true:已选择 false:未选择") + @Schema(name = "标识 true:已选择 false:未选择") private boolean flag; - @ApiModelProperty("检查项id路径") + @Schema(name = "检查项id路径") private List itemIdPath; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessReqVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessReqVo.java index 2b3afb43..7c981031 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessReqVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessReqVo.java @@ -1,17 +1,18 @@ package com.supervision.vo.result; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class DiagnoseProcessReqVo { - @ApiModelProperty("用户id") + @Schema(name = "用户id") private String userId; - @ApiModelProperty("主诉") + @Schema(name = "主诉") private String patientSelfDesc; - @ApiModelProperty("删除标识 0:未删除 1:删除") + @Schema(name = "删除标识 0:未删除 1:删除") private Integer deleteFlag; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessResVo.java index 1294c778..69c11264 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessResVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessResVo.java @@ -1,6 +1,7 @@ package com.supervision.vo.result; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; @@ -9,47 +10,47 @@ import java.util.List; @Data public class DiagnoseProcessResVo { - @ApiModelProperty("流程实例id") + @Schema(name = "流程实例id") private String processId; - @ApiModelProperty("用户id") + @Schema(name = "用户id") private String userId; - @ApiModelProperty("任务状态 0:待问诊 1:待处置 2:已评估") + @Schema(name = "任务状态 0:待问诊 1:待处置 2:已评估") private String status; - @ApiModelProperty("最近问诊时间") + @Schema(name = "最近问诊时间") private LocalDateTime time; - @ApiModelProperty("病例编号") + @Schema(name = "病例编号") private String medicalRecId; - @ApiModelProperty("主诉") + @Schema(name = "主诉") private String patientSelfDesc; - @ApiModelProperty("患者头像") + @Schema(name = "患者头像") private String patientHeadPic; - @ApiModelProperty("患者静默视频") + @Schema(name = "患者静默视频") private String patientSilentVideo; - @ApiModelProperty("病人id") + @Schema(name = "病人id") private String patientId; - @ApiModelProperty("病人姓名") + @Schema(name = "病人姓名") private String name; - @ApiModelProperty("年龄") + @Schema(name = "年龄") private Integer age; - @ApiModelProperty("性别") + @Schema(name = "性别") private String gender; - @ApiModelProperty("资源id") + @Schema(name = "资源id") private String resourceId; - @ApiModelProperty("初步诊断疾病名") + @Schema(name = "初步诊断疾病名") private List primaryDiseaseNameList; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/result/ProcessRecordVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/result/ProcessRecordVO.java index 1afe2d2f..d1c4e5f2 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/result/ProcessRecordVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/result/ProcessRecordVO.java @@ -1,44 +1,39 @@ package com.supervision.vo.result; -import com.baomidou.mybatisplus.annotation.TableField; -import com.supervision.handler.StringListTypeHandler; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.util.List; - @Data -@ApiModel +@Schema public class ProcessRecordVO { - @ApiModelProperty("病历ID") + @Schema(name = "病历ID") private String medicalId; - @ApiModelProperty("问诊实例ID") + @Schema(name = "问诊实例ID") private String processId; - @ApiModelProperty("问诊编号") + @Schema(name = "问诊编号") private String processNo; - @ApiModelProperty("病历编号") + @Schema(name = "病历编号") private String medicalRecNo; - @ApiModelProperty("学生名称") + @Schema(name = "学生名称") private String studentName; - @ApiModelProperty("疾病名称") + @Schema(name = "疾病名称") private String diseaseNameAlias; private String diseaseId; - @ApiModelProperty("疾病分类") + @Schema(name = "疾病分类") private String diseaseType; - @ApiModelProperty("状态 3:已评估 其他未评估") + @Schema(name = "状态 3:已评估 其他未评估") private Integer status; - @ApiModelProperty("更新时间(问诊实例的时间)") + @Schema(name = "更新时间(问诊实例的时间)") private String updateTime; private String containDiseaseIdJsonStr; diff --git a/virtual-patient-rasa/pom.xml b/virtual-patient-rasa/pom.xml index e6f099fa..2da2da67 100644 --- a/virtual-patient-rasa/pom.xml +++ b/virtual-patient-rasa/pom.xml @@ -41,6 +41,11 @@ spring-cloud-starter-openfeign + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config @@ -75,10 +80,6 @@ test - - io.swagger - swagger-annotations - cn.hutool hutool-all diff --git a/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaCmdController.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaCmdController.java index fda52353..ab8cb261 100644 --- a/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaCmdController.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaCmdController.java @@ -1,19 +1,23 @@ package com.supervision.rasa.controller; import cn.hutool.core.util.StrUtil; +import com.supervision.exception.BusinessException; import com.supervision.rasa.constant.RasaConstant; import com.supervision.rasa.pojo.vo.RasaCmdArgumentVo; import com.supervision.rasa.service.RasaCmdService; -import com.supervision.exception.BusinessException; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import java.io.*; -import java.util.concurrent.*; +import java.io.IOException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeoutException; -@Api(tags = "rasa管理") +@Tag(name = "rasa管理") @RestController @RequestMapping("rasaCmd") @RequiredArgsConstructor @@ -21,7 +25,7 @@ public class RasaCmdController { private final RasaCmdService rasaCmdService; - @ApiOperation("执行训练shell命令") + @Operation(summary = "执行训练shell命令") @PostMapping("/trainExec") public String trainExec(@RequestBody RasaCmdArgumentVo argument) throws IOException, ExecutionException, InterruptedException, TimeoutException { @@ -29,7 +33,7 @@ public class RasaCmdController { } - @ApiOperation("执行启动shell命令") + @Operation(summary = "执行启动shell命令") @PostMapping("/runExec") public String runExec(@RequestBody RasaCmdArgumentVo argument) throws ExecutionException, InterruptedException, TimeoutException { @@ -41,7 +45,7 @@ public class RasaCmdController { } - @ApiOperation("部署rasa") + @Operation(summary = "部署rasa") @PostMapping("/deploy") public boolean deployRasa() throws Exception { return rasaCmdService.deployRasa(); diff --git a/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaFileController.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaFileController.java index d29c1dc6..441cef98 100644 --- a/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaFileController.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaFileController.java @@ -1,22 +1,20 @@ package com.supervision.rasa.controller; -import cn.hutool.core.util.StrUtil; import com.supervision.exception.BusinessException; import com.supervision.rasa.service.RasaFileService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -@Api(tags = "rasa文件保存") +@Tag(name = "rasa文件保存") @RestController @RequestMapping("rasaFile") @RequiredArgsConstructor @@ -24,7 +22,7 @@ public class RasaFileController { private final RasaFileService rasaFileService; - @ApiOperation("接受并保存rasa文件") + @Operation(summary = "接受并保存rasa文件") @PostMapping("/saveRasaFile") public String saveRasaFile(@RequestParam("file") MultipartFile file) throws IOException { diff --git a/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaTalkController.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaTalkController.java index 04331728..e8478360 100644 --- a/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaTalkController.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaTalkController.java @@ -1,9 +1,9 @@ package com.supervision.rasa.controller; -import com.supervision.vo.rasa.RasaTalkVo; import com.supervision.rasa.service.RasaTalkService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import com.supervision.vo.rasa.RasaTalkVo; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Api(tags = "ras对话服务") +@Tag(name = "ras对话服务") @RestController @RequestMapping("rasa") @RequiredArgsConstructor @@ -20,7 +20,7 @@ public class RasaTalkController { private final RasaTalkService rasaTalkService; - @ApiOperation("rasa对话") + @Operation(summary = "rasa对话") @PostMapping("talkRasa") public List talkRasa(@RequestBody RasaTalkVo rasaTalkVo){ diff --git a/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/Text2vecController.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/Text2vecController.java index 842c96c3..d9caba75 100644 --- a/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/Text2vecController.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/Text2vecController.java @@ -4,8 +4,8 @@ import com.supervision.rasa.pojo.dto.Text2vecDataVo; import com.supervision.rasa.pojo.dto.Text2vecMatchesReq; import com.supervision.rasa.pojo.dto.Text2vecMatchesRes; import com.supervision.rasa.service.Text2vecService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -14,21 +14,22 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Api(tags = "text2vec服务") +@Tag(name = "text2vec服务") @RestController @RequestMapping("/text2vec") @RequiredArgsConstructor public class Text2vecController { private final Text2vecService text2vecService; - @ApiOperation("更新数据库") + + @Operation(summary = "更新数据库") @PostMapping("updateDataset") public boolean talkRasa(@RequestBody List text2vecDataVoList){ return text2vecService.updateDataset(text2vecDataVoList); } - @ApiOperation("获取匹配项") + @Operation(summary = "获取匹配项") @PostMapping("matches") public List matches(@RequestBody Text2vecMatchesReq text2vecMatchesReq){ diff --git a/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecDataVo.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecDataVo.java index 6b50ba9a..6463e694 100644 --- a/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecDataVo.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecDataVo.java @@ -1,15 +1,16 @@ package com.supervision.rasa.pojo.dto; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class Text2vecDataVo { - @ApiModelProperty("数据id") + @Schema(name = "数据id") private String id; - @ApiModelProperty("问题") + @Schema(name = "问题") private String question; public Text2vecDataVo(String id, String question) { diff --git a/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecMatchesReq.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecMatchesReq.java index 8292e709..289dfee0 100644 --- a/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecMatchesReq.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecMatchesReq.java @@ -1,15 +1,16 @@ package com.supervision.rasa.pojo.dto; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class Text2vecMatchesReq { - @ApiModelProperty("需要被匹配的语句") + @Schema(name = "需要被匹配的语句") private String querySentence; - @ApiModelProperty("相似度阈值") + @Schema(name = "相似度阈值") private Double threshold; public Text2vecMatchesReq() { diff --git a/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecMatchesRes.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecMatchesRes.java index 76d423da..e62a4ee5 100644 --- a/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecMatchesRes.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/Text2vecMatchesRes.java @@ -1,17 +1,18 @@ package com.supervision.rasa.pojo.dto; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class Text2vecMatchesRes { - @ApiModelProperty("id") + @Schema(name = "id") private String id; - @ApiModelProperty("句子") + @Schema(name = "句子") private String sentence; - @ApiModelProperty("相似度") + @Schema(name = "相似度") private String similarity; } diff --git a/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/vo/RasaCmdArgumentVo.java b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/vo/RasaCmdArgumentVo.java index 8f1d4dbf..bcdd374b 100644 --- a/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/vo/RasaCmdArgumentVo.java +++ b/virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/vo/RasaCmdArgumentVo.java @@ -1,8 +1,6 @@ package com.supervision.rasa.pojo.vo; import cn.hutool.core.util.StrUtil; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.Data; import java.util.Date; @@ -12,7 +10,6 @@ public class RasaCmdArgumentVo { private String fixedModelName;//fixed-model-name - @ApiModelProperty(hidden = true) private String modelId; public void setFixedModelNameIfAbsent(){ diff --git a/virtual-patient-web/pom.xml b/virtual-patient-web/pom.xml index e502f137..1d63d300 100644 --- a/virtual-patient-web/pom.xml +++ b/virtual-patient-web/pom.xml @@ -50,6 +50,10 @@ spring-cloud-starter-openfeign + + org.springframework.cloud + spring-cloud-starter-loadbalancer + diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java index a816fade..7a3c9af3 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskAncillaryController.java @@ -2,22 +2,22 @@ package com.supervision.controller; import com.supervision.model.ConfigAncillaryItem; import com.supervision.pojo.vo.AskAncillaryBatchReqVO; +import com.supervision.pojo.vo.AskAncillaryResultReqVO; import com.supervision.pojo.vo.SaveAncillaryAssessmentResultReqVO; +import com.supervision.service.AskAncillaryService; import com.supervision.vo.ask.AncillaryItemReqVo; import com.supervision.vo.ask.AskAncillaryHistoryResVO; -import com.supervision.pojo.vo.AskAncillaryResultReqVO; import com.supervision.vo.ask.ConfigAncillaryItemResVO; -import com.supervision.service.AskAncillaryService; import com.supervision.vo.ask.DiagnosisAncillaryRecordVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@Api(tags = "辅助检查") +@Tag(name = "辅助检查") @RestController @RequestMapping("askAncillary") @RequiredArgsConstructor @@ -25,38 +25,38 @@ public class AskAncillaryController { private final AskAncillaryService askAncillaryService; - @ApiOperation("查询辅助检查项目列表") + @Operation(summary = "查询辅助检查项目列表") @GetMapping("queryAncillaryItemList") public List queryAncillaryItemList(AncillaryItemReqVo ancillaryItemReqVo) { return askAncillaryService.queryAncillaryItemList(ancillaryItemReqVo); } - @ApiOperation("查询辅助检查项目目录树") + @Operation(summary = "查询辅助检查项目目录树") @GetMapping("queryAncillaryItemTree") public Map> queryAncillaryItemTree(){ return askAncillaryService.queryAncillaryItemTree(); } - @ApiOperation("批量进行辅助检查") + @Operation(summary = "批量进行辅助检查") @PostMapping("execAskAncillaryBatch") public void execAskAncillaryBatch(@RequestBody List reqVO){ askAncillaryService.execAskAncillaryBatch(reqVO); } @Deprecated - @ApiOperation("进行辅助检查,并获取结果") + @Operation(summary = "进行辅助检查,并获取结果") @GetMapping("queryAskAncillaryResult") public DiagnosisAncillaryRecordVo execAskAncillaryResult(AskAncillaryResultReqVO reqVO) { return askAncillaryService.execAskAncillaryResult(reqVO); } - @ApiOperation("查询辅助检查的历史记录") + @Operation(summary = "查询辅助检查的历史记录") @GetMapping("queryAskAncillaryHistory") public List queryAskAncillaryHistory(String processId) { return askAncillaryService.queryAskAncillaryHistory(processId); } - @ApiOperation("保存辅助检查判读结果") + @Operation(summary = "保存辅助检查判读结果") @PostMapping("saveAncillaryAssessmentResult") public void saveAncillaryAssessmentResult(@RequestBody SaveAncillaryAssessmentResultReqVO reqVO){ askAncillaryService.saveAncillaryAssessmentResult(reqVO); diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java index 6569efdb..dba3edc9 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java @@ -3,15 +3,15 @@ package com.supervision.controller; import com.supervision.pojo.vo.TalkResultResVO; import com.supervision.pojo.vo.TalkVideoReqVO; import com.supervision.service.AskService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; -@Api(tags = "问诊") +@Tag(name = "问诊") @RestController @RequestMapping("/ask/") public class AskController { @@ -19,14 +19,14 @@ public class AskController { @Autowired private AskService askService; - @ApiOperation("接收页面的语音消息转文字") + @Operation(summary = "接收页面的语音消息转文字") @PostMapping("/receiveVoiceFile") public String receiveVoiceFile(@RequestParam("file") MultipartFile file) { return askService.receiveVoiceFile(file); } - @ApiOperation("使用本地视频的形式来做") + @Operation(summary = "使用本地视频的形式来做") @PostMapping("/talkByVideo") public TalkResultResVO talkByVideo(@RequestBody TalkVideoReqVO talkReqVO) throws IOException { return askService.talkByVideo(talkReqVO); diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskDiagnosisResultController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskDiagnosisResultController.java index e4245d1b..7605ce3f 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskDiagnosisResultController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskDiagnosisResultController.java @@ -3,14 +3,14 @@ package com.supervision.controller; import com.supervision.pojo.vo.DiagnosisResultResVO; import com.supervision.pojo.vo.RadarChartResVO; import com.supervision.service.AskDiagnosisResultService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "评估详情") +@Tag(name = "评估详情") @RestController @RequestMapping("/askDiagnosisResult") @RequiredArgsConstructor @@ -18,13 +18,13 @@ public class AskDiagnosisResultController { private final AskDiagnosisResultService askDiagnosisResultService; - @ApiOperation("查询最终诊断结果") + @Operation(summary = "查询最终诊断结果") @GetMapping("queryDiagnosisResult") public DiagnosisResultResVO queryDiagnosisResult(String processId) { return askDiagnosisResultService.queryDiagnosisResult(processId); } - @ApiOperation("查询诊断结果的雷达图") + @Operation(summary = "查询诊断结果的雷达图") @GetMapping("queryRadarChart") public RadarChartResVO queryRadarChart(String processId) { return askDiagnosisResultService.queryRadarChart(processId); diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskPatientController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskPatientController.java index 8aff15ca..a584fbe3 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskPatientController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskPatientController.java @@ -3,14 +3,14 @@ package com.supervision.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.model.Patient; import com.supervision.service.AskPatientService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Api(tags = "病人") +@Tag(name = "病人") @RestController @RequestMapping("/askPatient") @RequiredArgsConstructor @@ -18,13 +18,13 @@ public class AskPatientController { private final AskPatientService askPatientService; - @ApiOperation("分页获取病人列表") + @Operation(summary = "分页获取病人列表") @GetMapping("queryPatientPage") public IPage queryPatientPage(Integer pageNum, Integer pageSize) { return askPatientService.queryPatientPage(pageNum, pageSize); } - @ApiOperation("根据病人ID获取病人详细信息") + @Operation(summary = "根据病人ID获取病人详细信息") @GetMapping("queryPatientInfo") public Patient queryPatientInfo(String id) { return askPatientService.queryPatientById(id); diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java index 3a435f37..574ca032 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskPhysicalController.java @@ -1,20 +1,19 @@ package com.supervision.controller; import com.supervision.pojo.vo.AskPhysicalResultReqVO; -import com.supervision.vo.ask.ConfigPhysicalToolResVO; import com.supervision.service.AskPhysicalService; -import com.supervision.vo.ask.DiagnosisPhysicalRecordVo; import com.supervision.vo.ask.AskPhysicalHistoryResVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import com.supervision.vo.ask.ConfigPhysicalToolResVO; +import com.supervision.vo.ask.DiagnosisPhysicalRecordVo; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.apache.ibatis.annotations.Param; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "体格检查") +@Tag(name = "体格检查") @RestController @RequestMapping("askPhysical") @RequiredArgsConstructor @@ -23,19 +22,19 @@ public class AskPhysicalController { private final AskPhysicalService askPhysicalService; - @ApiOperation(value = "查询体格检查的工具列表") + @Operation(summary = "查询体格检查的工具列表") @GetMapping("queryPhysicalToolList") public List queryPhysicalToolList() { return askPhysicalService.queryPhysicalToolList(); } - @ApiOperation(value = "查询体格检查的结果(执行体格检查)") + @Operation(summary = "查询体格检查的结果(执行体格检查)") @PostMapping("queryAskPhysicalResult") public DiagnosisPhysicalRecordVo queryAskPhysicalResult(@RequestBody AskPhysicalResultReqVO reqVO) { return askPhysicalService.queryAskPhysicalResult(reqVO); } - @ApiOperation(value = "查询体格检查历史记录") + @Operation(summary = "查询体格检查历史记录") @GetMapping("queryAskPhysicalHistory") public List queryAskPhysicalHistory(String processId){ return askPhysicalService.queryAskPhysicalHistory(processId); diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java index 26e25190..8ebbecb1 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskPrimaryController.java @@ -9,9 +9,9 @@ import com.supervision.service.AskPrimaryService; import com.supervision.vo.ask.DiagnosisPrimaryVO; import com.supervision.vo.ask.DiagnosticBasisForPrimaryResVO; import com.supervision.vo.ask.ModifyPrimaryDiseaseInfoReqVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "初步诊断") +@Tag(name = "初步诊断") @Validated @RestController @RequestMapping("askPrimary") @@ -29,56 +29,57 @@ public class AskPrimaryController { private final AskPrimaryService askPrimaryService; - @ApiOperation("查询初步诊断列表") + @Operation(summary = "查询初步诊断列表") @GetMapping("queryAskPrimaryList") public List queryAskPrimaryList(@NotBlank(message = "流程ID不能为空") String processId) { return askPrimaryService.queryAskPrimaryList(processId); } - @ApiOperation("获取初步诊断可选的下拉列表(只查单一疾病)") + @Operation(summary = "获取初步诊断可选的下拉列表(只查单一疾病)") @GetMapping("queryPrimaryCanChooseList") public List queryPrimaryCanChooseList() { return askPrimaryService.queryPrimaryCanChooseList(); } - @ApiOperation("获取单个初步诊断详细信息") + @Operation(summary = "获取单个初步诊断详细信息") @GetMapping("queryPrimaryDetailInfo") public DiagnosisPrimaryVO queryPrimaryDetailInfo(String primaryId) { return askPrimaryService.queryPrimaryDetailInfo(primaryId); } - @ApiOperation("修改初步诊断病情依据") + + @Operation(summary = "修改初步诊断病情依据") @PostMapping("modifyPrimaryDiseaseInfo") public void modifyPrimaryDiseaseInfo(@RequestBody @Validated ModifyPrimaryDiseaseInfoReqVO reqVO) { askPrimaryService.modifyPrimaryDiseaseInfo(reqVO); } - @ApiOperation("新增初步诊断") + @Operation(summary = "新增初步诊断") @PostMapping("savePrimary") public void savePrimary(@RequestBody @Validated SaveDiagnosisPrimaryReqVO reqVO) { askPrimaryService.savePrimary(reqVO); } - @ApiOperation("查询可选择初步诊断关联的问诊记录") + @Operation(summary = "查询可选择初步诊断关联的问诊记录") @GetMapping("queryRecordForPrimaryChoose") public RecordForPrimaryChooseVO queryRecordForPrimaryChoose(@NotBlank(message = "流程ID不能为空") String processId) { return askPrimaryService.queryRecordForPrimaryChoose(processId); } - @ApiOperation("删除初步诊断") + @Operation(summary = "删除初步诊断") @GetMapping("deletePrimary") public void deletePrimary(@NotBlank(message = "初步诊断ID不能为空") String id) { askPrimaryService.deletePrimary(id); } - @ApiOperation("确认诊断页面,查询初步诊断关联的诊断项") + @Operation(summary = "确认诊断页面,查询初步诊断关联的诊断项") @GetMapping("queryDiagnosticBasisListForPrimary") - public List queryDiagnosticBasisListForPrimary(@ApiParam(value = "流程ID",required = true) @NotBlank(message = "流程ID不能为空") String processId, - @ApiParam(value = "初步诊断ID,不填查所有",required = false) String primaryId) { - return askPrimaryService.queryDiagnosticBasisListForPrimary(processId,primaryId); + public List queryDiagnosticBasisListForPrimary(@Parameter(name = "流程ID", required = true) @NotBlank(message = "流程ID不能为空") String processId, + @Parameter(name = "初步诊断ID,不填查所有", required = false) String primaryId) { + return askPrimaryService.queryDiagnosticBasisListForPrimary(processId, primaryId); } - @ApiOperation("确认诊断页面,保存初步诊断以及鉴别依据") + @Operation(summary = "确认诊断页面,保存初步诊断以及鉴别依据") @PostMapping("confirmPrimaryByAskEnd") public void confirmPrimaryByAskEnd(@RequestBody @Valid PrimaryConfirmReqVO reqVO) { askPrimaryService.confirmPrimaryByAskEnd(reqVO); diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java index 18a485ec..9f35b8d6 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskProcessController.java @@ -4,15 +4,15 @@ import com.supervision.model.Process; import com.supervision.model.User; import com.supervision.service.AskProcessService; import com.supervision.util.UserUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; -@Api(tags = "诊断流程") +@Tag(name = "诊断流程") @RestController @RequestMapping("askProcess") @RequiredArgsConstructor @@ -20,23 +20,23 @@ public class AskProcessController { private final AskProcessService askProcessService; - @ApiOperation("生成诊断流程任务") + @Operation(summary = "生成诊断流程任务") @GetMapping("creatDiagnosisProcess") - public Process creatDiagnosisProcess(@ApiParam("病人ID") String patientId,@ApiParam("病历ID") String medicalId) { + public Process creatDiagnosisProcess(@Parameter(name = "病人ID") String patientId, @Parameter(name = "病历ID") String medicalId) { User user = UserUtil.getUser(); return askProcessService.creatDiagnosisProcess(patientId, medicalId, user); } - @ApiOperation("查询用户正在诊断中的诊断记录") + @Operation(summary = "查询用户正在诊断中的诊断记录") @GetMapping("queryUserProcess") public List queryUserProcess(String userId) { return askProcessService.queryUserProcess(userId); } - @ApiOperation("删除问诊实例") + @Operation(summary = "删除问诊实例") @DeleteMapping("delete") - public boolean deleteDiagnosisProcess(@ApiParam("病人ID") @RequestParam("processId") String processId) { + public boolean deleteDiagnosisProcess(@Parameter(name = "病人ID") @RequestParam("processId") String processId) { return askProcessService.deleteDiagnosisProcess(processId); } diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/DiagnoseHallController.java b/virtual-patient-web/src/main/java/com/supervision/controller/DiagnoseHallController.java index a9f068d6..eabc6920 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/DiagnoseHallController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/DiagnoseHallController.java @@ -5,9 +5,9 @@ import com.supervision.service.DiagnoseHallService; import com.supervision.vo.manage.MedicalRecPageResVO; import com.supervision.vo.result.DiagnoseProcessReqVo; import com.supervision.vo.result.DiagnoseProcessResVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; /** * 问诊大厅 */ -@Api(tags = "问诊大厅") +@Tag(name = "问诊大厅") @RestController @RequestMapping("diagnoseHall") @RequiredArgsConstructor @@ -25,19 +25,19 @@ public class DiagnoseHallController { private final DiagnoseHallService diagnoseHallService; - @ApiOperation("分页查询问诊流程列表") + @Operation(summary = "分页查询问诊流程列表") @GetMapping("queryDiagnoseProcessPageList") - public IPage queryDiagnoseProcessPageList(@ApiParam("起始页") @RequestParam(defaultValue = "1") Integer pageNum, - @ApiParam("每页大小") @RequestParam(defaultValue = "10") Integer pageSize, + public IPage queryDiagnoseProcessPageList(@Parameter(name = "起始页") @RequestParam(defaultValue = "1") Integer pageNum, + @Parameter(name = "每页大小") @RequestParam(defaultValue = "10") Integer pageSize, DiagnoseProcessReqVo diagnoseProcessReqVo) { return diagnoseHallService.queryDiagnoseProcessPageList(pageNum, pageSize, diagnoseProcessReqVo); } - @ApiOperation("分页查询病例信息列表") + @Operation(summary = "分页查询病例信息列表") @GetMapping("queryMedicalRecPageList") - public IPage queryMedicalRecPageList(@ApiParam("起始页") @RequestParam(defaultValue = "1") Integer pageNum, - @ApiParam("每页大小") @RequestParam(defaultValue = "10") Integer pageSize) { + public IPage queryMedicalRecPageList(@Parameter(name = "起始页") @RequestParam(defaultValue = "1") Integer pageNum, + @Parameter(name = "每页大小") @RequestParam(defaultValue = "10") Integer pageSize) { return diagnoseHallService.queryMedicalRecPageList(pageNum, pageSize); } diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/DiagnosisQaRecordController.java b/virtual-patient-web/src/main/java/com/supervision/controller/DiagnosisQaRecordController.java index 90397aa8..66f3de99 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/DiagnosisQaRecordController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/DiagnosisQaRecordController.java @@ -3,19 +3,16 @@ package com.supervision.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.supervision.exception.BusinessException; -import com.supervision.model.DiagnosisQaRecord; import com.supervision.service.DiagnosisQaRecordService; import com.supervision.vo.ask.DiagnosisQaRecordHistoryResVO; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - -@Api(tags = "问诊历史记录") +@Tag(name = "问诊历史记录") @RestController @RequestMapping("/diagnosisQaRecord") @RequiredArgsConstructor @@ -23,7 +20,8 @@ public class DiagnosisQaRecordController { private final DiagnosisQaRecordService diagnosisQaRecordService; - @ApiOperation("查询问诊历史记录") + + @Operation(summary = "查询问诊历史记录") @GetMapping("queryHistoryList") public IPage queryDiagnosisHistoryQaList(String processId, Integer pageNum, Integer pageSize){ if (StrUtil.isEmpty(processId)){ diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java b/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java index c031230e..b1404d49 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/MedicalRecordController.java @@ -1,21 +1,19 @@ package com.supervision.controller; -import cn.hutool.core.bean.BeanUtil; import com.supervision.model.ProcessMedical; import com.supervision.service.MedicalRecordService; import com.supervision.vo.ask.ProcessMedicalLayerResVo; -import com.supervision.vo.ask.ProcessMedicalResVo; import com.supervision.vo.ask.ProcessMedicalViewDetailResVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @Slf4j -@Api(tags = "电子病例") +@Tag(name = "电子病例") @RestController @RequestMapping("medicalRecord") @RequiredArgsConstructor @@ -29,31 +27,31 @@ public class MedicalRecordController { * @return 是否新增成功 */ @Deprecated - @ApiOperation("新增电子病例信息") + @Operation(summary = "新增电子病例信息") @PostMapping("save") public boolean saveMedicalRecord(@RequestBody ProcessMedical processMedical){ return medicalRecordService.saveMedicalRecord(processMedical); } - @ApiOperation("更新电子病例信息") + @Operation(summary = "更新电子病例信息") @PutMapping("update") public boolean updateMedicalRecord(@RequestBody ProcessMedical processMedical){ return medicalRecordService.saveOrUpdateMedicalRecord(processMedical); } - @ApiOperation("通过流程id查询电子病例信息") + @Operation(summary = "通过流程id查询电子病例信息") @GetMapping("findByProcessId") - public ProcessMedicalLayerResVo findByProcessId(@ApiParam("流程id") @RequestParam("processId") String processId){ + public ProcessMedicalLayerResVo findByProcessId(@Parameter(name = "流程id") @RequestParam("processId") String processId) { return ProcessMedicalLayerResVo.ProcessMedicalResVoToBean(medicalRecordService.findByProcessId(processId)); } - @ApiOperation("电子病例视图") + @Operation(summary = "电子病例视图") @GetMapping("queryViewDetails") - public ProcessMedicalViewDetailResVo queryViewDetail(@ApiParam("流程id") @RequestParam("processId") String processId){ + public ProcessMedicalViewDetailResVo queryViewDetail(@Parameter(name = "流程id") @RequestParam("processId") String processId) { return medicalRecordService.queryViewDetail(processId); } diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java b/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java index 5b25ff52..3743f975 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java @@ -1,15 +1,14 @@ package com.supervision.controller; import com.supervision.model.ConfigDrug; -import com.supervision.model.Process; import com.supervision.model.TreatmentPlanRecord; import com.supervision.pojo.vo.DealPlanResVO; import com.supervision.pojo.vo.TreatmentPlanConfirmReqVo; import com.supervision.service.TreatmentPlanService; import com.supervision.vo.manage.TreatmentPlanTreeNode; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.annotations.Param; @@ -18,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; @Slf4j -@Api(tags = "处置计划") +@Tag(name = "处置计划") @RestController @RequestMapping("/treatmentPlan") @RequiredArgsConstructor @@ -27,7 +26,7 @@ public class TreatmentPlanController { private final TreatmentPlanService treatmentPlanService; - @ApiOperation("新增处置计划记录") + @Operation(summary = "新增处置计划记录") @PostMapping("/record/save") public boolean saveTreatmentPlanRecord(@RequestBody TreatmentPlanRecord treatmentPlanRecord) { @@ -35,14 +34,14 @@ public class TreatmentPlanController { } - @ApiOperation("确认处置计划") + @Operation(summary = "确认处置计划") @PostMapping("/confirm") public boolean confirmTreatmentPlan(@RequestBody TreatmentPlanConfirmReqVo reqVo) { return treatmentPlanService.confirmTreatmentPlan(reqVo.getProcessId(),String.valueOf(reqVo.getStatus())); } - @ApiOperation("修改处置计划记录") + @Operation(summary = "修改处置计划记录") @PutMapping("/record/update") public boolean updateTreatmentPlanRecord(@RequestBody TreatmentPlanRecord treatmentPlanRecord) { @@ -50,7 +49,7 @@ public class TreatmentPlanController { } - @ApiOperation("删除处置计划记录") + @Operation(summary = "删除处置计划记录") @DeleteMapping("/record/delete") public boolean deleteTreatmentPlanRecord(@Param("记录主键id") @RequestParam String id) { @@ -58,32 +57,32 @@ public class TreatmentPlanController { } - @ApiOperation("查询处置计划记录列表") + @Operation(summary = "查询处置计划记录列表") @GetMapping("/record/queryRecord") - public List queryTreatmentPlanRecord(@ApiParam("流程实例id") @RequestParam("processId") String processId, - @ApiParam("处置计划类型 药物:0 其他:1") String disposalPlanType) { + public List queryTreatmentPlanRecord(@Parameter(name = "流程实例id") @RequestParam("processId") String processId, + @Parameter(name = "处置计划类型 药物:0 其他:1") String disposalPlanType) { return treatmentPlanService.queryTreatmentPlanRecord(processId, disposalPlanType); } - @ApiOperation("查询处置计划详情") + @Operation(summary = "查询处置计划详情") @GetMapping("/record/queryDetails") - public DealPlanResVO queryTreatmentPlanDetails(@ApiParam("流程实例id") @RequestParam("processId") String processId) { + public DealPlanResVO queryTreatmentPlanDetails(@Parameter(name = "流程实例id") @RequestParam("processId") String processId) { return treatmentPlanService.queryTreatmentPlanDetails(processId); } - @ApiOperation("查询药品列表") + @Operation(summary = "查询药品列表") @GetMapping("/getDrugList") public List getDrugList() { return treatmentPlanService.getDrugList(); } - @ApiOperation("查询处置计划树") + @Operation(summary = "查询处置计划树") @GetMapping("/queryTree") - public List queryTree(@ApiParam("处置方式")@RequestParam(required = false) Integer disposalMethod) { + public List queryTree(@Parameter(name = "处置方式") @RequestParam(required = false) Integer disposalMethod) { return treatmentPlanService.queryTree(disposalMethod); diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/UserController.java b/virtual-patient-web/src/main/java/com/supervision/controller/UserController.java index e04402d3..32712966 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/UserController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/UserController.java @@ -14,8 +14,8 @@ import com.supervision.service.UserManageService; import com.supervision.service.UserService; import com.supervision.util.TokenUtil; import com.supervision.util.UserUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; import java.util.Optional; -@Api(tags = "用户管理") +@Tag(name = "用户管理") @RestController @RequestMapping("user") @RequiredArgsConstructor @@ -36,7 +36,7 @@ public class UserController { private final UserManageService userManageService; - @ApiOperation("登录") + @Operation(summary = "登录") @PostMapping("login") public LoginResVO login(@RequestBody LoginReqVO reqVO) { if (!StrUtil.isAllNotBlank(reqVO.getUserAccount(), reqVO.getPassword())) { @@ -59,15 +59,14 @@ public class UserController { } - - @ApiOperation("修改用户信息") + @Operation(summary = "修改用户信息") @PutMapping("updateUserInfo") public boolean updateUserInfo(@RequestBody UserInfoReqVo userInfo) { return userManageService.updateUserInfo(userInfo); } - @ApiOperation("查看账号信息") + @Operation(summary = "查看账号信息") @GetMapping("getUserAccountInfo") public UserInfoResVo getUserAccountInfo() { User user = UserUtil.getUser(); diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryBatchReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryBatchReqVO.java index 4e8369c7..3389419e 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryBatchReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryBatchReqVO.java @@ -1,6 +1,7 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -8,12 +9,12 @@ import java.util.List; @Data public class AskAncillaryBatchReqVO { - @ApiModelProperty("体格检查项ID") + @Schema(name = "体格检查项ID") private String ancillaryItemId; - @ApiModelProperty("流程ID") + @Schema(name = "流程ID") private String processId; - @ApiModelProperty("初步诊断ID,支持多选") + @Schema(name = "初步诊断ID,支持多选") private List primaryId; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryResultReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryResultReqVO.java index ed16b30a..ba4d2df8 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryResultReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskAncillaryResultReqVO.java @@ -1,24 +1,24 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; @Data -@ApiModel +@Schema public class AskAncillaryResultReqVO { - @ApiModelProperty("辅助检查工具ID") + @Schema(name = "辅助检查工具ID") @NotBlank(message = "辅助检查工具ID不能为空") private String itemId; - @ApiModelProperty("初步诊断ID") + @Schema(name = "初步诊断ID") @NotBlank(message = "初步诊断ID不能为空") private String primaryId; - @ApiModelProperty("流程ID") + @Schema(name = "流程ID") @NotBlank(message = "流程ID不能为空") private String processId; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskPhysicalResultReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskPhysicalResultReqVO.java index 8e91c13f..a0a61d42 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskPhysicalResultReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/AskPhysicalResultReqVO.java @@ -1,28 +1,28 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; import java.util.List; @Data -@ApiModel +@Schema public class AskPhysicalResultReqVO { @NotBlank(message = "体格检查工具ID不能为空") - @ApiModelProperty("体格检查工具ID") + @Schema(name = "体格检查工具ID") private String toolId; - @ApiModelProperty("位置编码") + @Schema(name = "位置编码") private String locationCode; - @ApiModelProperty("初步诊断ID列表") + @Schema(name = "初步诊断ID列表") private List primaryIdList; @NotBlank(message = "流程ID不能为空") - @ApiModelProperty("流程ID") + @Schema(name = "流程ID") private String processId; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisConfirmResultResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisConfirmResultResVO.java index 11df78e7..ff9c6004 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisConfirmResultResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisConfirmResultResVO.java @@ -1,19 +1,19 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel +@Schema public class BasisConfirmResultResVO { - @ApiModelProperty("证实诊断依据") + @Schema(name = "证实诊断依据") private String confirmingDiagnosis; - @ApiModelProperty("证实诊断列表") + @Schema(name = "证实诊断列表") private List nodeList; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisDiagnosisNodeResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisDiagnosisNodeResVO.java index 84195acf..6849f0b7 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisDiagnosisNodeResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisDiagnosisNodeResVO.java @@ -1,21 +1,22 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class BasisDiagnosisNodeResVO { - @ApiModelProperty("初步诊断依据 0对话 1体格检查 2辅助检查") + @Schema(name = "初步诊断依据 0对话 1体格检查 2辅助检查") private Integer type; - @ApiModelProperty("记录名称 对话就是对话内容,其他的就是对应的名称") + @Schema(name = "记录名称 对话就是对话内容,其他的就是对应的名称") private String recordName; - @ApiModelProperty("对应的记录ID") + @Schema(name = "对应的记录ID") private String recordId; - @ApiModelProperty("是否正确,0：不正确 1：正确") + @Schema(name = "是否正确,0：不正确 1：正确") private Integer correct; public BasisDiagnosisNodeResVO() { diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisIdentificationResultResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisIdentificationResultResVO.java index ab7a19b5..f5e7fa92 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisIdentificationResultResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisIdentificationResultResVO.java @@ -1,6 +1,7 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -8,10 +9,10 @@ import java.util.List; @Data public class BasisIdentificationResultResVO { - @ApiModelProperty("证实诊断依据") + @Schema(name = "证实诊断依据") private String identificationDiagnosis; - @ApiModelProperty("证实诊断列表") + @Schema(name = "证实诊断列表") private List nodeList; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisPrimaryResultResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisPrimaryResultResVO.java index 4db1127e..70ab2760 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisPrimaryResultResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/BasisPrimaryResultResVO.java @@ -1,6 +1,7 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -9,9 +10,9 @@ import java.util.List; public class BasisPrimaryResultResVO { - @ApiModelProperty("初步诊断依据-每一种病都有一种初步诊断依据-vp_disease疾病表中的preliminary_diagnosis") + @Schema(name = "初步诊断依据-每一种病都有一种初步诊断依据-vp_disease疾病表中的preliminary_diagnosis") private String preliminaryDiagnosis; - @ApiModelProperty("初步诊断依据列表-医生做的某些操作项,require_check=1") + @Schema(name = "初步诊断依据列表-医生做的某些操作项,require_check=1") private List nodeList; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChartNodeVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChartNodeVO.java index f4304339..1ee87663 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChartNodeVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChartNodeVO.java @@ -1,47 +1,46 @@ package com.supervision.pojo.vo; import cn.hutool.core.util.NumberUtil; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; @Data -@ApiModel +@Schema public class ChartNodeVO { /** * 属性占比 */ - @ApiModelProperty("属性占比") + @Schema(name = "属性占比") private BigDecimal nodePer; - @ApiModelProperty("评分级别( (0-60) 不合格 [60,75)合格 [75,85)良好 [85,100]优秀,") + @Schema(name = "评分级别( (0-60) 不合格 [60,75)合格 [75,85)良好 [85,100]优秀,") private String scoreLevel; /** * 总数=其他三项之和 */ - @ApiModelProperty("总数") + @Schema(name = "总数") private Integer total; /** * 用户命中的数量 */ - @ApiModelProperty("用户命中的数量") + @Schema(name = "用户命中的数量") private Integer correct; /** * 不正确,用户未命中的数量=病例库中的总数-用户命中的数量 */ - @ApiModelProperty("不正确") + @Schema(name = "不正确") private Integer unCorrect; /** * 标准,病例库中配置的数量 */ - @ApiModelProperty("标准,病例库中配置的数量") + @Schema(name = "标准,病例库中配置的数量") private Integer standard; public String computeScoreLevel() { diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChooseNode.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChooseNode.java index 32412b34..6aa5f55d 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChooseNode.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ChooseNode.java @@ -1,6 +1,6 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + import lombok.Data; @Data diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DealPlanResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DealPlanResVO.java index 79c2f633..c12b2954 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DealPlanResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DealPlanResVO.java @@ -1,7 +1,7 @@ package com.supervision.pojo.vo; import com.supervision.model.TreatmentPlanRecord; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -9,10 +9,10 @@ import java.util.List; @Data public class DealPlanResVO { - @ApiModelProperty("用户的治疗计划类型(0门诊 1住院)") + @Schema(name = "用户的治疗计划类型(0门诊 1住院)") private Integer userTreatmentPlanType; - @ApiModelProperty("处置方案列表") + @Schema(name = "处置方案列表") private List drugTreatmentPlan; private List otherTreatmentPlan; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosisDiseaseResultNodeVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosisDiseaseResultNodeVO.java index aacc80e5..f60a093d 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosisDiseaseResultNodeVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosisDiseaseResultNodeVO.java @@ -1,20 +1,20 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel +@Schema public class DiagnosisDiseaseResultNodeVO { - @ApiModelProperty("疾病名称") + @Schema(name = "疾病名称") private String diseaseName; - @ApiModelProperty("是否正确,1正确") + @Schema(name = "是否正确,1正确") private Integer correct; - @ApiModelProperty("疾病ID") + @Schema(name = "疾病ID") private String diseaseId; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosisResultResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosisResultResVO.java index 6d46e89d..b898390f 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosisResultResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosisResultResVO.java @@ -1,6 +1,7 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data @@ -8,22 +9,22 @@ public class DiagnosisResultResVO { private String id; - @ApiModelProperty("预期诊断结果") + @Schema(name = "预期诊断结果") private ExpertDiagnosisResultResVO expertDiagnosisResult; - @ApiModelProperty("初步诊断依据") + @Schema(name = "初步诊断依据") private BasisPrimaryResultResVO basisPrimaryResultResVO; - @ApiModelProperty("证实诊断依据") + @Schema(name = "证实诊断依据") private BasisConfirmResultResVO basisConfirmResultResVO; - @ApiModelProperty("鉴别诊断依据") + @Schema(name = "鉴别诊断依据") private BasisIdentificationResultResVO basisIdentificationResult; - @ApiModelProperty("全面检查-(暂无相关数据)") + @Schema(name = "全面检查-(暂无相关数据)") private FullCheckResVO fullCheck; - @ApiModelProperty("处置方案") + @Schema(name = "处置方案") private DealPlanResVO dealPlan; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosticBasisForPrimaryReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosticBasisForPrimaryReqVO.java index 88fc4a79..548b4501 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosticBasisForPrimaryReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/DiagnosticBasisForPrimaryReqVO.java @@ -1,20 +1,21 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class DiagnosticBasisForPrimaryReqVO { - @ApiModelProperty("本项ID") + @Schema(name = "本项ID") private String id; - @ApiModelProperty("阶段,1问诊 2体格检查 3辅助检查") + @Schema(name = "阶段,1问诊 2体格检查 3辅助检查") private Integer type; - @ApiModelProperty("是否是证实诊断依据(0否1是)") + @Schema(name = "是否是证实诊断依据(0否1是)") private Integer basisConfirmFlag; - @ApiModelProperty("是否是鉴别依据(0否1是)") + @Schema(name = "是否是鉴别依据(0否1是)") private Integer basisIdentificationFlag; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ExpertDiagnosisResultResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ExpertDiagnosisResultResVO.java index f82f1444..2bcaed30 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ExpertDiagnosisResultResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ExpertDiagnosisResultResVO.java @@ -1,7 +1,7 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -10,15 +10,15 @@ import java.util.List; * 预期诊断结果 */ @Data -@ApiModel +@Schema public class ExpertDiagnosisResultResVO { - @ApiModelProperty("正确的诊断结果(就是这个病历实际的病症)") + @Schema(name = "正确的诊断结果(就是这个病历实际的病症)") private String diagnosis; - @ApiModelProperty("用户诊断结果") + @Schema(name = "用户诊断结果") private List userDiagnosisResult; - @ApiModelProperty("预期诊断结果") + @Schema(name = "预期诊断结果") private List expertDiagnosisResult; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/FinishAskReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/FinishAskReqVO.java index 3e5f157f..95ef43f5 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/FinishAskReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/FinishAskReqVO.java @@ -1,11 +1,11 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel +@Schema public class FinishAskReqVO { private String processId; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/LoginResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/LoginResVO.java index 466274ca..6062cbea 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/LoginResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/LoginResVO.java @@ -1,27 +1,27 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class LoginResVO { - @ApiModelProperty("主键") + @Schema(name = "主键") private String id; - @ApiModelProperty("用户账户") + @Schema(name = "用户账户") private String account; - @ApiModelProperty("用户名称") + @Schema(name = "用户名称") private String name; - @ApiModelProperty("用户角色编码，0管理员 1普通用户(学生) 2运营人员(配置)") + @Schema(name = "用户角色编码，0管理员 1普通用户(学生) 2运营人员(配置)") private String roleCode; - @ApiModelProperty("token") + @Schema(name = "token") private String token; - @ApiModelProperty(hidden = true) private static final long serialVersionUID = 1L; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmNodeReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmNodeReqVO.java index 9c94da8d..2427a574 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmNodeReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmNodeReqVO.java @@ -1,6 +1,7 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -9,13 +10,13 @@ import java.util.List; @Data public class PrimaryConfirmNodeReqVO { - @ApiModelProperty("初步诊断ID") + @Schema(name = "初步诊断ID") @NotBlank(message = "初步诊断ID不能为空") private String primaryId; - @ApiModelProperty("是否排除(0排除1确诊)") + @Schema(name = "是否排除(0排除1确诊)") private Integer excludeFlag; - @ApiModelProperty("诊断依据列表") + @Schema(name = "诊断依据列表") private List diagnosticBasisList; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java index 453afd57..f77e9d60 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java @@ -1,6 +1,7 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -12,9 +13,9 @@ public class PrimaryConfirmReqVO { @NotBlank(message = "流程ID不能为空") private String processId; - @ApiModelProperty("是否暂存,1是,0否(否就是直接诊毕)") + @Schema(name = "是否暂存,1是,0否(否就是直接诊毕)") private Integer tempSaveFlag; - @ApiModelProperty("确认结果") + @Schema(name = "确认结果") private List primaryConfirmList; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RadarChartResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RadarChartResVO.java index daacae2b..ec2a96b2 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RadarChartResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RadarChartResVO.java @@ -1,30 +1,29 @@ package com.supervision.pojo.vo; import com.supervision.model.ProcessEvaluation; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel +@Schema public class RadarChartResVO { // 生成问诊雷达图 - @ApiModelProperty("生成问诊雷达图") + @Schema(name = "生成问诊雷达图") private ChartNodeVO askChart; // 生成体格检查雷达图 - @ApiModelProperty("生成体格检查雷达图") + @Schema(name = "生成体格检查雷达图") private ChartNodeVO physicalChart; // 生成辅助检查雷达图 - @ApiModelProperty("生成辅助检查雷达图") + @Schema(name = "生成辅助检查雷达图") private ChartNodeVO ancillaryChart; // 生成处置计划雷达图 - @ApiModelProperty("生成处置计划雷达图") + @Schema(name = "生成处置计划雷达图") private ChartNodeVO treatmentPlanChart; // 临床思维=前面几项和或平均值 - @ApiModelProperty("临床思维") + @Schema(name = "临床思维") private ChartNodeVO clinicalThinking; - @ApiModelProperty("考核评估") + @Schema(name = "考核评估") private ProcessEvaluation processEvaluation; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RecordForPrimaryChooseVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RecordForPrimaryChooseVO.java index 9941ff46..f5deb235 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RecordForPrimaryChooseVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RecordForPrimaryChooseVO.java @@ -1,21 +1,21 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel +@Schema public class RecordForPrimaryChooseVO { - @ApiModelProperty("问诊ID") + @Schema(name = "问诊ID") private List askList; - @ApiModelProperty("辅助检查ID") + @Schema(name = "辅助检查ID") private List ancillaryList; - @ApiModelProperty("体格检查ID") + @Schema(name = "体格检查ID") private List physicalList; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java index 0f1081e4..968fadcf 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/SaveDiagnosisPrimaryReqVO.java @@ -1,40 +1,40 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; import java.util.List; @Data -@ApiModel -public class SaveDiagnosisPrimaryReqVO { +@Schema +public class SaveDiagnosisPrimaryReqVO { /** * 诊断流程ID */ - @ApiModelProperty("诊断流程ID") + @Schema(name = "诊断流程ID") @NotBlank(message = "诊断流程ID不能为空") private String processId; /** * 初步诊断疾病,关联disease表ID */ - @ApiModelProperty("初步诊断疾病ID,关联disease表ID") + @Schema(name = "初步诊断疾病ID,关联disease表ID") @NotBlank(message = "初步诊断疾病ID不能为空") private String primaryDiagnosisId; - @ApiModelProperty("患者病情(初步诊断填写)") + @Schema(name = "患者病情(初步诊断填写)") private String patientDiseaseInfo; - @ApiModelProperty("问诊ID列表") + @Schema(name = "问诊ID列表") private List askIdList; - @ApiModelProperty("辅助检查ID列表") + @Schema(name = "辅助检查ID列表") private List ancillaryIdList; - @ApiModelProperty("体格检查ID列表") + @Schema(name = "体格检查ID列表") private List physicalIdList; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkReqVO.java index 358903d3..63f34076 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkReqVO.java @@ -1,21 +1,20 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiParam; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import org.springframework.web.bind.annotation.RequestParam; @Data public class TalkReqVO { - @ApiModelProperty("对话内容") + @Schema(name = "对话内容") private String text; - @ApiModelProperty("流程ID") + @Schema(name = "流程ID") private String processId; - @ApiModelProperty("数字人房间的数字人ID") + @Schema(name = "数字人房间的数字人ID") private String roomKey; - @ApiModelProperty("数字人的TOKEN") + @Schema(name = "数字人的TOKEN") private String roomToken; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkResultResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkResultResVO.java index 93ceaf03..d0a30986 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkResultResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkResultResVO.java @@ -1,6 +1,7 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data @@ -9,30 +10,30 @@ public class TalkResultResVO { /** * 后端返回给前端时使用,表示该是语音回复还是action动作,1语音回复,2体格检查 3辅助检查 */ - @ApiModelProperty("后端返回给前端时使用,表示该是语音回复还是action动作,1语音回复,2体格检查 3辅助检查") + @Schema(name = "后端返回给前端时使用,表示该是语音回复还是action动作,1语音回复,2体格检查 3辅助检查") private Integer type; - @ApiModelProperty("表示体格检查工具或辅助检查项id") + @Schema(name = "表示体格检查工具或辅助检查项id") private String actionId; - @ApiModelProperty("表示体格检查工具或辅助检查项所属父级类型(存在目录树的场景)") + @Schema(name = "表示体格检查工具或辅助检查项所属父级类型(存在目录树的场景)") private String actionType; - @ApiModelProperty("type='2' itemName:工具名,type='3' itemName：检查项目名") + @Schema(name = "type='2' itemName:工具名,type='3' itemName：检查项目名") private String itemName; - @ApiModelProperty("type='2' 工具图片") + @Schema(name = "type='2' 工具图片") private String itemImage; - @ApiModelProperty("type='2' 是否需要检查部位 0：否 1：是") + @Schema(name = "type='2' 是否需要检查部位 0：否 1：是") private Integer requireLocation; - @ApiModelProperty("视频base64位编码") + @Schema(name = "视频base64位编码") private String videoBase64; - @ApiModelProperty("回复的消息内容，用于调试视频资料内容") + @Schema(name = "回复的消息内容，用于调试视频资料内容") private String answerMessage; diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkVideoReqVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkVideoReqVO.java index 1389f56c..808e86be 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkVideoReqVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/TalkVideoReqVO.java @@ -1,15 +1,16 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class TalkVideoReqVO { - @ApiModelProperty("对话内容") + @Schema(name = "对话内容") private String text; - @ApiModelProperty("流程ID") + @Schema(name = "流程ID") private String processId; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/UserInfoReqVo.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/UserInfoReqVo.java index d2089dd9..085ac0e8 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/UserInfoReqVo.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/UserInfoReqVo.java @@ -1,19 +1,20 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data public class UserInfoReqVo { - @ApiModelProperty("用户id") + @Schema(name = "用户id") private String id; - @ApiModelProperty("用户名称") + @Schema(name = "用户名称") private String name; - @ApiModelProperty("旧密码") + @Schema(name = "旧密码") private String oldPassword; - @ApiModelProperty("新密码") + @Schema(name = "新密码") private String newPassword; } diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/UserInfoResVo.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/UserInfoResVo.java index 2c8ffcaa..c62a0867 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/UserInfoResVo.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/UserInfoResVo.java @@ -1,6 +1,7 @@ package com.supervision.pojo.vo; -import io.swagger.annotations.ApiModelProperty; + +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; @@ -8,19 +9,19 @@ import java.time.LocalDateTime; @Data public class UserInfoResVo { - @ApiModelProperty("用户id") + @Schema(name = "用户id") private String id; - @ApiModelProperty("用户账户") + @Schema(name = "用户账户") private String account; - @ApiModelProperty("用户名称") + @Schema(name = "用户名称") private String name; - @ApiModelProperty("用户角色编码，0管理员 1普通用户") + @Schema(name = "用户角色编码，0管理员 1普通用户") private String roleCode; - @ApiModelProperty("最近登录时间") + @Schema(name = "最近登录时间") private LocalDateTime recentLoginTime; diff --git a/virtual-patient-web/src/main/java/com/supervision/service/AskPrimaryService.java b/virtual-patient-web/src/main/java/com/supervision/service/AskPrimaryService.java index bf689abe..825ddffc 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/AskPrimaryService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/AskPrimaryService.java @@ -1,15 +1,12 @@ package com.supervision.service; -import com.supervision.model.DiagnosisPrimary; import com.supervision.model.Disease; -import com.supervision.pojo.vo.DiagnosticBasisForPrimaryReqVO; import com.supervision.pojo.vo.PrimaryConfirmReqVO; import com.supervision.pojo.vo.RecordForPrimaryChooseVO; import com.supervision.pojo.vo.SaveDiagnosisPrimaryReqVO; -import com.supervision.vo.ask.DiagnosticBasisForPrimaryResVO; import com.supervision.vo.ask.DiagnosisPrimaryVO; +import com.supervision.vo.ask.DiagnosticBasisForPrimaryResVO; import com.supervision.vo.ask.ModifyPrimaryDiseaseInfoReqVO; -import io.swagger.annotations.ApiParam; import java.util.List; diff --git a/virtual-patient-web/src/main/resources/application.yml b/virtual-patient-web/src/main/resources/application.yml index 1ed209a9..3f05913a 100644 --- a/virtual-patient-web/src/main/resources/application.yml +++ b/virtual-patient-web/src/main/resources/application.yml @@ -43,4 +43,22 @@ spring: mybatis-plus: mapper-locations: classpath*:mapper/**/*.xml configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +# springdoc-openapi项目配置 +springdoc: + swagger-ui: + path: /swagger-ui.html + tags-sorter: alpha + operations-sorter: alpha + api-docs: + path: /v3/api-docs + group-configs: + - group: 'default' + paths-to-match: '/**' + packages-to-scan: com.supervision +# knife4j的增强配置，不需要增强可以不配 +knife4j: + enable: true + setting: + language: zh_cn \ No newline at end of file diff --git a/virtual-patient-web/src/main/resources/bootstrap-dev.yml b/virtual-patient-web/src/main/resources/bootstrap-dev.yml index 98dd29cc..86f173dd 100644 --- a/virtual-patient-web/src/main/resources/bootstrap-dev.yml +++ b/virtual-patient-web/src/main/resources/bootstrap-dev.yml @@ -4,7 +4,7 @@ spring: config: server-addr: 192.168.10.138:8848 file-extension: yml - namespace: b9eea377-79ec-4ba5-9cc2-354f7bd5181e + namespace: 0a75e42d-26fe-4ee6-a460-f1738845cf4d discovery: server-addr: 192.168.10.138:8848 - namespace: b9eea377-79ec-4ba5-9cc2-354f7bd5181e \ No newline at end of file + namespace: 0a75e42d-26fe-4ee6-a460-f1738845cf4d \ No newline at end of file