From 09ef66abe6ffc1325c5d23055ed6f3f4cb88b625 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 24 五月 2024 09:06:14 +0800
Subject: [PATCH] add mainCode
---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
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 15f6ba8..7927581 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
@@ -47,10 +47,41 @@
String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+
+ @PostMapping("/deviceResultFeedback")
+ public AjaxResult qinYanDeviceData(@RequestBody ParentVO parentVO){
+ //淇濆瓨鍙傛暟鏁版嵁
+ String productNum = parentVO.getProductNum();
+
+ //鍙傛暟淇濆瓨
+ List<DaParamCollection> paramCollectionList = new ArrayList<>();
+ List<ChildVO> checkList = parentVO.getCheckList();
+ for (ChildVO childVO : checkList) {
+ DaParamCollection daParamCollection = new DaParamCollection();
+ daParamCollection.setKeyCode(productNum);
+ daParamCollection.setProductCode(parentVO.getProductNum());
+ daParamCollection.setLocationCode(parentVO.getStationCode());
+ daParamCollection.setParamCode(childVO.getItemCode());
+ daParamCollection.setParamValue(childVO.getItemValue());
+ daParamCollection.setCollectionTime(new Date());
+ daParamCollection.setParamName(childVO.getItemText());
+ daParamCollection.setState(childVO.getCheckResult());
+ paramCollectionList.add(daParamCollection);
+ }
+ if (CollUtil.isNotEmpty(paramCollectionList)){
+ daParamCollectionService.insertBatch(paramCollectionList);
+ }
+// HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ return AjaxResult.success();
+ }
+
+
+
+
/**
* 瀵煎嚭鐐规浠诲姟鍒楄〃
*/
- @PostMapping("/deviceResultFeedback")
+ @PostMapping("/deviceResultFeedback222")
public AjaxResult hdy(@RequestBody ParentVO parentVO)
{
//淇濆瓨
@@ -63,6 +94,7 @@
DaPassingStationCollection passingStationCollection = new DaPassingStationCollection();
passingStationCollection.setWorkOrderNo(omProductionOrdeInfo.getWorkOrderNo());
passingStationCollection.setSfcCode(productNum);
+ passingStationCollection.setKeyCode(productNum);
passingStationCollection.setProductCode(omProductionOrdeInfo.getProductCode());
passingStationCollection.setLocationCode(parentVO.getStationCode());
passingStationCollection.setOutRsSign(parentVO.getTotalResult());
--
Gitblit v1.9.3