Merge remote-tracking branch 'origin/master'

zss

2024-07-23 c9a7198eb87bcd7ac8d2b21d6cf9d977e726fdd2

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

@@ -95,13 +95,11 @@
                    }
                }
            }
            String frequency = createFrequency(entrustCode, sampleCode);
            map.put("frequency", frequency);
            return map;
        }
    }

    private static String createFrequency(String entrustCode, String sampleCode) {
    public static String createFrequency(String entrustCode, String sampleCode) {
        String key = frequency + ":" + entrustCode + ":" + sampleCode;
        boolean b = RedisUtil.hasKey(key);
        String frequencyValue;
@@ -142,7 +140,16 @@
                JSONObject jsonObject1 = JSON.parseObject(dataList.get(y).toString());
                Object o = jsonObject1.get(key);
                if (ObjectUtils.isNotEmpty(o)) {
                    list.add(o);
                    // 小数点进三位
                    double v1 = 0;
                    try {
                        v1 = Double.parseDouble(o.toString());
                        double v2 = v1 / 1000;
                        list.add(v2);
                    } catch (NumberFormatException e) {
                        list.add(o);
                    }

                }
            }
            // 进行公式计算