修复am计算

2025年7月14日09:43:55

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

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();
     }