From b8470f5e90d0aed22bf2c4bf9f5d2a13cd60b15f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 十二月 2024 14:03:41 +0800
Subject: [PATCH] 1、统计模块实现农户日用水量纵转横转存，月、年用水量统计； 2、临时模块农户日用水量纵转横转存，月、年用水量统计；
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java
index 37fe0d4..a99463a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java
@@ -6,7 +6,6 @@
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.common.util.DateTime;
import com.dy.common.util.IDLongGenerator;
-import com.dy.pipIrrGlobal.util.Org;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.quartz.JobDataMap;
@@ -14,7 +13,6 @@
import org.quartz.JobExecutionException;
import java.util.Date;
-import java.util.List;
/**
* @Author: liurunyu
@@ -27,9 +25,9 @@
private String orgTag ;
- private StLoss stLoss ;
- private StIntake stIntake ;
- private StClient stClient ;
+ private StLossAmount stLossAmount;
+ private StIntakeAmount stIntakeAmount;
+ private StClientAmount stClientAmount;
private StChargeByIc stChargeByIc ;
private StChargeByClient stChargeByClient ;
private StConsumeByIc stConsumeByIc ;
@@ -58,14 +56,14 @@
return ;
}
DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
- stLoss = SpringContextUtil.getBean(StLoss.class);
- stIntake = SpringContextUtil.getBean(StIntake.class);
- stClient = SpringContextUtil.getBean(StClient.class);
+ stLossAmount = SpringContextUtil.getBean(StLossAmount.class);
+ stIntakeAmount = SpringContextUtil.getBean(StIntakeAmount.class);
+ stClientAmount = SpringContextUtil.getBean(StClientAmount.class);
stChargeByIc = SpringContextUtil.getBean(StChargeByIc.class);
stChargeByClient = SpringContextUtil.getBean(StChargeByClient.class);
stConsumeByIc = SpringContextUtil.getBean(StConsumeByIc.class);
stConsumeByClient = SpringContextUtil.getBean(StConsumeByClient.class);
- if(stLoss != null && stIntake != null && stClient != null
+ if(stLossAmount != null && stIntakeAmount != null && stClientAmount != null
&& stChargeByIc != null && stChargeByClient != null
&& stConsumeByIc != null && stConsumeByClient != null){
String yesterday = DateTime.lastXDay_yyyy_MM_dd(1) ;//寰楀埌鏄ㄥぉ锛岄浂鏅ㄦ椂鍒荤粺璁★紝缁熻鏄ㄥぉ鐨勬暟
@@ -73,8 +71,8 @@
statisticsYear = yesterdayGrp[0] ;//缁熻骞�
statisticsMonth = yesterdayGrp[1] ;//缁熻鏈�
statisticsDay = yesterdayGrp[2] ;//缁熻鏃�
- statistics4DayStartId = IDLongGenerator.generateOneDayStartId(statisticsYear, statisticsMonth, 1) ;
- statistics4DayEndId = IDLongGenerator.generateOneDayEndId(statisticsYear, statisticsMonth, DateTime.endDayOfMonth(statisticsYear, statisticsMonth)) ;
+ statistics4DayStartId = IDLongGenerator.generateOneDayStartId(statisticsYear, statisticsMonth, statisticsDay) ;
+ statistics4DayEndId = IDLongGenerator.generateOneDayEndId(statisticsYear, statisticsMonth, statisticsDay) ;
statistics4DayStartDt = DateTime.startOfDay(statisticsYear, statisticsMonth, statisticsDay) ;
statistics4DayEndDt = DateTime.endOfDay(statisticsYear, statisticsMonth, statisticsDay) ;
//缁熻鏃ョ殑閲�
@@ -109,6 +107,7 @@
* 缁熻
*/
private void doStatisticsDay(){
+ stClientAmount.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId) ;
stChargeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
stChargeByClient.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
stConsumeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartDt, statistics4DayEndDt);
@@ -118,9 +117,9 @@
* 缁熻
*/
private void doStatisticsMonthAndYear(){
- stLoss.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
- stIntake.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
- stClient.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
+ stLossAmount.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
+ stIntakeAmount.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
+ stClientAmount.statistics(statisticsYear, statisticsMonth, statistics4MonthYearStartId, statistics4MonthYearEndId) ;
stChargeByIc.statistics4MonthAndYear(statisticsYear, statisticsMonth);
stChargeByClient.statistics4MonthAndYear(statisticsYear, statisticsMonth);
--
Gitblit v1.8.0