From 6c345c06709a286a2a7dd3fa27d5348e7a57bfa0 Mon Sep 17 00:00:00 2001 From: cl <418351270@qq.com> Date: 星期四, 11 七月 2024 17:27:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 21 +++------------------ 1 files changed, 3 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 8911b60..70052fe 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 @@ -194,7 +194,9 @@ String cellCheckListString = jsonNode.path("cellCheckList").toString(); JsonNode cellCheckListNode = objectMapper.readValue(cellCheckListString, JsonNode.class); for (JsonNode checkNode : cellCheckListNode) { - if(checkNode.path("cellItem").toString().replaceAll("\"", "").equals("鐢佃姱鎸′綅")){ + //鐢佃姱鎸′綅 + String batteryCellGear = checkNode.path("cellItem").toString().replaceAll("\"", ""); + if(batteryCellGear.equals("鐢佃姱妗d綅")){ DaCellData daCellData = new DaCellData(); daCellData.setSiteCode(jsonObject.getStr("siteCode")); daCellData.setModuleSerial(jsonObject.getStr("moduleSerial")); @@ -213,23 +215,6 @@ 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