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 11b80203..07e8b737 100644 --- a/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java @@ -14,56 +14,56 @@ import io.swagger.v3.oas.models.info.Contact; public class SwaggerConfig { -// @Bean -// public OpenAPI projectOpenAPI() { -// return new OpenAPI() -// .info(new Info() -// .title("项目API 接口文档") -// .version("3.0") -// .description("") -// .contact(new Contact().name("郑顺利").email("13910913995@163.com")) -// ); -// } - - @Bean public OpenAPI projectOpenAPI() { - // 1. 定义第一个 Header：token - SecurityScheme tokenScheme = new SecurityScheme() - .type(SecurityScheme.Type.APIKEY) - .in(SecurityScheme.In.HEADER) - .name("token") - .description("用户认证 Token"); - - // 2. 定义第二个 Header：租户ID（示例） - SecurityScheme tenantScheme = new SecurityScheme() - .type(SecurityScheme.Type.APIKEY) - .in(SecurityScheme.In.HEADER) - .name("Tenant_Id") - .description("租户标识"); - - // 3. 将两个安全方案注册到 Components - Components components = new Components() - .addSecuritySchemes("tokenAuth", tokenScheme) - .addSecuritySchemes("tenantAuth", tenantScheme); - - // 4. 创建 SecurityRequirement，同时要求两个 Header 都必须提供 - SecurityRequirement securityRequirement = new SecurityRequirement() - .addList("tokenAuth") // 引用 token 方案 - .addList("tenantAuth"); // 引用 tenant 方案 - - return new OpenAPI() .info(new Info() .title("项目API 接口文档") .version("3.0") .description("") .contact(new Contact().name("郑顺利").email("13910913995@163.com")) - ) - .components(components) - .addSecurityItem(securityRequirement); // 一次性添加 + ); } + +// @Bean +// public OpenAPI projectOpenAPI() { +// // 1. 定义第一个 Header：token +// SecurityScheme tokenScheme = new SecurityScheme() +// .type(SecurityScheme.Type.APIKEY) +// .in(SecurityScheme.In.HEADER) +// .name("token") +// .description("用户认证 Token"); +// +// // 2. 定义第二个 Header：租户ID（示例） +// SecurityScheme tenantScheme = new SecurityScheme() +// .type(SecurityScheme.Type.APIKEY) +// .in(SecurityScheme.In.HEADER) +// .name("Tenant_Id") +// .description("租户标识"); +// +// // 3. 将两个安全方案注册到 Components +// Components components = new Components() +// .addSecuritySchemes("tokenAuth", tokenScheme) +// .addSecuritySchemes("tenantAuth", tenantScheme); +// +// // 4. 创建 SecurityRequirement，同时要求两个 Header 都必须提供 +// SecurityRequirement securityRequirement = new SecurityRequirement() +// .addList("tokenAuth") // 引用 token 方案 +// .addList("tenantAuth"); // 引用 tenant 方案 +// +// +// return new OpenAPI() +// .info(new Info() +// .title("项目API 接口文档") +// .version("3.0") +// .description("") +// .contact(new Contact().name("郑顺利").email("13910913995@163.com")) +// ) +// .components(components) +// .addSecurityItem(securityRequirement); // 一次性添加 +// } + // @Bean // public GroupedOpenApi groupPlatformApi() { // return GroupedOpenApi.builder() diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java index 3ffbb034..53472205 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java @@ -5939,7 +5939,7 @@ public class EngEqDataServiceImpl implements EngEqDataService { .append(" WHERE NVL(det.IS_DELETED, 0) = 0 AND NVL(cfg.IS_DELETED, 0) = 0 AND cfg.CODE = 'common' ") .append(") siteSort ON siteSort.RVCD = eng.HBRVCD AND siteSort.STCD = a.STCD ") .append("WHERE NVL(a.IS_DELETED, 0) = 0 ") - .append("AND NVL(a.USFL, 1) = 1 ") +// .append("AND NVL(a.USFL, 1) = 1 ") .append("AND a.LGTD IS NOT NULL ") .append("AND a.LTTD IS NOT NULL ") .append("AND a.STTP IN (SELECT STTP_CODE FROM SD_STTP_B WHERE DESCRIPTION = 'EQ') ") diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java index 1712f20c..0c2017ff 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fb/service/impl/FbStationServiceImpl.java @@ -4648,7 +4648,7 @@ public class FbStationServiceImpl implements FbStationService { .append(" AND t.TM BETWEEN ADD_MONTHS(SYSDATE, -12) AND SYSDATE ") .append(" GROUP BY t.RSTCD ") .append(") b ON a.STCD = b.stcd ") - .append("WHERE NVL(a.USFL, 1) = 1 ") + .append("WHERE 1 = 1 ") .append("AND a.LGTD IS NOT NULL ") .append("AND a.LTTD IS NOT NULL "); diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java index 9156d14b..a9d57798 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/service/impl/FhHabitatServiceImpl.java @@ -1955,13 +1955,13 @@ public class FhHabitatServiceImpl implements FhHabitatService { .append("t.DTIN AS dtin ") .append("FROM ( ") .append(" SELECT STCD, STNM, 'FH' AS STTP_CODE, RSTCD, BASE_ID, HBRVCD, LGTD, LTTD, BLPRD AS BLDSTT_CCODE, ELEV, DTIN ") - .append(" FROM SD_FHBT_B_H WHERE NVL(IS_DELETED, 0) = 0 AND USFL = 1 ") + .append(" FROM SD_FHBT_B_H WHERE NVL(IS_DELETED, 0) = 0 ") .append(" UNION ALL ") .append(" SELECT STCD, STNM, STTP AS STTP_CODE, RSTCD, BASE_ID, HBRVCD, LGTD, LTTD, BLDSTT_CODE AS BLDSTT_CCODE, ELEV, DTIN ") - .append(" FROM SD_VA_B_H WHERE NVL(IS_DELETED, 0) = 0 AND USFL = 1 ") + .append(" FROM SD_VA_B_H WHERE NVL(IS_DELETED, 0) = 0 ") .append(" UNION ALL ") .append(" SELECT STCD, STNM, STTP AS STTP_CODE, RSTCD, BASE_ID, HBRVCD, LGTD, LTTD, BLDSTT_CODE AS BLDSTT_CCODE, ELEV, DTIN ") - .append(" FROM SD_VP_B_H WHERE NVL(IS_DELETED, 0) = 0 AND USFL = 1 ") + .append(" FROM SD_VP_B_H WHERE NVL(IS_DELETED, 0) = 0 ") .append(") t ") .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = t.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ") .append("LEFT JOIN SD_HYDROBASE hb ON hb.BASEID = NVL(t.BASE_ID, eng.BASE_ID) AND NVL(hb.IS_DELETED, 0) = 0 ")