From 14b1aaecb3cb1042663135038bc1e81208a7ef6f Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 26 七月 2023 09:42:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 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 0adc204..195c448 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
@@ -3,18 +3,16 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
+import com.ruoyi.app.task.domain.ArdAppTaskDetail;
+import com.ruoyi.common.utils.spring.SpringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.catalina.security.SecurityUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -23,6 +21,7 @@
import com.ruoyi.app.task.service.IArdAppTaskService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
/**
* app浠诲姟绠＄悊Controller
@@ -33,8 +32,7 @@
@Api(tags = "app浠诲姟绠＄悊")
@RestController
@RequestMapping("/app/task")
-public class ArdAppTaskController extends BaseController
-{
+public class ArdAppTaskController extends BaseController {
@Autowired
private IArdAppTaskService ardAppTaskService;
@@ -44,21 +42,25 @@
@ApiOperation("鏌ヨapp浠诲姟绠＄悊鍒楄〃")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/list")
- public TableDataInfo list(ArdAppTask ardAppTask)
- {
+ public TableDataInfo list(ArdAppTask ardAppTask) {
startPage();
List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskList(ardAppTask);
return getDataTable(list);
}
-
+ @ApiOperation("鏌ヨapp浠诲姟绠＄悊鍒楄〃(璇︽儏)")
+ @PreAuthorize("@ss.hasPermi('app:task:list')")
+ @GetMapping("/listWithDetail")
+ public TableDataInfo userlist(ArdAppTask ardAppTask) {
+ List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
+ return getDataTable(ardAppTasks);
+ }
/**
* 瀵煎嚭app浠诲姟绠＄悊鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('app:task:export')")
@Log(title = "app浠诲姟绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ArdAppTask ardAppTask)
- {
+ public void export(HttpServletResponse response, ArdAppTask ardAppTask) {
List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskList(ardAppTask);
ExcelUtil<ArdAppTask> util = new ExcelUtil<ArdAppTask>(ArdAppTask.class);
util.exportExcel(response, list, "app浠诲姟绠＄悊鏁版嵁");
@@ -67,11 +69,10 @@
/**
* 鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅
*/
- @ApiOperation("鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅(鍥剧墖)")
+ @ApiOperation("鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('app:task:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfoWithPic(@PathVariable("id") String id)
- {
+ public AjaxResult getInfoWithPic(@PathVariable("id") String id) {
return success(ardAppTaskService.selectArdAppTaskById(id));
}
@@ -82,8 +83,7 @@
@PreAuthorize("@ss.hasPermi('app:task:add')")
@Log(title = "app浠诲姟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ArdAppTask ardAppTask)
- {
+ public AjaxResult add(@RequestBody ArdAppTask ardAppTask) {
return toAjax(ardAppTaskService.insertArdAppTask(ardAppTask));
}
@@ -93,8 +93,7 @@
@PreAuthorize("@ss.hasPermi('app:task:edit')")
@Log(title = "app浠诲姟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ArdAppTask ardAppTask)
- {
+ public AjaxResult edit(@RequestBody ArdAppTask ardAppTask) {
return toAjax(ardAppTaskService.updateArdAppTask(ardAppTask));
}
@@ -104,8 +103,28 @@
@PreAuthorize("@ss.hasPermi('app:task:remove')")
@Log(title = "app浠诲姟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable String[] ids)
- {
+ public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(ardAppTaskService.deleteArdAppTaskByIds(ids));
}
+
+ /**
+ * 鏇存柊app浠诲姟璇︽儏
+ */
+ @ApiOperation("鏇存柊app浠诲姟璇︽儏(鎵撳崱)")
+ @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("鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�")
+ @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