个人通讯录操作及权限配置服务

.gitignore

@@ -151,4 +151,7 @@ typings/
 #vscode
 **/.factorypath
 **/.vscode/
+
+
 *.swp
+

o2server/x_base_core_project/src/main/java/com/x/base/core/project/x_organization_assemble_control.java

@@ -9,6 +9,7 @@ import com.x.base.core.project.annotation.ModuleType;
 		"com.x.organization.core.entity.Role", "com.x.organization.core.entity.Person",
 		"com.x.organization.core.entity.Identity", "com.x.organization.core.entity.PersonAttribute",
 		"com.x.organization.core.entity.Unit", "com.x.organization.core.entity.UnitAttribute",
+		"com.x.organization.core.entity.PersonCard","com.x.organization.core.entity.PermissionSetting",
 		"com.x.organization.core.entity.UnitDuty" }, storeJars = { "x_organization_core_entity" })
 public class x_organization_assemble_control extends Deployable {
 }

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java

@@ -24,7 +24,9 @@ import com.x.base.core.project.organization.OrganizationDefinition;
 import com.x.base.core.project.tools.ListTools;
 import com.x.organization.assemble.control.factory.GroupFactory;
 import com.x.organization.assemble.control.factory.IdentityFactory;
+import com.x.organization.assemble.control.factory.PermissionSettingFactory;
 import com.x.organization.assemble.control.factory.PersonAttributeFactory;
+import com.x.organization.assemble.control.factory.PersonCardFactory;
 import com.x.organization.assemble.control.factory.PersonFactory;
 import com.x.organization.assemble.control.factory.RoleFactory;
 import com.x.organization.assemble.control.factory.UnitAttributeFactory;
@@ -56,7 +58,7 @@ public class Business {
 		this.cache = ApplicationCache.instance().getCache(Group.class, Role.class, Person.class, PersonAttribute.class,
 				Unit.class, UnitDuty.class, UnitAttribute.class, Identity.class);
 	}
-
+ 
 	public EntityManagerContainer entityManagerContainer() {
 		return this.emc;
 	}
@@ -79,6 +81,25 @@ public class Business {
 		return person;
 	}
 
