From c06c38ce579264ef82430b9e2f353afa97e6cafa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 28 十二月 2024 09:51:57 +0800
Subject: [PATCH] 通信中间件统计农户日用水量数据中增加次数属性，数据库中也相应增加此字段。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StatisticsJob.java | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 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 ce95708..8c39927 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 ;
@@ -57,14 +55,15 @@
if(orgTag == null){
return ;
}
- stLoss = SpringContextUtil.getBean(StLoss.class);
- stIntake = SpringContextUtil.getBean(StIntake.class);
- stClient = SpringContextUtil.getBean(StClient.class);
+ DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
+ 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) ;//寰楀埌鏄ㄥぉ锛岄浂鏅ㄦ椂鍒荤粺璁★紝缁熻鏄ㄥぉ鐨勬暟
@@ -108,18 +107,6 @@
* 缁熻
*/
private void doStatisticsDay(){
- /*
- List<Org.OrgVo> orgList = Org.OrgList ;
- if(orgList != null && orgList.size() >0){
- for(Org.OrgVo vo : orgList){
- DataSourceContext.set(vo.tag);//璁剧疆鏁版嵁婧�
- stChargeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
- stChargeByClient.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
- stConsumeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartDt, statistics4DayEndDt);
- stConsumeByClient.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartDt, statistics4DayEndDt);
- }
- } */
- DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
stChargeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
stChargeByClient.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartId, statistics4DayEndId);
stConsumeByIc.statistics4Day(statisticsYear, statisticsMonth, statisticsDay, statistics4DayStartDt, statistics4DayEndDt);
@@ -129,10 +116,9 @@
* 缁熻
*/
private void doStatisticsMonthAndYear(){
- DataSourceContext.set(orgTag);//璁剧疆鏁版嵁婧�
- 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