From f1e1115bd10c15dec59f8770538ad1642fb3a2e8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 27 七月 2023 17:28:51 +0800
Subject: [PATCH] 提交
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 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 0d953c3..3910fd7 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,11 +37,12 @@
public class ArdAppTaskController extends BaseController {
@Autowired
private IArdAppTaskService ardAppTaskService;
-
+ @Autowired
+ private ISysUserService sysUserService;
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
*/
- @ApiOperation("鏌ヨapp浠诲姟绠＄悊鍒楄〃")
+ @ApiOperation("鎸囨尌绔�-鍘嗗彶浠诲姟鏌ヨ")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/list")
public TableDataInfo list(ArdAppTask ardAppTask) {
@@ -47,12 +50,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 +79,6 @@
/**
* 鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅
*/
- @ApiOperation("鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('app:task:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfoWithPic(@PathVariable("id") String id) {
@@ -79,7 +88,7 @@
/**
* 鏂板app浠诲姟绠＄悊
*/
- @ApiOperation("鏂板app浠诲姟绠＄悊")
+ @ApiOperation("鎸囨尌绔�-涓嬪彂浠诲姟")
@PreAuthorize("@ss.hasPermi('app:task:add')")
@Log(title = "app浠诲姟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@@ -110,11 +119,20 @@
/**
* 鏇存柊app浠诲姟璇︽儏
*/
- @ApiOperation("鏇存柊app浠诲姟璇︽儏(鎵撳崱)")
+ @ApiOperation("鍗曞叺绔�-浠诲姟鎵撳崱")
@PreAuthorize("@ss.hasPermi('app:taskdetail:edit')")
@Log(title = "鏇存柊app浠诲姟璇︽儏", businessType = BusinessType.UPDATE)
@PutMapping("/detail")
public AjaxResult editDetail(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
return toAjax(ardAppTaskService.updateArdAppTaskDetail(ardAppTaskDetail));
}
+ /**
+ * 鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�
+ */
+ @ApiOperation("鍗曞叺绔�-浠诲姟鐐硅鎯�")
+ @PreAuthorize("@ss.hasPermi('app:task:query')")
+ @GetMapping(value = "/detail/{id}")
+ public AjaxResult getTaskDetailInfo(@PathVariable("id") String id) {
+ return success(ardAppTaskService.selectArdAppTaskDetailById(id));
+ }
}
--
Gitblit v1.9.3