From 5fcc7eca34386db39889e3d55a11a8afeedd227c Mon Sep 17 00:00:00 2001 From: tangwei Date: Wed, 8 Jul 2026 14:24:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96swagger&=E5=B8=B8?= =?UTF-8?q?=E8=A7=84=E6=B0=B4=E7=94=B5=E9=94=9A=E7=82=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yfd/platform/config/SwaggerConfig.java | 16 +++++++++++++++- .../service/impl/SdEngInfoBHServiceImpl.java | 19 ++++++++++++++++++- .../src/main/resources/application-prod.yml | 6 ++++-- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java b/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java index 21d7f41b..55e2cbe2 100644 --- a/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java @@ -1,5 +1,8 @@ package com.yfd.platform.config; +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springdoc.core.models.GroupedOpenApi; @@ -12,13 +15,24 @@ public class SwaggerConfig { @Bean public OpenAPI projectOpenAPI() { + // 定义 Header 中的 Token 参数 + SecurityScheme securityScheme = new SecurityScheme() + .type(SecurityScheme.Type.APIKEY) // 类型为 API Key + .in(SecurityScheme.In.HEADER) // 放在 Header 中 + .name("token"); // Header 的名称（也可改为 Authorization） + + SecurityRequirement securityRequirement = new SecurityRequirement() + .addList("tokenAuth"); // 关联上面的安全方案名称 + return new OpenAPI() .info(new Info() .title("项目API 接口文档") .version("3.0") .description("") .contact(new Contact().name("郑顺利").email("13910913995@163.com")) - ); + ) + .components(new Components().addSecuritySchemes("tokenAuth", securityScheme)) + .addSecurityItem(securityRequirement); } // @Bean diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java index 837cb471..0776145e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java @@ -20,6 +20,7 @@ import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.common.GroupHelper; import com.yfd.platform.common.GroupingInfo; import com.yfd.platform.common.MicroservicDynamicSQLMapper; +import com.yfd.platform.qgc_base.service.ICurrentUserDataScopeService; import com.yfd.platform.qgc_data.domain.SysUserDataScope; import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper; import com.yfd.platform.qgc_base.domain.SdEngInfoBH; @@ -62,6 +63,9 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl ENG_CODE_NAME_FIELD_MAP = new LinkedHashMap<>(); + @Resource + private ICurrentUserDataScopeService currentUserDataScopeService; + static { ENG_CODE_NAME_FIELD_MAP.put("baseId", "baseName"); ENG_CODE_NAME_FIELD_MAP.put("hbrvcd", "hbrvcdName"); @@ -2761,7 +2765,20 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl stationCodes = currentUserDataScopeService.getCurrentUserDataScope().getStationCodes(); + if (!stationCodes.isEmpty()) { + // 每个值加单引号，并用逗号连接 + String inClause = stationCodes.stream() + .map(code -> "'" + code + "'") // 如果值本身不含单引号，可简单处理；更严谨需转义 + .collect(Collectors.joining(",")); + sql.append("AND t.STCD IN (").append(inClause).append(") "); + }else{ + result.setData(new ArrayList<>()); + result.setTotal(0L); + return result; + } + } Map paramMap = new HashMap<>(); String filterSql = buildEngPointFilterCondition(dataSourceRequest.getFilter(), paramMap, new int[]{0}); if (StrUtil.isNotBlank(filterSql)) { diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml index a08b5045..24473695 100644 --- a/backend/src/main/resources/application-prod.yml +++ b/backend/src/main/resources/application-prod.yml @@ -111,9 +111,11 @@ spring: matching-strategy: ant_path_matcher data: redis: - host: "${REDIS_HOST:172.16.21.142}" +# host: "${REDIS_HOST:172.16.21.142}" + host: "${REDIS_HOST:localhost}" port: "${REDIS_PORT:6379}" - password: "${REDIS_PASSWORD:zny5678}" + password: "${REDIS_PASSWORD:}" +# password: "${REDIS_PASSWORD:zny5678}" database: "${REDIS_DATABASE:15}" timeout: 10000ms lettuce: