From d76bbaa8a9a70124045dc4c9753e5a868ac4e7d2 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 21 六月 2024 09:33:38 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
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 8705ccc..e84ac6a 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
@@ -50,6 +50,7 @@
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
/**
@@ -245,6 +246,7 @@
daParamCollectionTemp.setCollectionTime(new Date());
daParamCollectionTemp.setSfcCode(daParamCollection.getProductBarcode());
daParamCollectionTemp.setLocationCode(daParamCollection.getLocationCode());
+ daParamCollectionTemp.setProductCode(daParamCollection.getProductCode());
daParamCollectionTempService.save(daParamCollectionTemp);
}
}
@@ -462,6 +464,7 @@
@Override
public void pushGeelycvMesFeedback(String packID, String stationCode) {
+ logger.info("杩涘叆浜哄伐宸ヤ綅鎺ㄩ�佸伐鍘侻ES鏁版嵁鏂规硶-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";
@@ -516,12 +519,25 @@
}
parentVO.setCheckList(listChildVo);
- HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
- List<Long> idsList = paramList.stream().map(DaParamCollectionTemp::getId).collect(Collectors.toList());
- Long[] array = idsList.toArray(new Long[0]);
- daParamCollectionTempService.deleteDaParamCollectionTempByIds(array);
- System.out.println(execute.body());
+ try{
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
+ HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ logger.info("寮傛鏂规硶鎵ц缁撴潫");
+ logger.info("鎵嬪姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶{}"+execute.body());
+ List<Long> idsList = paramList.stream().map(DaParamCollectionTemp::getId).collect(Collectors.toList());
+ Long[] array = idsList.toArray(new Long[0]);
+ int i = daParamCollectionTempService.deleteDaParamCollectionTempByIds(array);
+ logger.info("鍒犻櫎涓存椂琛ㄦ暟鎹潯鏁皗}-宸ヤ綅{}-pack鐮亄}",i,stationCode,packID);
+ });
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+// HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+
+// System.out.println(execute.body());
System.out.println("-----------------------"+totalResult);
+ logger.info("缁撴潫浜哄伐宸ヤ綅鎺ㄩ�佸伐鍘侻ES鏁版嵁鏂规硶-pushGeelycvMesFeedback-宸ヤ綅{}-pack鐮亄}",stationCode,packID);
}
}
@@ -584,9 +600,19 @@
parentVO.setCheckList(listChildVo);
logger.info("缁撴潫宸ヤ綅{}-鎷兼暟鎹�",stationCode);
logger.info("杩涘叆宸ヤ綅{}-宸ュ巶MES鎺ㄩ�佹暟鎹柟娉旽ttpResponseSend",stationCode);
- HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ try{
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
+ HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ System.out.println(execute.body());
+ logger.info("寮傛鏂规硶鎵ц缁撴潫");
+ logger.info("鑷姩宸ヤ綅浼犲伐鍘侻ES寮傛鏂规硶{}"+execute.body());
+ });
+ }catch (Exception e){
+ System.out.println(e.getMessage());
+ }
+// HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
logger.info("缁撴潫宸ヤ綅{}-宸ュ巶MES鎺ㄩ�佹暟鎹柟娉旽ttpResponseSend",stationCode);
- System.out.println(execute.body());
System.out.println("-----------------------"+totalResult);
}
logger.info("缁撴潫宸ヤ綅{}-宸ュ巶MES鎺ㄩ�佹暟鎹柟娉昦utomaticWorkstationPushGeelycvMesFeedback",stationCode);
@@ -636,8 +662,18 @@
parentVO.setTotalResult("1");
parentVO.setCheckList(childVOList);
HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+// try{
+// CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+// logger.info("寮�濮嬫墽琛屽紓姝ユ柟娉�");
+// HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+// System.out.println(execute.body());
+// logger.info("寮傛鏂规硶鎵ц缁撴潫");
+// logger.info("绉伴噸寮傛鏂规硶{}",execute.body());
+// });
+// }catch (Exception e){
+// System.out.println(e.getMessage());
+// }
RestfulService.getWorkReportResultFeedback(daParamCollection.getSfcCode(),"OP500",format.format(new Date()));
- System.out.println(execute.body());
}
}
--
Gitblit v1.9.3