From 0325a5a16afeb1c950f1097739a6385c464f5a0e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 29 九月 2025 14:37:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java | 85 +++++++++++++++++++-----------------------
1 files changed, 38 insertions(+), 47 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
index 105c9a6..aa71218 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
@@ -1,25 +1,21 @@
package com.ruoyi.web.controller.api;
-import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
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.query.TMissionQuery;
+import com.ruoyi.system.service.TMissionReassignService;
import com.ruoyi.system.service.TMissionService;
-import com.ruoyi.system.vo.MissionTotalVo;
-import com.ruoyi.system.vo.TAppUserPageVo;
+import com.ruoyi.system.vo.TMissionVO;
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;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -29,60 +25,55 @@
* @author xiaochen
* @since 2025-09-28
*/
+@Api(tags = "任务管理")
@RestController
@RequestMapping("")
-@Api(tags = "任务App")
public class TMissionController {
- private final TokenService tokenService;
- private final TAppUserService appUserService;
+
+
private final TMissionService missionService;
-
+ private final TMissionReassignService missionReassignService;
+ private final TokenService tokenService;
@Autowired
- public TMissionController(TokenService tokenService, TAppUserService appUserService,TMissionService missionService) {
- this.tokenService = tokenService;
- this.appUserService = appUserService;
+ public TMissionController(TMissionService missionService, TMissionReassignService missionReassignService, TokenService tokenService) {
this.missionService = missionService;
- }
-
-
- @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(
-
- ));
+ this.missionReassignService = missionReassignService;
+ this.tokenService = tokenService;
}
/**
- * 获取任务列表
+ * 任务管理列表
*/
-// @PreAuthorize("@ss.hasPermi('system:mission:list')")
- @ApiOperation(value = "获取任务列表--待执行任务", response = TMission.class)
+ //@PreAuthorize("@ss.hasPermi('system:mission:list')")
+ @ApiOperation(value = "任务管理分页列表", response = TMissionQuery.class)
@PostMapping(value = "/api/t-mission/pageList")
- public R<PageInfo<TMission>> pageList(@RequestBody String param) {
- BasePage query = JSON.parseObject(param, BasePage.class);
+ public R<PageInfo<TMissionVO>> pageList(@RequestBody String param) {
+ TMissionQuery query = JSON.parseObject(param, TMissionQuery.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:add')")
+ @Log(title = "任务管理信息-新增任务管理", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加任务管理",response = TMission.class)
+ @PostMapping(value = "/api/t-mission/add")
+ public R<Boolean> add(@RequestBody String param) {
+ TMission dto = JSON.parseObject(param,TMission.class);
+ missionService.save(dto);
+ return R.ok();
}
+
/**
- * 获取任务列表
+ * 查看任务管理详情
*/
-// @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));
+ //@PreAuthorize("@ss.hasPermi('system:mission:detail')")
+ @ApiOperation(value = "查看任务管理详情")
+ @GetMapping(value = "/open/t-mission/getDetailById")
+ public R<TMission> getDetailById(@RequestParam String id) {
+ TMission equipment = missionService.getById(id);
+ return R.ok(equipment);
}
}
--
Gitblit v1.7.1