增加数据权限代码

module-article/src/main/java/ink/wgink/module/article/controller/api/content/ContentDataAuthController.java

@@ -0,0 +1,69 @@
+package ink.wgink.module.article.controller.api.content;
+
+import ink.wgink.annotation.CheckRequestBodyAnnotation;
+import ink.wgink.common.base.DefaultBaseController;
+import ink.wgink.exceptions.ParamsException;
+import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.module.article.pojo.dtos.content.ContentDTO;
+import ink.wgink.module.article.pojo.vos.content.ContentVO;
+import ink.wgink.module.article.service.content.IContentDataAuthService;
+import ink.wgink.module.article.service.content.IContentService;
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.result.ErrorResult;
+import ink.wgink.pojo.result.SuccessResult;
+import ink.wgink.pojo.result.SuccessResultData;
+import ink.wgink.pojo.result.SuccessResultList;
+import ink.wgink.util.RegexUtil;
+import io.swagger.annotations.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: ArticleContentController
+ * @Description: 文章内容
+ * @Author: WenG
+ * @Date: 2020-04-03 15:37
+ * @Version: 1.0
+ **/
+@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "文章内容数据权限接口")
+@RestController
+@RequestMapping(ISystemConstant.API_PREFIX + "/content/data-auth")
+public class ContentDataAuthController extends DefaultBaseController {
+
+    @Autowired
+    private IContentDataAuthService contentDataAuthService;
+
+    @ApiOperation(value = "文章内容列表", notes = "文章内容列表接口")
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "categoryId", value = "文章目录", paramType = "query", dataType = "String")
+    })
+    @GetMapping("list")
+    public List<ContentDTO> list() {
+        Map<String, Object> params = requestParams();
+        return contentDataAuthService.list(params);
+    }
+
+    @ApiOperation(value = "文章内容分页列表", notes = "文章内容分页列表接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"),
+            @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"),
+            @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "categoryId", value = "文章目录", paramType = "query", dataType = "String")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("listpage")
+    public SuccessResultList<List<ContentDTO>> listPage(ListPage page) {
+        Map<String, Object> params = requestParams();
+        page.setParams(params);
+        return contentDataAuthService.listPage(page);
+    }
+
+}

module-article/src/main/java/ink/wgink/module/article/controller/route/content/ContentDataAuthRouteController.java

@@ -0,0 +1,41 @@
+package ink.wgink.module.article.controller.route.content;
+
+import ink.wgink.interfaces.consts.ISystemConstant;
+import ink.wgink.module.article.pojo.dtos.category.CategoryDTO;
+import ink.wgink.module.article.service.category.ICategoryService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: MenuRouteController
+ * @Description: 文章内容路由
+ * @Author: wanggeng
+ * @Date: 2021/2/10 1:43 下午
+ * @Version: 1.0
+ */
+@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "文章内容路由接口")
+@Controller
+@RequestMapping(ISystemConstant.ROUTE_PREFIX + "/content/data-auth")
+public class ContentDataAuthRouteController {
+
+    @GetMapping("list")
+    public ModelAndView list() {
+        return new ModelAndView("content/data-auth/list");
+    }
+
+    @GetMapping("list/{categoryId}")
+    public ModelAndView listCategory(@PathVariable("categoryId") String categoryId) {
+        ModelAndView modelAndView = new ModelAndView("content/data-auth/list-category");
+        modelAndView.addObject("categoryId", categoryId);
+        return modelAndView;
+    }
+
+}

module-article/src/main/java/ink/wgink/module/article/controller/route/content/ContentRouteController.java

@@ -39,6 +39,11 @@ public class ContentRouteController {
         return new ModelAndView("content/list");
     }
 
