修改留言的存储

gis_admin/src/main/java/com/gis/admin/entity/po/SysUserEntity.java

@@ -56,9 +56,10 @@ public class SysUserEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "缩略图url")
     private String thumb;
 
-    @JSONField(serialize = false)
+//    @JSONField(serialize = false)
+    @Transient
     @ApiModelProperty(value = "角色，sys_admin:系统管理员，sys_high：高级管理员， sys_normal:普通管理员, sys_visitor：游客")
-    private String role;
+    private String roleKey;
 
     @Transient
     @ApiModelProperty(value = "角色id")

gis_admin/src/main/java/com/gis/admin/mapper/SysUserMapper.java

@@ -7,6 +7,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 
 @Component
 @Mapper
@@ -16,7 +18,13 @@ public interface SysUserMapper extends IBaseMapper<SysUserEntity, Long> {
     @Select(value = "select * from sys_user where is_delete = '0' AND user_name= #{userName}")
     SysUserEntity findByUserName(String userName);
 
-    @Select(value = "select a.*, b.role_id as roleId, c.role_name as roleName from sys_user a left join sys_user_role b on b.user_id = a.id " +
-            "left join sys_role c on c.id=b.role_id where a.is_delete = '0' AND a.id= #{id}")
+    @Select(value = "select a.*, b.role_id as roleId, c.role_name as roleName, c.role_key as roleKey from sys_user a " +
+            "left join sys_user_role b on b.user_id = a.id " +
+            "left join sys_role c on c.id=b.role_id where a.is_delete = 0 AND a.id= #{id}")
     SysUserEntity detailMapper(Long id);
+
+    @Select(value = "select a.*, b.role_id as roleId, c.role_name as roleName, c.role_key as roleKey from sys_user a " +
+            "left join sys_user_role b on b.user_id = a.id " +
+            "left join sys_role c on c.id=b.role_id where a.is_delete = 0 ")
+    List<SysUserEntity> findListMapper();
 }

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -126,7 +126,7 @@ public class SysUserServiceImpl extends IBaseServiceImpl<SysUserEntity, Long> im
     @Override
     public Result<SysUserEntity> search(PageDto param) {
         startPage(param);
-        PageInfo<SysUserEntity> page = new PageInfo<>(this.findAll());
+        PageInfo<SysUserEntity> page = new PageInfo<>(entityMapper.findListMapper());
         return Result.success(page);
     }
 

gis_admin/src/main/java/com/gis/admin/shiro/ShiroConfig.java

@@ -99,6 +99,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/**/*.jpg", "anon");
         filterChainDefinitionMap.put("/**/*.png", "anon");
         filterChainDefinitionMap.put("/**/*.ico", "anon");
+//        filterChainDefinitionMap.put("/**/*.mp4", "anon");
 
         filterChainDefinitionMap.put("/**/*.ttf", "anon");
         filterChainDefinitionMap.put("/**/*.woff", "anon");
