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-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java | 44 +++++++++++---------------------------------
1 files changed, 11 insertions(+), 33 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
index 5768ebf..55b2348 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
+import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.*;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
@@ -31,9 +32,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.Objects;
-
-//import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo;
-//import com.dy.common.mw.protocol.p206V1_0_0.downVos.ComXyVo;
/**
* @author ZhuBaoMin
@@ -94,11 +92,6 @@
Long operator = po.getOperator();
Long comId = idLongGenerator.generate();
- // 鑾峰彇绯荤粺鍙傛暟
- if(!setuped) {
- setUp();
- }
-
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
if(job_rtu == null) {
@@ -106,7 +99,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
@@ -179,11 +173,6 @@
Long operator = po.getOperator();
Long comId = idLongGenerator.generate();
- // 鑾峰彇绯荤粺鍙傛暟
- if(!setuped) {
- setUp();
- }
-
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
if(job_rtu == null) {
@@ -191,7 +180,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
@@ -244,11 +234,6 @@
Long operator = po.getOperator();
Long comId = idLongGenerator.generate();
- // 鑾峰彇绯荤粺鍙傛暟
- if(!setuped) {
- setUp();
- }
-
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
if(job_rtu == null) {
@@ -256,7 +241,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
@@ -310,11 +296,6 @@
Long operator = po.getOperator();
Long comId = idLongGenerator.generate();
- // 鑾峰彇绯荤粺鍙傛暟
- if(!setuped) {
- setUp();
- }
-
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
if(job_rtu == null) {
@@ -322,7 +303,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
@@ -375,11 +357,6 @@
Long operator = po.getOperator();
Long comId = idLongGenerator.generate();
- // 鑾峰彇绯荤粺鍙傛暟
- if(!setuped) {
- setUp();
- }
-
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
if(job_rtu == null) {
@@ -387,7 +364,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
+ //String orgTag = job_rtu.getString("orgTag");
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鑾峰彇鍔熻兘鐮�
--
Gitblit v1.8.0