From ccba1fcab18c85379a3dc59875e36fa4a0188d28 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Fri, 26 Apr 2019 19:38:58 +0200 Subject: [PATCH] Fixed RankingPoints Vue --- build.gradle | 2 +- .../labsw/bugageocaching/controller/Controller.java | 3 ++- .../bugageocaching/helper/RankingListHelper.java | 13 +++++++++---- .../bugageocaching/repositories/UserRepository.java | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 90a4591..e1cfe7a 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ dependencies { compile 'org.springframework.boot:spring-boot-starter-tomcat' //compile 'org.springframework.boot:spring-boot-starter-security' - //compile 'org.springframework.boot:spring-boot-starter-actuator' + compile 'org.springframework.boot:spring-boot-starter-actuator' //compile 'org.springframework.boot:spring-boot-starter-aop' //ompile group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '1.2.0.RELEASE' diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index 06702d4..493d66a 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -389,7 +389,8 @@ public class Controller { List sendBackUsers = new LinkedList<>(); List rankingUsers = userRepository.getRankingList(); for (Object[] obj : rankingUsers) { - RankingListHelper tmp = new RankingListHelper((String) obj[1], (int) obj[2]); + RankingListHelper tmp = new RankingListHelper((String) obj[1], (Integer) obj[2]); + System.out.println(tmp); sendBackUsers.add(tmp); } return ResponseEntity.status(200).body(new Gson().toJson(sendBackUsers)); diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java b/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java index 13f474a..9e3b2b2 100644 --- a/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java +++ b/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java @@ -3,11 +3,11 @@ package hhn.labsw.bugageocaching.helper; public class RankingListHelper { private String username; - private int ranking_Points; + private int rankingPointsSum; public RankingListHelper(String username, int ranking_Points) { this.username = username; - this.ranking_Points = ranking_Points; + this.rankingPointsSum = ranking_Points; } public String getUsername() { @@ -19,10 +19,15 @@ public class RankingListHelper { } public int getRanking_Points() { - return ranking_Points; + return rankingPointsSum; } public void setRanking_Points(int ranking_Points) { - this.ranking_Points = ranking_Points; + this.rankingPointsSum = ranking_Points; + } + + @Override + public String toString() { + return "( " + username + " | " + rankingPointsSum + " )"; } } diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java index b09f2a9..7820046 100644 --- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java +++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java @@ -16,7 +16,7 @@ public interface UserRepository extends CrudRepository { "WHERE u.id = ui.user_id\n" + "AND u.id = ur.user_id\n" + "order by ranking_points_sum DESC\n" + - "LIMIT 100;", nativeQuery = true) + "LIMIT 10;", nativeQuery = true) List getRankingList(); @Query(value = "SELECT Rang\n" +