From 85a2968c85ab196eec3c189395f89f8e067701ef Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 07 五月 2025 15:27:50 +0800
Subject: [PATCH] RTU模拟器增加命令92的响应，以测试透传命令。
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 178 insertions(+), 0 deletions(-)
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
new file mode 100644
index 0000000..be016ea
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/rtuUpgrade/task/UgRtuAddControllerCtrl.java
@@ -0,0 +1,178 @@
+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.pojoUg.UgRtuController;
+import com.dy.pipIrrGlobal.voPr.VoController;
+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/7 11:33
+ * @Description
+ */
+@Slf4j
+@Tag(name = "閫夋嫨RTU鍗囩骇浠诲姟瀵瑰簲鐨勬帶鍒跺櫒", description = "閫夋嫨RTU鍗囩骇浠诲姟瀵瑰簲鐨勬帶鍒跺櫒骞舵坊鍔犵瓑鎿嶄綔")
+@RestController
+@RequestMapping(path = "ugRtuAddController")
+@SuppressWarnings("unchecked")
+//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
+public class UgRtuAddControllerCtrl {
+
+ private UgRtuAddControllerSv addSv;
+ private UgRtuControllerSv addedSv;
+
+ @Autowired
+ private void setAddSv(UgRtuAddControllerSv addSv) { this.addSv = addSv; }
+
+ @Autowired
+ private void setSv(UgRtuControllerSv addedSv) { this.addedSv = addedSv; }
+
+ /**
+ * 瀹㈡埛绔姹傚緱鍒颁竴浜涙帶鍒跺櫒淇℃伅锛屼互渚涜閫夋嫨涓哄崌绾у璞�
+ * @return 涓�浜涙帶鍒跺櫒淇℃伅
+ */
+ @Operation(summary = "寰楀埌涓�浜涙帶鍒跺櫒淇℃伅锛屼互渚涜閫夋嫨涓哄崌绾у璞�", description = "寰楀埌涓�浜涙帶鍒跺櫒淇℃伅锛屼互渚涜閫夋嫨涓哄崌绾у璞�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�浜汻TU鍗囩骇浠诲姟鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoController.class))}
+ )
+ })
+ @GetMapping(path = "/some")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoController>>> some(QueryAddControllerVo vo){
+ try {
+ QueryResultVo<List<VoController>> res = this.addSv.selectSome(vo) ;
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
+ return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
+ }
+ }
+
+
+ /**
+ * 鎶婄鍚堟潯浠剁殑鎺у埗鍣ㄩ�夋嫨涓哄崌绾т换鍔″璞�
+ * @return 涓�浜汻TU鍗囩骇浠诲姟鏁版嵁
+ */
+ @Operation(summary = "鎶婄鍚堟潯浠剁殑鎺у埗鍣ㄩ�夋嫨涓哄崌绾т换鍔″璞�", description = "鎶婄鍚堟潯浠剁殑鎺у埗鍣ㄩ�夋嫨涓哄崌绾т换鍔″璞�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�浜汻TU鍗囩骇浠诲姟鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = UgRtuAddSomeResVo.class))}
+ )
+ })
+ @GetMapping(path = "/addSome")
+ @SsoAop()
+ public BaseResponse<UgRtuAddSomeResVo> addSome(QueryAddControllerVo vo){
+ if(vo.taskId == null){
+ return BaseResponseUtils.buildErrorMsg("鍗囩骇浠诲姟id涓嶈兘涓虹┖") ;
+ }
+ UgRtuAddSomeResVo res = new UgRtuAddSomeResVo();
+ try {
+ List<VoController> list = this.addSv.selectAll(vo) ;
+ List<UgRtuController> addedList = this.addedSv.selectAllConByTask(vo.taskId) ;
+ if(list != null && list.size() > 0){
+ if(addedList == null || addedList.size() == 0){
+ for(VoController voCon : list){
+ UgRtuController ugRtuController = new UgRtuController();
+ ugRtuController.setTaskId(vo.taskId);
+ ugRtuController.setControllerId(Long.parseLong(voCon.getId())) ;
+ ugRtuController.setRtuAddr(voCon.getRtuAddr()) ;
+ this.addedSv.save(ugRtuController);
+ res.successAddTotal += 1;
+ }
+ }else{
+ boolean exist = false ;
+ for(VoController voCon : list){
+ exist = false ;
+ for(UgRtuController addedVo : addedList){
+ if(addedVo.controllerId.longValue() == (Long.parseLong(voCon.getId()))){
+ exist = true;
+ break;
+ }
+ }
+ if(!exist){
+ UgRtuController ugRtuController = new UgRtuController();
+ ugRtuController.setTaskId(vo.taskId);
+ ugRtuController.setControllerId(Long.parseLong(voCon.getId())) ;
+ ugRtuController.setRtuAddr(voCon.getRtuAddr()) ;
+ this.addedSv.save(ugRtuController);
+ res.successAddTotal += 1;
+ }else{
+ res.failRepeatAddTotal += 1;
+ }
+ }
+ }
+ }
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
+ return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
+ }
+ }
+
+
+ /**
+ * 鎶婁竴涓帶鍒跺櫒閫夋嫨涓哄崌绾т换鍔″璞�
+ * @return 涓�浜汻TU鍗囩骇浠诲姟鏁版嵁
+ */
+ @Operation(summary = "鎶婁竴涓帶鍒跺櫒閫夋嫨涓哄崌绾т换鍔″璞�", description = "鎶婁竴涓帶鍒跺櫒閫夋嫨涓哄崌绾т换鍔″璞�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�浜汻TU鍗囩骇浠诲姟鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @GetMapping(path = "/addOne")
+ @SsoAop()
+ public BaseResponse<Boolean> addOne(String taskId, String controllerId, String rtuAddr){
+ if(taskId == null || taskId.trim().equals("")
+ || controllerId == null || controllerId.trim().equals("")
+ || rtuAddr == null || rtuAddr.trim().equals("")){
+ return BaseResponseUtils.buildErrorMsg("鍙傛暟蹇呴』鎻愪緵") ;
+ }
+ try {
+ if(this.addedSv.exist(Long.parseLong(taskId), Long.parseLong(controllerId))){
+ return BaseResponseUtils.buildErrorMsg("璇ユ帶鍒跺櫒宸茬粡娣诲姞杩囪浠诲姟") ;
+ }else{
+ UgRtuController ugRtuController = new UgRtuController();
+ ugRtuController.setTaskId(Long.parseLong(taskId));
+ ugRtuController.setControllerId(Long.parseLong(controllerId)) ;
+ ugRtuController.setRtuAddr(rtuAddr) ;
+ int count = this.addedSv.save(ugRtuController);
+ if(count <= 0){
+ return BaseResponseUtils.buildErrorMsg("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
+ }else{
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+ }
+ } catch (Exception e) {
+ log.error("鏌ヨRTU鍗囩骇浠诲姟寮傚父", e);
+ return BaseResponseUtils.buildErrorMsg(e.getMessage()) ;
+ }
+ }
+}
--
Gitblit v1.8.0