From f284c600886f5515a8669b9dec01b1131ec5f02f Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Thu, 24 Jun 2021 09:58:06 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E9=87=8D=E5=86=99=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E8=AF=A1=E5=BC=82=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/pom.xml | 5 +- adc-da-search/pom.xml | 414 ++++++++---------- .../controller/SearchCenterController.java | 22 +- .../controller/StandLawsSearchController.java | 4 +- .../impl/ElasticsearchServiceImpl.java | 2 +- .../service/impl/SearchCenterServiceImpl.java | 163 ++++--- .../impl/StandLawsSearchServiceImpl.java | 4 +- 7 files changed, 285 insertions(+), 329 deletions(-) diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml index df55c43a..8d811d0a 100644 --- a/adc-da-main/pom.xml +++ b/adc-da-main/pom.xml @@ -64,9 +64,12 @@ - + + + + diff --git a/adc-da-search/pom.xml b/adc-da-search/pom.xml index 7ee5b3dc..38d5f6b0 100644 --- a/adc-da-search/pom.xml +++ b/adc-da-search/pom.xml @@ -1,247 +1,213 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - com.adc - foton-slrs-system-rest - 3.0.0 - + + com.adc + foton-slrs-system-rest + 3.0.0 + - adc-da-search - 1.0.0 + adc-da-search + 1.0.0 - jar + jar - - UTF-8 - UTF-8 - 1.8 - 1.7 - 1.8 - 2.6.6 - 1.4.0-RC2 - 4.3.9.RELEASE - + + UTF-8 + UTF-8 + 1.8 + 1.7 + 1.8 + 2.6.6 + 1.4.0-RC2 + 4.3.9.RELEASE + - - - adc - http://60.247.58.121:8182/nexus/content/groups/public - - true - - - true - - + + + adc + http://60.247.58.121:8182/nexus/content/groups/public + + true + + + true + + - + - - - thirdparty - Nexus Thirdparty Repository - http://60.247.58.121:8182/nexus/content/repositories/thirdparty/ - - + + + thirdparty + Nexus Thirdparty Repository + http://60.247.58.121:8182/nexus/content/repositories/thirdparty/ + + - - - - - - + + + + + + - - com.adc - adc-da-base - 2.0.0 - + + com.adc + adc-da-base + 3.0.0 + - - com.adc - adc-da-util - 2.2.41 - - - org.bouncycastle - bcprov-jdk14 - - - + + com.adc + adc-da-sys + 3.0.0 + + + com.adc + adc-da-excel + 2.0.3 + - - com.adc - adc-da-sys - 3.0.0 - + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-amqp + + + org.elasticsearch.client + transport + 6.3.2 + + + org.elasticsearch + elasticsearch + 6.3.2 + + + + org.apache.logging.log4j + log4j-core + + + org.springframework.boot + spring-boot-starter-web + + + - - com.adc - adc-da-file - 2.2.0 - + + net.sourceforge.javacsv + javacsv + 2.0 + + + net.sf.opencsv + opencsv + 2.3 + - - com.adc - adc-da-druid - 2.0.0 - - - com.adc - adc-da-excel - 2.0.3 - - - org.springframework.boot - spring-boot-starter-test - test - + + com.alibaba + fastjson + 1.2.9 + + + com.google.guava + guava + 19.0 + + + com.mashape.unirest + unirest-java + 1.4.9 + - - - org.springframework.boot - spring-boot-starter-amqp - - - org.elasticsearch.client - transport - 6.3.2 - - - org.elasticsearch - elasticsearch - 6.3.2 - - - - org.apache.logging.log4j - log4j-core - - - org.springframework.boot - spring-boot-starter-web - - - - - - org.springframework.boot - spring-boot-starter-jetty - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 1.2.0 - + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + commons-logging + commons-logging + + + commons-beanutils + commons-beanutils + + + commons-collections + commons-collections + + + + + org.apache.httpcomponents + httpclient + 4.4.1 + + + org.apache.httpcomponents + httpcore + 4.4.1 + - - net.sourceforge.javacsv - javacsv - 2.0 - - - net.sf.opencsv - opencsv - 2.3 - + + org.aspectj + aspectjweaver + - - com.alibaba - fastjson - 1.2.9 - - - com.google.guava - guava - 19.0 - - - com.mashape.unirest - unirest-java - 1.4.9 - + + + cn.afterturn + easypoi-base + 4.1.2 + + + cn.afterturn + easypoi-web + 4.1.2 + + + cn.afterturn + easypoi-annotation + 4.1.2 + - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - - commons-logging - commons-logging - - - commons-beanutils - commons-beanutils - - - commons-collections - commons-collections - - - - - org.apache.httpcomponents - httpclient - 4.4.1 - - - org.apache.httpcomponents - httpcore - 4.4.1 - - - - org.aspectj - aspectjweaver - - - - - cn.afterturn - easypoi-base - 4.1.2 - - - cn.afterturn - easypoi-web - 4.1.2 - - - cn.afterturn - easypoi-annotation - 4.1.2 - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - - + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + diff --git a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java index 88aa8c56..7a291e8a 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java +++ b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java @@ -1,24 +1,25 @@ package com.adc.da.search.controller; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.adc.da.base.web.BaseController; +import com.adc.da.excel.poi.excel.ExcelExportUtil; +import com.adc.da.excel.poi.excel.entity.ExportParams; +import com.adc.da.excel.poi.excel.entity.enums.ExcelType; +import com.adc.da.http.PageInfo; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.search.dto.*; import com.adc.da.search.entity.SarAdvanceSearchVO; import com.adc.da.search.entity.SeniorSearchInfoEO; import com.adc.da.search.service.ElasticsearchService; import com.adc.da.search.service.SearchCenterService; -import com.adc.da.util.exception.AdcDaBaseException; -import com.adc.da.util.http.PageInfo; -import com.adc.da.util.http.ResponseMessage; -import com.adc.da.util.http.Result; -import com.adc.da.util.utils.IOUtils; -import com.adc.da.util.utils.StringUtils; +import com.adc.da.exception.AdcDaBaseException; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.util.IOUtils; + import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.elasticsearch.client.transport.TransportClient; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +34,6 @@ import java.io.OutputStream; import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Pattern; - import static com.adc.da.sys.common.ReadExcelName.encodeFileName; @RestController @@ -271,7 +271,7 @@ public class SearchCenterController extends BaseController> dtoDatas.add(exportDto); } //导出数据到Excel - workbook = ExcelExportUtil.exportExcel(exportParams, SearchMsgExportDto.class, dtoDatas); + workbook = com.adc.da.excel.poi.excel.ExcelExportUtil.exportExcel(exportParams, SearchMsgExportDto.class, dtoDatas); } os = response.getOutputStream(); diff --git a/adc-da-search/src/main/java/com/adc/da/search/controller/StandLawsSearchController.java b/adc-da-search/src/main/java/com/adc/da/search/controller/StandLawsSearchController.java index 3720d8da..7c99793a 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/controller/StandLawsSearchController.java +++ b/adc-da-search/src/main/java/com/adc/da/search/controller/StandLawsSearchController.java @@ -2,8 +2,8 @@ package com.adc.da.search.controller; import com.adc.da.base.web.BaseController; import com.adc.da.search.service.ElasticsearchService; -import com.adc.da.util.http.ResponseMessage; -import com.adc.da.util.http.Result; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java index 8cde8438..251abac1 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java @@ -2,8 +2,8 @@ package com.adc.da.search.service.impl; import com.adc.da.search.entity.EsPage; import com.adc.da.search.service.ElasticsearchService; -import com.adc.da.util.utils.StringUtils; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse; 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 13bc2063..ec8b808b 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 @@ -7,8 +7,7 @@ import com.adc.da.search.entity.SeniorSearchInfoEO; import com.adc.da.search.service.SearchCenterService; import com.alibaba.fastjson.JSONArray; import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.eclipse.jetty.util.StringUtil; +import org.apache.commons.lang3.StringUtils; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; @@ -120,30 +119,17 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ boolQueryBuilder.should(boolQueryShould); } + BoolQueryBuilder boolQueryBuilder1=null; if(searchInfoEO.getSelectIndex().equals("stand")) { - BoolQueryBuilder standBoolQueryBuilder = queryStandMsg(searchInfoEO,boolQueryMust,searchRequestBuilder); - boolQueryBuilder.must(standBoolQueryBuilder); - searchRequestBuilder.setQuery(boolQueryBuilder); - //在结果中检索 - if (StringUtils.isNotEmpty(searchInfoEO.getResultKeyword()) && StringUtils.isNotBlank(searchInfoEO.getIsHigh())) { - QueryBuilder multiQuery = queryInResult(searchInfoEO); - boolQueryBuilder.must(multiQuery); - } - result = countStandSearchResult(searchRequestBuilder,searchInfoEO); + boolQueryBuilder1 = queryStandMsg(searchInfoEO,boolQueryMust,searchRequestBuilder); } else if(searchInfoEO.getSelectIndex().equals("laws")){ - BoolQueryBuilder lawsBoolQueryBuilder = queryLawsMsg(searchInfoEO,boolQueryMust,searchRequestBuilder); - boolQueryBuilder.must(lawsBoolQueryBuilder); - searchRequestBuilder.setQuery(boolQueryBuilder); - //在结果中检索 - if (StringUtils.isNotEmpty(searchInfoEO.getResultKeyword()) && StringUtils.isNotBlank(searchInfoEO.getIsHigh())) { - QueryBuilder multiQuery = queryInResult(searchInfoEO); - boolQueryBuilder.must(multiQuery); - } - // 获取查询到的结果 - result = countStandSearchResult(searchRequestBuilder,searchInfoEO); + boolQueryBuilder1 = queryLawsMsg(searchInfoEO,boolQueryMust,searchRequestBuilder); } else if(searchInfoEO.getSelectIndex().equals("bussstand")){ - BoolQueryBuilder bussstandBoolQueryBuilder = queryBussStandMsg(searchInfoEO,boolQueryMust,searchRequestBuilder); - boolQueryBuilder.must(bussstandBoolQueryBuilder); + boolQueryBuilder1 = queryBussStandMsg(searchInfoEO,boolQueryMust,searchRequestBuilder); + } + + if(boolQueryBuilder1!=null){ + boolQueryBuilder.must(boolQueryBuilder1); searchRequestBuilder.setQuery(boolQueryBuilder); //在结果中检索 if (StringUtils.isNotEmpty(searchInfoEO.getResultKeyword()) && StringUtils.isNotBlank(searchInfoEO.getIsHigh())) { @@ -153,6 +139,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // 获取查询到的结果 result = countStandSearchResult(searchRequestBuilder,searchInfoEO); } + return result; } @@ -278,7 +265,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { } continue; } - if (StringUtil.isNotBlank(field) && StringUtil.isNotBlank(value)) { + if (StringUtils.isNotBlank(field) && StringUtils.isNotBlank(value)) { String type = searchVO.getType(); String connect = searchVO.getConnect(); if ("stand_name".equals(field) || "laws_name".equals(field)) { @@ -368,12 +355,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { public BoolQueryBuilder queryStandMsg(SeniorSearchInfoEO searchInfoEO, BoolQueryBuilder boolQueryBuilder, SearchRequestBuilder searchRequestBuilder) throws Exception{ String nameshowStr = "nameshow"; // 高级搜索项，只针对标准 - if (StringUtil.isNotBlank(searchInfoEO.getStandType())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandType())) { // 如果等于All，相当于不限制，查询全部 boolQueryBuilder.must(QueryBuilders.matchQuery("standType", searchInfoEO.getStandType())); } //标准类别，国内外标准有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getStandSort())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getStandSort().equals("all") && !searchInfoEO.getStandSort().equals("[]")) { String[] arrlist = searchInfoEO.getStandSort().split(","); @@ -382,51 +369,51 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } //编号，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getStandNumber())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber", "*"+searchInfoEO.getStandNumber()+"*")); } //标准年份 - if (StringUtil.isNotBlank(searchInfoEO.getStandYear())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandYear())) { boolQueryBuilder.must(QueryBuilders.matchQuery("standYear", searchInfoEO.getStandYear())); } //名称，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getNameShow())) { + if (StringUtils.isNotBlank(searchInfoEO.getNameShow())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getNameShow()+"*")); } //标准英文名称 - if (StringUtil.isNotBlank(searchInfoEO.getStandEnName())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) { boolQueryBuilder.must(QueryBuilders.matchQuery("standEnName", searchInfoEO.getStandEnName())); } //标准状态，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getStandState())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandState())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getStandState().equals("all") && !searchInfoEO.getStandState().equals("[]") ) { String[] arrlist = searchInfoEO.getStandState().split(","); boolQueryBuilder.must(QueryBuilders.termsQuery("statecode.keyword", arrlist)); } } - if (StringUtil.isNotBlank(searchInfoEO.getCLLX())) { + if (StringUtils.isNotBlank(searchInfoEO.getCLLX())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getCLLX().equals("all") && !searchInfoEO.getCLLX().equals("[]") ) { String[] arrlist = searchInfoEO.getCLLX().split(","); boolQueryBuilder.must(QueryBuilders.termsQuery("CLLX.keyword", arrlist)); } } - if (StringUtil.isNotBlank(searchInfoEO.getCYSD())) { + if (StringUtils.isNotBlank(searchInfoEO.getCYSD())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getCYSD().equals("all") && !searchInfoEO.getCYSD().equals("[]") ) { String[] arrlist = searchInfoEO.getCYSD().split(","); boolQueryBuilder.must(QueryBuilders.termsQuery("CYSD.keyword", arrlist)); } } - if (StringUtil.isNotBlank(searchInfoEO.getCBCD())) { + if (StringUtils.isNotBlank(searchInfoEO.getCBCD())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getCBCD().equals("all") && !searchInfoEO.getCBCD().equals("[]") ) { String[] arrlist = searchInfoEO.getCBCD().split(","); boolQueryBuilder.must(QueryBuilders.termsQuery("CBCD.keyword", arrlist)); } } - if (StringUtil.isNotBlank(searchInfoEO.getZRLX())) { + if (StringUtils.isNotBlank(searchInfoEO.getZRLX())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getZRLX().equals("all") && !searchInfoEO.getZRLX().equals("[]") ) { String[] arrlist = searchInfoEO.getZRLX().split(","); @@ -444,7 +431,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { String replacedStandNumStr = "replaced_stand_num"; String replaceStandNumStr = "replace_stand_num"; //国家，国内外标准，国内外法规有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getCountry())) { + if (StringUtils.isNotBlank(searchInfoEO.getCountry())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getCountry().equals("all") && !searchInfoEO.getCountry().equals("[]")) { // String[] arrlist = searchInfoEO.getCountry().split(","); @@ -453,35 +440,35 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } //标准性质，国内外标准，法规有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getNature())) { + if (StringUtils.isNotBlank(searchInfoEO.getNature())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getNature().equals("all") && !searchInfoEO.getNature().equals("[]")) { String[] arrlist = searchInfoEO.getNature().split(","); boolQueryBuilder.must(QueryBuilders.termsQuery("nature.keyword", arrlist)); } } - if (StringUtil.isNotBlank(searchInfoEO.getSYCLLX())) { + if (StringUtils.isNotBlank(searchInfoEO.getSYCLLX())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getSYCLLX().equals("all") && !searchInfoEO.getSYCLLX().equals("[]") ) { String[] arrlist = searchInfoEO.getSYCLLX().split(","); boolQueryBuilder.must(QueryBuilders.termsQuery("SYCLLX.keyword", arrlist)); } } - if (StringUtil.isNotBlank(searchInfoEO.getWSSFCY())) { + if (StringUtils.isNotBlank(searchInfoEO.getWSSFCY())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getWSSFCY().equals("all") && !searchInfoEO.getWSSFCY().equals("[]") ) { String[] arrlist = searchInfoEO.getWSSFCY().split(","); boolQueryBuilder.must(QueryBuilders.termsQuery("WSSFCY.keyword", arrlist)); } } - if (StringUtil.isNotBlank(searchInfoEO.getCBCD())) { + if (StringUtils.isNotBlank(searchInfoEO.getCBCD())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getCBCD().equals("all") && !searchInfoEO.getCBCD().equals("[]") ) { String[] arrlist = searchInfoEO.getCBCD().split(","); boolQueryBuilder.must(QueryBuilders.termsQuery("CBCD.keyword", arrlist)); } } - if (StringUtil.isNotBlank(searchInfoEO.getZRLX())) { + if (StringUtils.isNotBlank(searchInfoEO.getZRLX())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getZRLX().equals("all") && !searchInfoEO.getZRLX().equals("[]") ) { String[] arrlist = searchInfoEO.getZRLX().split(","); @@ -489,19 +476,19 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } //编号，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getNumberShow())) { + if (StringUtils.isNotBlank(searchInfoEO.getNumberShow())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery(numbershowStr, "*"+searchInfoEO.getNumberShow()+"*")); } //名称，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getNameShow())) { + if (StringUtils.isNotBlank(searchInfoEO.getNameShow())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getNameShow()+"*")); } //发布部门 - if (StringUtil.isNotBlank(searchInfoEO.getIssueUnit())) { + if (StringUtils.isNotBlank(searchInfoEO.getIssueUnit())) { boolQueryBuilder.must(QueryBuilders.matchQuery("issueUnit", searchInfoEO.getIssueUnit())); } //文件状态，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getStandState())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandState())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getStandState().equals("all") && !searchInfoEO.getStandState().equals("[]")) { String[] arrlist = searchInfoEO.getStandState().split(","); @@ -510,32 +497,32 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } //代替文件号 - if (StringUtil.isNotBlank(searchInfoEO.getReplaceStandNum())) { + if (StringUtils.isNotBlank(searchInfoEO.getReplaceStandNum())) { boolQueryBuilder.must(QueryBuilders.matchQuery("replace_laws_num", searchInfoEO.getReplaceStandNum())); } //适用车型，国内外标准，国内外法规，企业标准 有此属性 录入可多选 - if (StringUtil.isNotBlank(searchInfoEO.getApplyArctic())) { + if (StringUtils.isNotBlank(searchInfoEO.getApplyArctic())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getApplyArctic().equals("all") && !searchInfoEO.getApplyArctic().equals("[]")) { boolQueryBuilder.must(QueryBuilders.matchQuery("apply_arctic", searchInfoEO.getApplyArctic())); } } //能源种类，国内外标准，国内外法规，企业标准 有此属性 录入可多选 - if (StringUtil.isNotBlank(searchInfoEO.getEnergyKind())) { + if (StringUtils.isNotBlank(searchInfoEO.getEnergyKind())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getEnergyKind().equals("all") && !searchInfoEO.getEnergyKind().equals("[]") ) { boolQueryBuilder.must(QueryBuilders.matchQuery("energy_kind", searchInfoEO.getEnergyKind())); } } //适用认证，国内外标准，国内外法规 有此属性 录入可多选 - if (StringUtil.isNotBlank(searchInfoEO.getApplyAuth())) { + if (StringUtils.isNotBlank(searchInfoEO.getApplyAuth())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getApplyAuth().equals("all") && !searchInfoEO.getApplyAuth().equals("[]")) { boolQueryBuilder.must(QueryBuilders.matchQuery("apply_auth", searchInfoEO.getApplyAuth())); } } //责任部门 - if (StringUtil.isNotBlank(searchInfoEO.getResponsibleUnit())) { + if (StringUtils.isNotBlank(searchInfoEO.getResponsibleUnit())) { boolQueryBuilder.must(QueryBuilders.matchQuery("responsibleUnit", searchInfoEO.getResponsibleUnit())); } //发布日期 @@ -553,11 +540,11 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.filter(rangeQueryBuilder); } //内容摘要 - if (StringUtil.isNotBlank(searchInfoEO.getSynopsis())) { + if (StringUtils.isNotBlank(searchInfoEO.getSynopsis())) { boolQueryBuilder.must(QueryBuilders.matchQuery("synopsis", searchInfoEO.getSynopsis())); } //标准英文名称 - if (StringUtil.isNotBlank(searchInfoEO.getStandEnName())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) { boolQueryBuilder.must(QueryBuilders.matchQuery("standEnName", searchInfoEO.getStandEnName())); } //新定型车实施日期 @@ -589,15 +576,15 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.filter(rangeQueryBuilder); } //被代替标准号 - if (StringUtil.isNotBlank(searchInfoEO.getReplacedStandNum())) { + if (StringUtils.isNotBlank(searchInfoEO.getReplacedStandNum())) { boolQueryBuilder.must(QueryBuilders.matchQuery(replacedStandNumStr, searchInfoEO.getReplacedStandNum())); } //关键词 - if (StringUtil.isNotBlank(searchInfoEO.getTags())) { + if (StringUtils.isNotBlank(searchInfoEO.getTags())) { boolQueryBuilder.must(QueryBuilders.matchQuery("standTag", searchInfoEO.getTags())); } //所属类别，国内外标准， 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getCategory())) { + if (StringUtils.isNotBlank(searchInfoEO.getCategory())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getCategory().equals("all") && !searchInfoEO.getCategory().equals("[]")) { boolQueryBuilder.must(QueryBuilders.matchQuery("category", searchInfoEO.getCategory())); @@ -652,38 +639,38 @@ public class SearchCenterServiceImpl implements SearchCenterService { String replaceStandNumStr = "replace_stand_num"; // 高级搜索项，只针对标准 //分类代号 - if (StringUtil.isNotBlank(searchInfoEO.getClassifyCode())) { + if (StringUtils.isNotBlank(searchInfoEO.getClassifyCode())) { boolQueryBuilder.must(QueryBuilders.matchQuery("classifyCode", searchInfoEO.getClassifyCode())); } //编号，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getStandNumber())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber", "*"+searchInfoEO.getStandNumber()+"*")); } //名称，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getNameShow())) { + if (StringUtils.isNotBlank(searchInfoEO.getNameShow())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getNameShow()+"*")); } //标准英文名称 - if (StringUtil.isNotBlank(searchInfoEO.getStandEnName())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) { boolQueryBuilder.must(QueryBuilders.matchQuery("standEnName", searchInfoEO.getStandEnName())); } if (searchInfoEO.getPutYear() != null && StringUtils.isNotEmpty(searchInfoEO.getPutYear())) { boolQueryBuilder.must(QueryBuilders.wildcardQuery("putYear", "*"+searchInfoEO.getPutYear()+"*")); } //代替标准号 - if (StringUtil.isNotBlank(searchInfoEO.getReplaceStandNum())) { + if (StringUtils.isNotBlank(searchInfoEO.getReplaceStandNum())) { boolQueryBuilder.must(QueryBuilders.matchQuery(replaceStandNumStr, searchInfoEO.getReplaceStandNum())); } //主起草部门 - if (StringUtil.isNotBlank(searchInfoEO.getZQCBM())) { + if (StringUtils.isNotBlank(searchInfoEO.getZQCBM())) { boolQueryBuilder.must(QueryBuilders.matchQuery("ZQCBM", searchInfoEO.getZQCBM())); } //被代替标准号 - if (StringUtil.isNotBlank(searchInfoEO.getReplacedStandNum())) { + if (StringUtils.isNotBlank(searchInfoEO.getReplacedStandNum())) { boolQueryBuilder.must(QueryBuilders.matchQuery(replacedStandNumStr, searchInfoEO.getReplacedStandNum())); } //标准状态，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getStandState())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandState())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getStandState().equals("all") && !searchInfoEO.getStandState().equals("[]")) { String[] arrlist = searchInfoEO.getStandState().split(","); @@ -706,7 +693,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryBuilder.filter(rangeQueryBuilder); } //国家，国内外标准，国内外法规有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getCountry())) { + if (StringUtils.isNotBlank(searchInfoEO.getCountry())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getCountry().equals("all") && !searchInfoEO.getCountry().equals("[]") ) { String[] arrlist = searchInfoEO.getCountry().split(","); @@ -714,7 +701,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } //标准类别，国内外标准有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getStandSort())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getStandSort().equals("all")&& !searchInfoEO.getStandSort().equals("[]")) { String[] arrlist = searchInfoEO.getStandSort().split(","); @@ -913,7 +900,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { String nameshowStr = "nameshow"; String replacedStandNumStr = "replaced_stand_num"; String replaceStandNumStr = "replace_stand_num"; - if(StringUtil.isNotBlank(searchInfoEO.getSelectKey())){ + if(StringUtils.isNotBlank(searchInfoEO.getSelectKey())){ switch (searchInfoEO.getSelectKey()){ // 修改过后，前台不会传 all case "all": @@ -926,19 +913,19 @@ public class SearchCenterServiceImpl implements SearchCenterService { case "standNumber": case "lawsNumber": case "bussstandsNumber": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())){ + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())){ boolQueryBuilder.must(QueryBuilders.matchPhraseQuery(numbershowStr,searchInfoEO.getSelectValue())); } break; case "standName": case "lawsName": case "bussstandName": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())) { + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { boolQueryBuilder.must(QueryBuilders.matchQuery(nameshowStr, searchInfoEO.getSelectValue())); } break; case "standState": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())) { + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { boolQueryBuilder.must(QueryBuilders.matchQuery("standstateshow", searchInfoEO.getSelectValue())); } break; @@ -946,44 +933,44 @@ public class SearchCenterServiceImpl implements SearchCenterService { //标准正文 暂缺 break; case "applyArctic": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())) { + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { boolQueryBuilder.must(QueryBuilders.matchQuery("applyarcticshow", searchInfoEO.getSelectValue())); } break; case "issueTime": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())) { + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(searchInfoEO.getSelectStartTime().getTime()).to(searchInfoEO.getSelectEndTime().getTime()).includeLower(true).includeUpper(true); boolQueryBuilder.filter(rangeQueryBuilder); } break; case "putTime": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())) { + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { RangeQueryBuilder rangeQueryBuilders = QueryBuilders.rangeQuery("put_time").format(EPOCH_MILLIS).from(searchInfoEO.getSelectStartTime().getTime()).to(searchInfoEO.getSelectEndTime().getTime()).includeLower(true).includeUpper(true); boolQueryBuilder.filter(rangeQueryBuilders); } break; case "draftUser": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())) { + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { boolQueryBuilder.must(QueryBuilders.matchQuery("draft_user", searchInfoEO.getSelectValue())); } break; case "draftingUnit": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())) { + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { boolQueryBuilder.must(QueryBuilders.matchQuery("drafting_unit", searchInfoEO.getSelectValue())); } break; case "replaceStandNum": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())) { + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { boolQueryBuilder.must(QueryBuilders.matchQuery(replaceStandNumStr, searchInfoEO.getSelectValue())); } break; case "replacedStandNum": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())) { + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { boolQueryBuilder.must(QueryBuilders.matchQuery(replacedStandNumStr, searchInfoEO.getSelectValue())); } break; case "msgTitle": - if(StringUtil.isNotBlank(searchInfoEO.getSelectValue())) { + if(StringUtils.isNotBlank(searchInfoEO.getSelectValue())) { boolQueryBuilder.must(QueryBuilders.matchQuery("title", searchInfoEO.getSelectValue())); } break; @@ -999,7 +986,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(searchInfoEO.getSelectIndex().equals("stand")) { // 高级搜索项，只针对标准 //标准性质，国内外标准，法规有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getNature())) { + if (StringUtils.isNotBlank(searchInfoEO.getNature())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getNature().equals("all") && !searchInfoEO.getNature().equals("[]")) { String[] arrlist = searchInfoEO.getNature().split(","); @@ -1007,7 +994,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } //国家，国内外标准，国内外法规有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getCountry())) { + if (StringUtils.isNotBlank(searchInfoEO.getCountry())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getCountry().equals("all") && !searchInfoEO.getCountry().equals("[]")) { String[] arrlist = searchInfoEO.getCountry().split(","); @@ -1015,7 +1002,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } //标准类别，国内外标准有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getStandSort())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getStandSort().equals("all") && !searchInfoEO.getStandSort().equals("[]")) { String[] arrlist = searchInfoEO.getStandSort().split(","); @@ -1023,15 +1010,15 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } //编号，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getNumberShow())) { + if (StringUtils.isNotBlank(searchInfoEO.getNumberShow())) { boolQueryBuilder.must(QueryBuilders.matchQuery(numbershowStr, searchInfoEO.getNumberShow())); } //名称，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getNameShow())) { + if (StringUtils.isNotBlank(searchInfoEO.getNameShow())) { boolQueryBuilder.must(QueryBuilders.matchQuery(nameshowStr, searchInfoEO.getNameShow())); } //适用认证，国内外标准，国内外法规，企业标准 有此属性 录入可多选 - if (StringUtil.isNotBlank(searchInfoEO.getApplyArctic())) { + if (StringUtils.isNotBlank(searchInfoEO.getApplyArctic())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getApplyArctic().equals("all") && !searchInfoEO.getApplyArctic().equals("[]")) { boolQueryBuilder.must(QueryBuilders.matchQuery("apply_arctic", searchInfoEO.getApplyArctic())); @@ -1039,28 +1026,28 @@ public class SearchCenterServiceImpl implements SearchCenterService { } //认证类型，国内外标准，国内外法规 有此属性 录入可多选 - if (StringUtil.isNotBlank(searchInfoEO.getApplyAuth())) { + if (StringUtils.isNotBlank(searchInfoEO.getApplyAuth())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getApplyAuth().equals("all") && !searchInfoEO.getApplyAuth().equals("[]")) { boolQueryBuilder.must(QueryBuilders.matchQuery("apply_auth", searchInfoEO.getApplyAuth())); } } //所属类别，国内外标准， 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getCategory())) { + if (StringUtils.isNotBlank(searchInfoEO.getCategory())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getCategory().equals("all") && !searchInfoEO.getCategory().equals("[]")) { boolQueryBuilder.must(QueryBuilders.matchQuery("category", searchInfoEO.getCategory())); } } //能源种类，国内外标准，国内外法规，企业标准 有此属性 录入可多选 - if (StringUtil.isNotBlank(searchInfoEO.getEnergyKind())) { + if (StringUtils.isNotBlank(searchInfoEO.getEnergyKind())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getEnergyKind().equals("all") && !searchInfoEO.getEnergyKind().equals("[]")) { boolQueryBuilder.must(QueryBuilders.matchQuery("energy_kind", searchInfoEO.getEnergyKind())); } } //采标程度，国内外标准， 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getAdoptExtent())) { + if (StringUtils.isNotBlank(searchInfoEO.getAdoptExtent())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getAdoptExtent().equals("all") && !searchInfoEO.getAdoptExtent().equals("[]")) { /*String[] arrlist = searchInfoEO.getAdoptExtent().split(","); @@ -1069,7 +1056,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { } } //标准状态，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtil.isNotBlank(searchInfoEO.getStandState())) { + if (StringUtils.isNotBlank(searchInfoEO.getStandState())) { // 如果等于All，相当于不限制，查询全部 if (!searchInfoEO.getStandState().equals("all") && !searchInfoEO.getStandState().equals("[]")) { /*String[] arrlist = searchInfoEO.getStandState().split(","); diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index e7151d52..904fe5da 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -4,10 +4,10 @@ import com.adc.da.search.entity.FullTextSearchEO; import com.adc.da.search.entity.StandLawsEO; import com.adc.da.search.service.ElasticsearchService; import com.adc.da.search.service.StandLawsSearchService; -import com.adc.da.util.utils.DateUtils; -import com.adc.da.util.utils.StringUtils; +import com.adc.da.util.DateUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.lang3.StringUtils; import org.elasticsearch.client.transport.TransportClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory;