blame | history | patch | commit | commitdiff | ignore whitespace
jinpengyong
2021-12-22 9d91dc402f279630eaa100024fd3b1542fbeb41c 
 screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java


@@ -1,6 +1,7 @@


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;




@@ -13,6 +14,7 @@


import com.moral.api.service.DeviceService;


import com.moral.api.service.HistoryMinutelyService;


import com.moral.constant.Constants;


import com.moral.constant.RedisConstants;


import com.moral.util.DateUtils;




@Service


@@ -24,23 +26,27 @@


    @Autowired


    private DeviceService deviceService;




    @Autowired


    private RedisTemplate redisTemplate;




    @Override


    @Transactional


    public void insertHistoryMinutely(Map<String, Object> data) {


        Map<String, Object> result = new HashMap<>();


        Object ver = data.remove("ver");




        Map<String, Object> dataAdjust = new HashMap<>(data);




        Object mac = data.remove("mac");


        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");




        result.put("mac", mac);


        result.put("version", ver);


        result.put("version", version);




        Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);


        result.put("time", time);


        result.put("time", DateUtils.getDateOfMin(time, -1));


        result.put("value", JSONObject.toJSONString(data));


        String timeUnits = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN);


        String timeUnits = DateUtils.dateToDateString(DateUtils.getDateOfMin(time, -1), DateUtils.yyyyMM_EN);


        result.put("timeUnits", timeUnits + "_" + Constants.UN_ADJUST);




        //原始数据（未校准）