From 6de539c46205a6e26eaab24be2e1a21f9054af08 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 16 一月 2024 17:10:14 +0800
Subject: [PATCH] 1、完善通信中单件对上行数据处理的逻辑及代码
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java | 4 ++--
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java | 4 ++--
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java | 9 ++++-----
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java | 9 ++++-----
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java
index 45d1fa8..86b05f5 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java
@@ -42,17 +42,16 @@
@Autowired
private RmAutoReportHistoryMapper rmAutoReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙蹭笂鎶ユ暟鎹瓺AO
- @Autowired
- @Lazy
- private DbSv sv ;
-
+ //@Autowired
+ //@Lazy
+ //private DbSv sv ;
/**
* 閫氳繃鎺у埗鍣ㄥ湴鍧�浠庢暟鎹簱琛ㄤ腑鏌ヨ鎺у埗鍣�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @return 鎺у埗鍣�
*/
- public PrController getPrControllerByRtuAddr(String rtuAddr){
+ public PrController getControllersByRtuAddrAndIntakeNotNull(String rtuAddr){
List<PrController> list = this.prControllerMapperDao.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
if(list != null && list.size() > 0){
return list.get(0) ;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
index a5c0619..4f2a5f1 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
@@ -70,7 +70,7 @@
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataAlarmVo alarmVo, DataStateVo stateVo){
RmAlarmStateLast po = sv.getRmLastAlarmState(rtuAddr) ;
if(po == null){
- po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller.getId(),
+ po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
rtuAddr,
new Date(),
alarmVo==null?null:alarmVo.batteryVolt, alarmVo==null?null:alarmVo.loss, alarmVo==null?null:alarmVo.meter, alarmVo==null?null:alarmVo.valve,
@@ -91,7 +91,7 @@
* @param stateVo 鐘舵�佸璞�
*/
private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataAlarmVo alarmVo, DataStateVo stateVo){
- RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller.getId(),
+ RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
rtuAddr,
new Date(),
alarmVo==null?null:alarmVo.batteryVolt, alarmVo==null?null:alarmVo.loss, alarmVo==null?null:alarmVo.meter, alarmVo==null?null:alarmVo.valve,
@@ -101,9 +101,8 @@
private RmAlarmStateLast update(PrController controller, RmAlarmStateLast po, DataAlarmVo alarmVo, DataStateVo stateVo){
- if(controller != null){
- po.controllerid = controller.getId() ;
- }
+ po.controllerid = controller==null?null:controller.getId() ;
+
po.dt = new Date() ;
if(alarmVo != null){
po.bateryvolt = alarmVo.batteryVolt ;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java
index 1b33e27..d0d0704 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java
@@ -60,7 +60,7 @@
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataCdC0Vo dataCdC0Vo) throws Exception {
RmAutoReportLast po = sv.getRmLastAutoReport(rtuAddr) ;
if(po == null){
- po = new RmAutoReportLast(null, controller.getId(), controller.getId(),
+ po = new RmAutoReportLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getId(),
rtuAddr,
new Date(),
DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt),
@@ -81,7 +81,7 @@
* @param dataCdC0Vo 鑷姤鏁版嵁瀵硅薄
*/
private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataCdC0Vo dataCdC0Vo) throws Exception {
- RmAutoReportHistory po = new RmAutoReportHistory(null, controller.getId(), controller.getId(),
+ RmAutoReportHistory po = new RmAutoReportHistory(null, controller==null?null:controller.getId(), controller==null?null:controller.getIntakeId(),
rtuAddr,
new Date(),
DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCdC0Vo.rtuDt),
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
index 142c96b..7f541d1 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
@@ -32,9 +32,9 @@
String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖
DbSv sv = (DbSv)SpringContextUtil.getBean(DbSv.class) ;
if(sv != null){
- PrController controller = sv.getPrControllerByRtuAddr(rtuAddr) ;
+ PrController controller = sv.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
if(controller == null){
- //鏁版嵁搴撲腑鏈煡璇㈠埌鎺у埗鍣紙RTU瀹炰綋锛�
+ //鏁版嵁搴撲腑鏈煡璇�(宸茬粡缁戝畾涓旀帶鍒跺櫒鍦板潃鐩哥)鍒版帶鍒跺櫒锛圧TU瀹炰綋锛�
//娴佹氮鑰呮帶鍒跺櫒
PrControllerTramp rtuTramp = sv.getPrControllerTrampByRtuAddr(rtuAddr);
if(rtuTramp == null){
--
Gitblit v1.8.0