留言列表改树型

gis_domain/src/main/java/com/gis/domain/po/CommentEntity.java

@@ -21,6 +21,12 @@ public class CommentEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "真实姓名")
     private String realName;
 
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
     @ApiModelProperty(value = "消息")
     private String msg;
 

gis_domain/src/main/java/com/gis/domain/po/SysUserEntity.java

@@ -39,11 +39,11 @@ public class SysUserEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "单位")
     private String unit;
 
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
+//    @ApiModelProperty(value = "部门id")
+//    private Long deptId;
 
-    @ApiModelProperty(value = "超级管理员，1：是， 0：否")
-    private Integer sysManager;
+//    @ApiModelProperty(value = "超级管理员，1：是， 0：否")
+//    private Integer sysManager;
 
     @ApiModelProperty(value = "状态 1:启用  0：停用 ")
     private Integer status;

gis_domain/src/main/java/com/gis/domain/vo/CommentVo.java

@@ -0,0 +1,42 @@
+package com.gis.domain.vo;
+
+import com.gis.domain.po.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 留言评论
+ */
+@Data
+public class CommentVo extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = -8093446477743493946L;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "真实姓名")
+    private String realName;
+
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    @ApiModelProperty(value = "消息")
+    private String msg;
+
+    @ApiModelProperty(value = "父级id")
+    private Long parentId;
+
+
+
+
+
+
+
+}

gis_mapper/src/main/java/com/gis/mapper/CommentMapper.java

@@ -1,12 +1,22 @@
 package com.gis.mapper;
 
 
+import com.gis.domain.dto.PageDateDto;
 import com.gis.domain.po.CommentEntity;
+import com.gis.domain.vo.CommentVo;
+import com.gis.mapper.provider.CommentProvider;
+import com.gis.mapper.provider.SpiritProvider;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 @Mapper
 public interface CommentMapper extends IBaseMapper<CommentEntity, Long> {
 
+
+    @SelectProvider(type = CommentProvider.class, method = "search")
+    List<CommentEntity> search(PageDateDto param, Integer display);
 }

