blame | history | patch | commit | commitdiff | ignore whitespace
cjl
2023-09-26 36a11d78a2517b523fcf6b6ec622f3f0767f553f 
 screen-manage/src/main/java/com/moral/api/service/impl/HistoryMinutelyServiceImpl.java


@@ -5,6 +5,7 @@


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import java.text.SimpleDateFormat;


import java.util.Date;


import java.util.HashMap;


import java.util.Map;


@@ -42,8 +43,13 @@




        result.put("mac", mac);


        result.put("version", version);




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


//        String time1 = data.get("time").toString();


        String time2 = data.remove("time").toString();


        long l = Long.parseLong(time2);


        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:00");


        String format1 = dateFormat.format(l);


        Date time = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);


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


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


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


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


@@ -53,7 +59,7 @@


        historyMinutelyMapper.insertHistoryMinutely(result);




        //数据校准


        dataAdjust = deviceService.adjustDeviceData(dataAdjust);


        dataAdjust = deviceService.adjustDeviceData(dataAdjust,"1");


        result.put("timeUnits", timeUnits);


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


        historyMinutelyMapper.insertHistoryMinutely(result);