From ec72e577f4c26d91bf595115d0a7c2a543bc9ff7 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 13 Nov 2023 09:08:40 +0800 Subject: [PATCH] =?UTF-8?q?bug:=20=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SearchCenterServiceImpl.java | 45 ++++++++++--------- .../java/com/adc/da/mq/SendBussMQService.java | 1 + .../java/com/adc/da/mq/SendLawsMQService.java | 11 ++++- .../com/adc/da/mq/SendStandMQService.java | 2 + 4 files changed, 35 insertions(+), 24 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 d5a11fb7..2eb08f2d 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 @@ -241,25 +241,25 @@ public class SearchCenterServiceImpl implements SearchCenterService { sortField2 = "standYear"; sortField3 = "standSort.keyword"; } -// if("laws".equals(searchInfoEO.getSelectIndex())){ -// sortField1 = "lawsNumber"; -// sortField2 = "lawsYear"; -// sortField3 = "lawsType.keyword"; -// } else if("bussstand".equals(searchInfoEO.getSelectIndex())) { -// sortField1 = "putTime"; -// sortField2 = "standNumber"; -// sortField3 = "standYear"; -// sortField4 = "standSort.keyword"; -// } else if ("stand".equals(searchInfoEO.getSelectIndex())) { -// sortField1 = "SSRQ"; -// sortField2 = "standNumber"; -// sortField3 = "standYear"; -// sortField4 = "standSort.keyword"; -// } else { -// sortField1 = "standNumber"; -// sortField2 = "standYear"; -// sortField3 = "standSort.keyword"; -// } + if("laws".equals(searchInfoEO.getSelectIndex())){ + sortField1 = "lawsNumber"; + sortField2 = "lawsYear"; + sortField3 = "lawsType.keyword"; + } else if("bussstand".equals(searchInfoEO.getSelectIndex())) { + sortField1 = "put_time_data"; + sortField2 = "standNumber"; + sortField3 = "standYear"; + sortField4 = "standSort.keyword"; + } else if ("stand".equals(searchInfoEO.getSelectIndex())) { + sortField1 = "SSRQName"; + sortField2 = "standNumber"; + sortField3 = "standYear"; + sortField4 = "standSort.keyword"; + } else { + sortField1 = "standNumber"; + sortField2 = "standYear"; + sortField3 = "standSort.keyword"; + } // 国内海外查询标准体系字段由id变为文字 // if (StringUtils.isNotBlank(searchInfoEO.getStandSystem())) { @@ -307,10 +307,11 @@ public class SearchCenterServiceImpl implements SearchCenterService { searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) + .addSort(sortField1, SortOrder.DESC) .addSort("standSortOrder", SortOrder.ASC) - .addSort(sortField1, SortOrder.ASC) - .addSort(sortField2, SortOrder.DESC) - .addSort(sortField3, SortOrder.ASC) + .addSort(sortField2, SortOrder.ASC) + .addSort(sortField3, SortOrder.DESC) + .addSort(sortField4, SortOrder.ASC) .addSort("issue_time_data", SortOrder.DESC) .setSize(searchInfoEO.getPageSize()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index c3321cf7..c2ee042c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -121,6 +121,7 @@ public class SendBussMQService { }else{ saveMap.put("put_time_data",-1000000000000000000L); } + saveMap.put("warehousingTime",sdf.format(infoEO.getCreationTime())); // 入库时间 //查询字典表,形成Hash映射提升速度 List dicInfo = dicTypeEODao.getDicInfo("dic_id","dic_type_code", "dic_type_name","show_index"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java index 18937562..f357daad 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java @@ -243,7 +243,9 @@ public class SendLawsMQService { // 动态存储属性字段 for (String field : fieldInfoList) { - saveMap.put(field,attrInfoMap.getOrDefault(field,"")); + Object fieldValueObj = attrInfoMap.getOrDefault(field,""); + saveMap.put(field,fieldValueObj); + String fieldValue = ""; String fieldFilter = field.toLowerCase(); if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){ @@ -259,7 +261,12 @@ public class SendLawsMQService { fieldValue = fieldValue.replace("null",""); } } - saveMap.put(field+"Name",fieldValue); + if("SSRQ".equals(field)){ + saveMap.put(field+"Name",fieldValue.replace(" ","").replace("-","")); + }else{ + saveMap.put(field+"Name",fieldValue); + + } } if(infoEOMapItems != null && !infoEOMapItems.isEmpty()){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 8c881c6c..197d402b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -194,6 +194,8 @@ public class SendStandMQService { saveMap.put("validFlag","0"); saveMap.put("content",infoEO.getFileIds()); saveMap.put("CHJL",infoEO.getCHJL()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + saveMap.put("warehousingTime",sdf.format(infoEO.getCreationTime())); // 入库时间 String fieldInfo = InitStandAttrUtil.queryField; List fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());