123
This commit is contained in:
1 parent
77557ce4af
commit
06830916f6
4 files changed
+33
-2
No files matched your search
@@ -4,6 +4,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
|
|||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
import com.ruoyi.common.annotation.Excel;
|
import com.ruoyi.common.annotation.Excel;
|
||||||
import com.ruoyi.common.core.domain.BaseEntity;
|
import com.ruoyi.common.core.domain.BaseEntity;
|
||||||
|
import org.springframework.data.annotation.Transient;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
/**
|
/**
|
||||||
* 大漠任务组对象 dm_player_task_group
|
* 大漠任务组对象 dm_player_task_group
|
||||||
@@ -33,8 +35,18 @@ public class DmPlayerTaskGroup extends BaseEntity
|
|||||||
/** 状态 */
|
/** 状态 */
|
||||||
@Excel(name = "状态")
|
@Excel(name = "状态")
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
@Transient
|
||||||
|
private transient Long masterPlayerId;
|
||||||
|
|
||||||
public void setId(Long id)
|
public Long getMasterPlayerId() {
|
||||||
|
return masterPlayerId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMasterPlayerId(Long masterPlayerId) {
|
||||||
|
this.masterPlayerId = masterPlayerId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setId(Long id)
|
||||||
{
|
{
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ public interface IDmGroupTaskRelationService extends IService<DmGroupTaskRelatio
|
|||||||
|
|
||||||
Map<Long, DmGroupTaskRelationPlus> getMapByIds(List<Long> ids);
|
Map<Long, DmGroupTaskRelationPlus> getMapByIds(List<Long> ids);
|
||||||
|
|
||||||
|
Long getMasterPlayerIdByGroupId(Long groupId);
|
||||||
/**
|
/**
|
||||||
* @param field sum 字段
|
* @param field sum 字段
|
||||||
* @param where 条件
|
* @param where 条件
|
||||||
|
|||||||
+12
@@ -88,6 +88,18 @@ public class DmGroupTaskRelationServiceImpl extends ServiceImpl<DmGroupTaskRelat
|
|||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long getMasterPlayerIdByGroupId(Long groupId) {
|
||||||
|
LambdaQueryWrapper<DmGroupTaskRelationPlus> lambdaQueryWrapper = new LambdaQueryWrapper<DmGroupTaskRelationPlus>()
|
||||||
|
.select(DmGroupTaskRelationPlus::getPlayerId).eq(DmGroupTaskRelationPlus::getIsMaster, 1)
|
||||||
|
.eq(DmGroupTaskRelationPlus::getGroupId,groupId);
|
||||||
|
DmGroupTaskRelationPlus dmGroupTaskRelationPlus = getOne(lambdaQueryWrapper);
|
||||||
|
if(dmGroupTaskRelationPlus != null){
|
||||||
|
return dmGroupTaskRelationPlus.getPlayerId();
|
||||||
|
}
|
||||||
|
return -1L;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<DmGroupTaskRelationPlus> getByIds(List<Long> ids) {
|
public List<DmGroupTaskRelationPlus> getByIds(List<Long> ids) {
|
||||||
LambdaQueryWrapper<DmGroupTaskRelationPlus> lambdaQueryWrapper = new LambdaQueryWrapper<DmGroupTaskRelationPlus>().in(DmGroupTaskRelationPlus::getId, ids);
|
LambdaQueryWrapper<DmGroupTaskRelationPlus> lambdaQueryWrapper = new LambdaQueryWrapper<DmGroupTaskRelationPlus>().in(DmGroupTaskRelationPlus::getId, ids);
|
||||||
|
|||||||
+7
-1
@@ -12,7 +12,9 @@ import com.ruoyi.common.utils.StringUtils;
|
|||||||
import com.ruoyi.system.domain.DmGroupOperateVo;
|
import com.ruoyi.system.domain.DmGroupOperateVo;
|
||||||
import com.ruoyi.system.domain.DmPlayerTaskGroup;
|
import com.ruoyi.system.domain.DmPlayerTaskGroup;
|
||||||
import com.ruoyi.system.domain.DmPlayerTaskGroupPlus;
|
import com.ruoyi.system.domain.DmPlayerTaskGroupPlus;
|
||||||
|
import com.ruoyi.system.mapper.DmGroupTaskRelationMapper;
|
||||||
import com.ruoyi.system.mapper.DmPlayerTaskGroupMapper;
|
import com.ruoyi.system.mapper.DmPlayerTaskGroupMapper;
|
||||||
|
import com.ruoyi.system.service.IDmGroupTaskRelationService;
|
||||||
import com.ruoyi.system.service.IDmPlayerTaskGroupService;
|
import com.ruoyi.system.service.IDmPlayerTaskGroupService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
@@ -34,6 +36,8 @@ public class DmPlayerTaskGroupServiceImpl extends ServiceImpl<DmPlayerTaskGroupM
|
|||||||
@Autowired
|
@Autowired
|
||||||
private DmPlayerTaskGroupMapper dmPlayerTaskGroupMapper;
|
private DmPlayerTaskGroupMapper dmPlayerTaskGroupMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
private IDmGroupTaskRelationService dmGroupTaskRelationService;
|
||||||
|
@Autowired
|
||||||
private JdbcTemplate jdbcTemplate;
|
private JdbcTemplate jdbcTemplate;
|
||||||
@Value("${dm.server.ip:192.168.3.103}")
|
@Value("${dm.server.ip:192.168.3.103}")
|
||||||
private String serverIp;
|
private String serverIp;
|
||||||
@@ -173,7 +177,9 @@ public class DmPlayerTaskGroupServiceImpl extends ServiceImpl<DmPlayerTaskGroupM
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public DmPlayerTaskGroup selectDmPlayerTaskGroupById(Long id) {
|
public DmPlayerTaskGroup selectDmPlayerTaskGroupById(Long id) {
|
||||||
return dmPlayerTaskGroupMapper.selectDmPlayerTaskGroupById(id);
|
DmPlayerTaskGroup dmPlayerTaskGroup = dmPlayerTaskGroupMapper.selectDmPlayerTaskGroupById(id);
|
||||||
|
dmPlayerTaskGroup.setMasterPlayerId(dmGroupTaskRelationService.getMasterPlayerIdByGroupId(id));
|
||||||
|
return dmPlayerTaskGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in new issue
Block a user