intelligent_dispatching.git

parent: fe1d9ad6 | 补丁 | 提交 | ignore whitespace

liujie

2025-09-29 bfe40ef67714e9f57ebbb23ad9300691cbb61532

app任务

2个文件已修改

2个文件已添加

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java	39 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java	84 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/TMissionService.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/vo/MissionTotalVo.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -3,12 +3,15 @@

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.TAppUser;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.query.TAppUserQuery;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TMissionService;
import com.ruoyi.system.vo.MissionTotalVo;
import com.ruoyi.system.vo.TAppUserPageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -42,16 +45,44 @@
    }


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

        ));
    }

    /**
     * 获取任务列表
     */
//    @PreAuthorize("@ss.hasPermi('system:mission:list')")
    @ApiOperation(value = "获取任务列表", response = TAppUser.class)
    @ApiOperation(value = "获取任务列表--待执行任务", response = TMission.class)
    @PostMapping(value = "/api/t-mission/pageList")
    public R<PageInfo<TAppUserPageVo>> pageList(@RequestBody String param) {
        TAppUserQuery query = JSON.parseObject(param, TAppUserQuery.class);
        return R.ok(appUserService.pageList(query));
    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-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/service/TMissionService.java

@@ -1,7 +1,10 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.vo.MissionTotalVo;

/**
 * <p>
@@ -13,4 +16,8 @@
 */
public interface TMissionService extends IService<TMission> {

    PageInfo<TMission> pageList(BasePage query);

    MissionTotalVo missionTotal(String userId);

}

 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;
}

			@@ -3,12 +3,15 @@

			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.TAppUser;
			import com.ruoyi.system.model.TMission;
			import com.ruoyi.system.query.TAppUserQuery;
			import com.ruoyi.system.service.TAppUserService;
			import com.ruoyi.system.service.TMissionService;
			import com.ruoyi.system.vo.MissionTotalVo;
			import com.ruoyi.system.vo.TAppUserPageVo;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			@@ -42,16 +45,44 @@
			}


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

			));
			}

			/**
			* 获取任务列表
			*/
			// @PreAuthorize("@ss.hasPermi('system:mission:list')")
			@ApiOperation(value = "获取任务列表", response = TAppUser.class)
			@ApiOperation(value = "获取任务列表--待执行任务", response = TMission.class)
			@PostMapping(value = "/api/t-mission/pageList")
			public R<PageInfo<TAppUserPageVo>> pageList(@RequestBody String param) {
			TAppUserQuery query = JSON.parseObject(param, TAppUserQuery.class);
			return R.ok(appUserService.pageList(query));
			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));
			}

			}

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));
			}

			}

			@@ -1,7 +1,10 @@
			package com.ruoyi.system.service;

			import com.baomidou.mybatisplus.extension.service.IService;
			import com.ruoyi.common.basic.PageInfo;
			import com.ruoyi.common.core.domain.BasePage;
			import com.ruoyi.system.model.TMission;
			import com.ruoyi.system.vo.MissionTotalVo;

			/**
			* <p>
			@@ -13,4 +16,8 @@
			*/
			public interface TMissionService extends IService<TMission> {

			PageInfo<TMission> pageList(BasePage query);

			MissionTotalVo missionTotal(String userId);

			}

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;
			}