From 1cebcbd79fd408e17aa59e434b396476e117fc1c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:06:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java | 88 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 4 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 6889082..5accc32 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
@@ -13,10 +13,12 @@
import com.ruoyi.system.dto.EquipmentDto;
import com.ruoyi.system.dto.TMissionUserDto;
import com.ruoyi.system.mapper.TAppUserEquipmentMapper;
+import com.ruoyi.system.mapper.TMissionAssignRuleMapper;
import com.ruoyi.system.mapper.TMissionMapper;
import com.ruoyi.system.mapper.TMissionUserMapper;
import com.ruoyi.system.model.TAppUserEquipment;
import com.ruoyi.system.model.TMission;
+import com.ruoyi.system.model.TMissionAssignRule;
import com.ruoyi.system.model.TMissionUser;
import com.ruoyi.system.query.TMissionQuery;
import com.ruoyi.system.service.TMissionService;
@@ -32,14 +34,12 @@
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
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;
/**
@@ -61,6 +61,9 @@
@Resource
private TAppUserEquipmentMapper appUserEquipmentMapper;
+
+ @Resource
+ private TMissionAssignRuleMapper missionAssignRuleMapper;
@Override
public PageInfo<TMissionVO> pageListAssigned(TMissionQuery query) {
@@ -158,12 +161,36 @@
@Override
public void successMission(TMissionUserDto dto, String userId) {
TMissionUser user = missionUserMapper.selectById(dto.getId());
+ user.setSuccessTime(new Date());
BeanUtils.copyProperties(dto, user);
- missionUserMapper.updateById(user);
+
+ // 判断这个任务还有正在执行的不
+ Long l = missionUserMapper.selectCount(new LambdaQueryWrapper<TMissionUser>().eq(TMissionUser::getMissionId, user.getMissionId()).eq(TMissionUser::getStatus, 0));
+ if (l == 0){
+
+ TMission tMission = this.getById(user.getMissionId());
+ tMission.setFinishTime(LocalDateTime.now());
+ // 判断是否全部完成
+ Long unSuccessCount = missionUserMapper.selectCount(new LambdaQueryWrapper<TMissionUser>().eq(TMissionUser::getMissionId, user.getMissionId()).eq(TMissionUser::getStatus, 2));
+ if(unSuccessCount>0){
+ tMission.setStatus(6);
+ }else {
+ tMission.setStatus(4);
+ }
+ LocalDateTime assignTime = tMission.getAssignTime();
+ tMission.setSuccessTime((double) Duration.between(assignTime, tMission.getFinishTime()).toHours());
+ this.updateById(tMission);
+ }
+
+
// 更新装备
TAppUserEquipment tAppUserEquipment = appUserEquipmentMapper.selectOne(new LambdaQueryWrapper<TAppUserEquipment>().eq(TAppUserEquipment::getAppUserId, userId).eq(TAppUserEquipment::getAppUserId, userId));
+
if (Objects.nonNull(tAppUserEquipment)) {
+
+ String equipmentCount1 = tAppUserEquipment.getEquipmentCount();
+ List<EquipmentDto> dtos = JSONArray.parseArray(equipmentCount1, EquipmentDto.class);
String lossText = dto.getLossText();
String victoryText = dto.getVictoryText();
List<EquipmentDto> victoryTextDtos = JSONArray.parseArray(victoryText, EquipmentDto.class);
@@ -194,6 +221,19 @@
EquipmentDtoList.addAll(notHaveEquipment);
tAppUserEquipment.setEquipmentCount(JSON.toJSONString(EquipmentDtoList));
appUserEquipmentMapper.updateById(tAppUserEquipment);
+
+
+ int winSum = victoryTextDtos.stream().filter(e -> !e.getId().equals("0")).mapToInt(EquipmentDto::getCount).sum();
+ int oldSum = dtos.stream().mapToInt(EquipmentDto::getCount).sum();
+ winSum = winSum + oldSum;
+ int lossSum = lossTextDtos.stream().filter(e -> !e.getId().equals("0")).mapToInt(EquipmentDto::getCount).sum();
+ if(winSum!=0){
+ user.setDamageRate(new BigDecimal(lossSum).divide(BigDecimal.valueOf(winSum), 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).doubleValue());
+ }
+
+
+
+
} else {
tAppUserEquipment = new TAppUserEquipment();
tAppUserEquipment.setAppUserId(userId);
@@ -217,7 +257,16 @@
}
tAppUserEquipment.setEquipmentCount(JSON.toJSONString(victoryTextDtos));
appUserEquipmentMapper.insert(tAppUserEquipment);
+
+ int winSum = victoryTextDtos.stream().filter(e -> !e.getId().equals("0")).mapToInt(EquipmentDto::getCount).sum();
+ int lossSum = lossTextDtos.stream().filter(e -> !e.getId().equals("0")).mapToInt(EquipmentDto::getCount).sum();
+ if(winSum!=0){
+ user.setDamageRate(new BigDecimal(lossSum).divide(BigDecimal.valueOf(winSum), 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).doubleValue());
+ }
+
}
+
+ missionUserMapper.updateById(user);
}
@Override
@@ -250,6 +299,9 @@
try {
boolean b = redisCache.trylockLoop(missionId, UUID.randomUUID().toString(), 30);
if (b) {
+ TMission tMission = this.baseMapper.selectById(missionId);
+ tMission.setStatus(2);
+ this.baseMapper.updateById(tMission);
TMissionUser tMissionUser = new TMissionUser();
tMissionUser.setAppUserId(userId);
tMissionUser.setMissionId(missionId);
@@ -269,6 +321,15 @@
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);
+ if(!list.isEmpty()){
+ List<TMissionAssignRule> tMissionAssignRules = missionAssignRuleMapper.selectBatchIds(list.stream().map(TMission::getMissionTypeId).collect(Collectors.toList()));
+ list.forEach(e -> {
+ TMissionAssignRule tMissionAssignRule = tMissionAssignRules.stream().filter(rule -> rule.getId().equals(e.getMissionTypeId())).findFirst().orElse(null);
+ if(tMissionAssignRule != null){
+ e.setMissionType(tMissionAssignRule.getTypeName());
+ }
+ });
+ }
pageInfo.setRecords(list);
return pageInfo;
}
@@ -277,6 +338,16 @@
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));
+ List<TMission> records = tMissionPageInfo.getRecords();
+ if(!records.isEmpty()){
+ List<TMissionAssignRule> tMissionAssignRules = missionAssignRuleMapper.selectBatchIds(records.stream().map(TMission::getMissionTypeId).collect(Collectors.toList()));
+ records.forEach(e -> {
+ TMissionAssignRule tMissionAssignRule = tMissionAssignRules.stream().filter(rule -> rule.getId().equals(e.getMissionTypeId())).findFirst().orElse(null);
+ if(tMissionAssignRule != null){
+ e.setMissionType(tMissionAssignRule.getTypeName());
+ }
+ });
+ }
return tMissionPageInfo;
}
@@ -284,6 +355,15 @@
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);
+ if(!list.isEmpty()){
+ List<TMissionAssignRule> tMissionAssignRules = missionAssignRuleMapper.selectBatchIds(list.stream().map(TMission::getMissionTypeId).collect(Collectors.toList()));
+ list.forEach(e -> {
+ TMissionAssignRule tMissionAssignRule = tMissionAssignRules.stream().filter(rule -> rule.getId().equals(e.getMissionTypeId())).findFirst().orElse(null);
+ if(tMissionAssignRule != null){
+ e.setMissionType(tMissionAssignRule.getTypeName());
+ }
+ });
+ }
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1