修改repo根据标签获取元数据分页接口

src/main/java/com/keymobile/tagmanager/api/TagCtrl.java

@@ -265,12 +265,18 @@ public class TagCtrl {
 	
 	@ApiOperation(value = "根据用户授予的数据权限加载标签元数据", notes = "根据用户授予的数据权限加载标签元数据")
 	@PostMapping(value = "/getByTagWithPrivilege")
-	public Map<String,Object> getTagMetadataWithDataPrivilege(@RequestParam String dimensionType,
-			@RequestParam String idPath,@RequestParam(required = false) String keyword,
-			@RequestParam(required = false) String modelPath,@RequestParam int pageNum,
-			@RequestParam int pageSize,@RequestParam String tagType)throws Exception{
-		return tagService.getTagMetadataWithDataPrivilege(dimensionType, idPath, keyword, modelPath, 
-				pageNum, pageSize, tagType);
+	public Map<String,Object> getTagMetadataWithDataPrivilege(
+			@RequestParam String dimensionType,
+			@RequestParam String idPath,
+			@RequestParam(required = false) String keyword,
+			@RequestParam(required = false) String startDate, 
+			@RequestParam(required = false) String endDate , 
+			@RequestParam(required = false) String modelPath,
+			@RequestParam int pageNum,
+			@RequestParam int pageSize,
+			@RequestParam String tagType)throws Exception{
+		return tagService.getTagMetadataWithDataPrivilege(dimensionType, idPath, keyword, 
+				startDate, endDate, modelPath,pageNum, pageSize, tagType);
 	}
 	
 	

src/main/java/com/keymobile/tagmanager/remote/RepoServiceClient.java

@@ -28,7 +28,9 @@ public interface RepoServiceClient {
 			@RequestParam String idPath, 
 			@RequestParam String tagType, 
 			@RequestParam String dimensionType, 
-			@RequestParam(required = false) String keyword, 
+			@RequestParam(required = false) String keyword,
+			@RequestParam(required = false) String startDate,
+			@RequestParam(required = false) String endDate, 
 			@RequestParam int pageNum, 
 			@RequestParam int pageSize);
 	

src/main/java/com/keymobile/tagmanager/service/TagService.java

@@ -717,13 +717,14 @@ public class TagService {
 	//根据授予的元数据数据权限过滤标签关联的元数据
 	@SuppressWarnings("unchecked")
 	public Map<String,Object> getTagMetadataWithDataPrivilege(String dimensionType,String idPath,
-			String keyword,String modelPath,int pageNum,int pageSize,String tagType)throws Exception{
+			String keyword, String startDate, String endDate , String modelPath,
+			int pageNum,int pageSize,String tagType)throws Exception{
 		//获取用户关联的数据权限
 		Map<Long, Set<String>> systemTagMap = GrantedAuthHelper.getDataPrivileges();
 		logger.info("tag metadata user privilege:"+systemTagMap);
 		//调用repo接口获取标签关联的元数据
 		Map<String,Object> tagData = repoService.getPageByTag(systemTagMap, modelPath, idPath, 
-				tagType, dimensionType, keyword, pageNum, pageSize);
+				tagType, dimensionType, keyword, startDate, endDate, pageNum, pageSize);
 		tagData.put("systemTagMap", systemTagMap);
 		List<Map<String,Object>> content = (List<Map<String,Object>>)tagData.get("content");
 		//判断不是个人标签