jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
@@ -59,6 +59,9 @@ 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 FACTORY_EMS_UAT_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/"; public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/"; public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface/"; public static final String FACTORY_EMS_SITE_CODE = "3983"; } jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -536,8 +536,6 @@ public void pushGeelycvMesFeedback(String packID, String stationCode) { logger.info("进入人工工位推送工厂MES数据方法-pushGeelycvMesFeedback-工位{}-pack码{}",stationCode,packID); 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 totalResult = "0"; List<DaParamCollectionTemp> paramList = daParamCollectionTempService.list(new LambdaQueryWrapper<DaParamCollectionTemp>().eq(DaParamCollectionTemp::getSfcCode, packID).eq(DaParamCollectionTemp::getLocationCode, stationCode)); if(paramList.size() > 0){ @@ -592,7 +590,7 @@ try{ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { logger.info("开始执行异步方法"); HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute(); HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute(); logger.info("异步方法执行结束"); logger.info("手动工位传工厂MES异步方法{}"+execute.body()); @@ -622,8 +620,6 @@ 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 totalResult = "0"; if(paramList.size() > 0){ logger.info("进入工位{}-拼数据",stationCode); @@ -679,7 +675,7 @@ try{ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { logger.info("开始执行异步方法"); HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute(); HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_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
@@ -518,7 +518,7 @@ parentVO.setCheckList(mesList); log.info("执行工厂MES方法start，工位号{} 传入数据：{}",device ,parentVO); HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute(); HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute(); log.info("执行工厂MES方法end，工位号{} 返回数据：{}",device,execute.body()); }); @@ -758,7 +758,7 @@ parentVO.setCheckList(mesChildList);//参数 //CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { log.info("执行工厂MES方法start，传入数据：{}",parentVO); HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute(); HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_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
@@ -8,27 +8,6 @@ import org.springframework.web.bind.annotation.RequestParam; public class RestfulService { public static void main(String[] args) { String json = "{\"code\":\"success\",\"data\":{\"productNum\":\"LCV123456P0600036\",\"stationCode\":\"1HZ01\",\"resultCode\":\"S\",\"resultText\":\"报工成功\"},\"message\":\"API 调用成功\"}"; JSONObject jsonObject = new JSONObject(json); String code = jsonObject.getStr("code"); String resultCode = jsonObject.getJSONObject("data").getStr("resultCode"); System.out.println("code: " + code); System.out.println("resultCode: " + resultCode); } 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"; // public static final String getRealmName = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration"; // public static final String postRealmName = "https://imes-group.geelycv.com/api/mom-open/restful/interface"; public static final String siteCode = "3983"; /** * 生产工单请求接口 * @param productNum @@ -38,7 +17,7 @@ //{"code":"success","data":{"productNum":"LCV123456P0600036","stationCode":"1HZ01","materialCode":"LCV001_3","productionOrderNum":"500000258"},"message":"API调用成功"} public static String getProductionWorkOrderRequest(String productNum,String stationCode,String materialCode) { String url = getRealmName + "/productionWorkOrderRequest?siteCode="+siteCode+"&stationCode="+stationCode+"&productNum="+productNum+"&materialCode="+materialCode; String url = Constants.FACTORY_EMS_UAT_GET_RUL + "productionWorkOrderRequest?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&stationCode="+stationCode+"&productNum="+productNum+"&materialCode="+materialCode; HttpResponse response = HttpRequest.get(url).execute(); HttpRequest httpRequest = HttpRequest.get(url); return response.body(); @@ -56,7 +35,7 @@ { String result = ""; try { String url = getRealmName + "/workReportResultFeedback?siteCode="+siteCode+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime; String url = Constants.FACTORY_EMS_UAT_GET_RUL + "workReportResultFeedback?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime; HttpResponse response = HttpRequest.get(url).execute(); HttpRequest httpRequest = HttpRequest.get(url); result = response.body(); @@ -78,7 +57,7 @@ //{"code":"success","data":[{"productionOrderNum":"500000258","componentCode":"LCV_TZ_002","quantity":"1.0","stationCode":"C01"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_001","quantity":"1.0","stationCode":"C01"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_002","quantity":"1.0","stationCode":"C01"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_003","quantity":"1.0","stationCode":"C01"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_004","quantity":"1.0","stationCode":"C01"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_005","quantity":"1.0","stationCode":"C02"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_006","quantity":"1.0","stationCode":"C03"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_007","quantity":"1.0","stationCode":"C04"},{"productionOrderNum":"500000258","componentCode":"LCV_CG_009","quantity":"2.0","stationCode":"C05"}],"message":"API调用成功"} public static String getProductionOrderComponentRequest(String productionOrderNum) { String url = getRealmName + "/productionOrderComponentRequest?siteCode="+siteCode+"&productionOrderNum="+productionOrderNum; String url = Constants.FACTORY_EMS_UAT_GET_RUL + "productionOrderComponentRequest?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&productionOrderNum="+productionOrderNum; HttpResponse response = HttpRequest.get(url).execute(); HttpRequest httpRequest = HttpRequest.get(url); return response.body(); @@ -93,10 +72,10 @@ //{"code":"success","data":[{"configValues":{"FXPTX":"","ZJTX":"","JSYZYZC":"","CDGDTX":"","CHLXTX":""},"productTrackInfo":{"ProductNum":"LCVLCVTS3P0600388","StationCode":"1A03"}}],"message":"API调用成功"} public static String postPRODUCTION_QUEUE(String productNum,String stationCode) { String url = postRealmName + "/PRODUCTION_QUEUE"; String url = Constants.FACTORY_EMS_UAT_POST_RUL + "PRODUCTION_QUEUE"; HttpResponse response = HttpRequest.post(url) // 表单参数，可以通过多次调用 form 方法添加多个参数 .form("siteCode", siteCode) .form("siteCode", Constants.FACTORY_EMS_SITE_CODE) .form("interfaceCode", "PRODUCTION_QUEUE") .form("parameter", "{\"productNum\":\""+productNum+"\",\"stationCode\":\""+stationCode+"\",\"requestQty\":1}") // 执行请求 jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
@@ -72,21 +72,6 @@ @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-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback"; /** * 20工位接收清研数据 */ @PostMapping("/receiveOVCDataFrom020Workstations") public AjaxResult receiveOVCDataFrom020Workstations(@RequestBody ParentVO parentVO) { return AjaxResult.success(null); } /** * 导出点检任务列表 @@ -106,7 +91,7 @@ if(parentVO.getStationCode().equals("M1OP020")){ this.saveDaTestDeviceInterfaceTemp(parentVO,checkList); } HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute(); HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute(); return AjaxResult.success(execute.body()); }
