dashboard add matcj data

TastSong · TastSong · commit 36c20c4926f7 · 2022-07-22T15:58:08.000+08:00
diff --git a/CarzyCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundDashboardController.java b/CarzyCarServer/src/main/java/com/tastsong/crazycar/controller/BackgroundDashboardController.java
@@ -8,7 +8,6 @@
 
 import com.tastsong.crazycar.service.BackgroundDashboardService;
 
-import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 
 @RestController
@@ -27,18 +26,9 @@ public Object getDashboardData() throws Exception {
         data.putOpt("map_num", dashboardService.getMapNum());
         data.putOpt("time_trial_times", 99);
         data.putOpt("match_times", 44);
-        int size = 7;
         data.putOpt("login_user_num", dashboardService.getUserLoginData(7));
         data.putOpt("time_trial_num", dashboardService.getTimeTrialData(7));
-
-        JSONArray matchItems = new JSONArray();
-        for (int i = 0; i < size; i++){
-            JSONObject item = new JSONObject();
-            item.putOpt("timestamp", System.currentTimeMillis() - 1000 * 60 * 60 *24 * (7 - i));
-            item.putOpt("count", (i + 1) * 8);
-            matchItems.add(item);
-        }
-        data.putOpt("match_num", matchItems);
+        data.putOpt("match_num", dashboardService.getMatchData(7));
         return data;
     }
 }
diff --git a/CarzyCarServer/src/main/java/com/tastsong/crazycar/mapper/MatchMapper.java b/CarzyCarServer/src/main/java/com/tastsong/crazycar/mapper/MatchMapper.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import com.tastsong.crazycar.model.DataStatisticsModel;
 import com.tastsong.crazycar.model.MatchMapInfoModel;
 import com.tastsong.crazycar.model.MatchRankModel;
 import com.tastsong.crazycar.model.MatchRecordModel;
@@ -18,4 +19,5 @@ public interface MatchMapper {
     public Integer delMatchRank(Integer uid, Integer cid);
     public List<MatchRankModel> getMatchRankList(Integer uid, Integer cid);
     public Integer initMatchRank(Integer uid, Integer cid);
+    public List<DataStatisticsModel> getMatchData(Integer offsetTime); 
 }
diff --git a/CarzyCarServer/src/main/java/com/tastsong/crazycar/service/BackgroundDashboardService.java b/CarzyCarServer/src/main/java/com/tastsong/crazycar/service/BackgroundDashboardService.java
@@ -7,6 +7,7 @@
 
 import com.tastsong.crazycar.mapper.AvatarMapper;
 import com.tastsong.crazycar.mapper.EquipMapper;
+import com.tastsong.crazycar.mapper.MatchMapper;
 import com.tastsong.crazycar.mapper.TimeTrialMapper;
 import com.tastsong.crazycar.mapper.UserMapper;
 import com.tastsong.crazycar.model.DataStatisticsModel;
@@ -25,6 +26,9 @@ public class BackgroundDashboardService {
     @Autowired
     private TimeTrialMapper timeTrialMapper;
 
+    @Autowired
+    private MatchMapper matchMapper;
+
     public Integer getUserNum(){
         return userMapper.getAllUserNum();
     }
@@ -48,4 +52,8 @@ public List<DataStatisticsModel> getUserLoginData(Integer offsetTime){
     public List<DataStatisticsModel> getTimeTrialData(Integer offsetTime){
         return timeTrialMapper.getTimeTrialData(offsetTime);
     }
+
+    public List<DataStatisticsModel> getMatchData(Integer offsetTime){
+        return matchMapper.getMatchData(offsetTime);
+    }
 }
diff --git a/CarzyCarServer/src/main/resources/mapper/MatchMapper.xml b/CarzyCarServer/src/main/resources/mapper/MatchMapper.xml
@@ -79,4 +79,12 @@
                 (select @rownum:= 0) r
         ) as history_rank where rownum = 1 and complete_time != -1;
     </select>
+
+    <select id="getMatchData" parameterType="Integer" resultType="DataStatisticsModel">
+        select COUNT(*) as count, record_time as timestamp
+        from match_record 
+        where record_time > (unix_timestamp(CAST(SYSDATE()AS DATE)) - 60 * 60 * 24 * ${offsetTime}) 
+        group by FROM_UNIXTIME(record_time, '%y-%m-%d') 
+        order by record_time limit ${offsetTime};
+    </select>
 </mapper>
diff --git a/CrazyCarBackground/src/views/dashboard/index.vue b/CrazyCarBackground/src/views/dashboard/index.vue
@@ -78,7 +78,7 @@ export default {
         var match_actualData = []
         var match_x
         for (match_x in match_num) {
-          var match_time = new Date(match_num[match_x].timestamp)
+          var match_time = new Date(match_num[match_x].timestamp * 1000)
           match_date.push(match_time.getMonth() + '.' + match_time.getDay())
           match_actualData.push(match_num[match_x].count)
         }
diff --git a/CrazyCarDB/CrazyCar.sql b/CrazyCarDB/CrazyCar.sql
@@ -524,9 +524,15 @@ insert into match_record ( uid, cid, complete_time, record_time)
 				   (3, 1, 10, 1629544644);
 insert into match_record ( uid, cid, complete_time, record_time)
 				   values
-				   (4, 1, 16, 1629544644);
+				   (4, 1, 16, 1658476385);
 select record_time from match_record where uid = 1 ;	
 
+select COUNT(*) as count, record_time as timestamp
+from match_record 
+where record_time > (unix_timestamp(CAST(SYSDATE()AS DATE)) - 60 * 60 * 24 * 2) 
+group by FROM_UNIXTIME(record_time, '%y-%m-%d') 
+order by record_time limit 2;
+
 drop table if exists match_rank_0;
 create table  match_rank_0 as
 select * from  (select user_rank.*, @rank_num  := @rank_num  + 1 as rank_num

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ export default {`
`78`	`78`	`var match_actualData = []`
`79`	`79`	`var match_x`
`80`	`80`	`for (match_x in match_num) {`
`81`		`- var match_time = new Date(match_num[match_x].timestamp)`
	`81`	`+ var match_time = new Date(match_num[match_x].timestamp * 1000)`
`82`	`82`	`match_date.push(match_time.getMonth() + '.' + match_time.getDay())`
`83`	`83`	`match_actualData.push(match_num[match_x].count)`
`84`	`84`	`}`