From a01ca3fd4947d4b5166751a0b7a03172136a0863 Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Wed, 23 Jun 2021 10:43:31 +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 --- ...tHolder.java => SpringContextHolder1.java} | 2 +- .../com/adc/da/login/util/CacheUtils.java | 4 +- .../java/com/adc/da/login/util/UserUtils.java | 8 +- adc-da-search/pom.xml | 2 + .../controller/SearchCenterController.java | 8 +- .../controller/StandLawsSearchController.java | 2 +- .../da/search/controller/TestController.java | 2 +- .../adc/da/search/entity/SearchInfoEO.java | 2 +- .../da/search/entity/SeniorSearchInfoEO.java | 566 +----------------- .../adc/da/search/page/PartProductEOPage.java | 2 +- .../service/impl/SearchCenterServiceImpl.java | 130 +--- pom.xml | 1 + 12 files changed, 38 insertions(+), 691 deletions(-) rename adc-da-base/src/main/java/com/adc/da/util/{SpringContextHolder.java => SpringContextHolder1.java} (94%) diff --git a/adc-da-base/src/main/java/com/adc/da/util/SpringContextHolder.java b/adc-da-base/src/main/java/com/adc/da/util/SpringContextHolder1.java similarity index 94% rename from adc-da-base/src/main/java/com/adc/da/util/SpringContextHolder.java rename to adc-da-base/src/main/java/com/adc/da/util/SpringContextHolder1.java index 99581cb6..a1de3346 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/SpringContextHolder.java +++ b/adc-da-base/src/main/java/com/adc/da/util/SpringContextHolder1.java @@ -6,7 +6,7 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; @Component -public class SpringContextHolder implements ApplicationContextAware { +public class SpringContextHolder1 implements ApplicationContextAware { private static ApplicationContext applicationContext; diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/CacheUtils.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/CacheUtils.java index 079403f4..a855ef5b 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/CacheUtils.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/CacheUtils.java @@ -1,6 +1,6 @@ package com.adc.da.login.util; -import com.adc.da.util.SpringContextHolder; +import com.adc.da.util.SpringContextHolder1; import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.Element; @@ -14,7 +14,7 @@ public class CacheUtils { super(); } - private static CacheManager cacheManager = (CacheManager) SpringContextHolder.getBean("ehCacheManagerFactoryBean"); + private static CacheManager cacheManager = (CacheManager) SpringContextHolder1.getBean("ehCacheManagerFactoryBean"); private static final String SYS_CACHE = "sysCache"; diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java index cc409e88..0a8b15db 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java @@ -9,7 +9,7 @@ import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.service.IMenuEOService; import com.adc.da.sys.service.IRoleEOService; import com.adc.da.sys.service.IUserEOService; -import com.adc.da.util.SpringContextHolder; +import com.adc.da.util.SpringContextHolder1; import com.google.common.collect.Maps; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -53,17 +53,17 @@ public class UserUtils { /** * @see IUserEOService */ - private static IUserEOService userService = SpringContextHolder.getBean(IUserEOService.class); + private static IUserEOService userService = SpringContextHolder1.getBean(IUserEOService.class); /** * @see IMenuEOService */ - private static IMenuEOService menuService = SpringContextHolder.getBean(IMenuEOService.class); + private static IMenuEOService menuService = SpringContextHolder1.getBean(IMenuEOService.class); /** * @see IRoleEOService */ - private static IRoleEOService roleEOService = SpringContextHolder.getBean(IRoleEOService.class); + private static IRoleEOService roleEOService = SpringContextHolder1.getBean(IRoleEOService.class); /** * 退出 diff --git a/adc-da-search/pom.xml b/adc-da-search/pom.xml index ae2ae633..7ee5b3dc 100644 --- a/adc-da-search/pom.xml +++ b/adc-da-search/pom.xml @@ -53,6 +53,8 @@ + + com.adc adc-da-base 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 27957f6f..88aa8c56 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 @@ -4,7 +4,7 @@ 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.person.service.PersonCollectEOService; +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; @@ -38,7 +38,7 @@ import static com.adc.da.sys.common.ReadExcelName.encodeFileName; @RestController @RequestMapping("/${restPath}/search/searchCenter") -@Api(description = "|SearchCenter|") +@Api(tags = "|SearchCenter|") public class SearchCenterController extends BaseController> { @Autowired @@ -47,7 +47,7 @@ public class SearchCenterController extends BaseController> private SearchCenterService searchCenterService; @Autowired - private PersonCollectEOService personCollectEOService; + private IPersonCollectEOService personCollectEOService; @Autowired private ElasticsearchService elasticsearchService; @@ -60,7 +60,7 @@ public class SearchCenterController extends BaseController> @ApiOperation(value = "|SearchCenter|查询") @PostMapping(value="/searchSarBykey") public ResponseMessage>> searchSarBykey(SeniorSearchInfoEO searchInfoEO) throws Exception{ - List> result = new ArrayList<>(); + List> result; if (StringUtils.isAlphanumericSpace(searchInfoEO.getSelectIndex())) { if(elasticsearchService.isIndexExist(searchInfoEO.getSelectIndex())){ if("fulltextserch".equals(searchInfoEO.getSelectIndex()) || "fulltextserch"== searchInfoEO.getSelectIndex()){ 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 c768df38..3720d8da 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 @@ -20,7 +20,7 @@ import java.util.Map; @RestController @RequestMapping("/${restPath}/search/standLawsSearch") -@Api(description = "|StandLawsSearch|") +@Api(tags = "|StandLawsSearch|") public class StandLawsSearchController extends BaseController> { private static final Logger logger = LoggerFactory.getLogger(StandLawsSearchController.class); diff --git a/adc-da-search/src/main/java/com/adc/da/search/controller/TestController.java b/adc-da-search/src/main/java/com/adc/da/search/controller/TestController.java index 5b3e10f4..419eed66 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/controller/TestController.java +++ b/adc-da-search/src/main/java/com/adc/da/search/controller/TestController.java @@ -34,7 +34,7 @@ import static com.adc.da.search.util.ElasticsearchConstant.SUCCESS_DELETED; @RestController @RequestMapping("/${restPath}") -@Api(description = "|testElasticsearch|") +@Api(tags = "|testElasticsearch|") public class TestController { private static final Logger logger = LoggerFactory.getLogger(TestController.class); diff --git a/adc-da-search/src/main/java/com/adc/da/search/entity/SearchInfoEO.java b/adc-da-search/src/main/java/com/adc/da/search/entity/SearchInfoEO.java index aad0e5e0..1e69ed01 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/entity/SearchInfoEO.java +++ b/adc-da-search/src/main/java/com/adc/da/search/entity/SearchInfoEO.java @@ -1,6 +1,6 @@ package com.adc.da.search.entity; -import com.adc.da.sys.common.BasePage; +import com.adc.da.base.page.BasePage; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; diff --git a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java index eb9a62cc..7f2107ed 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java +++ b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java @@ -1,7 +1,9 @@ package com.adc.da.search.entity; -import com.adc.da.sys.common.BasePage; +import com.adc.da.base.page.BasePage; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.Date; import java.util.List; @@ -12,7 +14,8 @@ import java.util.List; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ - +@EqualsAndHashCode(callSuper = true) +@Data public class SeniorSearchInfoEO extends BasePage { private String standType; //标准性质 @@ -153,563 +156,4 @@ public class SeniorSearchInfoEO extends BasePage { private String stand_status; private String isHigh; - public String getNature() { - return nature; - } - - public void setNature(String nature) { - this.nature = nature; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - public String getStandSort() { - return standSort; - } - - public void setStandSort(String standSort) { - this.standSort = standSort; - } - - public String getNumberShow() { - return numberShow; - } - - public void setNumberShow(String numberShow) { - this.numberShow = numberShow; - } - - public String getNameShow() { - return nameShow; - } - - public void setNameShow(String nameShow) { - this.nameShow = nameShow; - } - - public String getApplyArctic() { - return applyArctic; - } - - public void setApplyArctic(String applyArctic) { - this.applyArctic = applyArctic; - } - - public String getApplyAuth() { - return applyAuth; - } - - public void setApplyAuth(String applyAuth) { - this.applyAuth = applyAuth; - } - - public String getCategory() { - return category; - } - - public void setCategory(String category) { - this.category = category; - } - - public String getEnergyKind() { - return energyKind; - } - - public void setEnergyKind(String energyKind) { - this.energyKind = energyKind; - } - - public String getAdoptExtent() { - return adoptExtent; - } - - public void setAdoptExtent(String adoptExtent) { - this.adoptExtent = adoptExtent; - } - - public String getStandState() { - return standState; - } - - public void setStandState(String standState) { - this.standState = standState; - } - - public Date getIssueTime() { - return issueTime; - } - - public void setIssueTime(Date issueTime) { - this.issueTime = issueTime; - } - - public String getSelectKey() { - return selectKey; - } - - public void setSelectKey(String selectKey) { - this.selectKey = selectKey; - } - - public String getSelectValue() { - return selectValue; - } - - public void setSelectValue(String selectValue) { - this.selectValue = selectValue; - } - - public Date getSelectStartTime() { - return selectStartTime; - } - - public void setSelectStartTime(Date selectStartTime) { - this.selectStartTime = selectStartTime; - } - - public Date getSelectEndTime() { - return selectEndTime; - } - - public void setSelectEndTime(Date selectEndTime) { - this.selectEndTime = selectEndTime; - } - - public String getSelectIndex() { - return selectIndex; - } - - public void setSelectIndex(String selectIndex) { - this.selectIndex = selectIndex; - } - - public String getBussBigClass() { - return bussBigClass; - } - - public void setBussBigClass(String bussBigClass) { - this.bussBigClass = bussBigClass; - } - - public String getBussFineClass() { - return bussFineClass; - } - - public void setBussFineClass(String bussFineClass) { - this.bussFineClass = bussFineClass; - } - - public String getStandNumber() { - return standNumber; - } - - public void setStandNumber(String standNumber) { - this.standNumber = standNumber; - } - - public String getStandYear() { - return standYear; - } - - public void setStandYear(String standYear) { - this.standYear = standYear; - } - - public String getStandEnName() { - return standEnName; - } - - public void setStandEnName(String standEnName) { - this.standEnName = standEnName; - } - - public String getReplaceStandNum() { - return replaceStandNum; - } - - public void setReplaceStandNum(String replaceStandNum) { - this.replaceStandNum = replaceStandNum; - } - - public String getReplacedStandNum() { - return replacedStandNum; - } - - public void setReplacedStandNum(String replacedStandNum) { - this.replacedStandNum = replacedStandNum; - } - - public String getInterStandNum() { - return interStandNum; - } - - public void setInterStandNum(String interStandNum) { - this.interStandNum = interStandNum; - } - - public Date getPutTime() { - return putTime; - } - - public void setPutTime(Date putTime) { - this.putTime = putTime; - } - - public Date getNewproductPutTime() { - return newproductPutTime; - } - - public void setNewproductPutTime(Date newproductPutTime) { - this.newproductPutTime = newproductPutTime; - } - - public Date getProductPutTime() { - return productPutTime; - } - - public void setProductPutTime(Date productPutTime) { - this.productPutTime = productPutTime; - } - - public Date getNewcarPutTime() { - return newcarPutTime; - } - - public void setNewcarPutTime(Date newcarPutTime) { - this.newcarPutTime = newcarPutTime; - } - - public String getDraftUser() { - return draftUser; - } - - public void setDraftUser(String draftUser) { - this.draftUser = draftUser; - } - - public String getDraftingUnit() { - return draftingUnit; - } - - public void setDraftingUnit(String draftingUnit) { - this.draftingUnit = draftingUnit; - } - - public String getTags() { - return tags; - } - - public void setTags(String tags) { - this.tags = tags; - } - - public String getSynopsis() { - return synopsis; - } - - public void setSynopsis(String synopsis) { - this.synopsis = synopsis; - } - - public String getResponsibleUnit() { - return responsibleUnit; - } - - public void setResponsibleUnit(String responsibleUnit) { - this.responsibleUnit = responsibleUnit; - } - - public String getClassifyCode() { - return classifyCode; - } - - public void setClassifyCode(String classifyCode) { - this.classifyCode = classifyCode; - } - - public String getPutYear() { - return putYear; - } - - public void setPutYear(String putYear) { - this.putYear = putYear; - } - - public String getFirstPutTime() { - return firstPutTime; - } - - public void setFirstPutTime(String firstPutTime) { - this.firstPutTime = firstPutTime; - } - - public String getQuoteStand() { - return quoteStand; - } - - public void setQuoteStand(String quoteStand) { - this.quoteStand = quoteStand; - } - - public String getCitationUser() { - return citationUser; - } - - public void setCitationUser(String citationUser) { - this.citationUser = citationUser; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getPubUserName() { - return pubUserName; - } - - public void setPubUserName(String pubUserName) { - this.pubUserName = pubUserName; - } - - public String getPubOrgName() { - return pubOrgName; - } - - public void setPubOrgName(String pubOrgName) { - this.pubOrgName = pubOrgName; - } - - public String getModule() { - return module; - } - - public void setModule(String module) { - this.module = module; - } - - public String getIssueUnit() { - return issueUnit; - } - - public void setIssueUnit(String issueUnit) { - this.issueUnit = issueUnit; - } - - public Date getRegisterPutTime() { - return registerPutTime; - } - - public void setRegisterPutTime(Date registerPutTime) { - this.registerPutTime = registerPutTime; - } - - public String getResultKeyword() { - return resultKeyword; - } - - public void setResultKeyword(String resultKeyword) { - this.resultKeyword = resultKeyword; - } - - public String getKeywords() { - return keywords; - } - - public void setKeywords(String keywords) { - this.keywords = keywords; - } - - public Date getIssueTimeSt() { - return issueTimeSt; - } - - public void setIssueTimeSt(Date issueTimeSt) { - this.issueTimeSt = issueTimeSt; - } - - public Date getIssueTimeEd() { - return issueTimeEd; - } - - public void setIssueTimeEd(Date issueTimeEd) { - this.issueTimeEd = issueTimeEd; - } - - public Date getPutTimeSt() { - return putTimeSt; - } - - public void setPutTimeSt(Date putTimeSt) { - this.putTimeSt = putTimeSt; - } - - public Date getPutTimeEd() { - return putTimeEd; - } - - public void setPutTimeEd(Date putTimeEd) { - this.putTimeEd = putTimeEd; - } - - public String getItemsName() { - return itemsName; - } - - public void setItemsName(String itemsName) { - this.itemsName = itemsName; - } - - public String getItemsNum() { - return itemsNum; - } - - public void setItemsNum(String itemsNum) { - this.itemsNum = itemsNum; - } - - public String getParts() { - return parts; - } - - public void setParts(String parts) { - this.parts = parts; - } - - public Date getNewcarPutTimeSt() { - return newcarPutTimeSt; - } - - public void setNewcarPutTimeSt(Date newcarPutTimeSt) { - this.newcarPutTimeSt = newcarPutTimeSt; - } - - public Date getNewcarPutTimeEd() { - return newcarPutTimeEd; - } - - public void setNewcarPutTimeEd(Date newcarPutTimeEd) { - this.newcarPutTimeEd = newcarPutTimeEd; - } - - public Date getProductPutTimeSt() { - return productPutTimeSt; - } - - public void setProductPutTimeSt(Date productPutTimeSt) { - this.productPutTimeSt = productPutTimeSt; - } - - public Date getProductPutTimeEd() { - return productPutTimeEd; - } - - public void setProductPutTimeEd(Date productPutTimeEd) { - this.productPutTimeEd = productPutTimeEd; - } - - public String getStandType() { - return standType; - } - - public void setStandType(String standType) { - this.standType = standType; - } - - public List getAdvanceSearchVOList() { - return advanceSearchVOList; - } - - public void setAdvanceSearchVOList(List advanceSearchVOList) { - this.advanceSearchVOList = advanceSearchVOList; - } - - public String getCLLX() { - return CLLX; - } - - public void setCLLX(String CLLX) { - this.CLLX = CLLX; - } - - public String getCYSD() { - return CYSD; - } - - public void setCYSD(String CYSD) { - this.CYSD = CYSD; - } - - public String getCBCD() { - return CBCD; - } - - public void setCBCD(String CBCD) { - this.CBCD = CBCD; - } - - public String getZRLX() { - return ZRLX; - } - - public void setZRLX(String ZRLX) { - this.ZRLX = ZRLX; - } - - public String getSYCLLX() { - return SYCLLX; - } - - public void setSYCLLX(String SYCLLX) { - this.SYCLLX = SYCLLX; - } - - public String getWSSFCY() { - return WSSFCY; - } - - public void setWSSFCY(String WSSFCY) { - this.WSSFCY = WSSFCY; - } - - public String getAdvanceSearchVOStr() { - return advanceSearchVOStr; - } - - public void setAdvanceSearchVOStr(String advanceSearchVOStr) { - this.advanceSearchVOStr = advanceSearchVOStr; - } - - public String getStand_status() { - return stand_status; - } - - public void setStand_status(String stand_status) { - this.stand_status = stand_status; - } - - public String getZQCBM() { - return ZQCBM; - } - - public void setZQCBM(String ZQCBM) { - this.ZQCBM = ZQCBM; - } - - public String getIsHigh() { - return isHigh; - } - - public void setIsHigh(String isHigh) { - this.isHigh = isHigh; - } } diff --git a/adc-da-search/src/main/java/com/adc/da/search/page/PartProductEOPage.java b/adc-da-search/src/main/java/com/adc/da/search/page/PartProductEOPage.java index d965d4a1..7aad57d3 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/page/PartProductEOPage.java +++ b/adc-da-search/src/main/java/com/adc/da/search/page/PartProductEOPage.java @@ -1,6 +1,6 @@ package com.adc.da.search.page; -import com.adc.da.sys.common.BasePage; +import com.adc.da.base.page.BasePage; import java.util.Date; 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 48384407..13bc2063 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 @@ -79,131 +79,31 @@ public class SearchCenterServiceImpl implements SearchCenterService { BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue()) && StringUtils.isBlank(searchInfoEO.getIsHigh())){ QueryBuilder multiQueryBuilder; + List strings=new ArrayList<>(); switch (searchInfoEO.getSelectIndex()){ case "stand": - multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - numbershowSplit,nameshowSplit,numbershowStr,nameshowStr,"numberExpNull","standSortShow","standstateshow","countryShow","standEnName", - "synopsis","baseSearchContent",content,"CYSDShow","CLLXShow","standstateshow","ZRLXShow","stand_name","stand_number","citeStand","DTBJH","FGXXSXXXShow","CBBH","YYBJ","XGLC","synopsis","isRelateAccess","GKDWShow","CYSDShow","FBJGShow","ZRLXShow","GXHBQShow","GZZXXName","YQLXShow","FGWHRName","ZRBMShow","XGBMShow","SVPPSName","FOShow","XMPGJSShow","BDTBZBH","BYYBJ","issue_time","ZCCSSRQ","XCXSSRQ","accessCountry").minimumShouldMatch("100%"); - boolQueryMust.must(multiQueryBuilder); - boolQueryShould.should(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(numbershowStr, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(numbershowSplit, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(nameshowSplit, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("CYSDShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("CLLXShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standstateshow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZRLXShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("stand_name", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("DTBJH", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("FGXXSXXXShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("CBBH", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("YYBJ", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XGLC", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("synopsis", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("isRelateAccess", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("GKDWShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("CYSDShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("FBJGShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZRLXShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("GXHBQShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("GZZXXName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("YQLXShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XCXSSRQ", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZCCSSRQ", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("EOPSSRQ", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("FGWHRName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZRBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XGBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("SVPPSName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("FOShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XMPGJSShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("accessCountry", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("content", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("BDTBZBH", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("BYYBJ", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("issue_time", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("stand_number", "*"+searchInfoEO.getSelectValue()+"*")); + strings=Arrays.asList(numbershowSplit, nameshowSplit, numbershowStr, nameshowStr, "numberExpNull", "standSortShow", "standstateshow", "countryShow", "standEnName", "synopsis", "baseSearchContent", content, "CYSDShow", "CLLXShow", "standstateshow", "ZRLXShow", "stand_name", "stand_number", "citeStand", "DTBJH", "FGXXSXXXShow", "CBBH", "YYBJ", "XGLC", "synopsis", "isRelateAccess", "GKDWShow", "CYSDShow", "FBJGShow", "ZRLXShow", "GXHBQShow", "GZZXXName", "YQLXShow", "FGWHRName", "ZRBMShow", "XGBMShow", "SVPPSName", "FOShow", "XMPGJSShow", "BDTBZBH", "BYYBJ", "issue_time", "ZCCSSRQ", "XCXSSRQ", "accessCountry"); break; case "laws": - multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - numbershowSplit,nameshowSplit,nameshowStr,numbershowStr,"numberExpNull","standstateshow","countryShow", "natureShow", "replace_laws_num", - "synopsis","standEnName",replacedStandNumStr,"baseSearchContent",content,"CYSDShow","SYCLLXShow","standstateshow","ZRLXShow","stand_number","isRelateAccess","YQLXShow","SYCLLXShow","GXHBQShow","ZCGCSShow","FBJGShow","SVPPSName","XGBMShow","ZRBMShow","FOShow","GKGLBMShow","WSSFCYShow","replaceLawsNum","replacedLawsNum","XMPGJSShow","issue_time","ZCCSSRQ","XCXSSRQ","EOPSSRQ","XGLC","accessCountry").minimumShouldMatch("100%"); - boolQueryMust.must(multiQueryBuilder); - boolQueryShould.should(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(numbershowStr, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(numbershowSplit, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(nameshowSplit, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(content, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("CYSDShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("SYCLLXShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("accessCountry", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standstateshow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZRLXShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("isRelateAccess", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("YQLXShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("SYCLLXShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("GXHBQShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XCXSSRQ", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZCCSSRQ", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("EOPSSRQ", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZCGCSShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("FBJGShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("SVPPSName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XGBMShow", "*"+searchInfoEO.getSelectValue()+"*")) -// .should(QueryBuilders.wildcardQuery("ZRBMName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZRBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("FOShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("GKGLBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("content", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("WSSFCYShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("replaceLawsNum", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("replacedLawsNum", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("issue_time", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XMPGJSShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XGLC", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("stand_number", "*"+searchInfoEO.getSelectValue()+"*")); + strings=Arrays.asList(numbershowSplit,nameshowSplit,nameshowStr,numbershowStr,"numberExpNull","standstateshow","countryShow", "natureShow", "replace_laws_num", + "synopsis","standEnName",replacedStandNumStr,"baseSearchContent",content,"CYSDShow","SYCLLXShow","standstateshow","ZRLXShow","stand_number","isRelateAccess","YQLXShow","SYCLLXShow","GXHBQShow","ZCGCSShow","FBJGShow","SVPPSName","XGBMShow","ZRBMShow","FOShow","GKGLBMShow","WSSFCYShow","replaceLawsNum","replacedLawsNum","XMPGJSShow","issue_time","ZCCSSRQ","XCXSSRQ","EOPSSRQ","XGLC","accessCountry"); break; case "bussstand": - multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - numbershowSplit,nameshowSplit,numbershowStr,nameshowStr,"numberExpNull","standstateshow", "standEnName",replaceStandNumStr, + strings=Arrays.asList(numbershowSplit,nameshowSplit,numbershowStr,nameshowStr,"numberExpNull","standstateshow", "standEnName",replaceStandNumStr, replacedStandNumStr,"countryShow","synopsis","standSortShow","ZQCBMShow","ZQCBM","stand_status", - "baseSearchContent",content,"numbershow","nameshow","standstateshow","issue_time","replaceStandNum","replacedStandNum","QBMJShow","QBSQShow","XHQBMShow","SVPPSName","XGBMName","ZYQCRShow","ZRBMShow","ZQCBMName","QTQCRShow","content","FSRQString","FZRQString","put_time","XGLC","WFSPJSName","GFXYYWJ").minimumShouldMatch("100%"); - boolQueryMust.must(multiQueryBuilder); - boolQueryShould.should(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(numbershowStr, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(numbershowSplit, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(nameshowSplit, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZQCBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standstateshow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZQCBM", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("stand_status", "*"+searchInfoEO.getSelectValue()+"*")) - - .should(QueryBuilders.wildcardQuery("numbershow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standEnName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("content", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("issue_time", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("nameshow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standstateshow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("replaceStandNum", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("replacedStandNum", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("QBMJShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("QBSQShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XHQBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("SVPPSName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XGBMName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZYQCRShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZRBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZQCBMName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("QTQCRShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("FSRQString", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("FZRQString", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XGLC", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("WFSPJSName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("GFXYYWJ", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("put_time", "*"+searchInfoEO.getSelectValue()+"*")); + "baseSearchContent",content,"numbershow","nameshow","standstateshow","issue_time","replaceStandNum","replacedStandNum","QBMJShow","QBSQShow","XHQBMShow","SVPPSName","XGBMName","ZYQCRShow","ZRBMShow","ZQCBMName","QTQCRShow","content","FSRQString","FZRQString","put_time","XGLC","WFSPJSName","GFXYYWJ"); break; default: break; } + + multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), strings.toArray(new String[0])).minimumShouldMatch("100%"); + boolQueryMust.must(multiQueryBuilder); + + for (String string : strings) { + boolQueryShould.should(QueryBuilders.wildcardQuery(string, "*"+searchInfoEO.getSelectValue()+"*")); + } + + } //在结果中检索 diff --git a/pom.xml b/pom.xml index 4bff73b3..f3befa7e 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ adc-da-base adc-da-sys adc-da-jwtLogin + adc-da-search adc-da-slrs adc-da-activiti