chore:测试提交

jinpengyong

2023-12-05 ac326c1db9de13a81d8b807276689df88486307d

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

@@ -492,58 +492,58 @@
            map.put("mac", objects[0]);
            map.put("time", objects[1]);
            // pm2.5
            if (!objects[2].toString().equals("--")){
            if (!objects[2].toString().equals("-")){
                map.put("a34004", objects[2]);
            }

            // pm10
            if (!objects[3].toString().equals("--")){
            if (!objects[3].toString().equals("-")){
                map.put("a34002", objects[3]);
            }
            // 二氧化硫
            if (!objects[4].toString().equals("--")){
            if (!objects[4].toString().equals("-")){
                map.put("a21026", objects[4]);
            }
            // 二氧化氮
            if (!objects[5].toString().equals("--")){
            if (!objects[5].toString().equals("-")){
                map.put("a21004", objects[5]);
            }
            // co
            if (!objects[6].toString().equals("--")){
            if (!objects[6].toString().equals("-")){
                map.put("a21005", objects[6]);
            }
            // o3
            if (!objects[7].toString().equals("--")){
            if (!objects[7].toString().equals("-")){
                map.put("a05024", objects[7]);
            }

            // 温度
            if (!objects[8].toString().equals("--")){
            if (!objects[8].toString().equals("-")){
                map.put("a01001", objects[8]);
            }
            // 湿度
            if (!objects[9].toString().equals("--")){
            if (!objects[9].toString().equals("-")){
                map.put("a01002", objects[9]);
            }
            // 风速
            if (!objects[10].toString().equals("--")){
            if (!objects[10].toString().equals("-")){
                map.put("a01007", objects[10]);
            }
            // 风向
            if (!objects[11].toString().equals("--")){
            if (!objects[11].toString().equals("-")){
                map.put("a01008", objects[11]);
            }

            // 气压
            if (!objects[12].toString().equals("--")){
            if (!objects[12].toString().equals("-")){
                map.put("a01006", objects[12]);
            }
            // 光照强度
            if (!objects[13].toString().equals("--")){
            if (!objects[13].toString().equals("-")){
                map.put("a00e12", objects[13]);
            }
            // tvoc
            if (!objects[14].toString().equals("--")){
            if (!objects[14].toString().equals("-")){
                map.put("a99054", objects[14]);
            }

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