From 607b2357c553af2e1965762ec665b036a83cdbda Mon Sep 17 00:00:00 2001 From: xiachao Date: Thu, 26 Sep 2024 08:41:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- help/sql/{ddl_1.0.0.sql => 1ddl_1.0.0.sql} | 0 help/sql/{dml_1.0.0.sql => 2dml_1.0.0.sql} | 0 help/sql/{dml_1.0.1.sql => 3dml_1.0.1.sql} | 0 .../carbon/peakvalley/service/impl/PeakValleyServiceImpl.java | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename help/sql/{ddl_1.0.0.sql => 1ddl_1.0.0.sql} (100%) rename help/sql/{dml_1.0.0.sql => 2dml_1.0.0.sql} (100%) rename help/sql/{dml_1.0.1.sql => 3dml_1.0.1.sql} (100%) diff --git a/help/sql/ddl_1.0.0.sql b/help/sql/1ddl_1.0.0.sql similarity index 100% rename from help/sql/ddl_1.0.0.sql rename to help/sql/1ddl_1.0.0.sql diff --git a/help/sql/dml_1.0.0.sql b/help/sql/2dml_1.0.0.sql similarity index 100% rename from help/sql/dml_1.0.0.sql rename to help/sql/2dml_1.0.0.sql diff --git a/help/sql/dml_1.0.1.sql b/help/sql/3dml_1.0.1.sql similarity index 100% rename from help/sql/dml_1.0.1.sql rename to help/sql/3dml_1.0.1.sql diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java index 7dc3964..0c2f47f 100644 --- a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java +++ b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java @@ -151,7 +151,7 @@ public class PeakValleyServiceImpl implements PeakValleyService { }); //总量的集合 PeakValleyPriceStatisticsInfo statisticsInfo = new PeakValleyPriceStatisticsInfo(); - statisticsInfo.setAttrName("总用量"); + statisticsInfo.setAttrName("总用"+result.getBaseName()+"量"); statisticsInfo.setBaseName(result.getBaseName()); statisticsInfo.setAttrCode(result.getBaseCode()); statisticsInfo.setAllDosageRatio(BigDecimal.valueOf(100)); From d278b1a52dad0e49ddc6663a3d4567e7e40e4f1c Mon Sep 17 00:00:00 2001 From: xiezw Date: Thu, 26 Sep 2024 09:42:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?20240925-=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=B0=96=E5=B3=B0=E8=B0=B7=E5=B9=B3=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../peakvalley/service/impl/PeakValleyServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java index 7dc3964..8311f6a 100644 --- a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java +++ b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java @@ -89,8 +89,8 @@ public class PeakValleyServiceImpl implements PeakValleyService { param.setDateType("dd"); } List attrList = new ArrayList<>(); - attrList.add(param.getKey()+"_peak"+param.getDateType()); attrList.add(param.getKey()+"_rush"+param.getDateType()); + attrList.add(param.getKey()+"_peak"+param.getDateType()); attrList.add(param.getKey()+"_valley"+param.getDateType()); attrList.add(param.getKey()+"_normal"+param.getDateType()); List tempList = queryList(param.getKey(),param.getThingCode(),attrList,startTs,endTs); @@ -587,11 +587,11 @@ public class PeakValleyServiceImpl implements PeakValleyService { if(temp.getAttrCode().contains("peak")){ temp.setAttrName(priceInfo.getPeakPriceBean()==null?"峰用"+priceInfo.getBaseName():priceInfo.getPeakPriceBean().getAttrName()); temp.setUintPrice(priceInfo.getPeakPriceBean()==null?BigDecimal.ZERO:priceInfo.getPeakPriceBean().getPrice()); - temp.setSort(1); + temp.setSort(2); }else if(temp.getAttrCode().contains("rush")){ temp.setAttrName(priceInfo.getRushPriceBean()==null?"尖用"+priceInfo.getBaseName():priceInfo.getRushPriceBean().getAttrName()); temp.setUintPrice(priceInfo.getRushPriceBean()==null?BigDecimal.ZERO:priceInfo.getRushPriceBean().getPrice()); - temp.setSort(2); + temp.setSort(1); }else if(temp.getAttrCode().contains("valley")){ temp.setAttrName(priceInfo.getValleyPriceBean()==null?"谷用"+priceInfo.getBaseName():priceInfo.getValleyPriceBean().getAttrName()); temp.setUintPrice(priceInfo.getValleyPriceBean()==null?BigDecimal.ZERO:priceInfo.getValleyPriceBean().getPrice()); From b1dc188d59654c3c060e93fd2e471619bda4f6d3 Mon Sep 17 00:00:00 2001 From: xiezw Date: Thu, 26 Sep 2024 09:45:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?20240925-=E6=94=B9=E5=90=8D=E6=80=BB?= =?UTF-8?q?=E7=94=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carbon/peakvalley/service/impl/PeakValleyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java index e2456f5..8311f6a 100644 --- a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java +++ b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java @@ -151,7 +151,7 @@ public class PeakValleyServiceImpl implements PeakValleyService { }); //总量的集合 PeakValleyPriceStatisticsInfo statisticsInfo = new PeakValleyPriceStatisticsInfo(); - statisticsInfo.setAttrName("总用"+result.getBaseName()+"量"); + statisticsInfo.setAttrName("总用量"); statisticsInfo.setBaseName(result.getBaseName()); statisticsInfo.setAttrCode(result.getBaseCode()); statisticsInfo.setAllDosageRatio(BigDecimal.valueOf(100));