Merge remote-tracking branch 'origin/master'

cl

9 天以前 5b544fc8d6029a71669b3992c5cfea9a044aaf3f

 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(() -> {