diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerConfigController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerConfigController.java index dd12723..112bea6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerConfigController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerConfigController.java @@ -4,14 +4,7 @@ import com.ruoyi.common.select.SelectItem; import java.util.List; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -82,7 +75,15 @@ public class DmPlayerConfigController extends BaseController { return AjaxResult.success(dmPlayerConfigService.selectDmPlayerConfigById(id)); } - + /** + * 获取玩家配置详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:dmplayerconfig:query-by-player-id')") + @GetMapping(value = "/query-by-player-id") + public AjaxResult getInfoByPlayerId(@RequestParam("id") Long id) + { + return AjaxResult.success(dmPlayerConfigService.selectDmPlayerConfigByPlayerId(id)); + } /** * 新增玩家配置 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerConfig.java index 465402d..032c82f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerConfig.java @@ -29,7 +29,8 @@ public class DmPlayerConfig extends BaseEntity /** 喊话蓝量 */ @Excel(name = "喊话蓝量") private Integer shoutMana; - + @Excel(name = "喊话编码 对应按键值表") + private Integer shoutKey; /** 是否自动加蓝 */ @Excel(name = "是否自动加蓝") private Integer autoAddMana; @@ -145,6 +146,14 @@ public class DmPlayerConfig extends BaseEntity return fixedDirection; } + public Integer getShoutKey() { + return shoutKey; + } + + public void setShoutKey(Integer shoutKey) { + this.shoutKey = shoutKey; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerConfigMapper.java index 1c7a49e..cddd014 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerConfigMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerConfigMapper.java @@ -23,6 +23,8 @@ public interface DmPlayerConfigMapper extends BaseMapper */ public DmPlayerConfig selectDmPlayerConfigById(Long id); + + public DmPlayerConfig selectDmPlayerConfigByPlayerId(Long playerId); /** * 查询玩家配置列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerConfigService.java index 9f66abb..e39f71c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerConfigService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerConfigService.java @@ -32,6 +32,8 @@ public interface IDmPlayerConfigService extends IService */ public List selectDmPlayerConfigList(DmPlayerConfig dmPlayerConfig); + + public DmPlayerConfig selectDmPlayerConfigByPlayerId(Long playerId); /** * 新增玩家配置 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerConfigServiceImpl.java index 811bf18..f3f59fd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerConfigServiceImpl.java @@ -7,14 +7,11 @@ import com.github.pagehelper.PageHelper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; +import java.util.*; import com.luqj.util.HttpHelper; import com.ruoyi.common.utils.StringUtils; import com.alibaba.fastjson.JSONArray; -import java.util.List; -import java.util.Map; import com.ruoyi.common.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -165,6 +162,29 @@ public class DmPlayerConfigServiceImpl extends ServiceImpl + - select id, player_id, create_time, update_time, shout_interval, shout_mana, auto_add_mana, add_mana_threshold, yolo_height, yolo_width, custom_params, fixed_direction from dm_player_config + select id, player_id, create_time,shout_key, update_time, shout_interval, shout_mana, auto_add_mana, add_mana_threshold, yolo_height, yolo_width, custom_params, fixed_direction from dm_player_config - + insert into dm_player_config