From 71a77992bd0095a446ca181b7ca1a6f5ec8e1ba6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 十月 2025 18:05:12 +0800
Subject: [PATCH] 人员管理
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 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..db92bbd 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,9 +161,26 @@
@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)) {
@@ -250,6 +270,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 +292,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 +309,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 +326,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