增加-标签查询及修改

yd-api/src/main/java/com/yd/api/agms/AgmsController.java

@@ -23,6 +23,8 @@ import com.yd.api.agms.vo.statistics.FinancialStatisticsRequestVO;
 import com.yd.api.agms.vo.statistics.FinancialStatisticsResponseVO;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsRequestVO;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsResponseVO;
+import com.yd.api.agms.vo.tag.TagUpdateRequestVO;
+import com.yd.api.agms.vo.tag.TagUpdateResponseVO;
 import com.yd.api.result.JsonResult;
 import com.yd.util.CommonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +52,8 @@ public class AgmsController {
     private AgmsSharingService agmsSharingService;
     @Autowired
     private AgmsPractitionerService agmsPractitionerService;
+    @Autowired
+    private AgmsTagService agmsTagService;
 
     /**
      * AGMS -- 财务管理报表
@@ -357,4 +361,18 @@ public class AgmsController {
         result.addResult(responseVO);
         return result;
     }
+
+    /**
+     * AGMS -- 标签修改
+     * @param requestVO 请求数据
+     * @return 响应数据
+     */
+    @RequestMapping(value="/tagUpdate")
+    public Object tagUpdate(@RequestBody TagUpdateRequestVO requestVO) {
+        JsonResult result = new JsonResult();
+        TagUpdateResponseVO responseVO = agmsTagService.tagUpdate(requestVO);
+        result.setData(responseVO);
+        result.addResult(responseVO);
+        return result;
+    }
 }

yd-api/src/main/java/com/yd/api/agms/service/AgmsTagService.java

+package com.yd.api.agms.service;
+
+import com.yd.api.agms.vo.tag.TagUpdateRequestVO;
+import com.yd.api.agms.vo.tag.TagUpdateResponseVO;
+
+/**
+ * @author xxy
+ */
+public interface AgmsTagService {
+    /**
+     * AGMS -- 标签修改
+     * @param requestVO 请求数据
+     * @return 响应数据
+     */
+    TagUpdateResponseVO tagUpdate(TagUpdateRequestVO requestVO);
+}

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

+package com.yd.api.agms.service.impl;
+
+import com.yd.api.agms.service.AgmsTagService;
+import com.yd.api.agms.vo.tag.TagUpdateRequestVO;
+import com.yd.api.agms.vo.tag.TagUpdateResponseVO;
+import com.yd.api.result.CommonResult;
+import com.yd.dal.entity.meta.MdTagNew;
+import com.yd.dal.service.meta.MdTagNewDALService;
+import com.yd.util.CommonUtil;
+import com.yd.util.config.ZHBErrorConfig;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @author xxy
+ * @date 2021年06月21日 23:39
+ */
+@Service("AgmsTagService")
+public class AgmsTagServiceImpl implements AgmsTagService {
+
+    @Autowired
+    public MdTagNewDALService mdTagNewDALService;
+
+    @Override
+    public TagUpdateResponseVO tagUpdate(TagUpdateRequestVO requestVO) {
+        TagUpdateResponseVO responseVO = new TagUpdateResponseVO();
+        CommonResult commonResult = new CommonResult();
+        tagUpdateEntryCheck(requestVO,commonResult);
+        if (!commonResult.isSuccess()){
+            responseVO.setCommonResult(commonResult);
+            return responseVO;
+        }
+
+        MdTagNew mdTagNew = new MdTagNew();
+        BeanUtils.copyProperties(requestVO,mdTagNew);
+        if (CommonUtil.isNullOrZero(requestVO.getId())){
+            mdTagNew.setCreatedAt(new Date());
+            mdTagNew.setUpdatedAt(new Date());
+            mdTagNew.setCreatedBy(requestVO.getLoginId());
+            mdTagNew.setUpdatedBy(requestVO.getLoginId());
+            mdTagNewDALService.insert(mdTagNew);
+        }else {
+            mdTagNew.setUpdatedAt(new Date());
+            mdTagNew.setUpdatedBy(requestVO.getLoginId());
+            mdTagNewDALService.updateByPrimaryKeySelective(mdTagNew);
+        }
+        commonResult.setSuccess(true);
+        commonResult.setMessage(ZHBErrorConfig.getErrorInfo("800000"));
+        responseVO.setCommonResult(commonResult);
+        return responseVO;
+    }
+
+    private void tagUpdateEntryCheck(TagUpdateRequestVO requestVO, CommonResult commonResult) {
+        if (CommonUtil.isNullOrZero(requestVO.getConfigLevel())){
+            commonResult.setSuccess(false);
+            commonResult.setMessage(ZHBErrorConfig.getErrorInfo("830027"));
+            return;
+        }
+        if (CommonUtil.isNullOrZero(requestVO.getUpperTagId()) && requestVO.getConfigLevel() != 1L){
+            commonResult.setSuccess(false);
+            commonResult.setMessage(ZHBErrorConfig.getErrorInfo("830028"));
+            return;
+        }
+        commonResult.setSuccess(true);
+        commonResult.setMessage(ZHBErrorConfig.getErrorInfo("800000"));
+    }
+}

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

