From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 八月 2024 11:36:41 +0800
Subject: [PATCH] 1、完善代码和application.yml配置文件，去掉不用的引入文件； 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断； 3、凡是有Server的应用，加载资源方式改为用springboot的工具类加载； 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2，以实现可以在jar包情况下能够扫描类（.class）注解。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
index 18fdf20..78dbea4 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealOpenValveReportV202404.java
@@ -4,6 +4,8 @@
import com.dy.common.mw.protocol.p206V202404.DataV202404;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd84Vo;
import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
+import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
@@ -54,8 +56,8 @@
* @param cdData 鍔熻兘鏁版嵁
*/
private void doDeal(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd84Vo cdData) throws Exception {
- //this.saveOrUpdateLast(sv, controller, rtuAddr, dataV202404, cdData);
- //this.saveHistory(sv, controller, rtuAddr, dataV202404, cdData);
+ this.saveOrUpdateLast(sv, controller, rtuAddr, dataV202404, cdData);
+ this.saveHistory(sv, controller, rtuAddr, dataV202404, cdData);
}
/**
@@ -66,22 +68,22 @@
* @param dataV202404 鍗忚鏁版嵁
* @param cdData 鍔熻兘鏁版嵁
*/
- //private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd84Vo cdData)throws Exception {
- // RmTimingReportLast po = sv.getRmTimingReportLast(rtuAddr) ;
- // if(po == null){
- // po = new RmTimingReportLast();
- // po.controllerId = controller==null?null:controller.getId();
- // po.intakeId = controller==null?null:controller.getIntakeId();
- // po.rtuAddr = rtuAddr;
- // po.valueFrom(dataV202404, cdData);
- // sv.saveRmTimingReportLast(po) ;
- // }else{
- // po.controllerId = controller==null?null:controller.getId();
- // po.intakeId = controller==null?null:controller.getIntakeId();
- // po.valueFrom(dataV202404, cdData);
- // sv.updateRmTimingReportLast(po);
- // }
- //}
+ private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd84Vo cdData)throws Exception {
+ RmOpenCloseValveLast po = sv.getRmOpenCloseValveLast(controller.getIntakeId());
+ if(po == null){
+ po = new RmOpenCloseValveLast();
+ po.controllerId = controller==null?null:controller.getId();
+ po.intakeId = controller==null?null:controller.getIntakeId();
+ po.rtuAddr = rtuAddr;
+ po.valueFrom84(dataV202404, cdData);
+ sv.saveRmOpenCloseValveLast(po);
+ }else{
+ po.controllerId = controller==null?null:controller.getId();
+ po.intakeId = controller==null?null:controller.getIntakeId();
+ po.valueFrom84(dataV202404, cdData);
+ sv.updateRmOpenCloseValveLast(po);
+ }
+ }
/**
* 淇濆瓨鎺у埗鍣ㄥ伐浣滄姤鍘嗗彶鏁版嵁
@@ -91,12 +93,12 @@
* @param dataV202404 鍗忚鏁版嵁
* @param cdData 鍔熻兘鏁版嵁
*/
- //private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd84Vo cdData)throws Exception {
- // RmTimingReportHistory po = new RmTimingReportHistory();
- // po.controllerId = controller==null?null:controller.getId();
- // po.intakeId = controller==null?null:controller.getIntakeId();
- // po.rtuAddr = rtuAddr;
- // po.valueFrom(dataV202404, cdData);
- // sv.saveRmTimingReportHistory(po); ;
- //}
+ private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd84Vo cdData)throws Exception {
+ RmOpenCloseValveHistory po = new RmOpenCloseValveHistory();
+ po.controllerId = controller==null?null:controller.getId();
+ po.intakeId = controller==null?null:controller.getIntakeId();
+ po.rtuAddr = rtuAddr;
+ po.valueFrom84(dataV202404, cdData);
+ sv.saveRmOpenCloseValveHistory(po); ;
+ }
}
--
Gitblit v1.8.0