添加门户网站全局搜索

gis_common/src/main/java/com/gis/common/constant/TypeCode.java

@@ -7,6 +7,12 @@ public class TypeCode {
 
     public static final String MODULE_EXHIBITION = "exhibition";
 
+    public static final String MODULE_NEWS = "news";
+
+    public static final String MODULE_ACTIVITY = "activity";
+
+    public static final String MODULE_GOODS = "goods";
+
 
 }
 

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * 通用返回类
@@ -21,11 +22,12 @@ public class Result<T> implements Serializable {
     public static int CODE_SUCCESS = 0;
     public static int CODE_FAILURE = -1;
     public static String[] NOOP = new String[]{};
+    public static LocalDateTime dataTime = LocalDateTime.now();
 
     /**
      * 处理状态：0: 成功, 1: 失败
      */
-    @ApiModelProperty(value = "处理状态：0: 成功, 1: 失败", name = "code")
+    @ApiModelProperty(value = "处理状态：0: 成功, -1: 失败", name = "code")
     private int code;
     /**
      * 消息
@@ -37,6 +39,9 @@ public class Result<T> implements Serializable {
      */
     @ApiModelProperty(value = "返回数据", name = "data")
     private T data;
+
+    @ApiModelProperty(value = "时间戳", name = "timestamp")
+    private LocalDateTime timestamp;
     /**
      * 处理成功，并返回数据
      *
@@ -44,7 +49,7 @@ public class Result<T> implements Serializable {
      * @return data
      */
     public static Result success(Object data) {
-        return new Result(CODE_SUCCESS, SUCCESS_MSG, data);
+        return new Result(CODE_SUCCESS, SUCCESS_MSG, data, dataTime);
     }
     /**
      * 处理成功
@@ -52,7 +57,7 @@ public class Result<T> implements Serializable {
      * @return data
      */
     public static Result success() {
-        return new Result(CODE_SUCCESS, SUCCESS_MSG, NOOP);
+        return new Result(CODE_SUCCESS, SUCCESS_MSG, NOOP, dataTime);
     }
     /**
      * 处理成功
@@ -61,7 +66,7 @@ public class Result<T> implements Serializable {
      * @return data
      */
     public static Result success(String msg) {
-        return new Result(CODE_SUCCESS, msg, NOOP);
+        return new Result(CODE_SUCCESS, msg, NOOP, dataTime);
     }
     /**
      * 处理成功
@@ -71,7 +76,7 @@ public class Result<T> implements Serializable {
      * @return data
      */
     public static Result success(String msg, Object data) {
-        return new Result(CODE_SUCCESS, msg, data);
+        return new Result(CODE_SUCCESS, msg, data, dataTime);
     }
     /**
      * 处理失败，并返回数据（一般为错误信息）
@@ -81,7 +86,7 @@ public class Result<T> implements Serializable {
      * @return data
      */
     public static Result failure(int code, String msg) {
-        return new Result(code, msg, NOOP);
+        return new Result(code, msg, NOOP , dataTime);
     }
     /**
      * 处理失败
@@ -96,6 +101,6 @@ public class Result<T> implements Serializable {
     @Override
     public String toString() {
         return "JsonResult [code=" + code + ", msg=" + msg + ", data="
-                + data + "]";
+                + data + ", timestamp="+ dataTime + "]";
     }
 }

gis_domain/src/main/java/com/gis/domain/dto/ModuleDto.java

@@ -0,0 +1,23 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * Created by owen on 2021/6/18 0018 15:48
+ */
+@Data
+public class ModuleDto {
+
+
+    @NotNull(message = "模块id不能为空")
+    @ApiModelProperty(value = "模块id")
+    private Long id;
+
+    @NotBlank(message = "模块类型不能为空")
+    @ApiModelProperty(value = "模块类型")
+    private String module;
+}

gis_domain/src/main/java/com/gis/domain/dto/SearchDto.java

@@ -0,0 +1,17 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Created by owen on 2021/6/18 0018 15:48
+ */
+@Data
+public class SearchDto {
+
+    @NotBlank(message = "搜索条件不能为空")
+    @ApiModelProperty(value = "搜索条件", name = "searchKey")
+    private String searchKey;
+}

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

@@ -0,0 +1,38 @@
+package com.gis.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 搜索对象
+ */
+@Data
+public class SearchVo  {
+
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "模块类型")
+    private String module;
+
+
+
+
+
+
+
+
+
+
+
+
+}

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

