From 72a6ba539aa2012edadbcf031f7b21acce5c8640 Mon Sep 17 00:00:00 2001
From: Oliver <1070107765@qq.com>
Date: 星期二, 08 十一月 2022 18:11:59 +0800
Subject: [PATCH] commit
---
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java | 1
ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java | 11 ++++-
ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java | 3 +
ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java | 28 ++++++++++++++
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 4 +-
ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java | 2 -
ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java | 3 +
ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java | 41 ++++++++++++++++++++
ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java | 9 +++-
ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java | 14 +++++++
10 files changed, 104 insertions(+), 12 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
index feea793..65537c6 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/cockpit/statisticsEvents/StatisticsEventsController.java
@@ -179,9 +179,7 @@
@GetMapping("/video_point")
public CommonResult<List<VideoPointVo>> videoPoint(@Validated CockpitVO params) {
checkApiUtil.cockpit(params);
-
IPage<VideoPointVo> page = videoPointService.getList(null, null, 1, 500);
-
return CommonResult.success(page.getRecords());
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
index ff7c125..d8bb664 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.region.SccgRegion;
@@ -45,11 +47,14 @@
public CommonResult addRegion(@Validated @RequestBody SccgRegion sccgRegion) {
return CommonResult.success(iSccgRegionService.save(sccgRegion));
}
+
@ApiOperation(value = "鑾峰彇琛屾斂鍖哄煙鍒嗛〉鏌ヨ")
@RequestMapping(value = "/list", method = RequestMethod.POST)
@ResponseBody
- public CommonResult<IPage<SccgRegion>> list(@Validated @RequestBody SccgRegion sccgRegion) {
- return CommonResult.success(iSccgRegionService.list(sccgRegion));
+ public CommonResult<CommonPage<SccgRegion>> list(@RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
+ @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
+ Page<SccgRegion> list = iSccgRegionService.list(pageSize, pageNum);
+ return CommonResult.success(CommonPage.restPage(list));
}
@@ -87,7 +92,7 @@
@ApiOperation("鑾峰彇瀛愮被")
@GetMapping("/getChildren/{parentId}")
@ApiImplicitParams({
- @ApiImplicitParam(name = "parentId",value = "椤剁骇parentId=0")
+ @ApiImplicitParam(name = "parentId", value = "椤剁骇parentId=0")
})
public CommonResult<List<SccgRegion>> getChildren(@PathVariable Long parentId) {
List<SccgRegion> treeList = iSccgRegionService.getChildren(parentId);
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index 67e4601..e52aff9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -62,7 +62,7 @@
public CommonResult<StoreInfo> getItem(@PathVariable Long id) {
StoreInfo storeInfo = storeInfoService.getById(id);
StoreInfoVO vo = new StoreInfoVO();
- BeanUtils.copyProperties(storeInfo,vo);
+ BeanUtils.copyProperties(storeInfo, vo);
vo.setVideoPoint(videoPointService.getById(storeInfo.getVideoId()));
return CommonResult.success(storeInfo);
}
@@ -70,7 +70,7 @@
@ApiOperation(value = "娣诲姞闂ㄥ簵淇℃伅")
@RequestMapping(value = "/add", method = RequestMethod.POST)
@ResponseBody
- @LogSave(operationType = "闂ㄥ簵绠＄悊",contain = "娣诲姞闂ㄥ簵")
+ @LogSave(operationType = "闂ㄥ簵绠＄悊", contain = "娣诲姞闂ㄥ簵")
public CommonResult<StoreInfo> add(@Validated @RequestBody UmsStoreInfoParam umsStoreInfoParam) {
StoreInfo storeInfo = StoreInfo.builder()
.owner(umsStoreInfoParam.getOwner())
diff --git a/ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java b/ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java
new file mode 100644
index 0000000..eb8132a
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/controller/video/VideoInspectionController.java
@@ -0,0 +1,41 @@
+package com.ycl.controller.video;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.api.CommonPage;
+import com.ycl.api.CommonResult;
+import com.ycl.entity.video.VideoPoint;
+import com.ycl.service.video.IVideoInspectionService;
+import com.ycl.service.video.impl.IVideoPointService;
+import com.ycl.vo.equipment.VideoPointVo;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 瑙嗛宸℃煡鎺у埗鍣�
+ *
+ * @author 瀹夌懢鐒�
+ * @date 2022/11/08
+ */
+@RestController
+@RequestMapping("/video_inspection")
+@Api(tags = "瑙嗛宸℃煡")
+public class VideoInspectionController {
+
+ @Autowired
+ private IVideoInspectionService videoInspectionService;
+
+
+ @GetMapping("page")
+ public CommonResult page(@RequestParam(value = "size", required = false) Long size,
+ @RequestParam(value = "current", required = false) Long current,
+ @RequestParam(value = "regionId", required = false) Integer streetId,
+ @RequestParam(value = "regionId", required = false) Integer communityId) {
+ Page<VideoPointVo> list = videoInspectionService.page(size, current, streetId, communityId);
+ return CommonResult.success(CommonPage.restPage(list));
+ }
+
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java
index b3d16ee..21c7c35 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/video/VideoPointMapper.java
@@ -5,6 +5,7 @@
import com.ycl.entity.video.VideoPoint;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.vo.equipment.VideoPointVo;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
@@ -15,7 +16,9 @@
* @author zhanghua
* @since 2022-09-26
*/
+@Mapper
public interface VideoPointMapper extends BaseMapper<VideoPoint> {
IPage<VideoPointVo> search(Page<VideoPointVo> page, @Param("streetId") Integer streetId, @Param("communityId") Integer communityId);
+
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java b/ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java
index e10cabd..2cac581 100644
--- a/ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/region/ISccgRegionService.java
@@ -1,6 +1,7 @@
package com.ycl.service.region;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.region.SccgRegion;
@@ -20,7 +21,7 @@
* @return
*/
List<SccgRegion> getTree();
- IPage<SccgRegion> list(SccgRegion sccgRegion);
+ Page<SccgRegion> list(Integer pageSize, Integer pageNum);
List<SccgRegion> getChildren(Long parentId);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
index 510d2fa..5759491 100644
--- a/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.region.SccgRegion;
import com.ycl.mapper.region.SccgRegionMapper;
@@ -39,7 +40,6 @@
if (StringUtils.isBlank(result)) {
// 1.鏌ュ嚭鎵�鏈夌綉鏍�
List<SccgRegion> list = this.list();
-
// 2.缁勮鎴愮埗瀛愮殑鏍戝瀷缁撴瀯
// 2.1銆佹壘鍒版墍鏈夌殑涓�绾х綉鏍�:浣跨敤jdk8鐨剆tream娴佽繘琛岃繃婊�
List<SccgRegion> collect = list.stream().filter(griddingEntity -> {
@@ -87,8 +87,11 @@
}
@Override
- public IPage<SccgRegion> list(SccgRegion sccgRegion) {
- return null;
+ public Page<SccgRegion> list(Integer pageSize, Integer pageNum) {
+ Page<SccgRegion> page = new Page<>();
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ return page(page);
}
@Override
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java b/ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java
new file mode 100644
index 0000000..50cc700
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/video/IVideoInspectionService.java
@@ -0,0 +1,14 @@
+package com.ycl.service.video;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.vo.equipment.VideoPointVo;
+
+/**
+ * 瑙嗛宸℃煡鏈嶅姟Service
+ *
+ * @author 瀹夌懢鐒�
+ * @date 2022/11/08
+ */
+public interface IVideoInspectionService {
+ Page<VideoPointVo> page(Long size, Long current, Integer streetId, Integer communityId);
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java
new file mode 100644
index 0000000..1f6e35f
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoInspectionServiceImpl.java
@@ -0,0 +1,28 @@
+package com.ycl.service.video.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.common.util.CommonUtils;
+import com.ycl.entity.video.VideoPoint;
+import com.ycl.mapper.video.VideoPointMapper;
+import com.ycl.service.video.IVideoInspectionService;
+import com.ycl.vo.equipment.VideoPointVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 瑙嗛宸℃煡鏈嶅姟ServiceImpl
+ *
+ * @author 瀹夌懢鐒�
+ * @date 2022/11/08
+ */
+@Service
+public class VideoInspectionServiceImpl implements IVideoInspectionService {
+ @Autowired
+ private VideoPointMapper videoPointMapper;
+
+ @Override
+ public Page<VideoPointVo> page(Long size, Long current, Integer streetId, Integer communityId) {
+ Page<VideoPointVo> page = new Page<>(current, size);
+ return (Page<VideoPointVo>) videoPointMapper.search(page, streetId, communityId);
+ }
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java
index 0600e9c..b9ddd78 100644
--- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java
@@ -24,7 +24,6 @@
@Override
public IPage<VideoPointVo> getList(Integer streetId, Integer communityId, Integer current, Integer size) {
-
Page<VideoPointVo> page = new Page<>(current, size);
IPage<VideoPointVo> page1 = baseMapper.search(page, streetId, communityId);
return page1;
--
Gitblit v1.8.0