From 20635fa3540068045b07471f08ab107b9d0f4281 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 05 七月 2024 08:54:01 +0800
Subject: [PATCH] -统一工厂MES UAT环境URL字符串
---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 3 ++-
jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java | 5 ++++-
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 8 ++++----
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 4 ++--
jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java | 2 +-
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java b/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
index 420ea7b..960a06d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
@@ -41,6 +41,6 @@
public static final Integer INT_THREE= 3;
public static final Integer INT_FOUR= 4;
public static final Integer INT_ZERO= 0;
- public static final String orderLineUrl = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration";
+ public static final String FACTORY_EMS_UAT_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/";
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
index 680bc0f..039a00f 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -592,7 +592,7 @@
try{
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
- HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
logger.info("寮傛鏂规硶鎵ц缁撴潫");
logger.info("鎵嬪姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶{}"+execute.body());
@@ -622,8 +622,8 @@
public void automaticWorkstationPushGeelycvMesFeedback(String packID, String stationCode,List<DaParamCollection> paramList) {
logger.info("杩涘叆宸ヤ綅{}-宸ュ巶MES鎺ㄩ�佹暟鎹柟娉昦utomaticWorkstationPushGeelycvMesFeedback",stationCode);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
- String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+ String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+// String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
String totalResult = "0";
if(paramList.size() > 0){
logger.info("杩涘叆宸ヤ綅{}-鎷兼暟鎹�",stationCode);
@@ -679,7 +679,7 @@
try{
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
- HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
System.out.println(execute.body());
logger.info("寮傛鏂规硶鎵ц缁撴潫");
logger.info("鑷姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶{}"+execute.body());
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index c6afadb..41602ba 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -507,7 +507,7 @@
parentVO.setCheckList(mesList);
log.info("鎵ц宸ュ巶MES鏂规硶start锛屼紶鍏ユ暟鎹細{}",parentVO);
- HttpResponse execute = HttpRequest.post(Constants.orderLineUrl).body(JSONUtil.toJsonStr(parentVO)).execute();
+ HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
log.info("鎵ц宸ュ巶MES鏂规硶end锛岃繑鍥炴暟鎹細{}",execute.body());
});
@@ -747,7 +747,7 @@
parentVO.setCheckList(mesChildList);//鍙傛暟
//CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
log.info("鎵ц宸ュ巶MES鏂规硶start锛屼紶鍏ユ暟鎹細{}",parentVO);
- HttpResponse execute = HttpRequest.post(Constants.orderLineUrl).body(JSONUtil.toJsonStr(parentVO)).execute();
+ HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
log.info("鎵ц宸ュ巶MES鏂规硶end锛岃繑鍥炴暟鎹細{}",execute.body());
}
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
index 8cc1b31..1fcadf7 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
@@ -3,6 +3,7 @@
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONObject;
+import com.jcdm.main.constant.Constants;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -16,7 +17,9 @@
System.out.println("resultCode: " + resultCode);
}
- public static final String getRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration";
+ public static final String getRealmName = Constants.FACTORY_EMS_UAT_RUL;
+
+ // public static final String getRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration";
//
public static final String postRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface";
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
index ac1b176..8911b60 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
@@ -72,8 +72,9 @@
@Autowired
private IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService;
+ String url = Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback";
- String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+// String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
// String url = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
--
Gitblit v1.9.3