From 37e53ee529f13b6058698eb97390dca1752843bb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 14 Dec 2021 17:57:53 +0800
Subject: [PATCH] fix video master source
---
src/main/java/cc/mrbird/febs/video/controller/AdminVideoController.java | 4 ++--
src/main/java/cc/mrbird/febs/video/service/IVideoMasterSourceService.java | 2 ++
src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterSourceServiceImpl.java | 8 ++++++++
src/main/resources/templates/febs/views/video/video/video-source-list.html | 11 +++--------
src/main/java/cc/mrbird/febs/video/mapper/VideoMasterSourceMapper.java | 4 ++++
src/main/resources/mapper/video/VideoMasterSourceMapper.xml | 12 +++++++++++-
6 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/video/controller/AdminVideoController.java b/src/main/java/cc/mrbird/febs/video/controller/AdminVideoController.java
index c056b63..cc7b200 100644
--- a/src/main/java/cc/mrbird/febs/video/controller/AdminVideoController.java
+++ b/src/main/java/cc/mrbird/febs/video/controller/AdminVideoController.java
@@ -99,8 +99,8 @@
@GetMapping("/source/delete/{ids}")
@RequiresPermissions("source:delete")
public FebsResponse delSource(@PathVariable String ids) {
- List<String> idList = StrUtil.split(ids, ',');
- return null;
+ this.videoMasterSourceService.delSource(ids);
+ return new FebsResponse().success();
}
}
diff --git a/src/main/java/cc/mrbird/febs/video/mapper/VideoMasterSourceMapper.java b/src/main/java/cc/mrbird/febs/video/mapper/VideoMasterSourceMapper.java
index 5645bbd..9024348 100644
--- a/src/main/java/cc/mrbird/febs/video/mapper/VideoMasterSourceMapper.java
+++ b/src/main/java/cc/mrbird/febs/video/mapper/VideoMasterSourceMapper.java
@@ -6,7 +6,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
public interface VideoMasterSourceMapper extends BaseMapper<VideoMasterSourceEntity> {
IPage<VideoMasterSourceEntity> selectInPage(@Param("record") VideoMasterSourceEntity source, Page<VideoMasterSourceEntity> page);
+
+ int updateDelFlag(@Param("delFlag") int delFlag, @Param("list") List<String> ids);
}
diff --git a/src/main/java/cc/mrbird/febs/video/service/IVideoMasterSourceService.java b/src/main/java/cc/mrbird/febs/video/service/IVideoMasterSourceService.java
index bc89f16..07f974e 100644
--- a/src/main/java/cc/mrbird/febs/video/service/IVideoMasterSourceService.java
+++ b/src/main/java/cc/mrbird/febs/video/service/IVideoMasterSourceService.java
@@ -11,4 +11,6 @@
IPage<VideoMasterSourceEntity> findInPage(VideoMasterSourceEntity source, QueryRequest queryRequest);
void modifySourceById(VideoMasterSourceEntity source);
+
+ void delSource(String ids);
}
diff --git a/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterSourceServiceImpl.java b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterSourceServiceImpl.java
index 91bb612..207399f 100644
--- a/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterSourceServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterSourceServiceImpl.java
@@ -6,6 +6,7 @@
import cc.mrbird.febs.video.mapper.VideoMasterItemsMapper;
import cc.mrbird.febs.video.mapper.VideoMasterSourceMapper;
import cc.mrbird.febs.video.service.IVideoMasterSourceService;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,6 +16,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.List;
/**
* @author wzy
@@ -45,4 +47,10 @@
this.videoMasterItemsMapper.updateVideoUrlBySourceId(source.getUrl(), source.getId());
}
}
+
+ @Override
+ public void delSource(String ids) {
+ List<String> idList = StrUtil.split(ids, ',');
+ this.baseMapper.updateDelFlag(AppContants.FLAG_INT_Y, idList);
+ }
}
diff --git a/src/main/resources/mapper/video/VideoMasterSourceMapper.xml b/src/main/resources/mapper/video/VideoMasterSourceMapper.xml
index 7b04b5d..2bf5bac 100644
--- a/src/main/resources/mapper/video/VideoMasterSourceMapper.xml
+++ b/src/main/resources/mapper/video/VideoMasterSourceMapper.xml
@@ -5,10 +5,20 @@
<select id="selectInPage" resultType="cc.mrbird.febs.video.entity.VideoMasterSourceEntity">
select * from video_master_source
<where>
- 1=1
+ 1=1 and is_del=2
<if test="record.name != null and record.name != ''">
and name like concat('%', #{record.name}, '%')
</if>
</where>
</select>
+
+
+ <update id="updateDelFlag">
+ update video_master_source
+ set is_del=#{delFlag}
+ where id in
+ <foreach collection="list" item="item" index="index" separator="," close=")" open="(">
+ #{item}
+ </foreach>
+ </update>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/video/video/video-source-list.html b/src/main/resources/templates/febs/views/video/video/video-source-list.html
index 0d4d2bd..b574f25 100644
--- a/src/main/resources/templates/febs/views/video/video/video-source-list.html
+++ b/src/main/resources/templates/febs/views/video/video/video-source-list.html
@@ -113,7 +113,7 @@
layEvent = obj.event;
if (layEvent === 'del') {
febs.modal.confirm('删除资源', '确定删除该资源？', function () {
- deleteUsers(data.userId);
+ deleteUsers(data.id);
});
}
if (layEvent === 'edit') {
@@ -176,13 +176,8 @@
};
}
- function deleteUsers(userIds) {
- var currentUserId = currentUser.userId + '';
- if (('' + userIds).split(',').indexOf(currentUserId) !== -1) {
- febs.alert.warn('所选资源包含当前登录资源，无法删除');
- return;
- }
- febs.get(ctx + 'user/delete/' + userIds, null, function () {
+ function deleteUsers(ids) {
+ febs.get(ctx + 'video/source/delete/' + ids, null, function () {
febs.alert.success('删除资源成功');
$query.click();
});
--
Gitblit v1.9.1