From f4d206d07eaeabad56e2918edf9799af13bb526e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 12 五月 2025 17:38:12 +0800
Subject: [PATCH] 表阀一体机：web后端系统，实现功能码5B、5C、15、16、22、30、31、50、55、56、65、68、97、98、99远程命令。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd65/CdCtrl.java | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/Cd50Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd65/CdCtrl.java
similarity index 67%
copy from pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/Cd50Ctrl.java
copy to pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd65/CdCtrl.java
index f699aac..3b5460e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/Cd50Ctrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/p202404V201/cd65/CdCtrl.java
@@ -1,8 +1,11 @@
-package com.dy.pipIrrRemote.monitor.p202404V201;
+package com.dy.pipIrrRemote.monitor.p202404V201.cd65;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
import com.dy.common.mw.protocol.Command;
+import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd65Vo;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrRemote.common.dto.DtoBase;
@@ -20,34 +23,36 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
* @Author: liurunyu
- * @Date: 2025/5/9 14:41
+ * @Date: 2025/5/12 10:50
* @Description
*/
@Slf4j
-@Tag(name = "杩滅▼閫忎紶鍛戒护", description = "杩滅▼閫忎紶鍛戒护")
-@RestController
-@RequestMapping(path = "p202404V201")
+@Tag(name = "杩滅▼鍛戒护", description = "鏌ヨ璁惧缁堢鐢ㄦ埛鐢ㄦ按璁板綍")
+@RestController("cd65Ctrl")
+@RequestMapping(path = "p202404V201/cd65")
@RequiredArgsConstructor
@Scope("prototype") //鍥犱负鏈夊璞＄被灞炴�э紝鎵�浠ラ噰鐢ㄥ師鍨嬫ā寮忥紝姣忔璇锋眰鏂板缓涓�涓疄渚嬪璞�
-public class Cd50Ctrl extends ComCtrl {
+public class CdCtrl extends ComCtrl {
- private static final String RtuSuccessMsg = "鎺у埗鍣ㄦ帴鏀跺苟鎵ц鍛戒护鎴愬姛";
+ private static final String RtuSuccessMsg = "鎺у埗鍣ㄦ帴鏀跺苟鎵ц鍛戒护鎴愬姛锛屾棤杩斿洖鏁版嵁";
- private static final String ComCode = "50" ;
+ private static final String ComCode = "65" ;
@Autowired
- private Cd50Sv sv ;
+ private CdSv sv ;
/**
- * 鍚戣澶囷紙鎺у埗鍣級鍙戦�侀�忎紶鍛戒护
+ * 鍚戣澶囷紙鎺у埗鍣級鍙戦�佸懡浠�
* @param dto 鍓嶇鍙戞潵鐨勫�煎璞�
* @param bindingResult 瀵筪to楠岃瘉鐨勭粨鏋�
* @return 杩斿洖鍓嶇
*/
- @PostMapping(path = "cd50", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(path = "send", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Object> send(@RequestBody @Valid Cd50Dto dto, BindingResult bindingResult) {
+ public BaseResponse<Object> send(@RequestBody @Valid CdDto dto, BindingResult bindingResult) {
BaseResponse<Object> res ;
//鍙戦�佸懡浠ゅ墠-1锛氶獙璇�
res = super.pre1(sv, ComCode, dto, bindingResult);
@@ -56,16 +61,17 @@
res = super.pre2(sv, ComCode, dto, bindingResult);
if (res == null) {
//鍙戦�佸懡浠ゅ墠-3锛氫繚瀛樺懡浠ゆ棩蹇�
- Cd50Param comParam = Cd50Param.builder().commandCode(ComCode).build();
+ CdParam comParam = CdParam.builder().commandCode(ComCode).projectNo(projectNo).controllerType(controllerType).build();
+ comParam.page = 1 ;
res = super.pre3(sv, dto.getIntakeId(), dto.getOperator(), ComCode, comParam);
if (res == null) {
//鍙戦�佸懡浠ゅ墠-4锛氬噯澶嘑eature
super.pre4();
try {
//鍒涘缓澶栭儴鍛戒护锛堝彂缁欐帶鍒跺櫒锛�
- Command com = sv.createOuterCommand("" + comId, ComCode);
- com.rtuAddr = ctrlPo.getRtuAddr();
+ Command com = sv.createOuterCommand(ctrlPo.getRtuAddr(), "" + comId, ComCode);
com.rtuResultSendWebUrl = rtuResultSendWebUrl;
+ com.param = comParam ;
//鍙戦�佸懡浠�
res = super.doSend(sv, com);
if (res == null) {
@@ -95,10 +101,18 @@
if(resultData != null){
JSONObject codeData = resultData.getJSONObject("data") ;
if(codeData == null){
- return RtuSuccessMsg ;
+ msg = RtuSuccessMsg ;
}else {
- Integer minute = codeData.getInteger("minute");
- return "鏌ヨ鎴愬姛锛岃嚜鎶ュ懆鏈燂細" + minute + "鍒嗛挓";
+ String json = codeData.toJSONString();
+ List<DataCd65Vo> list = JSON.parseArray(json, DataCd65Vo.class) ;
+ if(list != null && list.size() > 0){
+ msg = "" ;
+ for(DataCd65Vo cvo : list){
+ msg += cvo.toStr(false) ;
+ }
+ }else{
+ msg = RtuSuccessMsg ;
+ }
}
}else{
msg = RtuSuccessMsg ;
--
Gitblit v1.8.0