+	
+	private PersonCardFactory personCard;
+
+	public PersonCardFactory personCard() throws Exception {
+		if (null == this.personCard) {
+			this.personCard = new PersonCardFactory(this);
+		}
+		return personCard;
+	}
+	
+	private PermissionSettingFactory permissionSetting;
+
+	public PermissionSettingFactory permissionSetting() throws Exception {
+		if (null == this.permissionSetting) {
+			this.permissionSetting = new PermissionSettingFactory(this);
+		}
+		return permissionSetting;
+	}
+	
 	private PersonAttributeFactory personAttribute;
 
 	public PersonAttributeFactory personAttribute() throws Exception {

o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/ActionApplication.java

@@ -11,8 +11,10 @@ import com.x.organization.assemble.control.jaxrs.group.GroupAction;
 import com.x.organization.assemble.control.jaxrs.identity.IdentityAction;
 import com.x.organization.assemble.control.jaxrs.inputperson.InputPersonAction;
 import com.x.organization.assemble.control.jaxrs.loginrecord.LoginRecordAction;
+import com.x.organization.assemble.control.jaxrs.permissionsetting.PermissionSettingAction;
 import com.x.organization.assemble.control.jaxrs.person.PersonAction;
 import com.x.organization.assemble.control.jaxrs.personattribute.PersonAttributeAction;
+import com.x.organization.assemble.control.jaxrs.personcard.PersonCardAction;
 import com.x.organization.assemble.control.jaxrs.role.RoleAction;
 import com.x.organization.assemble.control.jaxrs.unit.UnitAction;
 import com.x.organization.assemble.control.jaxrs.unitattribute.UnitAttributeAction;
@@ -34,6 +36,8 @@ public class ActionApplication extends AbstractActionApplication {
 		classes.add(UnitAttributeAction.class);
 		classes.add(UnitDutyAction.class);
 		classes.add(ExportAction.class);
+		classes.add(PersonCardAction.class);
+		classes.add(PermissionSettingAction.class);
 		return classes;
 	}
 

o2server/x_organization_assemble_control/src/main/webapp/describe/sources/com/x/organization/assemble/control/Business.java

@@ -24,7 +24,9 @@ import com.x.base.core.project.organization.OrganizationDefinition;
 import com.x.base.core.project.tools.ListTools;
 import com.x.organization.assemble.control.factory.GroupFactory;
 import com.x.organization.assemble.control.factory.IdentityFactory;
+import com.x.organization.assemble.control.factory.PermissionSettingFactory;
 import com.x.organization.assemble.control.factory.PersonAttributeFactory;
+import com.x.organization.assemble.control.factory.PersonCardFactory;
 import com.x.organization.assemble.control.factory.PersonFactory;
 import com.x.organization.assemble.control.factory.RoleFactory;
 import com.x.organization.assemble.control.factory.UnitAttributeFactory;
@@ -56,7 +58,7 @@ public class Business {
 		this.cache = ApplicationCache.instance().getCache(Group.class, Role.class, Person.class, PersonAttribute.class,
 				Unit.class, UnitDuty.class, UnitAttribute.class, Identity.class);
 	}
-
+ 
 	public EntityManagerContainer entityManagerContainer() {
 		return this.emc;
 	}
@@ -79,6 +81,25 @@ public class Business {
 		return person;
 	}
 
+	
+	private PersonCardFactory personCard;
+
+	public PersonCardFactory personCard() throws Exception {
+		if (null == this.personCard) {
+			this.personCard = new PersonCardFactory(this);
+		}
+		return personCard;
+	}
+	
+	private PermissionSettingFactory permissionSetting;
+
+	public PermissionSettingFactory permissionSetting() throws Exception {
+		if (null == this.permissionSetting) {
+			this.permissionSetting = new PermissionSettingFactory(this);
+		}
+		return permissionSetting;
+	}
+	
 	private PersonAttributeFactory personAttribute;
 
 	public PersonAttributeFactory personAttribute() throws Exception {

o2server/x_organization_assemble_control/src/main/webapp/describe/sources/com/x/organization/assemble/control/jaxrs/ActionApplication.java

@@ -11,8 +11,10 @@ import com.x.organization.assemble.control.jaxrs.group.GroupAction;
 import com.x.organization.assemble.control.jaxrs.identity.IdentityAction;
 import com.x.organization.assemble.control.jaxrs.inputperson.InputPersonAction;
 import com.x.organization.assemble.control.jaxrs.loginrecord.LoginRecordAction;
+import com.x.organization.assemble.control.jaxrs.permissionsetting.PermissionSettingAction;
 import com.x.organization.assemble.control.jaxrs.person.PersonAction;
 import com.x.organization.assemble.control.jaxrs.personattribute.PersonAttributeAction;
+import com.x.organization.assemble.control.jaxrs.personcard.PersonCardAction;
 import com.x.organization.assemble.control.jaxrs.role.RoleAction;
 import com.x.organization.assemble.control.jaxrs.unit.UnitAction;
 import com.x.organization.assemble.control.jaxrs.unitattribute.UnitAttributeAction;
@@ -34,6 +36,8 @@ public class ActionApplication extends AbstractActionApplication {
 		classes.add(UnitAttributeAction.class);
 		classes.add(UnitDutyAction.class);
 		classes.add(ExportAction.class);
+		classes.add(PersonCardAction.class);
+		classes.add(PermissionSettingAction.class);
 		return classes;
 	}
 

o2server/x_organization_core_entity/src/main/java/com/x/organization/core/entity/PersistenceProperties.java

@@ -34,7 +34,17 @@ public final class PersistenceProperties extends AbstractPersistenceProperties {
 		public static final String distinguishNameCharacter = "P";
 		public static final Pattern distinguishedName_pattern = Pattern.compile("^(\\S+)\\@(\\S+)\\@P$");
 	}
-
+	public static class PersonCard {
+		public static final String table = "ORG_PERSONCARD";
+		public static final String distinguishNameCharacter = "P";
+		public static final Pattern distinguishedName_pattern = Pattern.compile("^(\\S+)\\@(\\S+)\\@P$");
+	}
+	public static class PermissionSetting {
+		public static final String table = "ORG_PERMISSIONSETTING";
+		public static final String distinguishNameCharacter = "P";
+		public static final Pattern distinguishedName_pattern = Pattern.compile("^(\\S+)\\@(\\S+)\\@P$");
+	}
+	
 	public static class PersonAttribute {
 		public static final String table = "ORG_PERSONATTRIBUTE";
 		public static final String distinguishNameCharacter = "PA";