bug: 搜索中心排序修改

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());
 

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<DicTypeEO> dicInfo = dicTypeEODao.getDicInfo("dic_id","dic_type_code", "dic_type_name","show_index");

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()){

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<String> fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());