time trial rank

TastSong · TastSong · commit eabd09a569b4 · 2022-07-01T09:24:20.000+08:00
diff --git a/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/controller/TimeTrialController.java b/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/controller/TimeTrialController.java
@@ -22,7 +22,6 @@ public class TimeTrialController {
     @PostMapping(value = "/Rank")
     public Object getRank(@RequestBody JSONObject body) throws Exception{
         Integer cid = body.getInt("cid");
-        timeTrialService.initRank(cid);
-        return Result.success();
+        return timeTrialService.getRankList(cid);
     }
 }
diff --git a/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/mapper/TimeTrialMapper.java b/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/mapper/TimeTrialMapper.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import com.tastsong.crazycar.model.TimeTrialRankModel;
 import com.tastsong.crazycar.model.TimeTrialRecordModel;
 
 public interface TimeTrialMapper {
@@ -11,4 +12,5 @@ public interface TimeTrialMapper {
     public Integer addTimeTrialMapForUser(Integer uid, Integer cid);
     public Integer initTimeTrialRank(Integer cid);
     public Integer delTimeTrialRank(Integer cid);
+    public List<TimeTrialRankModel> getTimeTrialRank(Integer cid);
 }
diff --git a/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/model/TimeTrialRankModel.java b/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/model/TimeTrialRankModel.java
@@ -0,0 +1,9 @@
+package com.tastsong.crazycar.model;
+
+public class TimeTrialRankModel {
+    public Integer uid;
+    public Integer aid;
+    public Integer rank_num;
+    public Integer complete_time;
+    public String user_name;
+}
diff --git a/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/service/TimeTrialService.java b/CarzyCarSpringBootServer/src/main/java/com/tastsong/crazycar/service/TimeTrialService.java
@@ -1,17 +1,37 @@
 package com.tastsong.crazycar.service;
 
+import java.util.List;
+
+import javax.print.DocFlavor.INPUT_STREAM;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.tastsong.crazycar.mapper.TimeTrialMapper;
+import com.tastsong.crazycar.mapper.UserMapper;
+import com.tastsong.crazycar.model.TimeTrialRankModel;
 
 @Service
 public class TimeTrialService {
     @Autowired
     private TimeTrialMapper timeTrialMapper;
 
-    public void initRank(Integer cid){
+    @Autowired
+    private UserMapper userMapper;
+
+    private void initRank(Integer cid){
         timeTrialMapper.delTimeTrialRank(cid);
         timeTrialMapper.initTimeTrialRank(cid);
     }
+
+    public List<TimeTrialRankModel> getRankList(Integer cid){
+        initRank(cid);
+        List<TimeTrialRankModel> timeTrialRankModels =  timeTrialMapper.getTimeTrialRank(cid);
+        for (Integer i = 0; i< timeTrialRankModels.size(); i++){
+            Integer uid = timeTrialRankModels.get(i).uid;
+            timeTrialRankModels.get(i).aid = userMapper.getUserByUid(uid).aid;
+            timeTrialRankModels.get(i).user_name = userMapper.getUserByUid(uid).user_name;
+        }
+        return timeTrialRankModels;
+    }
 }
diff --git a/CarzyCarSpringBootServer/src/main/resources/mapper/TimeTrialMapper.xml b/CarzyCarSpringBootServer/src/main/resources/mapper/TimeTrialMapper.xml
@@ -50,4 +50,10 @@
     <update id="delTimeTrialRank">  
         drop table if exists time_trial_rank_${cid};
     </update> 
+
+    <select id="getTimeTrialRank" resultType="TimeTrialRankModel">
+        select
+        *
+        from time_trial_rank_${cid};
+    </select>
 </mapper>
diff --git a/CrazyCar/Assets/Scripts/System/DataParseSystem.cs b/CrazyCar/Assets/Scripts/System/DataParseSystem.cs
@@ -117,10 +117,10 @@ public void ParseTimeTrialRank(JsonData jsonData, Action success = null) {
         timeTrialModel.TimeTrialRankList.Clear();
         for (int i = 0; i < jsonData.Count; i++) {
             TimeTrialRankInfo info = new TimeTrialRankInfo();
-            info.name = (string)jsonData[i]["name"];
+            info.name = (string)jsonData[i]["user_name"];
             info.aid = (int)jsonData[i]["aid"];
             info.completeTime = (int)jsonData[i]["complete_time"];
-            info.rank = (int)jsonData[i]["rank"];
+            info.rank = (int)jsonData[i]["rank_num"];
             timeTrialModel.TimeTrialRankList.Add(info);
         }
         success?.Invoke();
diff --git a/CrazyCar/Assets/Scripts/Utility/PathRecorderUtility.cs b/CrazyCar/Assets/Scripts/Utility/PathRecorderUtility.cs
@@ -11,10 +11,10 @@ public static class RequestUrl {
     public static string avatarUrl = "v2/Avatar/Detail";
     public static string changeAvatarUrl = "v2/Avatar/Change";
     public static string buyAvatarUrl = "v2/Avatar/Buy";
-    public static string timeTrialDetailUrl = "v2/TimeTrialDetail";
-    public static string buyTimeTrialClassUrl = "v2/BuyTimeTrialClass";
-    public static string timeTrialResultUrl = "v2/TimeTrialResult";
-    public static string timeTrialRankUrl = "v2/TimeTrialRank";
+    public static string timeTrialDetailUrl = "v2/TimeTrial/Detail";
+    public static string buyTimeTrialClassUrl = "v2/TimeTrial/BuyClass";
+    public static string timeTrialResultUrl = "v2/TimeTrial/Result";
+    public static string timeTrialRankUrl = "v2/TimeTrial/Rank";
     public static string modifyPersonalInfoUrl = "v2/UserInfo/ModifyPassword";
     public static string equipUrl = "v2/Equip/Detail";
     public static string buyEquipUrl = "v2/Equip/Buy";

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ public class TimeTrialController {`
`22`	`22`	`@PostMapping(value = "/Rank")`
`23`	`23`	`public Object getRank(@RequestBody JSONObject body) throws Exception{`
`24`	`24`	`Integer cid = body.getInt("cid");`
`25`		`- timeTrialService.initRank(cid);`
`26`		`- return Result.success();`
	`25`	`+ return timeTrialService.getRankList(cid);`
`27`	`26`	`}`
`28`	`27`	`}`