标签库新增根据标签ID查询标签信息

fed83b06 · wenyang · 8395e03e · fed83b06 · fed83b06 · fed83b06
Commit fed83b06 authored Jul 13, 2021 by wenyang
15 changed files
--- a/yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsTagServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsTagServiceImpl.java
@@ -3,6 +3,7 @@ package com.yd.api.agms.service.impl;
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
+import java.util.List;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +57,17 @@ public class AgmsTagServiceImpl implements AgmsTagService {
            return responseVO;
        }
+        if(!CommonUtil.isNullOrZero(requestVO.getConfigLevel()) && "1".equals(requestVO.getConfigLevel().toString()) 
+        		&& !CommonUtil.isNullOrZero(requestVO.getTagType())){
+        	List<MdTagNew> mdTagNewList= mdTagNewDALService.selectByConfigLevelAndtagType(requestVO.getConfigLevel(), requestVO.getTagType());
+        	if(mdTagNewList != null && mdTagNewList.size() > 0){
+                commonResult.setSuccess(false);
+                commonResult.setMessage(ZHBErrorConfig.getErrorInfo("830037"));
+                responseVO.setCommonResult(commonResult);
+                return responseVO;
+        	}
+        }
        MdTagNew mdTagNew = new MdTagNew();
        BeanUtils.copyProperties(requestVO,mdTagNew);
        if (CommonUtil.isNullOrZero(requestVO.getId())){

--- a/yd-api/src/main/java/com/yd/api/metadata/MetadataController.java
+++ b/yd-api/src/main/java/com/yd/api/metadata/MetadataController.java
@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.yd.api.metadata.service.MetadataService;
+import com.yd.api.metadata.vo.TagQueryBYIDRequestVO;
 import com.yd.api.metadata.vo.TagQueryRequestVO;
 import com.yd.api.metadata.vo.TagQueryResponseVO;
 import com.yd.api.metadata.vo.TagViewQueryRequestVO;
@@ -38,6 +39,20 @@ public class MetadataController {
    }
    /**
+     * 根据标签ID查询标签信息
+     * @param requestVO
+     * @return TagQueryBYIDRequestVO
+     */
+    @RequestMapping("/tagQueryById")
+    public Object tagQueryById(@RequestBody TagQueryBYIDRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        TagQueryResponseVO responseVO = metadataService.tagQueryBYIDRequestVO(requestVO);
+        result.setData(responseVO);
+        result.addResult(responseVO);
+        return result;
+    }
+    /**
     * 前端显示标签合集查询
     * @param requestVO
     * @return TagViewQueryResponseVO

--- a/yd-api/src/main/java/com/yd/api/metadata/service/MetadataService.java
+++ b/yd-api/src/main/java/com/yd/api/metadata/service/MetadataService.java
 package com.yd.api.metadata.service;
+import com.yd.api.metadata.vo.TagQueryBYIDRequestVO;
 import com.yd.api.metadata.vo.TagQueryRequestVO;
 import com.yd.api.metadata.vo.TagQueryResponseVO;
 import com.yd.api.metadata.vo.TagViewQueryRequestVO;
@@ -14,6 +15,13 @@ public interface MetadataService {
    TagQueryResponseVO tagQuery(TagQueryRequestVO requestVO);
    /**
+     * 根据标签ID查询标签信息
+     * @param requestVO
+     * @return TagQueryBYIDRequestVO
+     */
+    TagQueryResponseVO tagQueryBYIDRequestVO(TagQueryBYIDRequestVO requestVO);
+    /**
     * 前端显示标签合集查询
     * @param TagViewQueryRequestVO requestVO
     * @return TagViewQueryResponseVO

--- a/yd-api/src/main/java/com/yd/api/metadata/service/impl/MetadataServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/metadata/service/impl/MetadataServiceImpl.java
@@ -2,7 +2,9 @@ package com.yd.api.metadata.service.impl;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate;
 import org.apache.commons.collections.CollectionUtils;
@@ -12,6 +14,7 @@ import org.springframework.stereotype.Service;
 import com.github.pagehelper.PageHelper;
 import com.yd.api.metadata.service.MetadataService;
+import com.yd.api.metadata.vo.TagQueryBYIDRequestVO;
 import com.yd.api.metadata.vo.TagQueryInfo;
 import com.yd.api.metadata.vo.TagQueryRequestVO;
 import com.yd.api.metadata.vo.TagQueryResponseVO;
@@ -21,9 +24,11 @@ import com.yd.api.metadata.vo.TagViewQueryResponseVO;
 import com.yd.api.result.CommonResult;
 import com.yd.dal.entity.meta.MdTagNew;
 import com.yd.dal.entity.meta.MdTagView;
+import com.yd.dal.entity.user.AclUser;
 import com.yd.dal.service.meta.MdTagNewDALService;
 import com.yd.dal.service.meta.MdTagViewDALService;
 import com.yd.dal.service.metadata.MetadataDALService;
+import com.yd.dal.service.user.AclUserDALService;
 import com.yd.util.CommonUtil;
 import com.yd.util.config.ZHBErrorConfig;
@@ -43,6 +48,8 @@ public class MetadataServiceImpl implements MetadataService {
    @Autowired
    public MdTagViewDALService mdTagViewDALService;
+    @Autowired
+    public AclUserDALService aclUserService;
    @Override
    @SuppressWarnings("unchecked")
@@ -90,12 +97,13 @@ public class MetadataServiceImpl implements MetadataService {
            	configLevel = 1L;
        	}
        }
+        Map<Long,String> userMap = getUserMap();
        if(isActive == null || isActive == 1L || (configLevel != null || upperTagId != null || !CommonUtil.isNullOrBlank(requestVO.getTagName()))){
            List<MdTagNew> mdTagNewAddList = new ArrayList<>(16);
 	        BeanPropertyValueEqualsPredicate predicateClause = new BeanPropertyValueEqualsPredicate( "configLevel", configLevel);
 	        List<MdTagNew> objectListSelect= (List<MdTagNew>) CollectionUtils.select(mdTagNewList, predicateClause);
 	        mdTagNewAddList.addAll(objectListSelect);
-	        classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,objectListSelect,tagQueryInfos);
+	        classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,objectListSelect,tagQueryInfos,userMap);
 	        mdTagNewList.removeAll(mdTagNewAddList);
 //	        uncategorizedMdTag(mdTagNewList,tagQueryInfos);
@@ -104,7 +112,11 @@ public class MetadataServiceImpl implements MetadataService {
 	            TagQueryInfo tagQueryInfo = new TagQueryInfo();
 	            BeanUtils.copyProperties(mdTagNew,tagQueryInfo);
 	            tagQueryInfo.setCreatedAt(CommonUtil.dateParseString(mdTagNew.getCreatedAt(),"yyyy-MM-dd HH:mm:ss"));
+	            tagQueryInfo.setCreatedBy(userMap.get(mdTagNew.getCreatedBy()));
+                if(mdTagNew.getCreatedBy() != null){
+                	tagQueryInfo.setUpdatedBy(userMap.get(mdTagNew.getCreatedBy()));
                	tagQueryInfo.setUpdatedAt(CommonUtil.dateParseString(mdTagNew.getUpdatedAt(),"yyyy-MM-dd HH:mm:ss"));
+                }
 	            tagQueryInfos.add(tagQueryInfo);
 	        }
        }
@@ -128,13 +140,17 @@ public class MetadataServiceImpl implements MetadataService {
    private void classificationBuildUpMdTag(List<MdTagNew> mdTagNewList,
                                            List<MdTagNew> mdTagNewAddList,
                                            List<MdTagNew> objectListSelect,
-                                            List<TagQueryInfo> tagQueryInfos) {
+                                            List<TagQueryInfo> tagQueryInfos,Map<Long,String> userMap) {
        for (MdTagNew mdTagNew : objectListSelect) {
            Long id = mdTagNew.getId();
            TagQueryInfo tagQueryInfo = new TagQueryInfo();
            BeanUtils.copyProperties(mdTagNew,tagQueryInfo);
            tagQueryInfo.setCreatedAt(CommonUtil.dateParseString(mdTagNew.getCreatedAt(),"yyyy-MM-dd HH:mm:ss"));
+            tagQueryInfo.setCreatedBy(userMap.get(mdTagNew.getCreatedBy()));
+            if(mdTagNew.getCreatedBy() != null){
+            	tagQueryInfo.setUpdatedBy(userMap.get(mdTagNew.getCreatedBy()));
            	tagQueryInfo.setUpdatedAt(CommonUtil.dateParseString(mdTagNew.getUpdatedAt(),"yyyy-MM-dd HH:mm:ss"));
+            }
            BeanPropertyValueEqualsPredicate predicateClause = new BeanPropertyValueEqualsPredicate( "upperTagId", id);
            List<MdTagNew> mdTagNewListSelect= (List<MdTagNew>) CollectionUtils.select(mdTagNewList, predicateClause);
            if (mdTagNewListSelect.isEmpty()){
@@ -143,7 +159,7 @@ public class MetadataServiceImpl implements MetadataService {
            }
            mdTagNewAddList.addAll(mdTagNewListSelect);
            List<TagQueryInfo> tagQueryInfoList = new ArrayList<>(16);
-            classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,mdTagNewListSelect,tagQueryInfoList);
+            classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,mdTagNewListSelect,tagQueryInfoList,userMap);
            tagQueryInfoList.sort((o1, o2) -> o2.getId().compareTo(o1.getId()));
            tagQueryInfo.setTagQueryInfos(tagQueryInfoList);
            tagQueryInfos.add(tagQueryInfo);
@@ -151,26 +167,73 @@ public class MetadataServiceImpl implements MetadataService {
    }
-    private void uncategorizedMdTag(List<MdTagNew> mdTagNewList, List<TagQueryInfo> tagQueryInfos) {
+//    private void uncategorizedMdTag(List<MdTagNew> mdTagNewList, List<TagQueryInfo> tagQueryInfos) {
+//        TagQueryInfo tagQueryInfo = new TagQueryInfo();
+//        tagQueryInfo.setTagName("未分类");
+//        tagQueryInfo.setIsActive(1);
+//        tagQueryInfo.setCreatedAt(CommonUtil.dateParseString(new Date(),"yyyy-MM-dd HH:mm:ss"));
+//        tagQueryInfo.setCreatedBy(-1L);
+//        tagQueryInfo.setUpdatedAt(CommonUtil.dateParseString(new Date(),"yyyy-MM-dd HH:mm:ss"));
+//        tagQueryInfo.setUpdatedBy(-1L);
+//        List<TagQueryInfo> tagQueryInfoList = new ArrayList<>(16);
+//        mdTagNewList.forEach(m->{
+//            TagQueryInfo tagInfo = new TagQueryInfo();
+//            BeanUtils.copyProperties(m,tagInfo);
+//            tagInfo.setCreatedAt(CommonUtil.dateParseString(m.getCreatedAt(),"yyyy-MM-dd HH:mm:ss"));
+//            tagInfo.setUpdatedAt(CommonUtil.dateParseString(m.getUpdatedAt(),"yyyy-MM-dd HH:mm:ss"));
+//            tagQueryInfoList.add(tagInfo);
+//        });
+//        tagQueryInfoList.sort((o1, o2) -> o2.getId().compareTo(o1.getId()));
+//        tagQueryInfo.setTagQueryInfos(tagQueryInfoList);
+//        tagQueryInfos.add(tagQueryInfo);
+//    }
+//    
+    /**
+     * 根据标签ID查询标签信息
+     * @param requestVO
+     * @return TagQueryBYIDRequestVO
+     */
+    @Override
+    public TagQueryResponseVO tagQueryBYIDRequestVO(TagQueryBYIDRequestVO requestVO){
+    	TagQueryResponseVO responseVO = new TagQueryResponseVO();
+        CommonResult commonResult = new CommonResult();
+    	if(CommonUtil.isNullOrZero(requestVO.getId())){
+            String[] params = {"id"};
+            commonResult.setSuccess(false);
+            commonResult.setMessage(ZHBErrorConfig.getErrorInfo("610001", params));
+            responseVO.setCommonResult(commonResult);
+            return responseVO;
+    	}
+        PageHelper.clearPage();//偶然遇到了这个问题，同一个查询结果一会是10个（预期），一会是真实个数（刷新/重启应用就又变成真实个数）  查看日志，发现了问题：结果为10个时查询SQL自动加上了Limit 10
+        List<TagQueryInfo> tagQueryInfos = new ArrayList<>(16);
+        classificationBuildUpMdTagById(requestVO.getId(), tagQueryInfos);
+        responseVO.setTagQueryInfos(tagQueryInfos);
+        responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+        return responseVO;
+    }
+    /**
+     * 通过标签ID，递归获取上级标签,值到上级标签为空
+     * @param id 标签ID
+     * @param tagQueryInfos
+     */
+    private void classificationBuildUpMdTagById(Long id, List<TagQueryInfo> tagQueryInfos) {
+        MdTagNew mdTagNew = mdTagNewDalService.selectByPrimaryKey(id);
+        if(mdTagNew != null){
        	 TagQueryInfo tagQueryInfo = new TagQueryInfo();
-        tagQueryInfo.setTagName("未分类");
+             BeanUtils.copyProperties(mdTagNew,tagQueryInfo);
-        tagQueryInfo.setIsActive(1);
+             tagQueryInfo.setCreatedAt(CommonUtil.dateParseString(mdTagNew.getCreatedAt(),"yyyy-MM-dd HH:mm:ss"));
-        tagQueryInfo.setCreatedAt(CommonUtil.dateParseString(new Date(),"yyyy-MM-dd HH:mm:ss"));
+             tagQueryInfo.setUpdatedAt(CommonUtil.dateParseString(mdTagNew.getUpdatedAt(),"yyyy-MM-dd HH:mm:ss"));
-        tagQueryInfo.setCreatedBy(-1L);
+             if(mdTagNew.getUpperTagId() != null && !"".equals(mdTagNew.getUpperTagId().toString())){
-        tagQueryInfo.setUpdatedAt(CommonUtil.dateParseString(new Date(),"yyyy-MM-dd HH:mm:ss"));
-        tagQueryInfo.setUpdatedBy(-1L);
            	 List<TagQueryInfo> tagQueryInfoList = new ArrayList<>(16);
-        mdTagNewList.forEach(m->{
+            	 classificationBuildUpMdTagById(mdTagNew.getUpperTagId(), tagQueryInfoList);
-            TagQueryInfo tagInfo = new TagQueryInfo();
-            BeanUtils.copyProperties(m,tagInfo);
-            tagInfo.setCreatedAt(CommonUtil.dateParseString(m.getCreatedAt(),"yyyy-MM-dd HH:mm:ss"));
-            tagInfo.setUpdatedAt(CommonUtil.dateParseString(m.getUpdatedAt(),"yyyy-MM-dd HH:mm:ss"));
-            tagQueryInfoList.add(tagInfo);
-        });
-        tagQueryInfoList.sort((o1, o2) -> o2.getId().compareTo(o1.getId()));
                 tagQueryInfo.setTagQueryInfos(tagQueryInfoList);
+             }
             tagQueryInfos.add(tagQueryInfo);
        }
+    }
    /**
     * 前端显示标签合集查询
@@ -194,8 +257,8 @@ public class MetadataServiceImpl implements MetadataService {
        if(requestVO.getIsActive() != null){
        	isActive = requestVO.getIsActive().longValue();
        }
-        if(requestVO.getTaglevel() != null){
+        if(requestVO.getTagLevel() != null){
-        	taglevel = requestVO.getTaglevel();
+        	taglevel = requestVO.getTagLevel();
        }
        if(requestVO.getUpperTagViewId() != null){
        	upperTagViewId = requestVO.getUpperTagViewId();
@@ -204,7 +267,7 @@ public class MetadataServiceImpl implements MetadataService {
        	tagViewType = requestVO.getTagViewType();
        }
        if(!CommonUtil.isNullOrBlank(requestVO.getTagName())){
-        	if(requestVO.getTaglevel() == null){
+        	if(requestVO.getTagLevel() == null){
                commonResult.setSuccess(false);
                commonResult.setMessage(ZHBErrorConfig.getErrorInfo("830036"));
                responseVO.setCommonResult(commonResult);
@@ -224,6 +287,7 @@ public class MetadataServiceImpl implements MetadataService {
        	}
        }
+        Map<Long,String> userMap = getUserMap();
        List<TagViewQueryInfo> tagViewQueryInfos = new ArrayList<>(16);
        if(isActive == null || isActive == 1L || (taglevel != null || upperTagViewId != null || !CommonUtil.isNullOrBlank(requestVO.getTagName()))){
            List<MdTagView> mdTagViewAddList = new ArrayList<>(16);
@@ -231,7 +295,7 @@ public class MetadataServiceImpl implements MetadataService {
            List<MdTagView> objectListSelect = (List<MdTagView>) CollectionUtils.select(mdTagViewList, predicateClause);
            mdTagViewAddList.addAll(objectListSelect);
-            classificationBuildUpMdTagView(mdTagViewList,mdTagViewAddList,objectListSelect,tagViewQueryInfos);
+            classificationBuildUpMdTagView(mdTagViewList,mdTagViewAddList,objectListSelect,tagViewQueryInfos,userMap);
            mdTagViewList.removeAll(mdTagViewAddList);
        }else{
@@ -239,7 +303,11 @@ public class MetadataServiceImpl implements MetadataService {
 	            TagViewQueryInfo tagViewQueryInfo = new TagViewQueryInfo();
 	            BeanUtils.copyProperties(mdTagView,tagViewQueryInfo);
 	            tagViewQueryInfo.setCreatedAt(CommonUtil.dateParseString(mdTagView.getCreatedAt(),"yyyy-MM-dd HH:mm:ss"));
+	            tagViewQueryInfo.setCreatedBy(userMap.get(mdTagView.getCreatedBy()));
+                if(mdTagView.getCreatedBy() != null){
+                	tagViewQueryInfo.setUpdatedBy(userMap.get(mdTagView.getCreatedBy()));
    	            tagViewQueryInfo.setUpdatedAt(CommonUtil.dateParseString(mdTagView.getUpdatedAt(),"yyyy-MM-dd HH:mm:ss"));
+                }
 	            tagViewQueryInfos.add(tagViewQueryInfo);
 	        }
        }
@@ -253,13 +321,17 @@ public class MetadataServiceImpl implements MetadataService {
    private void classificationBuildUpMdTagView(List<MdTagView> mdTagViewList,
                                            List<MdTagView> mdTagViewAddList,
                                            List<MdTagView> objectListSelect,
-                                            List<TagViewQueryInfo> tagViewQueryInfos) {
+                                            List<TagViewQueryInfo> tagViewQueryInfos,Map<Long,String> userMap) {
        for (MdTagView mdTagView : objectListSelect) {
            Long id = mdTagView.getId();
            TagViewQueryInfo tagViewQueryInfo = new TagViewQueryInfo();
            BeanUtils.copyProperties(mdTagView,tagViewQueryInfo);
            tagViewQueryInfo.setCreatedAt(CommonUtil.dateParseString(mdTagView.getCreatedAt(),"yyyy-MM-dd HH:mm:ss"));
+            tagViewQueryInfo.setCreatedBy(userMap.get(mdTagView.getCreatedBy()));
+            if(mdTagView.getCreatedBy() != null){
+            	tagViewQueryInfo.setUpdatedBy(userMap.get(mdTagView.getCreatedBy()));
 	            tagViewQueryInfo.setUpdatedAt(CommonUtil.dateParseString(mdTagView.getUpdatedAt(),"yyyy-MM-dd HH:mm:ss"));
+            }
            BeanPropertyValueEqualsPredicate predicateClause = new BeanPropertyValueEqualsPredicate( "upperTagViewId", id);
            List<MdTagView> mdTagNewListSelect = (List<MdTagView>) CollectionUtils.select(mdTagViewList, predicateClause);
            if (mdTagNewListSelect.isEmpty()){
@@ -268,7 +340,7 @@ public class MetadataServiceImpl implements MetadataService {
            }
            mdTagViewAddList.addAll(mdTagNewListSelect);
            List<TagViewQueryInfo> tagViewQueryInfoList = new ArrayList<>(16);
-            classificationBuildUpMdTagView(mdTagViewList,mdTagViewAddList,mdTagNewListSelect,tagViewQueryInfoList);
+            classificationBuildUpMdTagView(mdTagViewList,mdTagViewAddList,mdTagNewListSelect,tagViewQueryInfoList,userMap);
            tagViewQueryInfoList.sort((o1, o2) -> o2.getId().compareTo(o1.getId()));
            tagViewQueryInfo.setTagViewQueryInfos(tagViewQueryInfoList);
            tagViewQueryInfos.add(tagViewQueryInfo);
@@ -285,4 +357,18 @@ public class MetadataServiceImpl implements MetadataService {
        commonResult.setSuccess(true);
        commonResult.setMessage(ZHBErrorConfig.getErrorInfo("800000"));
    }
+    /**
+     * 获取所有的用户信息
+     * @return 返回所有的用户信息
+     */
+    private Map<Long, String> getUserMap() {
+        Map<Long,String> userMap = new HashMap<>();
+        List<AclUser> users = aclUserService.findAll();
+        for(AclUser item : users){
+            userMap.put(item.getId(),item.getLogin());
+        }
+        return userMap;
+    }
 }
