feat: There is no way the, 优化ES
This commit is contained in:
@@ -186,8 +186,12 @@ public class SendBussMQService {
|
|||||||
String fieldFilter = field.toLowerCase();
|
String fieldFilter = field.toLowerCase();
|
||||||
if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){
|
if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){
|
||||||
Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue();
|
Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue();
|
||||||
if(!json.toString().equals("null")){
|
if(json instanceof org.json.JSONArray){
|
||||||
fieldValue = infoMap.get(fieldFilter).toString();
|
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);
|
saveMap.put(field+"Name",fieldValue);
|
||||||
|
|||||||
@@ -232,8 +232,12 @@ public class SendLawsMQService {
|
|||||||
String fieldFilter = field.toLowerCase();
|
String fieldFilter = field.toLowerCase();
|
||||||
if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){
|
if(infoMap.get(fieldFilter) != null && StringUtils.isNotBlank(infoMap.get(fieldFilter).toString())){
|
||||||
Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue();
|
Object json= new JSONTokener(infoMap.get(fieldFilter).toString()).nextValue();
|
||||||
if(!json.toString().equals("null")){
|
if(json instanceof org.json.JSONArray){
|
||||||
fieldValue = infoMap.get(fieldFilter).toString();
|
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);
|
saveMap.put(field+"Name",fieldValue);
|
||||||
|
|||||||
@@ -187,10 +187,10 @@ public class SendStandMQService {
|
|||||||
if(infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())){
|
if(infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())){
|
||||||
Object json= new JSONTokener(infoMap.get(field).toString()).nextValue();
|
Object json= new JSONTokener(infoMap.get(field).toString()).nextValue();
|
||||||
if(json instanceof org.json.JSONArray){
|
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 {
|
}else {
|
||||||
if(!("null").equals(json)){
|
if(!("null").equals(json)){
|
||||||
fieldValue = standMap.get(field).toString();
|
fieldValue = infoMap.get(field).toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
@@ -3014,6 +3014,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
|
|||||||
for (int i = 0; i < attidlist.length; i++) {
|
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"))) {
|
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());
|
AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i].trim());
|
||||||
|
if (null == attFileEO) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
|
String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
|
||||||
// String readFilePath = "E:\\上汽企标流程总览.pdf";
|
// String readFilePath = "E:\\上汽企标流程总览.pdf";
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user