blame | history | patch | commit | commitdiff | ignore whitespace
lizijie
2021-10-08 98e8cacdb51b5e31ce2e6670100fcf6408b9c8d9 
 screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java


@@ -105,7 +105,6 @@


            govMonitorPoint_avg.setId(0);


            govMonitorPoint_avg.setName("");


            govMonitorPoint_avg.setGuid("");


            govMonitorPointList.add(govMonitorPoint_avg);


            List<Map<String,Object>> data = new ArrayList<>();


            Map<String,Object> hour_1 = new HashMap<>();


            Map<String,Object> hour_2 = new HashMap<>();


@@ -546,7 +545,7 @@


            hour_22.put("time","22时");


            hour_23.put("time","23时");


            hour_24.put("time","0时");


            hour_AVG.put("time","avg");


            hour_AVG.put("time","均值");


            data.add(hour_1);


            data.add(hour_2);


            data.add(hour_3);


@@ -574,6 +573,7 @@


            data.add(hour_AVG);


            resultMap.put("title",date+"月报");


            resultMap.put("data",data);


            govMonitorPointList.add(govMonitorPoint_avg);


            resultMap.put("govMonitorPoint",govMonitorPointList);


            return resultMap;


        }catch (Exception e){