--- a/yd-api/src/main/java/com/yd/api/metadata/vo/TagViewQueryInfo.java
+++ b/yd-api/src/main/java/com/yd/api/metadata/vo/TagViewQueryInfo.java
@@ -18,9 +18,9 @@ public class TagViewQueryInfo {
 	private Integer isActive;// 1=active 2=inactive
 	private String remark;//备注
    private String createdAt;
-    private Long createdBy;
+    private String createdBy;
    private String updatedAt;
-    private Long updatedBy;
+    private String updatedBy;
    public List<TagViewQueryInfo> tagViewQueryInfos;
@@ -181,14 +181,14 @@ public class TagViewQueryInfo {
 	/**
 	 * @return the createdBy
 	 */
-	public Long getCreatedBy() {
+	public String getCreatedBy() {
 		return createdBy;
 	}
 	/**
 	 * @param createdBy the createdBy to set
 	 */
-	public void setCreatedBy(Long createdBy) {
+	public void setCreatedBy(String createdBy) {
 		this.createdBy = createdBy;
 	}
@@ -209,14 +209,14 @@ public class TagViewQueryInfo {
 	/**
 	 * @return the updatedBy
 	 */
-	public Long getUpdatedBy() {
+	public String getUpdatedBy() {
 		return updatedBy;
 	}
 	/**
 	 * @param updatedBy the updatedBy to set
 	 */
-	public void setUpdatedBy(Long updatedBy) {
+	public void setUpdatedBy(String updatedBy) {
 		this.updatedBy = updatedBy;
 	}

--- a/yd-api/src/main/java/com/yd/api/metadata/vo/TagViewQueryRequestVO.java
+++ b/yd-api/src/main/java/com/yd/api/metadata/vo/TagViewQueryRequestVO.java
@@ -6,7 +6,7 @@ package com.yd.api.metadata.vo;
 */
 public class TagViewQueryRequestVO {
    private String tagViewType; //标签显示类别(1=12宫格; 2=左侧热榜列表; 3=右上角筛选)
-    private String taglevel;//标签级别(1=一级; 2=二级; 3=三级)
+    private String tagLevel;//标签级别(1=一级; 2=二级; 3=三级)
    private Long upperTagViewId;//上级标签
    private String tagName;//标签名称
    private Integer isActive;// 1=active 2=inactive
@@ -26,17 +26,17 @@ public class TagViewQueryRequestVO {
 	}
 	/**
-	 * @return the taglevel
+	 * @return the tagLevel
 	 */
-	public String getTaglevel() {
+	public String getTagLevel() {
-		return taglevel;
+		return tagLevel;
 	}
 	/**
-	 * @param taglevel the taglevel to set
+	 * @param tagLevel the tagLevel to set
 	 */
-	public void setTaglevel(String taglevel) {
+	public void setTagLevel(String tagLevel) {
-		this.taglevel = taglevel;
+		this.tagLevel = tagLevel;
 	}
 	/**
@@ -85,7 +85,7 @@ public class TagViewQueryRequestVO {
    public String toString() {
        return "MdTagView{" +
                ", tagViewType='" + tagViewType + '\'' +
-                ", taglevel='" + taglevel + '\'' +
+                ", tagLevel='" + tagLevel + '\'' +
                ", upperTagViewId='" + upperTagViewId + '\'' +
                ", tagName='" + tagName + '\'' +
                ", isActive=" + isActive +

--- a/yd-api/src/main/java/com/yd/dal/mapper/meta/MdTagNewMapper.java
+++ b/yd-api/src/main/java/com/yd/dal/mapper/meta/MdTagNewMapper.java
@@ -24,4 +24,6 @@ public interface MdTagNewMapper {
    int batchInsert(@Param("list") List<MdTagNew> list);
    List<MdTagNew> selectByIsActive(@Param("isActive")Long isActive,@Param("configLevel")Long configLevel,@Param("upperTagId")Long upperTagId,@Param("tagName")String tagName,@Param("tagType")Long tagType);
+    List<MdTagNew> selectByConfigLevelAndtagType(@Param("configLevel")Long configLevel,@Param("tagType")Long  tagType);
 }
\ No newline at end of file
--- a/yd-api/src/main/java/com/yd/dal/mapper/user/UserMapper.java
+++ b/yd-api/src/main/java/com/yd/dal/mapper/user/UserMapper.java
@@ -23,4 +23,5 @@ public interface UserMapper {
    String selectNamesByMobileNos(@Param("list")List<String> mobileNoList);
+    List<AclUser> findAll();
 }
\ No newline at end of file
--- a/yd-api/src/main/java/com/yd/dal/service/meta/MdTagNewDALService.java
+++ b/yd-api/src/main/java/com/yd/dal/service/meta/MdTagNewDALService.java
@@ -15,4 +15,6 @@ public interface MdTagNewDALService {
    void updateByPrimaryKeySelective(MdTagNew mdTagNew);
    MdTagNew selectByPrimaryKey(Long id);
+    List<MdTagNew> selectByConfigLevelAndtagType(Long configLevel, Long tagType);
 }
--- a/yd-api/src/main/java/com/yd/dal/service/meta/impl/MdTagNewDALServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/dal/service/meta/impl/MdTagNewDALServiceImpl.java
@@ -39,4 +39,10 @@ public class MdTagNewDALServiceImpl implements MdTagNewDALService {
        return mapper.selectByPrimaryKey(id);
    }
+    @Override
+    public List<MdTagNew> selectByConfigLevelAndtagType(Long configLevel, Long tagType) {
+        return mapper.selectByConfigLevelAndtagType(configLevel, tagType);
+    }
 }
--- a/yd-api/src/main/java/com/yd/dal/service/user/AclUserDALService.java
+++ b/yd-api/src/main/java/com/yd/dal/service/user/AclUserDALService.java
@@ -22,4 +22,6 @@ public interface AclUserDALService {
    List<AclUser> findByIds(List<Long> userIdList);
    String selectNamesByMobileNos(String appointedApprovePractitioners);
+    List<AclUser> findAll();
 }
--- a/yd-api/src/main/java/com/yd/dal/service/user/impl/AclUserDALServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/dal/service/user/impl/AclUserDALServiceImpl.java
@@ -62,4 +62,9 @@ public class AclUserDALServiceImpl implements AclUserDALService {
    public int updateByPrimaryKey(AclUser record) {
        return aclUserMapper.updateByPrimaryKey(record);
    }
+    @Override
+    public List<AclUser> findAll() {
+        return aclUserMapper.findAll();
+    }
 }
--- a/yd-api/src/main/resources/i18n/messages_zh_CN.properties
+++ b/yd-api/src/main/resources/i18n/messages_zh_CN.properties
@@ -51,3 +51,4 @@
 830034=保存标签的标签级别与上级显示标签的标签级别不能相隔多级！
 830035=根据基础标签ID查找不到有效的基础标签！
 830036=标签名称有值时标签级别不能为空！
+830037=该标签类别已经有一级标签！
\ No newline at end of file
--- a/yd-api/src/main/resources/mapper/meta/MdTagNewMapper.xml
+++ b/yd-api/src/main/resources/mapper/meta/MdTagNewMapper.xml
@@ -315,4 +315,11 @@
      </if>
    </where>
    </select>
+  <select id="selectByConfigLevelAndtagType" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ag_md_tag_new where is_active = 1 and config_level = #{configLevel,jdbcType=BIGINT} and tag_type = #{tagType,jdbcType=BIGINT}
+    </select>
 </mapper>
\ No newline at end of file
--- a/yd-api/src/main/resources/mapper/user/AclUserMapper.xml
+++ b/yd-api/src/main/resources/mapper/user/AclUserMapper.xml
@@ -298,4 +298,10 @@
      #{item,jdbcType=VARCHAR}
    </foreach>
  </select>
+  <select id="findAll" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from ag_acl_user
+  </select>
 </mapper>
\ No newline at end of file