@@ -146,7 +147,9 @@ public class ShiroConfig {
         filterMap.put("jwt", new JwtFilter(cloudServer==null));
         shiroFilterFactoryBean.setFilters(filterMap);
         // <!-- 过滤链定义，从上向下顺序执行，一般将/**放在最为下边
-        filterChainDefinitionMap.put("/**", "jwt");
+//        filterChainDefinitionMap.put("/**", "jwt");
+        filterChainDefinitionMap.put("/sys/**", "jwt");
+        filterChainDefinitionMap.put("/cms/**", "jwt");
 
         // 未授权界面返回JSON
         shiroFilterFactoryBean.setUnauthorizedUrl("/sys/common/403");

gis_cms/src/main/java/com/gis/cms/controller/MournController.java

@@ -1,5 +1,6 @@
 package com.gis.cms.controller;
 
+import com.gis.cms.entity.vo.MournVo;
 import com.gis.common.base.aop.WebControllerLog;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.util.Result;
@@ -27,7 +28,7 @@ public class MournController {
 
     @ApiOperation("列表")
     @PostMapping("list")
-    public Result<MournEntity> search(@RequestBody PageDateDto param) {
+    public Result<MournVo> search(@RequestBody PageDateDto param) {
         return entityService.search(param, null);
     }
 

gis_cms/src/main/java/com/gis/cms/controller/WebController.java

@@ -135,6 +135,13 @@ public class WebController {
         return mournService.search(param, 1);
     }
 
+    @WebControllerLog(description = "门户网站-悼念烈士留言")
+    @ApiOperation("门户网站-悼念烈士留言")
+    @GetMapping("mourn/comment/{martyrId}")
+    public Result mournComment(@PathVariable Long martyrId) {
+        return mournService.mournComment(martyrId);
+    }
+
 
     @WebControllerLog(description = "门户网站-知识列表(详情)")
     @ApiOperation("知识-列表")
@@ -149,6 +156,8 @@ public class WebController {
     @ApiOperation("知识-详情")
     @GetMapping("news/detail/{id}")
     public Result<NewsEntity> newsDetail(@PathVariable Long id){
+        // 添加访问量
+        newsService.addVisit(id);
         return newsService.detail(id);
     }
 

gis_cms/src/main/java/com/gis/cms/entity/dto/CommentDto.java

@@ -19,5 +19,10 @@ public class CommentDto {
     @ApiModelProperty(value = "父级id")
     private Long parentId;
 
+    @ApiModelProperty(value = "是否显示真实姓名： 1：是， 0：否")
+    private Integer isRealName;
+
+
+
 
 }

gis_cms/src/main/java/com/gis/cms/entity/dto/MournDto.java

@@ -15,13 +15,17 @@ import java.io.Serializable;
 public class MournDto implements Serializable {
 
     private static final long serialVersionUID = 2684221237124140925L;
-    @NotBlank(message = "单位不能为空")
-    @ApiModelProperty(value = "单位", required = true)
-    private String unit;
+//    @NotBlank(message = "单位不能为空")
+//    @ApiModelProperty(value = "单位", required = true)
+//    private String unit;
+//
+////    @NotBlank(message = "真实姓名不能为空")
+//    @ApiModelProperty(value = "真实姓名")
+//    private String realName;
+//
+//    @ApiModelProperty(value = "昵称")
+//    private String nickName;
 
-    @NotBlank(message = "真实姓名不能为空")
-    @ApiModelProperty(value = "真实姓名", required = true)
-    private String realName;
 
     @NotNull(message = "烈士id姓名不能为空")
     @ApiModelProperty(value = "烈士id", required = true)
@@ -31,5 +35,8 @@ public class MournDto implements Serializable {
     @ApiModelProperty(value = "内容", required = true)
     private String content;
 
+    @ApiModelProperty(value = "是否显示真实姓名： 1：是， 0：否")
+    private Integer isRealName;
+
 
 }

gis_cms/src/main/java/com/gis/cms/entity/po/CommentEntity.java

@@ -21,11 +21,6 @@ public class CommentEntity extends BaseEntity implements Serializable {
     private Long userId;
 
 
-
-    @ApiModelProperty(value = "昵称")
-    private String nickName;
-
-
     @ApiModelProperty(value = "留言")
     private String content;
 
@@ -35,13 +30,19 @@ public class CommentEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否显示，1：是， 0：否")
     private Integer display;
 
-    @Transient
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
+    @ApiModelProperty(value = "是否显示真实姓名： 1：是， 0：否")
+    private Integer isRealName;
+
+//    @Transient
+//    @ApiModelProperty(value = "真实姓名")
+//    private String realName;
+//
+//    @Transient
+//    @ApiModelProperty(value = "单位")
+//    private String unit;
 
-    @Transient
-    @ApiModelProperty(value = "单位")
-    private String unit;
+//    @ApiModelProperty(value = "昵称")
+//    private String nickName;
 
 
 

gis_cms/src/main/java/com/gis/cms/entity/po/MournEntity.java

@@ -17,11 +17,11 @@ import java.io.Serializable;
 public class MournEntity extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 7167520531265687441L;
 
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-    @ApiModelProperty(value = "真实姓名")
-    private String realName;
+//    @ApiModelProperty(value = "单位")
+//    private String unit;
+//
+//    @ApiModelProperty(value = "真实姓名")
+//    private String realName;
 
     @ApiModelProperty(value = "烈士id")
     private Long martyrId;
@@ -35,12 +35,19 @@ public class MournEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "浏览量")
     private Integer visit;
 
-    /***
-     * javax.persistence.Transient 使用这个注解才有效
-     */
-    @Transient
-    @ApiModelProperty(value = "烈士真实姓名")
-    private String martyRealName;
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "是否显示真实姓名： 1：是， 0：否")
+    private Integer isRealName;
+
+
+//    /***
+//     * javax.persistence.Transient 使用这个注解才有效
+//     */
+//    @Transient
+//    @ApiModelProperty(value = "烈士真实姓名")
+//    private String martyRealName;
 
 
 }

gis_cms/src/main/java/com/gis/cms/entity/vo/CommentVo.java

@@ -15,8 +15,7 @@ import java.util.Set;
 @Data
 public class CommentVo extends BaseEntity {
 
-//    @Autowired
-//    RedisUtil redisUtil;
+
 
     @ApiModelProperty(value = "真实姓名")
     private String realName;
@@ -36,6 +35,9 @@ public class CommentVo extends BaseEntity {
     @ApiModelProperty(value = "父级id")
     private Long parentId;
 
+    @ApiModelProperty(value = "是否显示真实姓名： 1：是， 0：否")
+    private Integer isRealName;
+
 
 //    public void setContent(String content) {
 //        Set<String> filterKey = (Set)redisUtil.get("army_xinjiang_token_filter");

gis_cms/src/main/java/com/gis/cms/entity/vo/MournVo.java

@@ -0,0 +1,49 @@
+package com.gis.cms.entity.vo;
+
+import com.gis.common.base.entity.po.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * Created by owen on 2021/6/24 0024 12:22
+ * 悼念烈士表
+ */
+@Data
+public class MournVo extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 7167520531265687441L;
+
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    @ApiModelProperty(value = "真实姓名")
+    private String realName;
+
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "烈士id")
+    private Long martyrId;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "是否显示，0：不显示， 1：显示")
+    private Integer display;
+
+    @ApiModelProperty(value = "浏览量")
+    private Integer visit;
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    @ApiModelProperty(value = "是否显示真实姓名： 1：是， 0：否")
+    private Integer isRealName;
+
+    @ApiModelProperty(value = "烈士真实姓名")
+    private String martyRealName;
+
+
+}

gis_cms/src/main/java/com/gis/cms/mapper/MournMapper.java

@@ -1,11 +1,13 @@
 package com.gis.cms.mapper;
 
 
+import com.gis.cms.entity.vo.MournVo;
 import com.gis.cms.mapper.provider.MournProvider;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.MournEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
@@ -16,5 +18,10 @@ import java.util.List;
 public interface MournMapper extends IBaseMapper<MournEntity, Long> {
 
     @SelectProvider(type = MournProvider.class, method = "search")
-    List<MournEntity> search(PageDateDto param, Integer display);
+    List<MournVo> search(PageDateDto param, Integer display);
+
+    @Select("select a.*, b.unit, b.real_name, b.nick_name " +
+            "from tb_mourn a left join sys_user b on b.id=a.user_id " +
+            "where a.is_delete = '0' and a.martyr_id=#{martyrId} and display=1")
+    List<MournEntity> findByMartyrIdMapper(Long martyrId);
 }

gis_cms/src/main/java/com/gis/cms/mapper/NewsMapper.java

@@ -4,10 +4,13 @@ package com.gis.cms.mapper;
 import com.gis.common.base.mapper.IBaseMapper;
 import com.gis.cms.entity.po.NewsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Component;
 
 @Component
 @Mapper
 public interface NewsMapper extends IBaseMapper<NewsEntity, Long> {
 
+    @Update("update tb_news set visit = visit + 1 , update_time = NOW() where is_delete = 0  and id = #{id}")
+    void addVisit(Long id);
 }

gis_cms/src/main/java/com/gis/cms/mapper/provider/CommentProvider.java

@@ -13,7 +13,8 @@ public class CommentProvider {
 
     public String search(PageDateDto param, Integer display){
         StringBuffer sql = new StringBuffer(
-                "select a.id, a.create_time, a.content, a.display, a.parent_id, b.unit, b.real_name, b.nick_name from tb_comment a left join sys_user b on b.id=a.user_id  " +
+                "select a.id, a.create_time, a.content, a.display, a.parent_id, a.is_real_name, b.unit, b.real_name, b.nick_name " +
+                        "from tb_comment a left join sys_user b on b.id=a.user_id  " +
                         "where a.is_delete = '0' ");
 
 

gis_cms/src/main/java/com/gis/cms/mapper/provider/MournProvider.java

@@ -14,7 +14,9 @@ public class MournProvider {
 
     public String search(PageDateDto param, Integer display) {
         StringBuffer sql = new StringBuffer(
-                "select a.*, b.real_name as martyRealName from tb_mourn a left join tb_martyr b on b.id=a.martyr_id where a.is_delete = '0' ");
+                "select a.*, b.real_name as martyRealName, c.unit as unit, c.real_name as realName, c.nick_name as nickName " +
+                        "from tb_mourn a left join tb_martyr b on b.id=a.martyr_id left join sys_user c on c.id = a.user_id " +
+                        "where a.is_delete = '0' ");
 
         if (StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())) {
 
@@ -26,8 +28,8 @@ public class MournProvider {
         if (!StringUtils.isAllBlank(searchKey)) {
             searchKey = StringUtils.trim(searchKey);
             sql.append(" and (");
-            sql.append( "a.real_name like '%").append(searchKey).append("%'");
-            sql.append( " or a.unit like '%").append(searchKey).append("%'");
+            sql.append( "a.content like '%").append(searchKey).append("%'");
+//            sql.append( " or a.unit like '%").append(searchKey).append("%'");
             sql.append(")");
         }
 

gis_cms/src/main/java/com/gis/cms/service/MournService.java

@@ -3,6 +3,7 @@ package com.gis.cms.service;
 
 import com.gis.cms.entity.dto.MournDto;
 import com.gis.cms.entity.po.MournEntity;
+import com.gis.cms.entity.vo.MournVo;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.base.service.IBaseService;
 import com.gis.common.util.Result;
@@ -20,8 +21,10 @@ public interface MournService extends IBaseService<MournEntity, Long> {
 
     Result<MournEntity> detail(Long id);
 
-    Result<MournEntity> search(PageDateDto param, Integer display);
+    Result<MournVo> search(PageDateDto param, Integer display);
 
 
     Result updateDisplay(Long id, Integer display);
+
+    Result mournComment(Long martyrId);
 }

gis_cms/src/main/java/com/gis/cms/service/NewsService.java

@@ -30,4 +30,6 @@ public interface NewsService extends IBaseService<NewsEntity, Long> {
     Result auditDetail(Long id);
 
     Result updateDisplay(Long id, Integer display);
+
+    void addVisit(Long id);
 }

gis_cms/src/main/java/com/gis/cms/service/impl/MournServiceImpl.java

@@ -2,6 +2,7 @@ package com.gis.cms.service.impl;
 
 import com.gis.cms.entity.dto.MournDto;
 import com.gis.cms.entity.po.MournEntity;
+import com.gis.cms.entity.vo.MournVo;
 import com.gis.cms.mapper.MournMapper;
 import com.gis.common.base.exception.BaseRuntimeException;
 import com.gis.common.base.entity.dto.PageDateDto;
@@ -38,10 +39,10 @@ public class MournServiceImpl extends IBaseServiceImpl<MournEntity, Long> implem
 
 
     @Override
-    public Result<MournEntity> search(PageDateDto param, Integer display) {
+    public Result<MournVo> search(PageDateDto param, Integer display) {
         startPage(param);
-        List<MournEntity> list = entityMapper.search(param, display);
-        PageInfo<MournEntity> pageInfo = new PageInfo<>(list);
+        List<MournVo> list = entityMapper.search(param, display);
+        PageInfo<MournVo> pageInfo = new PageInfo<>(list);
         return Result.success(pageInfo);
     }
 
@@ -53,15 +54,22 @@ public class MournServiceImpl extends IBaseServiceImpl<MournEntity, Long> implem
         }
         entity.setDisplay(display);
         entity.setUpdateTime(LocalDateTime.now());
-        this.save(entity);
+        this.update(entity);
         return Result.success();
     }
 
+    @Override
+    public Result mournComment(Long martyrId) {
+       List<MournEntity> list = entityMapper.findByMartyrIdMapper(martyrId);
+        return Result.success(list);
+    }
+
 
     @Override
     public Result saveEntity(MournDto param) {
         MournEntity entity = new MournEntity();
         BeanUtils.copyProperties(param, entity);
+        entity.setUserId(getTokenUserId());
         this.save(entity);
         return Result.success(entity);
     }

gis_cms/src/main/java/com/gis/cms/service/impl/NewsServiceImpl.java

@@ -136,6 +136,11 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
         return Result.success(entity);
     }
 
+    @Override
+    public void addVisit(Long id) {
+        entityMapper.addVisit(id);
+    }
+
 
     private void updateStatus(Long id, Integer status){
         NewsEntity entity = this.findById(id);

gis_cms/src/main/java/com/gis/cms/tree/CommentTreeUtil.java

@@ -23,25 +23,28 @@ public class CommentTreeUtil {
     public CommentTreeUtil(List<CommentVo> nodesList, Set<Object> filterKey) {//通过构造函数初始化
 
         for (CommentVo n : nodesList) {
-            CommentTree treeGrid = new CommentTree();
-            treeGrid.setId(n.getId());
-            treeGrid.setContent(n.getContent());
+            CommentTree vo = new CommentTree();
+            vo.setId(n.getId());
+            vo.setContent(n.getContent());
             // 过滤敏感内容
-            treeGrid.setContent(getFilterMsg(filterKey, n.getContent()));
+            vo.setContent(getFilterMsg(filterKey, n.getContent()));
+
+
+            vo.setRealName(n.getRealName());
+            vo.setCreateTime(n.getCreateTime());
+            vo.setUpdateTime(n.getUpdateTime());
+            vo.setUnit(n.getUnit());
+            vo.setNickName(n.getNickName());
+            vo.setDisplay(n.getDisplay());
+            vo.setIsRealName(n.getIsRealName());
 
 
-//            treeGrid.setRealName(n.getRealName());
-            treeGrid.setCreateTime(n.getCreateTime());
-            treeGrid.setUpdateTime(n.getUpdateTime());
-//            treeGrid.setUnit(n.getUnit());
-            treeGrid.setNickName(n.getNickName());
-            treeGrid.setDisplay(n.getDisplay());
 
 
             if (n.getParentId() != null) {
-                treeGrid.setParentId(n.getParentId());
+                vo.setParentId(n.getParentId());
             }
-            nodes.add(treeGrid);
+            nodes.add(vo);
         }
     }
 
@@ -106,7 +109,9 @@ public class CommentTreeUtil {
      */
     private String getFilterMsg(Set<Object> filterKey, String content){
         for (Object s : filterKey) {
-            content =  content.replaceAll(s.toString(), "**");
+            if (s != null){
+                content =  content.replaceAll(s.toString(), "**");
+            }
         }
         return content;
     }

gis_cms/src/main/java/com/gis/cms/tree/vo/CommentTree.java

@@ -1,6 +1,7 @@
 package com.gis.cms.tree.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -27,6 +28,9 @@ public class CommentTree {
 
     private Integer display;
 
+    @ApiModelProperty(value = "是否显示真实姓名： 1：是， 0：否")
+    private Integer isRealName;
+
 
     // 子菜单/或按钮
     private List<CommentTree> children;

gis_scene/src/main/java/com/gis/scene/controller/SceneController.java

@@ -30,7 +30,7 @@ import java.util.List;
 @Slf4j
 @Api(tags = "场景管理")
 @RestController
-@RequestMapping("scene")
+@RequestMapping("cms/scene")
 public class SceneController  {
 
     @Autowired