From 5e2faddb34e79918b73dc75aca8f63048dd4526d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 15 七月 2024 20:53:33 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index 6275ab9..f35cd89 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -19,7 +19,6 @@
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -46,8 +45,8 @@
*/
public class ComSupport {
- @Value("${mw.comSendUrl}")
- private String comSendUrl;
+ //@Value("${mw.comSendUrl}")
+ protected String comSendUrl;
protected static String controllerType = null;
protected static Integer projectNo = null;
@@ -73,6 +72,9 @@
private SeVirtualCardMapper seVirtualCardMapper;
public static ComSupport comSupport;
+
+ public ComSupport() {
+ }
/**
* 寮曞叆BaSettingsMapper
@@ -124,6 +126,7 @@
job_rtu.put("rtuAddr", prController.getRtuAddr());
job_rtu.put("protocol", prController.getProtocol());
job_rtu.put("intakeId", prController.getIntakeId());
+ job_rtu.put("orgTag", prController.getOrgTag());
return job_rtu;
}
--
Gitblit v1.8.0