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 develop_master

Browse Source
This commit is contained in:
yuezhihang
2022-05-07 16:29:26 +08:00
parent e01952afc2 5cb0f2990d
commit adce797902
6 changed files with 30 additions and 10 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/StandLawsSearchServiceImpl.java
+3 -3
View File
@@ -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(" ");
adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java
+9 -2
View File
@@ -186,8 +186,15 @@ 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();
}
}
if(fieldValue.contains("null")){
fieldValue = fieldValue.replace("null","");
}
}
saveMap.put(field+"Name",fieldValue);
adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java
+9 -2
View File
@@ -232,8 +232,15 @@ 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();
}
}
if(fieldValue.contains("null")){
fieldValue = fieldValue.replace("null","");
}
}
saveMap.put(field+"Name",fieldValue);
adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java
+5 -2
View File
@@ -187,12 +187,15 @@ 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();
}
}
if(fieldValue.contains("null")){
fieldValue = fieldValue.replace("null","");
}
}
saveMap.put(field+"Name",fieldValue);
}catch (Exception e){
adc-da-slrs/src/main/java/com/adc/da/slrs/regulations/service/impl/StandDataServiceImpl.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class StandDataServiceImpl extends ServiceImpl<StandDataDao, StandData> 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());
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+3
View File
@@ -3014,6 +3014,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
for (int i = 0; i < attidlist.length; i++) {
if (StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i]) && (attidlist[i].contains("att_file") || attidlist[i].contains("ATT_FILE"))) {
AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i].trim());
if (null == attFileEO) {
continue;
}
String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
// String readFilePath = "E:\\上汽企标流程总览.pdf";
try {