From 781b70d43879025d80c0fcbfe89c0b648bbcba12 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 14 Dec 2021 17:25:20 +0800 Subject: [PATCH] add video master source back --- src/main/resources/templates/febs/views/video/video/video-source-add.html | 117 +++++ src/main/java/cc/mrbird/febs/video/controller/AdminVideoController.java | 38 + src/main/resources/templates/febs/views/video/video/video-list.html | 231 +++++++++++ src/main/java/cc/mrbird/febs/video/service/IVideoMasterSourceService.java | 14 src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterSourceServiceImpl.java | 48 ++ src/main/java/cc/mrbird/febs/video/entity/VideoMasterSourceEntity.java | 30 + src/main/resources/application-test.yml | 7 src/main/resources/mapper/video/VideoMasterSourceMapper.xml | 14 src/main/resources/templates/febs/views/video/video/video-source-update.html | 128 ++++++ src/main/java/cc/mrbird/febs/video/mapper/VideoMasterItemsMapper.java | 10 src/main/java/cc/mrbird/febs/video/controller/CommonController.java | 101 +++++ src/main/resources/mapper/video/VideoMasterItemsMapper.xml | 12 src/main/java/cc/mrbird/febs/common/utils/AppContants.java | 2 src/main/resources/application-dev.yml | 7 src/main/resources/templates/febs/views/video/video/video-source-list.html | 191 +++++++++ src/main/resources/templates/febs/views/video/video/video-add.html | 180 +++++++++ src/main/java/cc/mrbird/febs/video/mapper/VideoMasterSourceMapper.java | 12 src/main/java/cc/mrbird/febs/video/controller/ViewController.java | 33 + 18 files changed, 1,171 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/common/utils/AppContants.java b/src/main/java/cc/mrbird/febs/common/utils/AppContants.java index a2abac1..91dad5c 100644 --- a/src/main/java/cc/mrbird/febs/common/utils/AppContants.java +++ b/src/main/java/cc/mrbird/febs/common/utils/AppContants.java @@ -66,5 +66,7 @@ public static final String AGENT_LEVEL = "AGENT_LEVEL"; public static final String AGENT_LEVEL_REQUIRE = "AGENT_LEVEL_REQUIRE"; + public static final Integer FLAG_INT_Y = 1; + public static final Integer FLAG_INT_N = 2; } 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 f45fd9d..c056b63 100644 --- a/src/main/java/cc/mrbird/febs/video/controller/AdminVideoController.java +++ b/src/main/java/cc/mrbird/febs/video/controller/AdminVideoController.java @@ -1,11 +1,15 @@ package cc.mrbird.febs.video.controller; import cc.mrbird.febs.common.annotation.ControllerEndpoint; +import cc.mrbird.febs.common.controller.BaseController; import cc.mrbird.febs.common.entity.DeptTree; import cc.mrbird.febs.common.entity.FebsResponse; +import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.system.entity.Dept; import cc.mrbird.febs.video.entity.VideoCategoryEntity; +import cc.mrbird.febs.video.entity.VideoMasterSourceEntity; import cc.mrbird.febs.video.service.IVideoCategoryService; +import cc.mrbird.febs.video.service.IVideoMasterSourceService; import com.baomidou.mybatisplus.core.toolkit.StringPool; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -17,6 +21,7 @@ import javax.validation.constraints.NotBlank; import java.util.Date; import java.util.List; +import java.util.Map; /** * @author wzy @@ -26,9 +31,10 @@ @RestController @RequiredArgsConstructor @RequestMapping("video") -public class AdminVideoController { +public class AdminVideoController extends BaseController { private final IVideoCategoryService videoCategoryService; + private final IVideoMasterSourceService videoMasterSourceService; @GetMapping("/allCategory") public List<DeptTree<VideoCategoryEntity>> allCategory() { @@ -67,4 +73,34 @@ this.videoCategoryService.removeByIds(ids); return new FebsResponse().success(); } + + @GetMapping("/sourceInPage") + @RequiresPermissions("source:view") + @ControllerEndpoint(operation = "资源列表", exceptionMessage = "获取资源列表失败") + public FebsResponse findVideoSourceInPage(VideoMasterSourceEntity source, QueryRequest request) { + Map<String, Object> dataTable = getDataTable(this.videoMasterSourceService.findInPage(source, request)); + return new FebsResponse().success().data(dataTable); + } + + @PostMapping("/source/add") + @RequiresPermissions("source:add") + public FebsResponse addVideoSource(VideoMasterSourceEntity source) { + this.videoMasterSourceService.save(source); + return new FebsResponse().success(); + } + + @PostMapping("/source/update") + @RequiresPermissions("source:update") + public FebsResponse updateVideoSource(VideoMasterSourceEntity source) { + this.videoMasterSourceService.modifySourceById(source); + return new FebsResponse().success(); + } + + @GetMapping("/source/delete/{ids}") + @RequiresPermissions("source:delete") + public FebsResponse delSource(@PathVariable String ids) { + List<String> idList = StrUtil.split(ids, ','); + return null; + } + } diff --git a/src/main/java/cc/mrbird/febs/video/controller/CommonController.java b/src/main/java/cc/mrbird/febs/video/controller/CommonController.java new file mode 100644 index 0000000..6f0ba8a --- /dev/null +++ b/src/main/java/cc/mrbird/febs/video/controller/CommonController.java @@ -0,0 +1,101 @@ +package cc.mrbird.febs.video.controller; + +import cc.mrbird.febs.common.entity.FebsResponse; +import cc.mrbird.febs.common.exception.FebsException; +import cn.hutool.core.lang.UUID; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.util.FileCopyUtils; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; + +import java.io.File; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * @author wzy + * @date 2021-12-14 + **/ +@Slf4j +@RequestMapping(value = "/common") +@RestController +@RequiredArgsConstructor +public class CommonController { + + @Value("${system.images.path}") + private String baseSavePath; + + @Value("${system.images.url}") + private String baseUrl; + + + + @RequestMapping(value = "/upload") + public FebsResponse upload(MultipartRequest request) throws IOException { + // 保存路径 /Users/helius/Desktop/ + baseSavePath = "/Users/helius/Desktop/"; + + // 访问路径 + baseUrl = "http://localhost:1234/"; + List<String> visitPathes = updateImg(request); + return new FebsResponse().success().data(visitPathes); + } + + private List<String> updateImg(MultipartRequest request) { + // 检查目录 + File uploadDir = new File(baseSavePath); + if (!uploadDir.isDirectory()) { + uploadDir.mkdir(); + } + + Map<String, MultipartFile> fileMaps = request.getFileMap(); + List<String> visitPathes = new ArrayList<>(); + for (String key : fileMaps.keySet()) { + MultipartFile file = fileMaps.get(key); + + // 拼接64位文件名 + String fileName = file.getOriginalFilename(); + String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(); + String newFileName = UUID.randomUUID().toString() + "." + fileExt; + Map<String, String> fileUrlMap = fileUrl(baseSavePath, baseUrl); + String savePath = fileUrlMap.get("savePath"); + String saveUrl = fileUrlMap.get("saveUrl"); + File uploadedFile = new File(savePath, newFileName); + try { + FileCopyUtils.copy(file.getBytes(), uploadedFile); + } catch (IOException e) { + throw new FebsException("上传失败"); + } + // 图片访问地址 + String visitPath = saveUrl + newFileName; + visitPathes.add(visitPath); + + } + + return visitPathes; + } + + private Map<String, String> fileUrl(String savePath, String saveUrl) { + Map<String, String> fileUrlMap = new HashMap<>(); + + // 创建日期文件夹 + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); + String ymd = sdf.format(new Date()); + savePath += ymd + File.separatorChar; + saveUrl += ymd + File.separatorChar; + File dirFile = new File(savePath); + if (!dirFile.exists()) { + dirFile.mkdirs(); + } + + fileUrlMap.put("savePath", savePath); + fileUrlMap.put("saveUrl", saveUrl); + return fileUrlMap; + + } +} diff --git a/src/main/java/cc/mrbird/febs/video/controller/ViewController.java b/src/main/java/cc/mrbird/febs/video/controller/ViewController.java index 1e22ddb..ac72d33 100644 --- a/src/main/java/cc/mrbird/febs/video/controller/ViewController.java +++ b/src/main/java/cc/mrbird/febs/video/controller/ViewController.java @@ -2,19 +2,50 @@ import cc.mrbird.febs.common.entity.FebsConstant; import cc.mrbird.febs.common.utils.FebsUtil; +import cc.mrbird.febs.video.entity.VideoMasterSourceEntity; +import cc.mrbird.febs.video.service.IVideoMasterSourceService; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; @Controller("videoView") @RequiredArgsConstructor public class ViewController { + private final IVideoMasterSourceService videoMasterSourceService; @GetMapping(FebsConstant.VIEW_PREFIX + "video/category") @RequiresPermissions("category:view") - public String systemMenu() { + public String category() { return FebsUtil.view("video/video/category"); } + + @GetMapping(FebsConstant.VIEW_PREFIX + "video/list") + @RequiresPermissions("video:view") + public String videoList() { + return FebsUtil.view("video/video/video-list"); + } + + @GetMapping(FebsConstant.VIEW_PREFIX + "video/source/list") + @RequiresPermissions("source:view") + public String source() { + return FebsUtil.view("video/video/video-source-list"); + } + + @GetMapping(FebsConstant.VIEW_PREFIX + "video/source/add") + @RequiresPermissions("source:add") + public String sourceAdd() { + return FebsUtil.view("video/video/video-source-add"); + } + + @GetMapping(FebsConstant.VIEW_PREFIX + "video/source/update/{id}") + @RequiresPermissions("source:update") + public String sourceUpdate(@PathVariable Long id, Model model) { + VideoMasterSourceEntity source = this.videoMasterSourceService.getById(id); + model.addAttribute("obj", source); + return FebsUtil.view("video/video/video-source-update"); + } } diff --git a/src/main/java/cc/mrbird/febs/video/entity/VideoMasterSourceEntity.java b/src/main/java/cc/mrbird/febs/video/entity/VideoMasterSourceEntity.java new file mode 100644 index 0000000..b12b1e6 --- /dev/null +++ b/src/main/java/cc/mrbird/febs/video/entity/VideoMasterSourceEntity.java @@ -0,0 +1,30 @@ +package cc.mrbird.febs.video.entity; + +import cc.mrbird.febs.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @author wzy + * @date 2021-12-14 + **/ +@Data +@TableName("video_master_source") +public class VideoMasterSourceEntity extends BaseEntity { + + private String name; + + private String url; + + /** + * 是否删除 1/是 2/否 + */ + private Integer isDel; + + /** + * 是否同步修改 + */ + @TableField(exist = false) + private Integer isSyncUpdate; +} diff --git a/src/main/java/cc/mrbird/febs/video/mapper/VideoMasterItemsMapper.java b/src/main/java/cc/mrbird/febs/video/mapper/VideoMasterItemsMapper.java new file mode 100644 index 0000000..f326602 --- /dev/null +++ b/src/main/java/cc/mrbird/febs/video/mapper/VideoMasterItemsMapper.java @@ -0,0 +1,10 @@ +package cc.mrbird.febs.video.mapper; + +import cc.mrbird.febs.video.entity.VideoMasterItemsEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +public interface VideoMasterItemsMapper extends BaseMapper<VideoMasterItemsEntity> { + + int updateVideoUrlBySourceId(@Param("url") String url, @Param("sourceId") Long sourceId); +} diff --git a/src/main/java/cc/mrbird/febs/video/mapper/VideoMasterSourceMapper.java b/src/main/java/cc/mrbird/febs/video/mapper/VideoMasterSourceMapper.java new file mode 100644 index 0000000..5645bbd --- /dev/null +++ b/src/main/java/cc/mrbird/febs/video/mapper/VideoMasterSourceMapper.java @@ -0,0 +1,12 @@ +package cc.mrbird.febs.video.mapper; + +import cc.mrbird.febs.video.entity.VideoMasterSourceEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; + +public interface VideoMasterSourceMapper extends BaseMapper<VideoMasterSourceEntity> { + + IPage<VideoMasterSourceEntity> selectInPage(@Param("record") VideoMasterSourceEntity source, Page<VideoMasterSourceEntity> page); +} diff --git a/src/main/java/cc/mrbird/febs/video/service/IVideoMasterSourceService.java b/src/main/java/cc/mrbird/febs/video/service/IVideoMasterSourceService.java new file mode 100644 index 0000000..bc89f16 --- /dev/null +++ b/src/main/java/cc/mrbird/febs/video/service/IVideoMasterSourceService.java @@ -0,0 +1,14 @@ +package cc.mrbird.febs.video.service; + +import cc.mrbird.febs.common.entity.QueryRequest; +import cc.mrbird.febs.video.entity.VideoMasterSourceEntity; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; + +public interface IVideoMasterSourceService extends IService<VideoMasterSourceEntity> { + + IPage<VideoMasterSourceEntity> findInPage(VideoMasterSourceEntity source, QueryRequest queryRequest); + + void modifySourceById(VideoMasterSourceEntity source); +} 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 new file mode 100644 index 0000000..91bb612 --- /dev/null +++ b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterSourceServiceImpl.java @@ -0,0 +1,48 @@ +package cc.mrbird.febs.video.service.impl; + +import cc.mrbird.febs.common.entity.QueryRequest; +import cc.mrbird.febs.common.utils.AppContants; +import cc.mrbird.febs.video.entity.VideoMasterSourceEntity; +import cc.mrbird.febs.video.mapper.VideoMasterItemsMapper; +import cc.mrbird.febs.video.mapper.VideoMasterSourceMapper; +import cc.mrbird.febs.video.service.IVideoMasterSourceService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; + +/** + * @author wzy + * @date 2021-12-14 + **/ +@Slf4j +@Service +@RequiredArgsConstructor +public class VideoMasterSourceServiceImpl extends ServiceImpl<VideoMasterSourceMapper, VideoMasterSourceEntity> implements IVideoMasterSourceService { + + private final VideoMasterItemsMapper videoMasterItemsMapper; + + @Override + public IPage<VideoMasterSourceEntity> findInPage(VideoMasterSourceEntity source, QueryRequest queryRequest) { + Page<VideoMasterSourceEntity> page = new Page<>(queryRequest.getPageNum(), queryRequest.getPageSize()); + + return this.baseMapper.selectInPage(source, page); + } + + @Transactional + @Override + public void modifySourceById(VideoMasterSourceEntity source) { + source.setUpdatedTime(new Date()); + this.baseMapper.updateById(source); + + // 同步修改 即将所有关联到这个资源的视频中的url更新为最新url + if (AppContants.FLAG_INT_Y.equals(source.getIsSyncUpdate())) { + this.videoMasterItemsMapper.updateVideoUrlBySourceId(source.getUrl(), source.getId()); + } + } +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d05fbe9..965e850 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -46,4 +46,9 @@ # 连接池最大阻塞等待时间(使用负值表示没有限制) max-wait: 10000 # 连接超时时间(毫秒) - timeout: 5000 \ No newline at end of file + timeout: 5000 + +system: + images: + path: 123 + url: 123 \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index b46f7a9..6c6044a 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -46,4 +46,9 @@ # 连接池最大阻塞等待时间(使用负值表示没有限制) max-wait: 10000 # 连接超时时间(毫秒) - timeout: 5000 \ No newline at end of file + timeout: 5000 + +system: + images: + path: 123 + url: 123 \ No newline at end of file diff --git a/src/main/resources/mapper/video/VideoMasterItemsMapper.xml b/src/main/resources/mapper/video/VideoMasterItemsMapper.xml new file mode 100644 index 0000000..e7e8001 --- /dev/null +++ b/src/main/resources/mapper/video/VideoMasterItemsMapper.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="cc.mrbird.febs.video.mapper.VideoMasterItemsMapper"> + + + <update id="updateVideoUrlBySourceId"> + update video_master_items + set video_url=#{url} + where source_id=#{sourceId} + </update> + +</mapper> \ No newline at end of file diff --git a/src/main/resources/mapper/video/VideoMasterSourceMapper.xml b/src/main/resources/mapper/video/VideoMasterSourceMapper.xml new file mode 100644 index 0000000..7b04b5d --- /dev/null +++ b/src/main/resources/mapper/video/VideoMasterSourceMapper.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="cc.mrbird.febs.video.mapper.VideoMasterSourceMapper"> + + <select id="selectInPage" resultType="cc.mrbird.febs.video.entity.VideoMasterSourceEntity"> + select * from video_master_source + <where> + 1=1 + <if test="record.name != null and record.name != ''"> + and name like concat('%', #{record.name}, '%') + </if> + </where> + </select> +</mapper> \ No newline at end of file diff --git a/src/main/resources/templates/febs/views/video/video/video-add.html b/src/main/resources/templates/febs/views/video/video/video-add.html new file mode 100644 index 0000000..da6eb48 --- /dev/null +++ b/src/main/resources/templates/febs/views/video/video/video-add.html @@ -0,0 +1,180 @@ +<style> + #user-add { + padding: 20px 25px 25px 0; + } + #user-add .layui-treeSelect .ztree li a, .ztree li span { + margin: 0 0 2px 3px !important; + } + #user-add #data-permission-tree-block { + border: 1px solid #eee; + border-radius: 2px; + padding: 3px 0; + } + #user-add .layui-treeSelect .ztree li span.button.switch { + top: 1px; + left: 3px; + } +</style> +<div class="layui-fluid" id="user-add"> + <form class="layui-form" action="" lay-filter="user-add-form"> + <div class="layui-form-item"> + <label class="layui-form-label febs-form-item-require">用户名:</label> + <div class="layui-input-block"> + <input type="text" name="username" minlength="2" maxlength="10" lay-verify="range|username" + autocomplete="off" class="layui-input"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">手机:</label> + <div class="layui-input-block"> + <input type="tel" name="mobile" lay-verify="phone" autocomplete="off" class="layui-input"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">邮箱:</label> + <div class="layui-input-block"> + <input type="text" name="email" lay-verify="email" maxlength="50" autocomplete="off" + class="layui-input"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label febs-form-item-require">角色:</label> + <div class="layui-input-block"> + <select name="roleId" + lay-verify="required" + xm-select-direction="down" + xm-select="user-add-role" + xm-select-skin="default"> + </select> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">部门:</label> + <div class="layui-input-block"> + <input type="text" name="deptId" id="user-add-dept" class="layui-input"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label febs-form-item-require">状态:</label> + <div class="layui-input-block"> + <input type="radio" name="status" value="1" title="有效" checked=""> + <input type="radio" name="status" value="0" title="禁用"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label febs-form-item-require">性别:</label> + <div class="layui-input-block"> + <input type="radio" name="sex" value="0" title="男性"> + <input type="radio" name="sex" value="1" title="女性"> + <input type="radio" name="sex" value="2" title="保密" checked=""> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">数据权限:</label> + <div class="layui-input-block" id="data-permission-tree-block"> + <div class="data-permission-tree" lay-filter="dataPermissionTree" style="margin-left: 1rem"></div> + </div> + </div> + <div class="layui-form-item layui-form-text"> + <label class="layui-form-label">备注:</label> + <div class="layui-input-block"> + <textarea name="description" maxlength="100" class="layui-textarea"></textarea> + </div> + </div> + <div class="layui-form-item febs-hide"> + <button class="layui-btn" lay-submit="" lay-filter="user-add-form-submit" id="submit"></button> + <button type="reset" class="layui-btn" id="reset"></button> + </div> + </form> +</div> + +<script> + layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree'], function () { + var $ = layui.$, + febs = layui.febs, + layer = layui.layer, + formSelects = layui.formSelects, + treeSelect = layui.treeSelect, + form = layui.form, + eleTree = layui.eleTree, + $view = $('#user-add'), + validate = layui.validate, + _deptTree; + + form.verify(validate); + form.render(); + + formSelects.render(); + renderDeptTree(); + + treeSelect.render({ + elem: $view.find('#user-add-dept'), + type: 'get', + data: ctx + 'dept/select/tree', + placeholder: '请选择', + search: false + }); + + function renderDeptTree() { + _deptTree = eleTree.render({ + elem: $view.find('.data-permission-tree'), + url: ctx + 'dept/tree', + accordion: true, + highlightCurrent: true, + showCheckbox: true, + checkStrictly: true, + renderAfterExpand: false, + request: { + name: 'name', + key: "id", + checked: "checked", + data: 'data' + }, + response: { + statusName: "code", + statusCode: 200, + dataName: "data" + } + }); + return _deptTree; + } + + formSelects.config('user-add-role', { + searchUrl: ctx + 'role', + response: { + statusCode: 200 + }, + beforeSuccess: function (id, url, searchVal, result) { + var data = result.data; + var tranData = []; + for (var i = 0; i < data.length; i++) { + tranData.push({ + name: data[i].roleName, + value: data[i].roleId + }) + } + result.data = tranData; + return result; + }, + error: function (id, url, searchVal, err) { + console.error(err); + febs.alert.error('获取角色列表失败'); + } + }); + + form.on('submit(user-add-form-submit)', function (data) { + var checked = _deptTree.getChecked(false, true); + var deptIds = []; + layui.each(checked, function (key, item) { + deptIds.push(item.id) + }); + data.deptIds = deptIds.join(","); + febs.post(ctx + 'user', data.field, function () { + layer.closeAll(); + febs.alert.success('新增用户成功,初始密码为 1234qwer'); + $('#febs-user').find('#query').click(); + }); + return false; + }); + }); +</script> \ No newline at end of file diff --git a/src/main/resources/templates/febs/views/video/video/video-list.html b/src/main/resources/templates/febs/views/video/video/video-list.html new file mode 100644 index 0000000..da5d066 --- /dev/null +++ b/src/main/resources/templates/febs/views/video/video/video-list.html @@ -0,0 +1,231 @@ +<div class="layui-fluid layui-anim febs-anim" id="febs-video" lay-title="视频管理"> + <div class="layui-row febs-container"> + <div class="layui-col-md12"> + <div class="layui-card"> + <div class="layui-card-body febs-table-full"> + <form class="layui-form layui-table-form" lay-filter="video-table-form"> + <div class="layui-row"> + <div class="layui-col-md10"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label layui-form-label-sm">视频名称</label> + <div class="layui-input-inline"> + <input type="text" name="name" autocomplete="off" class="layui-input"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label layui-form-label-sm">上下架</label> + <div class="layui-input-inline"> + <select name="isUp"> + <option value=""></option> + <option value="1">上架</option> + <option value="2">下架</option> + </select> + </div> + </div> + </div> + </div> + <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area"> + <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query"> + <i class="layui-icon"></i> + </div> + <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset"> + <i class="layui-icon"></i> + </div> + <div class="layui-btn layui-btn-sm layui-btn-primary table-action action-more" + shiro:hasAnyPermissions="video:add,video:delete"> + <i class="layui-icon"></i> + </div> + </div> + </div> + </form> + <table lay-filter="videoTable" lay-data="{id: 'videoTable'}"></table> + </div> + </div> + </div> + </div> +</div> +<script type="text/html" id="user-status"> + {{# + var status = { + 1: {title: '有效', color: 'green'}, + 0: {title: '禁用', color: 'volcano'} + }[d.status]; + }} + <span class="layui-badge febs-bg-{{status.color}}">{{ status.title }}</span> +</script> +<script type="text/html" id="user-sex"> + {{# + var sex = { + 2: {title: '保密'}, + 1: {title: '女'}, + 0: {title: '男'} + }[d.sex]; + }} + <span>{{ sex.title }}</span> +</script> +<script type="text/html" id="user-option"> + <span shiro:lacksPermission="user:view,user:update,user:delete"> + <span class="layui-badge-dot febs-bg-orange"></span> 无权限 + </span> + <a lay-event="edit" shiro:hasPermission="user:update"><i + class="layui-icon febs-edit-area febs-blue"></i></a> + <a lay-event="del" shiro:hasPermission="user:delete"><i class="layui-icon febs-edit-area febs-red"></i></a> +</script> +<script data-th-inline="none" type="text/javascript"> + layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () { + var $ = layui.jquery, + laydate = layui.laydate, + febs = layui.febs, + form = layui.form, + table = layui.table, + dropdown = layui.dropdown, + $view = $('#febs-video'), + $query = $view.find('#query'), + $reset = $view.find('#reset'), + $searchForm = $view.find('form'), + sortObject = {field: 'createTime', type: null}, + tableIns, + createTimeFrom, + createTimeTo; + + form.render(); + + initTable(); + + dropdown.render({ + elem: $view.find('.action-more'), + click: function (name, elem, event) { + var checkStatus = table.checkStatus('videoTable'); + if (name === 'add') { + febs.modal.open('新增用户', 'system/user/add', { + btn: ['提交', '重置'], + area: $(window).width() <= 750 ? '95%' : '50%', + offset: '30px', + yes: function (index, layero) { + $('#video-add').find('#submit').trigger('click'); + }, + btn2: function () { + $('#video-add').find('#reset').trigger('click'); + return false; + } + }); + } + if (name === 'delete') { + if (!checkStatus.data.length) { + febs.alert.warn('请选择需要删除的用户'); + } else { + febs.modal.confirm('删除用户', '确定删除该用户?', function () { + var userIds = []; + layui.each(checkStatus.data, function (key, item) { + userIds.push(item.userId) + }); + deleteUsers(userIds.join(',')); + }); + } + } + }, + options: [{ + name: 'add', + title: '新增用户', + perms: 'user:add' + }, { + name: 'delete', + title: '删除用户', + perms: 'user:delete' + }] + }); + + + table.on('tool(videoTable)', function (obj) { + var data = obj.data, + layEvent = obj.event; + if (layEvent === 'detail') { + febs.modal.view('用户信息', 'system/user/detail/' + data.name, { + area: $(window).width() <= 750 ? '95%' : '660px' + }); + } + if (layEvent === 'del') { + febs.modal.confirm('删除用户', '确定删除该用户?', function () { + deleteUsers(data.userId); + }); + } + if (layEvent === 'edit') { + febs.modal.open('修改用户', 'system/user/update/' + data.name, { + area: $(window).width() <= 750 ? '90%' : '50%', + offset: '30px', + btn: ['提交', '取消'], + yes: function (index, layero) { + $('#user-update').find('#submit').trigger('click'); + }, + btn2: function () { + layer.closeAll(); + } + }); + } + }); + + table.on('sort(videoTable)', function (obj) { + sortObject = obj; + tableIns.reload({ + initSort: obj, + where: $.extend(getQueryParams(), { + field: obj.field, + order: obj.type + }) + }); + }); + + $query.on('click', function () { + var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type}); + tableIns.reload({where: params, page: {curr: 1}}); + }); + + $reset.on('click', function () { + $searchForm[0].reset(); + sortObject.type = 'null'; + createTimeTo = null; + createTimeFrom = null; + tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject}); + }); + + function initTable() { + tableIns = febs.table.init({ + elem: $view.find('table'), + id: 'videoTable', + url: ctx + 'user/list', + cols: [[ + {type: 'checkbox'}, + {field: 'name', title: '用户名', minWidth: 100}, + {title: '性别', templet: '#user-sex'}, + {field: 'deptName', title: '部门'}, + {field: 'mobile', title: '手机', minWidth: 165}, + {field: 'email', title: '邮箱', minWidth: 180}, + {title: '状态', templet: '#user-status'}, + {field: 'createTime', title: '创建时间', minWidth: 180, sort: true}, + {title: '操作', toolbar: '#user-option', minWidth: 140} + ]] + }); + } + + function getQueryParams() { + return { + name: $searchForm.find('input[name="name"]').val().trim(), + isUp: $searchForm.find("select[name='isUp']").val(), + invalidate_ie_cache: new Date() + }; + } + + 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 () { + febs.alert.success('删除用户成功'); + $query.click(); + }); + } + }) +</script> \ No newline at end of file diff --git a/src/main/resources/templates/febs/views/video/video/video-source-add.html b/src/main/resources/templates/febs/views/video/video/video-source-add.html new file mode 100644 index 0000000..484a21a --- /dev/null +++ b/src/main/resources/templates/febs/views/video/video/video-source-add.html @@ -0,0 +1,117 @@ +<style> + #source-add { + padding: 20px 25px 25px 0; + } + #source-add .layui-treeSelect .ztree li a, .ztree li span { + margin: 0 0 2px 3px !important; + } + #source-add #data-permission-tree-block { + border: 1px solid #eee; + border-radius: 2px; + padding: 3px 0; + } + #source-add .layui-treeSelect .ztree li span.button.switch { + top: 1px; + left: 3px; + } +</style> +<div class="layui-fluid" id="source-add"> + <form class="layui-form" action="" lay-filter="source-add-form"> + <div class="layui-form-item"> + <label class="layui-form-label febs-form-item-require">视频名称:</label> + <div class="layui-input-block"> + <input type="text" name="name" minlength="2" maxlength="20" lay-verify="range|username" + autocomplete="off" class="layui-input"> + </div> + </div> + + <div class="layui-form-item"> + <label class="layui-form-label"></label> + <div class="layui-input-block"> + <div class="layui-upload-drag" id="upload"> + <div class="upload-text" id="upload-text"> + <i class="layui-icon layui-icon-upload-drag"></i> + <p>点击上传,或将文件拖拽到此处</p> + </div> + + <div class="upload-progress" id="upload-progress" style="display: none;"> + <h2 style="padding: 20px 60px">10%</h2> + <div class="layui-progress layui-progress-small" lay-showpercent="yes" lay-filter="demo"> + <div class="layui-progress-bar" lay-percent=""></div> + </div> + </div> + </div> + </div> + <input id="file-url" type="text" name="url" autocomplete="off" class="layui-input febs-hide"> + </div> + + + <div class="layui-form-item febs-hide"> + <button class="layui-btn" lay-submit="" lay-filter="source-add-form-submit" id="submit"></button> + <button type="reset" class="layui-btn" id="reset"></button> + </div> + </form> +</div> + +<script> + layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'upload', 'element'], function () { + var $ = layui.$, + febs = layui.febs, + layer = layui.layer, + form = layui.form, + $view = $('#source-add'), + $uploadProgress = $("#upload-progress"), + validate = layui.validate, + upload = layui.upload, + element = layui.element; + + form.verify(validate); + form.render(); + + form.on('submit(source-add-form-submit)', function (data) { + febs.post(ctx + 'video/source/add', data.field, function () { + layer.closeAll(); + febs.alert.success('新增成功'); + $('#febs-video-source').find('#query').click(); + }); + return false; + }); + + // 拖拽上传 + upload.render({ + elem: '#upload' + ,url: 'common/upload' + ,accept: 'file' + // ,exts: 'mp4|flv' + ,before: function(obj){ + element.progress('demo', '0%'); //进度条复位 + $("#upload-text").css("display", "none"); + $uploadProgress.css("display", "block"); + var h2s = $uploadProgress.find("h2"); + $(h2s[0]).text("0%"); + layer.msg('上传中', {icon: 16, time: 0}); + } + ,done: function(res){ + console.log(res); + //如果上传失败 + if(res.code != 200){ + return layer.msg('上传失败'); + } + + $("#file-url").val(res.data); + } + ,error: function(){ + } + //进度条 + ,progress: function(n, elem, e){ + element.progress('demo', n + '%'); + + var h2s = $uploadProgress.find("h2"); + $(h2s[0]).text(n + "%"); + if(n == 100){ + layer.msg('上传完毕', {icon: 1}); + } + } + }); + }); +</script> \ 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 new file mode 100644 index 0000000..0d4d2bd --- /dev/null +++ b/src/main/resources/templates/febs/views/video/video/video-source-list.html @@ -0,0 +1,191 @@ +<div class="layui-fluid layui-anim febs-anim" id="febs-video-source" lay-title="资源管理"> + <div class="layui-row febs-container"> + <div class="layui-col-md12"> + <div class="layui-card"> + <div class="layui-card-body febs-table-full"> + <form class="layui-form layui-table-form" lay-filter="video-table-form"> + <div class="layui-row"> + <div class="layui-col-md10"> + <div class="layui-form-item"> + <div class="layui-inline"> + <label class="layui-form-label layui-form-label-sm">视频名称</label> + <div class="layui-input-inline"> + <input type="text" name="name" autocomplete="off" class="layui-input"> + </div> + </div> + </div> + </div> + <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area"> + <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query"> + <i class="layui-icon"></i> + </div> + <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset"> + <i class="layui-icon"></i> + </div> + <div class="layui-btn layui-btn-sm layui-btn-primary table-action action-more" + shiro:hasAnyPermissions="video:add,video:delete"> + <i class="layui-icon"></i> + </div> + </div> + </div> + </form> + <table lay-filter="videoSourceTable" lay-data="{id: 'videoSourceTable'}"></table> + </div> + </div> + </div> + </div> +</div> +<script type="text/html" id="source-option"> + <span shiro:lacksPermission="source:update,source:delete"> + <span class="layui-badge-dot febs-bg-orange"></span> 无权限 + </span> + <a lay-event="edit" shiro:hasPermission="source:update"><i + class="layui-icon febs-edit-area febs-blue"></i></a> + <a lay-event="del" shiro:hasPermission="source:delete"><i class="layui-icon febs-edit-area febs-red"></i></a> +</script> +<script data-th-inline="none" type="text/javascript"> + layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () { + var $ = layui.jquery, + laydate = layui.laydate, + febs = layui.febs, + form = layui.form, + table = layui.table, + dropdown = layui.dropdown, + $view = $('#febs-video-source'), + $query = $view.find('#query'), + $reset = $view.find('#reset'), + $searchForm = $view.find('form'), + sortObject = {field: 'createTime', type: null}, + tableIns, + createTimeFrom, + createTimeTo; + + form.render(); + + initTable(); + + dropdown.render({ + elem: $view.find('.action-more'), + click: function (name, elem, event) { + var checkStatus = table.checkStatus('videoSourceTable'); + if (name === 'add') { + febs.modal.open('新增资源', 'video/source/add', { + btn: ['提交', '重置'], + area: $(window).width() <= 750 ? '95%' : '50%', + offset: '30px', + yes: function (index, layero) { + $('#source-add').find('#submit').trigger('click'); + }, + btn2: function () { + $('#source-add').find('#reset').trigger('click'); + return false; + } + }); + } + if (name === 'delete') { + if (!checkStatus.data.length) { + febs.alert.warn('请选择需要删除的资源'); + } else { + febs.modal.confirm('删除资源', '确定删除该资源?', function () { + var userIds = []; + layui.each(checkStatus.data, function (key, item) { + userIds.push(item.userId) + }); + deleteUsers(userIds.join(',')); + }); + } + } + }, + options: [{ + name: 'add', + title: '新增资源', + perms: 'source:add' + }, { + name: 'delete', + title: '删除资源', + perms: 'source:delete' + }] + }); + + + table.on('tool(videoSourceTable)', function (obj) { + var data = obj.data, + layEvent = obj.event; + if (layEvent === 'del') { + febs.modal.confirm('删除资源', '确定删除该资源?', function () { + deleteUsers(data.userId); + }); + } + if (layEvent === 'edit') { + febs.modal.open('修改资源', 'video/source/update/' + data.id, { + area: $(window).width() <= 750 ? '90%' : '50%', + offset: '30px', + btn: ['提交', '取消'], + yes: function (index, layero) { + $('#source-update').find('#submit').trigger('click'); + }, + btn2: function () { + layer.closeAll(); + } + }); + } + }); + + table.on('sort(videoSourceTable)', function (obj) { + sortObject = obj; + tableIns.reload({ + initSort: obj, + where: $.extend(getQueryParams(), { + field: obj.field, + order: obj.type + }) + }); + }); + + $query.on('click', function () { + var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type}); + tableIns.reload({where: params, page: {curr: 1}}); + }); + + $reset.on('click', function () { + $searchForm[0].reset(); + sortObject.type = 'null'; + createTimeTo = null; + createTimeFrom = null; + tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject}); + }); + + function initTable() { + tableIns = febs.table.init({ + elem: $view.find('table'), + id: 'videoSourceTable', + url: ctx + 'video/sourceInPage', + cols: [[ + {type: 'checkbox'}, + {field: 'name', title: '视频名称', minWidth: 100}, + {field: 'createdTime', title: '创建时间', minWidth: 180, sort: true}, + {title: '操作', toolbar: '#source-option', minWidth: 140} + ]] + }); + } + + function getQueryParams() { + return { + name: $searchForm.find('input[name="name"]').val().trim(), + invalidate_ie_cache: new Date() + }; + } + + 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 () { + febs.alert.success('删除资源成功'); + $query.click(); + }); + } + }) +</script> \ No newline at end of file diff --git a/src/main/resources/templates/febs/views/video/video/video-source-update.html b/src/main/resources/templates/febs/views/video/video/video-source-update.html new file mode 100644 index 0000000..232c770 --- /dev/null +++ b/src/main/resources/templates/febs/views/video/video/video-source-update.html @@ -0,0 +1,128 @@ +<style> + #source-update { + padding: 20px 25px 25px 0; + } + #source-update .layui-treeSelect .ztree li a, .ztree li span { + margin: 0 0 2px 3px !important; + } + #source-update #data-permission-tree-block { + border: 1px solid #eee; + border-radius: 2px; + padding: 3px 0; + } + #source-update .layui-treeSelect .ztree li span.button.switch { + top: 1px; + left: 3px; + } +</style> +<div class="layui-fluid" id="source-update"> + <form class="layui-form" action="" lay-filter="source-update-form"> + <input type="text" name="id" autocomplete="off" class="layui-input febs-hide" data-th-value="${obj.id}"> + <div class="layui-form-item"> + <label class="layui-form-label febs-form-item-require">视频名称:</label> + <div class="layui-input-block"> + <input type="text" name="name" minlength="2" maxlength="20" lay-verify="range|username" + autocomplete="off" class="layui-input" data-th-value="${obj.name}"> + </div> + </div> + + <div class="layui-form-item"> + <label class="layui-form-label"></label> + <div class="layui-input-block"> + <div class="layui-upload-drag" id="upload"> + <div class="upload-text" id="upload-text"> + <i class="layui-icon layui-icon-upload-drag"></i> + <p>点击上传,或将文件拖拽到此处</p> + </div> + + <div class="upload-progress" id="upload-progress" style="display: none;"> + <h2 style="padding: 20px 60px">10%</h2> + <div class="layui-progress layui-progress-small" lay-showpercent="yes" lay-filter="demo"> + <div class="layui-progress-bar" lay-percent=""></div> + </div> + </div> + </div> + </div> + <input id="file-url" type="text" name="url" autocomplete="off" class="layui-input febs-hide" data-th-value="${obj.url}"> + </div> + + + <div class="layui-form-item"> + <label class="layui-form-label febs-form-item-require">同步修改:</label> + <div class="layui-input-block"> + <input type="radio" name="isSyncUpdate" value="1" title="是"> + <input type="radio" name="isSyncUpdate" value="2" title="否" checked> + + <blockquote class="layui-elem-quote">若选择是,将会更新所有关联到此资源的视频</blockquote> + </div> + </div> + + <div class="layui-form-item febs-hide"> + <button class="layui-btn" lay-submit="" lay-filter="source-update-form-submit" id="submit"></button> + <button type="reset" class="layui-btn" id="reset"></button> + </div> + </form> +</div> + +<script> + layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'upload', 'element'], function () { + var $ = layui.$, + febs = layui.febs, + layer = layui.layer, + form = layui.form, + $view = $('#source-update'), + $uploadProgress = $("#upload-progress"), + validate = layui.validate, + upload = layui.upload, + element = layui.element; + + form.verify(validate); + form.render(); + + form.on('submit(source-update-form-submit)', function (data) { + febs.post(ctx + 'video/source/update', data.field, function () { + layer.closeAll(); + febs.alert.success('修改成功'); + $('#febs-video-source').find('#query').click(); + }); + return false; + }); + + // 拖拽上传 + upload.render({ + elem: '#upload' + ,url: 'common/upload' + ,accept: 'file' + // ,exts: 'mp4|flv' + ,before: function(obj){ + element.progress('demo', '0%'); //进度条复位 + $("#upload-text").css("display", "none"); + $uploadProgress.css("display", "block"); + var h2s = $uploadProgress.find("h2"); + $(h2s[0]).text("0%"); + layer.msg('上传中', {icon: 16, time: 0}); + } + ,done: function(res){ + console.log(res); + //如果上传失败 + if(res.code != 200){ + return layer.msg('上传失败'); + } + + $("#file-url").val(res.data); + } + ,error: function(){ + } + //进度条 + ,progress: function(n, elem, e){ + element.progress('demo', n + '%'); + + var h2s = $uploadProgress.find("h2"); + $(h2s[0]).text(n + "%"); + if(n == 100){ + layer.msg('上传完毕', {icon: 1}); + } + } + }); + }); +</script> \ No newline at end of file -- Gitblit v1.9.1