@@ -2,10 +2,14 @@ package com.gis.mapper;
 
 
 import com.gis.domain.po.ActivityEntity;
+import com.gis.domain.vo.SearchVo;
 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 ActivityMapper extends IBaseMapper<ActivityEntity, Long> {
@@ -15,4 +19,7 @@ public interface ActivityMapper extends IBaseMapper<ActivityEntity, Long> {
 
     @Update("update tb_activity set is_index = 1 , update_time = NOW() where id = #{id} ")
     void indexEnabled(Long id);
+
+    @Select("SELECT id, name, content FROM tb_activity WHERE is_delete = 0 AND concat(name, content) like #{searchKey} ")
+    List<SearchVo> searchLike(String searchKey);
 }

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

@@ -2,9 +2,13 @@ package com.gis.mapper;
 
 
 import com.gis.domain.po.ExhibitionEntity;
+import com.gis.domain.vo.SearchVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 
 @Component
 @Mapper
@@ -12,7 +16,8 @@ public interface ExhibitionMapper extends IBaseMapper<ExhibitionEntity, Long> {
 
 
 
-
+    @Select("SELECT id, name, content FROM tb_exhibition WHERE is_delete = 0 AND concat(name, content) like #{searchKey} ")
+    List<SearchVo> searchLike(String searchKey);
 
 
 }

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

@@ -3,8 +3,10 @@ package com.gis.mapper;
 
 import com.gis.domain.dto.GoodsPageDto;
 import com.gis.domain.po.GoodsEntity;
+import com.gis.domain.vo.SearchVo;
 import com.gis.mapper.provider.GoodsProvider;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
@@ -19,6 +21,9 @@ public interface GoodsMapper extends IBaseMapper<GoodsEntity, Long> {
     @SelectProvider(type = GoodsProvider.class, method = "search")
     List<GoodsEntity> search(GoodsPageDto param);
 
+    @Select("SELECT id, name, description as content FROM tb_goods WHERE is_delete = 0 AND concat(name, description) like #{searchKey} ")
+    List<SearchVo> searchLike(String searchKey);
+
 
 
 

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

@@ -3,6 +3,7 @@ package com.gis.mapper;
 
 import com.gis.common.util.Result;
 import com.gis.domain.po.NewsEntity;
+import com.gis.domain.vo.SearchVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
@@ -21,4 +22,7 @@ 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}")
     Result addVisit(Long id);
+
+    @Select("SELECT id, name, content FROM tb_news WHERE is_delete = 0 AND concat(name, content) like #{searchKey} ")
+    List<SearchVo> searchLike(String searchKey);
 }

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

@@ -5,8 +5,11 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.ActivityDto;
 import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.ActivityEntity;
+import com.gis.domain.vo.SearchVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 
 /**
  * Created by owen on 2020/3/11 0011 16:14
@@ -25,4 +28,6 @@ public interface ActivityService extends IBaseService<ActivityEntity, Long> {
     Result setIndex(Long id);
 
     Result upload(MultipartFile file, String code);
+
+    List<SearchVo> searchLike(String searchKey);
 }

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

@@ -4,8 +4,11 @@ package com.gis.service;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
 import com.gis.domain.po.ExhibitionEntity;
+import com.gis.domain.vo.SearchVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 
 /**
  * Created by owen on 2020/3/11 0011 16:14
@@ -28,4 +31,6 @@ public interface ExhibitionService extends IBaseService<ExhibitionEntity, Long>
     Result detail(Long id);
 
     void checkStatus();
+
+    List<SearchVo> searchLike(String searchKey);
 }

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

@@ -5,8 +5,11 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.GoodsDto;
 import com.gis.domain.dto.GoodsPageDto;
 import com.gis.domain.po.GoodsEntity;
+import com.gis.domain.vo.SearchVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 
 /**
  * Created by owen on 2020/3/11 0011 16:14
@@ -21,4 +24,6 @@ public interface GoodsService extends IBaseService<GoodsEntity, Long> {
     Result upload(MultipartFile file);
 
     Result remove(Long id);
+
+    List<SearchVo> searchLike(String searchKey);
 }

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

@@ -6,6 +6,7 @@ import com.gis.domain.dto.NewsDto;
 import com.gis.domain.dto.PageDto;
 import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.NewsEntity;
+import com.gis.domain.vo.SearchVo;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -30,4 +31,6 @@ public interface NewsService extends IBaseService<NewsEntity, Long> {
     Result upload(MultipartFile file, String code);
 
     Result addVisit(Long id);
+
+    List<SearchVo> searchLike(String searchKey);
 }

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

@@ -0,0 +1,22 @@
+package com.gis.service;
+
+
+import com.gis.common.util.Result;
+import com.gis.domain.dto.GoodsDto;
+import com.gis.domain.dto.GoodsPageDto;
+import com.gis.domain.dto.ModuleDto;
+import com.gis.domain.dto.SearchDto;
+import com.gis.domain.po.GoodsEntity;
+import org.springframework.web.multipart.MultipartFile;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:14
+ */
+public interface WebService  {
+
+
+    Result search(SearchDto param);
+
+    Result searchDetail(ModuleDto param);
+}

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

