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/"; } 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("手动工位传工厂MES异步方法{}"+execute.body()); @@ -622,8 +622,8 @@ public void automaticWorkstationPushGeelycvMesFeedback(String packID, String stationCode,List<DaParamCollection> paramList) { logger.info("进入工位{}-工厂MES推送数据方法automaticWorkstationPushGeelycvMesFeedback",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("自动工位传工厂MES异步方法{}"+execute.body()); 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()); } } 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";
@@ -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";