gis_mapper/src/main/java/com/gis/mapper/NewsMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
 public interface NewsMapper extends IBaseMapper<NewsEntity, Long> {
 
     @SelectProvider(type = NewsProvider.class, method = "search")
-    List<NewsVo> search(NewsPageDateRequest param);
+    List<NewsVo> search(NewsPageDateRequest param, Long userId);
 
     @SelectProvider(type = NewsProvider.class, method = "webSearch")
     List<NewsVo> webSearch(PageDto webPageDto);

gis_mapper/src/main/java/com/gis/mapper/SlideshowMapper.java

@@ -16,5 +16,5 @@ import java.util.List;
 public interface SlideshowMapper extends IBaseMapper<SlideshowEntity, Long> {
 
     @SelectProvider(type = SlideshowProvider.class, method = "search")
-    List<SlideshowVo> search(SlideshowPageDateDto param);
+    List<SlideshowVo> search(SlideshowPageDateDto param, Long userId);
 }

gis_mapper/src/main/java/com/gis/mapper/SpiritMapper.java

@@ -16,5 +16,5 @@ import java.util.List;
 public interface SpiritMapper extends IBaseMapper<SpiritEntity, Long> {
 
     @SelectProvider(type = SpiritProvider.class, method = "search")
-    List<SpiritVo> search(SpiritPageDateDto param);
+    List<SpiritVo> search(SpiritPageDateDto param, Long userId);
 }

gis_mapper/src/main/java/com/gis/mapper/provider/CommentProvider.java

@@ -0,0 +1,42 @@
+package com.gis.mapper.provider;
+
+import com.gis.domain.dto.PageDateDto;
+import com.gis.domain.dto.SlideshowPageDateDto;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by owen on 2020/6/13 0013 10:56
+ */
+@Log4j2
+public class CommentProvider {
+
+
+    public String search(PageDateDto param, Integer display){
+        StringBuffer sql = new StringBuffer(
+                "select * from tb_comment where rec_status = 'A' ");
+
+        if(StringUtils.isNotBlank(param.getStartTime()) ){
+
+            sql.append(" and create_time >= ").append("'").append(param.getStartTime()).append("'");
+
+        }
+
+        if (StringUtils.isNotBlank(param.getEndTime())) {
+            sql.append(" and create_time <= ").append("'").append(param.getEndTime()).append("'");
+        }
+
+        String searchKey = param.getSearchKey();
+        if(StringUtils.isNotBlank(searchKey)){
+            sql.append(" and ( msg like '%").append(searchKey).append("%' )");
+        }
+
+        if (display != null) {
+            sql.append(" and display = ").append(display);
+        }
+
+        sql.append(" order by create_time desc");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+}

gis_mapper/src/main/java/com/gis/mapper/provider/NewsProvider.java

@@ -12,7 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 public class NewsProvider {
 
 
-    public String search(NewsPageDateRequest param){
+    public String search(NewsPageDateRequest param, Long userId){
         StringBuffer sql = new StringBuffer(
                 "select a.id, a.type, a.title, a.description, a.img, a.thumb, a.display, a.view_count, a.status, a.reason, a.create_time, a.update_time," +
                         "a.submit_id, b.real_name as submit_name from tb_news a left join sys_user b on b.id = a.submit_id where a.rec_status = 'A' ");
@@ -37,22 +37,9 @@ public class NewsProvider {
             sql.append(" and a.type = '").append(type).append("'");
         }
 
-        /**
-         * 待审核,0：草稿中、待审核、审核不通过
-         * 审核通过,1：审核通过
-         */
-//        Integer auditStatus = param.getAuditStatus();
-//
-//        if (auditStatus != null) {
-//
-//            if (auditStatus == 0) {
-//                sql.append(" and a.status <> ").append(4);
-//            } else {
-//                sql.append(" and a.status = ").append(4);
-//            }
-//        }
-
-
+        if (userId != null) {
+            sql.append(" and a.submit_id = ").append(userId);
+        }
         /**
          * 列表专用
          * 待审核,5：草稿中、待审核、审核不通过

gis_mapper/src/main/java/com/gis/mapper/provider/SlideshowProvider.java

@@ -11,9 +11,9 @@ import org.apache.commons.lang3.StringUtils;
 public class SlideshowProvider {
 
 
-    public String search(SlideshowPageDateDto param){
+    public String search(SlideshowPageDateDto param, Long userId){
         StringBuffer sql = new StringBuffer(
-                "select a.id, a.title, a.img, a.thumb, a.web_site, a.status, a.reason," +
+                "select a.id, a.title, a.img, a.thumb, a.web_site, a.status, a.reason, a.sort, a.display" +
                         "a.submit_id, b.real_name as submit_name from tb_slideshow a left join sys_user b on b.id = a.submit_id where a.rec_status = 'A' ");
 
         if(StringUtils.isNotBlank(param.getStartTime()) ){
@@ -31,6 +31,10 @@ public class SlideshowProvider {
             sql.append(" and ( a.title like '%").append(searchKey).append("%' )");
         }
 
+        if (userId != null) {
+            sql.append(" and a.submit_id = ").append(userId);
+        }
+
 
         /**
          * 列表专用
@@ -46,7 +50,7 @@ public class SlideshowProvider {
         }
 
 
-        sql.append(" order by a.create_time desc");
+        sql.append(" order by a.display = 1, a.sort asc, a.create_time desc");
         log.info("sql: {}", sql.toString());
         return sql.toString();
     }

gis_mapper/src/main/java/com/gis/mapper/provider/SpiritProvider.java

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.StringUtils;
 public class SpiritProvider {
 
 
-    public String search(SpiritPageDateDto param){
+    public String search(SpiritPageDateDto param, Long userId){
         StringBuffer sql = new StringBuffer(
                 "select a.id, a.title, a.unit, a.img, a.thumb, a.display, a.view_count, a.status, a.reason, a.create_time, a.update_time," +
                         "a.submit_id, b.real_name as submit_name from tb_spirit a left join sys_user b on b.id = a.submit_id where a.rec_status = 'A' ");
@@ -31,6 +31,10 @@ public class SpiritProvider {
             sql.append(" and ( a.title like '%").append(searchKey).append("%' )");
         }
 
+        if(userId != null){
+            sql.append(" and a.submit_id = ").append(userId);
+        }
+
 
         /**
          * 列表专用

gis_service/src/main/java/com/gis/service/CommentService.java

@@ -1,8 +1,11 @@
 package com.gis.service;
 
 
+import com.gis.domain.dto.PageDateDto;
 import com.gis.domain.po.CommentEntity;
 
+import java.util.List;
+
 
 /**
  * Created by owen on 2020/3/11 0011 16:14
@@ -10,4 +13,5 @@ import com.gis.domain.po.CommentEntity;
 public interface CommentService extends IBaseService<CommentEntity, Long> {
 
 
+    List<CommentEntity> search(PageDateDto param, Integer display);
 }

gis_service/src/main/java/com/gis/service/NewsService.java

@@ -15,7 +15,8 @@ import java.util.List;
 public interface NewsService extends IBaseService<NewsEntity, Long> {
 
 
-    List<NewsVo> search(NewsPageDateRequest param);
+    List<NewsVo> search(NewsPageDateRequest param, Long userId);
 
     List<NewsVo>  webSearch(PageDto webPageDto);
+
 }

gis_service/src/main/java/com/gis/service/SlideshowService.java

@@ -14,7 +14,7 @@ import java.util.List;
 public interface SlideshowService extends IBaseService<SlideshowEntity, Long> {
 
 
-    List<SlideshowVo> search(SlideshowPageDateDto param);
+    List<SlideshowVo> search(SlideshowPageDateDto param, Long userId);
 
 
 }

gis_service/src/main/java/com/gis/service/SpiritService.java

@@ -14,5 +14,5 @@ import java.util.List;
 public interface SpiritService extends IBaseService<SpiritEntity, Long> {
 
 
-    List<SpiritVo> search(SpiritPageDateDto param);
+    List<SpiritVo> search(SpiritPageDateDto param, Long userId);
 }

gis_service/src/main/java/com/gis/service/impl/CommentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gis.service.impl;
 
+import com.gis.domain.dto.PageDateDto;
 import com.gis.domain.po.CommentEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.CommentMapper;
@@ -7,6 +8,8 @@ import com.gis.service.CommentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * Created by owen on 2020/3/11 0011 16:16
@@ -23,5 +26,8 @@ public class CommentServiceImpl extends IBaseServiceImpl<CommentEntity, Long> im
     }
 
 
-
+    @Override
+    public List<CommentEntity> search(PageDateDto param, Integer display) {
+        return entityMapper.search(param, display);
+    }
 }

gis_service/src/main/java/com/gis/service/impl/NewsServiceImpl.java

@@ -29,8 +29,8 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
 
 
     @Override
-    public List<NewsVo> search(NewsPageDateRequest param) {
-        return entityMapper.search(param);
+    public List<NewsVo> search(NewsPageDateRequest param, Long userId) {
+        return entityMapper.search(param, userId);
     }
 
     @Override

gis_service/src/main/java/com/gis/service/impl/SlideshowServiceImpl.java

@@ -28,7 +28,7 @@ public class SlideshowServiceImpl extends IBaseServiceImpl<SlideshowEntity, Long
     }
 
     @Override
-    public List<SlideshowVo> search(SlideshowPageDateDto param) {
-        return entityMapper.search(param);
+    public List<SlideshowVo> search(SlideshowPageDateDto param, Long userId) {
+        return entityMapper.search(param, userId);
     }
 }

gis_service/src/main/java/com/gis/service/impl/SpiritServiceImpl.java

@@ -28,7 +28,7 @@ public class SpiritServiceImpl extends IBaseServiceImpl<SpiritEntity, Long> impl
 
 
     @Override
-    public List<SpiritVo> search(SpiritPageDateDto param) {
-        return entityMapper.search(param);
+    public List<SpiritVo> search(SpiritPageDateDto param, Long userId) {
+        return entityMapper.search(param, userId);
     }
 }

gis_service/src/main/java/com/gis/service/util/CommentTree.java

@@ -19,6 +19,10 @@ public class CommentTree {
 
     private Date createTime;
 
+    private String nickName;
+
+    private String unit;
+
 
     // 子菜单/或按钮
     private List<CommentTree> children;

gis_service/src/main/java/com/gis/service/util/CommentTreeUtil.java

@@ -19,6 +19,9 @@ public class CommentTreeUtil {
             treeGrid.setMsg(n.getMsg());
             treeGrid.setRealName(n.getRealName());
             treeGrid.setCreateTime(n.getCreateTime());
+            treeGrid.setUnit(n.getUnit());
+            treeGrid.setNickName(n.getNickName());
+
 
             if (n.getParentId() != null) {
                 treeGrid.setParentId(n.getParentId());

gis_web/src/main/java/com/gis/web/controller/CommentController.java

@@ -1,9 +1,11 @@
 package com.gis.web.controller;
 
 import com.gis.common.util.Result;
+import com.gis.domain.dto.PageDateDto;
 import com.gis.domain.po.CommentEntity;
 import com.gis.domain.dto.CommentRequest;
 import com.gis.domain.dto.PageDto;
+import com.gis.domain.vo.CommentVo;
 import com.gis.service.CommentService;
 import com.gis.service.util.CommentTree;
 import com.gis.service.util.CommentTreeUtil;
@@ -33,13 +35,13 @@ public class CommentController extends BaseController {
     private CommentService commentService;
 
 
-
-    @ApiOperation("列表")
+    @RequiresRoles(value = {"sys_admin", "sys_high", "sys_normal"}, logical = Logical.OR)
+    @ApiOperation("树型列表")
     @PostMapping("list")
-    public Result<CommentTree> list(@RequestBody PageDto param) {
+    public Result<CommentVo> list(@RequestBody PageDateDto param) {
         startPage(param);
 
-        List<CommentEntity> all = commentService.findAll();
+        List<CommentEntity> all = commentService.search(param, null);
         CommentTreeUtil commentTreeUtil = new CommentTreeUtil(all);
         List<CommentTree> commentTrees = commentTreeUtil.buildTree();
 
@@ -47,6 +49,20 @@ public class CommentController extends BaseController {
         return Result.success(page);
     }
 
+//    @RequiresRoles(value = {"sys_admin", "sys_high", "sys_normal"}, logical = Logical.OR)
+//    @ApiOperation("树型列表")
+//    @PostMapping("treeList")
+//    public Result<CommentTree> treeList(@RequestBody PageDto param) {
+//        startPage(param);
+//
+//        List<CommentEntity> all = commentService.findAll();
+//        CommentTreeUtil commentTreeUtil = new CommentTreeUtil(all);
+//        List<CommentTree> commentTrees = commentTreeUtil.buildTree();
+//
+//        PageInfo<CommentTree> page = new PageInfo<>(commentTrees);
+//        return Result.success(page);
+//    }
+
     @ApiOperation("新增/修改")
     @PostMapping("save")
     public Result save(@Valid @RequestBody CommentRequest param) {
@@ -75,6 +91,8 @@ public class CommentController extends BaseController {
         BeanUtils.copyProperties(param, entity);
         entity.setUserId(getTokenUserId());
         entity.setRealName(getSysUser().getRealName());
+        entity.setNickName(getSysUser().getNickName());
+        entity.setUnit(getSysUser().getUnit());
         commentService.save(entity);
 
         return Result.success();

gis_web/src/main/java/com/gis/web/controller/FodderController.java

@@ -5,10 +5,13 @@ import com.gis.domain.dto.FodderDto;
 import com.gis.domain.dto.FodderPageDto;
 import com.gis.domain.po.FodderEntity;
 import com.gis.service.FodderService;
+import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,6 +27,7 @@ import java.util.Date;
 @Api(tags = "场景素材")
 @RestController
 @RequestMapping("manage/fodder")
+@RequiresRoles(value = {"sys_admin", "sys_high", "sys_normal"}, logical = Logical.OR)
 public class FodderController extends BaseController {
 
     @Autowired
@@ -43,7 +47,8 @@ public class FodderController extends BaseController {
         return Result.success(page);
     }
 
-    @ApiOperation("新增/修改部信息")
+    @WebControllerLog(description = "场景素材-新增/修改")
+    @ApiOperation("新增/修改")
     @PostMapping("save")
     public Result save(@Valid @RequestBody FodderDto param) {
 
@@ -71,6 +76,7 @@ public class FodderController extends BaseController {
     /**
      * 素材文件，真删除
      */
+    @WebControllerLog(description = "场景素材-删除")
     @ApiOperation("删除")
     @GetMapping("removes/{ids}")
     public Result detail(@PathVariable String ids) {

gis_web/src/main/java/com/gis/web/controller/GoodsController.java

@@ -8,10 +8,13 @@ import com.gis.domain.po.FileEntity;
 import com.gis.domain.po.GoodsEntity;
 import com.gis.domain.vo.GoodsVo;
 import com.gis.service.GoodsService;
+import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -28,6 +31,7 @@ import java.util.List;
 @Api(tags = "精品典藏")
 @RestController
 @RequestMapping("manage/goods")
+@RequiresRoles(value = {"sys_admin", "sys_high", "sys_normal"}, logical = Logical.OR)
 public class GoodsController extends BaseController {
 
     @Autowired
@@ -46,8 +50,8 @@ public class GoodsController extends BaseController {
         return Result.success(page);
     }
 
-
-    @ApiOperation("新增/修改部信息")
+    @WebControllerLog(description = "精品典藏-新增/修改")
+    @ApiOperation("新增/修改")
     @PostMapping("save")
     public Result save(@Valid @RequestBody GoodsDto param) {
 
@@ -83,6 +87,7 @@ public class GoodsController extends BaseController {
      *
      * 这个是删除单条数据
      */
+    @WebControllerLog(description = "精品典藏-删除")
     @ApiOperation("删除")
     @GetMapping("remove/{id}")
     public Result remove(@PathVariable Long id) {

gis_web/src/main/java/com/gis/web/controller/MenuController.java

@@ -7,9 +7,12 @@ import com.gis.domain.dto.PageDto;
 import com.gis.service.MenuService;
 import com.gis.service.util.MenuTree;
 import com.gis.service.util.MenuTreeUtil;
+import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +24,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/5/8 0008 9:54
  */
+@RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
 @Api(tags = "s菜单管理")
 @RestController
 @RequestMapping("manage/menu")
@@ -39,7 +43,8 @@ public class MenuController extends BaseController {
         return Result.success(page);
     }
 
-    @ApiOperation("新增/修改部信息")
+    @WebControllerLog(description = "菜单管理-新增/修改")
+    @ApiOperation("新增/修改")
     @PostMapping("save")
     public Result save(@Valid @RequestBody MenuRequest param) {
 
@@ -64,6 +69,7 @@ public class MenuController extends BaseController {
     }
 
 
+    @WebControllerLog(description = "菜单管理-删除")
     @ApiOperation("删除")
     @GetMapping("removes/{ids}")
     public Result detail(@PathVariable String ids) {

gis_web/src/main/java/com/gis/web/controller/NewsController.java

@@ -4,12 +4,16 @@ import com.gis.common.util.Result;
 import com.gis.domain.po.NewsEntity;
 import com.gis.domain.dto.NewsPageDateRequest;
 import com.gis.domain.dto.NewsRequest;
+import com.gis.domain.po.SysUserEntity;
 import com.gis.domain.vo.NewsVo;
 import com.gis.service.NewsService;
+import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -22,9 +26,10 @@ import java.util.List;
  * Created by owen on 2020/5/8 0008 9:54
  */
 @Log4j2
-@Api(tags = "史馆动态", position = 2)
+@Api(tags = "史馆动态")
 @RestController
 @RequestMapping("manage/news")
+@RequiresRoles(value = {"sys_admin", "sys_high", "sys_normal"}, logical = Logical.OR)
 public class NewsController extends BaseController {
 
     @Autowired
@@ -36,16 +41,24 @@ public class NewsController extends BaseController {
     @PostMapping("list")
     public Result<NewsVo> list(@RequestBody NewsPageDateRequest param) {
 
-
-
+        SysUserEntity sysUser = getSysUser();
         startPage(param);
-        PageInfo<NewsVo> page = new PageInfo<>(newsService.search(param));
+        List<NewsVo> search;
+        if ("sys_normal".equals(sysUser.getRole())) {
+            // 查询个人
+            search = newsService.search(param, sysUser.getId());
+        } else {
+            search = newsService.search(param, null);
+        }
+
+        PageInfo<NewsVo> page = new PageInfo<>(search);
         return Result.success(page);
     }
 
-    @ApiOperation("新增/修改部信息")
-    @PostMapping("save")
 
+    @WebControllerLog(description = "史馆动态-新增/修改")
+    @ApiOperation("新增/修改")
+    @PostMapping("save")
     public Result save(@Valid @RequestBody NewsRequest param) {
 
         NewsEntity entity = null;
@@ -70,10 +83,10 @@ public class NewsController extends BaseController {
         return Result.success();
     }
 
-
     /**
      * 软删除，db保留记录
      */
+    @WebControllerLog(description = "史馆动态-删除")
     @ApiOperation("删除")
     @GetMapping("removes/{ids}")
     public Result detail(@PathVariable String ids) {
@@ -89,6 +102,7 @@ public class NewsController extends BaseController {
     }
 
 
+    @WebControllerLog(description = "史馆动态-审核")
     @ApiOperation("审核")
     @GetMapping("audit/{id}/{status}")
     public Result audit(@PathVariable Long id, @PathVariable Integer status) {

gis_web/src/main/java/com/gis/web/controller/SceneController.java

@@ -9,11 +9,14 @@ import com.gis.domain.dto.SceneDataDto;
 import com.gis.domain.po.SceneEntity;
 import com.gis.mapper.SceneMapper;
 import com.gis.service.SceneService;
+import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,6 +28,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/5/8 0008 9:54
  */
+@RequiresRoles(value = {"sys_admin", "sys_high", "sys_normal"}, logical = Logical.OR)
 @Log4j2
 @Api(tags = "大场景")
 @ApiSort(value = 2)
@@ -171,6 +175,7 @@ public class SceneController extends BaseController {
     /**
      * 素材文件，真删除
      */
+    @WebControllerLog(description = "大场景-删除")
     @ApiOperation("场景删除")
     @GetMapping("removes/{ids}")
     public Result detail(@PathVariable String ids) {

gis_web/src/main/java/com/gis/web/controller/SlideshowController.java

@@ -4,12 +4,17 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.SlideshowDto;
 import com.gis.domain.dto.SlideshowPageDateDto;
 import com.gis.domain.po.SlideshowEntity;
+import com.gis.domain.po.SysUserEntity;
 import com.gis.domain.vo.SlideshowVo;
+import com.gis.domain.vo.SpiritVo;
 import com.gis.service.SlideshowService;
+import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +26,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/5/8 0008 9:54
  */
+@RequiresRoles(value = {"sys_admin", "sys_high", "sys_normal"}, logical = Logical.OR)
 @Log4j2
 @Api(tags = "轮播图管理")
 @RestController
@@ -37,11 +43,20 @@ public class SlideshowController extends BaseController {
     public Result<SlideshowVo> list(@RequestBody SlideshowPageDateDto param) {
 
 
+        SysUserEntity sysUser = getSysUser();
         startPage(param);
-        PageInfo<SlideshowVo> page = new PageInfo<>(slideshowService.search(param));
+        List<SlideshowVo> search;
+        if ("sys_normal".equals(sysUser.getRole())) {
+            // 查询个人
+            search = slideshowService.search(param, sysUser.getId());
+        } else {
+            search = slideshowService.search(param, null);
+        }
+        PageInfo<SlideshowVo> page = new PageInfo<>(search);
         return Result.success(page);
     }
 
+    @WebControllerLog(description = "轮播图管理-新增/修改")
     @ApiOperation("新增/修改")
     @PostMapping("save")
     public Result save(@Valid @RequestBody SlideshowDto param) {
@@ -72,6 +87,7 @@ public class SlideshowController extends BaseController {
     /**
      * 软删除，db保留记录
      */
+    @WebControllerLog(description = "轮播图管理-删除")
     @ApiOperation("删除")
     @GetMapping("removes/{ids}")
     public Result detail(@PathVariable String ids) {
@@ -87,6 +103,7 @@ public class SlideshowController extends BaseController {
     }
 
 
+    @WebControllerLog(description = "轮播图管理-审核")
     @ApiOperation("审核")
     @GetMapping("audit/{id}/{status}")
     public Result audit(@PathVariable Long id, @PathVariable Integer status) {

gis_web/src/main/java/com/gis/web/controller/SpiritController.java

@@ -4,12 +4,17 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.SpiritPageDateDto;
 import com.gis.domain.po.SpiritEntity;
 import com.gis.domain.dto.SpiritRequest;
+import com.gis.domain.po.SysUserEntity;
+import com.gis.domain.vo.NewsVo;
 import com.gis.domain.vo.SpiritVo;
 import com.gis.service.SpiritService;
+import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,6 +26,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/5/8 0008 9:54
  */
+@RequiresRoles(value = {"sys_admin", "sys_high", "sys_normal"}, logical = Logical.OR)
 @Log4j2
 @Api(tags = "特有精神")
 @RestController
@@ -36,14 +42,21 @@ public class SpiritController extends BaseController {
     @PostMapping("list")
     public Result<SpiritVo> list(@RequestBody SpiritPageDateDto param) {
 
-        Long userId = getTokenUserId();
-
+        SysUserEntity sysUser = getSysUser();
         startPage(param);
-        PageInfo<SpiritVo> page = new PageInfo<>(spiritService.search(param));
+        List<SpiritVo> search;
+        if ("sys_normal".equals(sysUser.getRole())) {
+            // 查询个人
+            search = spiritService.search(param, sysUser.getId());
+        } else {
+            search = spiritService.search(param, null);
+        }
+        PageInfo<SpiritVo> page = new PageInfo<>(search);
         return Result.success(page);
     }
 
-    @ApiOperation("新增/修改部信息")
+    @WebControllerLog(description = "特有精神-新增/修改")
+    @ApiOperation("新增/修改")
     @PostMapping("save")
     public Result save(@Valid @RequestBody SpiritRequest param) {
 
@@ -73,6 +86,7 @@ public class SpiritController extends BaseController {
     /**
      * 软删除，db保留记录
      */
+    @WebControllerLog(description = "特有精神-删除")
     @ApiOperation("删除")
     @GetMapping("removes/{ids}")
     public Result detail(@PathVariable String ids) {
@@ -88,6 +102,7 @@ public class SpiritController extends BaseController {
     }
 
 
+    @WebControllerLog(description = "特有精神-审核")
     @ApiOperation("审核")
     @GetMapping("audit/{id}/{status}")
     public Result audit(@PathVariable Long id, @PathVariable Integer status) {

gis_web/src/main/java/com/gis/web/controller/SysUserController.java

@@ -141,7 +141,12 @@ public class SysUserController extends BaseController {
         }
 
 
-        if (user.getSysManager() == 1) {
+//        if (user.getSysManager() == 1) {
+//            log.error("管理员账户不能停用/注销： {}", id);
+//            return Result.failure("管理员账户不能停用/注销");
+//        }
+
+        if ("sys_admin".equals(user.getRole())) {
             log.error("管理员账户不能停用/注销： {}", id);
             return Result.failure("管理员账户不能停用/注销");
         }

gis_web/src/main/java/com/gis/web/controller/TopicController.java

@@ -5,11 +5,14 @@ import com.gis.domain.dto.PageDto;
 import com.gis.domain.po.SceneEntity;
 import com.gis.mapper.CommonMapper;
 import com.gis.service.SceneService;
+import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiSort;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,6 +23,7 @@ import java.util.Map;
 /**
  * Created by owen on 2020/5/8 0008 9:54
  */
+@RequiresRoles(value = {"sys_admin"}, logical = Logical.OR)
 @Log4j2
 @Api(tags = "s主题管理", position = 1)
 @RestController
@@ -38,6 +42,7 @@ public class TopicController extends BaseController {
         return Result.success(topic);
     }
 
+    @WebControllerLog(description = "主题管理-设置主题")
     @ApiOperation("设置主题")
     @GetMapping("set/{id}/{topic}")
     public Result setTopic(@PathVariable Long id, @PathVariable String topic) {

gis_web/src/main/java/com/gis/web/controller/VideoController.java

@@ -3,19 +3,20 @@ package com.gis.web.controller;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.PageDto;
 import com.gis.domain.dto.VideoDto;
-import com.gis.domain.po.NewsEntity;
 import com.gis.domain.po.VideoEntity;
 import com.gis.domain.vo.VideoVo;
 import com.gis.mapper.VideoMapper;
 import com.gis.service.VideoService;
+import com.gis.web.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import tk.mybatis.mapper.entity.Condition;
 
 import javax.validation.Valid;
 import java.util.Date;
@@ -24,6 +25,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/5/8 0008 9:54
  */
+@RequiresRoles(value = {"sys_admin", "sys_high", "sys_normal"}, logical = Logical.OR)
 @Log4j2
 @Api(tags = "大场景")
 @RestController
@@ -47,6 +49,7 @@ public class VideoController extends BaseController {
         return Result.success(page);
     }
 
+    @WebControllerLog(description = "大场景-视频新增/修改")
     @ApiOperation("视频新增/修改")
     @PostMapping("save")
     public Result save(@Valid @RequestBody VideoDto param) {
@@ -72,7 +75,7 @@ public class VideoController extends BaseController {
     }
 
 
-
+    @WebControllerLog(description = "大场景-视频删除")
     @ApiOperation("视频删除")
     @GetMapping("removes/{ids}")
     public Result detail(@PathVariable String ids) {

gis_web/src/main/java/com/gis/web/controller/WebController.java

@@ -6,22 +6,19 @@ import com.alibaba.fastjson.JSONObject;
 import com.gis.common.util.FileUtils;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
-import com.gis.domain.po.MenuEntity;
-import com.gis.domain.po.SceneEntity;
-import com.gis.domain.po.VideoEntity;
-import com.gis.domain.po.ViewEntity;
-import com.gis.domain.vo.GoodsVo;
-import com.gis.domain.vo.NewsVo;
-import com.gis.domain.vo.SlideshowVo;
-import com.gis.domain.vo.SpiritVo;
+import com.gis.domain.po.*;
+import com.gis.domain.vo.*;
 import com.gis.service.*;
+import com.gis.service.util.CommentTree;
+import com.gis.service.util.CommentTreeUtil;
 import com.gis.service.util.MenuTree;
 import com.gis.service.util.MenuTreeUtil;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.BeanUtils;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Condition;
@@ -60,10 +57,12 @@ public class WebController extends BaseController {
     @Autowired
     private VideoService videoService;
 
-
     @Autowired
     private SlideshowService slideshowService;
 
+    @Autowired
+    private CommentService commentService;
+
     @ApiOperation("导航栏")
     @GetMapping("navigation")
     public Result navigation() {
@@ -109,11 +108,10 @@ public class WebController extends BaseController {
     public Result slideshow() {
 
         SlideshowPageDateDto param = new SlideshowPageDateDto();
-//        param.setAuditStatus(1);
         param.setStatus(4);
         param.setPageSize(10);
         startPage(param);
-        PageInfo<SlideshowVo> page = new PageInfo<>(slideshowService.search(param));
+        PageInfo<SlideshowVo> page = new PageInfo<>(slideshowService.search(param, null));
         return Result.success(page);
     }
 
@@ -128,7 +126,7 @@ public class WebController extends BaseController {
         param.setType("news");
 
         startPage(param);
-        PageInfo<NewsVo> page = new PageInfo<>(newsService.search(param));
+        PageInfo<NewsVo> page = new PageInfo<>(newsService.search(param, null));
 
         return Result.success(page);
     }
@@ -144,7 +142,7 @@ public class WebController extends BaseController {
         param.setType("notice");
 
         startPage(param);
-        PageInfo<NewsVo> page = new PageInfo<>(newsService.search(param));
+        PageInfo<NewsVo> page = new PageInfo<>(newsService.search(param, null));
 
         return Result.success(page);
     }
@@ -161,7 +159,7 @@ public class WebController extends BaseController {
         param.setStatus(4);
         param.setStatus(5);
         startPage(param);
-        PageInfo<SpiritVo> page = new PageInfo<>(spiritService.search(param));
+        PageInfo<SpiritVo> page = new PageInfo<>(spiritService.search(param, null));
         return Result.success(page);
     }
 
@@ -204,22 +202,36 @@ public class WebController extends BaseController {
     }
 
 
+    @ApiOperation("留言列表")
+    @PostMapping("list")
+    public Result<CommentVo> list(@RequestBody PageDateDto param) {
+        startPage(param);
+
+        List<CommentEntity> all = commentService.search(param, 1);
+        CommentTreeUtil commentTreeUtil = new CommentTreeUtil(all);
+        List<CommentTree> commentTrees = commentTreeUtil.buildTree();
 
+        PageInfo<CommentTree> page = new PageInfo<>(commentTrees);
+        return Result.success(page);
+    }
 
-    public static void main(String[] args) throws IOException {
-        String resourceUrl = FileUtils.getResourceUrl("data/smokeing.json");
 
-        String data = FileUtil.readUtf8String(resourceUrl);
 
-        JSONObject jsonObject = JSONObject.parseObject(data);
 
-        JSONObject reportedJaon = jsonObject.getJSONObject("reported");
-        String batteryPower = reportedJaon.getString("batteryPower");
-        log.info("batteryPower:{}", batteryPower);
-        String replace = batteryPower.replace("%", "");
-        Integer power = Integer.valueOf(replace);
-        System.out.println(power);
-    }
+//    public static void main(String[] args) throws IOException {
+//        String resourceUrl = FileUtils.getResourceUrl("data/smokeing.json");
+//
+//        String data = FileUtil.readUtf8String(resourceUrl);
+//
+//        JSONObject jsonObject = JSONObject.parseObject(data);
+//
+//        JSONObject reportedJaon = jsonObject.getJSONObject("reported");
+//        String batteryPower = reportedJaon.getString("batteryPower");
+//        log.info("batteryPower:{}", batteryPower);
+//        String replace = batteryPower.replace("%", "");
+//        Integer power = Integer.valueOf(replace);
+//        System.out.println(power);
+//    }