@@ -7,6 +7,7 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.ActivityDto;
 import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.ActivityEntity;
+import com.gis.domain.vo.SearchVo;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.ActivityMapper;
 import com.gis.service.ActivityService;
@@ -22,6 +23,7 @@ import tk.mybatis.mapper.entity.Condition;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 
@@ -130,4 +132,9 @@ public class ActivityServiceImpl extends IBaseServiceImpl<ActivityEntity, Long>
         result.put("code", code);
         return Result.success(result);
     }
+
+    @Override
+    public List<SearchVo> searchLike(String searchKey) {
+        return entityMapper.searchLike(searchKey);
+    }
 }

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

@@ -10,6 +10,7 @@ import com.gis.domain.dto.PageDto;
 import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.ExhibitionEntity;
 import com.gis.domain.po.FileEntity;
+import com.gis.domain.vo.SearchVo;
 import com.gis.mapper.ExhibitionMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.service.ExhibitionService;
@@ -201,8 +202,7 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
         LocalDateTime now = LocalDateTime.now();
         // 查询未开始、开始中的数据
         Condition condition = new Condition(ExhibitionEntity.class);
-        condition.and().andEqualTo("status", "unstart");
-        condition.and().andEqualTo("status", "start");
+        condition.and().andEqualTo("status", "unstart").orEqualTo("status", "start");
         List<ExhibitionEntity> allList = this.findAll(condition);
         log.info("需要检查状态的数据数量： {}", allList.size());
         for (ExhibitionEntity entity : allList) {
@@ -245,5 +245,9 @@ public class ExhibitionServiceImpl extends IBaseServiceImpl<ExhibitionEntity, Lo
         log.info("状态检查完成");
     }
 
+    @Override
+    public List<SearchVo> searchLike(String searchKey) {
+        return entityMapper.searchLike(searchKey);
+    }
 
 }

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

@@ -10,6 +10,7 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.GoodsDto;
 import com.gis.domain.dto.GoodsPageDto;
 import com.gis.domain.po.GoodsEntity;
+import com.gis.domain.vo.SearchVo;
 import com.gis.mapper.GoodsMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.service.GoodsService;
