From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化

---
 ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
index fdc6221..6de5eb9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/video/VideoPointController.java
@@ -1,12 +1,14 @@
 package com.ycl.controller.video;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.annotation.LogSave;
 import com.ycl.api.CommonResult;
 import com.ycl.controller.BaseController;
 import com.ycl.entity.video.VideoPoint;
 import com.ycl.service.video.impl.IVideoPointService;
+import com.ycl.util.VideoUtil;
+import com.ycl.vo.equipment.VideoPointVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,35 +29,43 @@
 
     @Autowired
     IVideoPointService iVideoPointService;
+    @Autowired
+    VideoUtil videoUtil;
 
     @GetMapping("/query")
     @ApiOperation("鏌ヨ")
+    @LogSave(operationType = "鐐逛綅绠$悊", contain = "鏌ヨ鐐逛綅")
     public CommonResult searchVideoPoint(@RequestParam Long size,
                                          @RequestParam Long current,
                                          @RequestParam(required = false) Integer streetId,
                                          @RequestParam(required = false) Integer communityId) {
-        Page page = new Page<VideoPoint>()
-                .setSize(size)
-                .setCurrent(current);
-        return CommonResult.success(iVideoPointService.page(page, new LambdaQueryWrapper<VideoPoint>()
-                .eq(streetId != null, VideoPoint::getStreetId, streetId)
-                .eq(communityId != null, VideoPoint::getCommunityId, communityId)));
+
+        IPage<VideoPointVo> pointVoIPage = iVideoPointService.getList(streetId, communityId, current.intValue(), size.intValue());
+//        pointVoIPage.getRecords()
+//                .stream()
+//                .forEach(item -> item.setUrlAddress(videoUtil.getVideo(item.getPlatResourceId(), "HLS", 0)));
+        return CommonResult.success(pointVoIPage);
     }
+
     @PostMapping("/addition")
     @ApiOperation("娣诲姞")
+    @LogSave(operationType = "鐐逛綅绠$悊", contain = "娣诲姞鐐逛綅")
     public CommonResult addVideoPoint(@RequestBody VideoPoint videoPoint) {
+        videoPoint.setType(0);
         return CommonResult.success(iVideoPointService.save(videoPoint));
     }
 
     @PutMapping("/modification")
     @ApiOperation("缂栬緫")
+    @LogSave(operationType = "鐐逛綅绠$悊", contain = "缂栬緫鐐逛綅")
     public CommonResult modifyVideoPoint(@RequestBody VideoPoint videoPoint) {
         return CommonResult.success(iVideoPointService.updateById(videoPoint));
     }
 
     @DeleteMapping("/deletion")
     @ApiOperation("鍒犻櫎")
-    public  CommonResult deleteVideoPoint(@RequestParam Long id){
+    @LogSave(operationType = "鐐逛綅绠$悊", contain = "淇敼鐐逛綅")
+    public CommonResult deleteVideoPoint(@RequestParam Long id) {
         return CommonResult.success(iVideoPointService.removeById(id));
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0