fix：五分钟数据过滤

cjl

2023-11-18 b26526f7be82d3079704f2505237a61628cefa97

 screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java

@@ -195,11 +195,18 @@

    // 修改设备状态
    private void judgeDeviceState(String mac,Map<String, Object> dataMap){
        List<String> sensorList = Arrays.asList("a34004","a34002","a21026","a21004","a21005","a05024","a99054");
        Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
        if(Objects.isNull(device)){
            return;
        }
        List<Sensor> sensors = device.getVersion().getSensors();
        Expression expression;
        int state = 1;
        for (Sensor sensor : sensors) {
            if(!sensorList.contains(sensor.getCode())){
                continue;
            }
            //因子报警等级
            String alarmLevel = sensor.getAlarmLevel();
            if (StringUtils.isEmpty(alarmLevel)) {
@@ -399,12 +406,16 @@
            dataMap.put("value", JSONObject.toJSONString(jsonMap));
            //存入redis
            jsonMap.put("dataTime", DateUtils.dateToDateString(start));
           // redisTemplate.opsForHash().put(RedisConstants.DATA_FIVE_MINUTES, key, jsonMap);
            //insertData.add(dataMap);
            redisTemplate.opsForHash().put(RedisConstants.DATA_FIVE_MINUTES, key, jsonMap);
            insertData.add(dataMap);
            System.out.println(">>>"+key+"->>>"+jsonMap.toString());
            judgeDeviceState(key,jsonMap);
            System.out.println(dataMap);
        });

        });
        //5分钟表后缀
       // String insertTimeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
        //存入数据库
      //  historyFiveMinutelyMapper.insertHistoryFiveMinutely(insertData, insertTimeUnits);

    }
}