From f7c748120263ee6fbed1b137cbd7dad64e249c02 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 11 一月 2025 12:41:34 +0800
Subject: [PATCH] 1、通信中间件中，取水口日取水量统计重新实现，统计数据来源只采用关阀报，不再采用工作报和开阀报了； 2、临时任务中，增加统计取水口是取水量统计。
---
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java | 71 ++++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml | 33 +++
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeLossSv.java | 6
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeCtrl.java | 12 +
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountYearSv.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java | 17 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIntakeAmountDay.java | 327 +++++++++++++++++++++++------------
/dev/null | 12 -
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoTmp/ChangeMapper.java | 29 +++
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/util/StClientAmountConstant.java | 19 ++
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountDaySv.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountMonthSv.java | 5
13 files changed, 387 insertions(+), 152 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
index ac86459..b1dcd25 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/DateTime.java
@@ -1491,7 +1491,22 @@
"09", "11", "12", "13", "14", "15", "16", "17", "18", "19",
"20", "21", "22", "23" };
}
-
+
+ public static int[] dayGrpInMonth(int year, int month){
+ if(month == 1 || month == 3 || month == 5 || month == 7 || month == 8 || month == 10 || month == 12){
+ return new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31} ;
+ }else{
+ if(month == 2){
+ if(isLeapYear(year)){
+ return new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29} ;
+ }else{
+ return new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28} ;
+ }
+ }else{
+ return new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30} ;
+ }
+ }
+ }
public static String getWeek(int wk) {
if (wk == 1) {
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoTmp/ChangeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoTmp/ChangeMapper.java
index 64d3e8c..3c371ea 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoTmp/ChangeMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoTmp/ChangeMapper.java
@@ -42,11 +42,40 @@
* @return 褰卞搷瀹炰綋鏁�
*/
int updateOneIntakeAmountDay(@Param("id")Long id, @Param("amount")Double amount);
+ /**
+ * 鏇存柊涓�涓彇姘村彛鐨勬棩鐢ㄦ按閲忕粺璁�
+ *
+ * @return 褰卞搷瀹炰綋鏁�
+ */
+ /**
+ * 鏇存柊涓�涓彇姘村彛鐨勬棩鐢ㄦ按閲忕粺璁�
+ *
+ * @return 褰卞搷瀹炰綋鏁�
+ */
+ int updateOneIntakeAmountDay1(@Param("intakeId")Long intakeId, @Param("dt")Date dt,
+ @Param("amount")Double amount, @Param("money")Double money, @Param("times")Integer times);
/**
+ * 鍒犻櫎鎵�鏈夊彇姘村彛鐨勬棩鐢ㄦ按閲忕粺璁�
+ * @return 褰卞搷瀹炰綋鏁�
+ */
+ int deleteAllIntakeAmountDay();
+
+
+
+ /**
+ * 缁熻鎵�鏈夊彇姘村彛鐨勬棩鐢ㄦ按閲�
+ * @return 瀹炰綋闆嗗悎
+ */
+ List<RmIntakeAmountDay> statisticAllIntakeAmountDayFromOpenCloseValveHistory(@Param("startDt")Date startDt,
+ @Param("endDt")Date endDt);
+
+ List<RmIntakeAmountDay> selectStIntakeDayStatisticsByDate(@Param("intakeId")Long intakeId, @Param("date")Date date);
+
+ /**
* 鍒犻櫎鎵�鏈夊彇姘村彛鐨勬湀鐢ㄦ按閲忕粺璁�
* @return 褰卞搷瀹炰綋鏁�
*/
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml
index 6fe1f39..4e2d3ea 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Temp4ChangeMapper.xml
@@ -34,6 +34,39 @@
where id = #{id, jdbcType=BIGINT}
</update>
+ <update id="updateOneIntakeAmountDay1" >
+ update rm_intake_amount_day
+ set amount = #{amount, jdbcType=FLOAT},
+ money = #{money, jdbcType=FLOAT},
+ times = #{times, jdbcType=INTEGER}
+ where intake_id = #{intakeId, jdbcType=BIGINT}
+ and dt = #{dt, jdbcType=DATE}
+ </update>
+
+
+ <delete id="deleteAllIntakeAmountDay">
+ delete from rm_intake_amount_day
+ </delete>
+
+ <!-- -->
+ <select id="statisticAllIntakeAmountDayFromOpenCloseValveHistory" resultType="com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay">
+ select intake_id as intakeId ,
+ sum(cl_this_amount) as amount,
+ sum(cl_this_money) as money,
+ count(id) as times
+ from rm_open_close_valve_history
+ where cl_dt <![CDATA[>=]]> #{startDt, jdbcType=DATE}
+ and cl_dt <![CDATA[<=]]> #{endDt, jdbcType=DATE}
+ group by intake_id
+ </select>
+ <select id="selectStIntakeDayStatisticsByDate" resultType="com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay">
+ select *
+ from rm_intake_amount_day
+ where rm_intake_amount_day.intake_id = #{intakeId, jdbcType=BIGINT}
+ and dt = #{date, jdbcType=DATE}
+ </select>
+
+
<delete id="deleteAllIntakeAmountMonth">
delete from st_intake_amount_month
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIntakeAmountDay.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIntakeAmountDay.java
index 201e539..f5ff86e 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIntakeAmountDay.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIntakeAmountDay.java
@@ -37,22 +37,34 @@
Data d = (Data) data;
DataV1 dV1 = (DataV1) d.getSubData();//鍓嶉潰浠诲姟宸茬粡鍒ゆ柇涓嶄负null
Object cdObj = dV1.subData;
- if (cdObj != null && (cdObj instanceof DataCdC0Vo
- || cdObj instanceof DataCd84Vo
- || cdObj instanceof DataCd83OpenVo
- || cdObj instanceof DataCd83CloseVo)){
+ /**
+ * 2025-01-11
+ * 鍘熸潵瀹炵幇鏈换鍔″姛鑳斤紝鏁版嵁浠�84锛�83锛孋0鍔熻兘鐮佹暟鎹腑鑾峰緱缁熻鏁版嵁锛屼絾鍚庢潵鏁版嵁涓鍔犱簡閲戦涓庡紑鍏抽榾娆℃暟锛�
+ * 浠庤�屼娇寰椾粠涓夌鏁版嵁涓粺璁℃暟鎹浉褰撳洶闅句笌鑷浉鐭涚浘锛屾墍浠ヤ慨鏀瑰疄鐜版柟寮忥紝鍙粠83鏁版嵁涓粺璁℃湰鏁版嵁锛屽苟涓斾粠鍑�
+ * 涓湀鏉ヨ繍琛屾暟鎹湅锛屽彧瑕佽澶囪兘涓婄嚎锛屽熀鏈笂鍚勭涓婃姤鏁版嵁閮借兘涓婃姤涓婃潵锛屾墍浠ユ病鏈夊繀椤讳粠84鍙奀0鏁版嵁涓粺璁℃暟鎹簡
+ * 鑷虫锛屾湰瀹炵幇鏂瑰紡涓绘案涔呭疄鐜版柟寮忥紝涓嶅啀淇敼鍥炲幓浜嗭紝瀹炶返璇佹槑锛屼互鍓嶇殑瀹炵幇鏂瑰紡鏁版嵁鏄粺璁′笉鍑嗙‘鐨勩��
+ */
+ if (cdObj != null
+ && (
+ //cdObj instanceof DataCdC0Vo ||
+ //cdObj instanceof DataCd84Vo ||
+ //cdObj instanceof DataCd83OpenVo ||
+ cdObj instanceof DataCd83CloseVo
+ )){
Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
DbSv sv = (DbSv)objs[0] ;
PrController controller = (PrController)objs[1] ;
try{
UpDataVo vo = new UpDataVo() ;
+ /*
if(cdObj instanceof DataCdC0Vo){
vo.valueFrom((DataCdC0Vo)cdObj, null, null, null);
}else if(cdObj instanceof DataCd84Vo){
vo.valueFrom(null, (DataCd84Vo)cdObj, null, null);
}else if(cdObj instanceof DataCd83OpenVo){
vo.valueFrom(null,null, (DataCd83OpenVo)cdObj,null);
- }else if(cdObj instanceof DataCd83CloseVo){
+ }else */
+ if(cdObj instanceof DataCd83CloseVo){
vo.valueFrom(null,null,null, (DataCd83CloseVo)cdObj);
}
this.doDeal(sv, controller, d.getRtuAddr(), dV1, vo);
@@ -76,7 +88,7 @@
//鏁版嵁搴撲腑涓嶅瓨鍦ㄨ鍙栨按鍙ｇ殑鏃ュ彇姘撮噺鏁版嵁
//棣栧厛鐢熸垚鏈�鏂版暟鎹強鍘嗗彶鏁版嵁锛屽苟鍏堜繚瀛�
poLast = this.newRmIntakeAmountLast(controller, rtuAddr, dV1, dataVo);
- this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1, dataVo, poLast);
+ this.newAndSaveRmIntakeAmountHistory(sv, controller, rtuAddr, dV1, dataVo, poLast);
sv.saveRmIntakeAmountLast(poLast);
} else {
if(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataVo.rtuDt).before(poLast.rtuDtLast)){
@@ -91,21 +103,21 @@
//鍥犱负涓婅鏁版嵁涓殑鏃ユ湡鏃堕棿鏄彲杩涜璁＄畻鐨�
if(DateTime.dateFrom_yyyy_MM_dd1(dV1.dt).equals(poLast.dt)){
//鍚屼竴澶╂暟鎹�
- poLast = this.updateRmIntakeAmountLastByControllerChange(poLast, controller, rtuAddr, dV1, dataVo);
+ poLast = this.updateRmIntakeAmountLastBySameDateByControllerChange(poLast, controller, rtuAddr, dV1, dataVo);
RmIntakeAmountDay poHistory = null ;
if(poLast.lastHistoryId != null){
poHistory = sv.getRmIntakeAmountDay(poLast.lastHistoryId) ;
}
if(poHistory == null){
- this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1, dataVo, poLast);
+ this.newAndSaveRmIntakeAmountHistory(sv, controller, rtuAddr, dV1, dataVo, poLast);
}else{
- poHistory = this.updateRmIntakeAmountByControllerChange(poHistory, poLast, controller, rtuAddr, dV1, dataVo);
+ poHistory = this.updateRmIntakeAmountBySameDateByControllerChange(poHistory, poLast, controller, rtuAddr, dV1, dataVo);
sv.updateRmIntakeAmountDay(poHistory);
}
}else{
//闈炲悓涓�澶╋紝鎵�浠ユ柊鐢熸垚涓�涓巻鍙茶褰�
- poLast = this.updateRmIntakeAmountLastByControllerChange(poLast, controller, rtuAddr, dV1, dataVo);
- this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1, dataVo, poLast);
+ poLast = this.updateRmIntakeAmountLastByNewDateByControllerChange(poLast, controller, rtuAddr, dV1, dataVo);
+ this.newAndSaveRmIntakeAmountHistory(sv, controller, rtuAddr, dV1, dataVo, poLast);
}
}else{
//鏈洿鎹㈡帶鍒跺櫒
@@ -117,7 +129,7 @@
poHistory = sv.getRmIntakeAmountDay(poLast.lastHistoryId) ;
}
if(poHistory == null){
- this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1, dataVo, poLast);
+ this.newAndSaveRmIntakeAmountHistory(sv, controller, rtuAddr, dV1, dataVo, poLast);
}else{
poHistory = this.updateRmIntakeAmountBySameDateNewData(poHistory, poLast, controller, rtuAddr, dV1, dataVo);
sv.updateRmIntakeAmountDay(poHistory);
@@ -125,7 +137,7 @@
}else if(DateTime.dateFrom_yyyy_MM_dd1(dV1.dt).after(poLast.dt)){
//鏂扮殑鏃ユ湡
poLast = this.updateRmIntakeAmountLastByNewDateNewData(poLast, controller, rtuAddr, dV1, dataVo);
- this.newAndSaveHistoryDataDeal(sv, controller, rtuAddr, dV1, dataVo, poLast);
+ this.newAndSaveRmIntakeAmountHistory(sv, controller, rtuAddr, dV1, dataVo, poLast);
}else{
//杩欑鎯呭喌涓嶅瓨鍦�
}
@@ -153,6 +165,11 @@
po.dt = DateTime.dateFrom_yyyy_MM_dd1(dV1.dt);
po.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);
po.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+
+ po.amount = cdData.amount ;
+ po.money = cdData.money ;
+ po.times = 1 ;
+ /* 2025-01-11
if(cdData.isCloseValve != null && cdData.isCloseValve){
po.amount = cdData.amount ;
po.money = cdData.money ;
@@ -161,41 +178,10 @@
po.amount = 0.0D ;
po.money = 0.0D ;
po.times = 0 ;
- }
+ }*/
po.rtuAddrLast = rtuAddr;
return po ;
}
-
- /**
- * 鐢熸垚鏂扮殑鍙栨按鍙ｇ敤姘寸粺璁″巻鍙茶褰�
- * @param controller
- * @param rtuAddr
- * @param dV1
- * @param cdData
- * @return
- * @throws Exception
- */
- private RmIntakeAmountDay newRmIntakeAmountDay(PrController controller, String rtuAddr, DataV1 dV1, UpDataVo cdData, RmIntakeAmountDayLast lastPo)throws Exception {
- RmIntakeAmountDay po = new RmIntakeAmountDay() ;
- po.intakeId = controller==null?null:controller.getIntakeId();
- po.controllerIdLast = controller==null?null:controller.getId();
- po.rtuAddrLast = rtuAddr;
- po.dt = DateTime.dateFrom_yyyy_MM_dd1(dV1.dt);
- po.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);
- po.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
- if(lastPo != null){
- po.amount = lastPo.amount ;
- po.money = lastPo.money ;
- po.times = lastPo.times ;
- }else{
- po.amount = 0.0D ;
- po.money = 0.0D ;
- po.times = 0 ;
- }
- po.totalAmountLast = cdData.totalAmount ;
- return po ;
- }
-
/**
* 淇濆瓨鏂扮殑鍘嗗彶鏁版嵁璁板綍锛屽苟鎶奍D璧嬪�肩粰鏈�鏂拌褰曠殑 lastHistoryId
@@ -203,13 +189,32 @@
* @param controller
* @param rtuAddr
* @param dV1
- * @param dataCdC0Vo
+ * @param cdData
* @param poLast
* @throws Exception
* @return RmIntakeAmountDay
*/
- private RmIntakeAmountDay newAndSaveHistoryDataDeal(DbSv sv, PrController controller, String rtuAddr, DataV1 dV1, UpDataVo dataCdC0Vo, RmIntakeAmountDayLast poLast)throws Exception {
- RmIntakeAmountDay poHistory = this.newRmIntakeAmountDay(controller, rtuAddr, dV1, dataCdC0Vo, poLast) ;
+ private RmIntakeAmountDay newAndSaveRmIntakeAmountHistory(DbSv sv, PrController controller, String rtuAddr, DataV1 dV1, UpDataVo cdData, RmIntakeAmountDayLast poLast)throws Exception {
+ RmIntakeAmountDay poHistory = new RmIntakeAmountDay() ;
+ poHistory.intakeId = controller==null?null:controller.getIntakeId();
+ poHistory.controllerIdLast = controller==null?null:controller.getId();
+ poHistory.rtuAddrLast = rtuAddr;
+ poHistory.dt = DateTime.dateFrom_yyyy_MM_dd1(dV1.dt);
+ poHistory.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);
+ poHistory.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ poHistory.totalAmountLast = cdData.totalAmount ;
+
+ //2025-01-11
+ if(poLast != null){
+ poHistory.amount = poLast.amount ;
+ poHistory.money = poLast.money ;
+ poHistory.times = poLast.times ;
+ }else{
+ poHistory.amount = 0.0D ;
+ poHistory.money = 0.0D ;
+ poHistory.times = 0 ;
+ }
+
sv.saveRmIntakeAmountDay(poHistory);
//鐢辨渶鏂版暟鎹寔鏈夊巻鍙叉暟鎹腑鐨勬渶鏂拌褰旾D锛屼互鏂逛究蹇�熸煡璇�
poLast.lastHistoryId = poHistory == null ? null: poHistory.id ;
@@ -218,7 +223,7 @@
/**
- * 鍙栨按鍙ｆ洿鎹簡鎺у埗鍣紝姝ゆ椂鍙洿鏂伴儴鍒嗗睘鎬�
+ * 鍙栨按鍙ｆ洿鎹簡鎺у埗鍣紝鍚屼竴澶╂暟鎹紝姝ゆ椂鍙洿鏂伴儴鍒嗗睘鎬�
* @param controller
* @param rtuAddr
* @param dV1
@@ -226,17 +231,110 @@
* @return
* @throws Exception
*/
- private RmIntakeAmountDayLast updateRmIntakeAmountLastByControllerChange(RmIntakeAmountDayLast lastPo, PrController controller, String rtuAddr, DataV1 dV1, UpDataVo cdData)throws Exception {
+ private RmIntakeAmountDayLast updateRmIntakeAmountLastBySameDateByControllerChange(RmIntakeAmountDayLast lastPo, PrController controller, String rtuAddr, DataV1 dV1, UpDataVo cdData)throws Exception {
lastPo.intakeId = controller==null?null:controller.getIntakeId();
lastPo.controllerIdLast = controller==null?null:controller.getId();
lastPo.rtuAddrLast = rtuAddr;
lastPo.dt = DateTime.dateFrom_yyyy_MM_dd1(dV1.dt);
lastPo.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);
lastPo.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
- //lastPo.amount = lastPo.amount ; //鏃ョ疮璁″彇姘撮噺淇濇寔涓嶅彉锛�
lastPo.totalAmountLast = cdData.totalAmount ;
+ //闃�鎺у櫒鏇存崲浜嗭紝骞朵笖鏄悓涓�澶╂暟鎹�
+ //鍙湁鍏抽榾鎶ユ暟鎹紙2025-01-11锛�
+ if(lastPo.amount == null){
+ lastPo.amount = cdData.amount ;
+ }else{
+ lastPo.amount += cdData.amount ;
+ }
+ if(lastPo.money == null){
+ lastPo.money = cdData.money ;
+ }else{
+ lastPo.money += cdData.money ;
+ }
+ if(lastPo.times == null){
+ lastPo.times = 1 ;
+ }else{
+ lastPo.times += 1 ;
+ }
+ /*
+ if(cdData.isCloseValve != null && cdData.isCloseValve.booleanValue()){
+ //鏄粠鍏抽榾鎶ヤ腑寰楀埌鐨勬暟鎹�
+ if(lastPo.amount == null){
+ lastPo.amount = cdData.amount ;
+ }else{
+ lastPo.amount += cdData.amount ;
+ }
+ if(lastPo.money == null){
+ lastPo.money = cdData.money ;
+ }else{
+ lastPo.money += cdData.money ;
+ }
+ if(lastPo.times == null){
+ lastPo.times = 1 ;
+ }else{
+ lastPo.times += 1 ;
+ }
+ }else{
+ //闈炲叧闃�鎶ユ暟鎹�
+ //涓嶄綔涓�
+ }*/
return lastPo ;
}
+
+ /**
+ * 鍙栨按鍙ｆ洿鎹簡鎺у埗鍣ㄥ湪锛屾鏃跺彧鏇存柊閮ㄥ垎灞炴��
+ * @param controller
+ * @param rtuAddr
+ * @param dV1
+ * @param cdData
+ * @return
+ * @throws Exception
+ */
+ private RmIntakeAmountDay updateRmIntakeAmountBySameDateByControllerChange(RmIntakeAmountDay po, RmIntakeAmountDayLast lastPo, PrController controller, String rtuAddr, DataV1 dV1, UpDataVo cdData)throws Exception {
+ po.intakeId = controller==null?null:controller.getIntakeId();
+ po.controllerIdLast = controller==null?null:controller.getId();
+ po.rtuAddrLast = rtuAddr;
+ po.dt = lastPo.dt ;
+ po.dtLast = lastPo.dtLast;
+ po.rtuDtLast = lastPo.rtuDtLast;
+ po.totalAmountLast = lastPo.totalAmountLast ;
+
+ //闃�鎺у櫒鏇存崲浜嗭紝骞朵笖鏄悓涓�澶╂暟鎹�
+ //鍙湁鍏抽榾鎶ユ暟鎹紙2025-01-11锛�
+ po.amount = lastPo.amount ;
+ po.money = lastPo.money ;
+ po.times = lastPo.times ;
+
+ return po ;
+ }
+
+ /**
+ * 鍙栨按鍙ｆ洿鎹簡鎺у埗鍣紝闈炲悓涓�澶╂暟鎹紝姝ゆ椂鏇存柊閮ㄥ垎灞炴��
+ * @param controller
+ * @param rtuAddr
+ * @param dV1
+ * @param cdData
+ * @return
+ * @throws Exception
+ */
+ private RmIntakeAmountDayLast updateRmIntakeAmountLastByNewDateByControllerChange(RmIntakeAmountDayLast lastPo, PrController controller, String rtuAddr, DataV1 dV1, UpDataVo cdData)throws Exception {
+ lastPo.intakeId = controller==null?null:controller.getIntakeId();
+ lastPo.controllerIdLast = controller==null?null:controller.getId();
+ lastPo.rtuAddrLast = rtuAddr;
+ lastPo.dt = DateTime.dateFrom_yyyy_MM_dd1(dV1.dt);
+ lastPo.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);
+ lastPo.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ lastPo.totalAmountLast = cdData.totalAmount ;
+
+ //闃�鎺у櫒鏇存崲浜嗭紝骞朵笖鏄柊涓�澶╂暟鎹� 2025-01-11
+ lastPo.amount = cdData.amount ;
+ lastPo.money = cdData.money ;
+ lastPo.times = 1 ;
+
+ return lastPo ;
+ }
+
+
/**
* 鏀跺埌鍚屼竴澶╃殑鏂扮殑鏁版嵁锛岃繘琛屾洿鏂版暟鎹�
@@ -261,37 +359,58 @@
//涓婇潰鏃舵爣浣滀簡鏇存柊锛屼篃姝ｅ父锛岀浉褰撲簬鏈涓婃姤鐨勭疮璁℃祦閲忎笌涓婃涓婃姤鐨勭疮璁℃祦閲忔暟鍊肩浉绛�
//lastPo.totalAmountLast = lastPo.totalAmountLast ;
//lastPo.amount = lastPo.amount; //鏈棩鐨勬棩绱姘撮噺淇濇寔涓嶅彉
- }else{
- Double added = cdData.totalAmount - lastPo.totalAmountLast ;
- if(added > 0){
- if(lastPo.amount == null){
- lastPo.amount = added ;
- }else{
- lastPo.amount += added ;
- }
- }else{
- //鍙兘鏄洿鎹㈡按琛ㄤ簡锛屾柊琛ㄥ簳鍊煎鍘熻〃搴曞�煎皬銆�
- //鏈缃噺鍊间笉鍙橈紝涓嬫鍐嶄笂鎶ユ椂锛屽氨鑳芥甯歌绠椾簡銆�
- //lastPo.amount = lastPo.amount ; //鏃ョ疮璁″彇姘撮噺涓嶅彉
- }
- if(cdData.isCloseValve != null && cdData.isCloseValve.booleanValue()){
- //鏄粠鍏抽榾鎶ヤ腑寰楀埌鐨勬暟鎹�
- if(lastPo.money == null){
- lastPo.money = cdData.money ;
- }else{
- lastPo.money += cdData.money ;
- }
- if(lastPo.times == null){
- lastPo.times = 1 ;
- }else{
- lastPo.times += 1 ;
- }
- }else{
- lastPo.money = 0.0D ;
- lastPo.times = 1 ;
- }
- lastPo.totalAmountLast = cdData.totalAmount ;
+ }else {
+ lastPo.totalAmountLast = cdData.totalAmount;
}
+ //鏄悓涓�澶╂暟鎹�
+ //鍙湁鍏抽榾鎶ユ暟鎹紙2025-01-11锛�
+ if(lastPo.amount == null){
+ lastPo.amount = cdData.amount ;
+ }else{
+ lastPo.amount += cdData.amount ;
+ }
+ if(lastPo.money == null){
+ lastPo.money = cdData.money ;
+ }else{
+ lastPo.money += cdData.money ;
+ }
+ if(lastPo.times == null){
+ lastPo.times = 1 ;
+ }else{
+ lastPo.times += 1 ;
+ }
+
+ /* 2025-01-11
+ Double added = cdData.totalAmount - lastPo.totalAmountLast ;
+ if(added > 0){
+ if(lastPo.amount == null){
+ lastPo.amount = added ;
+ }else{
+ lastPo.amount += added ;
+ }
+ }else{
+ //鍙兘鏄洿鎹㈡按琛ㄤ簡锛屾柊琛ㄥ簳鍊兼瘮鍘熻〃搴曞�煎皬銆�
+ //鏈缃噺鍊间笉鍙橈紝涓嬫鍐嶄笂鎶ユ椂锛屽氨鑳芥甯歌绠椾簡銆�
+ //lastPo.amount = lastPo.amount ; //鏃ョ疮璁″彇姘撮噺涓嶅彉
+ }
+
+ if(cdData.isCloseValve != null && cdData.isCloseValve.booleanValue()){
+ //鏄粠鍏抽榾鎶ヤ腑寰楀埌鐨勬暟鎹�
+ if(lastPo.money == null){
+ lastPo.money = cdData.money ;
+ }else{
+ lastPo.money += cdData.money ;
+ }
+ if(lastPo.times == null){
+ lastPo.times = 1 ;
+ }else{
+ lastPo.times += 1 ;
+ }
+ }else{
+ //闈炲叧闃�鎶ユ暟鎹�
+ //涓嶄綔涓�
+ }
+ */
return lastPo ;
}
@@ -312,6 +431,14 @@
lastPo.dt = DateTime.dateFrom_yyyy_MM_dd1(dV1.dt);//鏃ユ湡鍙樹簡
lastPo.dtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt);
lastPo.rtuDtLast = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(cdData.rtuDt);
+ lastPo.totalAmountLast = cdData.totalAmount ;
+
+ //鏂扮殑涓�澶╂暟鎹� 2025-01-11
+ lastPo.amount = cdData.amount ;
+ lastPo.money = cdData.money ;
+ lastPo.times = 1 ;
+
+ /*
if(cdData.totalAmount == 0.0F){
//鍙戠幇闃�鎺у櫒涓�涓猙ug锛岀粡甯镐笂鎶ョ疮璁℃祦閲忎负0锛屾帹娴嬫槸闃�鎺у櫒鏈兘浠庢按琛ㄩ噰闆嗗埌鏁版嵁鏃朵細涓婃姤0鍊�
//杩欑鎯呭喌鏁版嵁涓嶅仛澶勭悊
@@ -329,45 +456,20 @@
//鏈缃�0锛屼笅娆″啀涓婃姤鏃讹紝灏辫兘姝ｅ父璁＄畻浜嗐��
lastPo.amount = 0.0D; //鏃ョ疮璁℃按閲忓綊0
}
- lastPo.totalAmountLast = cdData.totalAmount ;
}
-
if(cdData.isCloseValve != null && cdData.isCloseValve.booleanValue()){
//鏄粠鍏抽榾鎶ヤ腑寰楀埌鐨勬暟鎹�
lastPo.money = cdData.money ;
lastPo.times = 1 ;
}else{
- lastPo.money = 0.0D ;
- lastPo.times = 0 ;
+ //闈炲叧闃�鎶ユ暟鎹�
+ //涓嶄綔涓�
}
+ */
return lastPo ;
}
- /**
- * 鍙栨按鍙ｆ洿鎹簡鎺у埗鍣ㄥ湪锛屾鏃跺彧鏇存柊閮ㄥ垎灞炴��
- * @param controller
- * @param rtuAddr
- * @param dV1
- * @param cdData
- * @return
- * @throws Exception
- */
- private RmIntakeAmountDay updateRmIntakeAmountByControllerChange(RmIntakeAmountDay po, RmIntakeAmountDayLast lastPo, PrController controller, String rtuAddr, DataV1 dV1, UpDataVo cdData)throws Exception {
- po.intakeId = controller==null?null:controller.getIntakeId();
- po.controllerIdLast = controller==null?null:controller.getId();
- po.rtuAddrLast = rtuAddr;
- po.dt = lastPo.dt ;
- po.dtLast = lastPo.dtLast;
- po.rtuDtLast = lastPo.rtuDtLast;
-
- po.amount = lastPo.amount ;
- po.money = lastPo.money ;
- po.times = lastPo.times ;
- po.totalAmountLast = lastPo.totalAmountLast ;
-
- return po ;
- }
/**
* 鏇存柊鍘嗗彶璁板綍
@@ -385,11 +487,11 @@
po.dt = lastPo.dt ;
po.dtLast = lastPo.dtLast;
po.rtuDtLast = lastPo.rtuDtLast;
+ po.totalAmountLast = lastPo.totalAmountLast ;
po.amount = lastPo.amount ;//姝ゆ椂lastPo.amount宸茬粡澧炲姞涓婁簡澧為噺
po.money = lastPo.money ;//姝ゆ椂lastPo.money宸茬粡澧炲姞涓婁簡澧為噺
po.times = lastPo.times ;//姝ゆ椂lastPo.times宸茬粡澧炲姞涓婁簡澧為噺
- po.totalAmountLast = lastPo.totalAmountLast ;
return po ;
}
@@ -403,6 +505,7 @@
public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
public void valueFrom(DataCdC0Vo voC0, DataCd84Vo vo84, DataCd83OpenVo vo83Op, DataCd83CloseVo vo83Cl){
+ /*
if(voC0 != null){
this.totalAmount = voC0.totalAmount ;
this.rtuDt = voC0.rtuDt ;
@@ -412,13 +515,13 @@
}else if(vo83Op != null){
this.totalAmount = vo83Op.totalAmount ;
this.rtuDt = vo83Op.rtuDt ;
- }else if(vo83Cl != null){
+ }else if(vo83Cl != null){ */
this.totalAmount = vo83Cl.totalAmount ;
this.amount = vo83Cl.thisAmount ;
this.money = vo83Cl.thisMoney ;
this.isCloseValve = true ;
this.rtuDt = vo83Cl.rtuDt ;
- }
+ /*} */
}
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
index d9c38ce..755a377 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
@@ -23,7 +23,7 @@
<task id="TkDealOpenValveReport" name="鎺у埗鍣ㄥ紑闃�涓婃姤(鍔熻兘鐮�83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealOpenValveReport" />
<task id="TkDealCloseValveReport" name="鎺у埗鍣ㄥ叧闃�涓婃姤(鍔熻兘鐮�83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealCloseValveReport" />
<task id="TkDealLoss" name="鍙栨按鍙ｆ棩婕忔崯閲�(鍔熻兘鐮丆0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealLoss" />
- <task id="TkDealIntakeAmountDay" name="鍙栨按鍙ｆ棩鐢ㄦ按閲�(鍔熻兘鐮�84銆佸姛鑳界爜83銆佸姛鑳界爜C0)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealIntakeAmountDay" />
+ <task id="TkDealIntakeAmountDay" name="鍙栨按鍙ｆ棩鐢ㄦ按閲�(鍔熻兘鐮�83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealIntakeAmountDay" />
<task id="TkDealClientAmountDay" name="鍐滄埛鏃ョ敤姘撮噺(鍔熻兘鐮�83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealClientAmountDay" />
<task id="TkDealIcRemainMoney" name="IC鍗″墿浣欓噾棰�(鍔熻兘鐮�84銆佸姛鑳界爜83)" enable="true" class="com.dy.rtuMw.server.rtuData.p206V1.TkDealIcRemainMoney" />
</task>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeCtrl.java
index 2ebaaf0..320da48 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeCtrl.java
@@ -54,6 +54,18 @@
return BaseResponseUtils.buildSuccess(true);
}
+ /**
+ * 閲嶆柊缁熻鍙栨按鍙ｆ湀鍙栨按閲�
+ * @return
+ */
+ @GetMapping(path = "reStatisticsAllIntakeDayAmount")
+ @SsoAop()
+ public BaseResponse<Boolean> reStatisticsAllIntakeDayAmount() throws Exception{
+ this.intakeAmountSv.deleteAllIntakeAmountDay();
+ this.intakeAmountSv.statisticsIntakeAmountDay();
+ return BaseResponseUtils.buildSuccess(true);
+ }
+
/**
* 閲嶆柊缁熻鍙栨按鍙ｆ湀鍙栨按閲�
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
index d1e6f82..32cdf07 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
@@ -6,6 +6,7 @@
import com.dy.pipIrrGlobal.pojoSt.StIntakeAmountMonth;
import com.dy.pipIrrGlobal.pojoSt.StIntakeAmountYear;
import com.dy.pipIrrGlobal.voSt.VoIntake;
+import com.dy.pipIrrTemp.util.StClientAmountConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,8 +27,6 @@
public class ChSomeIntakeAmountSv {
private ChangeMapper dao;
-
- private static final int IntakeAmountDayFlag = 800 ;//2024-12-14缁熻鍏冭皨鏁版嵁搴撳疄鏃舵暟鎹紝鍙戠幇澶т簬800鐨勬纭殑鏁版嵁涓嶅瓨鍦紝鑰屽皬浜�800鐨勫熀鏈负姝ｇ‘鏁版嵁
@Autowired
private void setDao(ChangeMapper dao){
@@ -57,11 +56,11 @@
for(RmIntakeAmountDay ad : adList){
if(lastAd == null){
lastAd = ad ;
- if(lastAd.amount != null && lastAd.amount > IntakeAmountDayFlag){
+ if(lastAd.amount != null && lastAd.amount > StClientAmountConstant.IntakeAmountDayFlag){
this.doUpdateOneIntakeAmountDay(lastAd.id, 0.0);
}
}else{
- if(ad.amount != null && ad.amount > IntakeAmountDayFlag){
+ if(ad.amount != null && ad.amount > StClientAmountConstant.IntakeAmountDayFlag){
if(ad.totalAmountLast != null && lastAd.totalAmountLast != null){
//閲嶆柊璁＄畻鏃ュ彇姘撮噺
ad.amount = ad.totalAmountLast - lastAd.totalAmountLast;
@@ -74,10 +73,10 @@
);
ad.amount = 0.0 ;
}
- if(ad.amount > IntakeAmountDayFlag){
+ if(ad.amount > StClientAmountConstant.IntakeAmountDayFlag){
//璁＄畻鏃ュ彇姘撮噺鍚庯紝浠嶅ぇ浜嶪ntakeAmountDayFlag
log.info("鍑虹幇璋冩暣鍚庣殑鏃ュ彇姘撮噺浠嶅ぇ浜�"
- + IntakeAmountDayFlag
+ + StClientAmountConstant.IntakeAmountDayFlag
+ "鐨勬儏鍐碉紝鏁版嵁id=" + ad.id
+ "锛屽彇姘村彛id=" + ad.intakeId
+ "锛屾棩鏈�=" + ad.dt
@@ -87,7 +86,7 @@
if(DateTime.daysBetweenyyyy_MM_dd(ad.dt, lastAd.dt) == 1){
//鍙浉宸竴澶�
log.info("鍑虹幇鐩稿樊涓�澶╀絾鏃ュ彇姘撮噺澶т簬"
- + IntakeAmountDayFlag
+ + StClientAmountConstant.IntakeAmountDayFlag
+ "鐨勬儏鍐碉紝鏁版嵁id=" + ad.id
+ "锛屽彇姘村彛id=" + ad.intakeId
+ "锛屾棩鏈�=" + ad.dt
@@ -99,7 +98,7 @@
//宸茬粡淇敼鍚庣殑鏁板�间粛鐒跺ぇ浜嶪ntakeAmountDayFlag锛岃鏄庢槸澶ф棩鏈笂鎶ユ暟鎹�岀Н绱笅鏉�,鍙互澶т簬IntakeAmountDayFlag
//ad.amount = ad.amount ;
log.info("鍑虹幇鐩稿樊澶氬ぉ鏃ュ彇姘撮噺澶т簬"
- + IntakeAmountDayFlag
+ + StClientAmountConstant.IntakeAmountDayFlag
+ "鐨勬儏鍐碉紝鏁版嵁id=" + ad.id
+ "锛屽彇姘村彛id=" + ad.intakeId
+ "锛屾棩鏈�=" + ad.dt
@@ -110,7 +109,7 @@
}
}else{
log.info("鍑虹幇鐩稿樊澶氬ぉ鏃ュ彇姘撮噺澶т簬"
- + IntakeAmountDayFlag
+ + StClientAmountConstant.IntakeAmountDayFlag
+ "骞朵笖灞炴�otalAmountLast涓簄ull鐨勬儏鍐碉紝鏁版嵁id=" + ad.id
+ "锛屽彇姘村彛id=" + ad.intakeId
+ "锛屾棩鏈�=" + ad.dt
@@ -134,6 +133,53 @@
return dao.updateOneIntakeAmountDay(id, amount);
}
+ /**
+ * 鍒犻櫎鎵�鏈夊彇姘村彛鏃ュ彇姘撮噺缁熻
+ * @throws Exception
+ */
+ @Transactional
+ public void deleteAllIntakeAmountDay(){
+ dao.deleteAllIntakeAmountDay();
+ }
+
+ /**
+ * 缁熻鍙栨按鍙ｆ棩鍙栨按閲�
+ * @throws Exception
+ */
+ public void statisticsIntakeAmountDay() throws Exception{
+ int nowYear = Integer.parseInt(DateTime.yyyy()) ;
+ int nowMonth = Integer.parseInt(DateTime.mm()) ;
+ int nowDay = Integer.parseInt(DateTime.dd()) ;
+ Date startDt ;
+ Date endDt ;
+ List<RmIntakeAmountDay> list ;
+ boolean stop = false ;
+ for(int[] ym : StClientAmountConstant.yearMonthGrp) {
+ int[] dates = DateTime.dayGrpInMonth(ym[0], ym[1]);
+ for(int day: dates){
+ if(ym[0] == nowYear && ym[1] == nowMonth && day > nowDay){
+ stop = true ;
+ }
+ if(!stop){
+ startDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(ym[0] + "-" + ym[1] + "-" + day + " 00:00:00") ;
+ endDt = DateTime.dateFrom_yyyy_MM_dd(ym[0] + "-" + ym[1] + "-" + day + " 23:59:59") ;
+ list = dao.statisticAllIntakeAmountDayFromOpenCloseValveHistory(startDt, endDt) ;
+ this.doStatisticsIntakeAmountDay(ym[0], ym[1], day, list) ;
+ }else{
+ break ;
+ }
+ }
+ }
+ }
+ @Transactional
+ protected void doStatisticsIntakeAmountDay(int year, int month, int day, List<RmIntakeAmountDay> list) throws Exception{
+ if(list != null && list.size() > 0){
+ Date date = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + day) ;
+ for(RmIntakeAmountDay po : list){
+ dao.updateOneIntakeAmountDay1(po.intakeId, date, po.amount, po.money, po.times);
+ }
+ }
+ }
////////////////////////////////////////
@@ -141,9 +187,6 @@
// 鏈夊叧鏈堢粺璁�
//
///////////////////////////////////////
-
- private static final int DealStartYear = 2024 ;
- private static final int DealStartMonth = 8 ;
/**
* 鍒犻櫎鎵�鏈夊彇姘村彛鏈堝彇姘撮噺缁熻
@@ -164,7 +207,7 @@
Date startDt ;
Date endDt ;
List<StIntakeAmountMonth> list ;
- for(int year = DealStartYear; year <= nowYear; year ++){
+ for(int year = StClientAmountConstant.DealStartYear; year <= nowYear; year ++){
list = null ;
if(year < nowYear){
for(int month = 1 ; month <= 12 ; month ++){
@@ -218,7 +261,7 @@
Date startDt ;
Date endDt ;
List<StIntakeAmountYear> list ;
- for(int year = DealStartYear; year <= nowYear; year ++){
+ for(int year = StClientAmountConstant.DealStartYear; year <= nowYear; year ++){
list = null ;
startDt = DateTime.dateFrom_yyyy_MM_dd(year + "-01-01") ;
endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-12-31") ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeLossSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeLossSv.java
index 9a540ed..a089fab 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeLossSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeLossSv.java
@@ -9,6 +9,7 @@
import com.dy.pipIrrGlobal.pojoSt.StLossMonth;
import com.dy.pipIrrGlobal.pojoSt.StLossYear;
import com.dy.pipIrrGlobal.voSt.VoIntake;
+import com.dy.pipIrrTemp.util.StClientAmountConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,9 +28,6 @@
public class ChSomeIntakeLossSv {
private ChangeMapper dao;
-
- private static final int IntakeLossDayFlag = 800 ;//2024-12-14缁熻鍏冭皨鏁版嵁搴撳疄鏃舵暟鎹紝鍙戠幇澶т簬800鐨勬纭殑鏁版嵁涓嶅瓨鍦紝鑰屽皬浜�800鐨勫熀鏈负姝ｇ‘鏁版嵁
-
@Autowired
private void setDao(ChangeMapper dao){
this.dao = dao;
@@ -52,7 +50,7 @@
if(adList != null && adList.size() > 0){
//adList涓暟鎹互id鍗囧簭鎺掑垪
for(RmLossDay ad : adList){
- if(ad.lossAmount != null && ad.lossAmount > IntakeLossDayFlag){
+ if(ad.lossAmount != null && ad.lossAmount > StClientAmountConstant.IntakeLossDayFlag){
this.doUpdateOneIntakeLossDay(ad.id, 0.0);
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountConstant.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountConstant.java
deleted file mode 100644
index 5190805..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountConstant.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dy.pipIrrTemp.statistics;
-
-/**
- * @Author: liurunyu
- * @Date: 2024/12/30 13:49
- * @Description
- */
-public class StClientAmountConstant {
-
- public static final int[][] yearMonthGrp = {{2024, 9}, {2024, 10}, {2024, 11}, {2024, 12}, {2025, 1}, {2025, 2}, {2025, 3}, {2025, 4}};
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountDaySv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountDaySv.java
index 9a97dd0..72fdb43 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountDaySv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountDaySv.java
@@ -5,10 +5,8 @@
import com.dy.pipIrrGlobal.daoRm.RmClientAmountDayMapper;
import com.dy.pipIrrGlobal.daoSt.StClientAmountDayMapper;
import com.dy.pipIrrGlobal.pojoSt.StClientAmountDay;
-import com.dy.pipIrrGlobal.pojoSt.StConsumeClientMonth;
-import com.dy.pipIrrGlobal.pojoSt.StConsumeClientYear;
import com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics;
-import com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics;
+import com.dy.pipIrrTemp.util.StClientAmountConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountMonthSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountMonthSv.java
index b280e01..a1d5d90 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountMonthSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountMonthSv.java
@@ -1,14 +1,11 @@
package com.dy.pipIrrTemp.statistics;
import com.dy.common.util.DateTime;
-import com.dy.common.util.IDLongGenerator;
import com.dy.pipIrrGlobal.daoSt.StClientAmountDayMapper;
import com.dy.pipIrrGlobal.daoSt.StClientAmountMonthMapper;
import com.dy.pipIrrGlobal.pojoSt.StClientAmountMonth;
-import com.dy.pipIrrGlobal.pojoSt.StConsumeClientMonth;
-import com.dy.pipIrrGlobal.pojoSt.StConsumeClientYear;
import com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics;
-import com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics;
+import com.dy.pipIrrTemp.util.StClientAmountConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountYearSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountYearSv.java
index 73ff3b9..a94a0a6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountYearSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/statistics/StClientAmountYearSv.java
@@ -4,9 +4,9 @@
import com.dy.pipIrrGlobal.daoSt.StClientAmountDayMapper;
import com.dy.pipIrrGlobal.daoSt.StClientAmountMonthMapper;
import com.dy.pipIrrGlobal.daoSt.StClientAmountYearMapper;
-import com.dy.pipIrrGlobal.pojoSt.StClientAmountMonth;
import com.dy.pipIrrGlobal.pojoSt.StClientAmountYear;
import com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics;
+import com.dy.pipIrrTemp.util.StClientAmountConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/util/StClientAmountConstant.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/util/StClientAmountConstant.java
new file mode 100644
index 0000000..dbefecc
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/util/StClientAmountConstant.java
@@ -0,0 +1,19 @@
+package com.dy.pipIrrTemp.util;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/12/30 13:49
+ * @Description
+ */
+public class StClientAmountConstant {
+
+ public static final int IntakeLossDayFlag = 800 ;//2024-12-14缁熻鍏冭皨鏁版嵁搴撳疄鏃舵暟鎹紝鍙戠幇澶т簬800鐨勬纭殑鏁版嵁涓嶅瓨鍦紝鑰屽皬浜�800鐨勫熀鏈负姝ｇ‘鏁版嵁
+
+ public static final int IntakeAmountDayFlag = 800 ;//2024-12-14缁熻鍏冭皨鏁版嵁搴撳疄鏃舵暟鎹紝鍙戠幇澶т簬800鐨勬纭殑鏁版嵁涓嶅瓨鍦紝鑰屽皬浜�800鐨勫熀鏈负姝ｇ‘鏁版嵁
+
+ public static final int DealStartYear = 2024 ;
+ public static final int DealStartMonth = 8 ;
+
+ public static final int[][] yearMonthGrp = {{2024, 9}, {2024, 10}, {2024, 11}, {2024, 12}, {2025, 1}, {2025, 2}, {2025, 3}, {2025, 4}};
+
+}
--
Gitblit v1.8.0