Merge remote-tracking branch 'origin/master'

xuhy

2025-09-30 354cc1c2c7ff69c1183d77f1761a71d1ad5669da

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

@@ -7,11 +7,16 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TMissionUserDto;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.model.TMissionReassign;
import com.ruoyi.system.model.TMissionUser;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TMissionReassignService;
import com.ruoyi.system.service.TMissionService;
import com.ruoyi.system.vo.MissionTotalVo;
import com.ruoyi.system.vo.TotalHistoryVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,14 +42,15 @@
    private final TokenService tokenService;
    private final TAppUserService appUserService;
    private final TMissionService missionService;
    private final RedisCache redisCache;
    private final TMissionReassignService missionReassignService;


    @Autowired
    public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService,RedisCache redisCache) {
    public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService, RedisCache redisCache, TMissionReassignService missionReassignService) {
        this.tokenService = tokenService;
        this.appUserService = appUserService;
        this.missionService = missionService;
        this.redisCache = redisCache;
        this.missionReassignService = missionReassignService;
    }


@@ -89,6 +95,14 @@
    }


    @ApiOperation(value = "获取任务列表--历史任务汇总", response = TotalHistoryVo.class)
    @PostMapping(value = "/t-mission/totalHistory")
    public R<TotalHistoryVo> totalHistory() {
        String userId = tokenService.getLoginUserApplet().getUserId();
//        String userId ="1";
        return R.ok(missionService.totalHistory(userId));
    }

    /**
     * 添加任务
     */
@@ -114,22 +128,25 @@
     */
    @ApiOperation(value = "获取任务列表--抢单任务", response = TMission.class)
    @PostMapping(value = "/api/t-mission/grabMission")
    public R<?> grabMission(@RequestBody String param) {
    public R<String> grabMission(@RequestBody String param) {
        String missionId = JSON.parseObject(param, String.class);
        String userId = tokenService.getLoginUserApplet().getUserId();
        missionService.grabMission(missionId,userId);
        return R.ok();
        return R.ok( missionService.grabMission(missionId,userId));
    }

    /**
     * 申请支援
     */
    @ApiOperation(value = "获取任务列表--申请支援", response = TMission.class)
    @ApiOperation(value = "获取任务列表--申请支援/改派", response = TMission.class)
    @PostMapping(value = "/api/t-mission/requestSupport")
    public R<?> requestSupport(@RequestBody String param) {
        String missionId = JSON.parseObject(param, String.class);
        TMissionReassign tMissionReassign = JSON.parseObject(param, TMissionReassign.class);
        String userId = tokenService.getLoginUserApplet().getUserId();
        missionService.grabMission(missionId,userId);
        TAppUser appUser = appUserService.getById(userId);
        tMissionReassign.setCommitUserId(userId);
        tMissionReassign.setCommitTime(LocalDateTime.now());
        tMissionReassign.setCommitUserName(appUser.getNickName());
        missionReassignService.save(tMissionReassign);
        return R.ok();
    }

@@ -143,9 +160,9 @@
    @ApiOperation(value = "获取任务列表--完成任务汇报", response = TMission.class)
    @PostMapping(value = "/api/t-mission/successMission")
    public R<?> successMission(@RequestBody String param) {
        String missionId = JSON.parseObject(param, String.class);
        String userId = tokenService.getLoginUserApplet().getUserId();
        missionService.successMission(missionId,userId);
        TMissionUserDto dto = JSON.parseObject(param, TMissionUserDto.class);
//        String userId = tokenService.getLoginUserApplet().getUserId();
        missionService.successMission(dto);
        return R.ok();
    }