From 794adc47ae9e5392475ca0e73bfa05196e6da1fa Mon Sep 17 00:00:00 2001 From: roo00 Date: Mon, 18 Feb 2019 14:59:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=B8=8A=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../container/EntityManagerContainer.java | 60 ++++-------------- .../SliceEntityManagerContainerFactory.java | 5 +- .../entity/AbstractPersistenceProperties.java | 14 ++--- .../com/x/base/core/entity/JpaObject.java | 13 +++- .../x/base/core/project/jaxrs/WrapIdList.java | 44 +++++++++++++ .../project/scripting/ScriptingEngine.java | 7 +++ .../x_attendance_assemble_control.java | 33 ---------- .../core/project/x_bbs_assemble_control.java | 61 ------------------- .../project/x_calendar_assemble_control.java | 42 ------------- .../x_collaboration_assemble_websocket.java | 32 ---------- .../x_collaboration_service_message.java | 28 --------- .../project/x_component_assemble_control.java | 17 ------ .../core/project/x_file_assemble_control.java | 46 +------------- .../project/x_general_assemble_control.java | 30 --------- .../project/x_hotpic_assemble_control.java | 39 ------------ .../project/x_meeting_assemble_control.java | 19 ------ .../x_message_assemble_communicate.java | 17 ------ .../core/project/x_mind_assemble_control.java | 22 ------- .../core/project/x_okr_assemble_control.java | 39 ------------ ..._organization_assemble_authentication.java | 17 ------ .../x_organization_assemble_control.java | 19 ------ .../x_organization_assemble_custom.java | 14 ----- .../x_organization_assemble_express.java | 19 ------ .../x_organization_assemble_personal.java | 20 ------ .../project/x_portal_assemble_designer.java | 19 ------ .../project/x_portal_assemble_surface.java | 19 +----- .../x_processplatform_assemble_bam.java | 49 +-------------- .../x_processplatform_assemble_designer.java | 53 ---------------- .../x_processplatform_assemble_surface.java | 53 ---------------- .../x_processplatform_service_processing.java | 54 ---------------- .../x/base/core/project/x_program_center.java | 48 --------------- .../project/x_query_assemble_surface.java | 38 ------------ .../project/x_query_service_processing.java | 38 ------------ 33 files changed, 88 insertions(+), 940 deletions(-) create mode 100644 o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WrapIdList.java diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java index bd088e8e63..576d4a8f37 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/EntityManagerContainer.java @@ -420,72 +420,36 @@ public class EntityManagerContainer extends EntityManagerContainerBasic { return em.createQuery(cq.select(cb.count(root))).getSingleResult(); } - public Long countGreaterThanDesc(Class cls, String attribute, Object value) - throws Exception { - EntityManager em = this.get(cls); - Query query = em.createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " > " - + "?1) order by o." + attribute + " DESC"); - query.setParameter(1, value); - return (Long) query.getSingleResult(); - } - - public Long countLessThanDesc(Class cls, String attribute, Object value) throws Exception { - EntityManager em = this.get(cls); - Query query = em.createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " < " - + "?1) order by o." + attribute + " DESC"); - query.setParameter(1, value); - return (Long) query.getSingleResult(); - } - - public Long countGreaterThanAsc(Class cls, String attribute, Object value) - throws Exception { + public Long countGreaterThan(Class cls, String attribute, Object value) throws Exception { EntityManager em = this.get(cls); - Query query = em.createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " > " - + "?1) order by o." + attribute + " ASC"); + Query query = em + .createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " > " + "?1)"); query.setParameter(1, value); return (Long) query.getSingleResult(); } - public Long countLessThanAsc(Class cls, String attribute, Object value) throws Exception { - EntityManager em = this.get(cls); - Query query = em.createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " < " - + "?1) order by o." + attribute + " ASC"); - query.setParameter(1, value); - return (Long) query.getSingleResult(); - } - - public Long countGreaterThanOrEqualToDesc(Class cls, String attribute, Object value) - throws Exception { - EntityManager em = this.get(cls); - Query query = em.createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " >= " - + "?1) order by o." + attribute + " DESC"); - query.setParameter(1, value); - return (Long) query.getSingleResult(); - } - - public Long countLessThanOrEqualToDesc(Class cls, String attribute, Object value) - throws Exception { + public Long countLessThan(Class cls, String attribute, Object value) throws Exception { EntityManager em = this.get(cls); - Query query = em.createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " <= " - + "?1) order by o." + attribute + " DESC"); + Query query = em + .createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " < " + "?1)"); query.setParameter(1, value); return (Long) query.getSingleResult(); } - public Long countGreaterThanOrEqualToAsc(Class cls, String attribute, Object value) + public Long countGreaterThanOrEqualTo(Class cls, String attribute, Object value) throws Exception { EntityManager em = this.get(cls); - Query query = em.createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " >= " - + "?1) order by o." + attribute + " ASC"); + Query query = em + .createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " >= " + "?1)"); query.setParameter(1, value); return (Long) query.getSingleResult(); } - public Long countLessThanOrEqualToAsc(Class cls, String attribute, Object value) + public Long countLessThanOrEqualTo(Class cls, String attribute, Object value) throws Exception { EntityManager em = this.get(cls); - Query query = em.createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " <= " - + "?1) order by o." + attribute + " ASC"); + Query query = em + .createQuery("select count(o) from " + cls.getName() + " o where (o." + attribute + " <= " + "?1)"); query.setParameter(1, value); return (Long) query.getSingleResult(); } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/SliceEntityManagerContainerFactory.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/SliceEntityManagerContainerFactory.java index 1b63e82ea2..259f6b1ca0 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/SliceEntityManagerContainerFactory.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/container/factory/SliceEntityManagerContainerFactory.java @@ -17,6 +17,7 @@ import java.util.concurrent.ConcurrentHashMap; import javax.persistence.EntityManagerFactory; import javax.persistence.Id; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.openjpa.persistence.OpenJPAPersistence; @@ -36,7 +37,6 @@ import com.x.base.core.entity.annotation.CheckRemove; import com.x.base.core.entity.annotation.Flag; import com.x.base.core.entity.annotation.RestrictFlag; import com.x.base.core.entity.tools.JpaObjectTools; -import com.x.base.core.project.AbstractContext; import com.x.base.core.project.config.DataMappings; import com.x.base.core.project.tools.ListTools; @@ -44,6 +44,7 @@ public abstract class SliceEntityManagerContainerFactory { // protected static String persistence_xml_path = "META-INF/x_persistence.xml"; protected static String PERSISTENCE_XML_PATH = "META-INF/persistence.xml"; + protected static String META_INF = "META-INF"; /* class 与 entityManagerFactory 映射表 */ protected Map, EntityManagerFactory> entityManagerFactoryMap = new ConcurrentHashMap, EntityManagerFactory>(); @@ -155,6 +156,8 @@ public abstract class SliceEntityManagerContainerFactory { } OutputFormat format = OutputFormat.createPrettyPrint(); format.setEncoding("UTF-8"); + File dir = new File(webApplicationDirectory + "/WEB-INF/classes/" + META_INF); + FileUtils.forceMkdir(dir); File file = new File(webApplicationDirectory + "/WEB-INF/classes/" + PERSISTENCE_XML_PATH); XMLWriter writer = new XMLWriter(new FileWriter(file), format); writer.write(document); diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/AbstractPersistenceProperties.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/AbstractPersistenceProperties.java index a4e916c43a..789e467dab 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/AbstractPersistenceProperties.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/AbstractPersistenceProperties.java @@ -2,13 +2,13 @@ package com.x.base.core.entity; public class AbstractPersistenceProperties { - public static final String defaultUnit = "x"; - - public static final String schema = "X"; - - public static final String orderColumn = "xorderColumn"; - - //public static final String xmlStrategy = "com.x.core.entity.xml.strats.XStreamValueHandler"; +// public static final String defaultUnit = "x"; +// +// public static final String schema = "X"; +// +// public static final String orderColumn = "xorderColumn"; +// +// //public static final String xmlStrategy = "com.x.core.entity.xml.strats.XStreamValueHandler"; public static final int file_name_length = JpaObject.length_255B; diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java index 8a9f34cd23..0c3dfb54fe 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JpaObject.java @@ -39,7 +39,7 @@ public abstract class JpaObject extends GsonPropertyObject implements Serializab } abstract public void onPersist() throws Exception; - + public static final String default_schema = "X"; public static final String ColumnNamePrefix = "x"; @@ -68,7 +68,7 @@ public abstract class JpaObject extends GsonPropertyObject implements Serializab public static final String updateTime_FIELDNAME = "updateTime"; - public static final String sequence_FIELDNAME = "sequence"; + public static final String sequence_FIELDNAME = "sequence"; public static final String distributeFactor_FIELDNAME = "distributeFactor"; @@ -232,6 +232,7 @@ public abstract class JpaObject extends GsonPropertyObject implements Serializab public static final String CREATETIMECOLUMN = "xcreateTime"; public static final String UPDATETIMECOLUMN = "xupdateTime"; public static final String SEQUENCECOLUMN = "xsequence"; + public static final String ORDERCOLUMNCOLUMN = "xorderColumn"; public static final String DISTINGUISHEDNAME = "distinguishedName"; @@ -334,4 +335,12 @@ public abstract class JpaObject extends GsonPropertyObject implements Serializab this.onPersist(); } + public static T cast(Class cls, List fields, Object[] objects) throws Exception { + T t = cls.newInstance(); + for (int i = 0; i < fields.size(); i++) { + PropertyUtils.setProperty(t, fields.get(i), objects[i]); + } + return t; + } + } \ No newline at end of file diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WrapIdList.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WrapIdList.java new file mode 100644 index 0000000000..734f062274 --- /dev/null +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/jaxrs/WrapIdList.java @@ -0,0 +1,44 @@ +package com.x.base.core.project.jaxrs; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import com.x.base.core.project.annotation.FieldDescribe; +import com.x.base.core.project.gson.GsonPropertyObject; + +public class WrapIdList extends GsonPropertyObject { + + public WrapIdList() { + } + + public WrapIdList(Collection collection) { + this.idList = new ArrayList(collection); + } + + @FieldDescribe("标识符.") + private List idList = new ArrayList<>(); + + public List add(String value, Boolean unique) { + if (this.idList == null) { + this.idList = new ArrayList<>(); + } + if (unique) { + if (!this.idList.contains(value)) { + this.idList.add(value); + } + } else { + this.idList.add(value); + } + return this.idList; + } + + public List getIdList() { + return idList; + } + + public void setIdList(List idList) { + this.idList = idList; + } + +} \ No newline at end of file diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/scripting/ScriptingEngine.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/scripting/ScriptingEngine.java index c3a2a4d0ba..528a126bee 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/scripting/ScriptingEngine.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/scripting/ScriptingEngine.java @@ -13,6 +13,7 @@ import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.StringUtils; import com.x.base.core.project.exception.ExceptionScriptEval; +import com.x.base.core.project.http.EffectivePerson; import jdk.nashorn.api.scripting.ScriptObjectMirror; @@ -30,6 +31,7 @@ public class ScriptingEngine { public static final String BINDINGNAME__LOOKUP = "lookup"; public static final String BINDINGNAME_APPLICATIONS = "applications"; public static final String BINDINGNAME_PARAMETER = "parameter"; + public static final String BINDINGNAME_EFFECTIVEPERSON = "effectivePerson"; public ScriptingEngine(ScriptEngine scriptEngine) { this.scriptEngine = scriptEngine; @@ -76,6 +78,11 @@ public class ScriptingEngine { this.scriptEngine.put(BINDINGNAME_APPLICATIONS, o); return this; } + + public ScriptingEngine bindingEffectivePerson(EffectivePerson effectivePerson) { + this.scriptEngine.put(BINDINGNAME_EFFECTIVEPERSON, effectivePerson); + return this; + } public ScriptingEngine bindingParameter(Object o) { this.scriptEngine.put(BINDINGNAME_PARAMETER, o); diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_attendance_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_attendance_assemble_control.java index 839e1f84f6..c7476f3380 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_attendance_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_attendance_assemble_control.java @@ -32,37 +32,4 @@ public class x_attendance_assemble_control extends AssembleA { dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); } - -// public static final Dependency dependency = new Dependency(); -// -// static { -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceAdmin"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceAppealInfo"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceDetail"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceDetailMobile"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceEmployeeConfig"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceImportFileInfo"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceScheduleSetting"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceSetting"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceSelfHoliday"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceStatisticalCycle"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceStatisticRequireLog"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceWorkDayConfig"); -// dependency.containerEntities.add("com.x.attendance.entity.AttendanceWorkPlace"); -// dependency.containerEntities.add("com.x.attendance.entity.StatisticPersonForMonth"); -// dependency.containerEntities.add("com.x.attendance.entity.StatisticTopUnitForDay"); -// dependency.containerEntities.add("com.x.attendance.entity.StatisticTopUnitForMonth"); -// dependency.containerEntities.add("com.x.attendance.entity.StatisticUnitForDay"); -// dependency.containerEntities.add("com.x.attendance.entity.StatisticUnitForMonth"); -// dependency.storeJars.add(x_attendance_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); -// dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); -// } - -// public static final String name = "考勤"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_bbs_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_bbs_assemble_control.java index f4e54b247f..8600fc1584 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_bbs_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_bbs_assemble_control.java @@ -33,65 +33,4 @@ public class x_bbs_assemble_control extends AssembleA { dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); } - -// public static final Dependency dependency = new Dependency(); -// -// static { -// dependency.containerEntities.add("com.x.bbs.entity.BBSForumInfo"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSSectionInfo"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSSubjectInfo"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSSubjectContent"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSSubjectInfo"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSReplyInfo"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSSubjectAttachment"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSOperationRecord"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSUserInfo"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSUserRole"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSRoleInfo"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSPermissionRole"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSPermissionInfo"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSConfigSetting"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSVoteRecord"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSVoteOption"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSVoteOptionGroup"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSSubjectVoteResult"); -// dependency.storageTypes.add(StorageType.bbs.toString()); -// dependency.storeJars.add(x_bbs_core_entity.class.getName()); -// dependency.storeJars.add(x_organization_core_express.class.getName()); -// dependency.storeJars.add(x_organization_core_entity.class.getName()); -// dependency.storeJars.add(x_collaboration_core_message.class.getName()); -// } - -// public static final String name = "论坛"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.bbs.entity.BBSForumInfo"); -// containerEntities.add("com.x.bbs.entity.BBSSectionInfo"); -// containerEntities.add("com.x.bbs.entity.BBSSubjectInfo"); -// containerEntities.add("com.x.bbs.entity.BBSSubjectContent"); -// containerEntities.add("com.x.bbs.entity.BBSSubjectInfo"); -// containerEntities.add("com.x.bbs.entity.BBSReplyInfo"); -// containerEntities.add("com.x.bbs.entity.BBSSubjectAttachment"); -// containerEntities.add("com.x.bbs.entity.BBSOperationRecord"); -// containerEntities.add("com.x.bbs.entity.BBSUserInfo"); -// containerEntities.add("com.x.bbs.entity.BBSUserRole"); -// containerEntities.add("com.x.bbs.entity.BBSRoleInfo"); -// containerEntities.add("com.x.bbs.entity.BBSPermissionRole"); -// containerEntities.add("com.x.bbs.entity.BBSPermissionInfo"); -// containerEntities.add("com.x.bbs.entity.BBSConfigSetting"); -// containerEntities.add("com.x.bbs.entity.BBSVoteRecord"); -// containerEntities.add("com.x.bbs.entity.BBSVoteOption"); -// containerEntities.add("com.x.bbs.entity.BBSVoteOptionGroup"); -// containerEntities.add("com.x.bbs.entity.BBSSubjectVoteResult"); -// usedStorageTypes.add(StorageType.bbs); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_bbs_core_entity.class); -// dependents.add(x_collaboration_core_message.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_calendar_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_calendar_assemble_control.java index 1cf7eeb937..b536ae55ee 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_calendar_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_calendar_assemble_control.java @@ -20,46 +20,4 @@ public class x_calendar_assemble_control extends AssembleA { dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); dependency.storeJars.add(x_calendar_core_entity.class.getSimpleName()); } - -// public static final Dependency dependency = new Dependency(); -// -// static { -// dependency.containerEntities.add("com.x.calendar.core.entity.Calendar"); -// dependency.containerEntities.add("com.x.calendar.core.entity.Calendar_Event"); -// dependency.containerEntities.add("com.x.calendar.core.entity.Calendar_EventRepeatMaster"); -// dependency.containerEntities.add("com.x.calendar.core.entity.Calendar_Setting"); -// dependency.containerEntities.add("com.x.calendar.core.entity.Calendar_SettingLobValue"); -// dependency.storageTypes.add(StorageType.calendar.toString()); -// dependency.storeJars.add(x_bbs_core_entity.class.getName()); -// dependency.storeJars.add(x_organization_core_express.class.getName()); -// dependency.storeJars.add(x_organization_core_entity.class.getName()); -// dependency.storeJars.add(x_collaboration_core_message.class.getName()); -// } - -// public static final String name = "日程管理"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.calendar.core.entity.Calendar"); -// containerEntities.add("com.x.calendar.core.entity.Calendar_Event"); -// containerEntities.add("com.x.calendar.core.entity.Calendar_EventRepeatMaster"); -// containerEntities.add("com.x.calendar.core.entity.Calendar_Setting"); -// containerEntities.add("com.x.calendar.core.entity.Calendar_SettingLobValue"); -// -// usedStorageTypes.add(StorageType.calendar); -// -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_calendar_core_entity.class); -// } - -// protected void custom(File lib, String xLib) throws Exception { -// } -// -// public static void main(String[] args) { -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_collaboration_assemble_websocket.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_collaboration_assemble_websocket.java index 833cd64c43..0f60566ff4 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_collaboration_assemble_websocket.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_collaboration_assemble_websocket.java @@ -18,36 +18,4 @@ public class x_collaboration_assemble_websocket extends AssembleA { dependency.storeJars.add(x_collaboration_service_message.class.getSimpleName()); dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); } - -// public static final Dependency dependency = new Dependency(); -// -// static { -// -// dependency.containerEntities.add("com.x.collaboration.core.entity.SMSMessage"); -// dependency.containerEntities.add("com.x.collaboration.core.entity.Notification"); -// dependency.containerEntities.add("com.x.collaboration.core.entity.Dialog"); -// dependency.containerEntities.add("com.x.collaboration.core.entity.Talk"); -// -//// dependency.storageTypes.add(StorageType.cms.toString()); -//// dependency.storageTypes.add(StorageType.processPlatform.toString()); -// dependency.storeJars.add(x_collaboration_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); -// dependency.storeJars.add(x_collaboration_service_message.class.getSimpleName()); -// dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); -// } - -// public static final String name = "协作"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// -// dependents.add(x_base_core_project.class); -// dependents.add(x_collaboration_core_message.class); -// dependents.add(x_collaboration_core_entity.class); -// dependents.add(x_collaboration_service_message.class); -// dependents.add(x_organization_core_express.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_collaboration_service_message.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_collaboration_service_message.java index 7f37aeb6ff..a80e2e003f 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_collaboration_service_message.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_collaboration_service_message.java @@ -1,16 +1,8 @@ package com.x.base.core.project; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - -import com.x.base.core.entity.StorageType; import com.x.base.core.project.annotation.Module; import com.x.base.core.project.annotation.ModuleCategory; import com.x.base.core.project.annotation.ModuleType; -import com.x.base.core.project.gson.XGsonBuilder; @Module(type = ModuleType.SERVICE, category = ModuleCategory.OFFICIAL, name = "协作服务") public class x_collaboration_service_message extends ServiceA { @@ -21,24 +13,4 @@ public class x_collaboration_service_message extends ServiceA { dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); } - -// public static final Dependency dependency = new Dependency(); -// -// static { -// dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); -// dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); -// } -// public static final String name = "协作服务"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// dependents.add(x_base_core_project.class); -// dependents.add(x_collaboration_core_message.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_collaboration_core_entity.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_component_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_component_assemble_control.java index e78e2ac446..6a74b98c11 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_component_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_component_assemble_control.java @@ -12,21 +12,4 @@ public class x_component_assemble_control extends AssembleA { dependency.containerEntities.add("com.x.component.core.entity.Component"); dependency.storeJars.add(x_component_core_entity.class.getSimpleName()); } - -// public static final Dependency dependency = new Dependency(); -// -// static { -// dependency.containerEntities.add("com.x.component.core.entity.Component"); -// dependency.storeJars.add(x_component_core_entity.class.getSimpleName()); -// } -// public static final String name = "组件"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.component.core.entity.Component"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_component_core_entity.class); -// } } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_file_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_file_assemble_control.java index 03dff21ec5..8abd400e5d 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_file_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_file_assemble_control.java @@ -1,20 +1,13 @@ package com.x.base.core.project; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.x.base.core.entity.StorageType; import com.x.base.core.project.annotation.Module; import com.x.base.core.project.annotation.ModuleCategory; import com.x.base.core.project.annotation.ModuleType; -import com.x.base.core.project.gson.XGsonBuilder; @Module(type = ModuleType.ASSEMBLE, category = ModuleCategory.OFFICIAL, name = "云文件") public class x_file_assemble_control extends AssembleA { - + public x_file_assemble_control() { super(); dependency.containerEntities.add("com.x.file.core.entity.personal.Folder"); @@ -27,41 +20,4 @@ public class x_file_assemble_control extends AssembleA { dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); } - -// public static final Dependency dependency = new Dependency(); -// -// static { -// dependency.containerEntities.add("com.x.file.core.entity.personal.Folder"); -// dependency.containerEntities.add("com.x.file.core.entity.personal.Attachment"); -// dependency.containerEntities.add("com.x.file.core.entity.open.File"); -// dependency.storageTypes.add(StorageType.file.toString()); -// dependency.storeJars.add(x_collaboration_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); -// dependency.storeJars.add(x_file_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); -// } -// -// public static final String name = "云文件"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.file.core.entity.personal.Folder"); -// containerEntities.add("com.x.file.core.entity.personal.Attachment"); -// containerEntities.add("com.x.file.core.entity.open.File"); -// usedStorageTypes.add(StorageType.file); -// dependents.add(x_base_core_project.class); -// dependents.add(x_collaboration_core_entity.class); -// dependents.add(x_collaboration_core_message.class); -// dependents.add(x_file_core_entity.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// } - - protected void custom(File lib, String xLib) throws Exception { - - } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_general_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_general_assemble_control.java index 67af4ae179..ea90699985 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_general_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_general_assemble_control.java @@ -1,7 +1,5 @@ package com.x.base.core.project; -import java.io.File; - import com.x.base.core.entity.StorageType; import com.x.base.core.project.annotation.Module; import com.x.base.core.project.annotation.ModuleCategory; @@ -18,32 +16,4 @@ public class x_general_assemble_control extends AssembleA { dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); dependency.storeJars.add(x_general_core_entity.class.getSimpleName()); } - -// public static final Dependency dependency = new Dependency(); -// -// static { -// dependency.containerEntities.add("com.x.general.core.entity.area.District"); -// dependency.storageTypes.add(StorageType.file.toString()); -// dependency.storeJars.add(x_collaboration_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); -// dependency.storeJars.add(x_general_core_entity.class.getSimpleName()); -// } - -// public static final String name = "公共模块"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.general.core.entity.area.District"); -// usedStorageTypes.add(StorageType.file); -// dependents.add(x_base_core_project.class); -// dependents.add(x_collaboration_core_entity.class); -// dependents.add(x_collaboration_core_message.class); -// dependents.add(x_general_core_entity.class); -// } - - protected void custom(File lib, String xLib) throws Exception { - } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_hotpic_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_hotpic_assemble_control.java index b8d181d52f..85a32b30ea 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_hotpic_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_hotpic_assemble_control.java @@ -1,7 +1,5 @@ package com.x.base.core.project; -import java.io.File; - import com.x.base.core.entity.StorageType; import com.x.base.core.project.annotation.Module; import com.x.base.core.project.annotation.ModuleCategory; @@ -23,41 +21,4 @@ public class x_hotpic_assemble_control extends AssembleA { dependency.storeJars.add(x_cms_core_entity.class.getSimpleName()); dependency.storeJars.add(x_bbs_core_entity.class.getSimpleName()); } - -// public static final Dependency dependency = new Dependency(); -// -// static { -// dependency.containerEntities.add("com.x.hotpic.entity.HotPictureInfo"); -// dependency.containerEntities.add("com.x.bbs.entity.BBSSubjectInfo"); -// dependency.containerEntities.add("com.x.cms.core.entity.Document"); -// dependency.storageTypes.add(StorageType.file.toString()); -// dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); -// dependency.storeJars.add(x_hotpic_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); -// dependency.storeJars.add(x_cms_core_entity.class.getSimpleName()); -// dependency.storeJars.add(x_bbs_core_entity.class.getSimpleName()); -// } - -// public static final String name = "热点图片"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.hotpic.entity.HotPictureInfo"); -// containerEntities.add("com.x.bbs.entity.BBSSubjectInfo"); -// containerEntities.add("com.x.cms.core.entity.Document"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_hotpic_core_entity.class); -// dependents.add(x_collaboration_core_message.class); -// dependents.add(x_cms_core_entity.class); -// dependents.add(x_bbs_core_entity.class); -// } - - protected void custom(File lib, String xLib) throws Exception { - } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_meeting_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_meeting_assemble_control.java index f7366799c3..21b5242557 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_meeting_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_meeting_assemble_control.java @@ -20,23 +20,4 @@ public class x_meeting_assemble_control extends AssembleA { dependency.storeJars.add(x_meeting_core_entity.class.getSimpleName()); dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); } - -// public static final String name = "会议管理"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.meeting.core.entity.Building"); -// containerEntities.add("com.x.meeting.core.entity.Room"); -// containerEntities.add("com.x.meeting.core.entity.Meeting"); -// containerEntities.add("com.x.meeting.core.entity.Attachment"); -// usedStorageTypes.add(StorageType.meeting); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_meeting_core_entity.class); -// dependents.add(x_collaboration_core_message.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_message_assemble_communicate.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_message_assemble_communicate.java index 2c593cd741..77c0e66383 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_message_assemble_communicate.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_message_assemble_communicate.java @@ -16,21 +16,4 @@ public class x_message_assemble_communicate extends AssembleA { dependency.storeJars.add(x_processplatform_core_entity.class.getSimpleName()); dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); } - -// public static final String name = "消息通讯"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.message.core.entity.Message"); -// containerEntities.add("com.x.message.core.entity.Mass"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_message_core_entity.class); -// dependents.add(x_meeting_core_entity.class); -// dependents.add(x_processplatform_core_entity.class); -// dependents.add(x_organization_core_express.class); -// } -// - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_mind_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_mind_assemble_control.java index 5247c5ecba..1a6004997b 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_mind_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_mind_assemble_control.java @@ -22,26 +22,4 @@ public class x_mind_assemble_control extends AssembleA { dependency.storeJars.add(x_mind_core_entity.class.getSimpleName()); dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); } - -// public static final String name = "脑图"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.mind.entity.MindBaseInfo"); -// containerEntities.add("com.x.mind.entity.MindContentInfo"); -// containerEntities.add("com.x.mind.entity.MindFolderInfo"); -// containerEntities.add("com.x.mind.entity.MindIconInfo"); -// containerEntities.add("com.x.mind.entity.MindRecycleInfo"); -// containerEntities.add("com.x.mind.entity.MindShareRecord"); -// containerEntities.add("com.x.mind.entity.MindVersionInfo"); -// containerEntities.add("com.x.mind.entity.MindVersionContent"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_mind_core_entity.class); -// dependents.add(x_collaboration_core_message.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_okr_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_okr_assemble_control.java index 1d7294acaf..252e05b86a 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_okr_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_okr_assemble_control.java @@ -40,43 +40,4 @@ public class x_okr_assemble_control extends AssembleA { dependency.storeJars.add(x_okr_core_entity.class.getSimpleName()); dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); } - -// public static final String name = "OKR"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.okr.entity.OkrAttachmentFileInfo"); -// containerEntities.add("com.x.okr.entity.OkrCenterWorkInfo"); -// containerEntities.add("com.x.okr.entity.OkrConfigSecretary"); -// containerEntities.add("com.x.okr.entity.OkrConfigSystem"); -// containerEntities.add("com.x.okr.entity.OkrConfigWorkLevel"); -// containerEntities.add("com.x.okr.entity.OkrConfigWorkType"); -// containerEntities.add("com.x.okr.entity.OkrTask"); -// containerEntities.add("com.x.okr.entity.OkrTaskHandled"); -// containerEntities.add("com.x.okr.entity.OkrWorkAuthorizeRecord"); -// containerEntities.add("com.x.okr.entity.OkrWorkBaseInfo"); -// containerEntities.add("com.x.okr.entity.OkrWorkDetailInfo"); -// containerEntities.add("com.x.okr.entity.OkrWorkDynamics"); -// containerEntities.add("com.x.okr.entity.OkrWorkPerson"); -// containerEntities.add("com.x.okr.entity.OkrWorkReportBaseInfo"); -// containerEntities.add("com.x.okr.entity.OkrWorkReportDetailInfo"); -// containerEntities.add("com.x.okr.entity.OkrWorkReportPersonLink"); -// containerEntities.add("com.x.okr.entity.OkrWorkReportProcessLog"); -// containerEntities.add("com.x.okr.entity.OkrWorkChat"); -// containerEntities.add("com.x.okr.entity.OkrStatisticReportContent"); -// containerEntities.add("com.x.okr.entity.OkrStatisticReportStatus"); -// containerEntities.add("com.x.okr.entity.OkrUserInfo"); -// containerEntities.add("com.x.okr.entity.OkrErrorSystemIdentityInfo"); -// containerEntities.add("com.x.okr.entity.OkrErrorIdentityRecords"); -// containerEntities.add("com.x.okr.entity.OkrWorkAppraiseInfo"); -// usedStorageTypes.add(StorageType.okr); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_okr_core_entity.class); -// dependents.add(x_collaboration_core_message.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_authentication.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_authentication.java index fbcc918629..d178becbb4 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_authentication.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_authentication.java @@ -17,21 +17,4 @@ public class x_organization_assemble_authentication extends AssembleA { dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); } - -// public static final String name = "组织管理认证"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.organization.core.entity.Person"); -// containerEntities.add("com.x.organization.core.entity.Identity"); -// containerEntities.add("com.x.organization.core.entity.Role"); -// containerEntities.add("com.x.organization.core.entity.Bind"); -// containerEntities.add("com.x.organization.core.entity.OauthCode"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java index 0f20a95ea8..77f7e02e74 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java @@ -20,23 +20,4 @@ public class x_organization_assemble_control extends AssembleA { dependency.containerEntities.add("com.x.organization.core.entity.UnitDuty"); dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); } - -// public static final String name = "组织管理"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.organization.core.entity.Group"); -// containerEntities.add("com.x.organization.core.entity.Custom"); -// containerEntities.add("com.x.organization.core.entity.Role"); -// containerEntities.add("com.x.organization.core.entity.Person"); -// containerEntities.add("com.x.organization.core.entity.Identity"); -// containerEntities.add("com.x.organization.core.entity.PersonAttribute"); -// containerEntities.add("com.x.organization.core.entity.Unit"); -// containerEntities.add("com.x.organization.core.entity.UnitAttribute"); -// containerEntities.add("com.x.organization.core.entity.UnitDuty"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// } } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_custom.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_custom.java index c6927da395..b9b802664d 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_custom.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_custom.java @@ -14,18 +14,4 @@ public class x_organization_assemble_custom extends AssembleA { dependency.containerEntities.add("com.x.organization.core.entity.Definition"); dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); } - -// public static final String name = "布局"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.organization.core.entity.Custom"); -// containerEntities.add("com.x.organization.core.entity.Person"); -// containerEntities.add("com.x.organization.core.entity.Definition"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// } - } \ No newline at end of file diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_express.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_express.java index 69f73633b7..e98641b03f 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_express.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_express.java @@ -19,23 +19,4 @@ public class x_organization_assemble_express extends AssembleA { dependency.containerEntities.add("com.x.organization.core.entity.UnitDuty"); dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); } - -// public static final String name = "组织管理查询"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.organization.core.entity.Group"); -// containerEntities.add("com.x.organization.core.entity.Role"); -// containerEntities.add("com.x.organization.core.entity.Person"); -// containerEntities.add("com.x.organization.core.entity.PersonAttribute"); -// containerEntities.add("com.x.organization.core.entity.Identity"); -// containerEntities.add("com.x.organization.core.entity.Unit"); -// containerEntities.add("com.x.organization.core.entity.UnitAttribute"); -// containerEntities.add("com.x.organization.core.entity.UnitDuty"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_personal.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_personal.java index 295f902681..8fa0f61593 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_personal.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_personal.java @@ -20,24 +20,4 @@ public class x_organization_assemble_personal extends AssembleA { dependency.storeJars.add(x_organization_core_entity.class.getSimpleName()); dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); } - -// public static final String name = "组织管理个人"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.organization.core.entity.Group"); -// containerEntities.add("com.x.organization.core.entity.Role"); -// containerEntities.add("com.x.organization.core.entity.Person"); -// containerEntities.add("com.x.organization.core.entity.PersonAttribute"); -// containerEntities.add("com.x.organization.core.entity.Identity"); -// containerEntities.add("com.x.organization.core.entity.Unit"); -// containerEntities.add("com.x.organization.core.entity.UnitAttribute"); -// containerEntities.add("com.x.organization.core.entity.UnitDuty"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_designer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_designer.java index c9b8f94700..cdf74bf891 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_designer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_designer.java @@ -19,23 +19,4 @@ public class x_portal_assemble_designer extends AssembleA { dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); dependency.storeJars.add(x_portal_core_entity.class.getSimpleName()); } - -// public static final String name = "门户设计"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.portal.core.entity.Portal"); -// containerEntities.add("com.x.portal.core.entity.Widget"); -// containerEntities.add("com.x.portal.core.entity.Page"); -// containerEntities.add("com.x.portal.core.entity.Script"); -// containerEntities.add("com.x.portal.core.entity.File"); -// containerEntities.add("com.x.portal.core.entity.TemplatePage"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_portal_core_entity.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_surface.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_surface.java index 5a79155e7d..557fb1e66c 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_surface.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_portal_assemble_surface.java @@ -18,21 +18,4 @@ public class x_portal_assemble_surface extends AssembleA { dependency.storeJars.add(x_organization_core_express.class.getSimpleName()); dependency.storeJars.add(x_portal_core_entity.class.getSimpleName()); } - -// public static final String name = "门户"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.portal.core.entity.Portal"); -// containerEntities.add("com.x.portal.core.entity.Widget"); -// containerEntities.add("com.x.portal.core.entity.Page"); -// containerEntities.add("com.x.portal.core.entity.Script"); -// containerEntities.add("com.x.portal.core.entity.File"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_portal_core_entity.class); -// } -} +} \ No newline at end of file diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_bam.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_bam.java index 219c7acfdd..8081d98648 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_bam.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_bam.java @@ -48,51 +48,4 @@ public class x_processplatform_assemble_bam extends AssembleA { dependency.storeJars.add(x_processplatform_core_entity.class.getSimpleName()); dependency.storeJars.add(x_query_core_entity.class.getSimpleName()); } - -// public static final String name = "流程监控"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.processplatform.core.entity.content.Attachment"); -// containerEntities.add("com.x.processplatform.core.entity.content.Read"); -// containerEntities.add("com.x.processplatform.core.entity.content.ReadCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.Review"); -// containerEntities.add("com.x.processplatform.core.entity.content.SerialNumber"); -// containerEntities.add("com.x.processplatform.core.entity.content.Task"); -// containerEntities.add("com.x.processplatform.core.entity.content.TaskCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.Work"); -// containerEntities.add("com.x.processplatform.core.entity.content.WorkCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.WorkLog"); -// containerEntities.add("com.x.processplatform.core.entity.element.Agent"); -// containerEntities.add("com.x.processplatform.core.entity.element.Application"); -// containerEntities.add("com.x.processplatform.core.entity.element.ApplicationDict"); -// containerEntities.add("com.x.processplatform.core.entity.element.ApplicationDictItem"); -// containerEntities.add("com.x.processplatform.core.entity.element.Begin"); -// containerEntities.add("com.x.processplatform.core.entity.element.Cancel"); -// containerEntities.add("com.x.processplatform.core.entity.element.Choice"); -// containerEntities.add("com.x.processplatform.core.entity.element.Delay"); -// containerEntities.add("com.x.processplatform.core.entity.element.Embed"); -// containerEntities.add("com.x.processplatform.core.entity.element.End"); -// containerEntities.add("com.x.processplatform.core.entity.element.Form"); -// containerEntities.add("com.x.processplatform.core.entity.element.Invoke"); -// containerEntities.add("com.x.processplatform.core.entity.element.Manual"); -// containerEntities.add("com.x.processplatform.core.entity.element.Merge"); -// containerEntities.add("com.x.processplatform.core.entity.element.Message"); -// containerEntities.add("com.x.processplatform.core.entity.element.Parallel"); -// containerEntities.add("com.x.processplatform.core.entity.element.Process"); -// containerEntities.add("com.x.processplatform.core.entity.element.Route"); -// containerEntities.add("com.x.processplatform.core.entity.element.Script"); -// containerEntities.add("com.x.processplatform.core.entity.element.Service"); -// containerEntities.add("com.x.processplatform.core.entity.element.Split"); -// containerEntities.add("com.x.processplatform.core.entity.element.QueryView"); -// containerEntities.add("com.x.query.core.entity.Item"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_processplatform_core_entity.class); -// dependents.add(x_query_core_entity.class); -// } - -} +} \ No newline at end of file diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_designer.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_designer.java index 1d0a3e9e5c..8edb5b6314 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_designer.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_designer.java @@ -54,57 +54,4 @@ public class x_processplatform_assemble_designer extends AssembleA { dependency.storeJars.add(x_processplatform_core_entity.class.getSimpleName()); dependency.storeJars.add(x_query_core_entity.class.getSimpleName()); } - -// public static final String name = "流程设计"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.processplatform.core.entity.content.Attachment"); -// containerEntities.add("com.x.processplatform.core.entity.content.Read"); -// containerEntities.add("com.x.processplatform.core.entity.content.ReadCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.Review"); -// containerEntities.add("com.x.processplatform.core.entity.content.Hint"); -// containerEntities.add("com.x.processplatform.core.entity.content.SerialNumber"); -// containerEntities.add("com.x.processplatform.core.entity.content.Task"); -// containerEntities.add("com.x.processplatform.core.entity.content.TaskCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.Work"); -// containerEntities.add("com.x.processplatform.core.entity.content.WorkCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.WorkLog"); -// containerEntities.add("com.x.processplatform.core.entity.element.Invoke"); -// containerEntities.add("com.x.processplatform.core.entity.element.Message"); -// containerEntities.add("com.x.processplatform.core.entity.element.Split"); -// containerEntities.add("com.x.processplatform.core.entity.element.File"); -// containerEntities.add("com.x.processplatform.core.entity.element.Form"); -// containerEntities.add("com.x.processplatform.core.entity.element.FormField"); -// containerEntities.add("com.x.processplatform.core.entity.element.TemplateForm"); -// containerEntities.add("com.x.processplatform.core.entity.element.Application"); -// containerEntities.add("com.x.processplatform.core.entity.element.Script"); -// containerEntities.add("com.x.processplatform.core.entity.element.Merge"); -// containerEntities.add("com.x.processplatform.core.entity.element.Agent"); -// containerEntities.add("com.x.processplatform.core.entity.element.Process"); -// containerEntities.add("com.x.processplatform.core.entity.element.Choice"); -// containerEntities.add("com.x.processplatform.core.entity.element.Delay"); -// containerEntities.add("com.x.processplatform.core.entity.element.Parallel"); -// containerEntities.add("com.x.processplatform.core.entity.element.Begin"); -// containerEntities.add("com.x.processplatform.core.entity.element.Cancel"); -// containerEntities.add("com.x.processplatform.core.entity.element.Embed"); -// containerEntities.add("com.x.processplatform.core.entity.element.Service"); -// containerEntities.add("com.x.processplatform.core.entity.element.Manual"); -// containerEntities.add("com.x.processplatform.core.entity.element.Route"); -// containerEntities.add("com.x.processplatform.core.entity.element.End"); -// containerEntities.add("com.x.processplatform.core.entity.element.ApplicationDict"); -// containerEntities.add("com.x.processplatform.core.entity.element.ApplicationDictItem"); -// containerEntities.add("com.x.processplatform.core.entity.element.QueryView"); -// containerEntities.add("com.x.processplatform.core.entity.element.QueryStat"); -// containerEntities.add("com.x.query.core.entity.Item"); -// usedStorageTypes.add(StorageType.processPlatform); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_processplatform_core_entity.class); -// dependents.add(x_query_core_entity.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_surface.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_surface.java index bb37f2b0e0..7ab806162e 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_surface.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_assemble_surface.java @@ -53,57 +53,4 @@ public class x_processplatform_assemble_surface extends AssembleA { dependency.storeJars.add(x_processplatform_core_entity.class.getSimpleName()); dependency.storeJars.add(x_query_core_entity.class.getSimpleName()); } - -// public static final String name = "流程"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.processplatform.core.entity.content.Attachment"); -// containerEntities.add("com.x.processplatform.core.entity.content.Read"); -// containerEntities.add("com.x.processplatform.core.entity.content.ReadCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.Review"); -// containerEntities.add("com.x.processplatform.core.entity.content.Hint"); -// containerEntities.add("com.x.processplatform.core.entity.content.SerialNumber"); -// containerEntities.add("com.x.processplatform.core.entity.content.Task"); -// containerEntities.add("com.x.processplatform.core.entity.content.TaskCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.Work"); -// containerEntities.add("com.x.processplatform.core.entity.content.WorkCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.WorkLog"); -// containerEntities.add("com.x.processplatform.core.entity.element.Agent"); -// containerEntities.add("com.x.processplatform.core.entity.element.Application"); -// containerEntities.add("com.x.processplatform.core.entity.element.ApplicationDict"); -// containerEntities.add("com.x.processplatform.core.entity.element.ApplicationDictItem"); -// // containerEntities.add("com.x.processplatform.core.entity.element.ApplicationDictLobItem"); -// containerEntities.add("com.x.processplatform.core.entity.element.Begin"); -// containerEntities.add("com.x.processplatform.core.entity.element.Cancel"); -// containerEntities.add("com.x.processplatform.core.entity.element.Choice"); -// containerEntities.add("com.x.processplatform.core.entity.element.Delay"); -// containerEntities.add("com.x.processplatform.core.entity.element.Embed"); -// containerEntities.add("com.x.processplatform.core.entity.element.End"); -// containerEntities.add("com.x.processplatform.core.entity.element.File"); -// containerEntities.add("com.x.processplatform.core.entity.element.Form"); -// containerEntities.add("com.x.processplatform.core.entity.element.FormField"); -// containerEntities.add("com.x.processplatform.core.entity.element.Invoke"); -// containerEntities.add("com.x.processplatform.core.entity.element.Manual"); -// containerEntities.add("com.x.processplatform.core.entity.element.Merge"); -// containerEntities.add("com.x.processplatform.core.entity.element.Message"); -// containerEntities.add("com.x.processplatform.core.entity.element.Parallel"); -// containerEntities.add("com.x.processplatform.core.entity.element.Process"); -// containerEntities.add("com.x.processplatform.core.entity.element.Route"); -// containerEntities.add("com.x.processplatform.core.entity.element.Script"); -// containerEntities.add("com.x.processplatform.core.entity.element.Service"); -// containerEntities.add("com.x.processplatform.core.entity.element.Split"); -// containerEntities.add("com.x.processplatform.core.entity.element.QueryView"); -// containerEntities.add("com.x.processplatform.core.entity.element.QueryStat"); -// containerEntities.add("com.x.query.core.entity.Item"); -// usedStorageTypes.add(StorageType.processPlatform); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_processplatform_core_entity.class); -// dependents.add(x_query_core_entity.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java index aa19ff71a7..eee0e2f178 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_processplatform_service_processing.java @@ -54,58 +54,4 @@ public class x_processplatform_service_processing extends ServiceA { dependency.storeJars.add(x_collaboration_core_message.class.getSimpleName()); dependency.storeJars.add(x_query_core_entity.class.getSimpleName()); } - -// public static final String name = "流程驱动"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.processplatform.core.entity.content.Attachment"); -// containerEntities.add("com.x.processplatform.core.entity.content.TaskCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.ReadCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.Review"); -// containerEntities.add("com.x.processplatform.core.entity.content.Hint"); -// containerEntities.add("com.x.processplatform.core.entity.content.WorkCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.WorkLog"); -// containerEntities.add("com.x.processplatform.core.entity.content.Task"); -// containerEntities.add("com.x.processplatform.core.entity.content.Work"); -// containerEntities.add("com.x.processplatform.core.entity.content.Read"); -// containerEntities.add("com.x.processplatform.core.entity.content.SerialNumber"); -// containerEntities.add("com.x.processplatform.core.entity.element.End"); -// containerEntities.add("com.x.processplatform.core.entity.element.Application"); -// containerEntities.add("com.x.processplatform.core.entity.element.ApplicationDict"); -// containerEntities.add("com.x.processplatform.core.entity.element.ApplicationDictItem"); -// // containerEntities.add("com.x.processplatform.core.entity.element.ApplicationDictLobItem"); -// containerEntities.add("com.x.processplatform.core.entity.element.Script"); -// containerEntities.add("com.x.processplatform.core.entity.element.Cancel"); -// containerEntities.add("com.x.processplatform.core.entity.element.Merge"); -// containerEntities.add("com.x.processplatform.core.entity.element.Route"); -// containerEntities.add("com.x.processplatform.core.entity.element.Choice"); -// containerEntities.add("com.x.processplatform.core.entity.element.Invoke"); -// containerEntities.add("com.x.processplatform.core.entity.element.Manual"); -// containerEntities.add("com.x.processplatform.core.entity.element.Parallel"); -// containerEntities.add("com.x.processplatform.core.entity.element.Begin"); -// containerEntities.add("com.x.processplatform.core.entity.element.Split"); -// containerEntities.add("com.x.processplatform.core.entity.element.Message"); -// containerEntities.add("com.x.processplatform.core.entity.element.Process"); -// containerEntities.add("com.x.processplatform.core.entity.element.Service"); -// containerEntities.add("com.x.processplatform.core.entity.element.Agent"); -// containerEntities.add("com.x.processplatform.core.entity.element.Delay"); -// containerEntities.add("com.x.processplatform.core.entity.element.File"); -// containerEntities.add("com.x.processplatform.core.entity.element.Form"); -// containerEntities.add("com.x.processplatform.core.entity.element.FormField"); -// containerEntities.add("com.x.processplatform.core.entity.element.Embed"); -// containerEntities.add("com.x.processplatform.core.entity.log.ProcessingError"); -// containerEntities.add("com.x.query.core.entity.Item"); -// usedStorageTypes.add(StorageType.processPlatform); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_processplatform_core_entity.class); -// dependents.add(x_collaboration_core_entity.class); -// dependents.add(x_collaboration_core_message.class); -// dependents.add(x_query_core_entity.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_program_center.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_program_center.java index e7c8e9c98e..6e329b46e1 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_program_center.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_program_center.java @@ -50,52 +50,4 @@ public class x_program_center extends AssembleC { dependency.storeJars.add(x_general_core_entity.class.getSimpleName()); dependency.dynamicJars.add("x_query_dynamic_entity"); } - -// public static final String name = "中心"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.program.center.core.entity.Agent"); -// containerEntities.add("com.x.program.center.core.entity.Invoke"); -// containerEntities.add("com.x.program.center.core.entity.Captcha"); -// containerEntities.add("com.x.program.center.core.entity.Code"); -// containerEntities.add("com.x.program.center.core.entity.PromptErrorLog"); -// containerEntities.add("com.x.program.center.core.entity.UnexpectedErrorLog"); -// containerEntities.add("com.x.program.center.core.entity.Structure"); -// containerEntities.add("com.x.program.center.core.entity.WarnLog"); -// containerEntities.add("com.x.program.center.core.entity.validation.Meta"); -// containerEntities.add("com.x.portal.core.entity.Page"); -// containerEntities.add("com.x.portal.core.entity.Portal"); -// containerEntities.add("com.x.organization.core.entity.Group"); -// containerEntities.add("com.x.organization.core.entity.Custom"); -// containerEntities.add("com.x.organization.core.entity.Role"); -// containerEntities.add("com.x.organization.core.entity.Person"); -// containerEntities.add("com.x.organization.core.entity.Identity"); -// containerEntities.add("com.x.organization.core.entity.PersonAttribute"); -// containerEntities.add("com.x.organization.core.entity.Unit"); -// containerEntities.add("com.x.organization.core.entity.UnitAttribute"); -// containerEntities.add("com.x.organization.core.entity.UnitDuty"); -// containerEntities.add("com.x.general.core.entity.area.District"); -// containerEntities.add("com.x.program.center.core.entity.Schedule"); -// containerEntities.add("com.x.program.center.core.entity.ScheduleLocal"); -// containerEntities.add("com.x.program.center.core.entity.ScheduleLog"); -// dependents.add(x_base_core_project.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_program_center_core_entity.class); -// dependents.add(x_attendance_core_entity.class); -// dependents.add(x_cms_core_entity.class); -// dependents.add(x_collaboration_core_entity.class); -// dependents.add(x_component_core_entity.class); -// dependents.add(x_file_core_entity.class); -// dependents.add(x_meeting_core_entity.class); -// dependents.add(x_okr_core_entity.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_processplatform_core_entity.class); -// dependents.add(x_message_core_entity.class); -// dependents.add(x_query_core_entity.class); -// dependents.add(x_portal_core_entity.class); -// dependents.add(x_general_core_entity.class); -// } } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_surface.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_surface.java index 663e869e3d..bb0f7dcf00 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_surface.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_assemble_surface.java @@ -41,42 +41,4 @@ public class x_query_assemble_surface extends AssembleA { dependency.storeJars.add(x_cms_core_entity.class.getSimpleName()); dependency.storeJars.add(x_query_core_express.class.getSimpleName()); } - -// public static final String name = "数据查询"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.query.core.entity.Item"); -// containerEntities.add("com.x.query.core.entity.Query"); -// containerEntities.add("com.x.query.core.entity.View"); -// containerEntities.add("com.x.query.core.entity.Stat"); -// containerEntities.add("com.x.query.core.entity.Reveal"); -// containerEntities.add("com.x.query.core.entity.segment.Word"); -// containerEntities.add("com.x.query.core.entity.segment.Entry"); -// containerEntities.add("com.x.query.core.entity.neural.Entry"); -// containerEntities.add("com.x.query.core.entity.neural.InText"); -// containerEntities.add("com.x.query.core.entity.neural.OutText"); -// containerEntities.add("com.x.query.core.entity.neural.InValue"); -// containerEntities.add("com.x.query.core.entity.neural.OutValue"); -// containerEntities.add("com.x.query.core.entity.neural.Model"); -// containerEntities.add("com.x.processplatform.core.entity.content.Review"); -// containerEntities.add("com.x.processplatform.core.entity.content.Work"); -// containerEntities.add("com.x.processplatform.core.entity.content.WorkCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.Attachment"); -// containerEntities.add("com.x.cms.core.entity.Document"); -// containerEntities.add("com.x.cms.core.entity.AppInfo"); -// containerEntities.add("com.x.cms.core.entity.CategoryInfo"); -// usedStorageTypes.add(StorageType.processPlatform); -// usedStorageTypes.add(StorageType.cms); -// dependents.add(x_base_core_project.class); -// dependents.add(x_query_core_entity.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_processplatform_core_entity.class); -// dependents.add(x_cms_core_entity.class); -// dependents.add(x_query_core_express.class); -// } - } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_service_processing.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_service_processing.java index 71faf3db66..b807464121 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_service_processing.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_query_service_processing.java @@ -40,42 +40,4 @@ public class x_query_service_processing extends ServiceA { dependency.storeJars.add(x_processplatform_core_entity.class.getSimpleName()); dependency.storeJars.add(x_cms_core_entity.class.getSimpleName()); } - -// public static final String name = "数据处理"; -// public static List containerEntities = new ArrayList<>(); -// public static List usedStorageTypes = new ArrayList<>(); -// public static List> dependents = new ArrayList<>(); -// -// static { -// containerEntities.add("com.x.query.core.entity.Item"); -// containerEntities.add("com.x.query.core.entity.Query"); -// containerEntities.add("com.x.query.core.entity.View"); -// containerEntities.add("com.x.query.core.entity.Stat"); -// containerEntities.add("com.x.query.core.entity.Reveal"); -// containerEntities.add("com.x.query.core.entity.segment.Word"); -// containerEntities.add("com.x.query.core.entity.segment.Entry"); -// containerEntities.add("com.x.query.core.entity.neural.Entry"); -// containerEntities.add("com.x.query.core.entity.neural.InText"); -// containerEntities.add("com.x.query.core.entity.neural.OutText"); -// containerEntities.add("com.x.query.core.entity.neural.InValue"); -// containerEntities.add("com.x.query.core.entity.neural.OutValue"); -// containerEntities.add("com.x.query.core.entity.neural.Model"); -// containerEntities.add("com.x.processplatform.core.entity.content.Review"); -// containerEntities.add("com.x.processplatform.core.entity.content.Work"); -// containerEntities.add("com.x.processplatform.core.entity.content.WorkCompleted"); -// containerEntities.add("com.x.processplatform.core.entity.content.Attachment"); -// containerEntities.add("com.x.cms.core.entity.Document"); -// containerEntities.add("com.x.cms.core.entity.FileInfo"); -// containerEntities.add("com.x.cms.core.entity.AppInfo"); -// containerEntities.add("com.x.cms.core.entity.CategoryInfo"); -// usedStorageTypes.add(StorageType.processPlatform); -// usedStorageTypes.add(StorageType.cms); -// dependents.add(x_base_core_project.class); -// dependents.add(x_query_core_entity.class); -// dependents.add(x_organization_core_entity.class); -// dependents.add(x_organization_core_express.class); -// dependents.add(x_processplatform_core_entity.class); -// dependents.add(x_cms_core_entity.class); -// } - } -- GitLab