From 354cc1c2c7ff69c1183d77f1761a71d1ad5669da Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 30 九月 2025 10:46:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java | 127 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 127 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java index fe086be..0e94d2f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java @@ -1,19 +1,38 @@ package com.ruoyi.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.core.domain.BaseModel; +import com.ruoyi.common.core.domain.BasePage; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.system.dto.TMissionUserDto; import com.ruoyi.system.mapper.TMissionMapper; +import com.ruoyi.system.mapper.TMissionUserMapper; import com.ruoyi.system.model.TMission; +import com.ruoyi.system.model.TMissionUser; import com.ruoyi.system.query.TMissionQuery; import com.ruoyi.system.service.TMissionService; +import com.ruoyi.system.vo.MissionTotalVo; import com.ruoyi.system.vo.TMissionReassignVO; import com.ruoyi.system.vo.TMissionVO; +import com.ruoyi.system.vo.TotalHistoryVo; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.text.SimpleDateFormat; import java.time.Duration; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; import java.util.Objects; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; /** * <p> @@ -25,6 +44,12 @@ */ @Service public class TMissionServiceImpl extends ServiceImpl<TMissionMapper, TMission> implements TMissionService { + + @Resource + private TMissionUserMapper missionUserMapper; + + @Resource + private RedisCache redisCache; @Override public PageInfo<TMissionVO> pageListAssigned(TMissionQuery query) { @@ -89,4 +114,106 @@ pageInfo.setRecords(list); return pageInfo; } + + @Override + public TotalHistoryVo totalHistory(String userId) { + TotalHistoryVo totalHistoryVo = new TotalHistoryVo(); + List<TMissionUser> tMissionUsers = missionUserMapper.selectList(new LambdaQueryWrapper<TMissionUser>().eq(TMissionUser::getAppUserId, userId)); + if(tMissionUsers.isEmpty()){ + return totalHistoryVo; + } + long count = tMissionUsers.stream().filter(e -> e.getStatus() == 1).count(); + BigDecimal successRate = new BigDecimal(count).divide(new BigDecimal(tMissionUsers.size()), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + totalHistoryVo.setSuccessRate(successRate); + + long count1 = tMissionUsers.stream().filter(e -> e.getStatus() == 2).count(); + BigDecimal failRate = new BigDecimal(count1).divide(new BigDecimal(tMissionUsers.size()), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + totalHistoryVo.setFailRate(failRate); + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM"); + // 查询当前时间的年月日 + String now = LocalDate.now().toString(); + List<TMissionUser> todayMissionUsers = tMissionUsers.stream().filter(e -> now.equals(simpleDateFormat.format(e.getSuccessTime()))).collect(Collectors.toList()); + totalHistoryVo.setTodaySuccessNum(todayMissionUsers.size()); + // 查询当前时间的年月 + String firstDayOfMonth = LocalDate.now().withDayOfMonth(1).toString().substring(0, 7); + + List<TMissionUser> monthMissionUsers = tMissionUsers.stream().filter(e -> firstDayOfMonth.equals(simpleDateFormat1.format(e.getSuccessTime()))).collect(Collectors.toList()); + totalHistoryVo.setMonthSuccessNum(monthMissionUsers.size()); + return totalHistoryVo; + } + + @Override + public void successMission(TMissionUserDto dto) { + + } + + @Override + public PageInfo<TMissionVO> pageList(TMissionQuery query) { + + return null; + } + + @Override + public MissionTotalVo missionTotal(String userId) { + MissionTotalVo missionTotalVo = new MissionTotalVo(); + List<TMissionUser> tMissionUsers = missionUserMapper.selectList(new LambdaQueryWrapper<TMissionUser>().eq(TMissionUser::getAppUserId, userId).eq(TMissionUser::getStatus, 0)); + if(tMissionUsers.isEmpty()){ + return missionTotalVo; + } + List<String> missionIds = tMissionUsers.stream().map(TMissionUser::getMissionId).collect(Collectors.toList()); + List<TMission> tMissions = this.baseMapper.selectBatchIds(missionIds); + long count = tMissions.stream().filter(e -> e.getStatus() == 2).count(); + missionTotalVo.setNowNum((int) count); + missionTotalVo.setWaitNum(tMissions.size()-missionTotalVo.getNowNum()); + + List<TMissionUser> collect = tMissionUsers.stream().filter(e -> e.getStatus() == 1).collect(Collectors.toList()); + missionTotalVo.setRate(new BigDecimal(collect.size()).divide(new BigDecimal(tMissionUsers.size()),2, RoundingMode.HALF_UP)); + + return missionTotalVo; + } + + @Override + public String grabMission(String missionId, String userId) { + try { + boolean b = redisCache.trylockLoop(missionId, UUID.randomUUID().toString(), 30); + if(b){ + TMissionUser tMissionUser = new TMissionUser(); + tMissionUser.setAppUserId(userId); + tMissionUser.setMissionId(missionId); + tMissionUser.setStatus(0); + tMissionUser.setUserType(1); + missionUserMapper.insert(tMissionUser); + return tMissionUser.getMissionId(); + + } + }finally { + redisCache.unlock(missionId, UUID.randomUUID().toString()); + } + return null; + } + + @Override + public PageInfo<TMission> pageNowList(BasePage query,String userId) { + PageInfo<TMission> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<TMission> list = this.baseMapper.pageNowList(pageInfo,userId); + pageInfo.setRecords(list); + return pageInfo; + } + + @Override + public PageInfo<TMission> pageGrabList(BasePage query) { + PageInfo<TMission> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + PageInfo<TMission> tMissionPageInfo = this.baseMapper.selectPage(pageInfo, new LambdaQueryWrapper<TMission>().eq(TMission::getStatus, 1).eq(TMission::getIsMissionPool, 1).orderByDesc(BaseModel::getCreateTime)); + return tMissionPageInfo; + } + + @Override + public PageInfo<TMission> pageHistoryList(BasePage query, String userId) { + PageInfo<TMission> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + List<TMission> list = this.baseMapper.pageHistoryList(pageInfo,userId); + pageInfo.setRecords(list); + return pageInfo; + } } -- Gitblit v1.7.1