内容管理员设计权限修改

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/Business.java

@@ -310,21 +310,6 @@ public class Business {
 		return false;
 	}
 
-	/**
-	 * TODO (uncomplete)判断用户是否有权限进行：[文件或者附件管理]的操作
-	 *
-	 * @param person
-	 * @return
-	 * @throws Exception
-	 */
-	public boolean fileInfoEditAvailable( EffectivePerson person) throws Exception {
-		if ( isManager( person)) {
-			return true;
-		}
-		// 其他情况暂时全部不允许操作
-		return false;
-	}
-
 	/**
 	 * TODO (uncomplete)判断用户是否有权限进行：[表单模板管理]操作
 	 *
@@ -337,7 +322,7 @@ public class Business {
 			return true;
 		}
 		// 其他情况暂时全部不允许操作
-		return false;
+		return true;
 	}
 
 	/**
@@ -352,7 +337,7 @@ public class Business {
 			return true;
 		}
 		// 其他情况暂时全部不允许操作
-		return false;
+		return true;
 	}
 
 	public boolean editable( EffectivePerson effectivePerson, AppInfo appInfo ) throws Exception {

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionDelete.java

@@ -38,9 +38,7 @@ public class ActionDelete extends BaseAction {
 				throw new Exception("document{id:" + fileInfo.getDocumentId() + "} 文档信息不存在，无法继续删除.");
 			}
 			// 如果信息存在，再判断用户是否有操作的权限，如果没权限不允许继续操作
-			if (!business.fileInfoEditAvailable( effectivePerson)) {
-				throw new Exception( "fileInfo{name:" + effectivePerson.getDistinguishedName() + "} ，用户没有内容管理应用信息操作的权限！");
-			}
+
 			// 删除文件，并且删除记录及文档的关联信息
 			StorageMapping mapping = ThisApplication.context().storageMappings().get(FileInfo.class, fileInfo.getStorage());
 

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/fileinfo/ActionListAll.java

@@ -39,10 +39,6 @@ public class ActionListAll extends BaseAction {
 		} else {
 			try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 				Business business = new Business(emc);
-				//如判断用户是否有查看所有文件或者附件的权限，如果没权限不允许继续操作
-				if (!business.fileInfoEditAvailable( effectivePerson )) {
-					throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有查询全部文件或者附件的权限！");
-				}
 				//如果有权限，继续操作
 				FileInfoFactory fileInfoFactory  = business.getFileInfoFactory();
 				List<String> ids = fileInfoFactory.listAll();//获取所有文件或者附件列表

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionDelete.java

@@ -5,6 +5,7 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckRemoveType;
 import com.x.base.core.project.annotation.AuditLog;
 import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.exception.ExceptionAccessDenied;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.http.WrapOutId;
@@ -26,6 +27,9 @@ public class ActionDelete extends BaseAction {
 		WrapOutId wrap = null;
 		try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			Business business = new Business( emc );
+			if (!business.isManager( effectivePerson)) {
+				throw new ExceptionAccessDenied(effectivePerson);
+			}
 			// 先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作
 			Form form = business.getFormFactory().get( id );
 			List<String> viewIds = business.getViewFactory().listByFormId(id);
@@ -34,12 +38,12 @@ public class ActionDelete extends BaseAction {
 			List<String> viewCategoryIds = null;
 			List<ViewCategory> viewCategorys = null;
 			View view = null;
-			
+
 			emc.beginTransaction( Form.class );
 			emc.beginTransaction( View.class );
 			emc.beginTransaction( ViewFieldConfig.class );
 			emc.beginTransaction( ViewCategory.class );
-			
+
 			if( viewIds != null && !viewIds.isEmpty() ){
 				for( String viewId : viewIds ){
 					view = business.getViewFactory().get( viewId );
@@ -70,14 +74,14 @@ public class ActionDelete extends BaseAction {
 				emc.remove( form, CheckRemoveType.all );
 				emc.commit();
 				logService.log( emc, effectivePerson.getDistinguishedName(), form.getName(), form.getAppId(), "", "", form.getId(), "FORM", "删除");
-			}			
+			}
 			wrap = new WrapOutId( form.getId() );
 
 			CacheManager.notify( Form.class );
 			CacheManager.notify( View.class );
 			CacheManager.notify( ViewFieldConfig.class );
 			CacheManager.notify( ViewCategory.class );
-			
+
 			result.setData(wrap);
 		} catch (Throwable th) {
 			th.printStackTrace();
@@ -85,8 +89,8 @@ public class ActionDelete extends BaseAction {
 		}
 		return result;
 	}
-	
+
 	public static class Wo extends WoId {
 
 	}
-}
+}
\ No newline at end of file

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/ActionSave.java

@@ -47,7 +47,7 @@ public class ActionSave extends BaseAction {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			Business business = new Business(emc);
 
-			if (!business.formEditAvailable( effectivePerson)) {
+			if (!business.isManager( effectivePerson)) {
 				throw new ExceptionAccessDenied(effectivePerson);
 			}
 			Form form = emc.find(wi.getId(), Form.class);

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionDelete.java

@@ -8,6 +8,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckRemoveType;
 import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.exception.ExceptionAccessDenied;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -17,7 +18,7 @@ import com.x.cms.core.entity.element.ViewCategory;
 import com.x.cms.core.entity.element.ViewFieldConfig;
 
 public class ActionDelete extends BaseAction {
-	
+
 	protected ActionResult<Wo> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
@@ -30,16 +31,16 @@ public class ActionDelete extends BaseAction {
 			//查询视图关联的所有分类关联配置
 			List<String> viewCategoryIds = business.getViewCategoryFactory().listByViewId(id);
 			List<ViewCategory> viewCategorys = emc.list( ViewCategory.class, viewCategoryIds );
-			
+
 			//如果信息存在，再判断用户是否有操作的权限，如果没权限不允许继续操作
-			if (!business.viewEditAvailable( effectivePerson )) {
-				throw new Exception("view{name:" + effectivePerson.getDistinguishedName() + "} 用户没有内容管理应用信息操作的权限！");
+			if (!business.isManager( effectivePerson)) {
+				throw new ExceptionAccessDenied(effectivePerson);
 			}
 			//进行数据库持久化操作
 			emc.beginTransaction( View.class );
 			emc.beginTransaction( ViewFieldConfig.class );
 			emc.beginTransaction( ViewCategory.class );
-			
+
 			//删除所有的viewFieldConfig
 			if( fieldConfigs != null && fieldConfigs.size() > 0 ){
 				for( ViewFieldConfig viewFieldConfig : fieldConfigs ){
@@ -55,11 +56,11 @@ public class ActionDelete extends BaseAction {
 				emc.remove( view, CheckRemoveType.all );
 			}
 			emc.commit();
-			
+
 			if( view != null ){
 				logService.log( emc,  effectivePerson.getDistinguishedName(), view.getName(), view.getAppId(), "", "", view.getId(), "VIEW", "删除" );
 			}
-			
+
 			Wo wo = new Wo();
 			wo.setId( view.getId() );
 			result.setData( wo );
@@ -73,8 +74,8 @@ public class ActionDelete extends BaseAction {
 		}
 		return result;
 	}
-	
+
 	public static class Wo extends WoId {
 
 	}
-}
+}
\ No newline at end of file

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/view/ActionSave.java

@@ -5,7 +5,11 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.x.base.core.container.EntityManagerContainer;
+import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.exception.ExceptionAccessDenied;
+import com.x.cms.assemble.control.Business;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.JsonElement;
@@ -30,6 +34,12 @@ public class ActionSave extends BaseAction {
 	protected ActionResult<Wo> execute(HttpServletRequest request, EffectivePerson effectivePerson,
 			JsonElement jsonElement) throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			Business business = new Business(emc);
+			if (!business.isManager( effectivePerson)) {
+				throw new ExceptionAccessDenied(effectivePerson);
+			}
+		}
 		Wi wi = null;
 		View view = null;
 		Boolean check = true;

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionDelete.java

@@ -6,6 +6,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckRemoveType;
 import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.exception.ExceptionAccessDenied;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -14,28 +15,23 @@ import com.x.cms.core.entity.element.View;
 import com.x.cms.core.entity.element.ViewCategory;
 
 public class ActionDelete extends BaseAction {
-	
+
 	protected ActionResult<Wo> execute( HttpServletRequest request, EffectivePerson effectivePerson, String id ) throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			Business business = new Business(emc);
-			
+
 			//先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作
 			ViewCategory viewCategory = business.getViewCategoryFactory().get(id);
 			if (null == viewCategory) {
 				throw new Exception("view{id:" + id + "} 应用信息不存在.");
 			}
-			
-			//如果信息存在，再判断用户是否有操作的权限，如果没权限不允许继续操作
-			if (!business.viewEditAvailable( effectivePerson )) {
-				throw new Exception("view{name:" + effectivePerson.getDistinguishedName() + "} 用户没有内容管理应用信息操作的权限！");
-			}
-			
+
 			//进行数据库持久化操作
 			emc.beginTransaction( ViewCategory.class );
 			emc.remove( viewCategory, CheckRemoveType.all );
 			emc.commit();
-			
+
 			Wo wo = new Wo();
 			wo.setId( viewCategory.getId() );
 			result.setData(wo);
@@ -48,8 +44,8 @@ public class ActionDelete extends BaseAction {
 		}
 		return result;
 	}
-	
+
 	public static class Wo extends WoId {
 
 	}
-}
+}
\ No newline at end of file

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewcategory/ActionSave.java

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.exception.ExceptionAccessDenied;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.JsonElement;
@@ -55,10 +56,6 @@ public class ActionSave extends BaseAction {
 		if(check ){
 			try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 				Business business = new Business(emc);
-				//看看用户是否有权限进行应用信息新增操作
-				if (!business.viewEditAvailable( effectivePerson )) {
-					throw new Exception("person{name:" + effectivePerson.getDistinguishedName() + "} 用户没有内容管理视图分类关联信息信息操作的权限！");
-				}
 				viewCategory = business.getViewCategoryFactory().getByViewAndCategory( wrapIn.getViewId(), wrapIn.getCategoryId() );
 				if( viewCategory == null ){
 					viewCategory = Wi.copier.copy( wrapIn );

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionDelete.java

@@ -8,6 +8,7 @@ import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckRemoveType;
 import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.exception.ExceptionAccessDenied;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -34,11 +35,6 @@ public class ActionDelete extends BaseAction {
 			if (null == viewFieldConfig) {
 				logger.warn("viewFieldConfig{id:" + id + "} 应用信息不存在.");
 			}
-			// 如果信息存在，再判断用户是否有操作的权限，如果没权限不允许继续操作
-			if (!business.viewEditAvailable(effectivePerson)) {
-				throw new Exception(
-						"viewFieldConfig{name:" + effectivePerson.getDistinguishedName() + "} 用户没有内容管理应用信息操作的权限！");
-			}
 			// 查询视图信息
 			View view = business.getViewFactory().get(viewFieldConfig.getViewId());
 			if (view == null) {
@@ -86,4 +82,4 @@ public class ActionDelete extends BaseAction {
 
 	}
 
-}
+}
\ No newline at end of file

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/viewfieldconfig/ActionSave.java

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import com.x.base.core.project.cache.CacheManager;
+import com.x.base.core.project.exception.ExceptionAccessDenied;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.JsonElement;
@@ -57,24 +58,6 @@ public class ActionSave extends BaseAction {
 			}
 		}
 
-		if( check ){
-			//先看看视图信息是否存在，如果不存在
-			try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-				Business business = new Business(emc);
-				//看看用户是否有权限进行应用信息新增操作
-				if (!business.viewEditAvailable( effectivePerson )) {
-					check = false;
-					Exception exception = new ExceptionNoPermission( effectivePerson.getDistinguishedName() );
-					result.error( exception );
-				}
-			} catch (Exception e) {
-				check = false;
-				Exception exception = new ExceptionViewQueryByIdEmpty( e, wi.getViewId() );
-				result.error( exception );
-				logger.error( e, effectivePerson, request, null);
-			}
-		}
-
 		if( check ){
 			//先看看视图信息是否存在，如果不存在
 			try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) {