From 7a07684750e598e71c9211618958cc67d8a66ba9 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Tue, 8 Oct 2024 08:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E7=94=B5=E8=A1=A8=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BD=8D=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lihongjie/coal/meterDayLog/entity/MeterDayLogEntity.java | 4 ++-- .../coal/meterMonthLog/entity/MeterMonthLogEntity.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/meterDayLog/entity/MeterDayLogEntity.java b/src/main/java/cn/lihongjie/coal/meterDayLog/entity/MeterDayLogEntity.java index 2f48e228..c45d168c 100644 --- a/src/main/java/cn/lihongjie/coal/meterDayLog/entity/MeterDayLogEntity.java +++ b/src/main/java/cn/lihongjie/coal/meterDayLog/entity/MeterDayLogEntity.java @@ -37,7 +37,7 @@ order by DATE_TRUNC('day', time), meter_id, organization_id, t_meter_log.time de """) -@jakarta.persistence.Table(indexes = @jakarta.persistence.Index(name ="idx_meter_day_log_org_id", columnList = "organization_id")) +//@jakarta.persistence.Table(indexes = @jakarta.persistence.Index(name ="idx_meter_day_log_org_id", columnList = "organization_id")) public class MeterDayLogEntity extends OrgCommonEntity { @@ -52,6 +52,6 @@ public class MeterDayLogEntity extends OrgCommonEntity { @Formula("( lag(value, 1, (select tm.init_value from t_meter tm where tm.id = meter_id)) over (partition by meter_id order by time asc ) )") private java.lang.Double previousValue; - @Formula(" ( value - ( lag(value, 1, (select tm.init_value from t_meter tm where tm.id = meter_id)) over (partition by meter_id order by time asc ) ) )") + @Formula(" (round( ( value - ( lag(value, 1, (select tm.init_value from t_meter tm where tm.id = meter_id)) over (partition by meter_id order by time asc ) ) )::numeric, 2))") private java.lang.Double usage; } \ No newline at end of file diff --git a/src/main/java/cn/lihongjie/coal/meterMonthLog/entity/MeterMonthLogEntity.java b/src/main/java/cn/lihongjie/coal/meterMonthLog/entity/MeterMonthLogEntity.java index 2b06809c..721a6fdd 100644 --- a/src/main/java/cn/lihongjie/coal/meterMonthLog/entity/MeterMonthLogEntity.java +++ b/src/main/java/cn/lihongjie/coal/meterMonthLog/entity/MeterMonthLogEntity.java @@ -37,7 +37,7 @@ order by DATE_TRUNC('month', time), meter_id, organization_id, t_meter_log.time """) -@jakarta.persistence.Table(indexes = @jakarta.persistence.Index(name ="idx_meter_month_log_org_id", columnList = "organization_id")) +//@jakarta.persistence.Table(indexes = @jakarta.persistence.Index(name ="idx_meter_month_log_org_id", columnList = "organization_id")) public class MeterMonthLogEntity extends OrgCommonEntity { @@ -52,6 +52,6 @@ public class MeterMonthLogEntity extends OrgCommonEntity { @Formula("( lag(value, 1, (select tm.init_value from t_meter tm where tm.id = meter_id)) over (partition by meter_id order by time asc ) )") private java.lang.Double previousValue; - @Formula(" ( value - ( lag(value, 1, (select tm.init_value from t_meter tm where tm.id = meter_id)) over (partition by meter_id order by time asc ) ) )") + @Formula(" (round(( value - ( lag(value, 1, (select tm.init_value from t_meter tm where tm.id = meter_id)) over (partition by meter_id order by time asc ) ) )::numeric, 2))") private java.lang.Double usage; } \ No newline at end of file