cjl
2023-10-13 c191d6d093b52badf95da4b661a0a95f3178377d
screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
@@ -561,7 +561,13 @@
        for (Map<String, Object> map : list) {
            HistoryDaily historyDaily = new HistoryDaily();
            String time = map.remove("time").toString();
            Date date = DateUtils.dateStringToDate(time);
            Date date=null;
            if (time.length()>20){
                date = DateUtils.dateStringToDate(time);
            }else {
                date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            }
            String mac = map.remove("mac").toString();
            String value = JSONObject.toJSONString(map);
            historyDaily.setMac(mac);