+    @GetMapping("list-data-auth")
+    public ModelAndView listDataAuth() {
+        return new ModelAndView("category/list-data-auth");
+    }
+
     @GetMapping("list/{categoryId}")
     public ModelAndView listCategory(@PathVariable("categoryId") String categoryId) {
         ModelAndView modelAndView = new ModelAndView("content/list-category");

module-article/src/main/java/ink/wgink/module/article/service/content/IContentDataAuthService.java

@@ -0,0 +1,108 @@
+package ink.wgink.module.article.service.content;
+
+import ink.wgink.interfaces.article.IArticleCheckService;
+import ink.wgink.module.article.pojo.dtos.content.ContentDTO;
+import ink.wgink.module.article.pojo.vos.content.ContentVO;
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.result.SuccessResultList;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName: IArticleContentService
+ * @Description: 文章内容
+ * @Author: WenG
+ * @Date: 2020-04-03 15:37
+ * @Version: 1.0
+ **/
+public interface IContentDataAuthService extends IArticleCheckService {
+
+    /**
+     * 文章内容列表
+     *
+     * @param params
+     * @return
+     */
+    List<ContentDTO> list(Map<String, Object> params);
+
+    /**
+     * 文章内容列表
+     *
+     * @param categoryId 目录ID
+     * @return
+     */
+    List<ContentDTO> list(String categoryId);
+
+    /**
+     * 文章列表
+     *
+     * @param userId 用户ID
+     * @return
+     */
+    List<ContentDTO> listByUserId(String userId);
+
+    /**
+     * 文章列表
+     *
+     * @param userIds 用户ID列表
+     * @return
+     */
+    List<ContentDTO> listByUserIds(List<String> userIds);
+
+    /**
+     * 文章列表
+     *
+     * @param categoryId 目录ID
+     * @param userId     用户ID
+     * @return
+     */
+    List<ContentDTO> listByUserId(String categoryId, String userId);
+
+    /**
+     * 文章列表
+     *
+     * @param categoryId 目录ID
+     * @param userIds    用户ID列表
+     * @return
+     */
+    List<ContentDTO> listByUserIds(String categoryId, List<String> userIds);
+
+    /**
+     * 文章内容分页列表
+     *
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<ContentDTO>> listPage(ListPage page);
+
+    /**
+     * 文章内容分页
+     *
+     * @param categoryId
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<ContentDTO>> listPage(String categoryId, ListPage page);
+
+    /**
+     * 文章内容分页
+     *
+     * @param categoryId
+     * @param userId
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<ContentDTO>> listPageByUserId(String categoryId, String userId, ListPage page);
+
+    /**
+     * 文章内容分页
+     *
+     * @param categoryId
+     * @param userIds
+     * @param page
+     * @return
+     */
+    SuccessResultList<List<ContentDTO>> listPageByUserIds(String categoryId, List<String> userIds, ListPage page);
+
+}

module-article/src/main/java/ink/wgink/module/article/service/content/IContentService.java

@@ -194,30 +194,6 @@ public interface IContentService extends IArticleCheckService {
      */
     SuccessResultList<List<ContentDTO>> listPageByUserIds(String categoryId, List<String> userIds, ListPage page);
 
-    /**
-     * 文章内容列表（带数据权限）
-     *
-     * @param params
-     * @return
-     */
-    List<ContentDTO> listWithDataAuth(Map<String, Object> params);
-
-    /**
-     * 文章内容列表（带数据权限）
-     *
-     * @param categoryId 目录ID
-     * @return
-     */
-    List<ContentDTO> listWithDataAuth(String categoryId);
-
-    /**
-     * 文章内容分页列表（带数据权限）
-     *
-     * @param page
-     * @return
-     */
-    SuccessResultList<List<ContentDTO>> listPageWithDataAuth(ListPage page);
-
     /**
      * 统计文章数量
      *

module-article/src/main/java/ink/wgink/module/article/service/content/impl/ContentDataAuthService.java

@@ -0,0 +1,138 @@
+package ink.wgink.module.article.service.content.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import ink.wgink.common.base.DefaultBaseService;
+import ink.wgink.module.article.pojo.dtos.content.ContentDTO;
+import ink.wgink.module.article.service.content.IContentDataAuthService;
+import ink.wgink.module.article.service.content.IContentService;
+import ink.wgink.pojo.ListPage;
+import ink.wgink.pojo.result.SuccessResultList;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: ContentDataAuthService
+ * @Description: 文章内容数据权限
+ * @Author: wanggeng
+ * @Date: 2021/6/11 10:17 上午
+ * @Version: 1.0
+ */
+@Service
+public class ContentDataAuthService extends DefaultBaseService implements IContentDataAuthService {
+
+    @Autowired
+    private IContentService contentService;
+
+    @Override
+    public List<ContentDTO> list(Map<String, Object> params) {
+        setDataAuthorityInfo(params);
+        return contentService.list(params);
+    }
+
+    @Override
+    public List<ContentDTO> list(String categoryId) {
+        if (StringUtils.isBlank(categoryId)) {
+            return new ArrayList<>();
+        }
+        Map<String, Object> params = getHashMap(2);
+        params.put("categoryId", categoryId);
+        return list(params);
+    }
+
+    @Override
+    public List<ContentDTO> listByUserId(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return new ArrayList<>();
+        }
+        Map<String, Object> params = getHashMap(2);
+        params.put("creator", userId);
+        return list(params);
+    }
+
+    @Override
+    public List<ContentDTO> listByUserIds(List<String> userIds) {
+        if (userIds == null || userIds.isEmpty()) {
+            return new ArrayList<>();
+        }
+        Map<String, Object> params = getHashMap(2);
+        params.put("creators", userIds);
+        return list(params);
+    }
+
+    @Override
+    public List<ContentDTO> listByUserId(String categoryId, String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return new ArrayList<>();
+        }
+        Map<String, Object> params = getHashMap(4);
+        params.put("categoryId", categoryId);
+        params.put("creator", userId);
+        return list(params);
+    }
+
+    @Override
+    public List<ContentDTO> listByUserIds(String categoryId, List<String> userIds) {
+        if (StringUtils.isBlank(categoryId)) {
+            return new ArrayList<>();
+        }
+        if (userIds == null || userIds.isEmpty()) {
+            return new ArrayList<>();
+        }
+        Map<String, Object> params = getHashMap(4);
+        params.put("categoryId", categoryId);
+        params.put("creators", userIds);
+        return list(params);
+    }
+
+    @Override
+    public SuccessResultList<List<ContentDTO>> listPage(ListPage page) {
+        PageHelper.startPage(page.getPage(), page.getRows());
+        List<ContentDTO> articleContentDTOs = list(page.getParams());
+        PageInfo<ContentDTO> pageInfo = new PageInfo<>(articleContentDTOs);
+        return new SuccessResultList<>(articleContentDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
+    }
+
+    @Override
+    public SuccessResultList<List<ContentDTO>> listPage(String categoryId, ListPage page) {
+        if (StringUtils.isBlank(categoryId)) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
+        page.getParams().put("categoryId", categoryId);
+        return listPage(page);
+    }
+
+    @Override
+    public SuccessResultList<List<ContentDTO>> listPageByUserId(String categoryId, String userId, ListPage page) {
+        if (StringUtils.isBlank(categoryId)) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
+        if (StringUtils.isBlank(userId)) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
+        page.getParams().put("categoryId", categoryId);
+        page.getParams().put("creator", userId);
+        return listPage(page);
+    }
+
+    @Override
+    public SuccessResultList<List<ContentDTO>> listPageByUserIds(String categoryId, List<String> userIds, ListPage page) {
+        if (StringUtils.isBlank(categoryId)) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
+        if (userIds == null || userIds.isEmpty()) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
+        page.getParams().put("categoryId", categoryId);
+        page.getParams().put("creators", userIds);
+        return listPage(page);
+    }
+}

module-article/src/main/java/ink/wgink/module/article/service/content/impl/ContentServiceImpl.java

@@ -3,6 +3,7 @@ package ink.wgink.module.article.service.content.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import ink.wgink.common.base.DefaultBaseService;
+import ink.wgink.exceptions.ParamsException;
 import ink.wgink.module.article.dao.content.IContentDao;
 import ink.wgink.module.article.pojo.dtos.content.ContentDTO;
 import ink.wgink.module.article.pojo.vos.content.ContentVO;
@@ -11,9 +12,11 @@ import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResultList;
 import ink.wgink.util.UUIDUtil;
 import ink.wgink.util.map.HashMapUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -137,6 +140,9 @@ public class ContentServiceImpl extends DefaultBaseService implements IContentSe
 
     @Override
     public List<ContentDTO> list(String categoryId) {
+        if (StringUtils.isBlank(categoryId)) {
+            return new ArrayList<>();
+        }
         Map<String, Object> params = getHashMap(2);
         params.put("categoryId", categoryId);
         return list(params);
@@ -144,6 +150,9 @@ public class ContentServiceImpl extends DefaultBaseService implements IContentSe
 
     @Override
     public List<ContentDTO> listByUserId(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return new ArrayList<>();
+        }
         Map<String, Object> params = getHashMap(2);
         params.put("creator", userId);
         return list(params);
@@ -151,6 +160,9 @@ public class ContentServiceImpl extends DefaultBaseService implements IContentSe
 
     @Override
     public List<ContentDTO> listByUserIds(List<String> userIds) {
+        if (userIds == null || userIds.isEmpty()) {
+            return new ArrayList<>();
+        }
         Map<String, Object> params = getHashMap(2);
         params.put("creators", userIds);
         return list(params);
@@ -158,6 +170,9 @@ public class ContentServiceImpl extends DefaultBaseService implements IContentSe
 
     @Override
     public List<ContentDTO> listByUserId(String categoryId, String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return new ArrayList<>();
+        }
         Map<String, Object> params = getHashMap(4);
         params.put("categoryId", categoryId);
         params.put("creator", userId);
@@ -166,6 +181,12 @@ public class ContentServiceImpl extends DefaultBaseService implements IContentSe
 
     @Override
     public List<ContentDTO> listByUserIds(String categoryId, List<String> userIds) {
+        if (StringUtils.isBlank(categoryId)) {
+            return new ArrayList<>();
+        }
+        if (userIds == null || userIds.isEmpty()) {
+            return new ArrayList<>();
+        }
         Map<String, Object> params = getHashMap(4);
         params.put("categoryId", categoryId);
         params.put("creators", userIds);
@@ -182,12 +203,21 @@ public class ContentServiceImpl extends DefaultBaseService implements IContentSe
 
     @Override
     public SuccessResultList<List<ContentDTO>> listPage(String categoryId, ListPage page) {
+        if (StringUtils.isBlank(categoryId)) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
         page.getParams().put("categoryId", categoryId);
         return listPage(page);
     }
 
     @Override
     public SuccessResultList<List<ContentDTO>> listPageByUserId(String categoryId, String userId, ListPage page) {
+        if (StringUtils.isBlank(categoryId)) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
+        if (StringUtils.isBlank(userId)) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
         page.getParams().put("categoryId", categoryId);
         page.getParams().put("creator", userId);
         return listPage(page);
@@ -195,34 +225,17 @@ public class ContentServiceImpl extends DefaultBaseService implements IContentSe
 
     @Override
     public SuccessResultList<List<ContentDTO>> listPageByUserIds(String categoryId, List<String> userIds, ListPage page) {
+        if (StringUtils.isBlank(categoryId)) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
+        if (userIds == null || userIds.isEmpty()) {
+            return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
+        }
         page.getParams().put("categoryId", categoryId);
         page.getParams().put("creators", userIds);
         return listPage(page);
     }
 
-    @Override
-    public List<ContentDTO> listWithDataAuth(Map<String, Object> params) {
-        setDataAuthorityInfo(params);
-        return list(params);
-    }
-
-    @Override
-    public List<ContentDTO> listWithDataAuth(String categoryId) {
-        Map<String, Object> params = getHashMap(16);
-        params.put("categoryId", categoryId);
-        setDataAuthorityInfo(params);
-        return list(params);
-    }
-
-    @Override
-    public SuccessResultList<List<ContentDTO>> listPageWithDataAuth(ListPage page) {
-        PageHelper.startPage(page.getPage(), page.getRows());
-        setDataAuthorityInfo(page.getParams());
-        List<ContentDTO> articleContentDTOs = list(page.getParams());
-        PageInfo<ContentDTO> pageInfo = new PageInfo<>(articleContentDTOs);
-        return new SuccessResultList<>(articleContentDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
-    }
-
     @Override
     public Integer count(Map<String, Object> params) {
         Integer count = contentDao.count(params);

module-article/src/main/resources/templates/content/data-auth/list-category.html

@@ -0,0 +1,299 @@
+<!doctype html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <base th:href="${#request.getContextPath() + '/'} ">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn" style="margin-bottom: 10px;">
+                        <input type="hidden" id="categoryId" th:value="${categoryId}">
+                        <div class="layui-inline">
+                            <input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
+                        </div>
+                        <div class="layui-inline layui-form search-item">
+                            <select id="isPublish" name="isPublish">
+                                <option value="">选择状态</option>
+                                <option value="0">未发布</option>
+                                <option value="1">已发布</option>
+                            </select>
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                    <!-- 表头按钮组 -->
+                    <script type="text/html" id="headerToolBar">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
+                                <i class="fa fa-lg fa-plus"></i> 新增
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
+                                <i class="fa fa-lg fa-edit"></i> 编辑
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent">
+                                <i class="fa fa-lg fa-trash"></i> 删除
+                            </button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script type="text/javascript">
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laydate', 'common'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var table = layui.table;
+        var admin = layui.admin;
+        var laydate = layui.laydate;
+        var common = layui.common;
+        var resizeTimeout = null;
+        var tableUrl = 'api/content/data-auth/listpage?categoryId={categoryId}';
+
+        // 初始化表格
+        function initTable() {
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, [$('#categoryId').val()]),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 90,
+                limit: 20,
+                limits: [20, 40, 60, 80, 100, 200],
+                toolbar: '#headerToolBar',
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [
+                    [
+                        {type:'checkbox', fixed: 'left'},
+                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                        {field: 'title', width: 300, title: '标题', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'categoryTitle', width: 200, title: '文章类别', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'publishDate', width: 150, title: '发布时间', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return common.formatDate('yyyy-MM-dd', new Date(rowData));
+                            }
+                        },
+                        {field: 'isPublish', width: 100, title: '发布操作', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null) {
+                                    return '-';
+                                }
+                                if(rowData == 1) {
+                                    return '<button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="unPublishEvent">取消发布</button>';
+                                }
+                                return '<button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="publishEvent">确定发布</button>';
+                            }
+                        },
+                        {field: 'view', width: 80, title: '操作', align:'center', fixed: 'right',
+                            templet: function(row) {
+                                return '<button class="layui-btn layui-btn-sm" lay-event="viewEvent">预览</button>';
+                            }
+                        },
+                    ]
+                ],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                }
+            });
+        }
+        // 重载表格
+        function reloadTable(currentPage) {
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, [$('#categoryId').val()]),
+                where: {
+                    keywords: $('#keywords').val(),
+                    startTime: $('#startTime').val(),
+                    endTime: $('#endTime').val(),
+                    isPublish: $('#isPublish').val()
+                },
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 90,
+            });
+        }
+        // 初始化日期
+        function initDate() {
+            // 日期选择
+            laydate.render({
+                elem: '#startTime',
+                format: 'yyyy-MM-dd'
+            });
+            laydate.render({
+                elem: '#endTime',
+                format: 'yyyy-MM-dd'
+            });
+        }
+        // 删除
+        function removeData(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/content/remove/{ids}', [ids]), {}, null, function (code, data) {
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
+                        reloadTable();
+                    }, function (code, data) {
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+        initTable();
+        initDate();
+        // 事件 - 页面变化
+        $win.on('resize', function() {
+            clearTimeout(resizeTimeout);
+            resizeTimeout = setTimeout(function() {
+                reloadTable();
+            }, 500);
+        });
+        // 事件 - 搜索
+        $(document).on('click', '#search', function() {
+            reloadTable(1);
+        });
+        // 事件 - 增删改
+        table.on('toolbar(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            var checkStatus = table.checkStatus('dataTable');
+            var checkDatas = checkStatus.data;
+            if(layEvent === 'saveEvent') {
+                layer.open({
+                    type: 2,
+                    title: false,
+                    closeBtn: 0,
+                    area: ['100%', '100%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/content/save/{categoryId}', [$('#categoryId').val()]),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+            } else if(layEvent === 'updateEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    layer.open({
+                        type: 2,
+                        title: false,
+                        closeBtn: 0,
+                        area: ['100%', '100%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/content/update/{categoryId}?contentId={contentId}', [$('#categoryId').val(), checkDatas[0].contentId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'removeEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectDelete);
+                } else {
+                    var ids = '';
+                    for(var i = 0, item; item = checkDatas[i++];) {
+                        if(i > 1) {
+                            ids += '_';
+                        }
+                        ids += item['contentId'];
+                    }
+                    removeData(ids);
+                }
+            }
+        });
+        // 修改发布状态
+        function updatePublishStatus(contentId, publishStatus) {
+            top.restAjax.put(top.restAjax.path('api/content/update-publish-status/{contentId}/{publishStatus}', [contentId, publishStatus]), {}, null, function(code, data) {
+                top.dialog.msg('发布状态修改成功', {time: 1000});
+                reloadTable();
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        table.on('tool(dataTable)', function(obj) {
+           var data = obj.data;
+           var layEvent = obj.event;
+           if(layEvent === 'publishEvent') {
+               updatePublishStatus(data.contentId, 1);
+           } else if(layEvent === 'unPublishEvent') {
+               updatePublishStatus(data.contentId, 0);
+           } else if(layEvent === 'viewEvent') {
+               top.dialog.open({
+                   url: top.restAjax.path('route/content/get?contentId={contentId}', [data.contentId]),
+                   title: '文章预览',
+                   width: '600px',
+                   height: '80%',
+                   onClose: function() {}
+               });
+           }
+        });
+    });
+</script>
+</body>
+</html>

module-article/src/main/resources/templates/content/data-auth/list.html

@@ -0,0 +1,327 @@
+<!doctype html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <base th:href="${#request.getContextPath() + '/'} ">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn" style="margin-bottom: 10px;">
+                        <div class="layui-inline">
+                            <input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="startTime" class="layui-input search-item" placeholder="开始时间" readonly>
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
+                        </div>
+                        <div class="layui-inline layui-form search-item" id="categoryIdTemplateBox" lay-filter="categoryIdTemplateBox"></div>
+                        <script id="categoryIdTemplate" type="text/html">
+                            <select id="categoryId" name="categoryId" lay-filter="categoryId" lay-search>
+                                <option value="">选择类别</option>
+                                {{# for(var i = 0, item; item = d[i++];) { }}
+                                <option value="{{item.categoryId}}">{{item.title}}</option>
+                                {{# } }}
+                            </select>
+                        </script>
+                        <div class="layui-inline layui-form search-item">
+                            <select id="isPublish" name="isPublish">
+                                <option value="">选择状态</option>
+                                <option value="0">未发布</option>
+                                <option value="1">已发布</option>
+                            </select>
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                    <!-- 表头按钮组 -->
+                    <script type="text/html" id="headerToolBar">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
+                                <i class="fa fa-lg fa-plus"></i> 新增
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
+                                <i class="fa fa-lg fa-edit"></i> 编辑
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent">
+                                <i class="fa fa-lg fa-trash"></i> 删除
+                            </button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script src="assets/js/vendor/viewer/viewer.min.js"></script>
+<script type="text/javascript">
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laydate', 'common'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var table = layui.table;
+        var admin = layui.admin;
+        var laytpl = layui.laytpl;
+        var form = layui.form;
+        var laydate = layui.laydate;
+        var common = layui.common;
+        var resizeTimeout = null;
+        var tableUrl = 'api/content/data-auth/listpage';
+
+        // 初始化选择框、单选、复选模板
+        function initSelectRadioCheckboxTemplate(templateId, templateBoxId, data, callback) {
+            laytpl(document.getElementById(templateId).innerHTML).render(data, function(html) {
+                document.getElementById(templateBoxId).innerHTML = html;
+            });
+            form.render('select', templateBoxId);
+        }
+
+        // 初始化学校下拉选择
+        function initCategoryIdSelect() {
+            top.restAjax.get(top.restAjax.path('api/category/list', []), {}, null, function(code, data, args) {
+                initSelectRadioCheckboxTemplate('categoryIdTemplate', 'categoryIdTemplateBox', data);
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        initCategoryIdSelect();
+        
+        // 初始化表格
+        function initTable() {
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, []),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 90,
+                limit: 20,
+                limits: [20, 40, 60, 80, 100, 200],
+                toolbar: '#headerToolBar',
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [
+                    [
+                        {type:'checkbox', fixed: 'left'},
+                        {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                        {field: 'title', width: 300, title: '标题', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'categoryTitle', width: 200, title: '文章类别', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return rowData;
+                            }
+                        },
+                        {field: 'publishDate', width: 150, title: '发布时间', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                    return '-';
+                                }
+                                return common.formatDate('yyyy-MM-dd', new Date(rowData));
+                            }
+                        },
+                        {field: 'isPublish', width: 100, title: '发布操作', align:'center',
+                            templet: function(row) {
+                                var rowData = row[this.field];
+                                if(typeof(rowData) === 'undefined' || rowData == null) {
+                                    return '-';
+                                }
+                                if(rowData == 1) {
+                                    return '<button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="unPublishEvent">取消发布</button>';
+                                }
+                                return '<button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="publishEvent">确定发布</button>';
+                            }
+                        },
+                        {field: 'view', width: 80, title: '操作', align:'center', fixed: 'right',
+                            templet: function(row) {
+                                return '<button class="layui-btn layui-btn-sm" lay-event="viewEvent">预览</button>';
+                            }
+                        },
+                    ]
+                ],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                }
+            });
+        }
+        // 重载表格
+        function reloadTable(currentPage) {
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, []),
+                where: {
+                    keywords: $('#keywords').val(),
+                    startTime: $('#startTime').val(),
+                    endTime: $('#endTime').val(),
+                    categoryId: $('#categoryId').val(),
+                    isPublish: $('#isPublish').val()
+                },
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 90,
+            });
+        }
+        // 初始化日期
+        function initDate() {
+            // 日期选择
+            laydate.render({
+                elem: '#startTime',
+                format: 'yyyy-MM-dd'
+            });
+            laydate.render({
+                elem: '#endTime',
+                format: 'yyyy-MM-dd'
+            });
+        }
+        // 删除
+        function removeData(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/content/remove/{ids}', [ids]), {}, null, function (code, data) {
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
+                        reloadTable();
+                    }, function (code, data) {
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+        initTable();
+        initDate();
+        // 事件 - 页面变化
+        $win.on('resize', function() {
+            clearTimeout(resizeTimeout);
+            resizeTimeout = setTimeout(function() {
+                reloadTable();
+            }, 500);
+        });
+        // 事件 - 搜索
+        $(document).on('click', '#search', function() {
+            reloadTable(1);
+        });
+        // 事件 - 增删改
+        table.on('toolbar(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            var checkStatus = table.checkStatus('dataTable');
+            var checkDatas = checkStatus.data;
+            if(layEvent === 'saveEvent') {
+                layer.open({
+                    type: 2,
+                    title: false,
+                    closeBtn: 0,
+                    area: ['100%', '100%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/content/save', []),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+            } else if(layEvent === 'updateEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    layer.open({
+                        type: 2,
+                        title: false,
+                        closeBtn: 0,
+                        area: ['100%', '100%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/content/update?contentId={contentId}', [checkDatas[0].contentId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'removeEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectDelete);
+                } else {
+                    var ids = '';
+                    for(var i = 0, item; item = checkDatas[i++];) {
+                        if(i > 1) {
+                            ids += '_';
+                        }
+                        ids += item['contentId'];
+                    }
+                    removeData(ids);
+                }
+            }
+        });
+        // 修改发布状态
+        function updatePublishStatus(contentId, publishStatus) {
+            top.restAjax.put(top.restAjax.path('api/content/update-publish-status/{contentId}/{publishStatus}', [contentId, publishStatus]), {}, null, function(code, data) {
+                top.dialog.msg('发布状态修改成功', {time: 1000});
+                reloadTable();
+            }, function(code, data) {
+                top.dialog.msg(data.msg);
+            });
+        }
+        table.on('tool(dataTable)', function(obj) {
+           var data = obj.data;
+           var layEvent = obj.event;
+           if(layEvent === 'publishEvent') {
+               updatePublishStatus(data.contentId, 1);
+           } else if(layEvent === 'unPublishEvent') {
+               updatePublishStatus(data.contentId, 0);
+           } else if(layEvent === 'viewEvent') {
+               top.dialog.open({
+                   url: top.restAjax.path('route/content/get?contentId={contentId}', [data.contentId]),
+                   title: '文章预览',
+                   width: '600px',
+                   height: '80%',
+                   onClose: function() {}
+               });
+           }
+        });
+    });
+</script>
+</body>
+</html>