From f6aeadcf6cc2dfdd5f3983547114600bb0b5c69a Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 16 十月 2024 16:43:46 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java
index 5f9f604..5e8dc51 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataAlarmVo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo;
import com.dy.common.mw.protocol.p206V202404.DataV202404;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo;
@@ -10,6 +11,8 @@
import com.dy.pipIrrGlobal.pojoRm.RmOnHourReportLast;
import com.dy.pipIrrGlobal.pojoRm.RmTimingReportHistory;
import com.dy.pipIrrGlobal.pojoRm.RmTimingReportLast;
+import com.dy.rtuMw.server.ServerProperties;
+import com.dy.rtuMw.server.forMs.SendMsCache;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
@@ -68,7 +71,7 @@
* @param cdData 鑷姤鏁版嵁瀵硅薄
*/
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo cdData) throws Exception {
- RmOnHourReportLast po = sv.getRmOnHourReportLast(rtuAddr) ;
+ RmOnHourReportLast po = sv.getRmOnHourReportLast(controller.getIntakeId()) ;
if(po == null){
po = new RmOnHourReportLast();
po.controllerId = controller==null?null:controller.getId();
@@ -76,11 +79,17 @@
po.rtuAddr = rtuAddr;
po.valueFrom(dV1_0_1, cdData);
sv.saveRmOnHourReportLast(po) ;
+ if(po.lossAmount >= ServerProperties.intakeAlarmLossMinValue){
+ this.sendMessage(controller, po.lossAmount);
+ }
}else{
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.valueFrom(dV1_0_1, cdData);
sv.updateRmOnHourReportLast(po);
+ if(po.lossAmount >= ServerProperties.intakeAlarmLossMinValue){
+ this.sendMessage(controller, po.lossAmount);
+ }
}
}
@@ -101,5 +110,21 @@
po.valueFrom(dV1_0_1, cdData);
sv.saveRmOnHourReportHistory(po); ;
}
+
+
+
+ /**
+ * 鍚戦拤閽夊彂閫佹秷鎭�
+ * @param controller
+ */
+ private void sendMessage(PrController controller, Double lossAmount){
+ String ms = "鍙栨按鍙ｂ��" + controller.getIntakeName() + "鈥濇紡姘存姤璀︼紝浠婃棩婕忔崯閲�" + lossAmount + "绔嬫柟绫�";
+ try{
+ SendMsCache.cacheMs(ms);
+ }catch (Exception e){
+ log.error("缂撳瓨閽夐拤娑堟伅寮傚父锛�", e);
+ }
+ }
+
}
--
Gitblit v1.8.0