注释添加

jinpengyong

2021-07-26 d97d902c88d0c718152f0a9f099de209500fc18a

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

@@ -1,7 +1,9 @@
package com.moral.api.service.impl;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

import java.util.ArrayList;
@@ -21,6 +23,7 @@
import com.moral.api.service.HistoryMinutelyService;
import com.moral.api.service.SensorService;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.AmendUtils;
import com.moral.util.DateUtils;

@@ -41,7 +44,11 @@
        historyFiveMinutelyMapper.createTable(timeUnits);
    }

    @Autowired
    private RedisTemplate redisTemplate;

    @Override
    @Transactional
    public void insertHistoryFiveMinutely() {
        //时间格式化：yyyy-MM-dd HH:mm
        String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
@@ -64,6 +71,10 @@

        //获取所有设备的5分钟数据
        List<Map<String, Object>> fiveMinutelyData = historyMinutelyService.getHistoryFiveMinutelyData(params);
        if (fiveMinutelyData.size() == 0) {
            return;
        }

        //按mac分组
        Map<String, List<Map<String, Object>>> data = fiveMinutelyData.parallelStream()
                .collect(Collectors.groupingBy(o -> (String) o.get("mac")));
@@ -105,6 +116,8 @@
                }
            });
            dataMap.put("value", JSONObject.toJSONString(jsonMap));
            //存入redis
            redisTemplate.opsForHash().put(RedisConstants.DATA_FIVE_MINUTES, key, jsonMap);
            insertData.add(dataMap);
        });