From 428eee9df5f8885ab71d7cd273f5889b8c81e1dc Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 16:49:30 +0800
Subject: [PATCH] 2024-10-31 优化代码
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealOnHourReport.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 c04f4a0..ba8c3b0 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;
@@ -19,7 +22,7 @@
* @Author liurunyu
* @Date 2024/1/16 14:11
* @LastEditTime 2024/1/16 14:11
- * @Description 鎺у埗鍣ㄨ嚜鎶ュ疄鏃舵暟鎹紙鍔熻兘鐮佷负C0锛夛紙鏁寸偣涓婃姤锛�
+ * @Description 鎺у埗鍣ㄨ嚜鎶ュ疄鏃舵暟鎹紙鍔熻兘鐮佷负C0锛夛紙瀹氱偣涓婃姤锛�
*/
public class TkDealOnHourReport extends TaskSurpport {
@@ -44,7 +47,7 @@
try{
this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, (DataCdC0Vo)cdObj);
}catch (Exception e){
- log.error("淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ユ暟鎹椂鍙戠敓寮傚父", e);
+ log.error("淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ユ暟鎹椂鍙戠敓寮傚父", e);
}
}
}
@@ -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