moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.1 家族列表

Browse Source
This commit is contained in:
yeungchihang
2022-10-10 18:26:43 +08:00
parent f64e3a95e9
commit 97768c0b8b
4 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/ClanService.java
View File

@@ -105,6 +105,8 @@ public interface ClanService extends IService<Clan> {
*/
List<ClanRankListVO> listClanRankV2();
List<ClanRankListVO> listClan();
List<Clan> getValidClanByUid(Long clanElderUid);
}

40
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/impl/ClanServiceImpl.java
View File

@@ -37,7 +37,6 @@ import com.accompany.core.model.Users;
import com.accompany.core.service.common.JedisService;
import com.accompany.core.service.user.UsersBaseService;
import com.accompany.core.vo.UserLevelVo;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Maps;
@@ -251,21 +250,21 @@ public class ClanServiceImpl extends ServiceImpl<ClanMapper, Clan> implements Cl
return clanMapper.getClanBaseInfoByUid(uid);
}
/**
* 填充等级信息
*
* @param memberList
*/
private void fillLevelVo(List<ClanMemberVO> memberList) {
if (CollectionUtils.isNotEmpty(memberList)) {
List<String> uids = memberList.stream().map(member -> member.getUid().toString()).collect(Collectors.toList());
Map<Long, UserLevelVo> userLevelVoMap = levelService.getUserLevelVoMap(uids.toArray(new String[uids.size()]));
memberList.forEach((member) -> member.setUserLevelVo(userLevelVoMap.get(member.getUid())));
}
@Override
public List<ClanRankListVO> listClanRankV2() {
Long begin = Long.valueOf((Constant.DEFAULT_PAGE - 1) * Constant.DEFAULT_PAGE_SIZE);
Long end = Long.valueOf(Constant.DEFAULT_PAGE * Constant.DEFAULT_PAGE_SIZE - 1);
return rankClanList(begin, end);
}
@Override
public List<ClanRankListVO> listClanRankV2() {
public List<ClanRankListVO> listClan() {
Long begin = Long.MIN_VALUE;
Long end = Long.MAX_VALUE;
return rankClanList(begin, end);
}
private List<ClanRankListVO> rankClanList(Long begin, Long end) {
// 获取家族列表
List<ClanRankListVO> clanRankListVOS = clanMapper.listClanRankWithOutIncome();
@@ -286,8 +285,6 @@ public class ClanServiceImpl extends ServiceImpl<ClanMapper, Clan> implements Cl
Date date = new Date();
Long begin = Long.valueOf((Constant.DEFAULT_PAGE - 1) * Constant.DEFAULT_PAGE_SIZE);
Long end = Long.valueOf(Constant.DEFAULT_PAGE * Constant.DEFAULT_PAGE_SIZE - 1);
// 获取家族的周流水
Set<Map<String, Object>> mapSet = jedisService.zrevrangeWithScore(getClanWeekKey(date), begin, end);
if (!CollectionUtils.isEmpty(mapSet)) {
@@ -314,6 +311,19 @@ public class ClanServiceImpl extends ServiceImpl<ClanMapper, Clan> implements Cl
return clanRankListVOS;
}
/**
* 填充等级信息
*
* @param memberList
*/
private void fillLevelVo(List<ClanMemberVO> memberList) {
if (CollectionUtils.isNotEmpty(memberList)) {
List<String> uids = memberList.stream().map(member -> member.getUid().toString()).collect(Collectors.toList());
Map<Long, UserLevelVo> userLevelVoMap = levelService.getUserLevelVoMap(uids.toArray(new String[uids.size()]));
memberList.forEach((member) -> member.setUserLevelVo(userLevelVoMap.get(member.getUid())));
}
}
private String getClanWeekKey(Date date) {
String key = Constant.RankDatetype.week.toString() + ":" + DateTimeUtil.convertDate(DateTimeUtil.getMonday(date, 0, 0, 0), DateTimeUtil.DEFAULT_DATE_PATTERN);
return RedisKey.clan_rank.getKey(key);

7
accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/ClanMapper.xml
View File

@@ -196,10 +196,9 @@
</select>
<select id="listClanRankWithOutIncome" resultMap="clanRankListVO">
SELECT IFNULL(c.avatar,u.avatar) avatar, c.`name` , cl.level_icon, c.id, c.level, c.clan_elder_uid uid
from clan c, users u, clan_level_setting cl
where c.clan_elder_uid = u.uid
and c.`status` = 1
SELECT c.avatar, c.`name` , cl.level_icon, c.id, c.level, c.clan_elder_uid uid
from clan c, clan_level_setting cl
where c.`status` = 1
and c.`level` = cl.`level`
</select>
</mapper>

7
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanController.java
View File

@@ -96,4 +96,11 @@ public class ClanController extends BaseController {
public BaseResponseVO<List<ClanRankListVO>> listClanRank() {
return new BaseResponseVO(BusinessStatusCodeEnum.SUCCESS, clanService.listClanRankV2());
}
@ApiOperation("获取家族信息")
@RequestMapping(value = "/list", method = RequestMethod.GET)
@Authorization
public BaseResponseVO<List<ClanRankListVO>> listClan() {
return new BaseResponseVO(BusinessStatusCodeEnum.SUCCESS, clanService.listClan());
}
}