From 515b39791a7fbd18cd4026aa358c7354272c92af Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 29 十一月 2024 15:27:59 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 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 3293427..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
@@ -58,28 +58,6 @@
}
/**
- * 鏌ヨ涓�涓崌绾т换鍔℃湁鍏充俊鎭�
- * @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)) ;
- }
-
-
- /**
* 淇濆瓨RTU鍗囩骇缁撴潫鐘舵��
* @param taskId
* @param rtu
@@ -91,17 +69,46 @@
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