Commit db6212a3 by jianan

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

parents d2bddd31 8b219a8f
......@@ -3,7 +3,6 @@ package com.yd.api.metadata;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.yd.api.metadata.service.MetadataService;
......
......@@ -46,6 +46,7 @@ public class MetadataServiceImpl implements MetadataService {
@Override
@SuppressWarnings("unchecked")
public TagQueryResponseVO tagQuery(TagQueryRequestVO requestVO) {
System.out.println(requestVO.toString());
TagQueryResponseVO responseVO = new TagQueryResponseVO();
CommonResult commonResult = new CommonResult();
tagQueryCheck(requestVO, commonResult);
......@@ -76,6 +77,7 @@ public class MetadataServiceImpl implements MetadataService {
}
List<MdTagNew> mdTagNewList = mdTagNewDalService.selectByIsActive(isActive,configLevel,upperTagId,tagName);
System.out.println("mdTagNewList.size():"+mdTagNewList.size());
List<TagQueryInfo> tagQueryInfos = new ArrayList<>(16);
if(configLevel == null){
if((requestVO.getUpperTagId() != null || !CommonUtil.isNullOrBlank(requestVO.getTagName()))){
......@@ -104,6 +106,7 @@ public class MetadataServiceImpl implements MetadataService {
}
}
System.out.println("tagQueryInfos.size():"+tagQueryInfos.size());
responseVO.setTagQueryInfos(tagQueryInfos);
responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
return responseVO;
......
<?xml version="1.0" encoding="UTF-8"?>
<configuration><!-- 使用spring profile 来管理多环节log文件 -->
<logger name="com.yd.dal.mapper" level="DEBUG"/>
<springProfile name="local"> <!-- local 环境 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"><!-- 控制台输出 -->
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment