fix: redis json to set

gis_admin/src/main/java/com/gis/admin/controller/SysUserController.java

@@ -47,7 +47,7 @@ public class SysUserController {
     }
 
 
-    @ApiOperation("查询用户信息")
+    @ApiOperation("详情")
     @GetMapping("detail/{id}")
     public Result<SysUserEntity> detail(@PathVariable Long id) {
 //        SysUserEntity user = userService.findById(id);

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

@@ -3,10 +3,9 @@ package com.gis.cms.controller;
 import com.gis.cms.entity.dto.NewsPageDataDto;
 import com.gis.admin.entity.dto.RegisterDto;
 import com.gis.cms.entity.dto.StatusPageDataDto;
-import com.gis.cms.service.BarrageService;
-import com.gis.cms.service.GoodsService;
-import com.gis.cms.service.MartyrService;
-import com.gis.cms.service.NewsService;
+import com.gis.cms.entity.vo.CommentVo;
+import com.gis.cms.mapper.MyBaseMapper;
+import com.gis.cms.service.*;
 import com.gis.common.base.aop.WebControllerLog;
 import com.gis.common.base.entity.dto.PageDateDto;
 import com.gis.common.base.entity.dto.PageDto;
@@ -58,6 +57,12 @@ public class WebController {
     @Autowired
     LogService logService;
 
+    @Autowired
+    MyBaseMapper myBaseMapper;
+
+    @Autowired
+    CommentService commentService;
+
 
 
     @WebControllerLog(description = "门户网站-弹幕列表")
@@ -67,6 +72,14 @@ public class WebController {
         return barrageService.search(param, 1);
     }
 
+    @WebControllerLog(description = "门户网站-保存并获取访问量")
+    @ApiOperation("保存并获取访问量")
+    @GetMapping("webVisit")
+    public Result webVisit(){
+        myBaseMapper.addVist("web");
+        return Result.success(myBaseMapper.getVisit("web"));
+    }
+
 
 //    @WebControllerLog(description = "门户网站-场景点赞")
 //    @ApiOperation("场景-点赞")
@@ -86,6 +99,14 @@ public class WebController {
     }
 
 
+    @WebControllerLog(description = "门户网站-精品典藏详情")
+    @ApiOperation("精品典藏-列表")
+    @GetMapping("goods/detail/{id}")
+    public Result<GoodsEntity> goodsDetail(@PathVariable Long id){
+        return goodsService.detail(id);
+    }
+
+
     @WebControllerLog(description = "门户网站-烈士列表(详情)")
     @ApiOperation("烈士-列表")
     @PostMapping("martyr/list")
@@ -97,6 +118,14 @@ public class WebController {
         return martyrService.search(dto, 1);
     }
 
+    @WebControllerLog(description = "门户网站-烈士详情")
+    @ApiOperation("烈士-详情")
+    @GetMapping("martyr/detail/{id}")
+    public Result<MartyrEntity> martyrDetail(@PathVariable Long id){
+        return martyrService.detail(id);
+    }
+
+
 
     @WebControllerLog(description = "门户网站-知识列表(详情)")
     @ApiOperation("知识-列表")
@@ -107,6 +136,21 @@ public class WebController {
         return newsService.search(param, 1);
     }
 
+    @WebControllerLog(description = "门户网站-知识详情")
+    @ApiOperation("知识-详情")
+    @GetMapping("news/detail/{id}")
+    public Result<NewsEntity> newsDetail(@PathVariable Long id){
+        return newsService.detail(id);
+    }
+
+
+    @WebControllerLog(description = "门户网站-留言树列表")
+    @ApiOperation("门户网站-留言树列表")
+    @PostMapping("comment/listTree")
+    public Result<CommentVo> list(@RequestBody PageDateDto param) {
+        return commentService.voListTree(param, 1);
+    }
+
 
     /**
      * 2021-07-12

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

@@ -1,5 +1,7 @@
 package com.gis.cms.controller;
 
+import com.gis.admin.entity.po.SysUserEntity;
+import com.gis.admin.service.SysUserService;
 import com.gis.cms.entity.po.QuestionGroupEntity;
 import com.gis.cms.service.*;
 import com.gis.common.base.aop.WebControllerLog;
@@ -44,6 +46,11 @@ public class WebManageController {
     @Autowired
     MournService mournService;
 
+    @Autowired
+    SysUserService sysUserService;
+
+
+
 
     @WebControllerLog(description = "门户网站-弹幕新增留言", addDb = true)
     @ApiOperation("门户网站-弹幕新增留言")
@@ -115,6 +122,10 @@ public class WebManageController {
         return mournService.saveEntity(param);
     }
 
-
+    @ApiOperation("用户详情")
+    @GetMapping("user/detail/{id}")
+    public Result<SysUserEntity> detail(@PathVariable Long id) {
+        return sysUserService.detail(id);
+    }
 
 }

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

@@ -0,0 +1,38 @@
+package com.gis.cms.mapper;
+
+
+import com.gis.cms.entity.po.FileEntity;
+import com.gis.common.base.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+@Component
+@Mapper
+public interface MyBaseMapper extends IBaseMapper<FileEntity, Long> {
+
+//    @Update("update tb_file set is_index = 1 , update_time = NOW() where is_delete = 0 and id = #{fileId} ")
+//    void indexEnabled(Long fileId);
+//
+//    @Update("update tb_file set is_index = 0 , update_time = NOW() where is_delete = 0 and is_index = 1 and module = #{module} and module_id = #{moduleId}")
+//    void indexDisable(Long moduleId, String module);
+//
+//    @Update("update tb_file set module_id = #{moduleId} , update_time = NOW() where is_delete = 0 and module = #{module} and id in ( ${fileIds} )")
+//    void addModuleIdToFile(String fileIds, Long moduleId, String module);
+//
+//    @Select("select * from tb_file where is_delete = 0 and is_index = 1 and module = #{module} and module_id = #{moduleId} limit 1")
+//    List<FileEntity> findIndexByModule(Long moduleId, String module);
+//
+//    @Select("select * from tb_file where is_delete = 0 and module = #{module} and module_id = #{moduleId} ")
+//    List<FileEntity> findByModuleId(Long moduleId, String module);
+
+    @Update("update tb_visit set visit = visit + 1 , update_time = NOW() where is_delete = 0  and module = #{module}")
+    void addVist(String module);
+
+    @Select("select visit from tb_visit where is_delete = 0  and module = #{module}")
+    Integer getVisit(String module);
+}

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

@@ -14,5 +14,5 @@ import java.util.Set;
 public interface SensitiveMapper extends IBaseMapper<SensitiveEntity, Long> {
 
     @Select("SELECT DISTINCT name FROM tb_sensitive WHERE is_delete=0")
-    Set<String> getName();
+    Set<Object> getName();
 }

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

@@ -34,7 +34,7 @@ public class GoodsProvider {
 
         String type = param.getType();
         if (StringUtils.isNotBlank(type)) {
-
+            sql.append(" and  type = '").append(type).append("'");
         }
 
         Integer status = param.getStatus();

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

@@ -24,7 +24,7 @@ public interface SensitiveService extends IBaseService<SensitiveEntity, Long> {
 
     Result<SensitiveEntity> search(PageDto param);
 
-    Set<String> getFilterKey();
+    Set<Object> getFilterKey();
 
 
     Result refreshRedis();

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

@@ -82,7 +82,7 @@ public class CommentServiceImpl extends IBaseServiceImpl<CommentEntity, Long> im
 
         List<CommentVo> search = entityMapper.search(param, display);
 
-        Set<String> filterKey = sensitiveService.getFilterKey();
+        Set<Object> filterKey = sensitiveService.getFilterKey();
         CommentTreeUtil commentTreeUtil = new CommentTreeUtil(search, filterKey);
         List<CommentTree> commentTrees = commentTreeUtil.buildTree();
 

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

@@ -63,7 +63,7 @@ public class MartyrServiceImpl extends IBaseServiceImpl<MartyrEntity, Long> impl
         String searchKey = param.getSearchKey();
         if (StringUtils.isNotBlank(searchKey)) {
             searchKey = StringUtils.trim(searchKey);
-            condition.and().orLike("name", "%" + searchKey + "%");
+            condition.and().orLike("realName", "%" + searchKey + "%");
 //                    .orLike("userName", "%" + searchKey + "%");
         }
         String startTime = param.getStartTime();

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

@@ -106,14 +106,16 @@ public class SensitiveServiceImpl extends IBaseServiceImpl<SensitiveEntity, Long
     }
 
     @Override
-    public Set<String> getFilterKey(){
-        String redisFilterKeyKey = getRedisFilterKey();
-        Set<String> filterKey = (Set)redisUtil.get(redisFilterKeyKey);
+    public Set<Object> getFilterKey(){
+        String redisFilterKey = getRedisFilterKey();
+//        Set<String> filterKey = (Set)redisUtil.get(redisFilterKeyKey);
+        Set<Object> filterKey = redisUtil.getJsonSet(redisFilterKey);
         if (filterKey == null) {
             log.info("走数据库");
             filterKey = entityMapper.getName();
             // 86400s-> 24H
-            redisUtil.set(redisFilterKeyKey, filterKey, 86400);
+//            redisUtil.set(redisFilterKeyKey, filterKey, 86400);
+            redisUtil.setObjectToJson(redisFilterKey, filterKey, 86400);
         }
         log.info("走缓存");
         log.info("filterKey： {}", filterKey);

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

@@ -20,7 +20,7 @@ public class CommentTreeUtil {
      * @param nodesList 转换对象
      * @param filterKey 敏感词集合
      */
-    public CommentTreeUtil(List<CommentVo> nodesList, Set<String> filterKey) {//通过构造函数初始化
+    public CommentTreeUtil(List<CommentVo> nodesList, Set<Object> filterKey) {//通过构造函数初始化
 
         for (CommentVo n : nodesList) {
             CommentTree treeGrid = new CommentTree();
@@ -104,9 +104,9 @@ public class CommentTreeUtil {
      * @param content 过滤内容
      * @return
      */
-    private String getFilterMsg(Set<String> filterKey, String content){
-        for (String s : filterKey) {
-            content =  content.replaceAll(s, "**");
+    private String getFilterMsg(Set<Object> filterKey, String content){
+        for (Object s : filterKey) {
+            content =  content.replaceAll(s.toString(), "**");
         }
         return content;
     }

gis_common/src/main/java/com/gis/common/util/RedisUtil.java

@@ -1,14 +1,16 @@
 package com.gis.common.util;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -128,4 +130,19 @@ public class RedisUtil {
         }
         return null;
     }
+
+    public Set<Object> getJsonSet(String key) {
+        try {
+            String o = (String)get(key);
+            if (o == null) {
+                return null;
+            }
+            JSONArray array = JSONArray.parseArray(o);
+            Set<Object> set = CollUtil.newHashSet(array);
+            return set;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }