脚本和数据字段增加分页查询接口

o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/script/ActionListPaging.java

@@ -3,12 +3,14 @@ package com.x.portal.assemble.designer.jaxrs.script;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.tools.ListTools;
 import com.x.portal.assemble.designer.Business;
+import com.x.portal.core.entity.Portal;
 import com.x.portal.core.entity.Script;
 
 import javax.persistence.EntityManager;
@@ -29,6 +31,15 @@ class ActionListPaging extends BaseAction {
 			CriteriaBuilder cb = em.getCriteriaBuilder();
 			Predicate p = cb.conjunction();;
 			List<Wo> wos = emc.fetchDescPaging(Script.class, Wo.copier, p, page, size, Script.sequence_FIELDNAME);
+			wos.stream().forEach(wo -> {
+				try {
+					Portal portal = emc.find(wo.getPortal(), Portal.class);
+					if(portal != null){
+						wo.setPortalName(portal.getName());
+					}
+				} catch (Exception e) {
+				}
+			});
 			result.setData(wos);
 			result.setCount(emc.count(Script.class, p));
 			return result;
@@ -42,5 +53,15 @@ class ActionListPaging extends BaseAction {
 		static WrapCopier<Script, Wo> copier = WrapCopierFactory.wo(Script.class, Wo.class, null,
 				ListTools.toList(JpaObject.FieldsInvisible, Script.dependScriptList_FIELDNAME, Script.text_FIELDNAME));
 
+		@FieldDescribe("门户应用名称.")
+		private String portalName;
+
+		public String getPortalName() {
+			return portalName;
+		}
+
+		public void setPortalName(String portalName) {
+			this.portalName = portalName;
+		}
 	}
 }

o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/applicationdict/ActionListPaging.java

@@ -3,11 +3,15 @@ package com.x.processplatform.assemble.designer.jaxrs.applicationdict;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
 import com.x.processplatform.assemble.designer.Business;
+import com.x.processplatform.core.entity.element.Application;
 import com.x.processplatform.core.entity.element.ApplicationDict;
 
 import javax.persistence.EntityManager;
@@ -16,6 +20,9 @@ import javax.persistence.criteria.Predicate;
 import java.util.List;
 
 class ActionListPaging extends BaseAction {
+
+	private static Logger logger = LoggerFactory.getLogger(ActionListPaging.class);
+
 	ActionResult<List<Wo>> execute(EffectivePerson effectivePerson, Integer page, Integer size) throws Exception {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			ActionResult<List<Wo>> result = new ActionResult<>();
@@ -28,6 +35,15 @@ class ActionListPaging extends BaseAction {
 			CriteriaBuilder cb = em.getCriteriaBuilder();
 			Predicate p = cb.conjunction();;
 			List<Wo> wos = emc.fetchDescPaging(ApplicationDict.class, Wo.copier, p, page, size, ApplicationDict.sequence_FIELDNAME);
+			wos.stream().forEach(wo -> {
+				try {
+					Application app = emc.find(wo.getApplication(), Application.class);
+					if(app != null){
+						wo.setApplicationName(app.getName());
+					}
+				} catch (Exception e) {
+				}
+			});
 			result.setData(wos);
 			result.setCount(emc.count(ApplicationDict.class, p));
 			return result;
@@ -41,5 +57,15 @@ class ActionListPaging extends BaseAction {
 		static WrapCopier<ApplicationDict, Wo> copier = WrapCopierFactory.wo(ApplicationDict.class, Wo.class, null,
 				JpaObject.FieldsInvisible);
 
+		@FieldDescribe("应用名称.")
+		private String applicationName;
+
+		public String getApplicationName() {
+			return applicationName;
+		}
+
+		public void setApplicationName(String applicationName) {
+			this.applicationName = applicationName;
+		}
 	}
 }

o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/script/ActionListPaging.java

@@ -3,11 +3,13 @@ package com.x.processplatform.assemble.designer.jaxrs.script;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.JpaObject;
+import com.x.base.core.project.annotation.FieldDescribe;
 import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.tools.ListTools;
+import com.x.processplatform.core.entity.element.Application;
 import com.x.processplatform.core.entity.element.Script;
 
 import javax.persistence.EntityManager;
@@ -23,6 +25,15 @@ class ActionListPaging extends BaseAction {
 			CriteriaBuilder cb = em.getCriteriaBuilder();
 			Predicate p = cb.conjunction();
 			List<Wo> wos = emc.fetchDescPaging(Script.class, Wo.copier, p, page, size, Script.sequence_FIELDNAME);
+			wos.stream().forEach(wo -> {
+				try {
+					Application app = emc.find(wo.getApplication(), Application.class);
+					if(app != null){
+						wo.setApplicationName(app.getName());
+					}
+				} catch (Exception e) {
+				}
+			});
 			result.setData(wos);
 			result.setCount(emc.count(Script.class, p));
 			return result;
@@ -36,5 +47,16 @@ class ActionListPaging extends BaseAction {
 		static WrapCopier<Script, Wo> copier = WrapCopierFactory.wo(Script.class, Wo.class, null,
 				ListTools.toList(JpaObject.FieldsInvisible, Script.dependScriptList_FIELDNAME, Script.text_FIELDNAME));
 
+		@FieldDescribe("应用名称.")
+		private String applicationName;
+
+		public String getApplicationName() {
+			return applicationName;
+		}
+
+		public void setApplicationName(String applicationName) {
+			this.applicationName = applicationName;
+		}
+
 	}
 }