From b218f31bb202cffa656fa4ee09bdd8d67f8ed0ef Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 13 五月 2025 17:29:42 +0800
Subject: [PATCH] 1、根据江海调整，功能码92、A2的应答中的日期时间去除； 2、表阀一体机的开关阀上行数据（84、85）处理逻辑进行修改。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202404.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202404.java
new file mode 100644
index 0000000..f517210
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202404.java
@@ -0,0 +1,64 @@
+package com.dy.rtuMw.server.rtuData.p206V202404;
+
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.UpComResVo;
+import com.dy.common.mw.protocol.p206V202404.DataV202404;
+import com.dy.common.util.DateTime;
+import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
+import com.dy.rtuMw.server.rtuData.TaskSurpport;
+import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * @Author liurunyu
+ * @Date 2024/5/8 14:18
+ * @Description 澶勭悊鍛戒护鍝嶅簲涓婃姤
+ */
+public class TkRtuDealCommandResponseV202404 extends TaskSurpport {
+
+ private static final Logger log = LogManager.getLogger(TkRtuDealCommandResponseV202404.class.getName()) ;
+
+ //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
+ public static final String taskId = "TkRtuDealCommandResponseV202404" ;
+
+ /**
+ * 鎵ц鑺傜偣浠诲姟锛氬鐞嗗懡浠ゅ搷搴斾笂鎶�
+ * @param data 闇�瑕佸鐞嗙殑鏁版嵁
+ */
+ @Override
+ public void execute(Object data) {
+ Data d = (Data)data ;
+ Object protocolData = d.getSubData() ;
+ if(protocolData != null){
+ DataV202404 dV202404 = (DataV202404)protocolData ;
+ if(dV202404 != null) {
+ Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId);
+ DbSv sv = (DbSv) objs[0];
+ //PrController controller = (PrController) objs[1];
+ try{
+ RmCommandHistory po = sv.getCommandLog(d.commandId) ;
+ if(po != null){
+ po = this.updateCommandLogPo(po, d.code, dV202404, dV202404.subData) ;
+ sv.updateCommandLog(po);
+ }else{
+ log.error("鏈緱鍒板懡浠ゆ棩蹇楋紙" + d.getCommandId() + ")");
+ }
+ }catch (Exception e){
+ log.error("淇濆瓨鎺у埗鍣ㄨ嚜鎶ユ暟鎹椂鍙戠敓寮傚父", e);
+ }
+ }
+ }
+ }
+
+ public RmCommandHistory updateCommandLogPo(RmCommandHistory po, String code, DataV202404 dV202404, Object obj) throws Exception{
+ po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV202404.dt==null?DateTime.yyyy_MM_dd_HH_mm_ss():dV202404.dt));
+ if(obj instanceof UpComResVo){
+ UpComResVo vo = (UpComResVo)obj ;
+ po.setResult((byte)1);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
+ }
+ return po ;
+ }
+}
--
Gitblit v1.8.0