From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
index 938c27d..954bdcf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/LiveStreamingController.java
@@ -13,6 +13,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
+
 import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
 import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
 
@@ -24,7 +26,7 @@
     private LiveStreamingService liveStreamingService;
 
     @GetMapping("/all")
-    public AjaxResult listAll(LiveStreaming liveStreaming){
+    public AjaxResult listAll(LiveStreaming liveStreaming) throws ParseException {
         Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
         Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
         return liveStreamingService.selectDataList(liveStreaming, pageNum, pageSize);
@@ -41,8 +43,16 @@
      */
     @Log(title = "鐩存挱", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody LiveStreaming liveStreaming)
-    {
+    public AjaxResult add(@RequestBody LiveStreaming liveStreaming) throws ParseException {
         return liveStreamingService.addData(liveStreaming);
     }
+    /**
+     * 鎵归噺鍒犻櫎鐩存挱
+     */
+    @Log(title = "鐩存挱", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return liveStreamingService.deleteData(ids);
+    }
+
 }

--
Gitblit v1.9.1