沙雅分支swgger适配

bus-interceptor/pom.xml

@@ -18,13 +18,22 @@
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <optional>true</optional>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
     <build>
-        <finalName>bus-interceptor</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>repackage</id>
+                        <phase>none</phase> <!-- 显式跳过 -->
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
-
 </project>

bus-interceptor/src/main/java/com/lantone/interceptor/config/HttpInterceptorConfig.java

@@ -2,35 +2,26 @@ package com.lantone.interceptor.config;
 
 import com.lantone.interceptor.interceptor.HttpInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.EnvironmentAware;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.util.List;
 
-/**
- * @Description:
- * @Author songxl
- * @Date 2021/9/26
- */
-@PropertySource("classpath:application.properties")
 @Configuration
-public class HttpInterceptorConfig implements WebMvcConfigurer, EnvironmentAware {
+public class HttpInterceptorConfig implements WebMvcConfigurer {
+
     @Autowired
     private HttpInterceptor httpInterceptor;
-    private Environment env;
 
-    @Override
-    public void setEnvironment(Environment environment) {
-        this.env=environment;
-    }
+    @Value("${url:/userManage/loadByUsername,/redisRefresh,/loginLogHandle,/logManage/**,/error}")  // 默认值
+    private List<String> excludePaths;
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(httpInterceptor).addPathPatterns("/**")
-                .excludePathPatterns(env.getProperty("url",List.class));
-
+        registry.addInterceptor(httpInterceptor)
+                .addPathPatterns("/**")
+                .excludePathPatterns(excludePaths);
     }
-}
+}

bus-interceptor/src/main/resources/application.properties

@@ -1 +1,2 @@
-url =/userManage/loadByUsername,/redisRefresh,/loginLogHandle,/logManage/**,/error
+# application.properties
+url=/userManage/loadByUsername,/redisRefresh,/loginLogHandle,/logManage/**,/error

common/pom.xml

@@ -106,6 +106,12 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>1.6.14</version>
+        </dependency>
     </dependencies>
 
 <!--    <build>-->

common/src/main/java/com/lantone/common/config/BaseSwaggerConfig.java

@@ -1,108 +0,0 @@
-package com.lantone.common.config;
-
-import com.lantone.common.constant.AuthConstant;
-import com.lantone.common.domain.SwaggerProperties;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.annotation.Order;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: Swagger基础配置
- * @author: rengb
- * @time: 2021/1/5 18:27
- */
-public class BaseSwaggerConfig {
-
-    @Value("${swagger.title}")
-    private String swagger_title;
-    @Value("${swagger.des}")
-    private String swagger_des;
-    @Value("${swagger.version}")
-    private String swagger_version;
-    @Value("${swagger.show}")
-    private boolean swagger_show;
-
-    @Bean
-    @Order(value = 1)
-    public Docket groupRestApi() {
-        SwaggerProperties swaggerProperties = swaggerProperties();
-        Docket docket = new Docket(DocumentationType.SWAGGER_2)
-                .enable(swagger_show)
-                .apiInfo(apiInfo(swaggerProperties))
-                .select()
-                .apis(RequestHandlerSelectors.basePackage(swaggerProperties.getApiBasePackage()))
-                .paths(PathSelectors.any())
-                .build();
-        if (swaggerProperties.isEnableSecurity()) {
-            docket.securitySchemes(securitySchemes()).securityContexts(securityContexts());
-        }
-        return docket;
-    }
-
-    private ApiInfo apiInfo(SwaggerProperties swaggerProperties) {
-        return new ApiInfoBuilder()
-                .title(swaggerProperties.getTitle())
-                .description(swaggerProperties.getDescription())
-                .contact(new Contact(swaggerProperties.getContactName(), swaggerProperties.getContactUrl(), swaggerProperties.getContactEmail()))
-                .version(swaggerProperties.getVersion())
-                .build();
-    }
-
-    private List<ApiKey> securitySchemes() {
-        //设置请求头信息
-        List<ApiKey> result = new ArrayList<>();
-        result.add(new ApiKey("token(前缀：" + AuthConstant.JWT_TOKEN_PREFIX + ")", AuthConstant.JWT_TOKEN_HEADER, "header"));
-        result.add(new ApiKey("当前医院id", AuthConstant.HOSPITAL_ID_HEADER, "header"));
-        result.add(new ApiKey("当前系统id", AuthConstant.SOFTWARE_ID_HEADER, "header"));
-        return result;
-    }
-
-    private List<SecurityContext> securityContexts() {
-        //设置需要登录认证的路径
-        List<SecurityContext> result = new ArrayList<>();
-        result.add(getContextByPath("/*/.*"));
-        return result;
-    }
-
-    private SecurityContext getContextByPath(String pathRegex) {
-        return SecurityContext.builder()
-                .securityReferences(defaultAuth())
-                .forPaths(PathSelectors.regex(pathRegex))
-                .build();
-    }
-
-    private List<SecurityReference> defaultAuth() {
-        List<SecurityReference> result = new ArrayList<>();
-        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
-        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
-        authorizationScopes[0] = authorizationScope;
-        result.add(new SecurityReference("Authorization", authorizationScopes));
-        return result;
-    }
-
-    public SwaggerProperties swaggerProperties() {
-        return SwaggerProperties.builder()
-                .apiBasePackage("com.lantone")
-                .title(swagger_title)
-                .description("<div style='font-size:14px;color:red;'>" + swagger_des + "--RESTful APIs</div>")
-                .contactName("lantone")
-                .version(swagger_version)
-                .enableSecurity(true)
-                .build();
-    }
-
-}

common/src/main/java/com/lantone/common/config/OpenApiConfig.java

@@ -0,0 +1,227 @@
+package com.lantone.common.config;//package com.lantone.common.config;
+//
+//import com.lantone.common.constant.AuthConstant;
+//import com.lantone.common.domain.SwaggerProperties;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.core.annotation.Order;
+//import springfox.documentation.builders.ApiInfoBuilder;
+//import springfox.documentation.builders.PathSelectors;
+//import springfox.documentation.builders.RequestHandlerSelectors;
+//import springfox.documentation.service.ApiInfo;
+//import springfox.documentation.service.ApiKey;
+//import springfox.documentation.service.AuthorizationScope;
+//import springfox.documentation.service.Contact;
+//import springfox.documentation.service.SecurityReference;
+//import springfox.documentation.spi.DocumentationType;
+//import springfox.documentation.spi.service.contexts.SecurityContext;
+//import springfox.documentation.spring.web.plugins.Docket;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+///**
+// * @Description: Swagger基础配置
+// * @author: rengb
+// * @time: 2021/1/5 18:27
+// */
+//public class BaseSwaggerConfig {
+//
+//    @Value("${swagger.title}")
+//    private String swagger_title;
+//    @Value("${swagger.des}")
+//    private String swagger_des;
+//    @Value("${swagger.version}")
+//    private String swagger_version;
+//    @Value("${swagger.show}")
+//    private boolean swagger_show;
+//
+//    @Bean
+//    @Order(value = 1)
+//    public Docket groupRestApi() {
+//        SwaggerProperties swaggerProperties = swaggerProperties();
+//        Docket docket = new Docket(DocumentationType.SWAGGER_2)
+//                .enable(swagger_show)
+//                .apiInfo(apiInfo(swaggerProperties))
+//                .select()
+//                .apis(RequestHandlerSelectors.basePackage(swaggerProperties.getApiBasePackage()))
+//                .paths(PathSelectors.any())
+//                .build();
+//        if (swaggerProperties.isEnableSecurity()) {
+//            docket.securitySchemes(securitySchemes()).securityContexts(securityContexts());
+//        }
+//        return docket;
+//    }
+//
+//    private ApiInfo apiInfo(SwaggerProperties swaggerProperties) {
+//        return new ApiInfoBuilder()
+//                .title(swaggerProperties.getTitle())
+//                .description(swaggerProperties.getDescription())
+//                .contact(new Contact(swaggerProperties.getContactName(), swaggerProperties.getContactUrl(), swaggerProperties.getContactEmail()))
+//                .version(swaggerProperties.getVersion())
+//                .build();
+//    }
+//
+//    private List<ApiKey> securitySchemes() {
+//        //设置请求头信息
+//        List<ApiKey> result = new ArrayList<>();
+//        result.add(new ApiKey("token(前缀：" + AuthConstant.JWT_TOKEN_PREFIX + ")", AuthConstant.JWT_TOKEN_HEADER, "header"));
+//        result.add(new ApiKey("当前医院id", AuthConstant.HOSPITAL_ID_HEADER, "header"));
+//        result.add(new ApiKey("当前系统id", AuthConstant.SOFTWARE_ID_HEADER, "header"));
+//        return result;
+//    }
+//
+//    private List<SecurityContext> securityContexts() {
+//        //设置需要登录认证的路径
+//        List<SecurityContext> result = new ArrayList<>();
+//        result.add(getContextByPath("/*/.*"));
+//        return result;
+//    }
+//
+//    private SecurityContext getContextByPath(String pathRegex) {
+//        return SecurityContext.builder()
+//                .securityReferences(defaultAuth())
+//                .forPaths(PathSelectors.regex(pathRegex))
+//                .build();
+//    }
+//
+//    private List<SecurityReference> defaultAuth() {
+//        List<SecurityReference> result = new ArrayList<>();
+//        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+//        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+//        authorizationScopes[0] = authorizationScope;
+//        result.add(new SecurityReference("Authorization", authorizationScopes));
+//        return result;
+//    }
+//
+//    public SwaggerProperties swaggerProperties() {
+//        return SwaggerProperties.builder()
+//                .apiBasePackage("com.lantone")
+//                .title(swagger_title)
+//                .description("<div style='font-size:14px;color:red;'>" + swagger_des + "--RESTful APIs</div>")
+//                .contactName("lantone")
+//                .version(swagger_version)
+//                .enableSecurity(true)
+//                .build();
+//    }
+//
+//}
+
+import com.lantone.common.constant.AuthConstant;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import org.springdoc.core.GroupedOpenApi;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Collections;
+
+@Configuration
+public class OpenApiConfig {
+
+    @Value("${swagger.show:true}")
+    private boolean swaggerShow;
+
+    @Value("${swagger.title:API文档}")
+    private String swaggerTitle;
+
+    @Value("${swagger.description:}")
+    private String swaggerDescription;
+
+    @Value("${swagger.version:1.0}")
+    private String swaggerVersion;
+
+    @Value("${swagger.contact.name:lantone}")
+    private String contactName;
+
+    @Value("${swagger.contact.url:}")
+    private String contactUrl;
+
+    @Value("${swagger.contact.email:}")
+    private String contactEmail;
+
+    @Value("${swagger.enable-security:true}")
+    private boolean enableSecurity;
+
+    // 配置全局OpenAPI信息
+    @Bean
+    public OpenAPI customOpenAPI() {
+        OpenAPI openAPI = new OpenAPI()
+                .info(apiInfo());
+
+        // 根据开关决定是否启用Swagger
+        if (!swaggerShow) {
+            return openAPI;
+        }
+
+
+        // 添加安全配置
+        if (enableSecurity) {
+            // 注册安全方案
+            Components components = new Components()
+                    .addSecuritySchemes(AuthConstant.JWT_TOKEN_HEADER, jwtTokenSecurityScheme())
+                    .addSecuritySchemes(AuthConstant.HOSPITAL_ID_HEADER, hospitalIdSecurityScheme())
+                    .addSecuritySchemes(AuthConstant.SOFTWARE_ID_HEADER, softwareIdSecurityScheme());
+
+            openAPI.components(components);
+
+            // 全局安全要求
+            SecurityRequirement securityRequirement = new SecurityRequirement()
+                    .addList(AuthConstant.JWT_TOKEN_HEADER)
+                    .addList(AuthConstant.HOSPITAL_ID_HEADER)
+                    .addList(AuthConstant.SOFTWARE_ID_HEADER);
+
+            openAPI.security(Collections.singletonList(securityRequirement));
+        }
+
+        return openAPI;
+    }
+
+    // API基本信息配置
+    private Info apiInfo() {
+        return new Info()
+                .title(swaggerTitle)      // 必填
+                .version(swaggerVersion); // 必填
+    }
+
+    // 定义JWT Token安全方案
+    private SecurityScheme jwtTokenSecurityScheme() {
+        return new SecurityScheme()
+                .type(SecurityScheme.Type.APIKEY)
+                .in(SecurityScheme.In.HEADER)
+                .name(AuthConstant.JWT_TOKEN_HEADER)
+                .description("Token前缀: " + AuthConstant.JWT_TOKEN_PREFIX);
+    }
+
+    // 定义医院ID安全方案
+    private SecurityScheme hospitalIdSecurityScheme() {
+        return new SecurityScheme()
+                .type(SecurityScheme.Type.APIKEY)
+                .in(SecurityScheme.In.HEADER)
+                .name(AuthConstant.HOSPITAL_ID_HEADER)
+                .description("当前医院ID");
+    }
+
+    // 定义系统ID安全方案
+    private SecurityScheme softwareIdSecurityScheme() {
+        return new SecurityScheme()
+                .type(SecurityScheme.Type.APIKEY)
+                .in(SecurityScheme.In.HEADER)
+                .name(AuthConstant.SOFTWARE_ID_HEADER)
+                .description("当前系统ID");
+    }
+
+    // 配置扫描包路径（替代原来的basePackage）
+    @Bean
+    public GroupedOpenApi publicApi() {
+        return GroupedOpenApi.builder()
+                .group("default")
+                .packagesToScan("com.lantone")
+                .build();
+    }
+}

config-center/src/main/resources/shared/report-service-local.yml

@@ -12,6 +12,11 @@ spring:
   flyway:
     # 启用Flyway功能
     enabled: false
+  springdoc:
+    swagger-ui:
+      enabled: false
+    api-docs:
+      enabled: false
 
 swagger:
-  show: true
+  show: false

config-center/src/main/resources/shared/security-center-local.yml

@@ -12,5 +12,10 @@ spring:
   flyway:
     # 启用Flyway功能
     enabled: false
+  springdoc:
+    swagger-ui:
+      enabled: false
+    api-docs:
+      enabled: false
 
-swagger.show: true
+swagger.show: false

daqe-center/src/main/java/com/lantone/daqe/config/SwaggerConfig.java

@@ -1,16 +0,0 @@
-package com.lantone.daqe.config;
-
-import com.lantone.common.config.BaseSwaggerConfig;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @Description: Swagger相关配置
- * @author: rengb
- * @time: 2021/1/5 18:27
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig extends BaseSwaggerConfig {
-
-}

daqe-center/src/main/java/com/lantone/daqe/web/BlockLossManagementController.java

