From e13b68163f13019bea2d6c84f92ff07a5a9f15ec Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 29 九月 2025 18:17:46 +0800
Subject: [PATCH] app任务
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java | 96 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 91 insertions(+), 5 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 c788fb5..feeaa6f 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
@@ -5,11 +5,18 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BasePage;
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;
@@ -17,6 +24,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
/**
* <p>
@@ -33,12 +42,15 @@
private final TokenService tokenService;
private final TAppUserService appUserService;
private final TMissionService missionService;
+ private final TMissionReassignService missionReassignService;
+
@Autowired
- public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService) {
+ public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService, RedisCache redisCache, TMissionReassignService missionReassignService) {
this.tokenService = tokenService;
this.appUserService = appUserService;
this.missionService = missionService;
+ this.missionReassignService = missionReassignService;
}
@@ -54,10 +66,11 @@
*/
// @PreAuthorize("@ss.hasPermi('system:mission:list')")
@ApiOperation(value = "获取任务列表--待执行任务", response = TMission.class)
- @PostMapping(value = "/api/t-mission/pageList")
+ @PostMapping(value = "/api/t-mission/pageNowList")
public R<PageInfo<TMission>> pageList(@RequestBody String param) {
BasePage query = JSON.parseObject(param, BasePage.class);
- return R.ok(missionService.pageList(query));
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ return R.ok(missionService.pageNowList(query,userId));
}
/**
* 获取任务列表
@@ -67,7 +80,7 @@
@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));
+ return R.ok(missionService.pageGrabList(query));
}
/**
* 获取任务列表
@@ -77,7 +90,80 @@
@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));
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ return R.ok(missionService.pageHistoryList(query,userId));
+ }
+
+
+ @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));
+ }
+
+ /**
+ * 添加任务
+ */
+ @ApiOperation(value = "获取任务列表--添加任务", response = TMission.class)
+ @PostMapping(value = "/api/t-mission/addMission")
+ public R<String> addMission(@RequestBody String param) {
+ TMission tMission = JSON.parseObject(param, TMission.class);
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ TAppUser appUser = appUserService.getById(userId);
+
+ tMission.setCommitUserId(userId);
+ tMission.setCommitTime(LocalDateTime.now());
+ tMission.setCommitUserName(appUser.getNickName());
+ tMission.setCommitType(2);
+ tMission.setIsMissionPool(0);
+ missionService.save(tMission);
+ return R.ok(tMission.getId());
+ }
+
+
+ /**
+ * 抢单任务
+ */
+ @ApiOperation(value = "获取任务列表--抢单任务", response = TMission.class)
+ @PostMapping(value = "/api/t-mission/grabMission")
+ public R<String> grabMission(@RequestBody String param) {
+ String missionId = JSON.parseObject(param, String.class);
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ return R.ok( missionService.grabMission(missionId,userId));
+ }
+
+ /**
+ * 申请支援
+ */
+ @ApiOperation(value = "获取任务列表--申请支援/改派", response = TMission.class)
+ @PostMapping(value = "/api/t-mission/requestSupport")
+ public R<?> requestSupport(@RequestBody String param) {
+ TMissionReassign tMissionReassign = JSON.parseObject(param, TMissionReassign.class);
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ TAppUser appUser = appUserService.getById(userId);
+ tMissionReassign.setCommitUserId(userId);
+ tMissionReassign.setCommitTime(LocalDateTime.now());
+ tMissionReassign.setCommitUserName(appUser.getNickName());
+ missionReassignService.save(tMissionReassign);
+ return R.ok();
+ }
+
+
+
+
+
+ /**
+ * 完成任务
+ */
+ @ApiOperation(value = "获取任务列表--完成任务汇报", response = TMission.class)
+ @PostMapping(value = "/api/t-mission/successMission")
+ public R<?> successMission(@RequestBody String param) {
+ TMissionUserDto dto = JSON.parseObject(param, TMissionUserDto.class);
+// String userId = tokenService.getLoginUserApplet().getUserId();
+ missionService.successMission(dto);
+ return R.ok();
}
}
--
Gitblit v1.7.1