screen-api 修改删除转换公式BUG

kaiyu

2021-07-15 5776cbc5f2f31f3e939cbbf792d257620f03eb89

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

@@ -11,6 +11,7 @@

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.HashMap;
@@ -34,10 +35,12 @@
    private DeviceService deviceService;

    @Override
    @Transactional
    public void insertHistoryHourly(Map<String, Object> data) {
        Map<String, Object> dataAdjust = new HashMap<>(data);
        String mac = data.remove("mac").toString();
        Date time = DateUtils.dataToTimeStampTime(new Date(new Long((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);
        result.put("mac", mac);