@@ -11,7 +11,7 @@ import com.lantone.daqe.dto.UpBlockLossByIdVO;
 import com.lantone.daqe.facade.BlockLossManagementFacade;
 import com.lantone.daqe.vo.GetBlockLossPageVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,20 +34,20 @@ public class BlockLossManagementController {
     @Autowired
     private BlockLossManagementFacade blockLossManagementFacade;
 
-    @ApiOperation(value = "获取病历数据丢失明细分页列表 [by:songxl]", notes = "获取病历数据丢失明细分页列表")
+    @Operation(summary = "获取病历数据丢失明细分页列表 [by:songxl]", description = "获取病历数据丢失明细分页列表")
     @PostMapping("/getBlockLossPage")
     public CommonResult<IPage<GetBlockLossPageDTO>> getBlockLossPage(@RequestBody GetBlockLossPageVO getBlockLossPageVO) {
         return CommonResult.success(blockLossManagementFacade.getBlockLossPage(getBlockLossPageVO));
     }
 
-    @ApiOperation(value = "通过id修改病历数据块丢失明细 [by:songxl]", notes = "通过id修改病历数据块丢失明细")
+    @Operation(summary = "通过id修改病历数据块丢失明细 [by:songxl]", description = "通过id修改病历数据块丢失明细")
     @PostMapping("/upBlockLossById")
     @Transactional
     public CommonResult<Boolean> upBlockLossById(@RequestBody @Valid UpBlockLossByIdVO upBlockLossByIdVO) {
         return CommonResult.success(blockLossManagementFacade.upBlockLossById(upBlockLossByIdVO));
     }
 
-    @ApiOperation(value = "数据对比 [by:songxl]", notes = "数据对比")
+    @Operation(summary = "数据对比 [by:songxl]", description = "数据对比")
     @PostMapping("/dataCompare")
     @Transactional
     public CommonResult<Boolean> dataCompare(@RequestBody @Valid DataCompareVO dataCompareVO) {
@@ -55,14 +55,14 @@ public class BlockLossManagementController {
     }
 
 
-    @ApiOperation(value = "丢失量分类汇总 [by:songxl]", notes = "丢失量分类汇总")
+    @Operation(summary = "丢失量分类汇总 [by:songxl]", description = "丢失量分类汇总")
     @PostMapping("/blockLossTypeGather")
     public CommonResult<BlockLossTypeGatherDTO> blockLossTypeGather(@RequestBody @Valid BlockLossTypeGatherVO blockLossTypeGatherVO) {
         return CommonResult.success(blockLossManagementFacade.blockLossTypeGather(blockLossTypeGatherVO));
     }
 
 
-    @ApiOperation(value = "数据补录 [by:songxl]", notes = "数据补录")
+    @Operation(summary = "数据补录 [by:songxl]", description = "数据补录")
     @PostMapping("/dataRepari")
     @Transactional
     public CommonResult<Boolean> dataRepari(@RequestBody @Valid DataRepariVO dataRepariVO) {

daqe-center/src/main/java/com/lantone/daqe/web/ColumnResultManagmentController.java

@@ -13,7 +13,7 @@ import com.lantone.daqe.vo.GetColumnResultPageVO;
 import com.lantone.daqe.vo.UpdateColumnResultVO;
 import com.lantone.daqe.vo.GetByIdColumnResultVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,39 +37,39 @@ public class ColumnResultManagmentController {
     private ColumnResultManagementFacade columnResultManagementFacade;
 
 
-    @ApiOperation(value = "获取字段校验问题明细分页列表 [by:zhanghang]")
+    @Operation(summary = "获取字段校验问题明细分页列表 [by:zhanghang]")
     @PostMapping("/getColumnResultPage")
     public CommonResult<IPage<GetColumnResultPageDTO>> getColumnResultPage(@RequestBody GetColumnResultPageVO getColumnResultPageVO) {
         return CommonResult.success(columnResultManagementFacade.getColumnResultPage(getColumnResultPageVO));
     }
 
-    @ApiOperation(value = "获取字段校验问题明细数量 [by:zhanghang]")
+    @Operation(summary = "获取字段校验问题明细数量 [by:zhanghang]")
     @PostMapping("/getColumnResultNumber")
     public CommonResult<GetColumnResultNumberDTO> getColumnResultNumber(@RequestBody GetColumnResultNumberVO getColumnResultNumberVO) {
         return CommonResult.success(columnResultManagementFacade.getColumnResultNumber(getColumnResultNumberVO));
     }
 
-    @ApiOperation(value = "修改字段校验问题明细 [by:zhanghang]")
+    @Operation(summary = "修改字段校验问题明细 [by:zhanghang]")
     @PostMapping("/updateColumnResult")
     @Transactional
     public CommonResult<Boolean> updateColumnResult(@RequestBody UpdateColumnResultVO updateColumnResultVO) {
         return CommonResult.success(columnResultManagementFacade.updateColumnResult(updateColumnResultVO));
     }
 
-    @ApiOperation(value = "根据ID查看字段校验问题明细 [by:zhanghang]")
+    @Operation(summary = "根据ID查看字段校验问题明细 [by:zhanghang]")
     @PostMapping("/getByIdColumnResult")
     public CommonResult<GetByIdColumnResultDTO> getByIdColumnResult(@RequestBody GetByIdColumnResultVO getByIdColumnResultVO) {
         return CommonResult.success(columnResultManagementFacade.getByIdColumnResult(getByIdColumnResultVO));
     }
 
-    @ApiOperation(value = "数据校验接口 [by:zhanghang]")
+    @Operation(summary = "数据校验接口 [by:zhanghang]")
     @PostMapping("/dataCheck")
     @Transactional
     public CommonResult<Boolean> dataCheck(@RequestBody DataCheckVO dataCheckVO) {
         return CommonResult.success(columnResultManagementFacade.dataCheck(dataCheckVO));
     }
 
-    @ApiOperation(value = "获取质控模块名称 [by:zhanghang]")
+    @Operation(summary = "获取质控模块名称 [by:zhanghang]")
     @PostMapping("/getModeName")
     @Transactional
     public CommonResult<List<String>> getModeName() {

daqe-center/src/main/java/com/lantone/daqe/web/ColumnVerifyManagementController.java

@@ -20,7 +20,7 @@ import com.lantone.daqe.vo.GetTableColumnNameVO;
 import com.lantone.daqe.vo.GetTableNameVO;
 import com.lantone.daqe.vo.UpdateColumnVerifyVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -45,65 +45,65 @@ public class ColumnVerifyManagementController {
     private ColumnVerifyManagementFacade columnVerifyManagementFacade;
 
 
-    @ApiOperation(value = "获取字段校验规则维护分页列表 [by:zhanghang]")
+    @Operation(summary = "获取字段校验规则维护分页列表 [by:zhanghang]")
     @PostMapping("/getColumnVerifyPage")
     public CommonResult<IPage<GetColumnVerifyPageDTO>> getColumnVerifyPage(@RequestBody GetColumnVerifyPageVO getColumnVerifyPageVO) {
         return CommonResult.success(columnVerifyManagementFacade.getColumnVerifyPage(getColumnVerifyPageVO));
     }
 
-    @ApiOperation(value = "根据ID获取字段校验规则明细数据 [by:zhanghang]")
+    @Operation(summary = "根据ID获取字段校验规则明细数据 [by:zhanghang]")
     @PostMapping("/getByIdColumnVerify")
     public CommonResult<GetByIdColumnVerifyDTO> getByIdColumnVerify(@RequestBody GetByIdColumnVerifyVO getByIdColumnVerifyVO) {
         return CommonResult.success(columnVerifyManagementFacade.getByIdColumnVerify(getByIdColumnVerifyVO));
     }
 
-    @ApiOperation(value = "查询下拉框获取数据库表中列数据表名称信息 [by:zhanghang]")
+    @Operation(summary = "查询下拉框获取数据库表中列数据表名称信息 [by:zhanghang]")
     @PostMapping("/getTableName")
     public CommonResult<List<GetTableNameDTO>> getTableName(@RequestBody GetTableNameVO getTableNameVO) {
         return CommonResult.success(columnVerifyManagementFacade.getTableName(getTableNameVO));
     }
 
-    @ApiOperation(value = "查询下拉框获取数据库表中列数据字段名称信息 [by:zhanghang]")
+    @Operation(summary = "查询下拉框获取数据库表中列数据字段名称信息 [by:zhanghang]")
     @PostMapping("/getColumnName")
     public CommonResult<List<GetColumnNameDTO>> getColumnName(@RequestBody GetColumnNameVO getColumnNameVO) {
         return CommonResult.success(columnVerifyManagementFacade.getColumnName(getColumnNameVO));
     }
 
-    @ApiOperation(value = "新增修改下拉框获取数据库表中列数据字段名称信息 [by:zhanghang]")
+    @Operation(summary = "新增修改下拉框获取数据库表中列数据字段名称信息 [by:zhanghang]")
     @PostMapping("/getAddUpColumnName")
     public CommonResult<List<GetTableColumnNameDTO>> getTableColumnName(@RequestBody GetTableColumnNameVO getTableColumnNameVO) {
         return CommonResult.success(columnVerifyManagementFacade.getTableColumnName(getTableColumnNameVO ));
     }
 
-    @ApiOperation(value = "下拉框获取正则式名称 [by:zhanghang]")
+    @Operation(summary = "下拉框获取正则式名称 [by:zhanghang]")
     @PostMapping("/getRegular")
     public CommonResult<List<GetRegularDTO>> getRegular(@RequestBody GetRegularVO getRegularVO) {
         return CommonResult.success(columnVerifyManagementFacade.getRegular(getRegularVO));
     }
 
 
-    @ApiOperation(value = "新增字段校验规则 [by:zhanghang]")
+    @Operation(summary = "新增字段校验规则 [by:zhanghang]")
     @PostMapping("/addColumnVerify")
     @Transactional
     public CommonResult<Boolean> addColumnVerify(@RequestBody AddColumnVerifyVO addColumnVerifyVO) {
         return CommonResult.success(columnVerifyManagementFacade.addColumnVerify(addColumnVerifyVO));
     }
 
-    @ApiOperation(value = "删除字段校验规则 [by:zhanghang]")
+    @Operation(summary = "删除字段校验规则 [by:zhanghang]")
     @PostMapping("/delColumnVerify")
     @Transactional
     public CommonResult<Boolean> delColumnVerify(@RequestBody DelColumnVerifyVO delColumnVerifyVO) {
         return CommonResult.success(columnVerifyManagementFacade.delColumnVerify(delColumnVerifyVO));
     }
 
-    @ApiOperation(value = "修改字段校验规则 [by:zhanghang]")
+    @Operation(summary = "修改字段校验规则 [by:zhanghang]")
     @PostMapping("/updateColumnVerify")
     @Transactional
     public CommonResult<Boolean> updateColumnVerify(@RequestBody UpdateColumnVerifyVO updateColumnVerifyVO) {
         return CommonResult.success(columnVerifyManagementFacade.updateColumnVerify(updateColumnVerifyVO));
     }
 
-    @ApiOperation(value = "根据表名新增字段信息 [by:zhanghang]")
+    @Operation(summary = "根据表名新增字段信息 [by:zhanghang]")
     @PostMapping("/addColumn")
     @Transactional
     public CommonResult<Boolean> addColumn(@RequestBody AddColumnVO addColumnVO) {

daqe-center/src/main/java/com/lantone/daqe/web/CurrencyManagmentController.java

@@ -6,7 +6,7 @@ import com.lantone.daqe.dto.GetConceptLibraryPageDTO;
 import com.lantone.daqe.facade.CurrencyManagementFacade;
 import com.lantone.daqe.vo.GetConceptLibraryPageVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,7 +26,7 @@ public class CurrencyManagmentController {
     @Autowired
     private CurrencyManagementFacade currencyManagementFacade;
 
-    @ApiOperation(value = "获取标准词和同义词(一对一)分页列表 [by:rengb]")
+    @Operation(summary = "获取标准词和同义词(一对一)分页列表 [by:rengb]")
     @PostMapping("/getConceptLibraryPage")
     public CommonResult<IPage<GetConceptLibraryPageDTO>> getConceptLibraryPage(@RequestBody GetConceptLibraryPageVO getConceptLibraryPageVO) {
         return CommonResult.success(currencyManagementFacade.getConceptLibraryPage(getConceptLibraryPageVO));

daqe-center/src/main/java/com/lantone/daqe/web/DiseaseManagementController.java

@@ -14,7 +14,7 @@ import com.lantone.daqe.vo.GetMatchingDiseasePageVO;
 import com.lantone.daqe.vo.MatchingDiseaseVO;
 import com.lantone.daqe.vo.UpDiseaseByIdVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -40,50 +40,50 @@ public class DiseaseManagementController {
     @Autowired
     private DiseaseManagementFacade diseaseManagementFacade;
 
-    @ApiOperation(value = "获取诊断分页列表 [by:songxl]", notes = "获取诊断分页列表")
+    @Operation(summary = "获取诊断分页列表 [by:songxl]", description = "获取诊断分页列表")
     @PostMapping("/getDiseasePage")
     public CommonResult<IPage<GetDiseasePageDTO>> getDiseasePage(@RequestBody GetDiseasePageVO getDiseasePageVO) {
         return CommonResult.success(diseaseManagementFacade.getDiseasePage(getDiseasePageVO));
     }
 
-    @ApiOperation(value = "新增诊断 [by:songxl]", notes = "新增诊断")
+    @Operation(summary = "新增诊断 [by:songxl]", description = "新增诊断")
     @PostMapping("/addDisease")
     public CommonResult<Boolean> addDisease(@RequestBody @Valid AddDiseaseVO addDiseaseVO) {
         return CommonResult.success(diseaseManagementFacade.addDisease(addDiseaseVO));
     }
 
-    @ApiOperation(value = "通过id修改诊断 [by:songxl]", notes = "通过id修改诊断")
+    @Operation(summary = "通过id修改诊断 [by:songxl]", description = "通过id修改诊断")
     @PostMapping("/upDiseaseById")
     public CommonResult<Boolean> upDiseaseById(@RequestBody @Valid UpDiseaseByIdVO upDiseaseByIdVO) {
         return CommonResult.success(diseaseManagementFacade.upDiseaseById(upDiseaseByIdVO));
     }
 
-    @ApiOperation(value = "通过id删除诊断 [by:songxl]", notes = "通过id删除诊断")
+    @Operation(summary = "通过id删除诊断 [by:songxl]", description = "通过id删除诊断")
     @PostMapping("/delDiseaseById")
     public CommonResult<Boolean> delDiseaseById(@RequestBody @Valid DelDiseaseByIdVO delDiseaseByIdVO) {
         return CommonResult.success(diseaseManagementFacade.delDiseaseById(delDiseaseByIdVO));
     }
 
-    @ApiOperation(value = "匹配诊断信息列表 [by:songxl]", notes = "匹配诊断信息列表")
+    @Operation(summary = "匹配诊断信息列表 [by:songxl]", description = "匹配诊断信息列表")
     @PostMapping("/getMatchingDiseasePage")
     public CommonResult<IPage<GetMatchingDiseasePageDTO>> getMatchingDiseasePage(@RequestBody GetMatchingDiseasePageVO getMatchingDiseasePageVO) {
         return CommonResult.success(diseaseManagementFacade.getMatchingDiseasePage(getMatchingDiseasePageVO));
     }
 
-    @ApiOperation(value = "匹配诊断 [by:songxl]", notes = "匹配诊断")
+    @Operation(summary = "匹配诊断 [by:songxl]", description = "匹配诊断")
     @PostMapping("/matchingDisease")
     public CommonResult<Boolean> matchingDisease(@RequestBody MatchingDiseaseVO matchingDiseaseVO) {
         return CommonResult.success(diseaseManagementFacade.matchingDisease(matchingDiseaseVO));
     }
 
-    @ApiOperation(value = "医院诊断标准词匹配信息导入 [by:songxl]", notes = "医院诊断标准词匹配信息导入")
+    @Operation(summary = "医院诊断标准词匹配信息导入 [by:songxl]", description = "医院诊断标准词匹配信息导入")
     @PostMapping("/importDisease")
     @Transactional
     public void importDisease(HttpServletResponse response, @RequestParam("file") MultipartFile file) {
         diseaseManagementFacade.importDisease(response, file);
     }
 
-    @ApiOperation(value = "已匹配诊断信息查看 [by:songxl]", notes = "已匹配诊断信息查看")
+    @Operation(summary = "已匹配诊断信息查看 [by:songxl]", description = "已匹配诊断信息查看")
     @PostMapping("/getDiseaseInfoById")
     public CommonResult<GetDiseaseInfoByIdDTO> getDiseaseInfoById(@RequestBody GetDiseaseInfoByIdVO getDiseaseInfoByIdVO) {
         return CommonResult.success(diseaseManagementFacade.getDiseaseInfoById(getDiseaseInfoByIdVO));

daqe-center/src/main/java/com/lantone/daqe/web/DrugManagementController.java

@@ -14,7 +14,7 @@ import com.lantone.daqe.vo.GetMatchingDrugPageVO;
 import com.lantone.daqe.vo.MatchingDrugVO;
 import com.lantone.daqe.vo.UpDrugByIdVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -40,50 +40,50 @@ public class DrugManagementController {
     @Autowired
     private DrugManagementFacade drugManagementFacade;
 
-    @ApiOperation(value = "获取药品分页列表 [by:songxl]")
+    @Operation(summary = "获取药品分页列表 [by:songxl]")
     @PostMapping("/getDrugPage")
     public CommonResult<IPage<GetDrugPageDTO>> getDrugPage(@RequestBody GetDrugPageVO getDrugPageVO) {
         return CommonResult.success(drugManagementFacade.getDrugPage(getDrugPageVO));
     }
 
-    @ApiOperation(value = "新增药品 [by:songxl]")
+    @Operation(summary = "新增药品 [by:songxl]")
     @PostMapping("/addDrug")
     public CommonResult<Boolean> addDrug(@RequestBody @Valid AddDrugVO addDrugVO) {
         return CommonResult.success(drugManagementFacade.addDrug(addDrugVO));
     }
 
-    @ApiOperation(value = "通过id修改药品 [by:songxl]")
+    @Operation(summary = "通过id修改药品 [by:songxl]")
     @PostMapping("/upDrugById")
     public CommonResult<Boolean> upDrugById(@RequestBody @Valid UpDrugByIdVO upDrugByIdVO) {
         return CommonResult.success(drugManagementFacade.upDrugById(upDrugByIdVO));
     }
 
-    @ApiOperation(value = "通过id删除药品 [by:songxl]")
+    @Operation(summary = "通过id删除药品 [by:songxl]")
     @PostMapping("/delDrugById")
     public CommonResult<Boolean> delDrugById(@RequestBody @Valid DelDrugByIdVO delDrugByIdVO) {
         return CommonResult.success(drugManagementFacade.delDrugById(delDrugByIdVO));
     }
 
-    @ApiOperation(value = "匹配药品信息 [by:songxl]")
+    @Operation(summary = "匹配药品信息 [by:songxl]")
     @PostMapping("/matchingDrug")
     public CommonResult<Boolean> matchingDrug(@RequestBody @Valid MatchingDrugVO matchingDrugVO) {
         return CommonResult.success(drugManagementFacade.matchingDrug(matchingDrugVO));
     }
 
-    @ApiOperation(value = "药品匹配信息导入 [by:songxl]", notes = "药品匹配信息导入")
+    @Operation(summary = "药品匹配信息导入 [by:songxl]", description = "药品匹配信息导入")
     @PostMapping("/importDrug")
     @Transactional
     public void importDrug(HttpServletResponse response, @RequestParam("file") MultipartFile file) {
         drugManagementFacade.importDrug(response, file);
     }
 
-    @ApiOperation(value = "获取药品匹配分页列表 [by:songxl]")
+    @Operation(summary = "获取药品匹配分页列表 [by:songxl]")
     @PostMapping("/getMatchingDrugPage")
     public CommonResult<IPage<GetMatchingDrugPageDTO>> getMatchingDrugPage(@RequestBody GetMatchingDrugPageVO getMatchingDrugPageVO) {
         return CommonResult.success(drugManagementFacade.getMatchingDrugPage(getMatchingDrugPageVO));
     }
 
-    @ApiOperation(value = "已匹配药品信息查看 [by:songxl]")
+    @Operation(summary = "已匹配药品信息查看 [by:songxl]")
     @PostMapping("/getDrugById")
     public CommonResult<GetDrugByIdDTO> getDrugById(@RequestBody GetDrugByIdVO getDrugByIdVO) {
         return CommonResult.success(drugManagementFacade.getDrugById(getDrugByIdVO));

daqe-center/src/main/java/com/lantone/daqe/web/OfficialCapacityManagementController.java

@@ -8,6 +8,7 @@ import com.lantone.daqe.vo.DelOfficialCapacityByIdVO;
 import com.lantone.daqe.vo.GetOfficialCapacityPageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,14 +31,14 @@ public class OfficialCapacityManagementController {
     private OfficialCapacityManagementFacade officialCapacityManagementFacade;
 
 
-    @ApiOperation(value = "获取职务职称变更记录 [by:zhanghang]")
+    @Operation(summary = "获取职务职称变更记录 [by:zhanghang]")
     @PostMapping("/getOfficialCapacityPage")
     public CommonResult<IPage<GetOfficialCapacityPageDTO>> getOfficialCapacityPage(@RequestBody GetOfficialCapacityPageVO getOfficialCapacityPageVO) {
         return CommonResult.success(officialCapacityManagementFacade.getOfficialCapacityPage(getOfficialCapacityPageVO));
     }
 
 
-    @ApiOperation(value = "删除职务职称变更记录 [by:zhanghang]")
+    @Operation(summary = "删除职务职称变更记录 [by:zhanghang]")
     @PostMapping("/delOfficialCapacityPage")
     public CommonResult<Boolean> delOfficialCapacityPage(@RequestBody DelOfficialCapacityByIdVO delOfficialCapacityByIdVO) {
         return CommonResult.success(officialCapacityManagementFacade.delOfficialCapacityPage(delOfficialCapacityByIdVO));

daqe-center/src/main/java/com/lantone/daqe/web/OperationManagementController.java

@@ -14,7 +14,7 @@ import com.lantone.daqe.vo.GetOperationPageVO;
 import com.lantone.daqe.vo.MatchingOperationVO;
 import com.lantone.daqe.vo.UpOperationByIdVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -40,50 +40,50 @@ public class OperationManagementController {
     @Autowired
     private OperationManagementFacade operationManagementFacade;
 
-    @ApiOperation(value = "获取手术分页列表 [by:songxl]")
+    @Operation(summary = "获取手术分页列表 [by:songxl]")
     @PostMapping("/getOperationPage")
     public CommonResult<IPage<GetOperationPageDTO>> getOperationPage(@RequestBody GetOperationPageVO getOperationPageVO) {
         return CommonResult.success(operationManagementFacade.getOperationPage(getOperationPageVO));
     }
 
-    @ApiOperation(value = "新增手术 [by:songxl]")
+    @Operation(summary = "新增手术 [by:songxl]")
     @PostMapping("/addOperation")
     public CommonResult<Boolean> addOperation(@RequestBody @Valid AddOperationVO addOperationVO) {
         return CommonResult.success(operationManagementFacade.addOperation(addOperationVO));
     }
 
-    @ApiOperation(value = "通过id修改手术 [by:songxl]")
+    @Operation(summary = "通过id修改手术 [by:songxl]")
     @PostMapping("/upOperationById")
     public CommonResult<Boolean> upOperationById(@RequestBody @Valid UpOperationByIdVO upOperationByIdVO) {
         return CommonResult.success(operationManagementFacade.upOperationById(upOperationByIdVO));
     }
 
-    @ApiOperation(value = "通过id删除手术 [by:songxl]")
+    @Operation(summary = "通过id删除手术 [by:songxl]")
     @PostMapping("/delOperationById")
     public CommonResult<Boolean> delOperationById(@RequestBody @Valid DelOperationByIdVO delOperationByIdVO) {
         return CommonResult.success(operationManagementFacade.delOperationById(delOperationByIdVO));
     }
 
-    @ApiOperation(value = "匹配手术信息 [by:songxl]", notes = "匹配手术信息")
+    @Operation(summary = "匹配手术信息 [by:songxl]", description = "匹配手术信息")
     @PostMapping("/matchingOperation")
     public CommonResult<Boolean> matchingOperation(@RequestBody MatchingOperationVO matchingOperationVO) {
         return CommonResult.success(operationManagementFacade.matchingOperation(matchingOperationVO));
     }
 
-    @ApiOperation(value = "医院手术标准词匹配信息导入 [by:songxl]", notes = "医院手术标准词匹配信息导入")
+    @Operation(summary = "医院手术标准词匹配信息导入 [by:songxl]", description = "医院手术标准词匹配信息导入")
     @PostMapping("/importOperation")
     @Transactional
     public void importOperation(HttpServletResponse response, @RequestParam("file") MultipartFile file) {
         operationManagementFacade.importOperation(response, file);
     }
 
-    @ApiOperation(value = "获取手术匹配信息分页列表 [by:songxl]")
+    @Operation(summary = "获取手术匹配信息分页列表 [by:songxl]")
     @PostMapping("/getMatchingOperationPage")
     public CommonResult<IPage<GetMatchingOperationPageDTO>> getMatchingOperationPage(@RequestBody GetMatchingOperationVO getMatchingOperationVO) {
         return CommonResult.success(operationManagementFacade.getMatchingOperationPage(getMatchingOperationVO));
     }
 
-    @ApiOperation(value = "手术匹配信息查看 [by:songxl]")
+    @Operation(summary = "手术匹配信息查看 [by:songxl]")
     @PostMapping("/getOperationById")
     public CommonResult<GetOperationByIdDTO> getOperationById(@RequestBody GetOperationByIdVO getOperationByIdVO) {
         return CommonResult.success(operationManagementFacade.getOperationById(getOperationByIdVO));

daqe-center/src/main/java/com/lantone/daqe/web/RecordTemplateManagementController.java

@@ -8,7 +8,7 @@ import com.lantone.daqe.facade.RecordTemplateManagementFacade;
 import com.lantone.daqe.vo.GetRecordTemplateByIdVO;
 import com.lantone.daqe.vo.GetRecordTemplatePageVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,14 +30,14 @@ public class RecordTemplateManagementController {
     private RecordTemplateManagementFacade recordTemplateManagementFacade;
 
 
-    @ApiOperation(value = "获取文书模板分页列表 [by:zhanghang]")
+    @Operation(summary = "获取文书模板分页列表 [by:zhanghang]")
     @PostMapping("/getRecordTemplatePage")
     public CommonResult<IPage<GetRecordTemplatePageDTO>> getRecordTemplatePage(@RequestBody GetRecordTemplatePageVO getRecordTemplatePageVO) {
         return CommonResult.success(recordTemplateManagementFacade.getRecordTemplatePage(getRecordTemplatePageVO));
     }
 
 
-    @ApiOperation(value = "查看文书模板信息 [by:zhanghang]")
+    @Operation(summary = "查看文书模板信息 [by:zhanghang]")
     @PostMapping("/getRecordTemplateManage")
     public CommonResult<GetRecordTemplateManageDTO> getRecordTemplateManage(@RequestBody GetRecordTemplateByIdVO getRecordTemplateByIdVO) {
         return CommonResult.success(recordTemplateManagementFacade.getRecordTemplateById(getRecordTemplateByIdVO));

daqe-center/src/main/java/com/lantone/daqe/web/RegularManagementController.java

@@ -10,7 +10,7 @@ import com.lantone.daqe.vo.DelRegularByIdVO;
 import com.lantone.daqe.vo.GetRegularPageVO;
 import com.lantone.daqe.vo.UpRegularByIdVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,34 +33,34 @@ public class RegularManagementController {
     @Autowired
     private RegularManagementFacade regularManagementFacade;
 
-    @ApiOperation(value = "获取正则式维护分页列表 [by:songxl]", notes = "获取正则式维护分页列表")
+    @Operation(summary = "获取正则式维护分页列表 [by:songxl]", description = "获取正则式维护分页列表")
     @PostMapping("/getRegularPage")
     public CommonResult<IPage<GetRegularPageDTO>> getRegularPage(@RequestBody GetRegularPageVO getRegularPageVO) {
         return CommonResult.success(regularManagementFacade.getRegularPage(getRegularPageVO));
     }
 
-    @ApiOperation(value = "判断该正则式是否关联 [by:songxl]", notes = "判断该正则式是否关联")
+    @Operation(summary = "判断该正则式是否关联 [by:songxl]", description = "判断该正则式是否关联")
     @PostMapping("/isRelation")
     @Transactional
     public CommonResult<Boolean> isRelation(@RequestBody @Valid UpRegularByIdVO upRegularByIdVO) {
         return CommonResult.success(regularManagementFacade.isRelation(upRegularByIdVO));
     }
 
-    @ApiOperation(value = "新增正则式 [by:songxl]", notes = "新增正则式")
+    @Operation(summary = "新增正则式 [by:songxl]", description = "新增正则式")
     @PostMapping("/addRegular")
     @Transactional
     public CommonResult<Boolean> addRegular(@RequestBody @Valid AddRegularVO addRegularVO) {
         return CommonResult.success(regularManagementFacade.addRegular(addRegularVO));
     }
 
-    @ApiOperation(value = "通过id修改正则式 [by:songxl]", notes = "通过id修改正则式")
+    @Operation(summary = "通过id修改正则式 [by:songxl]", description = "通过id修改正则式")
     @PostMapping("/upRegularById")
     @Transactional
     public CommonResult<Boolean> upRegularById(@RequestBody @Valid UpRegularByIdVO upRegularByIdVO) {
         return CommonResult.success(regularManagementFacade.upRegularById(upRegularByIdVO));
     }
 
-    @ApiOperation(value = "通过id删除正则式 [by:songxl]", notes = "通过id删除正则式")
+    @Operation(summary = "通过id删除正则式 [by:songxl]", description = "通过id删除正则式")
     @PostMapping("/delRegularById")
     @Transactional
     public CommonResult<Boolean> delRegularById(@RequestBody @Valid DelRegularByIdVO delRegularByIdVO) {

external-service/src/main/java/com/lantone/external/config/SwaggerConfig.java

@@ -1,16 +0,0 @@
-package com.lantone.external.config;
-
-import com.lantone.common.config.BaseSwaggerConfig;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @Description: Swagger相关配置
- * @author: rengb
- * @time: 2021/1/5 18:27
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig extends BaseSwaggerConfig {
-
-}

external-service/src/main/java/com/lantone/external/web/BehospitalManagementController.java

@@ -5,7 +5,7 @@ import com.lantone.external.dto.GetLostBehospitalDTO;
 import com.lantone.external.facade.BehospitalManagementFacade;
 import com.lantone.external.vo.GetLostBehospitalVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,7 +27,7 @@ public class BehospitalManagementController {
     @Autowired
     private BehospitalManagementFacade behospitalManagementFacade;
 
-    @ApiOperation(value = "获取丢失的住院病历信息 [by:rengb]", notes = "获取丢失的住院病历信息")
+    @Operation(summary = "获取丢失的住院病历信息 [by:rengb]", description = "获取丢失的住院病历信息")
     @PostMapping("/getLostBehospital")
     public CommonResult<GetLostBehospitalDTO> getLostBehospital(@RequestBody @Valid GetLostBehospitalVO getLostBehospitalVO) {
         return CommonResult.success(behospitalManagementFacade.getLostBehospital(getLostBehospitalVO));

mdsp-service/src/main/java/com/lantone/config/SwaggerConfig.java

@@ -1,16 +0,0 @@
-package com.lantone.config;
-
-import com.lantone.common.config.BaseSwaggerConfig;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @Description: Swagger相关配置
- * @author: rengb
- * @time: 2021/1/5 18:27
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig extends BaseSwaggerConfig {
-
-}

mdsp-service/src/main/java/com/lantone/web/cdss/CdssRetrievalController.java

@@ -5,7 +5,7 @@ import com.lantone.dto.med.RetrievalDTO;
 import com.lantone.facade.cdss.CdssRetrievalFacade;
 import com.lantone.vo.cdss.RetrievalVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,8 +27,8 @@ public class CdssRetrievalController {
     @Autowired
     private CdssRetrievalFacade cdssRetrievalFacade;
 
-    @ApiOperation(value = "术语检索[zhaops]",
-            notes = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理、12-中医疾病、13-中医证候、14-麻醉、15-药品剂型、16-给药途径 <br>" +
+    @Operation(summary = "术语检索[zhaops]",
+            description = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理、12-中医疾病、13-中医证候、14-麻醉、15-药品剂型、16-给药途径 <br>" +
                     "inputStr： 检索内容<br>" +
                     "defaultList： 默认展示 0:不展示，1：展示全部<br>" +
                     "sex： 性别：1-男、2-女、3-通用 <br>" +

mdsp-service/src/main/java/com/lantone/web/cdss/MappingConfigController.java

@@ -13,7 +13,7 @@ import com.lantone.vo.cdss.MappingConfigPageVO;
 import com.lantone.vo.cdss.MappingConfigVO;
 import com.lantone.vo.cdss.PrecDataVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,15 +43,15 @@ public class MappingConfigController {
     private MappingConfigFacade mappingConfigFacade;
 
 
-    @ApiOperation(value = "数据导入模板导出[by:zhaops]",
-            notes = "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>")
+    @Operation(summary = "数据导入模板导出[by:zhaops]",
+            description = "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>")
     @PostMapping("/exportExcelModule")
     public void exportExcelModule(HttpServletResponse response, @RequestBody @Valid MappingConfigVO mappingConfigVO) {
         mappingConfigFacade.exportExcelModule(response, mappingConfigVO);
     }
 
-    @ApiOperation(value = "预匹配导入术语校验[by:zhaops]",
-            notes = "file（必填）：预匹配文件 <br>" +
+    @Operation(summary = "预匹配导入术语校验[by:zhaops]",
+            description = "file（必填）：预匹配文件 <br>" +
                     "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>")
     @PostMapping(value = "/dataVerify", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public CommonResult<Boolean> dataVerify(@RequestParam("file") MultipartFile file,
@@ -60,8 +60,8 @@ public class MappingConfigController {
         return CommonResult.success(data);
     }
 
-    @ApiOperation(value = "预匹配[by:zhaops]",
-            notes = "file（必填）：预匹配文件 <br>" +
+    @Operation(summary = "预匹配[by:zhaops]",
+            description = "file（必填）：预匹配文件 <br>" +
                     "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>")
     @PostMapping(value = "/precDataMatch", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public void precDataMatch(@RequestParam("file") MultipartFile file,
@@ -70,7 +70,7 @@ public class MappingConfigController {
         mappingConfigFacade.precDataMatch(file, type, response);
     }
 
-    @ApiOperation(value = "预匹配_远程调用[by:zhaops]", notes = "")
+    @Operation(summary = "预匹配_远程调用[by:zhaops]", description = "")
     @PostMapping(value = "/precDataMatch_remote", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @ApiIgnore
     public CommonResult<List<MappingConfigWrapper>> precDataMatch_remote(@RequestParam("file") MultipartFile file,
@@ -79,8 +79,8 @@ public class MappingConfigController {
         return CommonResult.success(data);
     }
 
-    @ApiOperation(value = "预匹配（非文件匹配）[by:zhaops]",
-            notes = "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>" +
+    @Operation(summary = "预匹配（非文件匹配）[by:zhaops]",
+            description = "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>" +
                     "hisName（必填）：医院术语名称 <br>" +
                     "hisDetailName（选填）：医院术语名称-细项 <br>" +
                     "code（选填）：诊断ICD10编码、手术编码、中医疾病编码、中医证候编码 <br>" +
@@ -91,8 +91,8 @@ public class MappingConfigController {
         return CommonResult.success(data);
     }
 
-    @ApiOperation(value = "数据导入校验[by:zhaops]",
-            notes = "file（必填）：导入文件 <br>" +
+    @Operation(summary = "数据导入校验[by:zhaops]",
+            description = "file（必填）：导入文件 <br>" +
                     "hospitalId（必填）：医院id <br>" +
                     "uesrId（必填）：操作人id <br>" +
                     "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>")
@@ -105,8 +105,8 @@ public class MappingConfigController {
         return CommonResult.success(data);
     }
 
-    @ApiOperation(value = "数据导入[by:zhaops]",
-            notes = "file（必填）：导入文件 <br>" +
+    @Operation(summary = "数据导入[by:zhaops]",
+            description = "file（必填）：导入文件 <br>" +
                     "hospitalId（必填）：医院id <br>" +
                     "uesrId（必填）：操作人id <br>" +
                     "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>")
@@ -121,8 +121,8 @@ public class MappingConfigController {
         mappingConfigFacade.importExcel(response, file, hospitalId, type, userId);
     }
 
-    @ApiOperation(value = "数据导入_远程调用[by:zhaops]",
-            notes = "file（必填）：导入文件 <br>" +
+    @Operation(summary = "数据导入_远程调用[by:zhaops]",
+            description = "file（必填）：导入文件 <br>" +
                     "hospitalId（必填）：医院id <br>" +
                     "uesrId（必填）：操作人id <br>" +
                     "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>")
@@ -139,8 +139,8 @@ public class MappingConfigController {
     }
 
 
-    @ApiOperation(value = "数据导出[by:zhaops]",
-            notes = "hospitalId（必填）：医院id <br>" +
+    @Operation(summary = "数据导出[by:zhaops]",
+            description = "hospitalId（必填）：医院id <br>" +
                     "isMatch（选填，默认全部）：是否匹配（0-未匹配、1-已匹配、2-多条匹配） <br>" +
                     "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>")
     @PostMapping("/exportExcel")
@@ -148,8 +148,8 @@ public class MappingConfigController {
         mappingConfigFacade.exportExcel(response, mappingConfigPageVO);
     }
 
-    @ApiOperation(value = "数据导出_远程调用[by:zhaops]",
-            notes = "")
+    @Operation(summary = "数据导出_远程调用[by:zhaops]",
+            description = "")
     @PostMapping("/exportExcel_remote")
     @ApiIgnore
     public CommonResult<List<MappingConfigWrapper>> exportExcel_remote(@RequestBody @Valid MappingConfigPageVO mappingConfigPageVO) {
@@ -157,8 +157,8 @@ public class MappingConfigController {
         return CommonResult.success(data);
     }
 
-    @ApiOperation(value = "分页查询[by:zhaops]",
-            notes = "hospitalId（必填）：医院id <br>" +
+    @Operation(summary = "分页查询[by:zhaops]",
+            description = "hospitalId（必填）：医院id <br>" +
                     "isMatch（选填，默认全部）：是否匹配（0-未匹配、1-已匹配、2-多条匹配） <br>" +
                     "hisName（必填）：医院术语名称 <br>" +
                     "uniqueName（选填，可为空）：标准术语名称 <br>" +
@@ -172,8 +172,8 @@ public class MappingConfigController {
     }
 
 
-    @ApiOperation(value = "获取映射关系[by:zhaops]",
-            notes = "id：关联关系id")
+    @Operation(summary = "获取映射关系[by:zhaops]",
+            description = "id：关联关系id")
     @PostMapping("/getRecord")
     @Transactional
     public CommonResult<MappingConfigWrapper> getRecord(@RequestBody @Valid IdVO idVO) {
@@ -181,8 +181,8 @@ public class MappingConfigController {
         return CommonResult.success(data);
     }
 
-    @ApiOperation(value = "映射关系是否已存在[by:zhaops]",
-            notes = "id：关联关系id <br>" +
+    @Operation(summary = "映射关系是否已存在[by:zhaops]",
+            description = "id：关联关系id <br>" +
                     "hospitalId（必填）：医院id <br>" +
                     "hisName（必填）：医院术语名称 <br>" +
                     "hisDetailName（选填，可为空）：医院术语名称-细项 <br>" +
@@ -196,8 +196,8 @@ public class MappingConfigController {
         return CommonResult.success(data);
     }
 
-    @ApiOperation(value = "查询已映射关系[by:zhaops]",
-            notes = "hospitalId（必填）：医院id <br>" +
+    @Operation(summary = "查询已映射关系[by:zhaops]",
+            description = "hospitalId（必填）：医院id <br>" +
                     "hisName（必填）：医院术语名称 <br>" +
                     "hisDetailName（选填，可为空）：医院术语名称-细项 <br>" +
                     "type（必填）： 类型：1-化验、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>")
@@ -208,8 +208,8 @@ public class MappingConfigController {
     }
 
 
-    @ApiOperation(value = "保存或修改映射关系[by:zhaops]",
-            notes = "id：关联关系id <br>" +
+    @Operation(summary = "保存或修改映射关系[by:zhaops]",
+            description = "id：关联关系id <br>" +
                     "hospitalId（必填）：医院id <br>" +
                     "hisName（必填）：医院术语名称 <br>" +
                     "hisDetailName（选填，可为空）：医院术语名称-细项 <br>" +
@@ -223,8 +223,8 @@ public class MappingConfigController {
         return CommonResult.success(data);
     }
 
-    @ApiOperation(value = "删除映射关系[by:zhaops]",
-            notes = "id：关联关系id")
+    @Operation(summary = "删除映射关系[by:zhaops]",
+            description = "id：关联关系id")
     @PostMapping("/deleteRecord")
     @Transactional
     public CommonResult<Boolean> deleteRecord(@RequestBody @Valid IdVO idVO) {
@@ -232,8 +232,8 @@ public class MappingConfigController {
         return CommonResult.success(data);
     }
 
-    @ApiOperation(value = "批量删除映射关系[by:zhaops]",
-            notes = "ids：关联关系id列表")
+    @Operation(summary = "批量删除映射关系[by:zhaops]",
+            description = "ids：关联关系id列表")
     @PostMapping("/deleteRecords")
     @Transactional
     public CommonResult<Boolean> deleteRecords(@RequestBody @Valid IdListVO idListVO) {

mdsp-service/src/main/java/com/lantone/web/med/MedRetrievalController.java

@@ -12,7 +12,7 @@ import com.lantone.vo.med.IndexByApprovalVO;
 import com.lantone.vo.med.KllisDetailVO;
 import com.lantone.vo.med.RetrievalVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -41,8 +41,8 @@ public class MedRetrievalController {
     @Autowired
     private MedRetrievalFacade medRetrievalFacade;
 
-    @ApiOperation(value = "术语检索[zhaops]",
-            notes = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、15-药品剂型、16-给药途径、17-物理治疗 <br>" +
+    @Operation(summary = "术语检索[zhaops]",
+            description = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、15-药品剂型、16-给药途径、17-物理治疗 <br>" +
                     "inputStr： 检索内容<br>" +
                     "defaultList： 默认展示 0:不展示，1：展示全部<br>" +
                     "notInIds： 排除项标准术语id<br>" +
@@ -54,8 +54,8 @@ public class MedRetrievalController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "术语批量查询[zhaops]",
-            notes = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、15-药品剂型、16-给药途径<br>" +
+    @Operation(summary = "术语批量查询[zhaops]",
+            description = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、15-药品剂型、16-给药途径<br>" +
                     "ids： 术语id列表<br>" +
                     "names： 术语列表<br>" +
                     "source： 数据来源：-1-id匹配、1-标准词、2-同义词、3-编码、4-历史数据、5-相似词、99-数据迁移<br>")
@@ -65,15 +65,15 @@ public class MedRetrievalController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "化验小项术语批量查询获取范围[gaodm]",
-            notes = "names： 术语列表<br>")
+    @Operation(summary = "化验小项术语批量查询获取范围[gaodm]",
+            description = "names： 术语列表<br>")
     @PostMapping("/getLisDetaisByNames")
     public RespDTO<Map<String, KllisDetailDTO>> getLisDetaisByNames(@RequestBody KllisDetailVO kllisDetailVO) {
         return RespDTO.onSuc(klConceptFacade.getLisDetaisByNamesFac(kllisDetailVO));
     }
 
-    @ApiOperation(value = "术语关联医学术语检索[zhaops]",
-            notes = "inputStr： 检索内容<br>")
+    @Operation(summary = "术语关联医学术语检索[zhaops]",
+            description = "inputStr： 检索内容<br>")
     @PostMapping("/filter")
     public RespDTO<List<IndexBatchDTO>> filter(@Valid @RequestBody FilterVO filterVO) {
         List<IndexBatchDTO> data = klConceptFacade.filter(filterVO);
@@ -84,8 +84,8 @@ public class MedRetrievalController {
      * @param indexByApprovalVO
      * @return
      */
-    @ApiOperation(value = "术语关联医学术语检索[zhaops]",
-            notes = "approvalList： 国药准字列表<br>")
+    @Operation(summary = "术语关联医学术语检索[zhaops]",
+            description = "approvalList： 国药准字列表<br>")
     @PostMapping("/indexByApproval")
     public RespDTO<List<IndexBatchDTO>> indexByApproval(@Valid @RequestBody IndexByApprovalVO indexByApprovalVO) {
         List<IndexBatchDTO> data = klConceptFacade.indexByApproval(indexByApprovalVO);

mdsp-service/src/main/java/com/lantone/web/med/TermMatchingController.java

@@ -5,7 +5,7 @@ import com.lantone.dto.med.TermConceptDTO;
 import com.lantone.facade.med.TermMatchingFacade;
 import com.lantone.vo.med.TermMatchingVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -28,8 +28,8 @@ public class TermMatchingController {
     @Autowired
     private TermMatchingFacade termMatchingFacade;
 
-    @ApiOperation(value = "术语匹配搜索[wangfeng]",
-            notes = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>" +
+    @Operation(summary = "术语匹配搜索[wangfeng]",
+            description = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、16-给药途径 <br>" +
                     "inputStr： 检索内容<br>")
     @PostMapping("/termMatching")
     public RespDTO<List<TermConceptDTO>> getTermMatching(@Valid @RequestBody TermMatchingVO termMatchingVO) {

message-service/src/main/java/com/lantone/message/config/SwaggerConfig.java

@@ -1,16 +0,0 @@
-package com.lantone.message.config;
-
-import com.lantone.common.config.BaseSwaggerConfig;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @Description: Swagger相关配置
- * @author: rengb
- * @time: 2021/1/5 18:27
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig extends BaseSwaggerConfig {
-
-}

message-service/src/main/java/com/lantone/message/web/BackSampleController.java

@@ -5,7 +5,7 @@ import com.lantone.common.dto.SendToTopicDTO;
 import com.lantone.common.util.ListUtil;
 import com.lantone.message.gateway.MqttGateway;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -28,14 +28,14 @@ public class BackSampleController {
     private MqttGateway mqttGateway;
 
     @PostMapping("/sendToDefaultTopic")
-    @ApiOperation("向默认主题发送消息")
+    @Operation(summary = "向默认主题发送消息")
     public CommonResult sendToDefaultTopic(String payload) {
         mqttGateway.sendToMqtt(payload);
         return CommonResult.success(null);
     }
 
     @PostMapping("/sendToTopic")
-    @ApiOperation("向指定主题发送消息")
+    @Operation(summary = "向指定主题发送消息")
     public CommonResult sendToTopic(@RequestBody List<SendToTopicDTO> sendToTopics) {
         if(ListUtil.isNotEmpty(sendToTopics)){
             sendToTopics.stream().forEach(sendToTopicDTO -> {

message-service/src/main/java/com/lantone/message/web/RedisRefreshController.java

@@ -3,7 +3,7 @@ package com.lantone.message.web;
 import com.lantone.common.api.CommonResult;
 import com.lantone.message.component.MessageSender;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +23,7 @@ public class RedisRefreshController {
     @Autowired
     private MessageSender messageSender;
 
-    @ApiOperation(value = "redis刷新处理")
+    @Operation(summary = "redis刷新处理")
     @PostMapping("/redisRefresh")
     public CommonResult redisRefresh(@RequestBody String type) {
         messageSender.sendRedisCacheRefreshMessage(type);

message-service/src/main/java/com/lantone/message/web/SyslogHandleController.java

@@ -6,7 +6,7 @@ import com.lantone.common.dto.LoginLogDTO;
 import com.lantone.common.dto.OperationLogDTO;
 import com.lantone.message.component.MessageSender;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,21 +26,21 @@ public class SyslogHandleController {
     @Autowired
     private MessageSender messageSender;
 
-    @ApiOperation(value = "用户登录成功后记录日志处理")
+    @Operation(summary = "用户登录成功后记录日志处理")
     @PostMapping("/loginLogHandle")
     public CommonResult loginLogHandle(@RequestBody LoginLogDTO loginLog) {
         messageSender.sendLogSuccessRecordMessage(loginLog);
         return CommonResult.success(null);
     }
 
-    @ApiOperation(value = "用户操作后记录日志处理")
+    @Operation(summary = "用户操作后记录日志处理")
     @PostMapping("/operationLogHandle")
     public CommonResult operationLogHandle(@RequestBody OperationLogDTO operationLog) {
         messageSender.sendOperLogRecordMessage(operationLog);
         return CommonResult.success(null);
     }
 
-    @ApiOperation(value = "用户操作异常记录日志处理")
+    @Operation(summary = "用户操作异常记录日志处理")
     @PostMapping("/abnormalLogHandle")
     public CommonResult abnormalLogHandle(@RequestBody AbnormalLogDTO abnormalLogDTO) {
         messageSender.operErrorLogRecordMessage(abnormalLogDTO);

pom.xml

@@ -308,6 +308,12 @@
                 <artifactId>easypoi-spring-boot-starter</artifactId>
                 <version>${easypoi.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-ui</artifactId>
+                <version>1.6.14</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

report-service/pom.xml

@@ -18,10 +18,12 @@
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>bus-interceptor</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>dblayer-mbg</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <!-- 解析客户端操作系统、浏览器等 -->
         <dependency>
@@ -53,6 +55,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>1.6.14</version>
+        </dependency>
     </dependencies>
 
 <!--    <build>-->

report-service/src/main/java/com/lantone/report/config/SwaggerConfig.java

@@ -1,16 +0,0 @@
-package com.lantone.report.config;
-
-import com.lantone.common.config.BaseSwaggerConfig;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @Description: Swagger相关配置
- * @author: rengb
- * @time: 2021/1/5 18:27
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig extends BaseSwaggerConfig {
-
-}

report-service/src/main/java/com/lantone/report/web/MedAppealExamineInfoManagementController.java

@@ -16,7 +16,7 @@ import com.lantone.report.vo.GetComplaintDetailMsgVO;
 import com.lantone.report.vo.GetComplaintRecordVO;
 import com.lantone.report.vo.RejectedVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,47 +39,47 @@ public class MedAppealExamineInfoManagementController {
     @Autowired
     MedAppealExamineInfoManagementFacade medAppealExamineInfoManagementFacade;
 
-    @ApiOperation(value = "获取申述记录列表[by:zhanghang]",
-            notes = "获取申述记录列表")
+    @Operation(summary = "获取申述记录列表[by:zhanghang]",
+            description = "获取申述记录列表")
     @PostMapping("/getComplaintRecord")
     public CommonResult<IPage<GetComplaintRecordDTO>> getComplaintRecord(@RequestBody GetComplaintRecordVO getComplaintRecordVO) {
         Page<GetComplaintRecordDTO> complaintRecord = medAppealExamineInfoManagementFacade.getComplaintRecord(getComplaintRecordVO);
         return CommonResult.success(complaintRecord);
     }
 
-    @ApiOperation(value = "获取申诉审核列表[by:zhanghang]",
-            notes = "获取申诉审核列表")
+    @Operation(summary = "获取申诉审核列表[by:zhanghang]",
+            description = "获取申诉审核列表")
     @PostMapping("/getAppealReview")
     public CommonResult<IPage<GetAppealReviewDTO>> getAppealReview(@RequestBody GetAppealReviewVO getAppealReviewVO) {
         Page<GetAppealReviewDTO> appealReview = medAppealExamineInfoManagementFacade.getAppealReview(getAppealReviewVO);
         return CommonResult.success(appealReview);
     }
 
-    @ApiOperation(value = "驳回[by:zhanghang]",
-            notes = "驳回")
+    @Operation(summary = "驳回[by:zhanghang]",
+            description = "驳回")
     @PostMapping("/rejected")
     @Transactional
     public CommonResult<Boolean> rejected(@RequestBody RejectedVo rejectedVo) {
         return CommonResult.success(medAppealExamineInfoManagementFacade.rejected(rejectedVo));
     }
 
-    @ApiOperation(value = "审核查看[by:zhanghang]",
-            notes = "审核查看")
+    @Operation(summary = "审核查看[by:zhanghang]",
+            description = "审核查看")
     @PostMapping("/getApprovedView")
     public CommonResult<GetAppealInfoDTO> getApprovedView(@RequestBody GetAppealInfoVO getAppealInfoVO) {
         return CommonResult.success(medAppealExamineInfoManagementFacade.getApprovedView(getAppealInfoVO));
     }
 
-    @ApiOperation(value = "获取待审核数量[by:zhanghang]",
-            notes = "获取待审核数量")
+    @Operation(summary = "获取待审核数量[by:zhanghang]",
+            description = "获取待审核数量")
     @PostMapping("/getAuditNumber")
     public CommonResult<Integer> getAuditNumber(@RequestBody GetAuditNumberVO getAuditNumberVO) {
         Integer complaintRecord = medAppealExamineInfoManagementFacade.getAuditNumber(getAuditNumberVO);
         return CommonResult.success(complaintRecord);
     }
 
-    @ApiOperation(value = "获取该申诉记录最新缺陷详情[by:zhanghang]",
-            notes = "获取该申诉记录最新缺陷详情")
+    @Operation(summary = "获取该申诉记录最新缺陷详情[by:zhanghang]",
+            description = "获取该申诉记录最新缺陷详情")
     @PostMapping("/getComplaintDetailMsg")
     public CommonResult<QcresultDetail> getComplaintDetailMsg(@RequestBody GetComplaintDetailMsgVO getComplaintDetailMsgVO) {
         return CommonResult.success(medAppealExamineInfoManagementFacade.getComplaintDetailMsg(getComplaintDetailMsgVO));

report-service/src/main/java/com/lantone/report/web/MedAppealInfoManagementController.java

@@ -15,7 +15,7 @@ import com.lantone.report.vo.GetAppealModeVo;
 import com.lantone.report.vo.GetAppealOperationTypeVO;
 import com.lantone.report.vo.GetReviewerVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -43,54 +43,54 @@ public class MedAppealInfoManagementController {
     MedAppealInfoManagementFacade medAppealInfoManagementFacade;
 
 
-    @ApiOperation(value = "申诉[by:songxl]",
-            notes = "申诉")
+    @Operation(summary = "申诉[by:songxl]",
+            description = "申诉")
     @PostMapping("/addAppealInfo")
     @Transactional
     public CommonResult<Boolean> addAppealInfo(@RequestBody @Valid AddAppealInfoVO addAppealInfoVO) {
         return CommonResult.success(medAppealInfoManagementFacade.addAppealInfo(addAppealInfoVO));
     }
 
-    @ApiOperation(value = "获取审核人[by:songxl]",
-            notes = "获取审核人")
+    @Operation(summary = "获取审核人[by:songxl]",
+            description = "获取审核人")
     @PostMapping("/getReviewer")
     public CommonResult<List<GetReviewerDTO>> getReviewer(@RequestBody GetReviewerVO getReviewerVO) {
         List<GetReviewerDTO> reviewers = medAppealInfoManagementFacade.getReviewer(getReviewerVO);
         return CommonResult.success(reviewers);
     }
 
-    @ApiOperation(value = "再次申诉获取操作类型[by:songxl]",
-            notes = "再次申诉获取操作类型")
+    @Operation(summary = "再次申诉获取操作类型[by:songxl]",
+            description = "再次申诉获取操作类型")
     @PostMapping("/getAppealOperationType")
     public CommonResult<Map<String, String>> getAppealOperationType(@RequestBody @Valid GetAppealOperationTypeVO getAppealOperationTypeVO) {
         return CommonResult.success(medAppealInfoManagementFacade.getAppealOperationType(getAppealOperationTypeVO));
     }
 
-    @ApiOperation(value = "撤回申诉[by:songxl]",
-            notes = "撤回申诉")
+    @Operation(summary = "撤回申诉[by:songxl]",
+            description = "撤回申诉")
     @PostMapping("/cancelAppealInfo")
     @Transactional
     public CommonResult<Boolean> cancelAppealInfo(@RequestBody @Valid CancelAppealInfoVO cancelAppealInfoVO) {
         return CommonResult.success(medAppealInfoManagementFacade.cancelAppealInfo(cancelAppealInfoVO));
     }
 
-    @ApiOperation(value = "申诉记录详情-查看[by:songxl]",
-            notes = "申诉记录详情-查看")
+    @Operation(summary = "申诉记录详情-查看[by:songxl]",
+            description = "申诉记录详情-查看")
     @PostMapping("/getAppealInfo")
     public CommonResult<GetAppealInfoDTO> getAppealInfo(@RequestBody GetAppealInfoVO getAppealInfoVO) {
         return CommonResult.success(medAppealInfoManagementFacade.getAppealInfo(getAppealInfoVO));
     }
 
 
-    @ApiOperation(value = "申诉审核科室下拉列表查询[by:songxl]",
-            notes = "申诉审核科室下拉列表查询")
+    @Operation(summary = "申诉审核科室下拉列表查询[by:songxl]",
+            description = "申诉审核科室下拉列表查询")
     @PostMapping("/getAppealDept")
     public CommonResult<List<GetAppealDeptDTO>> getAppealDept(@RequestBody @Valid GetAppealDeptVo getAppealDeptVo) {
         return CommonResult.success(medAppealInfoManagementFacade.getAppealDept(getAppealDeptVo));
     }
 
-    @ApiOperation(value = "申诉审核模块下拉列表查询[by:songxl]",
-            notes = "申诉审核模块下拉列表查询")
+    @Operation(summary = "申诉审核模块下拉列表查询[by:songxl]",
+            description = "申诉审核模块下拉列表查询")
     @PostMapping("/getAppealMode")
     public CommonResult<List<GetAppealModeDTO>> getAppealMode(@RequestBody @Valid GetAppealModeVo getAppealModeVo) {
         return CommonResult.success(medAppealInfoManagementFacade.getAppealMode(getAppealModeVo));

report-service/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
+springdoc.api-docs.enabled=false
+springdoc.swagger-ui.enabled=false

security-center/pom.xml

@@ -18,10 +18,12 @@
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>bus-interceptor</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>dblayer-mbg</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <!-- 解析客户端操作系统、浏览器等 -->
         <dependency>
@@ -44,6 +46,11 @@
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-okhttp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-ui</artifactId>
+            <version>1.6.14</version>
+        </dependency>
     </dependencies>
 
 <!--    <build>-->

security-center/src/main/java/com/lantone/security/config/SwaggerConfig.java

@@ -1,16 +0,0 @@
-package com.lantone.security.config;
-
-import com.lantone.common.config.BaseSwaggerConfig;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @Description: Swagger相关配置
- * @author: rengb
- * @time: 2021/1/5 18:27
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig extends BaseSwaggerConfig {
-
-}

security-center/src/main/java/com/lantone/security/web/DataAuthManagementController.java

@@ -11,7 +11,7 @@ import com.lantone.security.vo.GetDataAuthPageVO;
 import com.lantone.security.vo.GetDoctorPageVO;
 import com.lantone.security.vo.UpdateAuthVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,53 +37,53 @@ public class DataAuthManagementController {
     @Autowired
     private DataAuthManagementFacade dataAuthManagementFacade;
 
-    @ApiOperation(value = "新增数据权限[by:songxl]")
+    @Operation(summary = "新增数据权限[by:songxl]")
     @PostMapping("/addAuth")
     @Transactional
     public CommonResult<Boolean> addAuth(@RequestBody @Valid AddAuthVO addAuthVO) {
         return CommonResult.success(dataAuthManagementFacade.addDataAuth(addAuthVO));
     }
 
-    @ApiOperation(value = "修改数据权限[by:songxl]")
+    @Operation(summary = "修改数据权限[by:songxl]")
     @PostMapping("/updateAuth")
     @Transactional
     public CommonResult<Boolean> updateAuth(@RequestBody @Valid UpdateAuthVO updateAuthVO) {
         return CommonResult.success(dataAuthManagementFacade.updateDataAuth(updateAuthVO));
     }
 
-    @ApiOperation(value = "启用禁用数据权限[by:songxl]")
+    @Operation(summary = "启用禁用数据权限[by:songxl]")
     @PostMapping("/disableAuth")
     @Transactional
     public CommonResult<Boolean> disableAuth(@RequestParam @Valid @NotNull(message = "数据权限id为空") Long id, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
         return CommonResult.success(dataAuthManagementFacade.disableDataAuth(id, status));
     }
 
-    @ApiOperation(value = "删除数据权限[by:songxl]")
+    @Operation(summary = "删除数据权限[by:songxl]")
     @PostMapping("/deleteAuth")
     @Transactional
     public CommonResult<Boolean> deleteAuth(@RequestParam @Valid @NotNull(message = "数据权限id为空") Long id) {
         return CommonResult.success(dataAuthManagementFacade.deleteDataAuth(id));
     }
 
-    @ApiOperation(value = "查看数据权限[by:songxl]")
+    @Operation(summary = "查看数据权限[by:songxl]")
     @PostMapping("/getDataAuthById")
     public CommonResult<GetDataAuthByIdDTO> getDataAuthById(@RequestParam @Valid @NotNull(message = "数据权限id为空") Long id) {
         return CommonResult.success(dataAuthManagementFacade.getDataAuthById(id));
     }
 
-    @ApiOperation(value = "获取医生列表[by:songxl]")
+    @Operation(summary = "获取医生列表[by:songxl]")
     @PostMapping("/getDoctorPage")
     public CommonResult<IPage<GetDoctorPageDTO>> getDoctorPage(@RequestBody @Valid GetDoctorPageVO getDoctorPageVO) {
         return CommonResult.success(dataAuthManagementFacade.getDoctorPage(getDoctorPageVO));
     }
 
-    @ApiOperation(value = "获取数据权限列表[by:songxl]")
+    @Operation(summary = "获取数据权限列表[by:songxl]")
     @PostMapping("/getDataAuthPage")
     public CommonResult<IPage<GetDataAuthPageDTO>> getDataAuthPage(@RequestBody @Valid GetDataAuthPageVO getDataAuthPageVO) {
         return CommonResult.success(dataAuthManagementFacade.getDataAuthPage(getDataAuthPageVO));
     }
 
-    @ApiOperation(value = "加载所有用户的数据权限[by:cy]")
+    @Operation(summary = "加载所有用户的数据权限[by:cy]")
     @PostMapping("/initUserDataAuth")
     @ApiIgnore
     public CommonResult<Boolean> initUserDataAuth() {

security-center/src/main/java/com/lantone/security/web/DictionaryManagementController.java

@@ -7,7 +7,7 @@ import com.lantone.security.facade.DictionaryManagementFacade;
 import com.lantone.security.vo.GetDictionaryVO;
 import com.lantone.security.vo.SaveDictionaryVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,40 +33,40 @@ public class DictionaryManagementController {
     @Autowired
     private DictionaryManagementFacade dictionaryManagementFacade;
 
-    @ApiOperation(value = "新增字典[by:cy]")
+    @Operation(summary = "新增字典[by:cy]")
     @PostMapping("/addDictionary")
     @Transactional
     public CommonResult<Object> addDictionary(@RequestBody @Valid SaveDictionaryVO saveDictionaryVO) {
         return CommonResult.success(dictionaryManagementFacade.addDictionary(saveDictionaryVO));
     }
 
-    @ApiOperation(value = "修改字典[by:cy]")
+    @Operation(summary = "修改字典[by:cy]")
     @PostMapping("/updateDictionary")
     @Transactional
     public CommonResult<Object> updateDictionary(@RequestBody @Valid SaveDictionaryVO saveDictionaryVO) {
         return CommonResult.success(dictionaryManagementFacade.updateDictionary(saveDictionaryVO));
     }
 
-    @ApiOperation(value = "查看字典管理[by:cy]")
+    @Operation(summary = "查看字典管理[by:cy]")
     @PostMapping("/getDictionary")
     public CommonResult<IPage<DictionaryInfo>> getDictionary(@RequestBody GetDictionaryVO getDictionaryVO) {
         return CommonResult.success(dictionaryManagementFacade.getDictionary(getDictionaryVO));
     }
 
-    @ApiOperation(value = "删除字典管理[by:cy]")
+    @Operation(summary = "删除字典管理[by:cy]")
     @PostMapping("/deleteDictionary")
     @Transactional
     public CommonResult<Boolean> deleteDictionary(@RequestParam @Valid @NotNull(message = "字典id为空") Integer id) {
         return CommonResult.success(dictionaryManagementFacade.deleteDictionary(id));
     }
 
-    @ApiOperation(value = "查看字典管理代码类别[by:cy]")
+    @Operation(summary = "查看字典管理代码类别[by:cy]")
     @PostMapping("/getCodeCategory")
     public CommonResult<List<String>> getCodeCategory(@RequestParam("groupType") String groupType) {
         return CommonResult.success(dictionaryManagementFacade.getCodeCategory(groupType));
     }
 
-    @ApiOperation(value = "加载所有系统字典信息[by:cy]")
+    @Operation(summary = "加载所有系统字典信息[by:cy]")
     @PostMapping("/initDicMap")
     @ApiIgnore
     public CommonResult<Boolean> initDicMap() {

security-center/src/main/java/com/lantone/security/web/FuncManagementController.java

@@ -7,7 +7,7 @@ import com.lantone.security.vo.AddMenuVO;
 import com.lantone.security.vo.UpdateMenuVO;
 import com.lantone.security.facade.FuncManagementFacade;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,47 +36,47 @@ public class FuncManagementController {
     @Autowired
     private FuncManagementFacade funcManagementFacade;
 
-    @ApiOperation(value = "获取功能菜单列表 [by:songxl]")
+    @Operation(summary = "获取功能菜单列表 [by:songxl]")
     @PostMapping("/getMenusTree")
     public CommonResult<List<GetMenusTreeDTO>> getMenusTree() {
         return CommonResult.success(funcManagementFacade.getMenusTree());
     }
 
-    @ApiOperation(value = "添加功能菜单 [by:songxl]")
+    @Operation(summary = "添加功能菜单 [by:songxl]")
     @PostMapping("/addMenu")
     @Transactional
     public CommonResult<Boolean> addMenu(@RequestBody @Valid AddMenuVO addMenuVO) {
         return CommonResult.success(funcManagementFacade.addMenu(addMenuVO));
     }
 
-    @ApiOperation(value = "修改功能菜单 [by:songxl]")
+    @Operation(summary = "修改功能菜单 [by:songxl]")
     @PostMapping("/updateMenu")
     @Transactional
     public CommonResult<Boolean> updateMenu(@RequestBody @Valid UpdateMenuVO updateMenuVO) {
         return CommonResult.success(funcManagementFacade.updateMenu(updateMenuVO));
     }
 
-    @ApiOperation(value = "查看功能菜单 [by:songxl]")
+    @Operation(summary = "查看功能菜单 [by:songxl]")
     @PostMapping("/getMenuById")
     public CommonResult<GetMenuByIdDTO> getMenuById(@RequestParam @Valid @NotNull(message = "功能菜单编号为空") Long id, @RequestParam @Valid @NotNull(message = "系统编号为空") Long softwareId) {
         return CommonResult.success(funcManagementFacade.getMenuById(id, softwareId));
     }
 
-    @ApiOperation(value = "删除功能菜单 [by:songxl]")
+    @Operation(summary = "删除功能菜单 [by:songxl]")
     @PostMapping("/deleteMenu")
     @Transactional
     public CommonResult<Boolean> deleteMenu(@RequestParam @Valid @NotNull(message = "功能菜单编号为空") Long id) {
         return CommonResult.success(funcManagementFacade.deleteMenu(id));
     }
 
-    @ApiOperation(value = "启用禁用功能菜单 [by:songxl]")
+    @Operation(summary = "启用禁用功能菜单 [by:songxl]")
     @PostMapping("/disableMenu")
     @Transactional
     public CommonResult<Boolean> disableMenu(@RequestParam @Valid @NotNull(message = "功能菜单id为空") Long id, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
         return CommonResult.success(funcManagementFacade.disableMenu(id, status));
     }
 
-    @ApiOperation(value = "加载所有资源与角色访问对应关系[by:cy]")
+    @Operation(summary = "加载所有资源与角色访问对应关系[by:cy]")
     @PostMapping("/initResourceRolesMap")
     @ApiIgnore
     public CommonResult<Boolean> initResourceRolesMap() {

security-center/src/main/java/com/lantone/security/web/HospitalManagementController.java

@@ -9,7 +9,7 @@ import com.lantone.security.vo.GetHospitalListInfoVO;
 import com.lantone.security.vo.UpdateHospitalVO;
 import com.lantone.security.facade.HospitalManagementFacade;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,21 +35,21 @@ import java.util.Map;
 public class HospitalManagementController {
     @Autowired
     private HospitalManagementFacade hospitalManagementFacade;
-    @ApiOperation(value = "添加组织 [by:songxl]")
+    @Operation(summary = "添加组织 [by:songxl]")
     @PostMapping("/addHospital")
     @Transactional
     public CommonResult<Boolean> addHospital(@RequestBody @Valid AddHospitalVO addHospitalVO) {
         return CommonResult.success(hospitalManagementFacade.addHospital(addHospitalVO));
     }
-    @ApiOperation(value = "修改组织 [by:songxl]")
+    @Operation(summary = "修改组织 [by:songxl]")
     @PostMapping("/updateHospital")
     @Transactional
     public CommonResult<Boolean> updateHospital(@RequestBody @Valid UpdateHospitalVO updateHospitalVO) {
         return CommonResult.success(hospitalManagementFacade.updateHospital(updateHospitalVO));
     }
 
-    @ApiOperation(value = "删除组织 [by:songxl]",
-            notes = "type:组织机构类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院 5:科室），必填<br>")
+    @Operation(summary = "删除组织 [by:songxl]",
+            description = "type:组织机构类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院 5:科室），必填<br>")
     @PostMapping("/deleteHospital")
     @Transactional
     public CommonResult<Boolean> deleteHospital(@RequestParam @Valid @NotNull(message = "组织编号为空") Long HospitalId,
@@ -58,8 +58,8 @@ public class HospitalManagementController {
     }
 
 
-    @ApiOperation(value = "禁用|启用组织 [by:songxl]",
-            notes = "type:组织机构类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院 5:科室），必填<br>")
+    @Operation(summary = "禁用|启用组织 [by:songxl]",
+            description = "type:组织机构类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院 5:科室），必填<br>")
     @PostMapping("/disableHospital")
     @Transactional
     public CommonResult<Boolean> disableHospital(@RequestParam @Valid @NotNull(message = "组织编号为空") Long HospitalId,
@@ -68,25 +68,25 @@ public class HospitalManagementController {
         return CommonResult.success(hospitalManagementFacade.disableHospital(HospitalId,status,type));
     }
 
-    @ApiOperation(value = "查看功能 [by:songxl]",
-            notes = "type:组织机构类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院 5:科室），必填<br>")
+    @Operation(summary = "查看功能 [by:songxl]",
+            description = "type:组织机构类型（0:AI病案质控平台 1:集团医院 2:医共 3:医联 4:医院 5:科室），必填<br>")
     @PostMapping("/getHospitalById")
     public CommonResult<GetHospitalByIdDTO> getHospitalById(@RequestParam @Valid @NotNull(message = "组织编号为空") Long HospitalId,@RequestParam @Valid @NotNull(message = "组织类型为空") int type) {
         return CommonResult.success(hospitalManagementFacade.getHospitalById(HospitalId,type));
     }
 
-    @ApiOperation(value = "组织管理列表页管理员下拉框筛选类型、病区、职称查询 [by:songxl]")
+    @Operation(summary = "组织管理列表页管理员下拉框筛选类型、病区、职称查询 [by:songxl]")
     @PostMapping("/getManagerBoxInfo")
     public CommonResult<Map<String,Object>> getManagerBoxInfo() {
         return CommonResult.success(hospitalManagementFacade.getManagerBoxInfo());
     }
-    @ApiOperation(value = "组织管理列表页查询 [by:songxl]")
+    @Operation(summary = "组织管理列表页查询 [by:songxl]")
     @PostMapping("/getHospitalListInfo")
     public CommonResult<List<GetHospitalListInfoDTO>> getHospitalListInfo(@RequestBody GetHospitalListInfoVO getHospitalListInfoVO) {
         return CommonResult.success(hospitalManagementFacade.getHospitalListInfo(getHospitalListInfoVO));
     }
 
-    @ApiOperation(value = "重置密码 [by:songxl]")
+    @Operation(summary = "重置密码 [by:songxl]")
     @PostMapping("/resetPassword")
     @Transactional
     public CommonResult<Boolean> resetPassword(@RequestParam @Valid @NotNull(message = "组织编号为空") Long HospitalId) {

security-center/src/main/java/com/lantone/security/web/HospitalSetManagementController.java

@@ -8,7 +8,7 @@ import com.lantone.security.vo.SaveHospitalSetVO;
 import com.lantone.security.entity.HospitalSet;
 import com.lantone.security.facade.HospitalSetManagementFacade;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,40 +34,40 @@ public class HospitalSetManagementController {
     @Autowired
     private HospitalSetManagementFacade hospitalSetManagementFacade;
 
-    @ApiOperation(value = "新增参数[by:cy]")
+    @Operation(summary = "新增参数[by:cy]")
     @PostMapping("/addHospitalSet")
     @Transactional
     public CommonResult<Object> addHospitalSet(@RequestBody @Valid SaveHospitalSetVO saveHospitalSetVO) {
         return CommonResult.success(hospitalSetManagementFacade.addHospitalSet(saveHospitalSetVO));
     }
 
-    @ApiOperation(value = "修改参数[by:cy]")
+    @Operation(summary = "修改参数[by:cy]")
     @PostMapping("/updateHospitalSet")
     @Transactional
     public CommonResult<Object> updateHospitalSet(@RequestBody @Valid SaveHospitalSetVO saveHospitalSetVO) {
         return CommonResult.success(hospitalSetManagementFacade.updateHospitalSet(saveHospitalSetVO));
     }
 
-    @ApiOperation(value = "查看参数管理[by:cy]")
+    @Operation(summary = "查看参数管理[by:cy]")
     @PostMapping("/getHospitalSet")
     public CommonResult<IPage<HospitalSet>> getDictionary(@RequestBody GetHospitalSetVO getHospitalSetVO) {
         return CommonResult.success(hospitalSetManagementFacade.getHospitalSet(getHospitalSetVO));
     }
 
-    @ApiOperation(value = "删除参数管理[by:cy]")
+    @Operation(summary = "删除参数管理[by:cy]")
     @PostMapping("/deleteHospitalSet")
     @Transactional
     public CommonResult<Boolean> deleteHospitalSet(@RequestParam("id") @Valid @NotNull(message = "参数id不能为空") Integer id) {
         return CommonResult.success(hospitalSetManagementFacade.deleteHospitalSet(id));
     }
 
-    @ApiOperation(value = "查看参数管理所属组织[by:cy]")
+    @Operation(summary = "查看参数管理所属组织[by:cy]")
     @PostMapping("/getHospitalNames")
     public CommonResult<List<GetRealHospitalDTO>> getHospitalNames(@RequestParam("hospitalName") String hospitalName) {
         return CommonResult.success(hospitalSetManagementFacade.getHospitalNames(hospitalName));
     }
 
-    @ApiOperation(value = "加载所有组织机构参数配置信息[by:cy]")
+    @Operation(summary = "加载所有组织机构参数配置信息[by:cy]")
     @PostMapping("/initHospitalSetMap")
     @ApiIgnore
     public CommonResult<Boolean> initHospitalSetMap() {

security-center/src/main/java/com/lantone/security/web/LogManagementController.java

@@ -15,7 +15,7 @@ import com.lantone.security.vo.GetLoginNameAndIpVO;
 import com.lantone.security.vo.GetOperationLogVO;
 import com.lantone.security.facade.LogManagementFacade;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -40,70 +40,70 @@ public class LogManagementController {
     private LogManagementFacade logManagementFacade;
 
 
-    @ApiOperation(value = "查看登录日志[by:cy]")
+    @Operation(summary = "查看登录日志[by:cy]")
     @PostMapping("/getLoginLog")
     public CommonResult<IPage<LoginLogDTO>> getLoginLog(@RequestBody GetLoginLogVO getLoginLogVO) {
         return CommonResult.success(logManagementFacade.getLoginLog(getLoginLogVO));
     }
 
-    @ApiOperation(value = "查看登录日志登录用户|登录ip地址[by:cy]")
+    @Operation(summary = "查看登录日志登录用户|登录ip地址[by:cy]")
     @PostMapping("/getLoginLogNameAndIp")
     public CommonResult<List<String>> getLoginLogNameAndIp(@RequestBody @Valid GetLoginNameAndIpVO getLoginNameAndIpVO) {
         return CommonResult.success(logManagementFacade.getLoginLogNameAndIp(getLoginNameAndIpVO));
     }
 
-    @ApiOperation(value = "新增登录日志[by:cy]")
+    @Operation(summary = "新增登录日志[by:cy]")
     @PostMapping("/addLoginLog")
     @ApiIgnore
     public CommonResult<Boolean> addLoginLog(@RequestBody LoginLogDTO loginLog) {
         return CommonResult.success(logManagementFacade.addLoginLog(loginLog));
     }
 
-    @ApiOperation(value = "查看操作日志[by:cy]")
+    @Operation(summary = "查看操作日志[by:cy]")
     @PostMapping("/getOperationLog")
     public CommonResult<IPage<OperationLogDTO>> getOperationLog(@RequestBody GetOperationLogVO getOperationLogVO) {
         return CommonResult.success(logManagementFacade.getOperationLog(getOperationLogVO));
     }
 
-    @ApiOperation(value = "查看操作日志操作用户[by:cy]")
+    @Operation(summary = "查看操作日志操作用户[by:cy]")
     @PostMapping("/getOperationLogName")
     public CommonResult<List<String>> getOperationLogName(@RequestParam String operationName) {
         return CommonResult.success(logManagementFacade.getOperationLogName(operationName));
     }
 
-    @ApiOperation(value = "新增操作日志[by:cy]")
+    @Operation(summary = "新增操作日志[by:cy]")
     @PostMapping("/addOperLog")
     @ApiIgnore
     public CommonResult<Boolean> addOperLog(@RequestBody OperationLogDTO operationLog) {
         return CommonResult.success(logManagementFacade.addOperLog(operationLog));
     }
 
-    @ApiOperation(value = "查看异常日志[by:cy]")
+    @Operation(summary = "查看异常日志[by:cy]")
     @PostMapping("/getAbnormalLog")
     public CommonResult<IPage<AbnormalLogDTO>> getAbnormalLog(@RequestBody GetAbnormalLogVO getAbnormalLogVO) {
         return CommonResult.success(logManagementFacade.getAbnormalLog(getAbnormalLogVO));
     }
 
-    @ApiOperation(value = "查看异常日志请求方式|ip地址[by:cy]")
+    @Operation(summary = "查看异常日志请求方式|ip地址[by:cy]")
     @PostMapping("/getAbnormalLogWayAndIp")
     public CommonResult<List<String>> getAbnormalLogWayAndIp(@RequestBody @Valid GetAbnormalWayAndIpVO getAbnormalWayAndIpVO) {
         return CommonResult.success(logManagementFacade.getAbnormalLogWayAndIp(getAbnormalWayAndIpVO));
     }
 
-    @ApiOperation(value = "新增异常日志[by:cy]")
+    @Operation(summary = "新增异常日志[by:cy]")
     @PostMapping("/addOperErrorLog")
     @ApiIgnore
     public CommonResult<Boolean> addOperErrorLog(@RequestBody AbnormalLogDTO abnormalLogDTO) {
         return CommonResult.success(logManagementFacade.addOperErrorLog(abnormalLogDTO));
     }
 
-    @ApiOperation(value = "获取操作记录数据[by:songxl]")
+    @Operation(summary = "获取操作记录数据[by:songxl]")
     @PostMapping("/getOperationLogs")
     public CommonResult<List<GetOperationLogDTO>> getOperationLogs(@RequestBody DataCompareVO dataCompareVO) {
         return CommonResult.success(logManagementFacade.getOperationLogs(dataCompareVO));
     }
 
-    @ApiOperation(value = "获取该时间段的日志数量[by:songxl]")
+    @Operation(summary = "获取该时间段的日志数量[by:songxl]")
     @PostMapping("/getOperationLogNum")
     public CommonResult<Integer> getOperationLogNum(@RequestBody BlockLossTypeGatherVO blockLossTypeGatherVO) {
         return CommonResult.success(logManagementFacade.getOperationLogNum(blockLossTypeGatherVO));

security-center/src/main/java/com/lantone/security/web/MedoupManagementController.java

@@ -8,7 +8,7 @@ import com.lantone.security.vo.DeleteMedoupManageVO;
 import com.lantone.security.vo.GetMedoupManageVO;
 import com.lantone.security.vo.UpdateMedoupManageVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -28,27 +28,27 @@ public class MedoupManagementController {
     @Autowired
     MedoupManagementFacade medoupManagementFacade;
 
-    @ApiOperation(value = "新增医疗组信息 [by:zhanghang]")
+    @Operation(summary = "新增医疗组信息 [by:zhanghang]")
     @PostMapping("/addMedoupManage")
     @Transactional
     public CommonResult<Boolean> addMedoupManage(@RequestBody AddMedoupManageVO addMedoupManageVO) {
         return CommonResult.success(medoupManagementFacade.addMedoupManage(addMedoupManageVO));
     }
 
-    @ApiOperation(value = "查看医疗组具体信息 [by:zhanghang]")
+    @Operation(summary = "查看医疗组具体信息 [by:zhanghang]")
     @PostMapping("/getMedoupManage")
     public CommonResult<GetMedoupManageDTO> getMedoupManage(@RequestBody GetMedoupManageVO getMedoupManageVO) {
         return CommonResult.success(medoupManagementFacade.getMedoupManage(getMedoupManageVO));
     }
 
-    @ApiOperation(value = "修改医疗组信息 [by:zhanghang]")
+    @Operation(summary = "修改医疗组信息 [by:zhanghang]")
     @PostMapping("/updateMedoupManage")
     @Transactional
     public CommonResult<Boolean> updateMedoupManage(@RequestBody UpdateMedoupManageVO updateMedoupManageVO) {
         return CommonResult.success(medoupManagementFacade.updateMedoupManage(updateMedoupManageVO));
     }
 
-    @ApiOperation(value = "删除医疗组信息 [by:zhanghang]")
+    @Operation(summary = "删除医疗组信息 [by:zhanghang]")
     @PostMapping("/deleteMedoupManage")
     @Transactional
     public CommonResult<Boolean> deleteMedoupManage(@RequestBody DeleteMedoupManageVO deleteMedoupManageVO) {

security-center/src/main/java/com/lantone/security/web/NoticeManagementController.java

@@ -12,7 +12,7 @@ import com.lantone.security.vo.GetMyNoticeListVO;
 import com.lantone.security.vo.ListManagePageVO;
 import com.lantone.security.facade.NoticeManagementFacade;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,47 +39,47 @@ public class NoticeManagementController {
     @Autowired
     private NoticeManagementFacade noticeManagementFacade;
 
-    @ApiOperation(value = "我的通知列表页")
+    @Operation(summary = "我的通知列表页")
     @PostMapping(value = "/listPage")
     public CommonResult<IPage<GetMyNoticeListDTO>> listPage(@Valid @RequestBody GetMyNoticeListVO getMyNoticeListVO) {
         return CommonResult.success(noticeManagementFacade.listPage(getMyNoticeListVO));
     }
 
-    @ApiOperation(value = "知管理列表页")
+    @Operation(summary = "知管理列表页")
     @PostMapping(value = "/listManagePage")
     public CommonResult<IPage<ListManagePageDTO>> listManagePage(@Valid @RequestBody ListManagePageVO listManagePageVO) {
         return CommonResult.success(noticeManagementFacade.listManagePage(listManagePageVO));
     }
 
-    @ApiOperation(value = "获取指定组织的用户")
+    @Operation(summary = "获取指定组织的用户")
     @PostMapping(value = "/getHospitalUser")
     public CommonResult<IPage<GetHospitalUserPageDTO>> getHospitalUser(@Valid @RequestBody GetHospitalUserVO getHospitalUserVO) {
         return CommonResult.success(noticeManagementFacade.getHospitalUser(getHospitalUserVO));
     }
 
-    @ApiOperation(value = "获取未读信息数量")
+    @Operation(summary = "获取未读信息数量")
     @PostMapping(value = "/getNotNoticeCount")
     public CommonResult<Map<String, Integer>> getNotNoticeCount() {
         return CommonResult.success(noticeManagementFacade.getNotNoticeCount());
     }
 
 
-    @ApiOperation(value = "添加")
+    @Operation(summary = "添加")
     @PostMapping(value = "/add")
     @Transactional
     public CommonResult<Boolean> add(@Valid @RequestBody AddNoticeVO addNoticeVO) {
         return CommonResult.success(noticeManagementFacade.add(addNoticeVO));
     }
 
-    @ApiOperation(value = "查看",
-            notes = "type:管理列表查看通知内容还是我的通知列表查看通知功能（0:管理页面查看，1:我的通知列表查看），必填<br>")
+    @Operation(summary = "查看",
+            description = "type:管理列表查看通知内容还是我的通知列表查看通知功能（0:管理页面查看，1:我的通知列表查看），必填<br>")
     @PostMapping(value = "/getNoticeInfoById")
     public CommonResult<GetNoticeInfoByIdDTO> getNoticeInfoById(@RequestParam @Valid @NotNull(message = "通知编号为空") Long id
             , @RequestParam @Valid @NotBlank(message = "查看类型为空") String type) {
         return CommonResult.success(noticeManagementFacade.getNoticeInfoById(id, type));
     }
 
-    @ApiOperation(value = "删除")
+    @Operation(summary = "删除")
     @PostMapping(value = "/deleteNoticeInfo")
     @Transactional
     public CommonResult<Boolean> deleteNoticeInfo(@RequestParam @Valid @NotNull(message = "通知编号为空") Long id) {

security-center/src/main/java/com/lantone/security/web/RegionManagementController.java

@@ -9,7 +9,7 @@ import com.lantone.security.vo.SaveRegionVO;
 import com.lantone.security.vo.UpdateRegionVO;
 import com.lantone.security.facade.RegionManagementFacade;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,35 +33,35 @@ public class RegionManagementController {
     @Autowired
     private RegionManagementFacade sysRegionFacade;
 
-    @ApiOperation(value = "新增病区[by:cy]")
+    @Operation(summary = "新增病区[by:cy]")
     @PostMapping("/addRegion")
     @Transactional
     public CommonResult<Object> addRegion(@RequestBody @Valid SaveRegionVO saveRegionVo) {
         return CommonResult.success(sysRegionFacade.addRegion(saveRegionVo));
     }
 
-    @ApiOperation(value = "修改病区[by:cy]")
+    @Operation(summary = "修改病区[by:cy]")
     @PostMapping("/updateRegion")
     @Transactional
     public CommonResult<Object> updateRegion(@RequestBody UpdateRegionVO updateRegionVO) {
         return CommonResult.success(sysRegionFacade.updateRegion(updateRegionVO));
     }
 
-    @ApiOperation(value = "校验/禁用/启用病区管理[by:cy]")
+    @Operation(summary = "校验/禁用/启用病区管理[by:cy]")
     @PostMapping("/checkSolveRegion")
     public CommonResult<Object> checkSolveRegion(@RequestBody @Valid CheckSolveRegionVO checkSolveRegionVO) {
         return CommonResult.success(sysRegionFacade.checkSolveRegion(checkSolveRegionVO));
     }
 
 
-    @ApiOperation(value = "查看病区管理[by:cy]")
+    @Operation(summary = "查看病区管理[by:cy]")
     @PostMapping("/getRegion")
     public CommonResult<IPage<ViewRegionDTO>> getRegion(@RequestBody GetRegionVO getRegionVO) {
         return CommonResult.success(sysRegionFacade.getRegion(getRegionVO));
     }
 
 
-    @ApiOperation(value = "删除病区管理[by:cy]")
+    @Operation(summary = "删除病区管理[by:cy]")
     @PostMapping("/deleteRegion")
     @Transactional
     public CommonResult<Boolean> deleteRegion(@RequestParam @Valid @NotNull(message = "病区id为空") Integer id) {

security-center/src/main/java/com/lantone/security/web/RoleManagementController.java

@@ -11,7 +11,7 @@ import com.lantone.security.vo.GetRolePageVO;
 import com.lantone.security.vo.UpdateRoleVO;
 import com.lantone.security.facade.RoleManagementFacade;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,28 +40,28 @@ public class RoleManagementController {
     @Autowired
     private RoleManagementFacade roleManagementFacade;
 
-    @ApiOperation(value = "获取角色列表 [by:songxl]",
-            notes = "")
+    @Operation(summary = "获取角色列表 [by:songxl]",
+            description = "")
     @PostMapping("/getRolePage")
     public CommonResult<IPage<GetRolePageDTO>> getRolePage(@RequestBody @Valid GetRolePageVO getRolePageVO) {
         return CommonResult.success(roleManagementFacade.getRolePage(getRolePageVO));
     }
 
-    @ApiOperation(value = "添加角色 [by:songxl]")
+    @Operation(summary = "添加角色 [by:songxl]")
     @PostMapping("/addRole")
     @Transactional
     public CommonResult<Boolean> addRole(@RequestBody @Valid AddRoleVO addRoleVO) {
         return CommonResult.success(roleManagementFacade.addRole(addRoleVO));
     }
 
-    @ApiOperation(value = "修改角色 [by:songxl]")
+    @Operation(summary = "修改角色 [by:songxl]")
     @PostMapping("/updateRole")
     @Transactional
     public CommonResult<Boolean> updateRole(@RequestBody @Valid UpdateRoleVO updateRoleVO) {
         return CommonResult.success(roleManagementFacade.updateRole(updateRoleVO));
     }
 
-    @ApiOperation(value = "删除角色 [by:songxl]")
+    @Operation(summary = "删除角色 [by:songxl]")
     @PostMapping("/deleteRole")
     @Transactional
     public CommonResult<Boolean> deleteRole(@RequestParam @Valid @NotNull(message = "角色编号为空") Long roleId) {
@@ -69,35 +69,35 @@ public class RoleManagementController {
     }
 
 
-    @ApiOperation(value = "禁用|启用角色 [by:songxl]")
+    @Operation(summary = "禁用|启用角色 [by:songxl]")
     @PostMapping("/disableRole")
     @Transactional
     public CommonResult<Boolean> disableRole(@RequestParam @Valid @NotNull(message = "角色编号为空") Long roleId, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
         return CommonResult.success(roleManagementFacade.disableRole(roleId, status));
     }
 
-    @ApiOperation(value = "查看功能 [by:songxl]")
+    @Operation(summary = "查看功能 [by:songxl]")
     @PostMapping("/getRoleById")
     public CommonResult<GetRoleDTO> getRoleById(@RequestParam @Valid @NotNull(message = "角色编号为空") Long roleId) {
         //创建角色时type为1（新创建的角色非管理角色，不会有管理菜单）
         return CommonResult.success(roleManagementFacade.getRoleById(roleId,"1"));
     }
 
-    @ApiOperation(value = "获取当前登录用户管理的的功能权限树 [by:songxl]",
-            notes = "type:新增组织时查询type为0,添加角色时查询type为1，必填<br>")
+    @Operation(summary = "获取当前登录用户管理的的功能权限树 [by:songxl]",
+            description = "type:新增组织时查询type为0,添加角色时查询type为1，必填<br>")
     @PostMapping("/getUserMenuResourceTree")
     public CommonResult<List<UserMenuResourceTreeDTO>> getUserMenuResourceTree(@RequestParam @Valid @NotNull(message = "类型不能为空")String type) {
         return CommonResult.success(roleManagementFacade.getUserMenuResourceTree(type));
     }
 
-    @ApiOperation(value = "获取当前登录用户管理的角色列表 [by:songxl]",
-            notes = "softwareId:系统id 添加用户时获取的角色softwareId为空；添加数据权限角色的softwareId为选择的系统id")
+    @Operation(summary = "获取当前登录用户管理的角色列表 [by:songxl]",
+            description = "softwareId:系统id 添加用户时获取的角色softwareId为空；添加数据权限角色的softwareId为选择的系统id")
     @PostMapping("/getCreateRoles")
     public CommonResult<List<GetCreateRoleDTO>> getCreateRoles(@RequestParam Long softwareId) {
         return CommonResult.success(roleManagementFacade.getCreateRoles(softwareId));
     }
 
-    @ApiOperation(value = "获取当前登录用户的显示的菜单列表 [by:songxl]")
+    @Operation(summary = "获取当前登录用户的显示的菜单列表 [by:songxl]")
     @PostMapping("/getUserShowMemuTree")
     public CommonResult<Map<String, Object>> getUserShowMemuTree() {
         return CommonResult.success(roleManagementFacade.getUserShowMemuTree());

security-center/src/main/java/com/lantone/security/web/UserManagementController.java

@@ -13,7 +13,7 @@ import com.lantone.security.vo.ModifyPasswordVO;
 import com.lantone.security.vo.UpdateUserVO;
 import com.lantone.security.facade.UserManagementFacade;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -41,38 +41,38 @@ public class UserManagementController {
     @Autowired
     private UserManagementFacade userManagementFacade;
 
-    @ApiOperation(value = "登录以后返回token")
+    @Operation(summary = "登录以后返回token")
     @PostMapping(value = "/login")
     public CommonResult login(@Valid @RequestBody LoginVO loginVO) {
         return userManagementFacade.login(loginVO);
     }
-    @ApiOperation(value = "登出")
+    @Operation(summary = "登出")
     @PostMapping(value = "/close")
     public CommonResult<Boolean> close(@RequestParam @Valid @NotNull(message = "用户编号为空") String userId) {
         return userManagementFacade.close(userId);
     }
 
-    @ApiOperation("根据用户名获取通用用户信息")
+    @Operation(summary = "根据用户名获取通用用户信息")
     @PostMapping(value = "/loadByUsername")
     public CommonResult<UserDto> loadUserByUsername(@RequestParam String username) {
         return userManagementFacade.loadUserByUsername(username);
     }
 
-    @ApiOperation(value = "添加用户 [by:songxl]")
+    @Operation(summary = "添加用户 [by:songxl]")
     @PostMapping("/addUser")
     @Transactional
     public CommonResult<Boolean> addUser(@RequestBody @Valid AddUserVO addUserVO) {
         return CommonResult.success(userManagementFacade.addUser(addUserVO));
     }
 
-    @ApiOperation(value = "修改用户 [by:songxl]")
+    @Operation(summary = "修改用户 [by:songxl]")
     @PostMapping("/updateUser")
     @Transactional
     public CommonResult<Boolean> updateUser(@RequestBody @Valid UpdateUserVO updateUserVO) {
         return CommonResult.success(userManagementFacade.updateUser(updateUserVO));
     }
 
-    @ApiOperation(value = "删除用户 [by:songxl]")
+    @Operation(summary = "删除用户 [by:songxl]")
     @PostMapping("/deleteUser")
     @Transactional
     public CommonResult<Boolean> deleteUser(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId) {
@@ -80,39 +80,39 @@ public class UserManagementController {
     }
 
 
-    @ApiOperation(value = "禁用|启用用户 [by:songxl]")
+    @Operation(summary = "禁用|启用用户 [by:songxl]")
     @PostMapping("/disableUser")
     @Transactional
     public CommonResult<Boolean> disableUser(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId, @RequestParam @Valid @NotBlank(message = "启用禁用status为空") String status) {
         return CommonResult.success(userManagementFacade.disableUser(userId, status));
     }
 
-    @ApiOperation(value = "查看用户 [by:songxl]")
+    @Operation(summary = "查看用户 [by:songxl]")
     @PostMapping("/getUserById")
     public CommonResult<GetUserDTO> getUserById(@RequestParam @Valid @NotNull(message = "用户编号为空") Long userId) {
         return CommonResult.success(userManagementFacade.getUserById(userId));
     }
 
-    @ApiOperation(value = "获取登录用户管理的组织机构树 [by:songxl]")
+    @Operation(summary = "获取登录用户管理的组织机构树 [by:songxl]")
     @PostMapping("/getHospitalTree")
     public CommonResult<List<GetHospitalTreeDTO>> getLoginUserHospitalTree() {
         return CommonResult.success(userManagementFacade.getLoginUserHospitalTree());
     }
 
-    @ApiOperation(value = "获取当前用户所在组织的用户列表 [by:songxl]")
+    @Operation(summary = "获取当前用户所在组织的用户列表 [by:songxl]")
     @PostMapping("/getUserPage")
     public CommonResult<IPage<GetUserPageDTO>> getUserPage(@RequestBody @Valid GetUserPageVO getUserPageVO) {
         return CommonResult.success(userManagementFacade.getUserPage(getUserPageVO));
     }
 
-    @ApiOperation(value = "登录成功获取用户的系统医院信息 [by:songxl]")
+    @Operation(summary = "登录成功获取用户的系统医院信息 [by:songxl]")
     @PostMapping("/getUserHospitals")
     public CommonResult<Map<String, Object>> getUserHospitals() {
         return CommonResult.success(userManagementFacade.getUserHospitals());
     }
 
-    @ApiOperation(value = "修改密码[by:gaodm]",
-            notes = "password：原密码,必填<br>" +
+    @Operation(summary = "修改密码[by:gaodm]",
+            description = "password：原密码,必填<br>" +
                     "modifyPassword：新密码, 必填<br> ")
     @PostMapping("/midifyPassword")
     @Transactional

security-center/src/main/resources/application.properties

@@ -0,0 +1,3 @@
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
+springdoc.api-docs.enabled=false
+springdoc.swagger-ui.enabled=false

structure-center/src/main/java/com/lantone/structure/config/SwaggerConfig.java

@@ -1,16 +0,0 @@
-package com.lantone.structure.config;
-
-import com.lantone.common.config.BaseSwaggerConfig;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @Description: Swagger相关配置
- * @author: rengb
- * @time: 2021/1/5 18:27
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig extends BaseSwaggerConfig {
-
-}

structure-center/src/main/java/com/lantone/structure/controller/StructureController.java

@@ -5,7 +5,7 @@ import com.lantone.structure.dto.RespDTO;
 import com.lantone.structure.facade.StructureFacade;
 import com.lantone.structure.vo.AnalysisVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,13 +26,13 @@ public class StructureController {
     @Autowired
     private StructureFacade structureFacade;
 
-    @ApiOperation(value = "解析")
+    @Operation(summary = "解析")
     @PostMapping("analysis")
     public RespDTO<AnalysisDTO> analysis(@RequestBody AnalysisVO analysisVO) {
         return RespDTO.onSuc(structureFacade.analysis(analysisVO));
     }
 
-    @ApiOperation(value = "解析(上传文件版)")
+    @Operation(summary = "解析(上传文件版)")
     @PostMapping("analysisTest")
     public RespDTO<AnalysisDTO> analysisTest(@RequestParam("file") MultipartFile file, String type) {
         AnalysisVO analysisVO = new AnalysisVO();

tran-service/src/main/java/com/lantone/tran/config/SwaggerConfig.java

@@ -1,16 +0,0 @@
-package com.lantone.tran.config;
-
-import com.lantone.common.config.BaseSwaggerConfig;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @Description: Swagger相关配置
- * @author: rengb
- * @time: 2021/1/5 18:27
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig extends BaseSwaggerConfig {
-
-}

tran-service/src/main/java/com/lantone/tran/web/BehospitalManagementController.java

@@ -5,7 +5,7 @@ import com.lantone.tran.dto.AddLostBehospitalDTO;
 import com.lantone.tran.facade.BehospitalManagementFacade;
 import com.lantone.tran.vo.AddLostBehospitalVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,7 +27,7 @@ public class BehospitalManagementController {
     @Autowired
     private BehospitalManagementFacade behospitalManagementFacade;
 
-    @ApiOperation(value = "丢失的住院病历信息入库 [by:rengb]", notes = "丢失的住院病历信息入库")
+    @Operation(summary = "丢失的住院病历信息入库 [by:rengb]", description = "丢失的住院病历信息入库")
     @PostMapping("/addLostBehospital")
     public CommonResult<AddLostBehospitalDTO> addLostBehospital(@RequestBody List<AddLostBehospitalVO> addLostBehospitalVOList) {
         return CommonResult.success(behospitalManagementFacade.addLostBehospital(addLostBehospitalVOList));

user-auth/src/main/java/com/lantone/userauth/config/SwaggerConfig.java

@@ -1,16 +0,0 @@
-package com.lantone.userauth.config;
-
-import com.lantone.common.config.BaseSwaggerConfig;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * @Description: Swagger相关配置
- * @author: rengb
- * @time: 2021/1/5 18:27
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig extends BaseSwaggerConfig {
-
-}

user-auth/src/main/java/com/lantone/userauth/controller/AuthController.java

@@ -6,7 +6,7 @@ import com.lantone.userauth.domain.Oauth2TokenDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.provider.endpoint.TokenEndpoint;
@@ -33,7 +33,7 @@ public class AuthController {
     @Autowired
     private TokenEndpoint tokenEndpoint;
 
-    @ApiOperation("Oauth2获取token")
+    @Operation(summary = "Oauth2获取token")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "grant_type", value = "授权模式", required = true),
             @ApiImplicitParam(name = "client_id", value = "Oauth2客户端ID", required = true),