From 70aeac289c132085e91d59dc82bc1facd41889fa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 24 二月 2025 15:33:53 +0800
Subject: [PATCH] 有关表阀一体机（王江海制定）通信协议： 1、根据新版本协议，解析部分更新； 2、根据测试一体阀协议数据处理需求与逻辑，进行表阀一体机数据处理。
---
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
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 c3014ba..f7c8286 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.pipIrrGlobal.voTmp.VoRmIntakeAmountDay;
import com.dy.pipIrrTemp.util.StClientAmountConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -137,10 +138,19 @@
* 鍒犻櫎鎵�鏈夊彇姘村彛鏃ュ彇姘撮噺缁熻
* @throws Exception
*/
+ //@Transactional
+ //public void deleteAllIntakeAmountDay(){
+ // dao.deleteAllIntakeAmountDay();
+ //}
+ /**
+ * 鍒犻櫎涓�浜涘彇姘村彛鏃ュ彇姘撮噺缁熻
+ * @throws Exception
+ */
@Transactional
- public void deleteAllIntakeAmountDay(){
- dao.deleteAllIntakeAmountDay();
+ public void deleteSomeIntakeAmountDay(){
+ dao.deleteSomeIntakeAmountDay();
}
+
/**
* 缁熻鍙栨按鍙ｆ棩鍙栨按閲�
@@ -152,7 +162,7 @@
int nowDay = Integer.parseInt(DateTime.dd()) ;
Date startDt ;
Date endDt ;
- List<RmIntakeAmountDay> list ;
+ List<VoRmIntakeAmountDay> list ;
boolean stop = false ;
for(int[] ym : StClientAmountConstant.yearMonthGrp) {
int[] dates = DateTime.dayGrpInMonth(ym[0], ym[1]);
@@ -172,11 +182,11 @@
}
}
@Transactional
- protected void doStatisticsIntakeAmountDay(int year, int month, int day, List<RmIntakeAmountDay> list) throws Exception{
+ protected void doStatisticsIntakeAmountDay(int year, int month, int day, List<VoRmIntakeAmountDay> 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);
+ for(VoRmIntakeAmountDay vo : list){
+ dao.updateOneIntakeAmountDay1(vo.intakeId, date, vo.amount, vo.money, vo.times);
}
}
}
--
Gitblit v1.8.0