From f2ef0c6b926fc060d473b90b6fef5589f7bf1152 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Fri, 25 Feb 2022 11:52:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81bean=20Searcher=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B03.5.1=202=E3=80=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=90=9C=E7=8B=97=E9=A1=B5=E9=9D=A2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../business/webmagic/weixinsougou/index.vue  | 30 +++----------------
 ruoyi-ui/src/views/index.vue                  |  2 ++
 .../service/impl/WeiXinSouGouServiceImpl.java | 10 +++++--
 4 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index 167cc368..504b6fb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
         <mybatisplus.version>3.4.3.4</mybatisplus.version>
         <commonsNet.version>3.6</commonsNet.version>
         <aliyunoss.version>3.14.0</aliyunoss.version>
-        <bean-searcher.version>3.4.3</bean-searcher.version>
+        <bean-searcher.version>3.5.1</bean-searcher.version>
 
     </properties>
 
diff --git a/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue b/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue
index 5b75c40c..a28fd4ea 100644
--- a/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue
+++ b/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue
@@ -1,41 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="文章标题" prop="title">
+      <el-form-item label="查询条件" prop="condition">
         <el-input
-          v-model="queryParams.title"
+          v-model="queryParams.condition"
           prefix-icon="el-icon-refresh"
-          placeholder="请输入文章标题"
+          placeholder="请输入文章标题、文章内容、文章来源等"
           clearable
           maxlength="100"
+          style="width: 500px"
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
-      <el-form-item label="文章内容" prop="content">
-        <el-input
-          v-model="queryParams.content"
-          prefix-icon="el-icon-refresh"
-          placeholder="请输入文章内容"
-          clearable
-          maxlength="100"
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="文章来源" prop="source">
-        <el-input
-          v-model="queryParams.source"
-          prefix-icon="el-icon-refresh"
-          placeholder="请输入文章来源"
-          clearable
-          maxlength="20"
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 
       <el-form-item label="创建时间">
         <el-date-picker
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 463be110..5c198710 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -205,7 +205,9 @@ export default {
 
     //跳转到外部链接
     toRescue() {
+      //当前页面跳转
       // window.location.href = 'https://www.baidu.com/s?wd=' + this.searchContent
+      //打开新标签跳转
       window.open('https://www.baidu.com/s?wd='+ this.searchContent)
     },
 
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/weixin/service/impl/WeiXinSouGouServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/weixin/service/impl/WeiXinSouGouServiceImpl.java
index 38f6dfe3..14b7ccb9 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/weixin/service/impl/WeiXinSouGouServiceImpl.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/weixin/service/impl/WeiXinSouGouServiceImpl.java
@@ -36,15 +36,19 @@ public class WeiXinSouGouServiceImpl extends ServiceImpl<WeiXinSouGouMapper, Wei
 
         Map<String, Object> params = MapUtils.builder()
                 .page(pageDomain.getPageNum()-1, pageDomain.getPageSize())
-                .field(WeiXinSouGou::getTitle,weiXinSouGou.getTitle())
+                .group("A")
+                .field(WeiXinSouGou::getTitle,weiXinSouGou.getCondition())
                 .op("ct")//构建模糊查询   ct: 包含
-                .field(WeiXinSouGou::getContent,weiXinSouGou.getContent())
+                .group("B")
+                .field(WeiXinSouGou::getContent,weiXinSouGou.getCondition())
                 .op("ct")
-                .field(WeiXinSouGou::getSource,weiXinSouGou.getSource())
+                .group("C")
+                .field(WeiXinSouGou::getSource,weiXinSouGou.getCondition())
                 .op("ct")
                 .field(pageDomain.getOrderByColumn(),weiXinSouGou.getCreateTime(),weiXinSouGou.getEndCreateTime())
                 .op("bt")//构建bt区间查询
                 .orderBy(WeiXinSouGou::getCreateTime,pageDomain.getIsAsc())
+                .groupExpr("A|B|C")
                 .build();
 
         return beanSearcher.search(WeiXinSouGou.class, params);