From b8cea4af69eaf9399c2f91ba4be23fe4c5aad642 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Wed, 6 May 2026 09:38:05 -0400 Subject: [PATCH 01/24] 123 --- .../com/ruoyi/system/domain/DmOperateVo.java | 2 ++ .../service/impl/DmPlayerentServiceImpl.java | 34 +++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmOperateVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmOperateVo.java index 914f7fc..ff4cc86 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmOperateVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmOperateVo.java @@ -12,4 +12,6 @@ public class DmOperateVo implements Serializable { private String winId; private Integer operateType; private Integer type; + private Integer x; + private Integer y; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index ccfc7e1..833a827 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -179,34 +179,38 @@ public class DmPlayerentServiceImpl extends ServiceImpl(),new HashMap<>()); + params.put("winId", vo.getWinId()); + params.put("playerId", vo.getPlayerId()); + String result = httpHelper.getlHttpResult("http://" + this.serverIp + ":" + serverPort + "?cmd=6¶ms=" + URLEncoder.encode(JSONObject.toJSONString(params), "utf-8") + , "get", new HashMap<>(), new HashMap<>()); JSONObject jsonObject = JSONObject.parseObject(result); - if(jsonObject.getString("code").equals("1")){ + if (jsonObject.getString("code").equals("1")) { return true; } System.out.println(result); } catch (Exception e) { throw new RuntimeException(e); } - }else if(vo.getAction() == 6){ + } else if (vo.getAction() == 6) { try { - params.put("winId",vo.getWinId()); - params.put("playerId",vo.getPlayerId()); - params.put("operateType",vo.getOperateType()); - params.put("type",vo.getType()); - String result = httpHelper.getlHttpResult("http://"+ this.serverIp +":"+serverPort+ "?cmd=7¶ms="+ URLEncoder.encode(JSONObject.toJSONString(params),"utf-8") - ,"get",new HashMap<>(),new HashMap<>()); + params.put("winId", vo.getWinId()); + params.put("playerId", vo.getPlayerId()); + params.put("operateType", vo.getOperateType()); + params.put("type", vo.getType()); + String result = httpHelper.getlHttpResult("http://" + this.serverIp + ":" + serverPort + "?cmd=7¶ms=" + URLEncoder.encode(JSONObject.toJSONString(params), "utf-8") + , "get", new HashMap<>(), new HashMap<>()); JSONObject jsonObject = JSONObject.parseObject(result); - if(jsonObject.getString("code").equals("1")){ + if (jsonObject.getString("code").equals("1")) { return true; } System.out.println(result); From d4b1bc60b16b81ed6ea36876a5d9f3c5ded938cc Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Sat, 9 May 2026 23:56:16 -0400 Subject: [PATCH 02/24] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/service/impl/DmPlayerentServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index 833a827..edc8f64 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -179,6 +179,13 @@ public class DmPlayerentServiceImpl extends ServiceImpl Date: Sun, 10 May 2026 04:52:50 -0400 Subject: [PATCH 03/24] 123 --- .../controller/DmPlayerConfigController.java | 118 +++++++++ .../ruoyi/system/domain/DmPlayerConfig.java | 165 ++++++++++++ .../system/domain/DmPlayerConfigPlus.java | 203 +++++++++++++++ .../system/mapper/DmPlayerConfigMapper.java | 65 +++++ .../service/IDmPlayerConfigService.java | 91 +++++++ .../impl/DmPlayerConfigServiceImpl.java | 245 ++++++++++++++++++ .../service/impl/DmPlayerentServiceImpl.java | 47 +++- .../mapper/system/DmPlayerConfigMapper.xml | 97 +++++++ 8 files changed, 1024 insertions(+), 7 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerConfigController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerConfig.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerConfigPlus.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerConfigMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerConfigService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerConfigServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/DmPlayerConfigMapper.xml 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 new file mode 100644 index 0000000..dd12723 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerConfigController.java @@ -0,0 +1,118 @@ +package com.ruoyi.system.controller; +import com.ruoyi.common.select.Ids; +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 com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.DmPlayerConfig; +import com.ruoyi.system.domain.DmPlayerConfigPlus; +import com.ruoyi.system.service.IDmPlayerConfigService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 玩家配置Controller + * + * @author luqj + * @date 2026-05-10 + */ +@RestController +@RequestMapping("/system/dmplayerconfig") +public class DmPlayerConfigController extends BaseController +{ + @Autowired + private IDmPlayerConfigService dmPlayerConfigService; + @PreAuthorize("@ss.hasPermi('system:dmplayerconfig:getByIds')") + @PostMapping("/getByIds") + public AjaxResult getByIds(@RequestBody Ids ids) + { + List list = dmPlayerConfigService.getByIds(ids.getLongIds(),DmPlayerConfigPlus::getPlayerId,DmPlayerConfigPlus::getId); + return AjaxResult.success(list); + } + @PreAuthorize("@ss.hasPermi('system:dmplayerconfig:select')") + @GetMapping("/select") + public AjaxResult select(String keyword) + { + List list = dmPlayerConfigService.select(keyword); + return AjaxResult.success(list); + } + /** + * 查询玩家配置列表 + */ + @PreAuthorize("@ss.hasPermi('system:dmplayerconfig:list')") + @GetMapping("/list") + public TableDataInfo list(DmPlayerConfig dmPlayerConfig) + { + startPage(); + List list = dmPlayerConfigService.selectDmPlayerConfigList(dmPlayerConfig); + return getDataTable(list); + } + + /** + * 导出玩家配置列表 + */ + @PreAuthorize("@ss.hasPermi('system:dmplayerconfig:export')") + @Log(title = "玩家配置", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(DmPlayerConfig dmPlayerConfig) + { + List list = dmPlayerConfigService.selectDmPlayerConfigList(dmPlayerConfig); + ExcelUtil util = new ExcelUtil(DmPlayerConfig.class); + return util.exportExcel(list, "dmplayerconfig"); + } + + /** + * 获取玩家配置详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:dmplayerconfig:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(dmPlayerConfigService.selectDmPlayerConfigById(id)); + } + + /** + * 新增玩家配置 + */ + @PreAuthorize("@ss.hasPermi('system:dmplayerconfig:add')") + @Log(title = "玩家配置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmPlayerConfig dmPlayerConfig) + { + return toAjax(dmPlayerConfigService.insertDmPlayerConfig(dmPlayerConfig)); + } + + /** + * 修改玩家配置 + */ + @PreAuthorize("@ss.hasPermi('system:dmplayerconfig:edit')") + @Log(title = "玩家配置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmPlayerConfig dmPlayerConfig) + { + return toAjax(dmPlayerConfigService.updateDmPlayerConfig(dmPlayerConfig)); + } + + /** + * 删除玩家配置 + */ + @PreAuthorize("@ss.hasPermi('system:dmplayerconfig:remove')") + @Log(title = "玩家配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dmPlayerConfigService.deleteDmPlayerConfigByIds(ids)); + } +} 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 new file mode 100644 index 0000000..465402d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerConfig.java @@ -0,0 +1,165 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +/** + * 玩家配置对象 dm_player_config + * + * @author luqj + * @date 2026-05-10 + */ +public class DmPlayerConfig extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 玩家ID */ + @Excel(name = "玩家ID") + private Long playerId; + + /** 喊话间隔 */ + @Excel(name = "喊话间隔") + private Integer shoutInterval; + + /** 喊话蓝量 */ + @Excel(name = "喊话蓝量") + private Integer shoutMana; + + /** 是否自动加蓝 */ + @Excel(name = "是否自动加蓝") + private Integer autoAddMana; + + /** 加蓝阈值 */ + @Excel(name = "加蓝阈值") + private Integer addManaThreshold; + + /** 识别高度 */ + @Excel(name = "识别高度") + private Integer yoloHeight; + + /** 识别宽度 */ + @Excel(name = "识别宽度") + private Integer yoloWidth; + + /** 自定义参数 */ + @Excel(name = "自定义参数") + private String customParams; + + /** 固定方位 */ + @Excel(name = "固定方位") + private Integer fixedDirection; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setPlayerId(Long playerId) + { + this.playerId = playerId; + } + + public Long getPlayerId() + { + return playerId; + } + public void setShoutInterval(Integer shoutInterval) + { + this.shoutInterval = shoutInterval; + } + + public Integer getShoutInterval() + { + return shoutInterval; + } + public void setShoutMana(Integer shoutMana) + { + this.shoutMana = shoutMana; + } + + public Integer getShoutMana() + { + return shoutMana; + } + public void setAutoAddMana(Integer autoAddMana) + { + this.autoAddMana = autoAddMana; + } + + public Integer getAutoAddMana() + { + return autoAddMana; + } + public void setAddManaThreshold(Integer addManaThreshold) + { + this.addManaThreshold = addManaThreshold; + } + + public Integer getAddManaThreshold() + { + return addManaThreshold; + } + public void setYoloHeight(Integer yoloHeight) + { + this.yoloHeight = yoloHeight; + } + + public Integer getYoloHeight() + { + return yoloHeight; + } + public void setYoloWidth(Integer yoloWidth) + { + this.yoloWidth = yoloWidth; + } + + public Integer getYoloWidth() + { + return yoloWidth; + } + public void setCustomParams(String customParams) + { + this.customParams = customParams; + } + + public String getCustomParams() + { + return customParams; + } + public void setFixedDirection(Integer fixedDirection) + { + this.fixedDirection = fixedDirection; + } + + public Integer getFixedDirection() + { + return fixedDirection; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("playerId", getPlayerId()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("shoutInterval", getShoutInterval()) + .append("shoutMana", getShoutMana()) + .append("autoAddMana", getAutoAddMana()) + .append("addManaThreshold", getAddManaThreshold()) + .append("yoloHeight", getYoloHeight()) + .append("yoloWidth", getYoloWidth()) + .append("customParams", getCustomParams()) + .append("fixedDirection", getFixedDirection()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerConfigPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerConfigPlus.java new file mode 100644 index 0000000..511e943 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerConfigPlus.java @@ -0,0 +1,203 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; +/** + * 玩家配置对象 dm_player_config + * + * @author luqj + * @date 2026-05-10 + */ +@TableName(value = "dm_player_config") +public class DmPlayerConfigPlus implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + /** 玩家ID */ + @Excel(name = "玩家ID") + private Long playerId; + /** 创建时间 */ + private Date createTime; + /** 更新时间 */ + private Date updateTime; + /** 喊话间隔 */ + @Excel(name = "喊话间隔") + private Integer shoutInterval; + /** 喊话蓝量 */ + @Excel(name = "喊话蓝量") + private Integer shoutMana; + /** 是否自动加蓝 */ + @Excel(name = "是否自动加蓝") + private Integer autoAddMana; + /** 加蓝阈值 */ + @Excel(name = "加蓝阈值") + private Integer addManaThreshold; + /** 识别高度 */ + @Excel(name = "识别高度") + private Integer yoloHeight; + /** 识别宽度 */ + @Excel(name = "识别宽度") + private Integer yoloWidth; + /** 自定义参数 */ + @Excel(name = "自定义参数") + private String customParams; + /** 固定方位 + * + * + * + * + * + * + * + * + * + * + * + * */ + @Excel(name = "固定方位") + private Integer fixedDirection; + @Excel(name = "喊话编码 对应按键值表") + private Integer shoutKey; + + public Integer getShoutKey() { + return shoutKey; + } + + public void setShoutKey(Integer shoutKey) { + this.shoutKey = shoutKey; + } + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setPlayerId(Long playerId) + { + this.playerId = playerId; + } + + public Long getPlayerId() + { + return playerId; + } + public void setCreateTime(Date createTime) + { + this.createTime = createTime; + } + + public Date getCreateTime() + { + return createTime; + } + public void setUpdateTime(Date updateTime) + { + this.updateTime = updateTime; + } + + public Date getUpdateTime() + { + return updateTime; + } + public void setShoutInterval(Integer shoutInterval) + { + this.shoutInterval = shoutInterval; + } + + public Integer getShoutInterval() + { + return shoutInterval; + } + public void setShoutMana(Integer shoutMana) + { + this.shoutMana = shoutMana; + } + + public Integer getShoutMana() + { + return shoutMana; + } + public void setAutoAddMana(Integer autoAddMana) + { + this.autoAddMana = autoAddMana; + } + + public Integer getAutoAddMana() + { + return autoAddMana; + } + public void setAddManaThreshold(Integer addManaThreshold) + { + this.addManaThreshold = addManaThreshold; + } + + public Integer getAddManaThreshold() + { + return addManaThreshold; + } + public void setYoloHeight(Integer yoloHeight) + { + this.yoloHeight = yoloHeight; + } + + public Integer getYoloHeight() + { + return yoloHeight; + } + public void setYoloWidth(Integer yoloWidth) + { + this.yoloWidth = yoloWidth; + } + + public Integer getYoloWidth() + { + return yoloWidth; + } + public void setCustomParams(String customParams) + { + this.customParams = customParams; + } + + public String getCustomParams() + { + return customParams; + } + public void setFixedDirection(Integer fixedDirection) + { + this.fixedDirection = fixedDirection; + } + + public Integer getFixedDirection() + { + return fixedDirection; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("playerId", getPlayerId()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("shoutInterval", getShoutInterval()) + .append("shoutMana", getShoutMana()) + .append("autoAddMana", getAutoAddMana()) + .append("addManaThreshold", getAddManaThreshold()) + .append("yoloHeight", getYoloHeight()) + .append("yoloWidth", getYoloWidth()) + .append("customParams", getCustomParams()) + .append("fixedDirection", getFixedDirection()) + .toString(); + } +} 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 new file mode 100644 index 0000000..1c7a49e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerConfigMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.system.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.system.domain.DmPlayerConfig; +import com.ruoyi.system.domain.DmPlayerConfigPlus; + +/** + * 玩家配置Mapper接口 + * + * @author luqj + * @date 2026-05-10 + */ +public interface DmPlayerConfigMapper extends BaseMapper +{ + /** + * 查询玩家配置 + * + * @param id 玩家配置ID + * @return 玩家配置 + */ + public DmPlayerConfig selectDmPlayerConfigById(Long id); + + /** + * 查询玩家配置列表 + * + * @param dmPlayerConfig 玩家配置 + * @return 玩家配置集合 + */ + public List selectDmPlayerConfigList(DmPlayerConfig dmPlayerConfig); + + /** + * 新增玩家配置 + * + * @param dmPlayerConfig 玩家配置 + * @return 结果 + */ + public int insertDmPlayerConfig(DmPlayerConfig dmPlayerConfig); + + /** + * 修改玩家配置 + * + * @param dmPlayerConfig 玩家配置 + * @return 结果 + */ + public int updateDmPlayerConfig(DmPlayerConfig dmPlayerConfig); + + /** + * 删除玩家配置 + * + * @param id 玩家配置ID + * @return 结果 + */ + public int deleteDmPlayerConfigById(Long id); + + /** + * 批量删除玩家配置 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteDmPlayerConfigByIds(Long[] ids); +} 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 new file mode 100644 index 0000000..9f66abb --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerConfigService.java @@ -0,0 +1,91 @@ +package com.ruoyi.system.service; +import java.util.Map; +import java.util.List; +import com.ruoyi.system.domain.DmPlayerConfig; +import com.ruoyi.system.domain.DmPlayerConfigPlus; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.ruoyi.common.select.SelectItem; +/** + * 玩家配置Service接口 + * + * @author luqj + * @date 2026-05-10 + */ +public interface IDmPlayerConfigService extends IService +{ + + List select(String keyword); + /** + * 查询玩家配置 + * + * @param id 玩家配置ID + * @return 玩家配置 + */ + public DmPlayerConfig selectDmPlayerConfigById(Long id); + + /** + * 查询玩家配置列表 + * + * @param dmPlayerConfig 玩家配置 + * @return 玩家配置集合 + */ + public List selectDmPlayerConfigList(DmPlayerConfig dmPlayerConfig); + + /** + * 新增玩家配置 + * + * @param dmPlayerConfig 玩家配置 + * @return 结果 + */ + public int insertDmPlayerConfig(DmPlayerConfig dmPlayerConfig); + + /** + * 修改玩家配置 + * + * @param dmPlayerConfig 玩家配置 + * @return 结果 + */ + public int updateDmPlayerConfig(DmPlayerConfig dmPlayerConfig); + + /** + * 批量删除玩家配置 + * + * @param ids 需要删除的玩家配置ID + * @return 结果 + */ + public int deleteDmPlayerConfigByIds(Long[] ids); + + /** + * 删除玩家配置信息 + * + * @param id 玩家配置ID + * @return 结果 + */ + public int deleteDmPlayerConfigById(Long id); + + List getByIds(List ids, SFunction... columns); + + DmPlayerConfigPlus getById(Long id, SFunction... columns); + + Map getMapByIds(List ids, SFunction... columns); + + List getByIds(List ids); + + Map getMapByIds(List ids); + + + Map getMapByPlayerIds(List ids); + /** + * @param field sum 字段 + * @param where 条件 + * @param tClass 返回类型 + * @param + * @return + */ + T sum(String field, String where, Class tClass); + + Long count(String where); + + List countByGroupBy(String select, String where, String groupby, Class tClass); +} 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 new file mode 100644 index 0000000..811bf18 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerConfigServiceImpl.java @@ -0,0 +1,245 @@ +package com.ruoyi.system.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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 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; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.DmPlayerConfigMapper; +import com.ruoyi.system.domain.DmPlayerConfig; +import com.ruoyi.system.domain.DmPlayerConfigPlus; +import com.ruoyi.system.service.IDmPlayerConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import com.ruoyi.common.select.SelectItem; +/** + * 玩家配置Service业务层处理 + * + * @author luqj + * @date 2026-05-10 + */ +@Slf4j +@Service +public class DmPlayerConfigServiceImpl extends ServiceImpl implements IDmPlayerConfigService +{ + @Autowired + private DmPlayerConfigMapper dmPlayerConfigMapper; + @Autowired + private JdbcTemplate jdbcTemplate; + private HttpHelper httpHelper = new HttpHelper(); + @Value("${dm.server.ip:192.168.3.103}") + private String serverIp; + @Value("${dm.server.port:8080}") + private Integer serverPort; + @Override + public List getByIds(List ids, SFunction... columns) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(columns).in(DmPlayerConfigPlus::getId, ids); + return this.list(lambdaQueryWrapper); + } + @Override + public List select(String keyword) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(DmPlayerConfigPlus::getId, DmPlayerConfigPlus::getPlayerId) + .like(DmPlayerConfigPlus::getPlayerId, keyword); + List list = this.list(lambdaQueryWrapper); + List result =new ArrayList<>(); + for (DmPlayerConfigPlus item : list){ + SelectItem selectItem = new SelectItem(); + selectItem.setName(item.getPlayerId()+""); + selectItem.setId(item.getId()); + result.add(selectItem); + } + return result; + } + @Override + public DmPlayerConfigPlus getById(Long id, SFunction... columns) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(columns).eq(DmPlayerConfigPlus::getId, id); + return baseMapper.selectOne(lambdaQueryWrapper); + } + + @Override + public Map getMapByIds(List ids, SFunction... columns) { + List list = this.getByIds(ids, columns); + Map map = new HashMap<>(); + for (DmPlayerConfigPlus item : list) { + map.put(item.getId(), item); + } + return map; + } + + @Override + public Map getMapByIds(List ids) { + List list = this.getByIds(ids); + Map map = new HashMap<>(); + for (DmPlayerConfigPlus item : list) { + map.put(item.getId(), item); + } + return map; + } + + @Override + public Map getMapByPlayerIds(List ids) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .in(DmPlayerConfigPlus::getPlayerId, ids); + List list = this.list(lambdaQueryWrapper); + Map map = new HashMap<>(); + for (DmPlayerConfigPlus item : list) { + map.put(item.getId(), item); + } + return map; + } + @Override + public List getByIds(List ids) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper().in(DmPlayerConfigPlus::getId, ids); + return this.list(lambdaQueryWrapper); + } + + public T sum(String field, String where, Class tClass) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(" sum(" + field + ") as total "); + stringBuffer.append(" from dm_player_config "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + T result = jdbcTemplate.queryForObject(stringBuffer.toString(), tClass); + return result; + } + + public Long count(String where) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(" count(1)"); + stringBuffer.append(" from "); + stringBuffer.append(" dm_player_config "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + Long result = jdbcTemplate.queryForObject(stringBuffer.toString(), Long.class); + return result; + } + + public List countByGroupBy(String select, String where, String groupby, Class tClass) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(select); + stringBuffer.append(" from "); + stringBuffer.append(" dm_player_config "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + stringBuffer.append(" group by "); + stringBuffer.append(groupby); + List result = jdbcTemplate.queryForList(stringBuffer.toString()); + List tList = JSONArray.parseArray(JSONArray.toJSONString(result), tClass); + return tList; + } + /** + * 查询玩家配置 + * + * @param id 玩家配置ID + * @return 玩家配置 + */ + @Override + public DmPlayerConfig selectDmPlayerConfigById(Long id) + { + return dmPlayerConfigMapper.selectDmPlayerConfigById(id); + } + + /** + * 查询玩家配置列表 + * + * @param dmPlayerConfig 玩家配置 + * @return 玩家配置 + */ + @Override + public List selectDmPlayerConfigList(DmPlayerConfig dmPlayerConfig) + { + return dmPlayerConfigMapper.selectDmPlayerConfigList(dmPlayerConfig); + } + + /** + * 新增玩家配置 + * + * @param dmPlayerConfig 玩家配置 + * @return 结果 + */ + @Override + public int insertDmPlayerConfig(DmPlayerConfig dmPlayerConfig) + { + dmPlayerConfig.setCreateTime(DateUtils.getNowDate()); + return dmPlayerConfigMapper.insertDmPlayerConfig(dmPlayerConfig); + } + + /** + * 修改玩家配置 + * + * @param dmPlayerConfig 玩家配置 + * @return 结果 + */ + @Override + public int updateDmPlayerConfig(DmPlayerConfig dmPlayerConfig) + { + dmPlayerConfig.setUpdateTime(DateUtils.getNowDate()); + int resutl= dmPlayerConfigMapper.updateDmPlayerConfig(dmPlayerConfig); + if(resutl > 0){ + try { + String result = httpHelper.getlHttpResult("http://" + this.serverIp + ":" + serverPort + "?cmd=8¶ms=" + URLEncoder.encode(JSONObject.toJSONString(dmPlayerConfig), "utf-8") + , "get", new HashMap<>(), new HashMap<>()); + JSONObject jsonObject = JSONObject.parseObject(result); + if (jsonObject.getString("code").equals("1")) { + log.info("配置同步成功"); + }else{ + log.error("配置同步失败"); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + return resutl; + } + + /** + * 批量删除玩家配置 + * + * @param ids 需要删除的玩家配置ID + * @return 结果 + */ + @Override + public int deleteDmPlayerConfigByIds(Long[] ids) + { + return dmPlayerConfigMapper.deleteDmPlayerConfigByIds(ids); + } + + /** + * 删除玩家配置信息 + * + * @param id 玩家配置ID + * @return 结果 + */ + @Override + public int deleteDmPlayerConfigById(Long id) + { + return dmPlayerConfigMapper.deleteDmPlayerConfigById(id); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index edc8f64..c2d9a3c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -10,20 +10,20 @@ import com.ruoyi.common.select.SelectItem; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.DmOperateVo; +import com.ruoyi.system.domain.DmPlayerConfigPlus; import com.ruoyi.system.domain.DmPlayerent; import com.ruoyi.system.domain.DmPlayerentPlus; import com.ruoyi.system.mapper.DmPlayerentMapper; +import com.ruoyi.system.service.IDmPlayerConfigService; import com.ruoyi.system.service.IDmPlayerentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 大漠代理Service业务层处理 @@ -36,6 +36,9 @@ public class DmPlayerentServiceImpl extends ServiceImpl selectDmPlayerentList(DmPlayerent dmPlayerent) { - return dmPlayerentMapper.selectDmPlayerentList(dmPlayerent); + List list = dmPlayerentMapper.selectDmPlayerentList(dmPlayerent); + List ids = new ArrayList<>(); + for (DmPlayerent playerent : list) { + ids.add(playerent.getId()); + } + if (!ids.isEmpty()) { + Map map = playerConfigService.getMapByPlayerIds(ids); + List saveList = new ArrayList<>(); + for (DmPlayerent playerent : list) { + if (!map.containsKey(playerent.getId())) { + DmPlayerConfigPlus playerConfigPlus = new DmPlayerConfigPlus(); + playerConfigPlus.setPlayerId(playerent.getId()); + playerConfigPlus.setAutoAddMana(0); + playerConfigPlus.setAddManaThreshold(10); + playerConfigPlus.setCreateTime(new Date()); + playerConfigPlus.setYoloHeight(160); + playerConfigPlus.setYoloWidth(100); + playerConfigPlus.setCustomParams(""); + playerConfigPlus.setUpdateTime(new Date()); + playerConfigPlus.setFixedDirection(0); + playerConfigPlus.setShoutInterval(12000); + playerConfigPlus.setShoutMana(55); + playerConfigPlus.setShoutKey(69); + saveList.add(playerConfigPlus); + } + } + if (!saveList.isEmpty()) { + this.playerConfigService.saveBatch(saveList); + } + } + return list; } /** @@ -180,10 +213,10 @@ public class DmPlayerentServiceImpl 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 + + + + + + + + insert into dm_player_config + + player_id, + create_time, + update_time, + shout_interval, + shout_mana, + auto_add_mana, + add_mana_threshold, + yolo_height, + yolo_width, + custom_params, + fixed_direction, + + + #{playerId}, + #{createTime}, + #{updateTime}, + #{shoutInterval}, + #{shoutMana}, + #{autoAddMana}, + #{addManaThreshold}, + #{yoloHeight}, + #{yoloWidth}, + #{customParams}, + #{fixedDirection}, + + + + + update dm_player_config + + player_id = #{playerId}, + create_time = #{createTime}, + update_time = #{updateTime}, + shout_interval = #{shoutInterval}, + shout_mana = #{shoutMana}, + auto_add_mana = #{autoAddMana}, + add_mana_threshold = #{addManaThreshold}, + yolo_height = #{yoloHeight}, + yolo_width = #{yoloWidth}, + custom_params = #{customParams}, + fixed_direction = #{fixedDirection}, + + where id = #{id} + + + + delete from dm_player_config where id = #{id} + + + + delete from dm_player_config where id in + + #{id} + + + \ No newline at end of file From b77f5b0701a3a8ef5ef705987727b83b5c29b877 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Sun, 10 May 2026 05:16:10 -0400 Subject: [PATCH 04/24] 123 --- .../controller/DmPlayerConfigController.java | 19 +++++++------ .../ruoyi/system/domain/DmPlayerConfig.java | 11 +++++++- .../system/mapper/DmPlayerConfigMapper.java | 2 ++ .../service/IDmPlayerConfigService.java | 2 ++ .../impl/DmPlayerConfigServiceImpl.java | 28 ++++++++++++++++--- .../mapper/system/DmPlayerConfigMapper.xml | 8 ++++-- 6 files changed, 54 insertions(+), 16 deletions(-) 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 From a19f0e8e4602a2bf256b111259c42fd14f854c3a Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Sun, 10 May 2026 06:53:27 -0400 Subject: [PATCH 05/24] 123 --- .../impl/DmPlayerConfigServiceImpl.java | 98 +++++++++---------- 1 file changed, 48 insertions(+), 50 deletions(-) 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 f3f59fd..7512579 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 @@ -1,39 +1,36 @@ package com.ruoyi.system.service.impl; + +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.luqj.util.HttpHelper; +import com.ruoyi.common.select.SelectItem; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.DmPlayerConfig; +import com.ruoyi.system.domain.DmPlayerConfigPlus; +import com.ruoyi.system.mapper.DmPlayerConfigMapper; +import com.ruoyi.system.service.IDmPlayerConfigService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Service; import java.net.URLEncoder; import java.util.*; -import com.luqj.util.HttpHelper; -import com.ruoyi.common.utils.StringUtils; -import com.alibaba.fastjson.JSONArray; -import com.ruoyi.common.utils.DateUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import com.ruoyi.system.mapper.DmPlayerConfigMapper; -import com.ruoyi.system.domain.DmPlayerConfig; -import com.ruoyi.system.domain.DmPlayerConfigPlus; -import com.ruoyi.system.service.IDmPlayerConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.JdbcTemplate; -import com.ruoyi.common.select.SelectItem; /** * 玩家配置Service业务层处理 - * + * * @author luqj * @date 2026-05-10 */ @Slf4j @Service -public class DmPlayerConfigServiceImpl extends ServiceImpl implements IDmPlayerConfigService -{ +public class DmPlayerConfigServiceImpl extends ServiceImpl implements IDmPlayerConfigService { @Autowired private DmPlayerConfigMapper dmPlayerConfigMapper; @Autowired @@ -43,27 +40,30 @@ public class DmPlayerConfigServiceImpl extends ServiceImpl getByIds(List ids, SFunction... columns) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() .select(columns).in(DmPlayerConfigPlus::getId, ids); return this.list(lambdaQueryWrapper); } + @Override public List select(String keyword) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() .select(DmPlayerConfigPlus::getId, DmPlayerConfigPlus::getPlayerId) .like(DmPlayerConfigPlus::getPlayerId, keyword); List list = this.list(lambdaQueryWrapper); - List result =new ArrayList<>(); - for (DmPlayerConfigPlus item : list){ + List result = new ArrayList<>(); + for (DmPlayerConfigPlus item : list) { SelectItem selectItem = new SelectItem(); - selectItem.setName(item.getPlayerId()+""); + selectItem.setName(item.getPlayerId() + ""); selectItem.setId(item.getId()); result.add(selectItem); } return result; } + @Override public DmPlayerConfigPlus getById(Long id, SFunction... columns) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() @@ -102,6 +102,7 @@ public class DmPlayerConfigServiceImpl extends ServiceImpl getByIds(List ids) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper().in(DmPlayerConfigPlus::getId, ids); @@ -151,22 +152,22 @@ public class DmPlayerConfigServiceImpl extends ServiceImpl tList = JSONArray.parseArray(JSONArray.toJSONString(result), tClass); return tList; } + /** * 查询玩家配置 - * + * * @param id 玩家配置ID * @return 玩家配置 */ @Override - public DmPlayerConfig selectDmPlayerConfigById(Long id) - { + public DmPlayerConfig selectDmPlayerConfigById(Long id) { return dmPlayerConfigMapper.selectDmPlayerConfigById(id); } + @Override - public DmPlayerConfig selectDmPlayerConfigByPlayerId(Long playerId) - { - DmPlayerConfig dmPlayerConfig= dmPlayerConfigMapper.selectDmPlayerConfigByPlayerId(playerId); - if(dmPlayerConfig == null){ + public DmPlayerConfig selectDmPlayerConfigByPlayerId(Long playerId) { + DmPlayerConfig dmPlayerConfig = dmPlayerConfigMapper.selectDmPlayerConfigByPlayerId(playerId); + if (dmPlayerConfig == null) { DmPlayerConfig playerConfigPlus = new DmPlayerConfig(); playerConfigPlus.setPlayerId(playerId); playerConfigPlus.setAutoAddMana(0); @@ -188,48 +189,47 @@ public class DmPlayerConfigServiceImpl extends ServiceImpl selectDmPlayerConfigList(DmPlayerConfig dmPlayerConfig) - { + public List selectDmPlayerConfigList(DmPlayerConfig dmPlayerConfig) { return dmPlayerConfigMapper.selectDmPlayerConfigList(dmPlayerConfig); } /** * 新增玩家配置 - * + * * @param dmPlayerConfig 玩家配置 * @return 结果 */ @Override - public int insertDmPlayerConfig(DmPlayerConfig dmPlayerConfig) - { + public int insertDmPlayerConfig(DmPlayerConfig dmPlayerConfig) { dmPlayerConfig.setCreateTime(DateUtils.getNowDate()); return dmPlayerConfigMapper.insertDmPlayerConfig(dmPlayerConfig); } /** * 修改玩家配置 - * + * * @param dmPlayerConfig 玩家配置 * @return 结果 */ @Override - public int updateDmPlayerConfig(DmPlayerConfig dmPlayerConfig) - { + public int updateDmPlayerConfig(DmPlayerConfig dmPlayerConfig) { dmPlayerConfig.setUpdateTime(DateUtils.getNowDate()); - int resutl= dmPlayerConfigMapper.updateDmPlayerConfig(dmPlayerConfig); - if(resutl > 0){ + int resutl = dmPlayerConfigMapper.updateDmPlayerConfig(dmPlayerConfig); + if (resutl > 0) { try { - String result = httpHelper.getlHttpResult("http://" + this.serverIp + ":" + serverPort + "?cmd=8¶ms=" + URLEncoder.encode(JSONObject.toJSONString(dmPlayerConfig), "utf-8") + JSONObject params = new JSONObject(); + params.put("dates", Base64.getEncoder().encodeToString(JSONObject.toJSONString(dmPlayerConfig).getBytes())); + String result = httpHelper.getlHttpResult("http://" + this.serverIp + ":" + serverPort + "?cmd=8¶ms=" + URLEncoder.encode(JSONObject.toJSONString(params), "utf-8") , "get", new HashMap<>(), new HashMap<>()); JSONObject jsonObject = JSONObject.parseObject(result); if (jsonObject.getString("code").equals("1")) { log.info("配置同步成功"); - }else{ + } else { log.error("配置同步失败"); } } catch (Exception e) { @@ -241,25 +241,23 @@ public class DmPlayerConfigServiceImpl extends ServiceImpl Date: Sun, 10 May 2026 07:02:32 -0400 Subject: [PATCH 06/24] 123 --- .../com/ruoyi/system/service/impl/DmPlayerConfigServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 7512579..22d049c 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 @@ -223,6 +223,7 @@ public class DmPlayerConfigServiceImpl extends ServiceImpl 0) { try { JSONObject params = new JSONObject(); + params.put("playerId", dmPlayerConfig.getPlayerId()); params.put("dates", Base64.getEncoder().encodeToString(JSONObject.toJSONString(dmPlayerConfig).getBytes())); String result = httpHelper.getlHttpResult("http://" + this.serverIp + ":" + serverPort + "?cmd=8¶ms=" + URLEncoder.encode(JSONObject.toJSONString(params), "utf-8") , "get", new HashMap<>(), new HashMap<>()); From 7530acde5ba095b3778fee0084bb3fa72ed7429e Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Sun, 10 May 2026 11:05:52 -0400 Subject: [PATCH 07/24] 213 --- .../main/java/com/ruoyi/task/DmPlayerentOnlineStatusTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/DmPlayerentOnlineStatusTask.java b/ruoyi-admin/src/main/java/com/ruoyi/task/DmPlayerentOnlineStatusTask.java index 23dcda1..0d9e3c1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/task/DmPlayerentOnlineStatusTask.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/task/DmPlayerentOnlineStatusTask.java @@ -26,7 +26,7 @@ public class DmPlayerentOnlineStatusTask { Date updateTime = playerent.getUpdateTime(); if (updateTime != null) { long diff = new Date().getTime() - updateTime.getTime(); - if (diff > 60000) { + if (diff > 600000) { playerent.setOnlineStatus("0"); dmPlayerentService.updateById(playerent); log.info("Update playerent online status to 0, id: {}", playerent.getId()); From f91140ea331a81bcf114d41cd8c6140907dd7ab0 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Mon, 11 May 2026 00:43:00 -0400 Subject: [PATCH 08/24] 123 --- .../com/ruoyi/common/utils/TokenUtil.java | 82 +++++++++++++++++++ .../com/ruoyi/system/domain/DmPlayerent.java | 27 +++++- .../service/impl/DmPlayerentServiceImpl.java | 8 +- .../mapper/system/DmPlayerentMapper.xml | 3 +- 4 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/TokenUtil.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TokenUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TokenUtil.java new file mode 100644 index 0000000..3af3419 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TokenUtil.java @@ -0,0 +1,82 @@ +package com.ruoyi.common.utils; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.util.Base64; + +public class TokenUtil { + + private static final String SECRET = "lu7213"; + + public static void main(String[] args) { + String token = TokenUtil.generateToken("admin", "123456"); + System.out.println(token); + } + /** + * 生成24小时token + */ + public static String generateToken(String username, String password) { + long expireAt = System.currentTimeMillis() + 24 * 60 * 60 * 1000L; + + String rawCredential = Base64.getEncoder().encodeToString( + (username + ":" + password).getBytes(StandardCharsets.UTF_8) + ); + + String sign = md5(rawCredential + ":" + expireAt + ":" + SECRET); + + String payload = rawCredential + ":" + expireAt + ":" + sign; + + return Base64.getUrlEncoder() + .withoutPadding() + .encodeToString(payload.getBytes(StandardCharsets.UTF_8)); + } + + /** + * 校验token + */ + public static boolean validateToken(String username, String password,String token) { + try { + String rawCredential = Base64.getEncoder().encodeToString( + (username + ":" + password).getBytes(StandardCharsets.UTF_8) + ); + String decoded = new String( + Base64.getUrlDecoder().decode(token), + StandardCharsets.UTF_8 + ); + String[] parts = decoded.split(":"); + if (parts.length != 3) { + return false; + } + if(!parts[0].equals(rawCredential)){ + return false; + } + String expireStr = parts[1]; + String sign = parts[2] ; + long expireAt = Long.parseLong(expireStr); + if (System.currentTimeMillis() > expireAt) { + return false; + } + String expectedSign = md5(rawCredential + ":" + expireAt + ":" + SECRET); + + return expectedSign.equals(sign); + + } catch (Exception e) { + return false; + } + } + + private static String md5(String str) { + try { + byte[] digest = MessageDigest.getInstance("MD5") + .digest(str.getBytes(StandardCharsets.UTF_8)); + + StringBuilder sb = new StringBuilder(); + for (byte b : digest) { + sb.append(String.format("%02x", b)); + } + return sb.toString(); + + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerent.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerent.java index f5e02cf..68b1978 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerent.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerent.java @@ -4,6 +4,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.data.annotation.Transient; + import java.io.Serializable; /** * 大漠代理对象 dm_playerent @@ -69,12 +71,33 @@ public class DmPlayerent extends BaseEntity /** 当前任务 */ @Excel(name = "当前任务") private String winOneCurTask; - + /** 当前任务 */ + @Excel(name = "secret") + private String secret; /** 当前任务 */ @Excel(name = "当前任务") private String winTwoCurTask; + @Excel(name = "mjpeg播放地址") + @Transient + private transient String mjpegUrl; - public void setId(Long id) + public String getSecret() { + return secret; + } + + public void setSecret(String secret) { + this.secret = secret; + } + + public String getMjpegUrl() { + return mjpegUrl; + } + + public void setMjpegUrl(String mjpegUrl) { + this.mjpegUrl = mjpegUrl; + } + + public void setId(Long id) { this.id = id; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index c2d9a3c..57b2da8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -9,6 +9,7 @@ import com.luqj.util.HttpHelper; import com.ruoyi.common.select.SelectItem; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.TokenUtil; import com.ruoyi.system.domain.DmOperateVo; import com.ruoyi.system.domain.DmPlayerConfigPlus; import com.ruoyi.system.domain.DmPlayerent; @@ -154,7 +155,11 @@ public class DmPlayerentServiceImpl extends ServiceImpl list = dmPlayerentMapper.selectDmPlayerentList(dmPlayerent); List ids = new ArrayList<>(); for (DmPlayerent playerent : list) { + playerent.setSecret(null); ids.add(playerent.getId()); } if (!ids.isEmpty()) { diff --git a/ruoyi-system/src/main/resources/mapper/system/DmPlayerentMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DmPlayerentMapper.xml index 5cf8fb7..bacc81f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/DmPlayerentMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/DmPlayerentMapper.xml @@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, accountId, name, create_time, update_time, online_status, player_status, ip, http_port, win_one_hwnd, win_one_info, win_two_hwnd, win_two_info, win_two_img_path, win_one_img_path, win_one_cur_task, win_two_cur_task from dm_playerent + select id, accountId, name, secret,create_time, update_time, online_status, player_status, ip, http_port, win_one_hwnd, win_one_info, win_two_hwnd, win_two_info, win_two_img_path, win_one_img_path, win_one_cur_task, win_two_cur_task from dm_playerent From 7e30e92e7ba5ca703406185ad30992a51dd7a094 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Tue, 12 May 2026 03:54:04 -0400 Subject: [PATCH 11/24] 1 --- luqj-djl/pom.xml | 6 ++++++ ruoyi-common/pom.xml | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/luqj-djl/pom.xml b/luqj-djl/pom.xml index 887036c..46a5655 100644 --- a/luqj-djl/pom.xml +++ b/luqj-djl/pom.xml @@ -59,6 +59,12 @@ cn.smartjavaai ocr + + + org.apache.poi + poi + + diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 2df87f1..dd1a28c 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -21,6 +21,16 @@ cn.afterturn easypoi-base 4.1.3 + + + org.apache.poi + poi + + + org.apache.poi + poi-ooxml-schemas + + cn.afterturn From 1f08e30d3a1ee9d2b23a9725fd67902aa4752c73 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Tue, 12 May 2026 03:59:18 -0400 Subject: [PATCH 12/24] 1 --- ruoyi-admin/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 360402e..17f00ae 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -133,6 +133,11 @@ luqj-thymeleaf 3.4.0 + + org.apache.poi + poi-ooxml + 4.1.2 + com.ruoyi luqj-common From 66ab89fa93c6dfbf675cbd39a7f9686f3d5420d1 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Tue, 12 May 2026 09:00:03 -0400 Subject: [PATCH 13/24] 123 --- .../ruoyi/system/service/impl/DmPlayerConfigServiceImpl.java | 2 +- .../com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 6fef4bb..1a461e5 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 @@ -174,7 +174,7 @@ public class DmPlayerConfigServiceImpl extends ServiceImpl Date: Wed, 13 May 2026 03:31:36 -0400 Subject: [PATCH 14/24] 1123 --- .../com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index 4bd278d..16c453f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -157,7 +157,8 @@ public class DmPlayerentServiceImpl extends ServiceImpl Date: Wed, 13 May 2026 06:37:19 -0400 Subject: [PATCH 15/24] 1 --- .../ruoyi/system/service/impl/DmPlayerentServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index 16c453f..da00a1a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -157,8 +157,10 @@ public class DmPlayerentServiceImpl extends ServiceImpl Date: Wed, 13 May 2026 09:20:12 -0400 Subject: [PATCH 16/24] 1 --- .../ruoyi/system/service/impl/DmPlayerentServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index da00a1a..6fde59f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -246,9 +246,9 @@ public class DmPlayerentServiceImpl extends ServiceImpl Date: Wed, 13 May 2026 21:41:36 -0400 Subject: [PATCH 17/24] 11 --- .../ruoyi/system/service/impl/DmPlayerentServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index 6fde59f..ed45d30 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -157,11 +157,11 @@ public class DmPlayerentServiceImpl extends ServiceImpl Date: Thu, 14 May 2026 01:07:17 -0400 Subject: [PATCH 18/24] 123 --- .../java/com/ruoyi/system/domain/DmOperateVo.java | 1 + .../com/ruoyi/system/domain/DmPlayerentPlus.java | 14 +++++++++++++- .../service/impl/DmPlayerentServiceImpl.java | 15 ++++++++++++++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmOperateVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmOperateVo.java index ff4cc86..96afe8e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmOperateVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmOperateVo.java @@ -14,4 +14,5 @@ public class DmOperateVo implements Serializable { private Integer type; private Integer x; private Integer y; + private Long versionId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerentPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerentPlus.java index 886cd02..a4b4849 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerentPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerentPlus.java @@ -66,7 +66,19 @@ public class DmPlayerentPlus implements Serializable /** 当前任务 */ @Excel(name = "当前任务") private String winTwoCurTask; - public void setId(Long id) + + @Excel(name = "版本信息") + private String dmVersion; + + public String getDmVersion() { + return dmVersion; + } + + public void setDmVersion(String dmVersion) { + this.dmVersion = dmVersion; + } + + public void setId(Long id) { this.id = id; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index ed45d30..e246f9a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -287,8 +287,21 @@ public class DmPlayerentServiceImpl extends ServiceImpl(), new HashMap<>()); + JSONObject jsonObject = JSONObject.parseObject(result); + if (jsonObject.getString("code").equals("1")) { + return true; + } + System.out.println(result); + } catch (Exception e) { + throw new RuntimeException(e); + } } - return false; + return true; } /** From a14741aec758e0084e7960c43c9953240228feb5 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Thu, 14 May 2026 08:32:37 -0400 Subject: [PATCH 19/24] 123 --- .../DmGroupTaskRelationController.java | 118 ++++++++++ .../DmPlayerTaskGroupController.java | 118 ++++++++++ .../controller/DmPlayerVersionController.java | 118 ++++++++++ .../system/domain/DmGroupTaskRelation.java | 151 +++++++++++++ .../domain/DmGroupTaskRelationPlus.java | 167 ++++++++++++++ .../system/domain/DmPlayerTaskGroup.java | 96 ++++++++ .../system/domain/DmPlayerTaskGroupPlus.java | 128 +++++++++++ .../ruoyi/system/domain/DmPlayerVersion.java | 95 ++++++++ .../system/domain/DmPlayerVersionPlus.java | 115 ++++++++++ .../mapper/DmGroupTaskRelationMapper.java | 65 ++++++ .../mapper/DmPlayerTaskGroupMapper.java | 65 ++++++ .../system/mapper/DmPlayerVersionMapper.java | 65 ++++++ .../service/IDmGroupTaskRelationService.java | 89 ++++++++ .../service/IDmPlayerTaskGroupService.java | 89 ++++++++ .../service/IDmPlayerVersionService.java | 89 ++++++++ .../impl/DmGroupTaskRelationServiceImpl.java | 208 ++++++++++++++++++ .../impl/DmPlayerTaskGroupServiceImpl.java | 208 ++++++++++++++++++ .../impl/DmPlayerVersionServiceImpl.java | 208 ++++++++++++++++++ .../service/impl/DmPlayerentServiceImpl.java | 15 +- .../system/DmGroupTaskRelationMapper.xml | 94 ++++++++ .../mapper/system/DmPlayerTaskGroupMapper.xml | 83 +++++++ .../mapper/system/DmPlayerVersionMapper.xml | 79 +++++++ 22 files changed, 2462 insertions(+), 1 deletion(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/DmGroupTaskRelationController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerTaskGroupController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerVersionController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerTaskGroup.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerTaskGroupPlus.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerVersion.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerVersionPlus.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmGroupTaskRelationMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerTaskGroupMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerVersionMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IDmGroupTaskRelationService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerTaskGroupService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerVersionService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmGroupTaskRelationServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerTaskGroupServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/DmPlayerTaskGroupMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/DmPlayerVersionMapper.xml diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmGroupTaskRelationController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmGroupTaskRelationController.java new file mode 100644 index 0000000..2dc36b4 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmGroupTaskRelationController.java @@ -0,0 +1,118 @@ +package com.ruoyi.system.controller; +import com.ruoyi.common.select.Ids; +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 com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.DmGroupTaskRelation; +import com.ruoyi.system.domain.DmGroupTaskRelationPlus; +import com.ruoyi.system.service.IDmGroupTaskRelationService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 组任务关联Controller + * + * @author luqj + * @date 2026-05-14 + */ +@RestController +@RequestMapping("/system/dmgrouptaskrelation") +public class DmGroupTaskRelationController extends BaseController +{ + @Autowired + private IDmGroupTaskRelationService dmGroupTaskRelationService; + @PreAuthorize("@ss.hasPermi('system:dmgrouptaskrelation:getByIds')") + @PostMapping("/getByIds") + public AjaxResult getByIds(@RequestBody Ids ids) + { + List list = dmGroupTaskRelationService.getByIds(ids.getLongIds(),DmGroupTaskRelationPlus::getPlayerName,DmGroupTaskRelationPlus::getId); + return AjaxResult.success(list); + } + @PreAuthorize("@ss.hasPermi('system:dmgrouptaskrelation:select')") + @GetMapping("/select") + public AjaxResult select(String keyword) + { + List list = dmGroupTaskRelationService.select(keyword); + return AjaxResult.success(list); + } + /** + * 查询组任务关联列表 + */ + @PreAuthorize("@ss.hasPermi('system:dmgrouptaskrelation:list')") + @GetMapping("/list") + public TableDataInfo list(DmGroupTaskRelation dmGroupTaskRelation) + { + startPage(); + List list = dmGroupTaskRelationService.selectDmGroupTaskRelationList(dmGroupTaskRelation); + return getDataTable(list); + } + + /** + * 导出组任务关联列表 + */ + @PreAuthorize("@ss.hasPermi('system:dmgrouptaskrelation:export')") + @Log(title = "组任务关联", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(DmGroupTaskRelation dmGroupTaskRelation) + { + List list = dmGroupTaskRelationService.selectDmGroupTaskRelationList(dmGroupTaskRelation); + ExcelUtil util = new ExcelUtil(DmGroupTaskRelation.class); + return util.exportExcel(list, "dmgrouptaskrelation"); + } + + /** + * 获取组任务关联详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:dmgrouptaskrelation:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(dmGroupTaskRelationService.selectDmGroupTaskRelationById(id)); + } + + /** + * 新增组任务关联 + */ + @PreAuthorize("@ss.hasPermi('system:dmgrouptaskrelation:add')") + @Log(title = "组任务关联", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmGroupTaskRelation dmGroupTaskRelation) + { + return toAjax(dmGroupTaskRelationService.insertDmGroupTaskRelation(dmGroupTaskRelation)); + } + + /** + * 修改组任务关联 + */ + @PreAuthorize("@ss.hasPermi('system:dmgrouptaskrelation:edit')") + @Log(title = "组任务关联", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmGroupTaskRelation dmGroupTaskRelation) + { + return toAjax(dmGroupTaskRelationService.updateDmGroupTaskRelation(dmGroupTaskRelation)); + } + + /** + * 删除组任务关联 + */ + @PreAuthorize("@ss.hasPermi('system:dmgrouptaskrelation:remove')") + @Log(title = "组任务关联", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dmGroupTaskRelationService.deleteDmGroupTaskRelationByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerTaskGroupController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerTaskGroupController.java new file mode 100644 index 0000000..6fc688d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerTaskGroupController.java @@ -0,0 +1,118 @@ +package com.ruoyi.system.controller; +import com.ruoyi.common.select.Ids; +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 com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.DmPlayerTaskGroup; +import com.ruoyi.system.domain.DmPlayerTaskGroupPlus; +import com.ruoyi.system.service.IDmPlayerTaskGroupService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 大漠任务组Controller + * + * @author luqj + * @date 2026-05-14 + */ +@RestController +@RequestMapping("/system/dmtaskgroup") +public class DmPlayerTaskGroupController extends BaseController +{ + @Autowired + private IDmPlayerTaskGroupService dmPlayerTaskGroupService; + @PreAuthorize("@ss.hasPermi('system:dmtaskgroup:getByIds')") + @PostMapping("/getByIds") + public AjaxResult getByIds(@RequestBody Ids ids) + { + List list = dmPlayerTaskGroupService.getByIds(ids.getLongIds(),DmPlayerTaskGroupPlus::getGroupName,DmPlayerTaskGroupPlus::getId); + return AjaxResult.success(list); + } + @PreAuthorize("@ss.hasPermi('system:dmtaskgroup:select')") + @GetMapping("/select") + public AjaxResult select(String keyword) + { + List list = dmPlayerTaskGroupService.select(keyword); + return AjaxResult.success(list); + } + /** + * 查询大漠任务组列表 + */ + @PreAuthorize("@ss.hasPermi('system:dmtaskgroup:list')") + @GetMapping("/list") + public TableDataInfo list(DmPlayerTaskGroup dmPlayerTaskGroup) + { + startPage(); + List list = dmPlayerTaskGroupService.selectDmPlayerTaskGroupList(dmPlayerTaskGroup); + return getDataTable(list); + } + + /** + * 导出大漠任务组列表 + */ + @PreAuthorize("@ss.hasPermi('system:dmtaskgroup:export')") + @Log(title = "大漠任务组", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(DmPlayerTaskGroup dmPlayerTaskGroup) + { + List list = dmPlayerTaskGroupService.selectDmPlayerTaskGroupList(dmPlayerTaskGroup); + ExcelUtil util = new ExcelUtil(DmPlayerTaskGroup.class); + return util.exportExcel(list, "dmtaskgroup"); + } + + /** + * 获取大漠任务组详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:dmtaskgroup:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(dmPlayerTaskGroupService.selectDmPlayerTaskGroupById(id)); + } + + /** + * 新增大漠任务组 + */ + @PreAuthorize("@ss.hasPermi('system:dmtaskgroup:add')") + @Log(title = "大漠任务组", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmPlayerTaskGroup dmPlayerTaskGroup) + { + return toAjax(dmPlayerTaskGroupService.insertDmPlayerTaskGroup(dmPlayerTaskGroup)); + } + + /** + * 修改大漠任务组 + */ + @PreAuthorize("@ss.hasPermi('system:dmtaskgroup:edit')") + @Log(title = "大漠任务组", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmPlayerTaskGroup dmPlayerTaskGroup) + { + return toAjax(dmPlayerTaskGroupService.updateDmPlayerTaskGroup(dmPlayerTaskGroup)); + } + + /** + * 删除大漠任务组 + */ + @PreAuthorize("@ss.hasPermi('system:dmtaskgroup:remove')") + @Log(title = "大漠任务组", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dmPlayerTaskGroupService.deleteDmPlayerTaskGroupByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerVersionController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerVersionController.java new file mode 100644 index 0000000..cb72ad0 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerVersionController.java @@ -0,0 +1,118 @@ +package com.ruoyi.system.controller; +import com.ruoyi.common.select.Ids; +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 com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.DmPlayerVersion; +import com.ruoyi.system.domain.DmPlayerVersionPlus; +import com.ruoyi.system.service.IDmPlayerVersionService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 版本信息Controller + * + * @author luqj + * @date 2026-05-14 + */ +@RestController +@RequestMapping("/system/dmversion") +public class DmPlayerVersionController extends BaseController +{ + @Autowired + private IDmPlayerVersionService dmPlayerVersionService; + @PreAuthorize("@ss.hasPermi('system:dmversion:getByIds')") + @PostMapping("/getByIds") + public AjaxResult getByIds(@RequestBody Ids ids) + { + List list = dmPlayerVersionService.getByIds(ids.getLongIds(),DmPlayerVersionPlus::getTitle,DmPlayerVersionPlus::getId); + return AjaxResult.success(list); + } + @PreAuthorize("@ss.hasPermi('system:dmversion:select')") + @GetMapping("/select") + public AjaxResult select(String keyword) + { + List list = dmPlayerVersionService.select(keyword); + return AjaxResult.success(list); + } + /** + * 查询版本信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:dmversion:list')") + @GetMapping("/list") + public TableDataInfo list(DmPlayerVersion dmPlayerVersion) + { + startPage(); + List list = dmPlayerVersionService.selectDmPlayerVersionList(dmPlayerVersion); + return getDataTable(list); + } + + /** + * 导出版本信息列表 + */ + @PreAuthorize("@ss.hasPermi('system:dmversion:export')") + @Log(title = "版本信息", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(DmPlayerVersion dmPlayerVersion) + { + List list = dmPlayerVersionService.selectDmPlayerVersionList(dmPlayerVersion); + ExcelUtil util = new ExcelUtil(DmPlayerVersion.class); + return util.exportExcel(list, "dmversion"); + } + + /** + * 获取版本信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:dmversion:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(dmPlayerVersionService.selectDmPlayerVersionById(id)); + } + + /** + * 新增版本信息 + */ + @PreAuthorize("@ss.hasPermi('system:dmversion:add')") + @Log(title = "版本信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmPlayerVersion dmPlayerVersion) + { + return toAjax(dmPlayerVersionService.insertDmPlayerVersion(dmPlayerVersion)); + } + + /** + * 修改版本信息 + */ + @PreAuthorize("@ss.hasPermi('system:dmversion:edit')") + @Log(title = "版本信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmPlayerVersion dmPlayerVersion) + { + return toAjax(dmPlayerVersionService.updateDmPlayerVersion(dmPlayerVersion)); + } + + /** + * 删除版本信息 + */ + @PreAuthorize("@ss.hasPermi('system:dmversion:remove')") + @Log(title = "版本信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dmPlayerVersionService.deleteDmPlayerVersionByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java new file mode 100644 index 0000000..1f953a1 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java @@ -0,0 +1,151 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +/** + * 组任务关联对象 dm_group_task_relation + * + * @author luqj + * @date 2026-05-14 + */ +public class DmGroupTaskRelation extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 组ID */ + @Excel(name = "组ID") + private Long groupId; + + /** 玩家ID */ + @Excel(name = "玩家ID") + private Long playerId; + + /** 名称 */ + @Excel(name = "名称") + private String playerName; + + /** 用户ID */ + @Excel(name = "用户ID") + private Long accountId; + + /** 第几个窗口 */ + @Excel(name = "第几个窗口") + private Long windowIndex; + + /** 窗口句柄 */ + @Excel(name = "窗口句柄") + private Long windowHwnd; + + /** 是否主控号 */ + @Excel(name = "是否主控号") + private Integer isMaster; + + /** 状态 */ + @Excel(name = "状态") + private Integer status; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setGroupId(Long groupId) + { + this.groupId = groupId; + } + + public Long getGroupId() + { + return groupId; + } + public void setPlayerId(Long playerId) + { + this.playerId = playerId; + } + + public Long getPlayerId() + { + return playerId; + } + public void setPlayerName(String playerName) + { + this.playerName = playerName; + } + + public String getPlayerName() + { + return playerName; + } + public void setAccountId(Long accountId) + { + this.accountId = accountId; + } + + public Long getAccountId() + { + return accountId; + } + public void setWindowIndex(Long windowIndex) + { + this.windowIndex = windowIndex; + } + + public Long getWindowIndex() + { + return windowIndex; + } + public void setWindowHwnd(Long windowHwnd) + { + this.windowHwnd = windowHwnd; + } + + public Long getWindowHwnd() + { + return windowHwnd; + } + public void setIsMaster(Integer isMaster) + { + this.isMaster = isMaster; + } + + public Integer getIsMaster() + { + return isMaster; + } + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("groupId", getGroupId()) + .append("playerId", getPlayerId()) + .append("playerName", getPlayerName()) + .append("accountId", getAccountId()) + .append("windowIndex", getWindowIndex()) + .append("windowHwnd", getWindowHwnd()) + .append("isMaster", getIsMaster()) + .append("status", getStatus()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java new file mode 100644 index 0000000..68333a8 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java @@ -0,0 +1,167 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; +/** + * 组任务关联对象 dm_group_task_relation + * + * @author luqj + * @date 2026-05-14 + */ +@TableName(value = "dm_group_task_relation") +public class DmGroupTaskRelationPlus implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + /** 组ID */ + @Excel(name = "组ID") + private Long groupId; + /** 玩家ID */ + @Excel(name = "玩家ID") + private Long playerId; + /** 名称 */ + @Excel(name = "名称") + private String playerName; + /** 用户ID */ + @Excel(name = "用户ID") + private Long accountId; + /** 第几个窗口 */ + @Excel(name = "第几个窗口") + private Long windowIndex; + /** 窗口句柄 */ + @Excel(name = "窗口句柄") + private Long windowHwnd; + /** 是否主控号 */ + @Excel(name = "是否主控号") + private Integer isMaster; + /** 状态 */ + @Excel(name = "状态") + private Integer status; + /** 创建时间 */ + private Date createTime; + /** 更新时间 */ + private Date updateTime; + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setGroupId(Long groupId) + { + this.groupId = groupId; + } + + public Long getGroupId() + { + return groupId; + } + public void setPlayerId(Long playerId) + { + this.playerId = playerId; + } + + public Long getPlayerId() + { + return playerId; + } + public void setPlayerName(String playerName) + { + this.playerName = playerName; + } + + public String getPlayerName() + { + return playerName; + } + public void setAccountId(Long accountId) + { + this.accountId = accountId; + } + + public Long getAccountId() + { + return accountId; + } + public void setWindowIndex(Long windowIndex) + { + this.windowIndex = windowIndex; + } + + public Long getWindowIndex() + { + return windowIndex; + } + public void setWindowHwnd(Long windowHwnd) + { + this.windowHwnd = windowHwnd; + } + + public Long getWindowHwnd() + { + return windowHwnd; + } + public void setIsMaster(Integer isMaster) + { + this.isMaster = isMaster; + } + + public Integer getIsMaster() + { + return isMaster; + } + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + public void setCreateTime(Date createTime) + { + this.createTime = createTime; + } + + public Date getCreateTime() + { + return createTime; + } + public void setUpdateTime(Date updateTime) + { + this.updateTime = updateTime; + } + + public Date getUpdateTime() + { + return updateTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("groupId", getGroupId()) + .append("playerId", getPlayerId()) + .append("playerName", getPlayerName()) + .append("accountId", getAccountId()) + .append("windowIndex", getWindowIndex()) + .append("windowHwnd", getWindowHwnd()) + .append("isMaster", getIsMaster()) + .append("status", getStatus()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerTaskGroup.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerTaskGroup.java new file mode 100644 index 0000000..28e8cc5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerTaskGroup.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +/** + * 大漠任务组对象 dm_player_task_group + * + * @author luqj + * @date 2026-05-14 + */ +public class DmPlayerTaskGroup extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 组编号 */ + @Excel(name = "组编号") + private String groupCode; + + /** 组名称 */ + @Excel(name = "组名称") + private String groupName; + + /** 类型 0 加速 */ + @Excel(name = "类型 0 加速") + private Integer type; + + /** 状态 */ + @Excel(name = "状态") + private Integer status; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setGroupCode(String groupCode) + { + this.groupCode = groupCode; + } + + public String getGroupCode() + { + return groupCode; + } + public void setGroupName(String groupName) + { + this.groupName = groupName; + } + + public String getGroupName() + { + return groupName; + } + public void setType(Integer type) + { + this.type = type; + } + + public Integer getType() + { + return type; + } + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("groupCode", getGroupCode()) + .append("groupName", getGroupName()) + .append("type", getType()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerTaskGroupPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerTaskGroupPlus.java new file mode 100644 index 0000000..9cbf5d3 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerTaskGroupPlus.java @@ -0,0 +1,128 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; +/** + * 大漠任务组对象 dm_player_task_group + * + * @author luqj + * @date 2026-05-14 + */ +@TableName(value = "dm_player_task_group") +public class DmPlayerTaskGroupPlus implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + /** 组编号 */ + @Excel(name = "组编号") + private String groupCode; + /** 组名称 */ + @Excel(name = "组名称") + private String groupName; + /** 类型 0 加速 */ + @Excel(name = "类型 0 加速") + private Integer type; + /** 状态 */ + @Excel(name = "状态") + private Integer status; + /** 备注 */ + @Excel(name = "备注") + private String remark; + /** 创建时间 */ + private Date createTime; + /** 更新时间 */ + private Date updateTime; + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setGroupCode(String groupCode) + { + this.groupCode = groupCode; + } + + public String getGroupCode() + { + return groupCode; + } + public void setGroupName(String groupName) + { + this.groupName = groupName; + } + + public String getGroupName() + { + return groupName; + } + public void setType(Integer type) + { + this.type = type; + } + + public Integer getType() + { + return type; + } + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + public void setRemark(String remark) + { + this.remark = remark; + } + + public String getRemark() + { + return remark; + } + public void setCreateTime(Date createTime) + { + this.createTime = createTime; + } + + public Date getCreateTime() + { + return createTime; + } + public void setUpdateTime(Date updateTime) + { + this.updateTime = updateTime; + } + + public Date getUpdateTime() + { + return updateTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("groupCode", getGroupCode()) + .append("groupName", getGroupName()) + .append("type", getType()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerVersion.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerVersion.java new file mode 100644 index 0000000..a5938df --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerVersion.java @@ -0,0 +1,95 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +/** + * 版本信息对象 dm_player_version + * + * @author luqj + * @date 2026-05-14 + */ +public class DmPlayerVersion extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 名称 */ + @Excel(name = "名称") + private String title; + + /** 版本号 */ + @Excel(name = "版本号") + private String versionNum; + + /** 配置下载地址 */ + @Excel(name = "配置下载地址") + private String configUrl; + + /** 代理下载地址 */ + @Excel(name = "代理下载地址") + private String proxyUrl; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setTitle(String title) + { + this.title = title; + } + + public String getTitle() + { + return title; + } + public void setVersionNum(String versionNum) + { + this.versionNum = versionNum; + } + + public String getVersionNum() + { + return versionNum; + } + public void setConfigUrl(String configUrl) + { + this.configUrl = configUrl; + } + + public String getConfigUrl() + { + return configUrl; + } + public void setProxyUrl(String proxyUrl) + { + this.proxyUrl = proxyUrl; + } + + public String getProxyUrl() + { + return proxyUrl; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("title", getTitle()) + .append("versionNum", getVersionNum()) + .append("configUrl", getConfigUrl()) + .append("proxyUrl", getProxyUrl()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerVersionPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerVersionPlus.java new file mode 100644 index 0000000..e8278e3 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmPlayerVersionPlus.java @@ -0,0 +1,115 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; +/** + * 版本信息对象 dm_player_version + * + * @author luqj + * @date 2026-05-14 + */ +@TableName(value = "dm_player_version") +public class DmPlayerVersionPlus implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + /** 名称 */ + @Excel(name = "名称") + private String title; + /** 版本号 */ + @Excel(name = "版本号") + private String versionNum; + /** 配置下载地址 */ + @Excel(name = "配置下载地址") + private String configUrl; + /** 代理下载地址 */ + @Excel(name = "代理下载地址") + private String proxyUrl; + /** 创建时间 */ + private Date createTime; + /** 更新时间 */ + private Date updateTime; + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setTitle(String title) + { + this.title = title; + } + + public String getTitle() + { + return title; + } + public void setVersionNum(String versionNum) + { + this.versionNum = versionNum; + } + + public String getVersionNum() + { + return versionNum; + } + public void setConfigUrl(String configUrl) + { + this.configUrl = configUrl; + } + + public String getConfigUrl() + { + return configUrl; + } + public void setProxyUrl(String proxyUrl) + { + this.proxyUrl = proxyUrl; + } + + public String getProxyUrl() + { + return proxyUrl; + } + public void setCreateTime(Date createTime) + { + this.createTime = createTime; + } + + public Date getCreateTime() + { + return createTime; + } + public void setUpdateTime(Date updateTime) + { + this.updateTime = updateTime; + } + + public Date getUpdateTime() + { + return updateTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("title", getTitle()) + .append("versionNum", getVersionNum()) + .append("configUrl", getConfigUrl()) + .append("proxyUrl", getProxyUrl()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmGroupTaskRelationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmGroupTaskRelationMapper.java new file mode 100644 index 0000000..58e8c0a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmGroupTaskRelationMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.system.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.system.domain.DmGroupTaskRelation; +import com.ruoyi.system.domain.DmGroupTaskRelationPlus; + +/** + * 组任务关联Mapper接口 + * + * @author luqj + * @date 2026-05-14 + */ +public interface DmGroupTaskRelationMapper extends BaseMapper +{ + /** + * 查询组任务关联 + * + * @param id 组任务关联ID + * @return 组任务关联 + */ + public DmGroupTaskRelation selectDmGroupTaskRelationById(Long id); + + /** + * 查询组任务关联列表 + * + * @param dmGroupTaskRelation 组任务关联 + * @return 组任务关联集合 + */ + public List selectDmGroupTaskRelationList(DmGroupTaskRelation dmGroupTaskRelation); + + /** + * 新增组任务关联 + * + * @param dmGroupTaskRelation 组任务关联 + * @return 结果 + */ + public int insertDmGroupTaskRelation(DmGroupTaskRelation dmGroupTaskRelation); + + /** + * 修改组任务关联 + * + * @param dmGroupTaskRelation 组任务关联 + * @return 结果 + */ + public int updateDmGroupTaskRelation(DmGroupTaskRelation dmGroupTaskRelation); + + /** + * 删除组任务关联 + * + * @param id 组任务关联ID + * @return 结果 + */ + public int deleteDmGroupTaskRelationById(Long id); + + /** + * 批量删除组任务关联 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteDmGroupTaskRelationByIds(Long[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerTaskGroupMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerTaskGroupMapper.java new file mode 100644 index 0000000..520659d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerTaskGroupMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.system.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.system.domain.DmPlayerTaskGroup; +import com.ruoyi.system.domain.DmPlayerTaskGroupPlus; + +/** + * 大漠任务组Mapper接口 + * + * @author luqj + * @date 2026-05-14 + */ +public interface DmPlayerTaskGroupMapper extends BaseMapper +{ + /** + * 查询大漠任务组 + * + * @param id 大漠任务组ID + * @return 大漠任务组 + */ + public DmPlayerTaskGroup selectDmPlayerTaskGroupById(Long id); + + /** + * 查询大漠任务组列表 + * + * @param dmPlayerTaskGroup 大漠任务组 + * @return 大漠任务组集合 + */ + public List selectDmPlayerTaskGroupList(DmPlayerTaskGroup dmPlayerTaskGroup); + + /** + * 新增大漠任务组 + * + * @param dmPlayerTaskGroup 大漠任务组 + * @return 结果 + */ + public int insertDmPlayerTaskGroup(DmPlayerTaskGroup dmPlayerTaskGroup); + + /** + * 修改大漠任务组 + * + * @param dmPlayerTaskGroup 大漠任务组 + * @return 结果 + */ + public int updateDmPlayerTaskGroup(DmPlayerTaskGroup dmPlayerTaskGroup); + + /** + * 删除大漠任务组 + * + * @param id 大漠任务组ID + * @return 结果 + */ + public int deleteDmPlayerTaskGroupById(Long id); + + /** + * 批量删除大漠任务组 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteDmPlayerTaskGroupByIds(Long[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerVersionMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerVersionMapper.java new file mode 100644 index 0000000..3f59cab --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/DmPlayerVersionMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.system.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import com.ruoyi.system.domain.DmPlayerVersion; +import com.ruoyi.system.domain.DmPlayerVersionPlus; + +/** + * 版本信息Mapper接口 + * + * @author luqj + * @date 2026-05-14 + */ +public interface DmPlayerVersionMapper extends BaseMapper +{ + /** + * 查询版本信息 + * + * @param id 版本信息ID + * @return 版本信息 + */ + public DmPlayerVersion selectDmPlayerVersionById(Long id); + + /** + * 查询版本信息列表 + * + * @param dmPlayerVersion 版本信息 + * @return 版本信息集合 + */ + public List selectDmPlayerVersionList(DmPlayerVersion dmPlayerVersion); + + /** + * 新增版本信息 + * + * @param dmPlayerVersion 版本信息 + * @return 结果 + */ + public int insertDmPlayerVersion(DmPlayerVersion dmPlayerVersion); + + /** + * 修改版本信息 + * + * @param dmPlayerVersion 版本信息 + * @return 结果 + */ + public int updateDmPlayerVersion(DmPlayerVersion dmPlayerVersion); + + /** + * 删除版本信息 + * + * @param id 版本信息ID + * @return 结果 + */ + public int deleteDmPlayerVersionById(Long id); + + /** + * 批量删除版本信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteDmPlayerVersionByIds(Long[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmGroupTaskRelationService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmGroupTaskRelationService.java new file mode 100644 index 0000000..e58cef2 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmGroupTaskRelationService.java @@ -0,0 +1,89 @@ +package com.ruoyi.system.service; +import java.util.Map; +import java.util.List; +import com.ruoyi.system.domain.DmGroupTaskRelation; +import com.ruoyi.system.domain.DmGroupTaskRelationPlus; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.ruoyi.common.select.SelectItem; +/** + * 组任务关联Service接口 + * + * @author luqj + * @date 2026-05-14 + */ +public interface IDmGroupTaskRelationService extends IService +{ + + List select(String keyword); + /** + * 查询组任务关联 + * + * @param id 组任务关联ID + * @return 组任务关联 + */ + public DmGroupTaskRelation selectDmGroupTaskRelationById(Long id); + + /** + * 查询组任务关联列表 + * + * @param dmGroupTaskRelation 组任务关联 + * @return 组任务关联集合 + */ + public List selectDmGroupTaskRelationList(DmGroupTaskRelation dmGroupTaskRelation); + + /** + * 新增组任务关联 + * + * @param dmGroupTaskRelation 组任务关联 + * @return 结果 + */ + public int insertDmGroupTaskRelation(DmGroupTaskRelation dmGroupTaskRelation); + + /** + * 修改组任务关联 + * + * @param dmGroupTaskRelation 组任务关联 + * @return 结果 + */ + public int updateDmGroupTaskRelation(DmGroupTaskRelation dmGroupTaskRelation); + + /** + * 批量删除组任务关联 + * + * @param ids 需要删除的组任务关联ID + * @return 结果 + */ + public int deleteDmGroupTaskRelationByIds(Long[] ids); + + /** + * 删除组任务关联信息 + * + * @param id 组任务关联ID + * @return 结果 + */ + public int deleteDmGroupTaskRelationById(Long id); + + List getByIds(List ids, SFunction... columns); + + DmGroupTaskRelationPlus getById(Long id, SFunction... columns); + + Map getMapByIds(List ids, SFunction... columns); + + List getByIds(List ids); + + Map getMapByIds(List ids); + + /** + * @param field sum 字段 + * @param where 条件 + * @param tClass 返回类型 + * @param + * @return + */ + T sum(String field, String where, Class tClass); + + Long count(String where); + + List countByGroupBy(String select, String where, String groupby, Class tClass); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerTaskGroupService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerTaskGroupService.java new file mode 100644 index 0000000..515c49b --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerTaskGroupService.java @@ -0,0 +1,89 @@ +package com.ruoyi.system.service; +import java.util.Map; +import java.util.List; +import com.ruoyi.system.domain.DmPlayerTaskGroup; +import com.ruoyi.system.domain.DmPlayerTaskGroupPlus; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.ruoyi.common.select.SelectItem; +/** + * 大漠任务组Service接口 + * + * @author luqj + * @date 2026-05-14 + */ +public interface IDmPlayerTaskGroupService extends IService +{ + + List select(String keyword); + /** + * 查询大漠任务组 + * + * @param id 大漠任务组ID + * @return 大漠任务组 + */ + public DmPlayerTaskGroup selectDmPlayerTaskGroupById(Long id); + + /** + * 查询大漠任务组列表 + * + * @param dmPlayerTaskGroup 大漠任务组 + * @return 大漠任务组集合 + */ + public List selectDmPlayerTaskGroupList(DmPlayerTaskGroup dmPlayerTaskGroup); + + /** + * 新增大漠任务组 + * + * @param dmPlayerTaskGroup 大漠任务组 + * @return 结果 + */ + public int insertDmPlayerTaskGroup(DmPlayerTaskGroup dmPlayerTaskGroup); + + /** + * 修改大漠任务组 + * + * @param dmPlayerTaskGroup 大漠任务组 + * @return 结果 + */ + public int updateDmPlayerTaskGroup(DmPlayerTaskGroup dmPlayerTaskGroup); + + /** + * 批量删除大漠任务组 + * + * @param ids 需要删除的大漠任务组ID + * @return 结果 + */ + public int deleteDmPlayerTaskGroupByIds(Long[] ids); + + /** + * 删除大漠任务组信息 + * + * @param id 大漠任务组ID + * @return 结果 + */ + public int deleteDmPlayerTaskGroupById(Long id); + + List getByIds(List ids, SFunction... columns); + + DmPlayerTaskGroupPlus getById(Long id, SFunction... columns); + + Map getMapByIds(List ids, SFunction... columns); + + List getByIds(List ids); + + Map getMapByIds(List ids); + + /** + * @param field sum 字段 + * @param where 条件 + * @param tClass 返回类型 + * @param + * @return + */ + T sum(String field, String where, Class tClass); + + Long count(String where); + + List countByGroupBy(String select, String where, String groupby, Class tClass); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerVersionService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerVersionService.java new file mode 100644 index 0000000..f2902bb --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerVersionService.java @@ -0,0 +1,89 @@ +package com.ruoyi.system.service; +import java.util.Map; +import java.util.List; +import com.ruoyi.system.domain.DmPlayerVersion; +import com.ruoyi.system.domain.DmPlayerVersionPlus; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.ruoyi.common.select.SelectItem; +/** + * 版本信息Service接口 + * + * @author luqj + * @date 2026-05-14 + */ +public interface IDmPlayerVersionService extends IService +{ + + List select(String keyword); + /** + * 查询版本信息 + * + * @param id 版本信息ID + * @return 版本信息 + */ + public DmPlayerVersion selectDmPlayerVersionById(Long id); + + /** + * 查询版本信息列表 + * + * @param dmPlayerVersion 版本信息 + * @return 版本信息集合 + */ + public List selectDmPlayerVersionList(DmPlayerVersion dmPlayerVersion); + + /** + * 新增版本信息 + * + * @param dmPlayerVersion 版本信息 + * @return 结果 + */ + public int insertDmPlayerVersion(DmPlayerVersion dmPlayerVersion); + + /** + * 修改版本信息 + * + * @param dmPlayerVersion 版本信息 + * @return 结果 + */ + public int updateDmPlayerVersion(DmPlayerVersion dmPlayerVersion); + + /** + * 批量删除版本信息 + * + * @param ids 需要删除的版本信息ID + * @return 结果 + */ + public int deleteDmPlayerVersionByIds(Long[] ids); + + /** + * 删除版本信息信息 + * + * @param id 版本信息ID + * @return 结果 + */ + public int deleteDmPlayerVersionById(Long id); + + List getByIds(List ids, SFunction... columns); + + DmPlayerVersionPlus getById(Long id, SFunction... columns); + + Map getMapByIds(List ids, SFunction... columns); + + List getByIds(List ids); + + Map getMapByIds(List ids); + + /** + * @param field sum 字段 + * @param where 条件 + * @param tClass 返回类型 + * @param + * @return + */ + T sum(String field, String where, Class tClass); + + Long count(String where); + + List countByGroupBy(String select, String where, String groupby, Class tClass); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmGroupTaskRelationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmGroupTaskRelationServiceImpl.java new file mode 100644 index 0000000..1dcc650 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmGroupTaskRelationServiceImpl.java @@ -0,0 +1,208 @@ +package com.ruoyi.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; + +import java.util.ArrayList; +import java.util.HashMap; +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.DmGroupTaskRelationMapper; +import com.ruoyi.system.domain.DmGroupTaskRelation; +import com.ruoyi.system.domain.DmGroupTaskRelationPlus; +import com.ruoyi.system.service.IDmGroupTaskRelationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import com.ruoyi.common.select.SelectItem; +/** + * 组任务关联Service业务层处理 + * + * @author luqj + * @date 2026-05-14 + */ +@Service +public class DmGroupTaskRelationServiceImpl extends ServiceImpl implements IDmGroupTaskRelationService +{ + @Autowired + private DmGroupTaskRelationMapper dmGroupTaskRelationMapper; + @Autowired + private JdbcTemplate jdbcTemplate; + + @Override + public List getByIds(List ids, SFunction... columns) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(columns).in(DmGroupTaskRelationPlus::getId, ids); + return this.list(lambdaQueryWrapper); + } + @Override + public List select(String keyword) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(DmGroupTaskRelationPlus::getId, DmGroupTaskRelationPlus::getPlayerName) + .like(DmGroupTaskRelationPlus::getPlayerName, keyword); + List list = this.list(lambdaQueryWrapper); + List result =new ArrayList<>(); + for (DmGroupTaskRelationPlus item : list){ + SelectItem selectItem = new SelectItem(); + selectItem.setName(item.getPlayerName()); + selectItem.setId(item.getId()); + result.add(selectItem); + } + return result; + } + @Override + public DmGroupTaskRelationPlus getById(Long id, SFunction... columns) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(columns).eq(DmGroupTaskRelationPlus::getId, id); + return baseMapper.selectOne(lambdaQueryWrapper); + } + + @Override + public Map getMapByIds(List ids, SFunction... columns) { + List list = this.getByIds(ids, columns); + Map map = new HashMap<>(); + for (DmGroupTaskRelationPlus item : list) { + map.put(item.getId(), item); + } + return map; + } + + @Override + public Map getMapByIds(List ids) { + List list = this.getByIds(ids); + Map map = new HashMap<>(); + for (DmGroupTaskRelationPlus item : list) { + map.put(item.getId(), item); + } + return map; + } + + @Override + public List getByIds(List ids) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper().in(DmGroupTaskRelationPlus::getId, ids); + return this.list(lambdaQueryWrapper); + } + + public T sum(String field, String where, Class tClass) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(" sum(" + field + ") as total "); + stringBuffer.append(" from dm_group_task_relation "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + T result = jdbcTemplate.queryForObject(stringBuffer.toString(), tClass); + return result; + } + + public Long count(String where) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(" count(1)"); + stringBuffer.append(" from "); + stringBuffer.append(" dm_group_task_relation "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + Long result = jdbcTemplate.queryForObject(stringBuffer.toString(), Long.class); + return result; + } + + public List countByGroupBy(String select, String where, String groupby, Class tClass) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(select); + stringBuffer.append(" from "); + stringBuffer.append(" dm_group_task_relation "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + stringBuffer.append(" group by "); + stringBuffer.append(groupby); + List result = jdbcTemplate.queryForList(stringBuffer.toString()); + List tList = JSONArray.parseArray(JSONArray.toJSONString(result), tClass); + return tList; + } + /** + * 查询组任务关联 + * + * @param id 组任务关联ID + * @return 组任务关联 + */ + @Override + public DmGroupTaskRelation selectDmGroupTaskRelationById(Long id) + { + return dmGroupTaskRelationMapper.selectDmGroupTaskRelationById(id); + } + + /** + * 查询组任务关联列表 + * + * @param dmGroupTaskRelation 组任务关联 + * @return 组任务关联 + */ + @Override + public List selectDmGroupTaskRelationList(DmGroupTaskRelation dmGroupTaskRelation) + { + return dmGroupTaskRelationMapper.selectDmGroupTaskRelationList(dmGroupTaskRelation); + } + + /** + * 新增组任务关联 + * + * @param dmGroupTaskRelation 组任务关联 + * @return 结果 + */ + @Override + public int insertDmGroupTaskRelation(DmGroupTaskRelation dmGroupTaskRelation) + { + dmGroupTaskRelation.setCreateTime(DateUtils.getNowDate()); + return dmGroupTaskRelationMapper.insertDmGroupTaskRelation(dmGroupTaskRelation); + } + + /** + * 修改组任务关联 + * + * @param dmGroupTaskRelation 组任务关联 + * @return 结果 + */ + @Override + public int updateDmGroupTaskRelation(DmGroupTaskRelation dmGroupTaskRelation) + { + dmGroupTaskRelation.setUpdateTime(DateUtils.getNowDate()); + return dmGroupTaskRelationMapper.updateDmGroupTaskRelation(dmGroupTaskRelation); + } + + /** + * 批量删除组任务关联 + * + * @param ids 需要删除的组任务关联ID + * @return 结果 + */ + @Override + public int deleteDmGroupTaskRelationByIds(Long[] ids) + { + return dmGroupTaskRelationMapper.deleteDmGroupTaskRelationByIds(ids); + } + + /** + * 删除组任务关联信息 + * + * @param id 组任务关联ID + * @return 结果 + */ + @Override + public int deleteDmGroupTaskRelationById(Long id) + { + return dmGroupTaskRelationMapper.deleteDmGroupTaskRelationById(id); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerTaskGroupServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerTaskGroupServiceImpl.java new file mode 100644 index 0000000..9c762dc --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerTaskGroupServiceImpl.java @@ -0,0 +1,208 @@ +package com.ruoyi.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; + +import java.util.ArrayList; +import java.util.HashMap; +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.DmPlayerTaskGroupMapper; +import com.ruoyi.system.domain.DmPlayerTaskGroup; +import com.ruoyi.system.domain.DmPlayerTaskGroupPlus; +import com.ruoyi.system.service.IDmPlayerTaskGroupService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import com.ruoyi.common.select.SelectItem; +/** + * 大漠任务组Service业务层处理 + * + * @author luqj + * @date 2026-05-14 + */ +@Service +public class DmPlayerTaskGroupServiceImpl extends ServiceImpl implements IDmPlayerTaskGroupService +{ + @Autowired + private DmPlayerTaskGroupMapper dmPlayerTaskGroupMapper; + @Autowired + private JdbcTemplate jdbcTemplate; + + @Override + public List getByIds(List ids, SFunction... columns) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(columns).in(DmPlayerTaskGroupPlus::getId, ids); + return this.list(lambdaQueryWrapper); + } + @Override + public List select(String keyword) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(DmPlayerTaskGroupPlus::getId, DmPlayerTaskGroupPlus::getGroupName) + .like(DmPlayerTaskGroupPlus::getGroupName, keyword); + List list = this.list(lambdaQueryWrapper); + List result =new ArrayList<>(); + for (DmPlayerTaskGroupPlus item : list){ + SelectItem selectItem = new SelectItem(); + selectItem.setName(item.getGroupName()); + selectItem.setId(item.getId()); + result.add(selectItem); + } + return result; + } + @Override + public DmPlayerTaskGroupPlus getById(Long id, SFunction... columns) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(columns).eq(DmPlayerTaskGroupPlus::getId, id); + return baseMapper.selectOne(lambdaQueryWrapper); + } + + @Override + public Map getMapByIds(List ids, SFunction... columns) { + List list = this.getByIds(ids, columns); + Map map = new HashMap<>(); + for (DmPlayerTaskGroupPlus item : list) { + map.put(item.getId(), item); + } + return map; + } + + @Override + public Map getMapByIds(List ids) { + List list = this.getByIds(ids); + Map map = new HashMap<>(); + for (DmPlayerTaskGroupPlus item : list) { + map.put(item.getId(), item); + } + return map; + } + + @Override + public List getByIds(List ids) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper().in(DmPlayerTaskGroupPlus::getId, ids); + return this.list(lambdaQueryWrapper); + } + + public T sum(String field, String where, Class tClass) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(" sum(" + field + ") as total "); + stringBuffer.append(" from dm_player_task_group "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + T result = jdbcTemplate.queryForObject(stringBuffer.toString(), tClass); + return result; + } + + public Long count(String where) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(" count(1)"); + stringBuffer.append(" from "); + stringBuffer.append(" dm_player_task_group "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + Long result = jdbcTemplate.queryForObject(stringBuffer.toString(), Long.class); + return result; + } + + public List countByGroupBy(String select, String where, String groupby, Class tClass) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(select); + stringBuffer.append(" from "); + stringBuffer.append(" dm_player_task_group "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + stringBuffer.append(" group by "); + stringBuffer.append(groupby); + List result = jdbcTemplate.queryForList(stringBuffer.toString()); + List tList = JSONArray.parseArray(JSONArray.toJSONString(result), tClass); + return tList; + } + /** + * 查询大漠任务组 + * + * @param id 大漠任务组ID + * @return 大漠任务组 + */ + @Override + public DmPlayerTaskGroup selectDmPlayerTaskGroupById(Long id) + { + return dmPlayerTaskGroupMapper.selectDmPlayerTaskGroupById(id); + } + + /** + * 查询大漠任务组列表 + * + * @param dmPlayerTaskGroup 大漠任务组 + * @return 大漠任务组 + */ + @Override + public List selectDmPlayerTaskGroupList(DmPlayerTaskGroup dmPlayerTaskGroup) + { + return dmPlayerTaskGroupMapper.selectDmPlayerTaskGroupList(dmPlayerTaskGroup); + } + + /** + * 新增大漠任务组 + * + * @param dmPlayerTaskGroup 大漠任务组 + * @return 结果 + */ + @Override + public int insertDmPlayerTaskGroup(DmPlayerTaskGroup dmPlayerTaskGroup) + { + dmPlayerTaskGroup.setCreateTime(DateUtils.getNowDate()); + return dmPlayerTaskGroupMapper.insertDmPlayerTaskGroup(dmPlayerTaskGroup); + } + + /** + * 修改大漠任务组 + * + * @param dmPlayerTaskGroup 大漠任务组 + * @return 结果 + */ + @Override + public int updateDmPlayerTaskGroup(DmPlayerTaskGroup dmPlayerTaskGroup) + { + dmPlayerTaskGroup.setUpdateTime(DateUtils.getNowDate()); + return dmPlayerTaskGroupMapper.updateDmPlayerTaskGroup(dmPlayerTaskGroup); + } + + /** + * 批量删除大漠任务组 + * + * @param ids 需要删除的大漠任务组ID + * @return 结果 + */ + @Override + public int deleteDmPlayerTaskGroupByIds(Long[] ids) + { + return dmPlayerTaskGroupMapper.deleteDmPlayerTaskGroupByIds(ids); + } + + /** + * 删除大漠任务组信息 + * + * @param id 大漠任务组ID + * @return 结果 + */ + @Override + public int deleteDmPlayerTaskGroupById(Long id) + { + return dmPlayerTaskGroupMapper.deleteDmPlayerTaskGroupById(id); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java new file mode 100644 index 0000000..332d41b --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java @@ -0,0 +1,208 @@ +package com.ruoyi.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; + +import java.util.ArrayList; +import java.util.HashMap; +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.DmPlayerVersionMapper; +import com.ruoyi.system.domain.DmPlayerVersion; +import com.ruoyi.system.domain.DmPlayerVersionPlus; +import com.ruoyi.system.service.IDmPlayerVersionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import com.ruoyi.common.select.SelectItem; +/** + * 版本信息Service业务层处理 + * + * @author luqj + * @date 2026-05-14 + */ +@Service +public class DmPlayerVersionServiceImpl extends ServiceImpl implements IDmPlayerVersionService +{ + @Autowired + private DmPlayerVersionMapper dmPlayerVersionMapper; + @Autowired + private JdbcTemplate jdbcTemplate; + + @Override + public List getByIds(List ids, SFunction... columns) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(columns).in(DmPlayerVersionPlus::getId, ids); + return this.list(lambdaQueryWrapper); + } + @Override + public List select(String keyword) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(DmPlayerVersionPlus::getId, DmPlayerVersionPlus::getTitle) + .like(DmPlayerVersionPlus::getTitle, keyword); + List list = this.list(lambdaQueryWrapper); + List result =new ArrayList<>(); + for (DmPlayerVersionPlus item : list){ + SelectItem selectItem = new SelectItem(); + selectItem.setName(item.getTitle()); + selectItem.setId(item.getId()); + result.add(selectItem); + } + return result; + } + @Override + public DmPlayerVersionPlus getById(Long id, SFunction... columns) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .select(columns).eq(DmPlayerVersionPlus::getId, id); + return baseMapper.selectOne(lambdaQueryWrapper); + } + + @Override + public Map getMapByIds(List ids, SFunction... columns) { + List list = this.getByIds(ids, columns); + Map map = new HashMap<>(); + for (DmPlayerVersionPlus item : list) { + map.put(item.getId(), item); + } + return map; + } + + @Override + public Map getMapByIds(List ids) { + List list = this.getByIds(ids); + Map map = new HashMap<>(); + for (DmPlayerVersionPlus item : list) { + map.put(item.getId(), item); + } + return map; + } + + @Override + public List getByIds(List ids) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper().in(DmPlayerVersionPlus::getId, ids); + return this.list(lambdaQueryWrapper); + } + + public T sum(String field, String where, Class tClass) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(" sum(" + field + ") as total "); + stringBuffer.append(" from dm_player_version "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + T result = jdbcTemplate.queryForObject(stringBuffer.toString(), tClass); + return result; + } + + public Long count(String where) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(" count(1)"); + stringBuffer.append(" from "); + stringBuffer.append(" dm_player_version "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + Long result = jdbcTemplate.queryForObject(stringBuffer.toString(), Long.class); + return result; + } + + public List countByGroupBy(String select, String where, String groupby, Class tClass) { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append("select "); + stringBuffer.append(select); + stringBuffer.append(" from "); + stringBuffer.append(" dm_player_version "); + if (StringUtils.isNotBlank(where)) { + stringBuffer.append(" where "); + stringBuffer.append(where); + } + stringBuffer.append(" group by "); + stringBuffer.append(groupby); + List result = jdbcTemplate.queryForList(stringBuffer.toString()); + List tList = JSONArray.parseArray(JSONArray.toJSONString(result), tClass); + return tList; + } + /** + * 查询版本信息 + * + * @param id 版本信息ID + * @return 版本信息 + */ + @Override + public DmPlayerVersion selectDmPlayerVersionById(Long id) + { + return dmPlayerVersionMapper.selectDmPlayerVersionById(id); + } + + /** + * 查询版本信息列表 + * + * @param dmPlayerVersion 版本信息 + * @return 版本信息 + */ + @Override + public List selectDmPlayerVersionList(DmPlayerVersion dmPlayerVersion) + { + return dmPlayerVersionMapper.selectDmPlayerVersionList(dmPlayerVersion); + } + + /** + * 新增版本信息 + * + * @param dmPlayerVersion 版本信息 + * @return 结果 + */ + @Override + public int insertDmPlayerVersion(DmPlayerVersion dmPlayerVersion) + { + dmPlayerVersion.setCreateTime(DateUtils.getNowDate()); + return dmPlayerVersionMapper.insertDmPlayerVersion(dmPlayerVersion); + } + + /** + * 修改版本信息 + * + * @param dmPlayerVersion 版本信息 + * @return 结果 + */ + @Override + public int updateDmPlayerVersion(DmPlayerVersion dmPlayerVersion) + { + dmPlayerVersion.setUpdateTime(DateUtils.getNowDate()); + return dmPlayerVersionMapper.updateDmPlayerVersion(dmPlayerVersion); + } + + /** + * 批量删除版本信息 + * + * @param ids 需要删除的版本信息ID + * @return 结果 + */ + @Override + public int deleteDmPlayerVersionByIds(Long[] ids) + { + return dmPlayerVersionMapper.deleteDmPlayerVersionByIds(ids); + } + + /** + * 删除版本信息信息 + * + * @param id 版本信息ID + * @return 结果 + */ + @Override + public int deleteDmPlayerVersionById(Long id) + { + return dmPlayerVersionMapper.deleteDmPlayerVersionById(id); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java index e246f9a..1d407a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerentServiceImpl.java @@ -287,7 +287,7 @@ public class DmPlayerentServiceImpl extends ServiceImpl(), new HashMap<>()); + JSONObject jsonObject = JSONObject.parseObject(result); + if (jsonObject.getString("code").equals("1")) { + return true; + } + System.out.println(result); + } catch (Exception e) { + throw new RuntimeException(e); + } } return true; } diff --git a/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml new file mode 100644 index 0000000..c84c82c --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + select id, group_id, player_id, player_name, account_id, window_index, window_hwnd, is_master, status, create_time, update_time from dm_group_task_relation + + + + + + + + insert into dm_group_task_relation + + group_id, + player_id, + player_name, + account_id, + window_index, + window_hwnd, + is_master, + status, + create_time, + update_time, + + + #{groupId}, + #{playerId}, + #{playerName}, + #{accountId}, + #{windowIndex}, + #{windowHwnd}, + #{isMaster}, + #{status}, + #{createTime}, + #{updateTime}, + + + + + update dm_group_task_relation + + group_id = #{groupId}, + player_id = #{playerId}, + player_name = #{playerName}, + account_id = #{accountId}, + window_index = #{windowIndex}, + window_hwnd = #{windowHwnd}, + is_master = #{isMaster}, + status = #{status}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dm_group_task_relation where id = #{id} + + + + delete from dm_group_task_relation where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/DmPlayerTaskGroupMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DmPlayerTaskGroupMapper.xml new file mode 100644 index 0000000..a9d9011 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/DmPlayerTaskGroupMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + select id, group_code, group_name, type, status, remark, create_time, update_time from dm_player_task_group + + + + + + + + insert into dm_player_task_group + + group_code, + group_name, + type, + status, + remark, + create_time, + update_time, + + + #{groupCode}, + #{groupName}, + #{type}, + #{status}, + #{remark}, + #{createTime}, + #{updateTime}, + + + + + update dm_player_task_group + + group_code = #{groupCode}, + group_name = #{groupName}, + type = #{type}, + status = #{status}, + remark = #{remark}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dm_player_task_group where id = #{id} + + + + delete from dm_player_task_group where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/DmPlayerVersionMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DmPlayerVersionMapper.xml new file mode 100644 index 0000000..f156f66 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/DmPlayerVersionMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + select id, title, version_num, config_url, proxy_url, create_time, update_time from dm_player_version + + + + + + + + insert into dm_player_version + + id, + title, + version_num, + config_url, + proxy_url, + create_time, + update_time, + + + #{id}, + #{title}, + #{versionNum}, + #{configUrl}, + #{proxyUrl}, + #{createTime}, + #{updateTime}, + + + + + update dm_player_version + + title = #{title}, + version_num = #{versionNum}, + config_url = #{configUrl}, + proxy_url = #{proxyUrl}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from dm_player_version where id = #{id} + + + + delete from dm_player_version where id in + + #{id} + + + \ No newline at end of file From 1365ef660be4cf7cddef5858aa35a70743106274 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Thu, 14 May 2026 09:21:40 -0400 Subject: [PATCH 20/24] 1 --- .../controller/DmPlayerVersionController.java | 13 ++++++- .../system/domain/DmVersionUpdateVo.java | 14 +++++++ .../service/IDmPlayerVersionService.java | 4 ++ .../impl/DmPlayerVersionServiceImpl.java | 38 +++++++++++++++++-- 4 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/DmVersionUpdateVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerVersionController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerVersionController.java index cb72ad0..2fd2181 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerVersionController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/DmPlayerVersionController.java @@ -2,6 +2,8 @@ package com.ruoyi.system.controller; import com.ruoyi.common.select.Ids; import com.ruoyi.common.select.SelectItem; import java.util.List; + +import com.ruoyi.system.domain.DmVersionUpdateVo; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -93,7 +95,16 @@ public class DmPlayerVersionController extends BaseController { return toAjax(dmPlayerVersionService.insertDmPlayerVersion(dmPlayerVersion)); } - + /** + * 新增版本信息 + */ + @PreAuthorize("@ss.hasPermi('system:dmversion:playerent-update')") + @Log(title = "版本信息", businessType = BusinessType.INSERT) + @PostMapping("playerent-update") + public AjaxResult playerentUpdate(@RequestBody DmVersionUpdateVo vo) + { + return toAjax(dmPlayerVersionService.playerentUpdate(vo)); + } /** * 修改版本信息 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmVersionUpdateVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmVersionUpdateVo.java new file mode 100644 index 0000000..d44538f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmVersionUpdateVo.java @@ -0,0 +1,14 @@ +package com.ruoyi.system.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class DmVersionUpdateVo implements Serializable { + private static final long serialVersionUID = 1L; + private Long id; + + private List playerIds; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerVersionService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerVersionService.java index f2902bb..3d7f9d9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerVersionService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IDmPlayerVersionService.java @@ -6,6 +6,8 @@ import com.ruoyi.system.domain.DmPlayerVersionPlus; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.ruoyi.common.select.SelectItem; +import com.ruoyi.system.domain.DmVersionUpdateVo; + /** * 版本信息Service接口 * @@ -40,6 +42,8 @@ public interface IDmPlayerVersionService extends IService */ public int insertDmPlayerVersion(DmPlayerVersion dmPlayerVersion); + + public boolean playerentUpdate(DmVersionUpdateVo vo); /** * 修改版本信息 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java index 332d41b..d5a9216 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java @@ -1,18 +1,21 @@ package com.ruoyi.system.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import java.util.ArrayList; -import java.util.HashMap; +import java.net.URLEncoder; +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 com.ruoyi.system.domain.DmVersionUpdateVo; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.ruoyi.system.mapper.DmPlayerVersionMapper; import com.ruoyi.system.domain.DmPlayerVersion; @@ -30,6 +33,11 @@ import com.ruoyi.common.select.SelectItem; @Service public class DmPlayerVersionServiceImpl extends ServiceImpl implements IDmPlayerVersionService { + @Value("${dm.server.ip:192.168.3.103}") + private String serverIp; + @Value("${dm.server.port:8080}") + private Integer serverPort; + private HttpHelper httpHelper = new HttpHelper(); @Autowired private DmPlayerVersionMapper dmPlayerVersionMapper; @Autowired @@ -169,6 +177,28 @@ public class DmPlayerVersionServiceImpl extends ServiceImpl(), new HashMap<>()); + JSONObject jsonObject = JSONObject.parseObject(result); + if (jsonObject.getString("code").equals("1")) { + return true; + } + System.out.println(result); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + return false; + } + /** * 修改版本信息 * From e22f6b510bac401631ca5c82221cffd94fe83c0d Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Thu, 14 May 2026 09:36:29 -0400 Subject: [PATCH 21/24] 123 --- .../system/service/impl/DmPlayerVersionServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java index d5a9216..bf69b38 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DmPlayerVersionServiceImpl.java @@ -184,7 +184,12 @@ public class DmPlayerVersionServiceImpl extends ServiceImpl(), new HashMap<>()); JSONObject jsonObject = JSONObject.parseObject(result); From 89e9cccf1d0956e323db4457ef57f2e07b09216e Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Thu, 14 May 2026 22:42:45 -0400 Subject: [PATCH 22/24] 11 --- .../src/main/resources/mapper/system/DmPlayerConfigMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ruoyi-system/src/main/resources/mapper/system/DmPlayerConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DmPlayerConfigMapper.xml index 738dcf9..aca753e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/DmPlayerConfigMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/DmPlayerConfigMapper.xml @@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" yolo_width, custom_params, fixed_direction, + shoutKey, #{playerId}, @@ -67,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{yoloWidth}, #{customParams}, #{fixedDirection}, + #{shoutKey}, @@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" yolo_width = #{yoloWidth}, custom_params = #{customParams}, fixed_direction = #{fixedDirection}, + shout_key = #{shoutKey}, where id = #{id} From 69706cfbcd555fbe0f2ce182e90502a233840588 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Thu, 14 May 2026 23:46:01 -0400 Subject: [PATCH 23/24] 1 --- .../system/domain/DmGroupTaskRelation.java | 23 ++++++++++++++++++- .../domain/DmGroupTaskRelationPlus.java | 23 ++++++++++++++++++- .../system/DmGroupTaskRelationMapper.xml | 10 +++++++- 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java index 1f953a1..90c71dc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelation.java @@ -49,8 +49,29 @@ public class DmGroupTaskRelation extends BaseEntity /** 状态 */ @Excel(name = "状态") private Integer status; + @Excel(name = "x") + private Integer x; - public void setId(Long id) + @Excel(name = "y") + private Integer y; + + public Integer getX() { + return x; + } + + public void setX(Integer x) { + this.x = x; + } + + public Integer getY() { + return y; + } + + public void setY(Integer y) { + this.y = y; + } + + public void setId(Long id) { this.id = id; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java index 68333a8..d285532 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/DmGroupTaskRelationPlus.java @@ -44,6 +44,11 @@ public class DmGroupTaskRelationPlus implements Serializable /** 状态 */ @Excel(name = "状态") private Integer status; + @Excel(name = "x") + private Integer x; + + @Excel(name = "y") + private Integer y; /** 创建时间 */ private Date createTime; /** 更新时间 */ @@ -53,7 +58,23 @@ public class DmGroupTaskRelationPlus implements Serializable this.id = id; } - public Long getId() + public Integer getX() { + return x; + } + + public void setX(Integer x) { + this.x = x; + } + + public Integer getY() { + return y; + } + + public void setY(Integer y) { + this.y = y; + } + + public Long getId() { return id; } diff --git a/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml index c84c82c..9b845d8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/DmGroupTaskRelationMapper.xml @@ -14,12 +14,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, group_id, player_id, player_name, account_id, window_index, window_hwnd, is_master, status, create_time, update_time from dm_group_task_relation + select id, group_id,`x`,`y`, player_id, player_name, account_id, window_index, window_hwnd, is_master, status, create_time, update_time from dm_group_task_relation