FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into FOTON

Browse Source
This commit is contained in:
zhangjun
2022-08-30 13:58:00 +08:00
parent ae466b86d7 3bff146fb4
commit e243dbb44f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+6 -5
View File
@@ -1610,11 +1610,12 @@ public class SearchCenterServiceImpl implements SearchCenterService {
// } // }
// } // }
boolQueryShould boolQueryShould
.should(QueryBuilders.wildcardQuery("sortTitle.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1005f)) .should(QueryBuilders.wildcardQuery("sortTitle.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1005f))
.should(QueryBuilders.termQuery("numberTitle", searchInfoEO.getSelectValue().toUpperCase()).boost(1004f)) //非 .keyword 无法查询出结果
.should(QueryBuilders.wildcardQuery("yearOrder.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f)) .should(QueryBuilders.wildcardQuery("numberTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1004f))
.should(QueryBuilders.wildcardQuery("nameTitle.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1002f)) .should(QueryBuilders.wildcardQuery("yearOrder.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1003f))
.should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)); .should(QueryBuilders.wildcardQuery("nameTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1002f))
.should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f));
// queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), // queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(),
// "sortTitle","numberTitle","yearOrder","nameTitle","title" // "sortTitle","numberTitle","yearOrder","nameTitle","title"
// ).field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f); // ).field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f);
adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java
+2 -2
View File
@@ -188,7 +188,7 @@ public class UpdateStateStandSyncFz implements Runnable {
QueryWrapper wrapperNotGB = new QueryWrapper(); QueryWrapper wrapperNotGB = new QueryWrapper();
wrapperNotGB.eq("VALID_FLAG","0"); wrapperNotGB.eq("VALID_FLAG","0");
wrapperNotGB.ne("STAND_SORT","GB"); wrapperNotGB.ne("STAND_SORT","GB");
wrapperNotGB.in("TEXT_STATUS",wrapperNotGB); wrapperNotGB.in("TEXT_STATUS",bdtStateList);
wrapperNotGB.in("trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-'," + wrapperNotGB.in("trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-'," +
"SAR_STANDARDS_INFO.STAND_YEAR),' ',''))",bdtList); "SAR_STANDARDS_INFO.STAND_YEAR),' ',''))",bdtList);
List<SarStandardsInfo> queryNotGBList = sarStandardsInfoDao.selectList(wrapperNotGB); List<SarStandardsInfo> queryNotGBList = sarStandardsInfoDao.selectList(wrapperNotGB);
@@ -232,11 +232,11 @@ public class UpdateStateStandSyncFz implements Runnable {
public void execStandDate(List<SarStandardsInfo> infoList, String textStatusStand) throws Exception { public void execStandDate(List<SarStandardsInfo> infoList, String textStatusStand) throws Exception {
List<SarStandardsInfo> list = new ArrayList<>(); List<SarStandardsInfo> list = new ArrayList<>();
for (SarStandardsInfo info : infoList) { for (SarStandardsInfo info : infoList) {
saveUpdateLog(info,textStatusStand);
info.setTextStatus(textStatusStand); info.setTextStatus(textStatusStand);
standFunc(info); standFunc(info);
createStandMQService.sendStandMQ(info,"update"); createStandMQService.sendStandMQ(info,"update");
saveUpdateLog(info,textStatusStand);
// 只批量更新文本字段 // 只批量更新文本字段
SarStandardsInfo newInfo = new SarStandardsInfo(); SarStandardsInfo newInfo = new SarStandardsInfo();
newInfo.setTextStatus(textStatusStand); newInfo.setTextStatus(textStatusStand);