From 70225b084dc19db41a9f210bb3e64c27ed25d25c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 29 九月 2025 17:09:08 +0800
Subject: [PATCH] app任务

---
 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java |   79 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 74 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..fb814ab 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,7 +5,9 @@
 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.model.TAppUser;
 import com.ruoyi.system.model.TMission;
 import com.ruoyi.system.service.TAppUserService;
 import com.ruoyi.system.service.TMissionService;
@@ -17,6 +19,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 +37,14 @@
     private final TokenService tokenService;
     private final TAppUserService appUserService;
     private final TMissionService missionService;
+    private final RedisCache redisCache;
 
     @Autowired
-    public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService) {
+    public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService,RedisCache redisCache) {
         this.tokenService = tokenService;
         this.appUserService = appUserService;
         this.missionService = missionService;
+        this.redisCache = redisCache;
     }
 
 
@@ -54,10 +60,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 +74,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 +84,69 @@
     @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 = 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<?> grabMission(@RequestBody String param) {
+        String missionId = JSON.parseObject(param, String.class);
+        String userId = tokenService.getLoginUserApplet().getUserId();
+        missionService.grabMission(missionId,userId);
+        return R.ok();
+    }
+
+    /**
+     * 申请支援
+     */
+    @ApiOperation(value = "获取任务列表--申请支援", response = TMission.class)
+    @PostMapping(value = "/api/t-mission/requestSupport")
+    public R<?> requestSupport(@RequestBody String param) {
+        String missionId = JSON.parseObject(param, String.class);
+        String userId = tokenService.getLoginUserApplet().getUserId();
+        missionService.grabMission(missionId,userId);
+        return R.ok();
+    }
+
+
+
+
+
+    /**
+     * 完成任务
+     */
+    @ApiOperation(value = "获取任务列表--完成任务汇报", response = TMission.class)
+    @PostMapping(value = "/api/t-mission/successMission")
+    public R<?> successMission(@RequestBody String param) {
+        String missionId = JSON.parseObject(param, String.class);
+        String userId = tokenService.getLoginUserApplet().getUserId();
+        missionService.successMission(missionId,userId);
+        return R.ok();
     }
 
 }

--
Gitblit v1.7.1