Merge remote-tracking branch 'origin/master'

cl

4 天以前 ba216b39c2866460a43f4979f99363364c71c015

Merge remote-tracking branch 'origin/master'

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

@@ -177,36 +177,41 @@
     * 接收电芯数据
     */
    @PostMapping("/receivingBatteryCellData")
    public void receivingBatteryCellData(@RequestBody CellDataVo cellDataVo) throws JsonProcessingException {
        ObjectMapper objectMapper = new ObjectMapper();
        JSONObject jsonObject = new JSONObject(cellDataVo);
        String cellListString = jsonObject.getStr("cellList");
        JsonNode cellListNode = objectMapper.readValue(cellListString, JsonNode.class);
        List<DaCellData> daCellDataList = new ArrayList<>();
        for (JsonNode jsonNode : cellListNode) {
            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);
    public AjaxResult receivingBatteryCellData(@RequestBody CellDataVo cellDataVo){
        try {
            ObjectMapper objectMapper = new ObjectMapper();
            JSONObject jsonObject = new JSONObject(cellDataVo);
            String cellListString = jsonObject.getStr("cellList");
            JsonNode cellListNode = objectMapper.readValue(cellListString, JsonNode.class);
            List<DaCellData> daCellDataList = new ArrayList<>();
            for (JsonNode jsonNode : cellListNode) {
                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);
                }
            }
            daCellDataService.insertBatch(daCellDataList);
            return AjaxResult.success("API调用成功");
        }catch (Exception e){
            return AjaxResult.error("API调用失败");
        }
        daCellDataService.insertBatch(daCellDataList);
    }

}