From 6d2e96a1d755ae189733c1a3d7cf286b56de27c1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 09 十月 2025 16:28:16 +0800
Subject: [PATCH] update
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
index fb814ab..f9a9f27 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
@@ -7,11 +7,15 @@
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.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,18 +41,19 @@
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;
}
- @ApiOperation(value = "获取任务列表--任务汇总", response = MissionTotalVo.class)
+ @ApiOperation(value = "获取任务列表--任务汇总",notes = "响应参数：R«app任务汇总数»", response = MissionTotalVo.class)
@PostMapping(value = "/api/t-mission/missionTotal")
public R<MissionTotalVo> missionTotal() {
String userId = tokenService.getLoginUserApplet().getUserId();
@@ -59,7 +64,7 @@
* 获取任务列表
*/
// @PreAuthorize("@ss.hasPermi('system:mission:list')")
- @ApiOperation(value = "获取任务列表--待执行任务", response = TMission.class)
+ @ApiOperation(value = "获取任务列表--待执行任务",notes = "请求参数：基础查询列表dto,响应参数：TMission对象", response = TMission.class)
@PostMapping(value = "/api/t-mission/pageNowList")
public R<PageInfo<TMission>> pageList(@RequestBody String param) {
BasePage query = JSON.parseObject(param, BasePage.class);
@@ -70,7 +75,7 @@
* 获取任务列表
*/
// @PreAuthorize("@ss.hasPermi('system:mission:list')")
- @ApiOperation(value = "获取任务列表--抢单任务", response = TMission.class)
+ @ApiOperation(value = "获取任务列表--抢单任务",notes = "请求参数：基础查询列表dto,响应参数：TMission对象", response = BasePage.class)
@PostMapping(value = "/api/t-mission/pageGrabList")
public R<PageInfo<TMission>> pageGrabList(@RequestBody String param) {
BasePage query = JSON.parseObject(param, BasePage.class);
@@ -80,7 +85,7 @@
* 获取任务列表
*/
// @PreAuthorize("@ss.hasPermi('system:mission:list')")
- @ApiOperation(value = "获取任务列表--历史任务", response = TMission.class)
+ @ApiOperation(value = "获取任务列表--历史任务",notes = "请求参数：基础查询列表dto,响应参数：TMission对象", response = TMission.class)
@PostMapping(value = "/api/t-mission/pageHistoryList")
public R<PageInfo<TMission>> pageHistoryList(@RequestBody String param) {
BasePage query = JSON.parseObject(param, BasePage.class);
@@ -89,10 +94,18 @@
}
+ @ApiOperation(value = "获取任务列表--历史任务汇总",notes = "响应参数：app历史任务顶部汇总", response = TotalHistoryVo.class)
+ @PostMapping(value = "/open/t-mission/totalHistory")
+ public R<TotalHistoryVo> totalHistory() {
+ String userId = tokenService.getLoginUserApplet().getUserId();
+// String userId ="1";
+ return R.ok(missionService.totalHistory(userId));
+ }
+
/**
* 添加任务
*/
- @ApiOperation(value = "获取任务列表--添加任务", response = TMission.class)
+ @ApiOperation(value = "获取任务列表--添加任务",notes = "请求参数：TMission对象", response = TMission.class)
@PostMapping(value = "/api/t-mission/addMission")
public R<String> addMission(@RequestBody String param) {
TMission tMission = JSON.parseObject(param, TMission.class);
@@ -114,22 +127,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 +159,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);
+ TMissionUserDto dto = JSON.parseObject(param, TMissionUserDto.class);
String userId = tokenService.getLoginUserApplet().getUserId();
- missionService.successMission(missionId,userId);
+ missionService.successMission(dto,userId);
return R.ok();
}
--
Gitblit v1.7.1