From d12a6715c18b22e0441cd272884e1fc449c5fab0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 13 十月 2025 18:34:05 +0800
Subject: [PATCH] app任务
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java | 98 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 74 insertions(+), 24 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 feeaa6f..5a88665 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
@@ -2,19 +2,17 @@
import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.MissionIdDto;
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.model.*;
+import com.ruoyi.system.query.TEquipmentQuery;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.MissionTotalVo;
import com.ruoyi.system.vo.TotalHistoryVo;
import io.swagger.annotations.Api;
@@ -26,6 +24,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -43,18 +42,26 @@
private final TAppUserService appUserService;
private final TMissionService missionService;
private final TMissionReassignService missionReassignService;
+ private final TMissionAssignRuleService missionAssignRuleService;
+ private final TEquipmentService equipmentService;
+ private final TMissionUserService missionUserService;
@Autowired
- public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService, RedisCache redisCache, TMissionReassignService missionReassignService) {
+ public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService, RedisCache redisCache, TMissionReassignService missionReassignService, TMissionAssignRuleService missionAssignRuleService, TEquipmentService equipmentService, TMissionUserService missionUserService) {
this.tokenService = tokenService;
this.appUserService = appUserService;
this.missionService = missionService;
this.missionReassignService = missionReassignService;
+ this.missionAssignRuleService = missionAssignRuleService;
+
+ this.equipmentService = equipmentService;
+ this.missionUserService = missionUserService;
+
}
- @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();
@@ -62,10 +69,10 @@
}
/**
- * 获取任务列表
+ * 获取待执行任务 任务列表
*/
// @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);
@@ -73,20 +80,20 @@
return R.ok(missionService.pageNowList(query,userId));
}
/**
- * 获取任务列表
+ * 获取抢单任务列表 任务列表
*/
// @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);
return R.ok(missionService.pageGrabList(query));
}
/**
- * 获取任务列表
+ * 获取历史任务 任务列表
*/
// @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);
@@ -95,8 +102,8 @@
}
- @ApiOperation(value = "获取任务列表--历史任务汇总", response = TotalHistoryVo.class)
- @PostMapping(value = "/t-mission/totalHistory")
+ @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";
@@ -106,7 +113,7 @@
/**
* 添加任务
*/
- @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);
@@ -129,15 +136,15 @@
@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);
+ MissionIdDto missionId = JSON.parseObject(param, MissionIdDto.class);
String userId = tokenService.getLoginUserApplet().getUserId();
- return R.ok( missionService.grabMission(missionId,userId));
+ return R.ok( missionService.grabMission(missionId.getMissionId(),userId));
}
/**
* 申请支援
*/
- @ApiOperation(value = "获取任务列表--申请支援/改派", response = TMission.class)
+ @ApiOperation(value = "获取任务列表--申请支援/改派", response = TMissionReassign.class)
@PostMapping(value = "/api/t-mission/requestSupport")
public R<?> requestSupport(@RequestBody String param) {
TMissionReassign tMissionReassign = JSON.parseObject(param, TMissionReassign.class);
@@ -157,14 +164,57 @@
/**
* 完成任务
*/
- @ApiOperation(value = "获取任务列表--完成任务汇报", response = TMission.class)
+ @ApiOperation(value = "获取任务列表--完成任务汇报", response = TMissionUserDto.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);
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ missionService.successMission(dto,userId);
return R.ok();
}
+
+ /**
+ * 获取任务类型
+ */
+ @ApiOperation(value = "获取任务列表--获取任务类型", response = TMissionAssignRule.class)
+ @PostMapping(value = "/api/t-mission/missionTypeList")
+ public R<List<TMissionAssignRule>> missionTypeList() {
+ List<TMissionAssignRule> list = missionAssignRuleService.list();
+ return R.ok(list);
+ }
+
+
+ /**
+ * 获取任务详情
+ */
+ @ApiOperation(value = "获取任务列表--获取任务详情", response = TMission.class)
+ @PostMapping(value = "/api/t-mission/detailMission")
+ public R<TMission> detailMission(@RequestBody String param) {
+ MissionIdDto missionId = JSON.parseObject(param, MissionIdDto.class);
+ String userId = tokenService.getLoginUserApplet().getUserId();
+ TMission tMission = missionService.getById(missionId.getMissionId());
+ TMissionAssignRule byId = missionAssignRuleService.getById(tMission.getMissionTypeId());
+ tMission.setMissionType(byId.getTypeName());
+ // 判断我结果这个任务没有
+ TMissionUser one = missionUserService.getOne(new QueryWrapper<TMissionUser>().eq("mission_id", missionId.getMissionId()).eq("app_user_id", userId).orderByDesc("create_time"));
+ if(one!=null){
+ tMission.setUserMissionId(one.getId());
+ }
+ tMission.setMissionUser( one);
+
+ return R.ok(tMission);
+ }
+
+
+ /**
+ * 装备库管理列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:equipment:list')")
+ @ApiOperation(value = "装备库管理列表", response = TEquipment.class)
+ @PostMapping(value = "/api/t-mission/equipmentList")
+ public R<List<TEquipment>> equipmentList() {
+ return R.ok(equipmentService.list());
+ }
}
--
Gitblit v1.7.1