From 07b41573802930dc093c8847f5b7ce0c22e9823a Mon Sep 17 00:00:00 2001 From: lishuai Date: Mon, 14 Jul 2025 09:45:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dam=E8=AE=A1=E7=AE=97=202025?= =?UTF-8?q?=E5=B9=B47=E6=9C=8814=E6=97=A509:43:55?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application.yml | 7 ------- .../java/com/thing/common/tskv/service/TsKvNativeSQL.java | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 4a555a0..c2e24c7 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -79,13 +79,6 @@ mybatis-flex: deleted-value-of-logic-delete: 1 #数据眼配置 datasource: - #物管理数据源 - pg-thing: - type: com.zaxxer.hikari.HikariDataSource - url: jdbc:postgresql://1.94.32.181:5432/thing - driver-class-name: org.postgresql.Driver - username: postgres - password: sddt8888 #遥测数据数据眼 pg-tskv: type: com.zaxxer.hikari.HikariDataSource diff --git a/common/tskv/src/main/java/com/thing/common/tskv/service/TsKvNativeSQL.java b/common/tskv/src/main/java/com/thing/common/tskv/service/TsKvNativeSQL.java index d7f88ce..1e99352 100644 --- a/common/tskv/src/main/java/com/thing/common/tskv/service/TsKvNativeSQL.java +++ b/common/tskv/src/main/java/com/thing/common/tskv/service/TsKvNativeSQL.java @@ -198,7 +198,7 @@ public class TsKvNativeSQL { } else { sql.append(TS_KV); } - sql.append(" WHERE ").append(THING_CODE).append(" = '").append(thingCode).append("' ").append("AND ").append(ATTR_KEY).append(" = '").append(attrKey).append("' ").append("AND ").append(TS).append(" >= ").append(stTs).append(" AND ").append(TS).append(" <= ").append(enTs).append(" GROUP BY ").append(THING_CODE).append(", ").append(ATTR_KEY).append(", ").append(" time ORDER BY time DESC;"); + sql.append(" WHERE ").append(THING_CODE).append(" = '").append(thingCode).append("' ").append("AND ").append(ATTR_KEY).append(" = '").append(attrKey).append("' ").append("AND ").append(TS).append(" >= ").append(stTs).append(" AND ").append(TS).append(" < ").append(enTs).append(" GROUP BY ").append(THING_CODE).append(", ").append(ATTR_KEY).append(", ").append(" time ORDER BY time DESC;"); return sql.toString(); }