From dd0cc9d6d7c341266dd2c3f07479e1f8c4230b65 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 30 十一月 2022 17:42:18 +0800
Subject: [PATCH] fix: 图片管理视频管理 查询bug
---
ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java | 2 +-
ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml | 2 +-
ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml | 2 +-
ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java | 2 +-
ycl-platform/src/main/java/com/ycl/mapper/resources/VideoResourcesMapper.java | 2 +-
ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java | 2 +-
ycl-platform/src/main/java/com/ycl/mapper/resources/ImageResourcesMapper.java | 2 +-
ycl-platform/src/main/java/com/ycl/service/resources/IImageResourcesService.java | 2 +-
ycl-platform/src/main/java/com/ycl/service/resources/IVideoResourcesService.java | 2 +-
ycl-platform/src/main/java/com/ycl/service/resources/impl/ImageResourcesServiceImpl.java | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java b/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java
index a577643..fda1988 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java
@@ -32,7 +32,7 @@
@GetMapping("/query")
@ApiOperation("鏌ヨ")
@LogSave(operationType = "鍥剧墖璧勬簮绠＄悊", contain = "鏌ヨ鍥剧墖")
- public CommonResult search(@RequestParam(required = false) Integer type,
+ public CommonResult search(@RequestParam(required = false) String type,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
@RequestParam Long size,
diff --git a/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java b/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
index ebbf0df..f650fb1 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
@@ -32,7 +32,7 @@
@GetMapping("/query")
@ApiOperation("鏌ヨ")
@LogSave(operationType = "瑙嗛璧勬簮绠＄悊", contain = "淇敼鍥剧墖")
- public CommonResult search(@RequestParam(required = false) Integer type,
+ public CommonResult search(@RequestParam(required = false) String type,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
@RequestParam Long size,
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/resources/ImageResourcesMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/resources/ImageResourcesMapper.java
index f4a2c15..1915ccb 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/resources/ImageResourcesMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/resources/ImageResourcesMapper.java
@@ -15,5 +15,5 @@
*/
public interface ImageResourcesMapper extends BaseMapper<ImageResources> {
- Page<MediaVO> selectImagePage(Page<MediaVO> imagesVOPage, Integer type, String startTime, String endTime);
+ Page<MediaVO> selectImagePage(Page<MediaVO> imagesVOPage, String type, String startTime, String endTime);
}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/resources/VideoResourcesMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/resources/VideoResourcesMapper.java
index fb242c2..f555bf9 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/resources/VideoResourcesMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/resources/VideoResourcesMapper.java
@@ -15,5 +15,5 @@
*/
public interface VideoResourcesMapper extends BaseMapper<VideoResources> {
- Page<MediaVO> selectImagePage(Page<MediaVO> mediaVOPage, Integer type, String startTime, String endTime);
+ Page<MediaVO> selectImagePage(Page<MediaVO> mediaVOPage, String type, String startTime, String endTime);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/resources/IImageResourcesService.java b/ycl-platform/src/main/java/com/ycl/service/resources/IImageResourcesService.java
index a138bc9..50c8b58 100644
--- a/ycl-platform/src/main/java/com/ycl/service/resources/IImageResourcesService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/resources/IImageResourcesService.java
@@ -15,5 +15,5 @@
*/
public interface IImageResourcesService extends IService<ImageResources> {
- Page<MediaVO> selectImages(Integer type, String startTime, String endTime, Long size, Long current);
+ Page<MediaVO> selectImages(String type, String startTime, String endTime, Long size, Long current);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/resources/IVideoResourcesService.java b/ycl-platform/src/main/java/com/ycl/service/resources/IVideoResourcesService.java
index f9d1ce5..4c1d39f 100644
--- a/ycl-platform/src/main/java/com/ycl/service/resources/IVideoResourcesService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/resources/IVideoResourcesService.java
@@ -15,5 +15,5 @@
*/
public interface IVideoResourcesService extends IService<VideoResources> {
- Page<MediaVO> selectImages(Integer type, String startTime, String endTime, Long size, Long current);
+ Page<MediaVO> selectImages(String type, String startTime, String endTime, Long size, Long current);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/resources/impl/ImageResourcesServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/resources/impl/ImageResourcesServiceImpl.java
index 1e06397..663bacf 100644
--- a/ycl-platform/src/main/java/com/ycl/service/resources/impl/ImageResourcesServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/resources/impl/ImageResourcesServiceImpl.java
@@ -26,7 +26,7 @@
ImageResourcesMapper imageResourcesMapper;
@Override
- public Page<MediaVO> selectImages(Integer type, String startTime, String endTime, Long size, Long current) {
+ public Page<MediaVO> selectImages(String type, String startTime, String endTime, Long size, Long current) {
Page<MediaVO> imagesVOPage = new Page<>();
imagesVOPage.setCurrent(current);
imagesVOPage.setSize(size);
diff --git a/ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java
index 2a74441..4947aef 100644
--- a/ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java
@@ -26,7 +26,7 @@
VideoResourcesMapper videoResourcesMapper;
@Override
- public Page<MediaVO> selectImages(Integer type, String startTime, String endTime, Long size, Long current) {
+ public Page<MediaVO> selectImages(String type, String startTime, String endTime, Long size, Long current) {
Page<MediaVO> mediaVOPage = new Page<>();
mediaVOPage.setCurrent(current);
mediaVOPage.setSize(size);
diff --git a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
index e4f5ee4..a585c28 100644
--- a/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/resources/ImageResourcesMapper.xml
@@ -34,7 +34,7 @@
<if test="type == '03' and type != null and type !='' ">
t1.type='03'
</if>
- <if test="type == null and type =='' ">
+ <if test="type == '01' and type != null and type !='' ">
t1.type='02' or t1.type='01'
</if>
<if test="startTime != '' and endTime != '' and startTime != null and endTime != null">
diff --git a/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
index 29414d0..8720205 100644
--- a/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/resources/VideoResourcesMapper.xml
@@ -34,7 +34,7 @@
<if test="type == '03' and type != null and type !='' ">
t1.type='03'
</if>
- <if test="type == null and type =='' ">
+ <if test="type == '01' and type != null and type !='' ">
t1.type='02' or t1.type='01'
</if>
<if test="startTime != '' and endTime != '' and startTime != null and endTime != null">
--
Gitblit v1.8.0