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 index 1dcc650..93d72a8 100644 --- 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 @@ -1,39 +1,41 @@ 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.select.SelectItem; 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.common.utils.StringUtils; import com.ruoyi.system.domain.DmGroupTaskRelation; import com.ruoyi.system.domain.DmGroupTaskRelationPlus; +import com.ruoyi.system.domain.DmPlayerent; +import com.ruoyi.system.mapper.DmGroupTaskRelationMapper; +import com.ruoyi.system.mapper.DmPlayerentMapper; 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; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * 组任务关联Service业务层处理 - * + * * @author luqj * @date 2026-05-14 */ @Service -public class DmGroupTaskRelationServiceImpl extends ServiceImpl implements IDmGroupTaskRelationService -{ +public class DmGroupTaskRelationServiceImpl extends ServiceImpl implements IDmGroupTaskRelationService { @Autowired private DmGroupTaskRelationMapper dmGroupTaskRelationMapper; @Autowired private JdbcTemplate jdbcTemplate; + @Autowired + private DmPlayerentMapper dmPlayerentMapper; @Override public List getByIds(List ids, SFunction... columns) { @@ -41,14 +43,15 @@ public class DmGroupTaskRelationServiceImpl extends ServiceImpl 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){ + List result = new ArrayList<>(); + for (DmGroupTaskRelationPlus item : list) { SelectItem selectItem = new SelectItem(); selectItem.setName(item.getPlayerName()); selectItem.setId(item.getId()); @@ -56,6 +59,7 @@ public class DmGroupTaskRelationServiceImpl extends ServiceImpl... columns) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() @@ -132,77 +136,96 @@ public class DmGroupTaskRelationServiceImpl extends ServiceImpl tList = JSONArray.parseArray(JSONArray.toJSONString(result), tClass); return tList; } + /** * 查询组任务关联 - * + * * @param id 组任务关联ID * @return 组任务关联 */ @Override - public DmGroupTaskRelation selectDmGroupTaskRelationById(Long id) - { + public DmGroupTaskRelation selectDmGroupTaskRelationById(Long id) { return dmGroupTaskRelationMapper.selectDmGroupTaskRelationById(id); } /** * 查询组任务关联列表 - * + * * @param dmGroupTaskRelation 组任务关联 * @return 组任务关联 */ @Override - public List selectDmGroupTaskRelationList(DmGroupTaskRelation dmGroupTaskRelation) - { + public List selectDmGroupTaskRelationList(DmGroupTaskRelation dmGroupTaskRelation) { return dmGroupTaskRelationMapper.selectDmGroupTaskRelationList(dmGroupTaskRelation); } /** * 新增组任务关联 - * + * * @param dmGroupTaskRelation 组任务关联 * @return 结果 */ @Override - public int insertDmGroupTaskRelation(DmGroupTaskRelation dmGroupTaskRelation) - { + public int insertDmGroupTaskRelation(DmGroupTaskRelation dmGroupTaskRelation) { + if (dmGroupTaskRelation.getStatus() == null) { + dmGroupTaskRelation.setStatus(1); + } + if (dmGroupTaskRelation.getWindowIndex() == null) { + dmGroupTaskRelation.setWindowIndex(0L); + } + DmPlayerent dmPlayerent = dmPlayerentMapper.selectDmPlayerentById(dmGroupTaskRelation.getPlayerId()); + if (dmPlayerent == null) { + throw new RuntimeException("找不到player"); + } + dmGroupTaskRelation.setAccountId(dmPlayerent.getAccountid()); + dmGroupTaskRelation.setPlayerName(dmPlayerent.getName()); dmGroupTaskRelation.setCreateTime(DateUtils.getNowDate()); return dmGroupTaskRelationMapper.insertDmGroupTaskRelation(dmGroupTaskRelation); } /** * 修改组任务关联 - * + * * @param dmGroupTaskRelation 组任务关联 * @return 结果 */ @Override - public int updateDmGroupTaskRelation(DmGroupTaskRelation dmGroupTaskRelation) - { + public int updateDmGroupTaskRelation(DmGroupTaskRelation dmGroupTaskRelation) { + if (dmGroupTaskRelation.getStatus() == null) { + dmGroupTaskRelation.setStatus(1); + } + if (dmGroupTaskRelation.getWindowIndex() == null) { + dmGroupTaskRelation.setWindowIndex(0L); + } + DmPlayerent dmPlayerent = dmPlayerentMapper.selectDmPlayerentById(dmGroupTaskRelation.getPlayerId()); + if (dmPlayerent == null) { + throw new RuntimeException("找不到player"); + } + dmGroupTaskRelation.setAccountId(dmPlayerent.getAccountid()); + dmGroupTaskRelation.setPlayerName(dmPlayerent.getName()); dmGroupTaskRelation.setUpdateTime(DateUtils.getNowDate()); return dmGroupTaskRelationMapper.updateDmGroupTaskRelation(dmGroupTaskRelation); } /** * 批量删除组任务关联 - * + * * @param ids 需要删除的组任务关联ID * @return 结果 */ @Override - public int deleteDmGroupTaskRelationByIds(Long[] ids) - { + public int deleteDmGroupTaskRelationByIds(Long[] ids) { return dmGroupTaskRelationMapper.deleteDmGroupTaskRelationByIds(ids); } /** * 删除组任务关联信息 - * + * * @param id 组任务关联ID * @return 结果 */ @Override - public int deleteDmGroupTaskRelationById(Long id) - { + public int deleteDmGroupTaskRelationById(Long id) { return dmGroupTaskRelationMapper.deleteDmGroupTaskRelationById(id); } }