From b1384c4959a4486d391369c4e7a58c4b4b0e9b9c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 13 十一月 2024 17:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUgResult.java | 78 +++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java | 70 ++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultSv.java | 56 +++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/QueryUgResultVo.java | 30 ++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml | 38 +++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java | 14 ++
8 files changed, 288 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java
index 09b02b9..47280ea 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeRtu.java
@@ -52,7 +52,7 @@
return sb.toString() ;
}
- public String getStateName(int state){
+ public static String getStateName(int state){
switch (state) {
case STATE_OFFLINE:
return "绂荤嚎";
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 a71e642..096c08c 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.UgRtuController;
import com.dy.pipIrrGlobal.voPr.VoController;
+import com.dy.pipIrrGlobal.voUg.VoUgResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -94,6 +95,19 @@
*/
Long selectCountByTaskAndCon(@Param("taskId") Long taskId, @Param("conId") Long conId) ;
+ /**
+ * 鍒嗛〉鏌ヨ涓�涓崌绾т换鍔′腑鎵�鏈夋帶鍒跺櫒鍗囩骇缁撴煡 鏁伴噺
+ *
+ * @param params
+ * @return
+ */
+ Long selectControllerUpgradeResultsCount(Map<?, ?> params) ;
+ /**
+ * 鍒嗛〉鏌ヨ涓�涓崌绾т换鍔′腑鎵�鏈夋帶鍒跺櫒鍗囩骇缁撴煡
+ * @param params
+ * @return
+ */
+ List<VoUgResult> selectControllerUpgradeResults(Map<?, ?> params);
/**
* update record selective
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
index 735ca04..03d969b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
@@ -22,7 +22,7 @@
*/
@Data
-@JsonPropertyOrder({ "id", "rtuAddr", "intakeName", "bindNumber", "findDt", "isOnLine", "protocol", "remarks"})
+@JsonPropertyOrder({ "id", "rtuAddr", "intakeName", "bindNumber", "findDt", "isOnLine", "protocol", "protocolVersion", "remarks"})
@HeadRowHeight(30)
@ContentRowHeight(20)
public class VoController implements BaseEntity {
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUgResult.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUgResult.java
new file mode 100644
index 0000000..05bb328
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoUgResult.java
@@ -0,0 +1,78 @@
+package com.dy.pipIrrGlobal.voUg;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/11/13 16:53
+ * @Description
+ */
+
+@Data
+@JsonPropertyOrder({ "id", "rtuAddr", "intakeName", "isOver", "isOverStr", "ugState", "ugStateStr", "overDt"})
+public class VoUgResult {
+ /**
+ * 涓婚敭
+ */
+ @Schema(description = "涓婚敭" )
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long id;
+
+ /**
+ * 鎺у埗鍣ㄥ湴鍧�
+ */
+ @Schema(description = "鎺у埗鍣ㄥ湴鍧�" )
+ public String rtuAddr;
+
+ /**
+ * 鍙栨按缂栧彿
+ */
+ @Schema(description = "鍙栨按鍙ｇ紪鍙�")
+ private String intakeNum;
+
+ /**
+ * 鍗囩骇鏄惁缁撴潫
+ */
+ @Schema(description = "鍗囩骇鏄惁缁撴潫" )
+ public Byte isOver;
+
+ /**
+ * 鍗囩骇鏄惁缁撴潫
+ */
+ @Schema(description = "鍗囩骇鏄惁缁撴潫" )
+ @TableField(exist = false)
+ public String isOverStr;
+
+ /**
+ * 鍗囩骇鐘舵��
+ */
+ @Schema(description = "鍗囩骇鐘舵��" )
+ public Integer ugState;
+
+ /**
+ * 鍗囩骇鐘舵��
+ */
+ @Schema(description = "鍗囩骇鐘舵��" )
+ public String ugStateStr;
+
+ /**
+ * 鍗囩骇缁撴潫鏃堕棿
+ */
+ @Schema(description = "鍗囩骇缁撴潫鏃堕棿" )
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS")
+ public Integer overDt;
+
+ /**
+ * 鏃犲弬鏁版嵁鏋勯�犳柟娉�
+ */
+ public VoUgResult(){
+ this.isOver = 0;
+ }
+
+}
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 a0015a4..60f1766 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuControllerMapper.xml
@@ -120,6 +120,44 @@
</where>
</select>
+
+ <select id="selectControllerUpgradeResultsCount" resultType="java.lang.Long">
+ <!--@mbg.generated-->
+ select
+ count(*)
+ from ug_rtu_controller
+ <where>
+ <if test="taskId != null">
+ AND task_id = #{taskId,jdbcType=BIGINT}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectControllerUpgradeResults" resultType="com.dy.pipIrrGlobal.voUg.VoUgResult">
+ <!--@mbg.generated-->
+ select
+ ctb.id as id,
+ inTb.name as intakeNum,
+ ctb.rtu_addr as rtuAddr,
+ ctb.is_over as isOver,
+ ctb.ug_state as ugState,
+ ctb.over_dt as overDt
+ from ug_rtu_controller ctb
+ inner join pr_intake inTb on ctb.task_id = inTb.id
+ <where>
+ <if test="taskId != null">
+ AND ctb.task_id = #{taskId,jdbcType=BIGINT}
+ </if>
+ </where>
+ ORDER BY ctb.id ASC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from ug_rtu_controller
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/QueryUgResultVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/QueryUgResultVo.java
new file mode 100644
index 0000000..09e30af
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/QueryUgResultVo.java
@@ -0,0 +1,30 @@
+package com.dy.pipIrrBase.rtuUpgrade.task;
+
+import com.dy.common.webUtil.QueryConditionVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/11/13 16:36
+ * @Description
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@Schema(name = "鏌ヨ鍗囩骇浠诲姟RTU鍗囩骇鎯呭喌鐨勬潯浠�")
+public class QueryUgResultVo extends QueryConditionVo {
+
+ @Schema(description = "鍗囩骇浠诲姟id")
+ public Long taskId;
+
+ @Schema(description = "鍙栨按鍙ｇ紪鍙�")
+ public String intakeNum;
+
+ @Schema(description = "鎺у埗鍣ㄥ湴鍧�")
+ public String rtuAddr;
+
+}
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
new file mode 100644
index 0000000..8d03297
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultCtrl.java
@@ -0,0 +1,70 @@
+package com.dy.pipIrrBase.rtuUpgrade.task;
+
+import com.dy.common.aop.SsoAop;
+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.UgRtuTask;
+import com.dy.pipIrrGlobal.voUg.VoUgResult;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/11/13 16:10
+ * @Description
+ */
+@Slf4j
+@Tag(name = "RTU鍗囩骇缁撴灉", description = "RTU鍗囩骇缁撴灉")
+@RestController
+@RequestMapping(path = "ugRtuResult")
+@SuppressWarnings("unchecked")
+//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
+public class UgRtuResultCtrl {
+
+ private UgRtuResultSv sv;
+
+ @Autowired
+ private void setSv(UgRtuResultSv sv) { this.sv = sv; }
+
+ /**
+ * 瀹㈡埛绔垎椤垫煡璇竴涓崌绾т换鍔＄殑鎵�鏈夋帶鍒跺櫒
+ * @return 涓�浜汻TU鍗囩骇浠诲姟鏁版嵁
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ涓�涓崌绾т换鍔′腑鎵�鏈夋帶鍒跺櫒鍗囩骇缁撴煡", description = "瀹㈡埛绔垎椤垫煡璇竴涓崌绾т换鍔′腑鎵�鏈夋帶鍒跺櫒鍗囩骇缁撴煡")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�浜汻TU鍗囩骇浠诲姟鎺у埗鍣ㄥ崌绾ф暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = UgRtuTask.class))}
+ )
+ })
+ @GetMapping(path = "/some")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoUgResult>>> some(QueryUgResultVo vo) {
+ if (vo.taskId == null) {
+ return BaseResponseUtils.buildErrorMsg("鍗囩骇浠诲姟id涓嶈兘涓虹┖");
+ }
+ try {
+ QueryResultVo<List<VoUgResult>> res = this.sv.selectSome(vo);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultSv.java
new file mode 100644
index 0000000..0ccc142
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuResultSv.java
@@ -0,0 +1,56 @@
+package com.dy.pipIrrBase.rtuUpgrade.task;
+
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper;
+import com.dy.common.softUpgrade.state.UpgradeRtu;
+import com.dy.pipIrrGlobal.voUg.VoUgResult;
+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.List;
+import java.util.Map;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/11/13 16:11
+ * @Description
+ */
+@Slf4j
+@Service
+public class UgRtuResultSv {
+
+ @Autowired
+ private UgRtuControllerMapper dao ;
+
+ /**
+ * 鍒嗛〉鏌ヨ涓�涓崌绾т换鍔′腑鎵�鏈夋帶鍒跺櫒鍗囩骇缁撴煡
+ * @return 鎺у埗鍣ㄥ崌绾х粨鏌�
+ */
+ public QueryResultVo<List<VoUgResult>> selectSome(QueryUgResultVo queryVo){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
+ Long itemTotal = this.dao.selectControllerUpgradeResultsCount(params) ;
+
+ QueryResultVo<List<VoUgResult>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+ rsVo.calculateAndSet(itemTotal, params);
+ List<VoUgResult> list = this.dao.selectControllerUpgradeResults(params) ;
+ if(list != null && list.size() > 0){
+ for(VoUgResult vo : list){
+ if(vo.isOver != null && vo.isOver.byteValue() == 1){
+ vo.isOverStr = "鏄�" ;
+ }else{
+ vo.isOverStr = "鍚�" ;
+ }
+ if(vo.ugState != null){
+ vo.ugStateStr = UpgradeRtu.getStateName(vo.ugState) ;
+ }
+ }
+ }
+ rsVo.obj = list ;
+
+ return rsVo ;
+ }
+}
--
Gitblit v1.8.0