Merge remote-tracking branch 'origin/master'

xuhy

2025-09-29 14e060206ec8445daf6f72081d7aaf7b4fc85cf5

Merge remote-tracking branch 'origin/master'

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

New file
@@ -0,0 +1,84 @@
package com.ruoyi.web.controller.api;


import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TMissionService;
import com.ruoyi.system.vo.MissionTotalVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * 任务管理 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-09-28
 */
@RestController
@RequestMapping("")
@Api(tags = "任务App")
public class TMissionController {
    private final TokenService tokenService;
    private final TAppUserService appUserService;
    private final TMissionService missionService;

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


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

    /**
     * 获取任务列表
     */
//    @PreAuthorize("@ss.hasPermi('system:mission:list')")
    @ApiOperation(value = "获取任务列表--待执行任务", response = TMission.class)
    @PostMapping(value = "/api/t-mission/pageList")
    public R<PageInfo<TMission>> pageList(@RequestBody String param) {
        BasePage query = JSON.parseObject(param, BasePage.class);
        return R.ok(missionService.pageList(query));
    }
    /**
     * 获取任务列表
     */
//    @PreAuthorize("@ss.hasPermi('system:mission:list')")
    @ApiOperation(value = "获取任务列表--抢单任务", response = TMission.class)
    @PostMapping(value = "/api/t-mission/pageGrabList")
    public R<PageInfo<TMission>> pageGrabList(@RequestBody String param) {
        BasePage query = JSON.parseObject(param, BasePage.class);
        return R.ok(missionService.pageList(query));
    }
    /**
     * 获取任务列表
     */
//    @PreAuthorize("@ss.hasPermi('system:mission:list')")
    @ApiOperation(value = "获取任务列表--历史任务", response = TMission.class)
    @PostMapping(value = "/api/t-mission/pageHistoryList")
    public R<PageInfo<TMission>> pageHistoryList(@RequestBody String param) {
        BasePage query = JSON.parseObject(param, BasePage.class);
        return R.ok(missionService.pageList(query));
    }

}


 ruoyi-system/src/main/java/com/ruoyi/system/vo/MissionTotalVo.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel("app任务汇总数")
public class MissionTotalVo {
    @ApiModelProperty("执行中")
    private Integer nowNum;

    @ApiModelProperty("待执行")
    private Integer waitNum;

    @ApiModelProperty("进度")
    private BigDecimal rate;
}