Merge remote-tracking branch 'origin/develop_3' into develop_3

adc-da-convert/src/main/java/com/adc/da/convert/mq/SendConvertMQService.java

@@ -28,7 +28,7 @@ public class SendConvertMQService {
     private static final Logger logger = LoggerFactory.getLogger(SendConvertMQService.class);
 
         @RabbitListener(bindings = @QueueBinding(
-            value = @Queue(value = "createStandMQ_SQ_GSAR", durable = "true"),
+            value = @Queue(value = "createConvertStandMQ_SQ_GSAR", durable = "true"),
             exchange = @Exchange(value = "convert-exchange_SQ_GSAR", ignoreDeclarationExceptions = "true"),
             key = "convert-key_SQ_GSAR"))
     public void createMQ(AttFileEO attFileEO, Message message, Channel channel) throws Exception{

adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java

@@ -127,7 +127,9 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
         boolean isForeign = false;
         Map<String,Object> fullTextSearchEO = new HashMap<>();
         Map<String,String> mapItems = new TreeMap<>();
-        mapItems = net.sf.json.JSONObject.fromObject(attrInfoMap.get("mapItems").toString());
+        if(attrInfoMap.get("mapItems") != null){
+            mapItems = net.sf.json.JSONObject.fromObject(attrInfoMap.get("mapItems").toString());
+        }
         fullTextSearchEO.put("id",String.valueOf(attrInfoMap.get("id")));
         if ("FOREIGN".equals(String.valueOf(attrInfoMap.get("standType")))){
             fullTextSearchEO.put("indexType",String.valueOf(attrInfoMap.get("standType")));

adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java

@@ -180,10 +180,12 @@ public class SendStandMQService {
         // 动态存储属性字段
         for (String field : fieldInfoList) {
             saveMap.put(field,attrInfoMap.getOrDefault(field,""));
-            Object json= new JSONTokener(infoMap.get(field).toString()).nextValue();
             String fieldValue = "";
-            if(!json.toString().equals("null")){
+            if(infoMap.get(field) != null && StringUtils.isNotBlank(infoMap.get(field).toString())){
-                fieldValue = infoMap.get(field).toString();
+                Object json= new JSONTokener(infoMap.get(field).toString()).nextValue();
+                if(!json.toString().equals("null")){
+                    fieldValue = infoMap.get(field).toString();
+                }
             }
             saveMap.put(field+"Name",fieldValue);
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -68,6 +68,7 @@ import org.apache.poi.hwpf.extractor.WordExtractor;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.json.JSONTokener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -387,13 +388,19 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
-    public void attrInfoSearchDetails(SarStandardsInfo row) throws Exception {
+    public void attrInfoSearchDetails(SarStandardsInfo row,String type) throws Exception {
         String fieldInfo = InitStandAttrUtil.queryField;
         String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
         row.setCollectId(collectId);
         // 查询属性表数据
         if (StringUtils.isNotBlank(fieldInfo)) {
-            Map<String, Object> getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
+            Map<String, Object> getAttrMap = new TreeMap<>();
+            if(type.equals("add")){
+                String sarStandAttrEOStr = row.getSarStandAttrEOStr();
+                getAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
+            }else {
+                getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
+            }
             if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) {
                 // 遍历修改所有clob类型的值
                 for (String clobField : InitStandAttrUtil.clobFieldList) {
@@ -457,18 +464,28 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
-    public void attrInfoShowSearchDetails(SarStandardsInfo row) throws Exception {
+    public void attrInfoShowSearchDetails(SarStandardsInfo row,String type) throws Exception {
         if (row != null) {
-            attrInfoSearchDetails(row);
+            attrInfoSearchDetails(row,type);
             Map<String, Object> getAttrMap = row.getAttrInfoMap();
             if (getAttrMap != null && getAttrMap.size() > 0) {
                 for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
                     String name = entry.getKey();
                     String value = "";
+                    List<String> valArr = new ArrayList<>();
                     if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
-                        value = entry.getValue().toString();
+                        if(StringUtils.isNotBlank(entry.getValue().toString())){
-                        List<String> valArr = Arrays.asList(value.split(","));
+                            Object json= new JSONTokener(entry.getValue().toString()).nextValue();
-                        value = dicTypeEODao.getDicNamesByCodes(valArr);
+                            if(json instanceof org.json.JSONArray){
+                                valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(),String.class);
+                            }else {
+                                value = entry.getValue().toString();
+                                valArr = Arrays.asList(value.split(","));
+                            }
+                            if(!valArr.isEmpty()){
+                                value = dicTypeEODao.getDicNamesByCodes(valArr);
+                            }
+                        }
                         entry.setValue(value);
                     }
                 }
@@ -576,10 +593,20 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
             String content = "新增" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
             sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
-//            if(elasflag) {
+            if(elasflag) {
-//                // 消息队列
+                // 消息队列
-//                createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
+                attrInfoShowSearchDetails(sarStandardsInfoEO,"add");
-//            }
+                FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO();
+                pageInfo.setStandId(sarStandardsInfoEO.getId());
+                pageInfo.setFileType("FBGBJBD");
+                List<SarItemVO> sarItemVOS = standItemsDao.querySarItemAndInterpretation(pageInfo);
+                if(!sarItemVOS.isEmpty()){
+                    Map<String,String> collectMap = sarItemVOS.stream().filter((e) -> e.getItemsNum() != null && e.getItemsName() != null)
+                            .collect(Collectors.toMap(SarItemVO::getItemsNum, SarItemVO::getItemsName));
+                    sarStandardsInfoEO.setMapItems(collectMap);
+                }
+                createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
+            }
         }
     }
 
@@ -1148,7 +1175,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         // 记录修改日志
         saveUpdateLog(sarStandardsInfoEO, beforeSarStandardsInfo);
         if(elasflag) { //what?
-            attrInfoShowSearchDetails(sarStandardsInfoEO);
+            attrInfoShowSearchDetails(sarStandardsInfoEO,"upd");
             FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO();
             pageInfo.setStandId(sarStandardsInfoEO.getId());
             pageInfo.setFileType("FBGBJBD");