From f628dd00d8f99b37a128243b941bb8cfefd02ac9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 14 十一月 2024 10:36:08 +0800
Subject: [PATCH] 1、优远程升级相关代码； 2、修改升级监视功能模块代码。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java | 55 ++++++++--
pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml | 4
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramSv.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUpgradeDetail.java | 7 -
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml | 12 +-
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java | 12 +-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoUg/UgRtuTask.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskSv.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerSv.java | 1
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml | 10 +-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuProgramMapper.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuProgram.java | 6
pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java | 44 ++++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java | 6
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuTask.java | 8 -
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java | 4
/dev/null | 24 ----
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java | 5
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/QueryVo.java | 21 ++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuTaskMapper.java | 5
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoUg/UgRtuProgram.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml | 10 +-
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java | 14 +-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java | 4
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 2
pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml | 4
32 files changed, 174 insertions(+), 108 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java
index cc1c4b1..145bd62 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java
@@ -20,6 +20,10 @@
public int failOneTotal ;//鎵�鏈変竴鍖呮澶辫触
public UpgradeState() {
+ this.init();
+ }
+
+ public void init(){
this.rtuTotal = 0;
this.offLineTotal = 0;
this.unStartTotal = 0;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
index 363e953..41344a3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
@@ -88,8 +88,10 @@
this.queryStart = (this.pageCurr - 1) * this.pageSize ;
this.queryCount = this.pageSize ;
- params.put("start", this.queryStart) ;
- params.put("count", this.queryCount) ;
+ if(params != null){
+ params.put("start", this.queryStart) ;
+ params.put("count", this.queryCount) ;
+ }
}
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java
index 096c08c..f7b0230 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java
@@ -1,7 +1,7 @@
package com.dy.pipIrrGlobal.daoRm;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuController;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuController;
import com.dy.pipIrrGlobal.voPr.VoController;
import com.dy.pipIrrGlobal.voUg.VoUgResult;
import org.apache.ibatis.annotations.Mapper;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuProgramMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuProgramMapper.java
index 0c97753..d04c744 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuProgramMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuProgramMapper.java
@@ -1,7 +1,7 @@
package com.dy.pipIrrGlobal.daoRm;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuTaskMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuTaskMapper.java
index e3f4419..9cd7a75 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuTaskMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuTaskMapper.java
@@ -1,9 +1,8 @@
package com.dy.pipIrrGlobal.daoRm;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
-import com.dy.pipIrrGlobal.voRm.VoUpgradeDetail;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
+import com.dy.pipIrrGlobal.voUg.VoUpgradeDetail;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuController.java
deleted file mode 100644
index 6656e9f..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.dy.pipIrrGlobal.pojoRm;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-/**
- * @Author: liurunyu
- * @Date: 2024/11/5 9:29
- * @Description
- */
-
-@TableName(value="ug_rtu_controller", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@AllArgsConstructor
-@Schema(name = "RTU杩滅▼鍗囩骇鎵�鍏宠仈鐨勬祴鎺т竴浣撻榾 ")
-public class UgRtuController implements BaseEntity {
-
- public static final long serialVersionUID = 202411050918001L;
- /**
- * 涓婚敭
- */
- @Schema(description = "涓婚敭", requiredMode = Schema.RequiredMode.REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- public Long id;
-
- /**
- * 澶栭敭锛屾寚鍚戝崌绾т换鍔�
- */
- @Schema(description = "鍗囩骇浠诲姟瀹炰綋澶栭敭", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long taskId;
-
- /**
- * 鎺у埗鍣ㄥ疄浣揑D锛堝閿級
- */
- @Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long controllerId;
-
- /**
- * 鎺у埗鍣ㄥ湴鍧�
- */
- @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
- public String rtuAddr;
-
- /**
- * 鍗囩骇鏄惁缁撴潫
- */
- @Schema(description = "鍗囩骇鏄惁缁撴潫", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Byte isOver;
-
- /**
- * 鍗囩骇鏄惁缁撴潫
- */
- @Schema(description = "鍗囩骇鏄惁缁撴潫", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @TableField(exist = false)
- public String isOverStr;
-
- /**
- * 鍗囩骇鐘舵��
- */
- @Schema(description = "鍗囩骇鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Integer ugState;
-
- /**
- * 鍗囩骇鐘舵��
- */
- @Schema(description = "鍗囩骇鐘舵��", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public String ugStateStr;
-
- /**
- * 鍗囩骇缁撴潫鏃堕棿
- */
- @Schema(description = "鍗囩骇缁撴潫鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
- public Integer overDt;
-
- /**
- * 鏃犲弬鏁版嵁鏋勯�犳柟娉�
- */
- public UgRtuController(){
- this.isOver = 0;
- }
-
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuProgram.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoUg/UgRtuProgram.java
similarity index 98%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuProgram.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoUg/UgRtuProgram.java
index 1cf4459..690edc5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuProgram.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoUg/UgRtuProgram.java
@@ -1,4 +1,4 @@
-package com.dy.pipIrrGlobal.pojoRm;
+package com.dy.pipIrrGlobal.pojoUg;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuTask.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoUg/UgRtuTask.java
similarity index 98%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuTask.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoUg/UgRtuTask.java
index 9fd1ca5..fcfa486 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/UgRtuTask.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoUg/UgRtuTask.java
@@ -1,4 +1,4 @@
-package com.dy.pipIrrGlobal.pojoRm;
+package com.dy.pipIrrGlobal.pojoUg;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoRtuProgram.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuProgram.java
similarity index 90%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoRtuProgram.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuProgram.java
index 2f7433b..6e0d803 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoRtuProgram.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuProgram.java
@@ -1,11 +1,9 @@
-package com.dy.pipIrrGlobal.voRm;
+package com.dy.pipIrrGlobal.voUg;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.dy.common.po.BaseEntity;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoRtuTask.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuTask.java
similarity index 84%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoRtuTask.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuTask.java
index a12aae5..f95592d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoRtuTask.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoRtuTask.java
@@ -1,16 +1,12 @@
-package com.dy.pipIrrGlobal.voRm;
+package com.dy.pipIrrGlobal.voUg;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.dy.common.po.BaseEntity;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
-import org.springframework.web.multipart.MultipartFile;
/**
* @Author: liurunyu
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUpgradeDetail.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUpgradeDetail.java
similarity index 76%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUpgradeDetail.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUpgradeDetail.java
index fdc0cd2..b12c43e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoUpgradeDetail.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUpgradeDetail.java
@@ -1,4 +1,4 @@
-package com.dy.pipIrrGlobal.voRm;
+package com.dy.pipIrrGlobal.voUg;
import com.dy.common.softUpgrade.state.UpgradeRtu;
import com.dy.common.softUpgrade.state.UpgradeState;
@@ -28,9 +28,4 @@
//绋嬪簭鏂囦欢鍚�
public String hexFileName;
- //鍗囩骇浠诲姟鎬讳綋鐘舵��
- public UpgradeState ugOverallState;
-
- //鍗囩骇浠诲姟RTU鐘舵�佸垪琛�
- public List<UpgradeRtu> ugRtuStateList;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java
new file mode 100644
index 0000000..79b39b2
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java
@@ -0,0 +1,44 @@
+package com.dy.pipIrrGlobal.voUg;
+
+import com.dy.common.softUpgrade.state.UpgradeRtu;
+import com.dy.common.softUpgrade.state.UpgradeState;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/11/14 9:14
+ * @Description 鐩戣RTU杩滅▼鍗囩骇鐘舵�佸�煎璞�
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class VoWatch {
+ public VoUpgradeDetail upgrade ;
+ public UpgradeState overall ;//鍏ㄥ眬缁熻
+ public List<VoWatchRtu> rtus ;//涓�涓帶鍒跺櫒鍗囩骇鎯呭喌
+
+ @Data
+ @AllArgsConstructor
+ @NoArgsConstructor
+ public static class VoWatchRtu{
+ public String rtuAddr ; //鎺у埗鍣ㄥ湴鍧�
+ public Integer rate ; //杩涘害
+ public String state; //鍗囩骇鐘舵��
+ public Integer reTryTimes ; //閲嶈瘯娆℃暟
+ public boolean over ; //鏄惁缁撴潫锛坱rue锛氭槸锛宖alse锛氬惁锛�
+ public boolean success ; //鏄惁鎴愬姛锛坱rue锛氭槸锛宖alse锛氬惁锛�
+
+ public void fromCache(UpgradeRtu ugRtu){
+ this.rtuAddr = ugRtu.rtuAddr ;
+ this.rate = (ugRtu.currentPackage * 1000)/ugRtu.totalPackage ;//鍓嶇瀹炵幇鏄�1000浠界殑杩涘害鏉�
+ this.state = UpgradeRtu.getStateName(ugRtu.state) ;
+ this.reTryTimes = ugRtu.reTryTimes ;
+ this.over = ugRtu.isOver ;
+ this.success = ugRtu.state == UpgradeRtu.STATE_SUCCESS ? true : false ;
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml
index 190348e..ec02735 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml
@@ -5,9 +5,9 @@
#name: sp
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://8.130.130.233:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
druid:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml
index 4e972d0..778e7bc 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-test.yml
@@ -5,9 +5,9 @@
#name: test
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.40.166:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://192.168.40.166:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://8.130.130.233:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://127.0.0.1:3306/pipIrr_test?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
druid:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
index ed9eb26..80e789b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
@@ -5,9 +5,9 @@
#name: ym
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
druid:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 5e8b483..8f11670 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -77,7 +77,7 @@
pipIrr:
global:
- dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
nginx:
webPort: 54321
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
index 60f1766..b7aa29e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
<!--@mbg.generated-->
<!--@Table ug_rtu_controller-->
<id column="id" jdbcType="BIGINT" property="id" />
@@ -168,7 +168,7 @@
where task_id = #{taskId,jdbcType=BIGINT}
</delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
<!--@mbg.generated-->
insert into ug_rtu_controller (id, task_id, controller_id,
rtu_addr)
@@ -177,7 +177,7 @@
#{isOver,jdbcType=TINYINT}, #{ugState,jdbcType=INTEGER},
#{overDt,jdbcType=TIMESTAMP})
</insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
<!--@mbg.generated-->
insert into ug_rtu_controller
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -227,7 +227,7 @@
</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
<!--@mbg.generated-->
update ug_rtu_controller
<set>
@@ -252,7 +252,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuController">
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuController">
<!--@mbg.generated-->
update ug_rtu_controller
set task_id = #{taskId,jdbcType=BIGINT},
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml
index 9aa7dbd..bae70d5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoRm.UgRtuProgramMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
<!--@mbg.generated-->
<!--@Table ug_rtu_program-->
<id column="id" jdbcType="BIGINT" property="id" />
@@ -96,7 +96,7 @@
update ug_rtu_program set deleted = 1
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
<!--@mbg.generated-->
insert into ug_rtu_program (id, hex_file_name, store_ram_addr,
start_ram_addr, program_calculate_bytes, program_crc16,
@@ -107,7 +107,7 @@
#{programBytes,jdbcType=BLOB}, #{fileBytes,jdbcType=BLOB}, #{remark,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP},
#{deleted,jdbcType=TINYINT})
</insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
<!--@mbg.generated-->
insert into ug_rtu_program
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -181,7 +181,7 @@
</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
<!--@mbg.generated-->
update ug_rtu_program
<set>
@@ -218,7 +218,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
<!--@mbg.generated-->
update ug_rtu_program
set hex_file_name = #{hexFileName,jdbcType=VARCHAR},
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml
index e91d8e6..c59e372 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuTaskMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoRm.UgRtuTaskMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoUg.UgRtuTask">
<!--@mbg.generated-->
<!--@Table ug_rtu_task-->
<id column="id" jdbcType="BIGINT" property="id" />
@@ -95,7 +95,7 @@
order by bd.id DESC
</select>
- <select id="selectTaskDetail" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voRm.VoUpgradeDetail">
+ <select id="selectTaskDetail" parameterType="java.lang.Long" resultType="com.dy.pipIrrGlobal.voUg.VoUpgradeDetail">
<!--@mbg.generated-->
select
ttb.id as taskId,
@@ -107,7 +107,7 @@
where ttb.id = #{taskId,jdbcType=BIGINT}
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuTask">
<!--@mbg.generated-->
insert into ug_rtu_task (id, program_id, creator,
remark, dt, is_execute, is_over, deleted
@@ -117,7 +117,7 @@
#{isOver,jdbcType=TINYINT}, #{deleted,jdbcType=TINYINT}
)
</insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuTask">
<!--@mbg.generated-->
insert into ug_rtu_task
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -173,7 +173,7 @@
</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuTask">
<!--@mbg.generated-->
update ug_rtu_task
<set>
@@ -201,7 +201,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuTask">
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuTask">
<!--@mbg.generated-->
update ug_rtu_task
set program_id = #{programId,jdbcType=BIGINT},
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java
index 33993ce..4d8fa14 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramCtrl.java
@@ -4,13 +4,12 @@
import com.dy.common.aop.SsoAop;
import com.dy.common.softUpgrade.parse.HexFileParse;
import com.dy.common.softUpgrade.parse.HexFileVo;
-import com.dy.common.util.DateTime;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
-import com.dy.pipIrrGlobal.voRm.VoRtuProgram;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
+import com.dy.pipIrrGlobal.voUg.VoRtuProgram;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramSv.java
index 83dd7c8..cd7bbb3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/program/UgRtuProgramSv.java
@@ -2,7 +2,7 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.UgRtuProgramMapper;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java
index 8a8279a..1c3a5cf 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java
@@ -5,7 +5,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuController;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuController;
import com.dy.pipIrrGlobal.voPr.VoController;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerSv.java
index 6199d1c..eee1f7e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerSv.java
@@ -3,7 +3,6 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
import com.dy.pipIrrGlobal.voPr.VoController;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java
index c743bd7..a084132 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerCtrl.java
@@ -11,7 +11,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.voPr.VoController;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java
index 4787a6b..573f9fc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuControllerSv.java
@@ -2,7 +2,7 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuController;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuController;
import com.dy.pipIrrGlobal.voPr.VoController;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java
index 8d03297..3a99797 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java
@@ -5,7 +5,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.voUg.VoUgResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
index 59ab39b..459728b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskCtrl.java
@@ -5,8 +5,8 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
-import com.dy.pipIrrGlobal.voRm.VoRtuTask;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
+import com.dy.pipIrrGlobal.voUg.VoRtuTask;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskSv.java
index d5363aa..6c86bbf 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuTaskSv.java
@@ -2,7 +2,7 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.UgRtuTaskMapper;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/CurUpgradeStateVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/CurUpgradeStateVo.java
deleted file mode 100644
index 1f094e8..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/CurUpgradeStateVo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.dy.pipIrrRemote.rtuUpgrage;
-
-import com.dy.common.softUpgrade.state.UpgradeRtu;
-import com.dy.common.softUpgrade.state.UpgradeState;
-import com.dy.pipIrrGlobal.voRm.VoUpgradeDetail;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Author: liurunyu
- * @Date: 2024/11/13 15:58
- * @Description
- */
-@Data
-public class CurUpgradeStateVo {
- //鍗囩骇浠诲姟ID
- public VoUpgradeDetail upgrade ;
- //鍗囩骇浠诲姟鎬讳綋鐘舵��
- public UpgradeState ugOverallState;
- //鍗囩骇浠诲姟RTU鐘舵�佸垪琛�
- public List<UpgradeRtu> ugRtuStateList;
-
-}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/QueryVo.java
new file mode 100644
index 0000000..aac5f50
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/QueryVo.java
@@ -0,0 +1,21 @@
+package com.dy.pipIrrRemote.rtuUpgrage;
+
+
+import com.dy.common.webUtil.QueryConditionVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(name = "鐩戣鍗囩骇鎯呭喌鏌ヨ鏉′欢")
+public class QueryVo extends QueryConditionVo {
+
+ @Schema(description = "鎺у埗鍣ㄥ湴鍧�")
+ public String rtuAddr ;
+
+}
+
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
index 8b53bb0..bc79bf2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
@@ -2,16 +2,17 @@
import com.dy.common.aop.SsoAop;
import com.dy.common.multiDataSource.DataSourceContext;
-import com.dy.common.softUpgrade.state.UpgradeInfo;
+import com.dy.common.softUpgrade.state.UpgradeRtu;
import com.dy.common.softUpgrade.state.UpgradeTaskVo;
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-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.rtuMw.ToRtuMwCom;
-import com.dy.pipIrrGlobal.voRm.VoUpgradeDetail;
+import com.dy.pipIrrGlobal.voUg.VoWatch;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -26,6 +27,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
import java.util.List;
/**
@@ -121,6 +124,7 @@
}
/**
+ * 鐩戣锛�
* 褰撳墠rtu杩滅▼鍗囩骇浠诲姟鎵ц鐘舵��
* @return 鎿嶄綔缁撴灉
*/
@@ -135,20 +139,47 @@
})
@GetMapping(path = "/curUpgradeState")
@SsoAop()
- public BaseResponse<UpgradeInfo> curUpgradeState(){
+ public BaseResponse<QueryResultVo<VoWatch> > curUpgradeState(QueryVo qvo){
if(RtuUpgradeStateReceiverCtrl.cache == null){
//return BaseResponseUtils.buildError("褰撳墠娌℃湁鍗囩骇浠诲姟") ;
//姝ｅ紡杩愯鏃讹紝涓嬮潰涓よ鍘绘帀锛屼笂闈竴琛屾墦寮�
RtuUpgradeStateReceiverCtrl ctrl = SpringContextUtil.getBean(RtuUpgradeStateReceiverCtrl.class);
ctrl.demo();
}
- CurUpgradeStateVo vo = new CurUpgradeStateVo() ;
- List<VoUpgradeDetail> list = this.sv.selectTaskDetail(RtuUpgradeStateReceiverCtrl.cache.ugTaskId);
- if(list != null && list.size() > 0){
- vo.upgrade = list.get(0) ;
+
+ QueryResultVo<VoWatch> rsVo = new QueryResultVo();
+ VoWatch vo = new VoWatch() ;
+ vo.upgrade = this.sv.selectTaskDetail(RtuUpgradeStateReceiverCtrl.cache.ugTaskId);
+ vo.overall = RtuUpgradeStateReceiverCtrl.cache.ugOverallState ;
+ vo.rtus = new ArrayList<>() ;
+ if(RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList != null && RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size() > 0){
+ if(qvo.rtuAddr != null && !qvo.rtuAddr.trim().equals("")){
+ qvo.pageCurr = 1 ;
+ RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.stream().filter(rtu -> rtu.rtuAddr.equals(qvo.rtuAddr)).forEach(ugRtu -> {
+ VoWatch.VoWatchRtu rtu = new VoWatch.VoWatchRtu() ;
+ rtu.fromCache(ugRtu) ;
+ vo.rtus.add(rtu) ;
+ }); ;
+ }else{
+ if(qvo.pageCurr < 1){
+ qvo.pageCurr = 1 ;
+ }
+ int start = (qvo.pageCurr - 1) * qvo.pageSize ;
+ if(start >= RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size()){
+ start = RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size() - 1 ;
+ }
+ for(int i = start; i < (start + qvo.pageSize) && i < RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size(); i++){
+ UpgradeRtu ugRtu = RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.get(i) ;
+ VoWatch.VoWatchRtu rtu = new VoWatch.VoWatchRtu() ;
+ rtu.fromCache(ugRtu) ;
+ vo.rtus.add(rtu) ;
+ }
+ }
}
- vo.ugOverallState = RtuUpgradeStateReceiverCtrl.cache.ugOverallState ;
- vo.ugRtuStateList = RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList ;
- return BaseResponseUtils.buildSuccess(vo) ;
+ rsVo.obj = vo ;
+ rsVo.pageSize = qvo.pageSize ;
+ rsVo.pageCurr = qvo.pageCurr ;
+ rsVo.calculateAndSet(0L + vo.rtus.size(), null);
+ return BaseResponseUtils.buildSuccess(rsVo) ;
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java
index 3c7ffa2..abf7883 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java
@@ -8,8 +8,8 @@
import com.dy.common.util.DateTime;
import com.dy.common.util.ThreadJob;
import com.dy.common.webUtil.BaseResponse;
-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 io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -117,7 +117,7 @@
UgRtuTask tpo = this.sv.selectLastTask() ;
if(tpo != null) {
UgRtuProgram ppo = this.sv.selectProgramById(tpo.programId);
- if (ppo == null) {
+ if (ppo != null) {
List<String> taskRtuAddrs = this.sv.selectAllRtuAddrByTask("" + tpo.id);
if (taskRtuAddrs != null && taskRtuAddrs.size() > 0) {
cache = new UpgradeInfo();
@@ -167,11 +167,8 @@
while (true){
for(UpgradeRtu rtu : cache.ugRtuStateList){
this.rtuUpgrade(rtu) ;
- hasRunning = this.statisticsNowUpgradeState() ;
- if(!hasRunning){
- break ;
- }
}
+ hasRunning = this.statisticsNowUpgradeState() ;
if(!hasRunning){
break ;
}
@@ -244,6 +241,7 @@
public boolean statisticsNowUpgradeState() {
boolean hasRunning = false ;
if(cache.ugRtuStateList != null && cache.ugRtuStateList.size() > 0){
+ cache.ugOverallState.init();
for(UpgradeRtu rtu : cache.ugRtuStateList){
if(rtu.state == UpgradeRtu.STATE_OFFLINE){
cache.ugOverallState.offLineTotal ++ ;
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 626af0e..3293427 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
@@ -4,9 +4,9 @@
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.voRm.VoUpgradeDetail;
+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;
@@ -61,8 +61,12 @@
* 鏌ヨ涓�涓崌绾т换鍔℃湁鍏充俊鎭�
* @return 鍗囩骇浠诲姟鏈夊叧淇℃伅
*/
- public List<VoUpgradeDetail> selectTaskDetail(String taskId){
- return this.tdao.selectTaskDetail(Long.valueOf(taskId)) ;
+ 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 ;
}
--
Gitblit v1.8.0