yuzixiang
2020-05-22 92ec288bdffcce4846b6db312c630eaf3275e124
update(O3平均值计算)
1 files modified
7 ■■■■■ changed files
src/main/java/com/moral/service/impl/HistoryServiceImpl.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryServiceImpl.java
@@ -556,27 +556,22 @@
        List<String> stringListDate = DatesUtil.getAllTheDateOftheMonth(time);
        List<Map<String,Object>> maxList=new ArrayList<Map<String,Object>>();
        for (String date : stringListDate) {
            System.out.println("------------------------------------------------");
            Map<String, Object> parm = new HashMap<String, Object>();
            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
            LocalDateTime time1 = LocalDateTime.parse(date + " 00:00:00", df);
            LocalDateTime time2 = time1.plusDays(1);
            String time3 = time2.toString().substring(0, 10);
            String nextDate = time3 + " 07:00:00";
            System.out.println("-----"+date);
            System.out.println(nextDate);
            parm.put("date", date);
            parm.put("nextDate", nextDate);
            parm.put("mac", mac);
            List<Map<String, Object>> listMap = historyMapper.getO3AVG(parm);
            System.out.println("size="+listMap.size());
            List list=new ArrayList();
            DatesUtil.getList(listMap,list);
            List list1=new ArrayList();
            String maxO3="";
            for (int i = 0; i <list.size() ; i++) {
                List elist=new ArrayList();
                List tlist=new ArrayList();
                Double sum=0.0;
                Double avg=0.0;
                for (Object o : (List)list.get(i)) {
@@ -604,8 +599,6 @@
                    list1.add(avg1);
                }
            }
            System.out.println(list1);
            String timef=date+" 00:00:00";
            String timea=date+" 23:59:59";
            int num=historyMapper.getNum(timef,timea);