From 5b544fc8d6029a71669b3992c5cfea9a044aaf3f Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 04 七月 2024 16:39:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 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 4a0ad55..ac1b176 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
@@ -170,7 +170,12 @@
@PostMapping("/sendWebSocket")
public void sendWebSocket(@RequestBody BsFormulaChildInfo bsFormulaChildInfo)
{
- WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), bsFormulaChildInfo.getResults());
+ CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
+ logger.info("鎺ユ敹鐢佃姱寮�濮嬫墽琛屽紓姝ユ柟娉�");
+ WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), bsFormulaChildInfo.getResults());
+ logger.info("鎺ユ敹鐢佃姱寮傛鏂规硶鎵ц缁撴潫");
+ });
+// WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), bsFormulaChildInfo.getResults());
}
/**
@@ -188,23 +193,42 @@
String cellCheckListString = jsonNode.path("cellCheckList").toString();
JsonNode cellCheckListNode = objectMapper.readValue(cellCheckListString, JsonNode.class);
for (JsonNode checkNode : cellCheckListNode) {
- DaCellData daCellData = new DaCellData();
- daCellData.setSiteCode(jsonObject.getStr("siteCode"));
- daCellData.setModuleSerial(jsonObject.getStr("moduleSerial"));
- daCellData.setModuleModel(jsonObject.getStr("moduleModel"));
- daCellData.setAbModule(jsonObject.getStr("ABModule"));
- daCellData.setPackageNo(jsonObject.getStr("packageNo"));
- daCellData.setSupplierModuleBarcode(jsonObject.getStr("supplierModuleBarcode"));
- daCellData.setCustomerModuleBarcode(jsonObject.getStr("customerModuleBarcode"));
- daCellData.setCellSerial(jsonNode.path("cellSerial").toString().replaceAll("\"", ""));
- daCellData.setCellModel(jsonNode.path("cellModel").toString().replaceAll("\"", ""));
- daCellData.setGbCellCode(jsonNode.path("GBCellCode").toString().replaceAll("\"", ""));
- daCellData.setGbModuleCode(jsonNode.path("GBModuleCode").toString().replaceAll("\"", ""));
- daCellData.setCellItem(checkNode.path("cellItem").toString().replaceAll("\"", ""));
- daCellData.setCellValue(checkNode.path("cellValue").toString().replaceAll("\"", ""));
- daCellData.setCreateUser("宸ュ巶MES");
- daCellData.setCreateTime(new Date());
- daCellDataList.add(daCellData);
+ if(checkNode.path("cellItem").toString().replaceAll("\"", "").equals("鐢佃姱鎸′綅")){
+ DaCellData daCellData = new DaCellData();
+ daCellData.setSiteCode(jsonObject.getStr("siteCode"));
+ daCellData.setModuleSerial(jsonObject.getStr("moduleSerial"));
+ daCellData.setModuleModel(jsonObject.getStr("moduleModel"));
+ daCellData.setAbModule(jsonObject.getStr("ABModule"));
+ daCellData.setPackageNo(jsonObject.getStr("packageNo"));
+ daCellData.setSupplierModuleBarcode(jsonObject.getStr("supplierModuleBarcode"));
+ daCellData.setCustomerModuleBarcode(jsonObject.getStr("customerModuleBarcode"));
+ daCellData.setCellSerial(jsonNode.path("cellSerial").toString().replaceAll("\"", ""));
+ daCellData.setCellModel(jsonNode.path("cellModel").toString().replaceAll("\"", ""));
+ daCellData.setGbCellCode(jsonNode.path("GBCellCode").toString().replaceAll("\"", ""));
+ daCellData.setGbModuleCode(jsonNode.path("GBModuleCode").toString().replaceAll("\"", ""));
+ daCellData.setCellItem(checkNode.path("cellItem").toString().replaceAll("\"", ""));
+ daCellData.setCellValue(checkNode.path("cellValue").toString().replaceAll("\"", ""));
+ daCellData.setCreateUser("宸ュ巶MES");
+ daCellData.setCreateTime(new Date());
+ daCellDataList.add(daCellData);
+ }
+// DaCellData daCellData = new DaCellData();
+// daCellData.setSiteCode(jsonObject.getStr("siteCode"));
+// daCellData.setModuleSerial(jsonObject.getStr("moduleSerial"));
+// daCellData.setModuleModel(jsonObject.getStr("moduleModel"));
+// daCellData.setAbModule(jsonObject.getStr("ABModule"));
+// daCellData.setPackageNo(jsonObject.getStr("packageNo"));
+// daCellData.setSupplierModuleBarcode(jsonObject.getStr("supplierModuleBarcode"));
+// daCellData.setCustomerModuleBarcode(jsonObject.getStr("customerModuleBarcode"));
+// daCellData.setCellSerial(jsonNode.path("cellSerial").toString().replaceAll("\"", ""));
+// daCellData.setCellModel(jsonNode.path("cellModel").toString().replaceAll("\"", ""));
+// daCellData.setGbCellCode(jsonNode.path("GBCellCode").toString().replaceAll("\"", ""));
+// daCellData.setGbModuleCode(jsonNode.path("GBModuleCode").toString().replaceAll("\"", ""));
+// daCellData.setCellItem(checkNode.path("cellItem").toString().replaceAll("\"", ""));
+// daCellData.setCellValue(checkNode.path("cellValue").toString().replaceAll("\"", ""));
+// daCellData.setCreateUser("宸ュ巶MES");
+// daCellData.setCreateTime(new Date());
+// daCellDataList.add(daCellData);
}
}
CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
--
Gitblit v1.9.3