From c76d735cf906bde876ebd32a0ad8d1413a7ca902 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 28 七月 2023 16:37:05 +0800
Subject: [PATCH] 修复app推送在线状态错误
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 9b86968..3fc7278 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
@@ -6,7 +6,9 @@
import com.alibaba.fastjson2.JSONObject;
import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
import com.ruoyi.app.task.domain.ArdAppTaskDetail;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.catalina.security.SecurityUtil;
@@ -35,6 +37,8 @@
public class ArdAppTaskController extends BaseController {
@Autowired
private IArdAppTaskService ardAppTaskService;
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
@@ -47,6 +51,7 @@
List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskList(ardAppTask);
return getDataTable(list);
}
+
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔″垪琛�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/listWithDetail")
@@ -54,6 +59,7 @@
List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
return getDataTable(ardAppTasks);
}
+
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/userDetailById")
@@ -61,6 +67,7 @@
List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetailById(ardAppTask);
return AjaxResult.success(ardAppTasks);
}
+
/**
* 瀵煎嚭app浠诲姟绠＄悊鍒楄〃
*/
@@ -123,6 +130,13 @@
public AjaxResult editDetail(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
return toAjax(ardAppTaskService.updateArdAppTaskDetail(ardAppTaskDetail));
}
+ @ApiOperation("鍗曞叺绔�-浠诲姟鏌ョ湅")
+ @PreAuthorize("@ss.hasPermi('app:taskdetail:edit')")
+ @Log(title = "鍗曞叺绔�-浠诲姟鏌ョ湅", businessType = BusinessType.UPDATE)
+ @PutMapping("/detail/view")
+ public AjaxResult editDetailView(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
+ return toAjax(ardAppTaskService.updateArdAppTaskDetailView(ardAppTaskDetail));
+ }
/**
* 鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�
*/
@@ -132,5 +146,4 @@
public AjaxResult getTaskDetailInfo(@PathVariable("id") String id) {
return success(ardAppTaskService.selectArdAppTaskDetailById(id));
}
-
}
--
Gitblit v1.9.3