From 759160807674a36ad8b04ea516da258a8d0cfef5 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 22 七月 2024 15:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java
index 4550f5a..6c9ad33 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java
@@ -3,6 +3,7 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.pipIrrMwTestRtu.tcpClient.upData.UpCd83Close;
import com.dy.pipIrrMwTestRtu.tcpClient.upData.UpCd83Open;
+import com.dy.pipIrrMwTestRtu.tcpClient.upData.UpCd84;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,9 +23,11 @@
@GetMapping(path = "test")
public BaseResponse<String> test(String com) {
if(com.equals("83Open")){
- this.cd83Open() ;
+ UpCd83Open.upCd83Data();
}else if(com.equals("83Close")){
- this.cd83Close() ;
+ UpCd83Close.upCd83Data();
+ }else if(com.equals("84")){
+ UpCd84.upCd84Data();
}
BaseResponse<String> rt = new BaseResponse<String>() ;
rt.setCode("001") ;
@@ -32,18 +35,6 @@
rt.setSuccess(true) ;
return rt ;
}
-
-
- private void cd83Open(){
- UpCd83Open.upCd83Data();
- }
-
-
- private void cd83Close(){
- UpCd83Close.upCd83Data();
- }
-
-
}
--
Gitblit v1.8.0