From ddf2c28b00b38469c9119dcad42d986f849bc62d Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期日, 21 七月 2024 09:53:51 +0800
Subject: [PATCH] 添加电芯挡位校验
---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 38 ++++----------------------------------
1 files changed, 4 insertions(+), 34 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..01f3dad 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
@@ -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());
}
@@ -194,7 +179,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("鐢佃姱妗ｄ綅")){
DaCellData daCellData = new DaCellData();
daCellData.setSiteCode(jsonObject.getStr("siteCode"));
daCellData.setModuleSerial(jsonObject.getStr("moduleSerial"));
@@ -213,23 +200,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