From f1407edab8c340af83e6d5008b4b826a3922e989 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 13 五月 2024 16:33:55 +0800
Subject: [PATCH] 完善协议（20240510）数据处理任务树。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java
similarity index 75%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatus.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java
index f968801..03be447 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202405.java
@@ -2,12 +2,8 @@
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V202404.DataV202404 ;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd80_5BVo;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd81Vo;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd93_A3_85Vo;
-import com.dy.common.util.DateTime;
+import com.dy.common.mw.protocol.p206V202404.upVos.*;
import com.dy.pipIrrGlobal.pojoPr.PrController;
-import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
@@ -18,12 +14,12 @@
* @Author liurunyu
* @Date 2024/5/8 14:18
*/
-public class TkDealAlarmStatus extends TaskSurpport {
+public class TkDealAlarmStatusV202405 extends TaskSurpport {
- private static final Logger log = LogManager.getLogger(TkDealAlarmStatus.class.getName()) ;
+ private static final Logger log = LogManager.getLogger(TkDealAlarmStatusV202405.class.getName()) ;
//绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
- public static final String taskId = "TkDealAlarmStatus" ;
+ public static final String taskId = "TkDealAlarmStatusV202405" ;
/**
* 鎵ц鑺傜偣浠诲姟锛氭姤璀﹀強鐘舵��
@@ -39,24 +35,34 @@
Object cdObj = dV202404.subData ;
if(cdObj != null){
try{
- Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
+ Object[] objs = this.getTaskResults(TkPreGenObjsV202405.taskId) ;
DbSv sv = (DbSv)objs[0] ;
PrController controller = (PrController)objs[1] ;
- if(cdObj instanceof DataCd80_5BVo){
+ if(cdObj instanceof DataCd81Vo){
+ //璁惧缁堢闅忔満鑷姤
+ DataCd81Vo cdData = (DataCd81Vo)(cdObj) ;
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, cdData, null, null) ;
+ this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, cdData, null, null) ;
+ }else if(cdObj instanceof DataCd80_5BVo){
//璁惧缁堢宸ヤ綔涓婃姤 + 鏌ヨ璁惧缁堢瀹炴椂鍊�
DataCd80_5BVo cdData = (DataCd80_5BVo)(cdObj) ;
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null) ;
- this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null) ;
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null, null, null) ;
+ this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, null, null, null, null) ;
}else if(cdObj instanceof DataCd93_A3_85Vo){
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂� + 鍒峰崱鍏虫车/闃�涓婃姤
DataCd93_A3_85Vo cdData = (DataCd93_A3_85Vo)(cdObj) ;
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null) ;
- this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null) ;
- }else if(cdObj instanceof DataCd81Vo){
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null, null, null) ;
+ this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, null, cdData, null, null, null) ;
+ }else if(cdObj instanceof DataCd84Vo){
//璁惧缁堢闅忔満鑷姤
- DataCd81Vo cdData = (DataCd81Vo)(cdObj) ;
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, cdData) ;
- this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, cdData) ;
+ DataCd84Vo cdData = (DataCd84Vo)(cdObj) ;
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, null, cdData, null) ;
+ this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, null, cdData, null) ;
+ }else if(cdObj instanceof DataCdC2Vo){
+ //璁惧缁堢闅忔満鑷姤
+ DataCdC2Vo cdData = (DataCdC2Vo)(cdObj) ;
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), null, null, null, null, null, cdData) ;
+ this.saveHistory(sv, controller, d.getRtuAddr(), null, null, null, null, null, cdData) ;
}
}catch (Exception e){
log.error("淇濆瓨鎺у埗鍣ㄦ姤璀﹀拰鐘舵�佹暟鎹椂鍙戠敓寮傚父", e);
@@ -81,7 +87,9 @@
String rtuDt,
DataCd80_5BVo vo80_5B,
DataCd93_A3_85Vo vo93_A3_85,
- DataCd81Vo vo81) throws Exception {
+ DataCd81Vo vo81,
+ DataCd84Vo vo84,
+ DataCdC2Vo voC2) throws Exception {
// RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ;
// if(po == null){
// po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
@@ -113,7 +121,9 @@
String rtuDt,
DataCd80_5BVo vo80_5B,
DataCd93_A3_85Vo vo93_A3_85,
- DataCd81Vo vo81) throws Exception {
+ DataCd81Vo vo81,
+ DataCd84Vo vo84,
+ DataCdC2Vo voC2) throws Exception {
// RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
// rtuAddr,
// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
@@ -129,7 +139,9 @@
String rtuDt,
DataCd80_5BVo vo80_5B,
DataCd93_A3_85Vo vo93_A3_85,
- DataCd81Vo vo81) throws Exception {
+ DataCd81Vo vo81,
+ DataCd84Vo vo84,
+ DataCdC2Vo voC2) throws Exception {
// po.controllerid = controller==null?null:controller.getId() ;
// po.intakeid = controller==null?null:controller.getIntakeId() ;
//
--
Gitblit v1.8.0