update

jinpengyong

2021-07-01 0d24ea21533d9135c8963a28d8d45bfd207b8ec6

update

 screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java

@@ -10,8 +10,8 @@
import org.springframework.util.StringUtils;

import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.stream.Collectors;

import com.alibaba.fastjson.JSON;
import com.moral.api.service.DeviceService;
@@ -52,18 +52,27 @@
            }

            //数据过滤
            data = data.entrySet().stream()
                    .filter(map -> {
                        String key = map.getKey();
                        return !(key.contains("Min") || key.contains("Max") || key.contains("Cou"));
                    }).collect(Collectors.toMap(m -> m.getKey().replaceAll("-Avg", ""), Map.Entry::getValue));
            data.remove("time");
            data.remove("entryTime");
            Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
            Map<String, Object> newMap = new HashMap<>();
            Map.Entry<String, Object> next;
            while (iterator.hasNext()) {
                next = iterator.next();
                String key = next.getKey();
                Object value = next.getValue();
                if (key.contains("-Avg")) {
                    newMap.put(key.replaceAll("-Avg", ""), value);
                } else {
                    newMap.put(key, value);
                }
                iterator.remove();
            }
            //存入数据库
            historyMinutelyService.insertHistoryMinutely(data);
            historyMinutelyService.insertHistoryMinutely(newMap);
            ack.acknowledge();
        } catch (Exception e) {
            //log.error("param{}" + msg);
            log.error("param{}" + msg);
        }
    }

@@ -83,18 +92,27 @@
            }

            //数据过滤
            data = data.entrySet().stream()
                    .filter(map -> {
                        String key = map.getKey();
                        return !(key.contains("Min") || key.contains("Max") || key.contains("Cou"));
                    }).collect(Collectors.toMap(m -> m.getKey().replaceAll("-Avg", ""), Map.Entry::getValue));
            data.remove("time");
            data.remove("entryTime");
            Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
            Map<String, Object> newMap = new HashMap<>();
            Map.Entry<String, Object> next;
            while (iterator.hasNext()) {
                next = iterator.next();
                String key = next.getKey();
                Object value = next.getValue();
                if (key.contains("-Avg")) {
                    newMap.put(key.replaceAll("-Avg", ""), value);
                } else {
                    newMap.put(key, value);
                }
                iterator.remove();
            }
            //存入数据库
            historyHourlyService.insertHistoryHourly(data);
            historyHourlyService.insertHistoryHourly(newMap);
            ack.acknowledge();
        } catch (Exception e) {
            //log.error("param{}" + msg);
            log.error("param{}" + msg);
        }
    }

@@ -120,7 +138,7 @@
            deviceService.judgeDeviceState(data);
            ack.acknowledge();
        } catch (Exception e) {
            //log.error("param{}" + msg);
            log.error("param{}" + msg);
        }
    }
}

 screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java

@@ -37,7 +37,7 @@
    public void insertHistoryHourly(Map<String, Object> data) {
        Map<String, Object> dataAdjust = new HashMap<>(data);
        String mac = data.remove("mac").toString();
        Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyy_MM_dd_HH_EN);
        Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);

        Integer version = (Integer) data.remove("ver");
        Map<String, Object> result = new HashMap<>(data);