screen-aqi 监测因子对比图对时间进行排序

kaiyu

2021-10-09 fe26987e7e18b57d43b096631d1b1534d2fe86ec

 screen-common/src/main/java/com/moral/util/AmendUtils.java

@@ -172,8 +172,11 @@
            Object speed = dataValue.get(Constants.SENSOR_CODE_WIND_SPEED);
            Object flagDir = dataValue.get(Constants.SENSOR_CODE_WIND_DIR + "-" + Constants.MARKER_BIT_KEY);
            Object flagSpeed = dataValue.get(Constants.SENSOR_CODE_WIND_SPEED + "-" + Constants.MARKER_BIT_KEY);
            if (!Constants.MARKER_BIT_TRUE.equals(flagDir) || !Constants.MARKER_BIT_TRUE.equals(flagSpeed)) {
                continue;

            if (!ObjectUtils.isEmpty(flagDir) && !ObjectUtils.isEmpty(flagSpeed)) {
                if (!Constants.MARKER_BIT_TRUE.equals(flagDir) || !Constants.MARKER_BIT_TRUE.equals(flagSpeed)) {
                    continue;
                }
            }

            if (ObjectUtils.isEmpty(wind) || ObjectUtils.isEmpty(speed)) {
@@ -271,10 +274,6 @@
        for (Map<String, Object> dataMap : list) {
            Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
            Object o = dataValue.get(Constants.SENSOR_CODE_CO);
            Object flag = dataValue.get(Constants.SENSOR_CODE_CO + "-" + Constants.MARKER_BIT_KEY);
            if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
                continue;
            }
            if (ObjectUtils.isEmpty(o)) {
                continue;
            }
@@ -309,10 +308,6 @@
        for (Map<String, Object> dataMap : list) {
            Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
            Object o = dataValue.get(Constants.SENSOR_CODE_O3);
            Object flag = dataValue.get(Constants.SENSOR_CODE_O3 + "-" + Constants.MARKER_BIT_KEY);
            if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
                continue;
            }
            if (ObjectUtils.isEmpty(o)) {
                continue;
            }