From b5cf2539edf29b0da8bde02ad3b5c1c373824a34 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期一, 24 七月 2023 15:23:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 1eb5f3e..dba3030 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
@@ -2,16 +2,14 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
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;
@@ -20,6 +18,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
@@ -27,6 +26,7 @@
* @author ard
* @date 2023-07-22
*/
+@Api(tags = "app浠诲姟绠＄悊")
@RestController
@RequestMapping("/app/task")
public class ArdAppTaskController extends BaseController
@@ -37,6 +37,7 @@
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
*/
+ @ApiOperation("鏌ヨapp浠诲姟绠＄悊鍒楄〃")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/list")
public TableDataInfo list(ArdAppTask ardAppTask)
@@ -62,9 +63,10 @@
/**
* 鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('app:task:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
+ public AjaxResult getInfoWithPic(@PathVariable("id") String id)
{
return success(ardAppTaskService.selectArdAppTaskById(id));
}
@@ -72,6 +74,7 @@
/**
* 鏂板app浠诲姟绠＄悊
*/
+ @ApiOperation("鏂板app浠诲姟绠＄悊")
@PreAuthorize("@ss.hasPermi('app:task:add')")
@Log(title = "app浠诲姟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
--
Gitblit v1.9.3