screen-manage 修复报警更新代码BUG

kaiyu

2021-09-03 c3afba5959d8c94b6af76e6d578b1c6a1bf79b84

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

@@ -53,6 +53,8 @@
        //时间格式化：yyyy-MM-dd HH:mm
        String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
        Date now = new Date();
        now = DateUtils.getFiveMinuteDate(now);

        //从数据库获取数据参数
        Map<String, Object> params = new HashMap<>();
        //开始时间
@@ -133,7 +135,7 @@
                            Map<String, Object> dataValue = JSONObject.parseObject((String) v.get("value"), Map.class);
                            Object sensorValue = dataValue.get(sensorCode);
                            //数据有效性标记位
                            Object flag = dataValue.get(sensorCode + Constants.MARKER_BIT_KEY);
                            Object flag = dataValue.get(sensorCode + "-" + Constants.MARKER_BIT_KEY);
                            if (!Constants.MARKER_BIT_TRUE.equals(flag)) {
                                return null;
                            }