From 2b1178e2894bb445f9cd5b03e51be8ddc28714a2 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 5 May 2022 17:00:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/mq/SendBussMQService.java | 8 ++++++-- .../src/main/java/com/adc/da/mq/SendLawsMQService.java | 8 ++++++-- .../src/main/java/com/adc/da/mq/SendStandMQService.java | 4 ++-- .../service/impl/SarStandardsInfoServiceImpl.java | 3 +++ 4 files changed, 17 insertions(+), 6 deletions(-) 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 5ca1d5ef..7ebeed33 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 @@ -186,8 +186,12 @@ public class SendBussMQService { String fieldFilter = field.toLowerCase(); if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){ Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue(); - if(!json.toString().equals("null")){ - fieldValue = infoMap.get(fieldFilter).toString(); + if(json instanceof org.json.JSONArray){ + fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(infoMap.get(fieldFilter).toString(),String.class)); + }else { + if(!("null").equals(json)){ + fieldValue = infoMap.get(fieldFilter).toString(); + } } } saveMap.put(field+"Name",fieldValue); 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 c81169d4..f7190b42 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 @@ -232,8 +232,12 @@ public class SendLawsMQService { String fieldFilter = field.toLowerCase(); if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){ Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue(); - if(!json.toString().equals("null")){ - fieldValue = infoMap.get(fieldFilter).toString(); + if(json instanceof org.json.JSONArray){ + fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(infoMap.get(fieldFilter).toString(),String.class)); + }else { + if(!("null").equals(json)){ + fieldValue = infoMap.get(fieldFilter).toString(); + } } } saveMap.put(field+"Name",fieldValue); 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 9bcc232a..19f86cb3 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 @@ -187,10 +187,10 @@ public class SendStandMQService { if(infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())){ Object json= new JSONTokener(infoMap.get(field).toString()).nextValue(); if(json instanceof org.json.JSONArray){ - fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(standMap.get(field).toString(),String.class)); + fieldValue = String.join(",", com.alibaba.fastjson.JSONObject.parseArray(infoMap.get(field).toString(),String.class)); }else { if(!("null").equals(json)){ - fieldValue = standMap.get(field).toString(); + fieldValue = infoMap.get(field).toString(); } } } 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 f28db1f3..f605e2b0 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 @@ -3014,6 +3014,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Thu, 5 May 2022 17:33:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96ES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java | 3 +++ adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java | 3 +++ .../src/main/java/com/adc/da/mq/SendStandMQService.java | 3 +++ 3 files changed, 9 insertions(+) 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 7ebeed33..f58df196 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 @@ -193,6 +193,9 @@ public class SendBussMQService { fieldValue = infoMap.get(fieldFilter).toString(); } } + if(fieldValue.contains("null")){ + fieldValue = fieldValue.replace("null",""); + } } saveMap.put(field+"Name",fieldValue); } 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 f7190b42..c531aacf 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 @@ -239,6 +239,9 @@ public class SendLawsMQService { fieldValue = infoMap.get(fieldFilter).toString(); } } + if(fieldValue.contains("null")){ + fieldValue = fieldValue.replace("null",""); + } } saveMap.put(field+"Name",fieldValue); } 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 19f86cb3..68f57ed3 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 @@ -193,6 +193,9 @@ public class SendStandMQService { fieldValue = infoMap.get(field).toString(); } } + if(fieldValue.contains("null")){ + fieldValue = fieldValue.replace("null",""); + } } saveMap.put(field+"Name",fieldValue); }catch (Exception e){ From 4347f9d2090ccb91d32ee37f92c8f76558d44103 Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Fri, 6 May 2022 14:55:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update:awc=E5=AF=B9=E6=8E=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=AE=BF=E9=97=AE=E9=93=BE=E6=8E=A5=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/regulations/service/impl/StandDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java index a07b2742..9a892684 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java @@ -42,7 +42,7 @@ public class StandDataServiceImpl extends ServiceImpl i standDataQuery.stream().peek(standData -> { FileResult fileResult = new FileResult(); fileResult.setDocumentName(verifyObj(standData.getStandSort(),standData.getStandNumber(),standData.getStandName())); - fileResult.setDocumentUrl(webUrl+"?userName="+encode(searchStandContext.getUserName())+"&dataId="+standData.getStandId()+"&datatype="+standData.getStandType()); + fileResult.setDocumentUrl(webUrl+"?dataId="+standData.getStandId()+"&datatype="+standData.getStandType()); fileResultList.add(fileResult); }).collect(Collectors.toList()); } From 5cb0f2990dfaf3fc7d116771a54498580d9c8231 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 6 May 2022 21:16:52 +0800 Subject: [PATCH 4/4] feat: There is no way the,not null --- .../da/search/service/impl/StandLawsSearchServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index c6aa555f..99d10e56 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -139,7 +139,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { } if("stand".equals(attrInfoMap.get("type"))){ // 标准全文 - fullTextSearchEO.put("title",attrInfoMap.get("numbershow")+" "+attrInfoMap.get("nameshow")); + fullTextSearchEO.put("title",attrInfoMap.get("numbershow")+" "+attrInfoMap.getOrDefault("nameshow","")); for (String key : attrInfoMap.keySet()) { if (null == attrInfoMap.get(key) || "".equals(attrInfoMap.get(key))){ @@ -253,7 +253,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { attrInfoMap.put(key, "null"); } } - fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+" "+attrInfoMap.get("lawsNumber")+" "+attrInfoMap.get("lawsName")); + fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+" "+attrInfoMap.getOrDefault("lawsNumber","")+" "+attrInfoMap.getOrDefault("lawsName","")); StringBuilder contentBuilder = new StringBuilder(); contentBuilder.append("政策分类: ").append(attrInfoMap.get("lawsTypeName")).append(" "); contentBuilder.append("政策编号: ").append(attrInfoMap.get("lawsNumber")).append(" "); @@ -321,7 +321,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { attrInfoMap.put(key, "null"); } } - fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+" "+attrInfoMap.get("stand_name")); + fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+" "+attrInfoMap.getOrDefault("stand_name","")); StringBuilder contentBuilder = new StringBuilder(); contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" ");