From 1fe74a6aba7cc02e6a5c00a227ff815639f825de Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 15 七月 2024 20:52:45 +0800
Subject: [PATCH] 1、实现RTU模拟器，并实现心跳上报、开阀上报、关阀上报； 2、基于RTU模拟器的开关阀上报，设计通信中间件上行数据处理任务的bug;
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java | 102 ++++++++++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 53 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
index a1f920f..c24d04f 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java
@@ -1,11 +1,11 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;
+import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd84Vo;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
-import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory;
import com.dy.pipIrrGlobal.pojoRm.RmWorkReportLast;
@@ -32,84 +32,80 @@
@Override
public void execute(Object data) {
Data d = (Data) data;
- Object subD = d.getSubData();
- if (subD != null) {
- DataV1_0_1 dV1_0_1 = (DataV1_0_1) subD;
-// if (dV1_0_1 != null && dV1_0_1.dataCd84Vo != null) {
-// Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
-// DbSv sv = (DbSv)objs[0] ;
-// PrController controller = (PrController)objs[1] ;
-// try{
-// this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, dV1_0_1.dataCd84Vo) ;
-// }catch (Exception e){
-// log.error("淇濆瓨鎺у埗鍣ㄩ榾寮�宸ヤ綔鎶ユ椂鍙戠敓寮傚父", e);
-// }
-// }
+ DataV1_0_1 dV1_0_1 = (DataV1_0_1) d.getSubData();//鍓嶉潰浠诲姟宸茬粡鍒ゆ柇涓嶄负null
+ Object cdObj = dV1_0_1.subData;
+ if (cdObj != null && cdObj instanceof DataCd84Vo) {
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
+ DbSv sv = (DbSv)objs[0] ;
+ PrController controller = (PrController)objs[1] ;
+ SeClient clientVo = (SeClient)objs[3] ;//杩欎釜鍊煎璞′腑鍙湁id鍜宯ame浼氭湁鍊�
+ try{
+ this.doDeal(sv, clientVo, controller, d.getRtuAddr(), dV1_0_1, (DataCd84Vo)cdObj) ;
+ }catch (Exception e){
+ log.error("淇濆瓨鎺у埗鍣ㄩ榾寮�宸ヤ綔鎶ユ椂鍙戠敓寮傚父", e);
+ }
}
}
/**
* 澶勭悊闃�寮�宸ヤ綔鎶ユ暟鎹�
* @param sv 鏈嶅姟
+ * @param clientVo 鍐滄埛瀵硅薄锛堜笉涓虹┖鏃讹紝鍙湁id鍜宯ame鏈夊�硷級
* @param controller 鎺у埗鍣ㄥ璞�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @param dataCd84Vo 宸ヤ綔鎶ユ暟鎹璞�
*/
- private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo dataCd84Vo) throws Exception {
- this.saveOrUpdateLast(sv, controller, rtuAddr, dV1_0_1, dataCd84Vo);
- this.saveHistory(sv, controller, rtuAddr, dV1_0_1, dataCd84Vo);
+ private void doDeal(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo dataCd84Vo) throws Exception {
+ this.saveOrUpdateLast(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd84Vo);
+ this.saveHistory(sv, clientVo, controller, rtuAddr, dV1_0_1, dataCd84Vo);
}
/**
* 淇濆瓨闃�寮�宸ヤ綔鎶ユ渶鏂版暟鎹�
* @param sv
+ * @param clientVo 鍐滄埛瀵硅薄锛堜笉涓虹┖鏃讹紝鍙湁id鍜宯ame鏈夊�硷級
* @param controller
* @param rtuAddr
* @param dV1_0_1
- * @param dataCd84Vo
+ * @param cdData
*/
- private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo dataCd84Vo) throws Exception {
-// RmWorkReportLast po = sv.getRmWorkReportLast(rtuAddr) ;
-// if(po == null){
-// po = new RmWorkReportLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
-// rtuAddr,
-// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
-// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.rtuDt),
-// dataCd84Vo.cardNo,
-// dataCd84Vo.totalAmount,
-// dataCd84Vo.instantAmount,
-// dataCd84Vo.remainMoney) ;
-// sv.saveRmWorkReportLast(po) ;
-// }else{
-// po.controllerId = controller==null?null:controller.getId();
-// po.intakeId = controller==null?null:controller.getIntakeId();
-//
-// po.dt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt);
-// po.rtuDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.rtuDt);
-// po.icCardNo = dataCd84Vo.cardNo;
-// po.totalAmount = dataCd84Vo.totalAmount;
-// po.instantAmount = dataCd84Vo.instantAmount;
-// po.remainMoney = dataCd84Vo.remainMoney;
-// sv.updateRmWorkReportLast(po);
-// }
+ private void saveOrUpdateLast(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo cdData) throws Exception {
+ RmWorkReportLast po = sv.getRmWorkReportLast(controller.getIntakeId()) ;
+ if(po == null){
+ po = new RmWorkReportLast() ;
+ po.clientId = clientVo==null?null:clientVo.getId() ;
+ po.clientName = clientVo==null?null:clientVo.getName() ;
+ po.controllerId = controller==null?null:controller.getId();
+ po.intakeId = controller==null?null:controller.getIntakeId();
+ po.rtuAddr = rtuAddr;
+ po.valueFrom(dV1_0_1, cdData);
+ sv.saveRmWorkReportLast(po) ;
+ }else{
+ po.clientId = clientVo==null?null:clientVo.getId() ;
+ po.clientName = clientVo==null?null:clientVo.getName() ;
+ po.controllerId = controller==null?null:controller.getId();
+ po.intakeId = controller==null?null:controller.getIntakeId();
+ po.valueFrom(dV1_0_1, cdData);
+ sv.updateRmWorkReportLast(po);
+ }
}
/**
* 淇濆瓨闃�寮�宸ヤ綔鎶ュ巻鍙叉暟鎹�
* @param sv
+ * @param clientVo 鍐滄埛瀵硅薄锛堜笉涓虹┖鏃讹紝鍙湁id鍜宯ame鏈夊�硷級
* @param controller
* @param rtuAddr
* @param dV1_0_1
- * @param dataCd84Vo
+ * @param cdData
*/
- private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo dataCd84Vo) throws Exception {
-// RmWorkReportHistory po = new RmWorkReportHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
-// rtuAddr,
-// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt),
-// DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd84Vo.rtuDt),
-// dataCd84Vo.cardNo,
-// dataCd84Vo.totalAmount,
-// dataCd84Vo.instantAmount,
-// dataCd84Vo.remainMoney) ;
-// sv.saveRmWorkReportHistory(po) ;
+ private void saveHistory(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCd84Vo cdData) throws Exception {
+ RmWorkReportHistory po = new RmWorkReportHistory();
+ po.clientId = clientVo==null?null:clientVo.getId() ;
+ po.clientName = clientVo==null?null:clientVo.getName() ;
+ po.controllerId = controller==null?null:controller.getId();
+ po.intakeId = controller==null?null:controller.getIntakeId();
+ po.rtuAddr = rtuAddr;
+ po.valueFrom(dV1_0_1, cdData);
+ sv.saveRmWorkReportHistory(po) ;
}
--
Gitblit v1.8.0