数采如果只采集到最后一条，造数据

Crunchy

2024-08-07 3c8908675b9ac0dc5494a56bc200536383a10032

数采如果只采集到最后一条，造数据

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

@@ -186,13 +186,7 @@
        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())) {
//                result = formulaCalculation(frequency, true);
//            } else {
//                result = formulaCalculation(frequency, false);
//            }
            return Result.success(frequency);
        } else {
            return Result.success(null);

 cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java

@@ -314,7 +314,11 @@
     */
    private static Object calculationFormula(List<Object> list, DataConfig dataConfig, String insProductItem, Device device) {
        if (list.size() == 0) {
            return null;
            Map<String, Object> hashMap = new HashMap<>();
            hashMap.put("result", "");
            hashMap.put("equipName", device.getDeviceName());
            hashMap.put("equipValue", device.getManagementNumber());
            return hashMap;
        }
        ArrayList<Object> listResult = new ArrayList<>();
        Map<String, Object> hashMap = new HashMap<>();