@@ -26,10 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 
 /**
@@ -103,4 +101,9 @@ public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implem
     }
 
 
+    @Override
+    public List<SearchVo> searchLike(String searchKey) {
+        return entityMapper.searchLike(searchKey);
+    }
+
 }

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

@@ -9,6 +9,7 @@ import com.gis.domain.dto.PageDto;
 import com.gis.domain.dto.TypePageDto;
 import com.gis.domain.po.NewsEntity;
 import com.gis.domain.po.FileEntity;
+import com.gis.domain.vo.SearchVo;
 import com.gis.mapper.NewsMapper;
 import com.gis.mapper.IBaseMapper;
 import com.gis.service.NewsService;
@@ -130,5 +131,10 @@ public class NewsServiceImpl extends IBaseServiceImpl<NewsEntity, Long> implemen
         return entityMapper.addVisit(id);
     }
 
+    @Override
+    public List<SearchVo> searchLike(String searchKey) {
+        return entityMapper.searchLike(searchKey);
+    }
+
 
 }

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

@@ -0,0 +1,75 @@
+package com.gis.service.impl;
+
+import com.gis.common.constant.TypeCode;
+import com.gis.common.util.Result;
+import com.gis.domain.dto.ModuleDto;
+import com.gis.domain.dto.SearchDto;
+import com.gis.domain.vo.SearchVo;
+import com.gis.service.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * Created by owen on 2021/6/18 0011 16:16
+ */
+@Service
+public class WebServiceImpl implements WebService {
+
+
+    @Autowired
+    private GoodsService goodsService;
+
+    @Autowired
+    NewsService newsService;
+
+    @Autowired
+    ExhibitionService exhibitionService;
+
+    @Autowired
+    ActivityService activityService;
+
+
+    @Override
+    public Result search(SearchDto param) {
+        String searchKey = param.getSearchKey();
+        if (StringUtils.isBlank(searchKey)) {
+            return Result.success();
+        }
+        searchKey = StringUtils.trim(searchKey);
+        searchKey = "%"+ searchKey + "%";
+        List<SearchVo> newsList = newsService.searchLike(searchKey);
+        List<SearchVo> goodsList = goodsService.searchLike(searchKey);
+        List<SearchVo> exhibitionList = exhibitionService.searchLike(searchKey);
+        List<SearchVo> activityList = activityService.searchLike(searchKey);
+
+        HashMap<String, Object> result = new HashMap<>();
+        result.put(TypeCode.MODULE_NEWS, newsList);
+        result.put(TypeCode.MODULE_GOODS, goodsList);
+        result.put(TypeCode.MODULE_EXHIBITION, exhibitionList);
+        result.put(TypeCode.MODULE_ACTIVITY, activityList);
+
+        return Result.success(result);
+    }
+
+    @Override
+    public Result searchDetail(ModuleDto param) {
+        String module = param.getModule();
+        Long id = param.getId();
+        Object entity = null;
+        if (TypeCode.MODULE_NEWS.equals(module)) {
+             entity = newsService.findById(id);
+        } else if(TypeCode.MODULE_GOODS.equals(module)) {
+            entity = goodsService.findById(id);
+        } else if(TypeCode.MODULE_EXHIBITION.equals(module)) {
+            entity = exhibitionService.findById(id);
+        } else if(TypeCode.MODULE_ACTIVITY.equals(module)) {
+            entity = activityService.findById(id);
+        }
+        return Result.success(entity);
+    }
+}

gis_service/src/main/java/com/gis/service/shiro/JWTFilter.java

@@ -1,9 +1,11 @@
 package com.gis.service.shiro;
 
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.gis.common.exception.JwtAuthenticationException;
 import lombok.extern.log4j.Log4j2;
 import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
+import org.junit.Test;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.RequestMethod;
 
@@ -14,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.time.LocalDateTime;
 
 
 /**
@@ -56,6 +59,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
     protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
         try {
             executeLogin(request, response);
+            return true;
         } catch (Exception e) {
             /**
              * 这个异常需要自己写，全局捕获不了
@@ -64,7 +68,7 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
             exceptionMsg(e, response);
         }
         // return false 前端没有响应，接收不到异常
-        return true;
+        return false;
 
 
     }
@@ -128,8 +132,16 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
             jsonObject.put("code", 5002);
             jsonObject.put("msg", "token invalid");
         }
+        jsonObject.put("timestamp", LocalDateTime.now());
         // 直接返回Response信息
         this.writeResponse(response, jsonObject);
 
     }
+
+
+    @Test
+    public void test(){
+        String s = HttpUtil.get("https://www.baidu.com");
+        System.out.println(s );
+    }
 }

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

@@ -1,15 +1,10 @@
 package com.gis.web.controller;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
 import com.gis.domain.po.CommentEntity;
-import com.gis.domain.po.GoodsEntity;
-import com.gis.domain.po.ActivityEntity;
 import com.gis.domain.po.VisitEntity;
 import com.gis.service.*;
-import com.gis.service.aop.WebControllerLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -35,9 +30,6 @@ public class WebController {
     private GoodsService goodsService;
 
     @Autowired
-    ActivityService materialService;
-
-    @Autowired
     FileService fileService;
 
     @Autowired
@@ -58,6 +50,9 @@ public class WebController {
     @Autowired
     CommentService commentService;
 
+    @Autowired
+    WebService webService;
+
     @ApiOperation(value = "保存网站访问记录", notes = "type, web:管网, scene:线上史馆")
     @GetMapping("addVisitWeb/{type}")
     public Result addVisitWeb(@PathVariable String type) {
@@ -131,6 +126,20 @@ public class WebController {
         return Result.success();
     }
 
+    @ApiOperation(value = "搜索")
+    @PostMapping("search")
+    public Result search(@RequestBody SearchDto param){
+        return webService.search(param);
+    }
+
+
+    @ApiOperation(value = "搜索详情")
+    @PostMapping("search/detail")
+    public Result searchDetail(@RequestBody ModuleDto param){
+        return webService.searchDetail(param);
+    }
+
+
 
 
 }