From a8fa8c5473d8bd4dc509d9f4b0bb370f443d15ad Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期二, 07 十一月 2023 16:23:03 +0800 Subject: [PATCH] 清淤 --- ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java | 60 ++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 20 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java index 4b2de62..fc30265 100644 --- a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java +++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java @@ -2,6 +2,9 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.utils.uuid.IdUtils; +import com.ruoyi.common.utils.uuid.UUID; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,14 +26,13 @@ /** * 瑙嗛宸℃浠诲姟Controller - * + * * @author ruoyi - * @date 2023-05-25 + * @date 2023-05-30 */ @RestController @RequestMapping("/inspect/task") -public class ArdVideoInspectTaskController extends BaseController -{ +public class ArdVideoInspectTaskController extends BaseController { @Autowired private IArdVideoInspectTaskService ardVideoInspectTaskService; @@ -39,8 +41,7 @@ */ @PreAuthorize("@ss.hasPermi('inspect:task:list')") @GetMapping("/list") - public TableDataInfo list(ArdVideoInspectTask ardVideoInspectTask) - { + public TableDataInfo list(ArdVideoInspectTask ardVideoInspectTask) { startPage(); List<ArdVideoInspectTask> list = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask); return getDataTable(list); @@ -52,8 +53,7 @@ @PreAuthorize("@ss.hasPermi('inspect:task:export')") @Log(title = "瑙嗛宸℃浠诲姟", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, ArdVideoInspectTask ardVideoInspectTask) - { + public void export(HttpServletResponse response, ArdVideoInspectTask ardVideoInspectTask) { List<ArdVideoInspectTask> list = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask); ExcelUtil<ArdVideoInspectTask> util = new ExcelUtil<ArdVideoInspectTask>(ArdVideoInspectTask.class); util.exportExcel(response, list, "瑙嗛宸℃浠诲姟鏁版嵁"); @@ -63,11 +63,23 @@ * 鑾峰彇瑙嗛宸℃浠诲姟璇︾粏淇℃伅 */ @PreAuthorize("@ss.hasPermi('inspect:task:query')") - @GetMapping(value = "/{inspectMode}") - public AjaxResult getInfo(@PathVariable("inspectMode") String inspectMode) - { - return success(ardVideoInspectTaskService.selectArdVideoInspectTaskByInspectMode(inspectMode)); + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(ardVideoInspectTaskService.selectArdVideoInspectTaskById(id)); } + +/* + */ +/** + * 鑾峰彇瑙嗛宸℃浠诲姟璇︾粏淇℃伅 + *//* + + @PreAuthorize("@ss.hasPermi('inspect:task:edit')") + @GetMapping(value = "/getTaskUsedCameraPeriods") + public AjaxResult getTaskUsedCameraPeriods(String cameraId) { + return success(ardVideoInspectTaskService.getTaskUsedCameraPeriods(cameraId)); + } +*/ /** * 鏂板瑙嗛宸℃浠诲姟 @@ -75,8 +87,8 @@ @PreAuthorize("@ss.hasPermi('inspect:task:add')") @Log(title = "瑙嗛宸℃浠诲姟", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody ArdVideoInspectTask ardVideoInspectTask) - { + public AjaxResult add(@RequestBody ArdVideoInspectTask ardVideoInspectTask) { + ardVideoInspectTask.setId(IdUtils.simpleUUID()); return toAjax(ardVideoInspectTaskService.insertArdVideoInspectTask(ardVideoInspectTask)); } @@ -86,9 +98,18 @@ @PreAuthorize("@ss.hasPermi('inspect:task:edit')") @Log(title = "瑙嗛宸℃浠诲姟", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody ArdVideoInspectTask ardVideoInspectTask) - { + public AjaxResult edit(@RequestBody ArdVideoInspectTask ardVideoInspectTask) { return toAjax(ardVideoInspectTaskService.updateArdVideoInspectTask(ardVideoInspectTask)); + } + + /** + * 鍙慨鏀硅棰戝贰妫�浠诲姟,涓嶆洿鏂版楠� + */ + @PreAuthorize("@ss.hasPermi('inspect:task:edit')") + @Log(title = "鍙慨鏀硅棰戝贰妫�浠诲姟,涓嶆洿鏂版楠�", businessType = BusinessType.UPDATE) + @PostMapping("/update") + public AjaxResult updateArdVideoInspectTaskSingle(@RequestBody ArdVideoInspectTask ardVideoInspectTask) { + return toAjax(ardVideoInspectTaskService.updateArdVideoInspectTaskSingle(ardVideoInspectTask)); } /** @@ -96,9 +117,8 @@ */ @PreAuthorize("@ss.hasPermi('inspect:task:remove')") @Log(title = "瑙嗛宸℃浠诲姟", businessType = BusinessType.DELETE) - @DeleteMapping("/{inspectModes}") - public AjaxResult remove(@PathVariable String[] inspectModes) - { - return toAjax(ardVideoInspectTaskService.deleteArdVideoInspectTaskByInspectModes(inspectModes)); + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(ardVideoInspectTaskService.deleteArdVideoInspectTaskByIds(ids)); } } -- Gitblit v1.9.3