From 7cd5904c0505d13d301fc869017612daf402a984 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 6 Jun 2022 09:18:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=B6=88=E6=81=AF=E5=BA=93=E8=A1=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/news_feed_动态消息表更新表结构.sql | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 doc/sql/news_feed_动态消息表更新表结构.sql diff --git a/doc/sql/news_feed_动态消息表更新表结构.sql b/doc/sql/news_feed_动态消息表更新表结构.sql new file mode 100644 index 00000000..1741f4d0 --- /dev/null +++ b/doc/sql/news_feed_动态消息表更新表结构.sql @@ -0,0 +1,33 @@ +/* +Navicat MySQL Data Transfer + +Source Server : 123.56.177.15_new_测试 +Source Server Version : 50736 +Source Host : 123.56.177.15:3306 +Source Database : foton_slrs_test2 + +Target Server Type : MYSQL +Target Server Version : 50736 +File Encoding : 65001 + +Date: 2022-06-02 12:17:37 +*/ + +SET FOREIGN_KEY_CHECKS=0; + +-- ---------------------------- +-- Table structure for news_feed +-- ---------------------------- +DROP TABLE IF EXISTS `news_feed`; +CREATE TABLE `news_feed` ( + `ID` varchar(50) CHARACTER SET utf8mb4 NOT NULL COMMENT 'ID', + `RESOURCE_TYPE` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '资源类型', + `MESSAGE_TYPE` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '消息类型', + `STANDARD_ID` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '标准类型', + `STANDARD` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '标准号', + `STANDARD_NAME` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '标准名称', + `RELEASE_DATE` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '发布日期', + `TEXT_STATE` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '文本状态', + `RENEW_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='动态消息表'; From 52fc8846b622091bdcbfcddfa739767cfeccbddf Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 6 Jun 2022 09:33:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bug?= =?UTF-8?q?=20#52893=20=E7=BC=BA=E5=B0=91=E4=BB=A3=E6=9B=BF=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=20=E8=A2=AB=E4=BB=A3=E6=9B=BF=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandardsInfoServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 32e0808e..6896763d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1222,7 +1222,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Mon, 6 Jun 2022 10:22:25 +0800 Subject: [PATCH 3/4] feat: There is no way the, xxx --- .../adc/da/search/service/impl/SearchCenterServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 9adcd241..da24e2bb 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1333,9 +1333,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { QueryBuilder multiQueryBuilder1; QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery(""); if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())){ - queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - "title" - ).minimumShouldMatch("100%").field("title",1000f); + queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue().toUpperCase(), + "sortTitle","numberTitle","yearOrder","nameTitle","title" + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f); boolQueryBuilder.must(queryBuilder1); } From 01a4a19a2fcde75f215c364e706867705c4d1f2d Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 6 Jun 2022 11:20:28 +0800 Subject: [PATCH 4/4] feat: There is no way the, XXX --- .../service/impl/SearchCenterServiceImpl.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index da24e2bb..457c91eb 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -1333,9 +1333,21 @@ public class SearchCenterServiceImpl implements SearchCenterService { QueryBuilder multiQueryBuilder1; QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery(""); if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())){ + if(searchInfoEO.getSelectValue().length() > 1){ + String str0 = searchInfoEO.getSelectValue().substring(0,1); + String Str1 = searchInfoEO.getSelectValue().substring(1,2); + String reg = ".*[0-9].*"; + Pattern pattern = Pattern.compile("^[a-zA-Z\\/]+$"); + if (pattern.matcher(str0).matches() && Str1.matches(reg)) { + String value = searchInfoEO.getSelectValue().replace(str0,str0+" "); + searchInfoEO.setSelectValue(value); + } + } + + queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue().toUpperCase(), - "sortTitle","numberTitle","yearOrder","nameTitle","title" - ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f); + "title" + ).minimumShouldMatch("100%").field("title",1000f); boolQueryBuilder.must(queryBuilder1); }