补充提交

cjl

2023-10-20 4dc15079f5e5fe8620a0c9d1787e838a960269b9

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