From c4d56f4a2c7687739f3bf0f43bcc1f35c9bbeb8b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 14 五月 2025 15:18:44 +0800
Subject: [PATCH] 1、表阀一体协议解析同步新版本；2、默认设备是表阀一体（0x02）
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java
index 59aa42f..018f0dc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java
@@ -1,15 +1,20 @@
package com.dy.pipIrrRemote.rtuUpgrage;
+import com.dy.common.softUpgrade.state.UpgradeRtu;
import com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper;
import com.dy.pipIrrGlobal.daoRm.UgRtuProgramMapper;
import com.dy.pipIrrGlobal.daoRm.UgRtuTaskMapper;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
+import com.dy.pipIrrGlobal.voUg.VoUpgradeDetail;
import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @Author: liurunyu
@@ -28,7 +33,7 @@
/**
* 閫氫俊涓婚敭鏌ヨ涓�涓崌绾т换鍔�
- * @param id 涓婚敭
+ * @param taskId 涓婚敭
* @return
*/
public UgRtuTask selectTaskById(String taskId){
@@ -51,4 +56,59 @@
public List<String> selectAllRtuAddrByTask(String taskId){
return this.cdao.selectAllRtuAddrByTask(Long.valueOf(taskId)) ;
}
+
+ /**
+ * 淇濆瓨RTU鍗囩骇缁撴潫鐘舵��
+ * @param taskId
+ * @param rtu
+ */
+ public void saveRtuUpgradeState(Long taskId, UpgradeRtu rtu){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(rtu) ;
+ params.put("taskId", taskId) ;
+ params.put("overDt", new Date()) ;
+ cdao.updateRtuUpgradeState(params) ;
+ }
+
+ /**
+ * 鏌ヨ涓�涓崌绾т换鍔℃湁鍏充俊鎭�
+ * @return 鍗囩骇浠诲姟鏈夊叧淇℃伅
+ */
+ public VoUpgradeDetail selectTaskDetail(String taskId){
+ List<VoUpgradeDetail> list = this.tdao.selectTaskDetail(Long.valueOf(taskId)) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+
+ /**
+ * 淇濆瓨鍗囩骇浠诲姟涓烘墽琛岀姸鎬�
+ * @param taskId 浠诲姟ID
+ */
+ public void setUpgradeTaskExecuted(String taskId){
+ this.tdao.executeById(Long.valueOf(taskId)) ;
+ }
+
+
+ /**
+ * 璁剧疆鍗囩骇浠诲姟宸茬粡瀹屾垚
+ * @param taskId
+ */
+ public void updateTaskOver(String taskId){
+ tdao.overById(Long.valueOf(taskId)) ;
+ }
+
+ /////////////////////////////////////////////////////
+ //
+ // 浠ヤ笅婕旂ず鍗囩骇鍔熻兘鐢ㄥ埌
+ //
+ /////////////////////////////////////////////////////
+
+ /**
+ * 鏌ヨ鏈�鏂颁竴涓崌绾т换鍔�
+ * @return
+ */
+ public UgRtuTask selectLastTask(){
+ return tdao.selectLastTask();
+ }
}
--
Gitblit v1.8.0