Merge remote-tracking branch 'origin/master'

zss

2024-08-03 f608e00e49461f60ba8df1566fc4b9a998430ace

Merge remote-tracking branch 'origin/master'

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -229,7 +229,7 @@
    @PostMapping("/formulaCalculation")
    @ValueAuth
    public Result<?> formulaCalculation(@RequestBody Map<String, Object> map) {
        return Result.success(deviceService.formulaCalculation(map, false));
        return Result.success(map);
    }
}


 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -180,13 +180,14 @@
        Map<String, Object> map = DataAcquisition.dataAcquisitionEntrance(list1, device.get(0), entrustCode, sampleCode, ip);
        // 4、造循环次数
        if (ObjectUtils.isNotEmpty(map)) {
            Object result;
            Map<String, Object> frequency = DataAcquisition.createFrequency(entrustCode, sampleCode, map);
            if (ObjectUtils.isEmpty(device.get(0).getEntrustCode()) && ObjectUtils.isEmpty(device.get(0).getSampleCode())) {
                Map<String, Object> frequency = DataAcquisition.createFrequency(entrustCode, sampleCode, map);
                Object o = formulaCalculation(frequency, true);
                return Result.success(o);
                result = formulaCalculation(frequency, true);
            } else {
                return Result.success(DataAcquisition.createFrequency(entrustCode, sampleCode, map));
                result = formulaCalculation(frequency, false);
            }
            return Result.success(result);
        } else {
            return Result.success(null);
        }
@@ -1007,8 +1008,6 @@
                    if (formulaData.containsKey("result") && formulaData.containsKey("isCalculation") &&
                    formulaData.containsKey("formula")) {
                        String formula = formulaData.get("formula").toString();
                        Boolean isCalculation = Boolean.valueOf(formulaData.get("isCalculation").toString());
                        if (isCalculation) {
                            List<Object> resultList = new ArrayList<>();
                            try {
                                resultList = JSONObject.parseArray(JSON.toJSONString(formulaData.get("result")), Object.class);
@@ -1030,7 +1029,6 @@

                            formulaData.put("isCalculation", false);
                            formulaData.put("result", list);
                        }
                    }
                    jsonObject.put(sonKey, formulaData);
                }