From 4cc19e25b2a210ba4b5af46f30f28dbe4ca289fe Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 27 七月 2023 08:56:22 +0800
Subject: [PATCH] 修改websocket包位置 增加单兵端-下发给我的任务详情 增加app位置websocket推送按用户频率
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index 195c448..9b86968 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -39,7 +39,7 @@
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
*/
- @ApiOperation("鏌ヨapp浠诲姟绠＄悊鍒楄〃")
+ @ApiOperation("鎸囨尌绔�-鍘嗗彶浠诲姟鏌ヨ")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/list")
public TableDataInfo list(ArdAppTask ardAppTask) {
@@ -47,12 +47,19 @@
List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskList(ardAppTask);
return getDataTable(list);
}
- @ApiOperation("鏌ヨapp浠诲姟绠＄悊鍒楄〃(璇︽儏)")
+ @ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔″垪琛�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/listWithDetail")
public TableDataInfo userlist(ArdAppTask ardAppTask) {
List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
return getDataTable(ardAppTasks);
+ }
+ @ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
+ @PreAuthorize("@ss.hasPermi('app:task:list')")
+ @GetMapping("/userDetailById")
+ public AjaxResult userDetail(ArdAppTask ardAppTask) {
+ List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetailById(ardAppTask);
+ return AjaxResult.success(ardAppTasks);
}
/**
* 瀵煎嚭app浠诲姟绠＄悊鍒楄〃
@@ -69,7 +76,6 @@
/**
* 鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅
*/
- @ApiOperation("鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('app:task:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfoWithPic(@PathVariable("id") String id) {
@@ -79,7 +85,7 @@
/**
* 鏂板app浠诲姟绠＄悊
*/
- @ApiOperation("鏂板app浠诲姟绠＄悊")
+ @ApiOperation("鎸囨尌绔�-涓嬪彂浠诲姟")
@PreAuthorize("@ss.hasPermi('app:task:add')")
@Log(title = "app浠诲姟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@@ -110,7 +116,7 @@
/**
* 鏇存柊app浠诲姟璇︽儏
*/
- @ApiOperation("鏇存柊app浠诲姟璇︽儏(鎵撳崱)")
+ @ApiOperation("鍗曞叺绔�-浠诲姟鎵撳崱")
@PreAuthorize("@ss.hasPermi('app:taskdetail:edit')")
@Log(title = "鏇存柊app浠诲姟璇︽儏", businessType = BusinessType.UPDATE)
@PutMapping("/detail")
@@ -120,7 +126,7 @@
/**
* 鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�
*/
- @ApiOperation("鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�")
+ @ApiOperation("鍗曞叺绔�-浠诲姟鐐硅鎯�")
@PreAuthorize("@ss.hasPermi('app:task:query')")
@GetMapping(value = "/detail/{id}")
public AjaxResult getTaskDetailInfo(@PathVariable("id") String id) {
--
Gitblit v1.9.3