Merge branch 'dev_20210330' of 139.224.139.2:AGSH/yd-backend into dev_20210330

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

@@ -10,6 +10,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import com.github.pagehelper.PageHelper;
 import com.yd.api.metadata.service.MetadataService;
 import com.yd.api.metadata.service.MetadataService;
 import com.yd.api.metadata.vo.TagQueryInfo;
 import com.yd.api.metadata.vo.TagQueryInfo;
 import com.yd.api.metadata.vo.TagQueryRequestVO;
 import com.yd.api.metadata.vo.TagQueryRequestVO;
@@ -46,7 +47,6 @@ public class MetadataServiceImpl implements MetadataService {
     @Override
     @Override
     @SuppressWarnings("unchecked")
     @SuppressWarnings("unchecked")
     public TagQueryResponseVO tagQuery(TagQueryRequestVO requestVO) {
     public TagQueryResponseVO tagQuery(TagQueryRequestVO requestVO) {
-    	System.out.println(requestVO.toString());
         TagQueryResponseVO responseVO = new TagQueryResponseVO();
         TagQueryResponseVO responseVO = new TagQueryResponseVO();
         CommonResult commonResult = new CommonResult();
         CommonResult commonResult = new CommonResult();
         tagQueryCheck(requestVO, commonResult);
         tagQueryCheck(requestVO, commonResult);
@@ -76,8 +76,8 @@ public class MetadataServiceImpl implements MetadataService {
         	tagName = requestVO.getTagName()+"%";
         	tagName = requestVO.getTagName()+"%";
         }
         }
         
         
+        PageHelper.clearPage();//偶然遇到了这个问题，同一个查询结果一会是10个（预期），一会是真实个数（刷新/重启应用就又变成真实个数）  查看日志，发现了问题：结果为10个时查询SQL自动加上了Limit 10
         List<MdTagNew> mdTagNewList = mdTagNewDalService.selectByIsActive(isActive,configLevel,upperTagId,tagName);
         List<MdTagNew> mdTagNewList = mdTagNewDalService.selectByIsActive(isActive,configLevel,upperTagId,tagName);
-        System.out.println("mdTagNewList.size():"+mdTagNewList.size());
         List<TagQueryInfo> tagQueryInfos = new ArrayList<>(16);
         List<TagQueryInfo> tagQueryInfos = new ArrayList<>(16);
         if(configLevel == null){
         if(configLevel == null){
         	if((requestVO.getUpperTagId() != null || !CommonUtil.isNullOrBlank(requestVO.getTagName()))){
         	if((requestVO.getUpperTagId() != null || !CommonUtil.isNullOrBlank(requestVO.getTagName()))){
@@ -106,7 +106,6 @@ public class MetadataServiceImpl implements MetadataService {
 	        }
 	        }
         }
         }
 
 
-        System.out.println("tagQueryInfos.size():"+tagQueryInfos.size());
         responseVO.setTagQueryInfos(tagQueryInfos);
         responseVO.setTagQueryInfos(tagQueryInfos);
         responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         return responseVO;
         return responseVO;
@@ -186,7 +185,8 @@ public class MetadataServiceImpl implements MetadataService {
             responseVO.setCommonResult(commonResult);
             responseVO.setCommonResult(commonResult);
             return responseVO;
             return responseVO;
         }
         }
-        
+
+        PageHelper.clearPage();//偶然遇到了这个问题，同一个查询结果一会是10个（预期），一会是真实个数（刷新/重启应用就又变成真实个数）  查看日志，发现了问题：结果为10个时查询SQL自动加上了Limit 10
         List<MdTagView> mdTagViewList = mdTagViewDALService.selectByIsActive(requestVO.getIsActive().longValue());
         List<MdTagView> mdTagViewList = mdTagViewDALService.selectByIsActive(requestVO.getIsActive().longValue());
         if (!CommonUtil.isNullOrBlank(requestVO.getTagViewType())){
         if (!CommonUtil.isNullOrBlank(requestVO.getTagViewType())){
             BeanPropertyValueEqualsPredicate predicateClause = new BeanPropertyValueEqualsPredicate( "tagViewType", requestVO.getTagViewType());
             BeanPropertyValueEqualsPredicate predicateClause = new BeanPropertyValueEqualsPredicate( "tagViewType", requestVO.getTagViewType());