+package com.yd.api.agms.vo.tag;
+
+/**
+ * @author xxy
+ * @date 2021年06月21日 23:41
+ */
+public class TagUpdateRequestVO {
+    private Long id;
+
+    private Long configLevel;
+
+    private Long upperTagId;
+
+    private String tagName;
+
+    private Integer isActive;
+
+    private Long loginId;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Gets the value of configLevel. *
+     *
+     * @return the value of configLevel
+     */
+    public Long getConfigLevel() {
+        return configLevel;
+    }
+
+    /**
+     * Sets the configLevel. *
+     * <p>You can use getConfigLevel() to get the value of configLevel</p>
+     * * @param configLevel configLevel
+     */
+    public void setConfigLevel(Long configLevel) {
+        this.configLevel = configLevel;
+    }
+
+    /**
+     * Gets the value of upperTagId. *
+     *
+     * @return the value of upperTagId
+     */
+    public Long getUpperTagId() {
+        return upperTagId;
+    }
+
+    /**
+     * Sets the upperTagId. *
+     * <p>You can use getUpperTagId() to get the value of upperTagId</p>
+     * * @param upperTagId upperTagId
+     */
+    public void setUpperTagId(Long upperTagId) {
+        this.upperTagId = upperTagId;
+    }
+
+    /**
+     * Gets the value of tagName. *
+     *
+     * @return the value of tagName
+     */
+    public String getTagName() {
+        return tagName;
+    }
+
+    /**
+     * Sets the tagName. *
+     * <p>You can use getTagName() to get the value of tagName</p>
+     * * @param tagName tagName
+     */
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
+
+    /**
+     * Gets the value of isActive. *
+     *
+     * @return the value of isActive
+     */
+    public Integer getIsActive() {
+        return isActive;
+    }
+
+    /**
+     * Sets the isActive. *
+     * <p>You can use getIsActive() to get the value of isActive</p>
+     * * @param isActive isActive
+     */
+    public void setIsActive(Integer isActive) {
+        this.isActive = isActive;
+    }
+
+    /**
+     * Gets the value of loginId. *
+     *
+     * @return the value of loginId
+     */
+    public Long getLoginId() {
+        return loginId;
+    }
+
+    /**
+     * Sets the loginId. *
+     * <p>You can use getLoginId() to get the value of loginId</p>
+     * * @param loginId loginId
+     */
+    public void setLoginId(Long loginId) {
+        this.loginId = loginId;
+    }
+
+    @Override
+    public String toString() {
+        return "TagUpdateRequestVO{" +
+                "id=" + id +
+                ", configLevel=" + configLevel +
+                ", upperTagId=" + upperTagId +
+                ", tagName='" + tagName + '\'' +
+                ", isActive=" + isActive +
+                ", loginId=" + loginId +
+                '}';
+    }
+}

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

+package com.yd.api.agms.vo.tag;
+
+import com.yd.api.result.CommonResult;
+
+/**
+ * @author xxy
+ * @date 2021年06月21日 23:41
+ */
+public class TagUpdateResponseVO {
+
+    private CommonResult commonResult;
+
+    /**
+     * Gets the value of commonResult. *
+     *
+     * @return the value of commonResult
+     */
+    public CommonResult getCommonResult() {
+        return commonResult;
+    }
+
+    /**
+     * Sets the commonResult. *
+     * <p>You can use getCommonResult() to get the value of commonResult</p>
+     * * @param commonResult commonResult
+     */
+    public void setCommonResult(CommonResult commonResult) {
+        this.commonResult = commonResult;
+    }
+
+    @Override
+    public String toString() {
+        return "TagUpdateResponseVO{" +
+                "commonResult=" + commonResult +
+                '}';
+    }
+}

yd-api/src/main/java/com/yd/api/metadata/MetadataController.java

+package com.yd.api.metadata;
+
+import com.yd.api.metadata.service.MetadataService;
+import com.yd.api.metadata.vo.TagQueryResponseVO;
+import com.yd.api.result.JsonResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author xxy
+ * @date 2021年06月21日 17:14
+ */
+@RestController
+@RequestMapping("/metadata")
+public class MetadataController {
+
+    @Autowired
+    public MetadataService metadataService;
+
+    /**
+     * 标签合集查询
+     * @return TagQueryResponseVO
+     */
+    @GetMapping("/tagQuery")
+    public Object tagQuery(@RequestParam(value = "isActive",required = false) Long isActive){
+        JsonResult result = new JsonResult();
+        TagQueryResponseVO responseVO = metadataService.tagQuery(isActive);
+        result.setData(responseVO);
+        result.addResult(responseVO);
+        return result;
+    }
+
+}

yd-api/src/main/java/com/yd/api/metadata/service/MetadataService.java

+package com.yd.api.metadata.service;
+
+import com.yd.api.metadata.vo.TagQueryResponseVO;
+
+public interface MetadataService {
+    /**
+     * 标签合集查询
+     * @param isActive 是否启用
+     * @return
+     */
+    TagQueryResponseVO tagQuery(Long isActive);
+}

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

+package com.yd.api.metadata.service.impl;
+
+import com.yd.api.metadata.service.MetadataService;
+import com.yd.api.metadata.vo.TagQueryInfo;
+import com.yd.api.metadata.vo.TagQueryResponseVO;
+import com.yd.api.result.CommonResult;
+import com.yd.dal.entity.meta.MdTagNew;
+import com.yd.dal.service.meta.MdTagNewDALService;
+import com.yd.dal.service.metadata.MetadataDALService;
+import com.yd.util.CommonUtil;
+import com.yd.util.config.ZHBErrorConfig;
+import org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author xxy
+ * @date 2021年06月21日 17:33
+ */
+@Service("metadataService")
+public class MetadataServiceImpl implements MetadataService {
+
+    @Autowired
+    public MetadataDALService metadataDalService;
+
+    @Autowired
+    public MdTagNewDALService mdTagNewDalService;
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public TagQueryResponseVO tagQuery(Long isActive) {
+        TagQueryResponseVO responseVO = new TagQueryResponseVO();
+
+        List<MdTagNew> mdTagNewList = mdTagNewDalService.selectByIsActive(isActive);
+        List<TagQueryInfo> tagQueryInfos = new ArrayList<>(16);
+        List<MdTagNew> mdTagNewAddList = new ArrayList<>(16);
+
+        BeanPropertyValueEqualsPredicate predicateClause = new BeanPropertyValueEqualsPredicate( "configLevel", 1L);
+        List<MdTagNew> objectListSelect= (List<MdTagNew>) CollectionUtils.select(mdTagNewList, predicateClause);
+        mdTagNewAddList.addAll(objectListSelect);
+        classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,objectListSelect,predicateClause,tagQueryInfos);
+
+        mdTagNewList.removeAll(mdTagNewAddList);
+        uncategorizedMdTag(mdTagNewList,tagQueryInfos);
+
+        responseVO.setTagQueryInfos(tagQueryInfos);
+        responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+        return responseVO;
+    }
+
+    @SuppressWarnings("unchecked")
+    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();
+            TagQueryInfo tagQueryInfo = new TagQueryInfo();
+            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);
+            List<MdTagNew> mdTagNewListSelect= (List<MdTagNew>) CollectionUtils.select(mdTagNewList, predicateClause);
+            if (mdTagNewListSelect.isEmpty()){
+                tagQueryInfos.add(tagQueryInfo);
+                continue;
+            }
+            mdTagNewAddList.addAll(mdTagNewListSelect);
+            List<TagQueryInfo> tagQueryInfoList = new ArrayList<>(16);
+            classificationBuildUpMdTag(mdTagNewList,mdTagNewAddList,mdTagNewListSelect,predicateClause,tagQueryInfoList);
+            tagQueryInfo.setTagQueryInfos(tagQueryInfoList);
+            tagQueryInfos.add(tagQueryInfo);
+        }
+    }
+
+
+    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);
+        });
+        tagQueryInfo.setTagQueryInfos(tagQueryInfoList);
+        tagQueryInfos.add(tagQueryInfo);
+    }
+}

yd-api/src/main/java/com/yd/api/metadata/vo/TagQueryInfo.java

+package com.yd.api.metadata.vo;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author xxy
+ * @date 2021年06月21日 17:56
+ */
+public class TagQueryInfo {
+
+    private Long id;
+
+    private Long configLevel;
+
+    private Long upperTagId;
+
+    private String tagName;
+
+    private Integer isActive;
+
+    private String createdAt;
+
+    private Long createdBy;
+
+    private String updatedAt;
+
+    private Long updatedBy;
+
+    public List<TagQueryInfo> tagQueryInfos;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Gets the value of configLevel. *
+     *
+     * @return the value of configLevel
+     */
+    public Long getConfigLevel() {
+        return configLevel;
+    }
+
+    /**
+     * Sets the configLevel. *
+     * <p>You can use getConfigLevel() to get the value of configLevel</p>
+     * * @param configLevel configLevel
+     */
+    public void setConfigLevel(Long configLevel) {
+        this.configLevel = configLevel;
+    }
+
+    /**
+     * Gets the value of upperTagId. *
+     *
+     * @return the value of upperTagId
+     */
+    public Long getUpperTagId() {
+        return upperTagId;
+    }
+
+    /**
+     * Sets the upperTagId. *
+     * <p>You can use getUpperTagId() to get the value of upperTagId</p>
+     * * @param upperTagId upperTagId
+     */
+    public void setUpperTagId(Long upperTagId) {
+        this.upperTagId = upperTagId;
+    }
+
+    /**
+     * Gets the value of tagName. *
+     *
+     * @return the value of tagName
+     */
+    public String getTagName() {
+        return tagName;
+    }
+
+    /**
+     * Sets the tagName. *
+     * <p>You can use getTagName() to get the value of tagName</p>
+     * * @param tagName tagName
+     */
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
+
+    /**
+     * Gets the value of isActive. *
+     *
+     * @return the value of isActive
+     */
+    public Integer getIsActive() {
+        return isActive;
+    }
+
+    /**
+     * Sets the isActive. *
+     * <p>You can use getIsActive() to get the value of isActive</p>
+     * * @param isActive isActive
+     */
+    public void setIsActive(Integer isActive) {
+        this.isActive = isActive;
+    }
+
+    /**
+     * Gets the value of createdAt. *
+     *
+     * @return the value of createdAt
+     */
+    public String getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * Sets the createdAt. *
+     * <p>You can use getCreatedAt() to get the value of createdAt</p>
+     * * @param createdAt createdAt
+     */
+    public void setCreatedAt(String createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    /**
+     * Gets the value of createdBy. *
+     *
+     * @return the value of createdBy
+     */
+    public Long getCreatedBy() {
+        return createdBy;
+    }
+
+    /**
+     * Sets the createdBy. *
+     * <p>You can use getCreatedBy() to get the value of createdBy</p>
+     * * @param createdBy createdBy
+     */
+    public void setCreatedBy(Long createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * Gets the value of updatedAt. *
+     *
+     * @return the value of updatedAt
+     */
+    public String getUpdatedAt() {
+        return updatedAt;
+    }
+
+    /**
+     * Sets the updatedAt. *
+     * <p>You can use getUpdatedAt() to get the value of updatedAt</p>
+     * * @param updatedAt updatedAt
+     */
+    public void setUpdatedAt(String updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    /**
+     * Gets the value of updatedBy. *
+     *
+     * @return the value of updatedBy
+     */
+    public Long getUpdatedBy() {
+        return updatedBy;
+    }
+
+    /**
+     * Sets the updatedBy. *
+     * <p>You can use getUpdatedBy() to get the value of updatedBy</p>
+     * * @param updatedBy updatedBy
+     */
+    public void setUpdatedBy(Long updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    /**
+     * Gets the value of tagQueryInfos. *
+     *
+     * @return the value of tagQueryInfos
+     */
+    public List<TagQueryInfo> getTagQueryInfos() {
+        return tagQueryInfos;
+    }
+
+    /**
+     * Sets the tagQueryInfos. *
+     * <p>You can use getTagQueryInfos() to get the value of tagQueryInfos</p>
+     * * @param tagQueryInfos tagQueryInfos
+     */
+    public void setTagQueryInfos(List<TagQueryInfo> tagQueryInfos) {
+        this.tagQueryInfos = tagQueryInfos;
+    }
+
+    @Override
+    public String toString() {
+        return "TagQueryInfo{" +
+                "id=" + id +
+                ", configLevel=" + configLevel +
+                ", upperTagId=" + upperTagId +
+                ", tagName='" + tagName + '\'' +
+                ", isActive=" + isActive +
+                ", createdAt='" + createdAt + '\'' +
+                ", createdBy=" + createdBy +
+                ", updatedAt=" + updatedAt +
+                ", updatedBy=" + updatedBy +
+                ", tagQueryInfos=" + tagQueryInfos +
+                '}';
+    }
+}

yd-api/src/main/java/com/yd/api/metadata/vo/TagQueryResponseVO.java

+package com.yd.api.metadata.vo;
+
+import com.yd.api.result.CommonResult;
+
+import java.util.List;
+
+/**
+ * @author xxy
+ * @date 2021年06月21日 17:39
+ */
+public class TagQueryResponseVO {
+
+    private List<TagQueryInfo> tagQueryInfos;
+
+    public List<TagQueryInfo> getTagQueryInfos() {
+        return tagQueryInfos;
+    }
+
+    public void setTagQueryInfos(List<TagQueryInfo> tagQueryInfos) {
+        this.tagQueryInfos = tagQueryInfos;
+    }
+
+    private CommonResult commonResult;
+
+    public CommonResult getCommonResult() {
+        return commonResult;
+    }
+
+    public void setCommonResult(CommonResult commonResult) {
+        this.commonResult = commonResult;
+    }
+
+    @Override
+    public String toString() {
+        return "TagQueryResponseVO{" +
+                "tagQueryInfos=" + tagQueryInfos +
+                ", commonResult=" + commonResult +
+                '}';
+    }
+}

yd-api/src/main/java/com/yd/dal/entity/meta/MdTagNew.java

+package com.yd.dal.entity.meta;
+
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @author xxy
+ */
+public class MdTagNew {
+    private Long id;
+
+    private Long configLevel;
+
+    private Long upperTagId;
+
+    private String tagName;
+
+    private Integer isActive;
+
+    private Date createdAt;
+
+    private Long createdBy;
+
+    private Date updatedAt;
+
+    private Long updatedBy;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Gets the value of configLevel. *
+     *
+     * @return the value of configLevel
+     */
+    public Long getConfigLevel() {
+        return configLevel;
+    }
+
+    /**
+     * Sets the configLevel. *
+     * <p>You can use getConfigLevel() to get the value of configLevel</p>
+     * * @param configLevel configLevel
+     */
+    public void setConfigLevel(Long configLevel) {
+        this.configLevel = configLevel;
+    }
+
+    /**
+     * Gets the value of upperTagId. *
+     *
+     * @return the value of upperTagId
+     */
+    public Long getUpperTagId() {
+        return upperTagId;
+    }
+
+    /**
+     * Sets the upperTagId. *
+     * <p>You can use getUpperTagId() to get the value of upperTagId</p>
+     * * @param upperTagId upperTagId
+     */
+    public void setUpperTagId(Long upperTagId) {
+        this.upperTagId = upperTagId;
+    }
+
+    /**
+     * Gets the value of tagName. *
+     *
+     * @return the value of tagName
+     */
+    public String getTagName() {
+        return tagName;
+    }
+
+    /**
+     * Sets the tagName. *
+     * <p>You can use getTagName() to get the value of tagName</p>
+     * * @param tagName tagName
+     */
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
+
+    /**
+     * Gets the value of isActive. *
+     *
+     * @return the value of isActive
+     */
+    public Integer getIsActive() {
+        return isActive;
+    }
+
+    /**
+     * Sets the isActive. *
+     * <p>You can use getIsActive() to get the value of isActive</p>
+     * * @param isActive isActive
+     */
+    public void setIsActive(Integer isActive) {
+        this.isActive = isActive;
+    }
+
+    /**
+     * Gets the value of createdAt. *
+     *
+     * @return the value of createdAt
+     */
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * Sets the createdAt. *
+     * <p>You can use getCreatedAt() to get the value of createdAt</p>
+     * * @param createdAt createdAt
+     */
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    /**
+     * Gets the value of createdBy. *
+     *
+     * @return the value of createdBy
+     */
+    public Long getCreatedBy() {
+        return createdBy;
+    }
+
+    /**
+     * Sets the createdBy. *
+     * <p>You can use getCreatedBy() to get the value of createdBy</p>
+     * * @param createdBy createdBy
+     */
+    public void setCreatedBy(Long createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * Gets the value of updatedAt. *
+     *
+     * @return the value of updatedAt
+     */
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    /**
+     * Sets the updatedAt. *
+     * <p>You can use getUpdatedAt() to get the value of updatedAt</p>
+     * * @param updatedAt updatedAt
+     */
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    /**
+     * Gets the value of updatedBy. *
+     *
+     * @return the value of updatedBy
+     */
+    public Long getUpdatedBy() {
+        return updatedBy;
+    }
+
+    /**
+     * Sets the updatedBy. *
+     * <p>You can use getUpdatedBy() to get the value of updatedBy</p>
+     * * @param updatedBy updatedBy
+     */
+    public void setUpdatedBy(Long updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    @Override
+    public String toString() {
+        return "MdTagNew{" +
+                "id=" + id +
+                ", configLevel=" + configLevel +
+                ", upperTagId=" + upperTagId +
+                ", tagName='" + tagName + '\'' +
+                ", isActive=" + isActive +
+                ", createdAt=" + createdAt +
+                ", createdBy=" + createdBy +
+                ", updatedAt=" + updatedAt +
+                ", updatedBy=" + updatedBy +
+                '}';
+    }
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/entity/meta/MdTagView.java

+package com.yd.dal.entity.meta;
+
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 前端显示标签表
+ * @author xxy
+ */
+public class MdTagView {
+    /**
+    * serial id
+    */
+    private Long id;
+
+    /**
+    * 标签显示类别(1=12宫格; 2=左侧热榜列表; 3=右上角筛选)
+    */
+    private String tagViewType;
+
+    /**
+    * 标签ID
+    */
+    private Long tagId;
+
+    /**
+    * 标签名称
+    */
+    private String tagName;
+
+    /**
+    * 标签级别(1=一级标签;2=二级标签;3=三级标签,以此类推)
+    */
+    private String tagLevel;
+
+    /**
+    * 上级前端显示标签ID
+    */
+    private Long upperTagViewId;
+
+    /**
+    * UI上显示图片
+    */
+    private String displayImage;
+
+    /**
+    * UI上layout优先级
+    */
+    private Integer displayOrder;
+
+    /**
+    * 1=active 2=inactive
+    */
+    private Integer isActive;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    /**
+    * 创建时间
+    */
+    private Date createdAt;
+
+    /**
+    * FK ag_acl_user.id
+    */
+    private Long createdBy;
+
+    /**
+    * 修改时间
+    */
+    private Date updatedAt;
+
+    /**
+    * FK ag_acl_user.id
+    */
+    private Long updatedBy;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Gets the value of tagViewType. *
+     *
+     * @return the value of tagViewType
+     */
+    public String getTagViewType() {
+        return tagViewType;
+    }
+
+    /**
+     * Sets the tagViewType. *
+     * <p>You can use getTagViewType() to get the value of tagViewType</p>
+     * * @param tagViewType tagViewType
+     */
+    public void setTagViewType(String tagViewType) {
+        this.tagViewType = tagViewType;
+    }
+
+    /**
+     * Gets the value of tagId. *
+     *
+     * @return the value of tagId
+     */
+    public Long getTagId() {
+        return tagId;
+    }
+
+    /**
+     * Sets the tagId. *
+     * <p>You can use getTagId() to get the value of tagId</p>
+     * * @param tagId tagId
+     */
+    public void setTagId(Long tagId) {
+        this.tagId = tagId;
+    }
+
+    /**
+     * Gets the value of tagName. *
+     *
+     * @return the value of tagName
+     */
+    public String getTagName() {
+        return tagName;
+    }
+
+    /**
+     * Sets the tagName. *
+     * <p>You can use getTagName() to get the value of tagName</p>
+     * * @param tagName tagName
+     */
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
+
+    /**
+     * Gets the value of tagLevel. *
+     *
+     * @return the value of tagLevel
+     */
+    public String getTagLevel() {
+        return tagLevel;
+    }
+
+    /**
+     * Sets the tagLevel. *
+     * <p>You can use getTagLevel() to get the value of tagLevel</p>
+     * * @param tagLevel tagLevel
+     */
+    public void setTagLevel(String tagLevel) {
+        this.tagLevel = tagLevel;
+    }
+
+    /**
+     * Gets the value of upperTagViewId. *
+     *
+     * @return the value of upperTagViewId
+     */
+    public Long getUpperTagViewId() {
+        return upperTagViewId;
+    }
+
+    /**
+     * Sets the upperTagViewId. *
+     * <p>You can use getUpperTagViewId() to get the value of upperTagViewId</p>
+     * * @param upperTagViewId upperTagViewId
+     */
+    public void setUpperTagViewId(Long upperTagViewId) {
+        this.upperTagViewId = upperTagViewId;
+    }
+
+    /**
+     * Gets the value of displayImage. *
+     *
+     * @return the value of displayImage
+     */
+    public String getDisplayImage() {
+        return displayImage;
+    }
+
+    /**
+     * Sets the displayImage. *
+     * <p>You can use getDisplayImage() to get the value of displayImage</p>
+     * * @param displayImage displayImage
+     */
+    public void setDisplayImage(String displayImage) {
+        this.displayImage = displayImage;
+    }
+
+    /**
+     * Gets the value of displayOrder. *
+     *
+     * @return the value of displayOrder
+     */
+    public Integer getDisplayOrder() {
+        return displayOrder;
+    }
+
+    /**
+     * Sets the displayOrder. *
+     * <p>You can use getDisplayOrder() to get the value of displayOrder</p>
+     * * @param displayOrder displayOrder
+     */
+    public void setDisplayOrder(Integer displayOrder) {
+        this.displayOrder = displayOrder;
+    }
+
+    /**
+     * Gets the value of isActive. *
+     *
+     * @return the value of isActive
+     */
+    public Integer getIsActive() {
+        return isActive;
+    }
+
+    /**
+     * Sets the isActive. *
+     * <p>You can use getIsActive() to get the value of isActive</p>
+     * * @param isActive isActive
+     */
+    public void setIsActive(Integer isActive) {
+        this.isActive = isActive;
+    }
+
+    /**
+     * Gets the value of remark. *
+     *
+     * @return the value of remark
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * Sets the remark. *
+     * <p>You can use getRemark() to get the value of remark</p>
+     * * @param remark remark
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * Gets the value of createdAt. *
+     *
+     * @return the value of createdAt
+     */
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * Sets the createdAt. *
+     * <p>You can use getCreatedAt() to get the value of createdAt</p>
+     * * @param createdAt createdAt
+     */
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    /**
+     * Gets the value of createdBy. *
+     *
+     * @return the value of createdBy
+     */
+    public Long getCreatedBy() {
+        return createdBy;
+    }
+
+    /**
+     * Sets the createdBy. *
+     * <p>You can use getCreatedBy() to get the value of createdBy</p>
+     * * @param createdBy createdBy
+     */
+    public void setCreatedBy(Long createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * Gets the value of updatedAt. *
+     *
+     * @return the value of updatedAt
+     */
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    /**
+     * Sets the updatedAt. *
+     * <p>You can use getUpdatedAt() to get the value of updatedAt</p>
+     * * @param updatedAt updatedAt
+     */
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    /**
+     * Gets the value of updatedBy. *
+     *
+     * @return the value of updatedBy
+     */
+    public Long getUpdatedBy() {
+        return updatedBy;
+    }
+
+    /**
+     * Sets the updatedBy. *
+     * <p>You can use getUpdatedBy() to get the value of updatedBy</p>
+     * * @param updatedBy updatedBy
+     */
+    public void setUpdatedBy(Long updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    @Override
+    public String toString() {
+        return "MdTagView{" +
+                "id=" + id +
+                ", tagViewType='" + tagViewType + '\'' +
+                ", tagId=" + tagId +
+                ", tagName='" + tagName + '\'' +
+                ", tagLevel='" + tagLevel + '\'' +
+                ", upperTagViewId=" + upperTagViewId +
+                ", displayImage='" + displayImage + '\'' +
+                ", displayOrder=" + displayOrder +
+                ", isActive=" + isActive +
+                ", remark='" + remark + '\'' +
+                ", createdAt=" + createdAt +
+                ", createdBy=" + createdBy +
+                ", updatedAt=" + updatedAt +
+                ", updatedBy=" + updatedBy +
+                '}';
+    }
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/meta/MdTagNewMapper.java

+package com.yd.dal.mapper.meta;
+
+import com.yd.dal.entity.meta.MdTagNew;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface MdTagNewMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(MdTagNew record);
+
+    int insertSelective(MdTagNew record);
+
+    MdTagNew selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(MdTagNew record);
+
+    int updateByPrimaryKey(MdTagNew record);
+
+    int updateBatch(List<MdTagNew> list);
+
+    int updateBatchSelective(List<MdTagNew> list);
+
+    int batchInsert(@Param("list") List<MdTagNew> list);
+
+    List<MdTagNew> selectByIsActive(@Param("isActive")Long isActive);
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/meta/MdTagViewMapper.java

+package com.yd.dal.mapper.meta;
+
+import com.yd.dal.entity.meta.MdTagView;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author xxy
+ */
+public interface MdTagViewMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(MdTagView record);
+
+    int insertSelective(MdTagView record);
+
+    MdTagView selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(MdTagView record);
+
+    int updateByPrimaryKey(MdTagView record);
+
+    int updateBatch(List<MdTagView> list);
+
+    int updateBatchSelective(List<MdTagView> list);
+
+    int batchInsert(@Param("list") List<MdTagView> list);
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/metadata/MetadataMapper.java

+package com.yd.dal.mapper.metadata;
+
+/**
+ * @author xxy
+ */
+public interface MetadataMapper {
+}

yd-api/src/main/java/com/yd/dal/service/meta/MdTagNewDALService.java

+package com.yd.dal.service.meta;
+
+import com.yd.dal.entity.meta.MdTagNew;
+
+import java.util.List;
+
+/**
+ * @author xxy
+ */
+public interface MdTagNewDALService {
+    List<MdTagNew> selectByIsActive(Long isActive);
+
+    void insert(MdTagNew mdTagNew);
+
+    void updateByPrimaryKeySelective(MdTagNew mdTagNew);
+}

yd-api/src/main/java/com/yd/dal/service/meta/MdTagViewDALService.java

+package com.yd.dal.service.meta;
+
+/**
+ * @author xxy
+ */
+public interface MdTagViewDALService {
+}

yd-api/src/main/java/com/yd/dal/service/meta/impl/MdTagNewDALServiceImpl.java

+package com.yd.dal.service.meta.impl;
+
+import com.yd.dal.entity.meta.MdTagNew;
+import com.yd.dal.mapper.meta.MdTagNewMapper;
+import com.yd.dal.service.meta.MdTagNewDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author xxy
+ * @date 2021年06月21日 17:22
+ */
+@Service("mdTagNewDALService")
+public class MdTagNewDALServiceImpl implements MdTagNewDALService {
+    @Resource
+    public MdTagNewMapper mapper;
+
+    @Override
+    public List<MdTagNew> selectByIsActive(Long isActive) {
+        return mapper.selectByIsActive(isActive);
+    }
+
+    @Override
+    public void insert(MdTagNew mdTagNew) {
+        mapper.insert(mdTagNew);
+    }
+
+    @Override
+    public void updateByPrimaryKeySelective(MdTagNew mdTagNew) {
+        mapper.updateByPrimaryKeySelective(mdTagNew);
+    }
+}

yd-api/src/main/java/com/yd/dal/service/meta/impl/MdTagViewDALServiceImpl.java

+package com.yd.dal.service.meta.impl;
+
+import com.yd.dal.mapper.meta.MdTagViewMapper;
+import com.yd.dal.service.meta.MdTagViewDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author xxy
+ * @date 2021年06月21日 17:25
+ */
+@Service("mdTagViewDALService")
+public class MdTagViewDALServiceImpl implements MdTagViewDALService {
+    @Resource
+    public MdTagViewMapper mapper;
+}

yd-api/src/main/java/com/yd/dal/service/metadata/MetadataDALService.java

+package com.yd.dal.service.metadata;
+
+/**
+ * @author xxy
+ */
+public interface MetadataDALService {
+}

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

+package com.yd.dal.service.metadata.impl;
+
+import com.yd.dal.service.metadata.MetadataDALService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author xxy
+ * @date 2021年06月21日 17:19
+ */
+@Service("metadataDALService")
+public class MetadataDALServiceImpl implements MetadataDALService {
+}

yd-api/src/main/resources/i18n/messages_zh_CN.properties

@@ -40,4 +40,6 @@
 830024=存在已关账保单,禁止修改为非可发放状态
 830025=上传失败，请重新上传！
 830026=经纪人审批步骤出现问题,请联系it！
+830027=标签级别不能为空！
+830028=此标签不是一级标签,上级标签id不能为空！
 900003=保险公司响应报文为空！
\ No newline at end of file

yd-api/src/main/resources/mapper/metadata/MetadataMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yd.dal.mapper.metadata.MetadataMapper">
+
+</mapper>
\ No newline at end of file