Merge branch 'fix/取消视图查询2000条限制' into 'develop'

【数据中心】优化视图查询，取消视图bundle查询2000条限制 to develop

See merge request o2oa/o2oa!1079

o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionBundle.java

@@ -39,7 +39,7 @@ class ActionBundle extends BaseAction {
 			}
 			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
 
-			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(), wi.getCount());
+			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(), wi.getCount(), true);
 
 			List<String> os = null;
 			switch (StringUtils.trimToEmpty(view.getType())) {

o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/ActionSimulate.java

@@ -41,7 +41,7 @@ class ActionSimulate extends BaseAction {
 			if (wi == null) {
 				wi = new Wi();
 			}
-			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(), wi.getCount());
+			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(), wi.getCount(), false);
 			runtime.bundleList = wi.getBundleList();
 			switch (StringUtils.trimToEmpty(view.getType())) {
 

o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/view/BaseAction.java

@@ -51,7 +51,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 	}
 
 	protected Runtime runtime(EffectivePerson effectivePerson, Business business, View view,
-							  List<FilterEntry> filterList, Map<String, String> parameter, Integer count) throws Exception {
+							  List<FilterEntry> filterList, Map<String, String> parameter, Integer count, boolean isBundle) throws Exception {
 		Runtime runtime = new Runtime();
 		runtime.person = effectivePerson.getDistinguishedName();
 		runtime.identityList = business.organization().identity().listWithPerson(effectivePerson);
@@ -107,14 +107,22 @@ abstract class BaseAction extends StandardJaxrsAction {
 		}
 		runtime.parameter = parameter;
 		runtime.filterList = filterList;
-		runtime.count = this.getCount(view, count);
+		runtime.count = this.getCount(view, count, isBundle);
 		return runtime;
 	}
 
-	protected Integer getCount(View view, Integer count) {
+	protected Integer getCount(View view, Integer count, boolean isBundle) {
 		Integer viewCount = view.getCount();
-		Integer wiCount = ((count == null) || (count < 1) || (count > View.MAX_COUNT)) ? View.MAX_COUNT : count;
-		return NumberUtils.min(viewCount, wiCount);
+		if(isBundle) {
+			if(viewCount==null || viewCount < 1){
+				viewCount = View.MAX_COUNT;
+			}
+			Integer wiCount = ((count == null) || (count < 1)) ? viewCount : count;
+			return wiCount;
+		}else{
+			Integer wiCount = ((count == null) || (count < 1) || (count > View.MAX_COUNT)) ? View.MAX_COUNT : count;
+			return NumberUtils.min(viewCount, wiCount);
+		}
 	}
 
 	protected void setProcessEdition(Business business, ProcessPlatformPlan processPlatformPlan) throws Exception {

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionBundle.java

@@ -53,7 +53,7 @@ class ActionBundle extends BaseAction {
 				wi = new Wi();
 			}
 			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(),
-					wi.getCount());
+					wi.getCount(), true);
 			List<String> os = this.fetchBundle(business, view, runtime);
 			Wo wo = new Wo();
 			wo.setValueList(os);

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionBundleWithQuery.java

@@ -51,7 +51,7 @@ class ActionBundleWithQuery extends BaseAction {
 				wi = new Wi();
 			}
 			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(),
-					wi.getCount());
+					wi.getCount(), true);
 			Wo wo = new Wo();
 			wo.setValueList(this.fetchBundle(business, view, runtime));
 			result.setData(wo);

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExcel.java

@@ -50,7 +50,7 @@ class ActionExcel extends BaseAction {
 			}
 			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
 			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(),
-					wi.getCount());
+					wi.getCount(), false);
 			runtime.bundleList = wi.getBundleList();
 			Plan plan = this.accessPlan(business, view, runtime);
 			String excelFlag = this.girdWriteToExcel(effectivePerson, business, plan, view);

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExcelWithQuery.java

@@ -48,7 +48,7 @@ class ActionExcelWithQuery extends BaseAction {
 			}
 			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
 			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(),
-					wi.getCount());
+					wi.getCount(), false);
 			runtime.bundleList = wi.getBundleList();
 			Plan plan = this.accessPlan(business, view, runtime);
 			String excelFlag = this.girdWriteToExcel(effectivePerson, business, plan, view);

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExecute.java

@@ -55,7 +55,7 @@ class ActionExecute extends BaseAction {
 				wi = new Wi();
 			}
 			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(),
-					wi.getCount());
+					wi.getCount(), false);
 			runtime.bundleList = wi.getBundleList();
 			Plan plan = this.accessPlan(business, view, runtime);
 			result.setData(plan);

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/ActionExecuteWithQuery.java

@@ -50,7 +50,8 @@ class ActionExecuteWithQuery extends BaseAction {
 			if (null == wi) {
 				wi = new Wi();
 			}
-			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(), wi.getCount());
+			Runtime runtime = this.runtime(effectivePerson, business, view, wi.getFilterList(), wi.getParameter(),
+					wi.getCount(), false);
 			runtime.bundleList = wi.getBundleList();
 			Plan plan = this.accessPlan(business, view, runtime);
 			result.setData(plan);

o2server/x_query_assemble_surface/src/main/java/com/x/query/assemble/surface/jaxrs/view/BaseAction.java

@@ -202,7 +202,7 @@ abstract class BaseAction extends StandardJaxrsAction {
 	}
 
 	protected Runtime runtime(EffectivePerson effectivePerson, Business business, View view,
-			List<FilterEntry> filterList, Map<String, String> parameter, Integer count) throws Exception {
+			List<FilterEntry> filterList, Map<String, String> parameter, Integer count, boolean isBundle) throws Exception {
 		Runtime runtime = new Runtime();
 		runtime.person = effectivePerson.getDistinguishedName();
 		runtime.identityList = business.organization().identity().listWithPerson(effectivePerson);
@@ -258,14 +258,22 @@ abstract class BaseAction extends StandardJaxrsAction {
 		}
 		runtime.parameter = parameter;
 		runtime.filterList = filterList;
-		runtime.count = this.getCount(view, count);
+		runtime.count = this.getCount(view, count, isBundle);
 		return runtime;
 	}
 
-	protected Integer getCount(View view, Integer count) {
+	protected Integer getCount(View view, Integer count, boolean isBundle) {
 		Integer viewCount = view.getCount();
-		Integer wiCount = ((count == null) || (count < 1) || (count > View.MAX_COUNT)) ? View.MAX_COUNT : count;
-		return NumberUtils.min(viewCount, wiCount);
+		if(isBundle) {
+			if(viewCount==null || viewCount < 1){
+				viewCount = View.MAX_COUNT;
+			}
+			Integer wiCount = ((count == null) || (count < 1)) ? viewCount : count;
+			return wiCount;
+		}else{
+			Integer wiCount = ((count == null) || (count < 1) || (count > View.MAX_COUNT)) ? View.MAX_COUNT : count;
+			return NumberUtils.min(viewCount, wiCount);
+		}
 	}
 
 }