diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java index 889a9d1..9f1965c 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java @@ -104,13 +104,20 @@ public class IMeetingStatsServiceImpl implements IMeetingStatsService { List y = new ArrayList<>(); List zs = new ArrayList<>(); List list = meetingStatsMapper.roomRankStats(start, end); + + System.out.println("会议室使用排名原始数据: " + list.size() + "条"); for (MRStatsVo mrStatsVo : list) { + System.out.println("会议室: " + mrStatsVo.getName() + + ", 楼层: " + mrStatsVo.getFloor() + + ", 房间号: " + mrStatsVo.getRoomNum() + + ", 使用次数: " + mrStatsVo.getValue()); y.add(mrStatsVo.getName()); zs.add(mrStatsVo.getValue()); } roomRank.put("y", y); roomRank.put("total", zs); map.put("roomRank", roomRank); + System.out.println("处理后的会议室使用排名数据: y=" + y + ", total=" + zs); } if (true) {//服务情况 List> serve = new ArrayList<>(); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MRStatsVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MRStatsVo.java index 3a944fd..1fdc011 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MRStatsVo.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MRStatsVo.java @@ -20,6 +20,12 @@ public class MRStatsVo implements Serializable { private String name; private Long value; + + // 楼层 + private String floor; + + // 房间号 + private String roomNum; @JsonIgnore private Date start; diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml index 3c27366..376d867 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml @@ -55,10 +55,10 @@ @@ -91,7 +91,7 @@ 7 and mr.start between #{start} and #{end} - GROUP BY mr.user_org order by value desc limit 10 + GROUP BY mr.user_org order by value desc limit 20 ]]>