app任务

liujie

5 天以前 d12a6715c18b22e0441cd272884e1fc449c5fab0

app任务

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java

@@ -2,6 +2,7 @@


import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
@@ -9,14 +10,9 @@
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.MissionIdDto;
import com.ruoyi.system.dto.TMissionUserDto;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.model.TMissionAssignRule;
import com.ruoyi.system.model.TMissionReassign;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TMissionAssignRuleService;
import com.ruoyi.system.service.TMissionReassignService;
import com.ruoyi.system.service.TMissionService;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TEquipmentQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.MissionTotalVo;
import com.ruoyi.system.vo.TotalHistoryVo;
import io.swagger.annotations.Api;
@@ -47,15 +43,20 @@
    private final TMissionService missionService;
    private final TMissionReassignService missionReassignService;
    private final TMissionAssignRuleService missionAssignRuleService;
    private final TEquipmentService equipmentService;
    private final TMissionUserService missionUserService;


    @Autowired
    public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService, RedisCache redisCache, TMissionReassignService missionReassignService, TMissionAssignRuleService missionAssignRuleService) {
    public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService, RedisCache redisCache, TMissionReassignService missionReassignService, TMissionAssignRuleService missionAssignRuleService, TEquipmentService equipmentService, TMissionUserService missionUserService) {
        this.tokenService = tokenService;
        this.appUserService = appUserService;
        this.missionService = missionService;
        this.missionReassignService = missionReassignService;
        this.missionAssignRuleService = missionAssignRuleService;

        this.equipmentService = equipmentService;
        this.missionUserService = missionUserService;

    }

@@ -143,7 +144,7 @@
    /**
     * 申请支援
     */
    @ApiOperation(value = "获取任务列表--申请支援/改派", response = TMission.class)
    @ApiOperation(value = "获取任务列表--申请支援/改派", response = TMissionReassign.class)
    @PostMapping(value = "/api/t-mission/requestSupport")
    public R<?> requestSupport(@RequestBody String param) {
        TMissionReassign tMissionReassign = JSON.parseObject(param, TMissionReassign.class);
@@ -163,7 +164,7 @@
    /**
     * 完成任务
     */
    @ApiOperation(value = "获取任务列表--完成任务汇报", response = TMission.class)
    @ApiOperation(value = "获取任务列表--完成任务汇报", response = TMissionUserDto.class)
    @PostMapping(value = "/api/t-mission/successMission")
    public R<?> successMission(@RequestBody String param) {
        TMissionUserDto dto = JSON.parseObject(param, TMissionUserDto.class);
@@ -191,11 +192,29 @@
    @PostMapping(value = "/api/t-mission/detailMission")
    public R<TMission> detailMission(@RequestBody String param) {
        MissionIdDto missionId = JSON.parseObject(param, MissionIdDto.class);
        String userId = tokenService.getLoginUserApplet().getUserId();
        TMission tMission = missionService.getById(missionId.getMissionId());
        TMissionAssignRule byId = missionAssignRuleService.getById(tMission.getMissionTypeId());
        tMission.setMissionType(byId.getTypeName());
        // 判断我结果这个任务没有
        TMissionUser one = missionUserService.getOne(new QueryWrapper<TMissionUser>().eq("mission_id", missionId.getMissionId()).eq("app_user_id", userId).orderByDesc("create_time"));
        if(one!=null){
            tMission.setUserMissionId(one.getId());
        }
        tMission.setMissionUser( one);

        return R.ok(tMission);
    }


    /**
     * 装备库管理列表
     */
    //@PreAuthorize("@ss.hasPermi('system:equipment:list')")
    @ApiOperation(value = "装备库管理列表", response = TEquipment.class)
    @PostMapping(value = "/api/t-mission/equipmentList")
    public R<List<TEquipment>> equipmentList() {
        return R.ok(equipmentService.list());
    }
}


 ruoyi-system/src/main/java/com/ruoyi/system/dto/EquipmentDto.java

@@ -7,5 +7,7 @@
public class EquipmentDto {
    private String id;

    private String name;

    private Integer count;
}

 ruoyi-system/src/main/java/com/ruoyi/system/dto/TMissionUserDto.java

@@ -26,7 +26,8 @@
public class TMissionUserDto{


    @TableId(value = "id", type = IdType.ASSIGN_ID)
    @TableId(value = "id")
    @ApiModelProperty(value = "任务用户id")
    private String id;

    @ApiModelProperty(value = "接单用户")

 ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java

@@ -148,4 +148,7 @@
    @ApiModelProperty(value = "任务评分 ")
    private Double score;

    @TableField(exist = false)
    private TMissionUser missionUser;

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java

@@ -34,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;

/**
@@ -163,6 +161,7 @@
    @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);
        // 判断这个任务还有正在执行的不