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 ac066a0d..05b5f948 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 @@ -1411,7 +1411,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { // .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("standTypeOrder",SortOrder.ASC) .addSort("standSortOrder",SortOrder.ASC) - .addSort("numberTitle",SortOrder.ASC) + .addSort("numberTitle.keyword",SortOrder.ASC) .addSort("yearOrder",SortOrder.DESC) .addSort("sortTitle.keyword",SortOrder.ASC) .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize()) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java index 20a9e073..bdcce2e5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java @@ -14,6 +14,7 @@ import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.Utils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -179,7 +180,10 @@ public class UpdateStateBussSyncFz implements Runnable { List valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { if(org.apache.commons.lang.StringUtils.isNotBlank(entry.getValue().toString())){ - Object json= new JSONTokener(entry.getValue().toString()).nextValue(); + Object json = null; + if(Utils.isJson(entry.getValue().toString())){ + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } if(json instanceof org.json.JSONArray){ valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class); }else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncSsAndYx.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncSsAndYx.java index 4defb29c..4e92432d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncSsAndYx.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncSsAndYx.java @@ -14,6 +14,7 @@ import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.Utils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -204,7 +205,10 @@ public class UpdateStateBussSyncSsAndYx implements Runnable { List valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { if(org.apache.commons.lang.StringUtils.isNotBlank(entry.getValue().toString())){ - Object json= new JSONTokener(entry.getValue().toString()).nextValue(); + Object json = null; + if(Utils.isJson(entry.getValue().toString())){ + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } if(json instanceof org.json.JSONArray){ valArr = JSONObject.parseArray(entry.getValue().toString(),String.class); }else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java index 36555485..74d8cf18 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java @@ -16,6 +16,7 @@ import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.Utils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -289,7 +290,10 @@ public class UpdateStateStandSyncFz implements Runnable { List valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { if (StringUtils.isNotBlank(entry.getValue().toString())) { - Object json = new JSONTokener(entry.getValue().toString()).nextValue(); + Object json = null; + if(Utils.isJson(entry.getValue().toString())){ + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } if (json instanceof org.json.JSONArray) { valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncSsAndYx.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncSsAndYx.java index 72a8afec..4721244c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncSsAndYx.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncSsAndYx.java @@ -16,6 +16,7 @@ import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.Utils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; @@ -238,7 +239,10 @@ public class UpdateStateStandSyncSsAndYx implements Runnable { List valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { if (StringUtils.isNotBlank(entry.getValue().toString())) { - Object json = new JSONTokener(entry.getValue().toString()).nextValue(); + Object json = null; + if(Utils.isJson(entry.getValue().toString())){ + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } if (json instanceof org.json.JSONArray) { valArr = JSONObject.parseArray(entry.getValue().toString(), String.class); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index 6e75567b..ce54fe20 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -31,8 +31,10 @@ import com.adc.da.util.http.Result; import com.adc.da.utils.util.DateUtil; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.Utils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.elasticsearch.client.transport.TransportClient; import org.json.JSONTokener; @@ -504,7 +506,10 @@ public class ResetSearchCenterService { List valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { if (StringUtils.isNotBlank(entry.getValue().toString())) { - Object json = new JSONTokener(entry.getValue().toString()).nextValue(); + Object json = null; + if(Utils.isJson(entry.getValue().toString())){ + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } if (json instanceof org.json.JSONArray) { valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class); } else { @@ -825,7 +830,10 @@ public class ResetSearchCenterService { List valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) { if(org.apache.commons.lang.StringUtils.isNotBlank(entry.getValue().toString())){ - Object json= new JSONTokener(entry.getValue().toString()).nextValue(); + Object json = null; + if(Utils.isJson(entry.getValue().toString())){ + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } if(json instanceof org.json.JSONArray){ valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class); }else { @@ -1071,7 +1079,10 @@ public class ResetSearchCenterService { List valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { if(org.apache.commons.lang.StringUtils.isNotBlank(entry.getValue().toString())){ - Object json= new JSONTokener(entry.getValue().toString()).nextValue(); + Object json = null; + if(Utils.isJson(entry.getValue().toString())){ + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } if(json instanceof org.json.JSONArray){ valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class); }else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index fdd6f412..5db4e83d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -54,6 +54,7 @@ import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; import com.adc.da.utils.util.SarAdvanceSearchUtil; +import com.adc.da.utils.util.Utils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; @@ -1466,7 +1467,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { if(StringUtils.isNotBlank(entry.getValue().toString())){ - Object json= new JSONTokener(entry.getValue().toString()).nextValue(); + Object json = null; + if(Utils.isJson(entry.getValue().toString())){ + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } if(json instanceof org.json.JSONArray){ valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class); }else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java index ddd92ac9..c3435ac4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java @@ -58,6 +58,7 @@ import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; import com.adc.da.utils.util.SarAdvanceSearchUtil; +import com.adc.da.utils.util.Utils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; @@ -769,7 +770,10 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) { if(StringUtils.isNotBlank(entry.getValue().toString())){ - Object json= new JSONTokener(entry.getValue().toString()).nextValue(); + Object json = null; + if(Utils.isJson(entry.getValue().toString())){ + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } if(json instanceof org.json.JSONArray){ valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class); }else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 6c6aa130..75f2d18f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1025,7 +1025,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl valArr = new ArrayList<>(); if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { if (StringUtils.isNotBlank(entry.getValue().toString())) { - Object json = new JSONTokener(entry.getValue().toString()).nextValue(); + Object json = null; + if(Utils.isJson(entry.getValue().toString())){ + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } if (json instanceof JSONArray) { valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java index f43dfae9..7ec77930 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/Utils.java @@ -1,5 +1,6 @@ package com.adc.da.utils.util; +import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; @@ -18,6 +19,16 @@ public class Utils { return MessageFormat.format(value, paras); } + + public static boolean isJson(String string) { + try { + JSONObject.parseObject(string); + return true; + } catch (Exception e) { + return false; + } + } + //判断row是否为空 空返回true public static boolean isRowEmpty(Row row) { if (null == row) {