From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报（功能码83）报中的控制器时钟去除掉了，通信中间件解决这个报文时，把开阀报中的开阀时间当作控制器时钟，把关阀报中的关阀时间作为控制器时钟； 2、优化代码。
---
pipIrr-platform/pipIrr-web/pipIrr-mwTest-rtu/src/main/java/com/dy/pipIrrMwTestRtu/p206V1_0_0/RtuP206V1_0_0Ctrl.java | 22 ++++++++--------------
1 files changed, 8 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..7518550 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
@@ -1,8 +1,10 @@
package com.dy.pipIrrMwTestRtu.p206V1_0_0;
import com.dy.common.webUtil.BaseResponse;
+import com.dy.pipIrrMwTestRtu.tcpClient.upData.UpCd38;
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 +24,13 @@
@GetMapping(path = "test")
public BaseResponse<String> test(String com) {
if(com.equals("83Open")){
- this.cd83Open() ;
+ UpCd83Open.upData();
}else if(com.equals("83Close")){
- this.cd83Close() ;
+ UpCd83Close.upData();
+ }else if(com.equals("84")){
+ UpCd84.upData();
+ }else if(com.equals("38")){
+ UpCd38.upData();
}
BaseResponse<String> rt = new BaseResponse<String>() ;
rt.setCode("001") ;
@@ -32,18 +38,6 @@
rt.setSuccess(true) ;
return rt ;
}
-
-
- private void cd83Open(){
- UpCd83Open.upCd83Data();
- }
-
-
- private void cd83Close(){
- UpCd83Close.upCd83Data();
- }
-
-
}
--
Gitblit v1.8.0