Merge branch 'dev_20210617_xxy_tag' into dev_20210330

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsTagServiceImpl.java

@@ -49,6 +49,7 @@ public class AgmsTagServiceImpl implements AgmsTagService {
         }
         commonResult.setSuccess(true);
         commonResult.setMessage(ZHBErrorConfig.getErrorInfo("800000"));
+        responseVO.setId(mdTagNew.getId());
         responseVO.setCommonResult(commonResult);
         return responseVO;
     }

yd-api/src/main/java/com/yd/api/agms/vo/tag/TagUpdateResponseVO.java

@@ -8,6 +8,8 @@ import com.yd.api.result.CommonResult;
  */
 public class TagUpdateResponseVO {
 
+    private Long id;
+
     private CommonResult commonResult;
 
     /**
@@ -28,10 +30,29 @@ public class TagUpdateResponseVO {
         this.commonResult = commonResult;
     }
 
+    /**
+     * Gets the value of id. *
+     *
+     * @return the value of id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * Sets the id. *
+     * <p>You can use getId() to get the value of id</p>
+     * * @param id id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     @Override
     public String toString() {
         return "TagUpdateResponseVO{" +
-                "commonResult=" + commonResult +
+                "id=" + id +
+                ", commonResult=" + commonResult +
                 '}';
     }
 }

yd-api/src/main/java/com/yd/api/metadata/service/impl/MetadataServiceImpl.java

@@ -44,7 +44,7 @@ public class MetadataServiceImpl implements MetadataService {
         BeanPropertyValueEqualsPredicate predicateClause = new BeanPropertyValueEqualsPredicate( "configLevel", 1L);
         List<MdTagNew> objectListSelect= (List<MdTagNew>) CollectionUtils.select(mdTagNewList, predicateClause);
         mdTagNewAddList.addAll(objectListSelect);
-        classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,objectListSelect,predicateClause,tagQueryInfos);
+        classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,objectListSelect,tagQueryInfos);
 
         mdTagNewList.removeAll(mdTagNewAddList);
         uncategorizedMdTag(mdTagNewList,tagQueryInfos);
@@ -58,7 +58,6 @@ public class MetadataServiceImpl implements MetadataService {
     private void classificationBuildUpMdTag(List<MdTagNew> mdTagNewList,
                                             List<MdTagNew> mdTagNewAddList,
                                             List<MdTagNew> objectListSelect,
-                                            BeanPropertyValueEqualsPredicate predicateClause,
                                             List<TagQueryInfo> tagQueryInfos) {
         for (MdTagNew mdTagNew : objectListSelect) {
             Long id = mdTagNew.getId();
@@ -66,7 +65,7 @@ public class MetadataServiceImpl implements MetadataService {
             BeanUtils.copyProperties(mdTagNew,tagQueryInfo);
             tagQueryInfo.setCreatedAt(CommonUtil.dateParseString(mdTagNew.getCreatedAt(),"yyyy-MM-dd HH:mm:ss"));
             tagQueryInfo.setUpdatedAt(CommonUtil.dateParseString(mdTagNew.getUpdatedAt(),"yyyy-MM-dd HH:mm:ss"));
-            predicateClause = new BeanPropertyValueEqualsPredicate( "upperTagId", id);
+            BeanPropertyValueEqualsPredicate predicateClause = new BeanPropertyValueEqualsPredicate( "upperTagId", id);
             List<MdTagNew> mdTagNewListSelect= (List<MdTagNew>) CollectionUtils.select(mdTagNewList, predicateClause);
             if (mdTagNewListSelect.isEmpty()){
                 tagQueryInfos.add(tagQueryInfo);
@@ -74,7 +73,7 @@ public class MetadataServiceImpl implements MetadataService {
             }
             mdTagNewAddList.addAll(mdTagNewListSelect);
             List<TagQueryInfo> tagQueryInfoList = new ArrayList<>(16);
-            classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,mdTagNewListSelect,predicateClause,tagQueryInfoList);
+            classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,mdTagNewListSelect,tagQueryInfoList);
             tagQueryInfo.setTagQueryInfos(tagQueryInfoList);
             tagQueryInfos.add(tagQueryInfo);
         }