分钟，5分钟，小时表存入非本月数据bug修复

jinpengyong

2021-12-22 9d91dc402f279630eaa100024fd3b1542fbeb41c

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

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

import com.alibaba.fastjson.JSONObject;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.service.DeviceService;
import com.moral.api.service.HistoryHourlyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;

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;

@@ -26,7 +26,7 @@
 * @since 2021-06-04
 */
@Service
public class HistoryHourlyServiceImpl extends ServiceImpl<HistoryHourlyMapper, HistoryHourly> implements HistoryHourlyService {
public class HistoryHourlyServiceImpl implements HistoryHourlyService {

    @Autowired
    private HistoryHourlyMapper historyHourlyMapper;
@@ -34,40 +34,39 @@
    @Autowired
    private DeviceService deviceService;

    @Autowired
    private RedisTemplate redisTemplate;

    @Override
    @Transactional
    public void insertHistoryHourly(Map<String, Object> data) {
        //用来校准数据
        Map<String, Object> dataAdjust = new HashMap<>(data);
        //存入数据库对象
        Map<String, Object> result = new HashMap<>();
        String mac = data.remove("mac").toString();
        //根据mac获取型号
        Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
        Map<String, Object> versionInfo = (Map<String, Object>) deviceInfo.get("version");
        Integer version = (Integer) versionInfo.get("id");

        Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
        Integer version = (Integer) data.remove("ver");
        Map<String, Object> result = new HashMap<>();
        String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);

        result.put("mac", mac);
        result.put("time", time);
        result.put("time", DateUtils.addHours(time, -1));
        result.put("version", version);
        result.put("timeUnits", Constants.UN_ADJUST);
        result.put("timeUnits", yearAndMonth + "_" + Constants.UN_ADJUST);
        result.put("value", JSONObject.toJSONString(data));
        //原始数据（未校准）
        historyHourlyMapper.insertHistoryHourlyUnAdjust(result);
        //未校准小时表insert
        historyHourlyMapper.insertHistoryHourly(result);

        //数据校准
        dataAdjust = deviceService.adjustDeviceData(dataAdjust);
        dataAdjust.remove("mac");
        dataAdjust.remove("DataTime");
        dataAdjust.remove("ver");

        int count = historyHourlyMapper.getCountByMacAndTime(mac, DateUtils.dateToDateString(time));

        //判断中间表有没有该mac,该小时的数据，有就更新，没有就新增
        if (count == 0) {
            //小时数据校准后存入小时中间表
            result.put("value", JSONObject.toJSONString(dataAdjust));
            //新增
            historyHourlyMapper.insertHistoryHourlyTransition(result);
        } else {
            //更新
            historyHourlyMapper.updateHistoryTransition(mac, DateUtils.dateToDateString(time));
        }
        //校准后小时表insert
        result.put("timeUnits", yearAndMonth);
        result.put("value", JSONObject.toJSONString(dataAdjust));
        historyHourlyMapper.insertHistoryHourly(result);
    }
}