diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java index cd7bbe43..f61f0e07 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java @@ -12,6 +12,7 @@ import cn.jisol.game.entity.game.PlayerPet; import cn.jisol.game.entity.game.Resource; import cn.jisol.game.entity.mode.ModeOnHook; import cn.jisol.game.entity.mode.ModeOnHookInfo; +import cn.jisol.game.mapper.ModeOnHookMapper; import cn.jisol.game.proto.GOnHookMessage; import cn.jisol.game.service.ModeOnHookService; import cn.jisol.game.service.PlayerPetService; @@ -20,6 +21,7 @@ import cn.jisol.game.table.GTbGOnHookLevels; import cn.jisol.game.vo.news.NewsResource; import cn.jisol.game.vo.news.ov.ResourceUpdateOV; import cn.jisol.ngame.util.NewsContext; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -46,6 +48,8 @@ public class GOnHookController { ResourceService resourceService; @Autowired ModeOnHookService modeOnHookService; + @Autowired + ModeOnHookMapper modeOnHookMapper; //生成的野怪列表 public static Map> CREEPS = new HashMap<>(); @@ -252,4 +256,14 @@ public class GOnHookController { } + //排行榜 + @ApiImplicitParams({}) + @ApiOperation(value = "排行榜") + @GetMapping("/onRankings/{mapId}") + public NewsContext> onRankings(@PathVariable Integer mapId){ + + return NewsContext.onSuccess("查询成功",this.modeOnHookMapper.onRankings(mapId.toString())); + + } + } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHook.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHook.java index 9e8bafeb..82c47ffc 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHook.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/mode/ModeOnHook.java @@ -5,10 +5,12 @@ import cn.hutool.json.JSONUtil; import cn.jisol.game.data.TD; import cn.jisol.game.table.GTbGOnHookLevels; import cn.jisol.game.table.TableUtil; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -50,6 +52,7 @@ public class ModeOnHook { } //获取当前地图类 + @JsonIgnore public GTbGOnHookLevels getGTbGOnHookLevels(){ String sign = TD.DATA.getTbGOnHookMaps().get(this.getOnHookMap()).sign; return new GTbGOnHookLevels(TableUtil.getTDObject(sign)); diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/mapper/ModeOnHookMapper.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/mapper/ModeOnHookMapper.java index 10ca89d7..1bff7de3 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/mapper/ModeOnHookMapper.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/mapper/ModeOnHookMapper.java @@ -3,9 +3,17 @@ package cn.jisol.game.mapper; import cn.jisol.game.entity.game.Player; import cn.jisol.game.entity.mode.ModeOnHook; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Component; +import java.util.List; + @Component public interface ModeOnHookMapper extends BaseMapper { + //排行榜 + @Select("SELECT * FROM mode_on_hook ORDER BY JSON_EXTRACT(on_hook_info, CONCAT('$.maps.\"',#{mapId},'\"')) DESC LIMIT 10;") + List onRankings(@Param("mapId") String mapId); + } \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/application.yml b/JisolGameServer/Main/src/main/resources/application.yml index 364ad07d..9e0d9877 100644 --- a/JisolGameServer/Main/src/main/resources/application.yml +++ b/JisolGameServer/Main/src/main/resources/application.yml @@ -4,8 +4,8 @@ spring: datasource: username: pet_jisol_cn password: sThsBwjfDcaw2wJR -# url: jdbc:mysql://kyu.jisol.cn:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 - url: jdbc:mysql://localhost:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://kyu.jisol.cn:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 +# url: jdbc:mysql://localhost:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 driver-class-name: com.mysql.cj.jdbc.Driver jackson: serialization: