工厂MES接口地址优化

admin

2024-07-12 971788bf15d4bd58fe5bb6dbb76f16317a25ef7b

 jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java

@@ -73,20 +73,6 @@
    @Autowired
    private IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService;

    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);
    }

    /**
     * 导出点检任务列表
     */
@@ -105,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());
    }

@@ -193,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"));
@@ -212,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(() -> {