From 18c43123b51a1688ab4ae01fe3d171c7d92e619b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期四, 16 一月 2025 18:19:34 +0800
Subject: [PATCH] 1、调整会话过期提示 2、流程设计器隐藏拓展按钮,隐藏右下角图标

---
 Source/Common/PLTSlice/slice/02-framework.ice | 1069 +++++++++++++++++++++++++++-------------------------------
 1 files changed, 499 insertions(+), 570 deletions(-)

diff --git a/Source/Common/PLTSlice/slice/02-framework.ice b/Source/Common/PLTSlice/slice/02-framework.ice
index 69fc746..55662ee 100644
--- a/Source/Common/PLTSlice/slice/02-framework.ice
+++ b/Source/Common/PLTSlice/slice/02-framework.ice
@@ -237,52 +237,7 @@
 			string licensor;
 		};
 		sequence<RoleRightInfo> RoleRightInfoList;
-		/**-----------------------鏃ュ織绠$悊妯″潡-------------------------**/
-		//鏃ュ織淇℃伅 
-		struct LogInfo {
-			string puid;//ID
-			string username;//鐢ㄦ埛鍚�
-			string truename;//濮撳悕
-			string userIp;//鐢ㄦ埛IP
-			string result;//鎿嶄綔缁撴灉
-			string content; // 鏃ュ織鍐呭
-			string date;//鎿嶄綔鏃ユ湡
-			string type;//鎿嶄綔绫诲瀷
-			string moduleName;//鎿嶄綔妯″潡
-			string entityDesc;//鎿嶄綔瀵硅薄鐨勬弿杩�
-			string property;//鎿嶄綔鐨勫睘鎬�
-			string previousVal;//鎿嶄綔鍓嶅緱鍊�
-			string newVal;//鎿嶄綔鍚庣殑鍊� 
-			string logType;// 鏃ュ織绫诲瀷
-		}; 
-		sequence<LogInfo> LogInfoList; 
-		//鏃ュ織淇濆瓨鍜屽浠芥湡闄愪俊鎭�
-		struct LogPeriodInfo {
-			string code;//瀵瑰簲鐨勬暟鍊硷紝浠ユ湀涓哄崟浣�
-			string value;//瀵瑰簲鐨勬樉绀哄悕绉�
-		}; 
-		sequence<LogPeriodInfo> LogPeriodInfoList; 
-		//妯″潡瀵瑰簲鐨勬爲鑿滃崟
-		struct SpecialRoleTreeInfo{
-			string iconName;
-			string nodeName;
-			string panelName;
-			string nodeShowInfo;
-		};
-		sequence<SpecialRoleTreeInfo> SpecialRoleTreeInfoList;
-		//涓夊憳鐧诲綍鏄剧ず鐨勬ā鍧椾俊鎭� 
-		struct SpecialRoleInfo{
-			string logonUserId;   
-			string	logonRoleId;   
-			string	iconName;      
-			string	moduleName;    
-			string	panelName;     
-			string	moduleShowInfo;
-			SpecialRoleTreeInfoList specialRoleTreeInfos;
-		}
-		sequence<SpecialRoleInfo> SpecialRoleInfoList;
 
-		
 		//鏁版嵁搴撲俊鎭�
 		struct DataSourceInfo{
 			string tbSpaceName;	// 琛ㄧ┖闂村悕绉�
@@ -366,538 +321,512 @@
 		sequence<GrandValue> GrandValueArray;
 		
 	};//end data
-	module method {
-		interface FrameworkService {
-			// 娴嬭瘯绯荤粺鏄惁鑳借繛閫�
-			bool test() throws common::VCIError;
 
-			/**楠岃瘉鐧诲綍**/
-			data::UserInfo checkLogin(string userName,string password) throws common::VCIError;
+	interface FrameworkService {
+		// 娴嬭瘯绯荤粺鏄惁鑳借繛閫�
+		bool test() throws common::VCIError;
 
-			data::UserInfo checkLoginForBS(string userName,string password) throws common::VCIError;
+		/**楠岃瘉鐧诲綍**/
+		data::UserInfo checkLogin(string userName,string password) throws common::VCIError;
 
-			data::UserInfo getUserObjectByUserName(string userName) throws common::VCIError;
+		data::UserInfo checkLoginForBS(string userName,string password) throws common::VCIError;
 
-			data::UserInfo checkByToken(string token) throws common::VCIError;
+		data::UserInfo getUserObjectByUserName(string userName) throws common::VCIError;
 
-			// 鏄惁鍚敤鐢ㄦ埛鏉冮檺鏍¢獙
-			bool userSecuritySwith() throws common::VCIError;
-			// 鏄惁鍚敤鏈哄櫒鏉冮檺鏍¢獙
-			bool ipSecuritySwitch() throws common::VCIError;
-			// 鏄惁榛樿鏈夋潈
-			string defaultHasRight() throws common::VCIError;
+		data::UserInfo checkByToken(string token) throws common::VCIError;
 
-			//flag:nonsys鍒犻櫎闈炵郴缁熸ā鍧�
-			//flag:business鍒犻櫎涓氬姟妯″潡
-			bool deleteModules(string flag)throws common::VCIError;
-			common::data::StringArray getClientDeployJarPath() throws common::VCIError;
-			
-			/** AppConfigCategory 瀵硅薄鎺ュ彛 **/
-			// 娣诲姞銆佷繚瀛� AppConfigCategory 瀵硅薄 
-			string saveAppConfigCategory(data::AppConfigCategoryInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			// 淇敼銆佹洿鏂� AppConfigCategory 瀵硅薄 
-			bool updateAppConfigCategory(data::AppConfigCategoryInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			// 鏍规嵁ID鍒犻櫎  AppConfigCategory 瀵硅薄锛堟壒閲忥級
-			bool deleteAppConfigCategory(common::data::StringArray ids, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			// 杩斿洖鍏ㄩ儴  AppConfigCategory 瀵硅薄
-			data::AppConfigCategoryInfoList getAppConfigCategorys(common::data::UserEntityInfo userEntity) throws common::VCIError;
-			// 鏍规嵁ID杩斿洖  AppConfigCategory 瀵硅薄
-			data::AppConfigCategoryInfo getAppConfigCategoryById(string id, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/** AppConfigDetail 瀵硅薄鎺ュ彛 **/
-			// 娣诲姞銆佷繚瀛� AppConfigDetail 瀵硅薄 
-			string saveAppConfigDetail(data::AppConfigDetailInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			// 淇敼銆佹洿鏂� AppConfigDetail 瀵硅薄 
-			bool updateAppConfigDetail(data::AppConfigDetailInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			// 鏍规嵁ID鍒犻櫎  AppConfigDetail 瀵硅薄锛堟壒閲忥級
-			bool deleteAppConfigDetail(common::data::StringArray ids, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			// 杩斿洖鍏ㄩ儴  AppConfigDetail 瀵硅薄
-			data::AppConfigDetailInfoList getAppConfigDetails(common::data::UserEntityInfo userEntity) throws common::VCIError;
-			// 杩斿洖鎸囧畾鍒嗙被鐨勫叏閮�  AppConfigDetail 瀵硅薄
-			data::AppConfigDetailInfoList getAppConfigDetailsByCatId(string clsfId, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			data::AppConfigDetailInfoList getAppConfigDetailsByCategory(string catName, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			
-			// 鏍规嵁ID杩斿洖  AppConfigDetail 瀵硅薄
-			data::AppConfigDetailInfo getAppConfigDetailById(string id, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			// 鏍规嵁閰嶇疆Key杩斿洖  AppConfigDetail 瀵硅薄
-			data::AppConfigDetailInfo getAppConfigDetailByKey(string key, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			// 鏍规嵁閰嶇疆Key杩斿洖  AppConfigDetail 瀵硅薄
-			data::AppConfigDetailInfoList getAppConfigDetailsByName(string name, common::data::UserEntityInfo userEntity) throws common::VCIError;
-						
-			/** 鏍规嵁key鑾峰彇conf.properties涓殑鍙傛暟鍊�
-				fileResourcePath锛氳祫婧愭枃浠惰矾寰�  
-				姣斿锛�/properties/conf.properties锛寈xx.properties 鏂囦欢鍦ㄩ」鐩富鐩綍鐨刾roperties鏂囦欢澶逛笅
-				鎴栬�咃細properties/xxx.properties锛寈xx.properties 鏂囦欢鍦╯rc/properties/鏂囦欢澶逛笅
-				濡傛灉浼犲叆绌哄�硷紝鍒欎粠 /properties/conf.properties 涓鍙�
-				key锛�
-			**/
-			string getConfigValue(string key) throws common::VCIError;
-					
-			//寰楀埌涓�涓殢鍗崇殑36浣嶆暟
-			string getRandomGUID36() throws common::VCIError; 
-					
-			/***************************绯荤粺鍔熻兘妯″潡start**************************/
-			//淇濆瓨妯″潡
-			string saveModule(data::FunctionInfo function,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鏇存柊妯″潡
-			string updateModule(data::FunctionInfo function,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鍒犻櫎妯″潡
-			string deleteModule(string moduleId,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鑾峰彇鑷姩鐢熸垚鐨勭紪鍙�
-			//long getAutoModuleNo() throws common::VCIError;
-			//鑾峰彇瀛愮骇妯″潡
-			data::FunctionInfoList getModuleListByParentId(string parentId,bool isAll) throws common::VCIError;
-			data::FunctionInfoList getModuleListByParentIdForBS(string parentId,bool isAll) throws common::VCIError;
-			data::FunctionInfoList getModuleListByParentIdForCS(string parentId,bool isAll) throws common::VCIError;
-			//鑾峰彇鎵�鏈夊瓙绾фā鍧�
-			data::FunctionInfoList getChildrenFunctionsByParentId(string parentId,bool isAll) throws common::VCIError;
-			//鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀛愮骇妯″潡鍒楄〃
-			data::FunctionInfoList getModuleListByRoleRight(string parentId,string userName) throws common::VCIError;
-			data::FunctionInfoList getModuleListByRoleRightForBS(string parentId,string userName) throws common::VCIError;
-			//鏍规嵁class鏌ヨ妯″潡瀵硅薄
-			data::FunctionInfo getModuleByClass(string classPath) throws common::VCIError;
-			//鏍规嵁funcOid鏌ヨ妯″潡瀵硅薄
-			data::FunctionInfo getFunctionObjectById(string funcOid) throws common::VCIError;
-			//鏍规嵁妯″潡鍚嶇О鏌ヨ妯″潡瀵硅薄
-			data::FunctionInfo getModuleByName(string moduleName) throws common::VCIError;
-			//妫�鏌ユā鍧椾笅鏄寕鎺ユā鍧楄繕鏄寕鎺ユ搷浣滐紝true涓烘寕鎺ユā鍧�
-			long checkChildObject(string moduleId) throws common::VCIError;
-			//淇濆瓨鎿嶄綔
-			string saveOperate(data::OperateInfo operate,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//淇敼鎿嶄綔
-			string updateOperate(data::OperateInfo operate,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鍒犻櫎鎿嶄綔
-			bool deleteOperate(string id,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鑾峰彇鍏ㄩ儴鎿嶄綔鍒楄〃锛堝弬鏁版ā鍧桰D涓嶄负绌虹殑鏃跺�欒幏鍙栭櫎璇ユā鍧椾笅鎿嶄綔涔嬪鐨勫叏閮ㄦ搷浣滐級
-			data::OperateInfoList getOperateTreeList(string moduleId) throws common::VCIError;
-			//妫�鏌ユ搷浣滄槸鍚﹁寮曠敤
-			long checkOperateIsReferenced(string operateId) throws common::VCIError;
-			//閫氳繃鏍囪瘑鑾峰彇鎿嶄綔
-			data::OperateInfo getOperateByIdentify(string identify) throws common::VCIError;
-			//閫氳繃鍚嶇О鑾峰彇鎿嶄綔
-			data::OperateInfo fetchOperateTypeByName(string name) throws common::VCIError;
-			//鑾峰彇妯″潡涓嬫寕鎺ョ殑鎿嶄綔瀵硅薄 onlyIsValid 鍙傛暟琛ㄧず鏄惁浠呬粎杩斿洖鏄敓鏁堢殑鎿嶄綔 true锛氭槸 false 锛氫笉鏄紙姝ゆ椂杩斿洖妯″潡涓嬪叏閮ㄧ殑鎿嶄綔锛屼粎鍦ㄥ畾涔夋ā鍧椾笅鐨勬搷浣滄椂闇�瑕佽繑鍥炲叏閮ㄧ殑鎿嶄綔锛屽叾瀹冩儏鍐甸渶瑕佸潎鍙渶瑕佽繑鍥炵敓鏁堢殑鎿嶄綔锛�
-			data::FuncOperationInfoList getFuncOperationByModule(string funcitonId,string operateId, bool onlyIsValid) throws common::VCIError;
-			//閫氳繃鎿嶄綔鏍囪瘑鍜屾ā鍧桰D鑾峰彇鎸傛帴鍏崇郴
-			data::FuncOperationInfo getFuncOperationByIdentify(string funcId,string identify) throws common::VCIError;
-			//淇濆瓨妯″潡涓嬬殑鎿嶄綔
-			bool saveFuncOperation(data::FuncOperationInfoList funcOperationInfos,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//淇敼妯″潡涓嬫搷浣滃埆鍚�
-			bool updateFuncOperation(string id, string alias, bool isSelected, common::data::UserEntityInfo userEntity) throws common::VCIError; 
-			//鍒犻櫎妯″潡涓嬬殑鎿嶄綔
-			bool deleteFuncOperation(data::FuncOperationInfo funcOperation,common::data::UserEntityInfo userEntity) throws common::VCIError;
-					
-			//淇濆瓨瑙掕壊鏉冮檺,閫氳繃鐢ㄦ埛鍚嶅尯鍒嗘潈闄愮被鍨�
-			bool saveRoleRight(data::RoleRightInfoList roleRightInfos,string roleId,string userName,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//澧炲姞瑙掕壊鏉冮檺,閫氳繃鐢ㄦ埛鍚嶅尯鍒嗘潈闄愮被鍨�
-			bool addRoleRight(data::RoleRightInfoList roleRightInfos,string roleId,string userName,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鑾峰彇瑙掕壊鏉冮檺,閫氳繃鐢ㄦ埛鍚嶅尯鍒嗘潈闄愮被鍨�
-			data::RoleRightInfoList getRoleRightList(string roleId,string userName) throws common::VCIError; 
-			//鏍规嵁鎺堟潈瑙掕壊鐨勭被鍨嬭幏鍙栨潈闄� 
-			data::RoleRightInfoList getRoleRightListByType(common::data::StringArray rightType) throws common::VCIError; 
-			//鍒犻櫎瑙掕壊鏉冮檺锛寃eidy@2018-10-12
-			bool removeRoleRight(data::RoleRightInfoList roleRightInfos,string roleId,string userName,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//娓呯┖瑙掕壊鏉冮檺锛寃eidy@2019-01-24
-			bool clearRoleRight(string roleId,string userName,common::data::UserEntityInfo userEntity, short functionType) throws common::VCIError;
-			//鑾峰彇鐢ㄦ埛瀵瑰綋鍓嶆ā鍧楃殑鏉冮檺鍊�
-			data::RoleRightInfoList getRoleRightByModule(string funcId,string userName) throws common::VCIError; 
-			//鑾峰彇褰撳墠鐢ㄦ埛鐨勬潈闄�
-			data::RoleRightInfoList getRoleRightByUserName(string userName) throws common::VCIError; 
-			//鑾峰彇褰撳墠鐢ㄦ埛鐨勫叿鏈夌殑鍔熻兘妯″潡鏉冮檺
-			data::RoleRightInfoList getFunctionRoleRightByUserName(string userName) throws common::VCIError; 
-			
+		// 鏄惁鍚敤鐢ㄦ埛鏉冮檺鏍¢獙
+		bool userSecuritySwith() throws common::VCIError;
+		// 鏄惁鍚敤鏈哄櫒鏉冮檺鏍¢獙
+		bool ipSecuritySwitch() throws common::VCIError;
+		// 鏄惁榛樿鏈夋潈
+		string defaultHasRight() throws common::VCIError;
 
-			/***************************绯荤粺鍔熻兘妯″潡end**************************/ 
-					
-			/**鏃ュ織绠$悊妯″潡**/
-			//鑾峰彇鏃ュ織鍒犻櫎閰嶇疆锛宼rue琛ㄧず鑷姩锛宖alse琛ㄧず鎵嬪姩
-			bool getIsAutoDelete() throws common::VCIError;
-			//鍒濆鍖栦笅鎷夋锛岃幏鍙栭厤缃ソ鐨勫��
-			data::LogPeriodInfoList getPeriods() throws common::VCIError;
-			//鑾峰彇鏃ュ織椤甸潰鏄剧ず鏉℃暟
-			long getPageSize() throws common::VCIError;
-			//鑾峰彇褰撳墠鏌ヨ鏃ュ織鐨勬�绘潯鏁�
-			long getSumLogRows(string sql) throws common::VCIError;
-			//鑾峰彇褰撳墠鏌ヨ鐨勬棩蹇楅泦鍚�
-			data::LogInfoList fetchLogInfo(long pageNo, long pagesize,string sql) throws common::VCIError;
-			//淇濆瓨鏃ュ織淇濆瓨鏈熼檺
-			bool savePeriod(data::SystemCfgInfo period,common::data::UserEntityInfo userEntity) throws common::VCIError;	                    
-			//鑾峰彇褰撳墠鏃ュ織淇濆瓨鏈熼檺
-			long getCurPeriod(string type) throws common::VCIError;
-			//鍒犻櫎鏃ュ織
-			bool deleteLog(string deleteDate) throws common::VCIError;
-			//鏍规嵁鏌ヨ鏉′欢鑾峰彇鏃ュ織淇℃伅
-			data::LogInfoList getLogListByContion(long pageNo,long pagesize,string sql) throws common::VCIError;
-					
-			/**鑾峰彇鎵�鏈夐儴闂�**/
-			data::DeptInfoList fetchDepartmentInfo() throws common::VCIError;
-								
-			data::DeptInfoList fetchDeptByUserNames(common::data::StringArray userNames) throws common::VCIError;
-			/**鏍规嵁id鑾峰彇閮ㄩ棬**/
-			data::DeptInfo fetchDepartmentInfoById(string id) throws common::VCIError;
-			/**鏍规嵁浜哄憳id鑾峰彇閮ㄩ棬**/
-			data::DeptInfo fetchDeptByUserId(string userId) throws common::VCIError;
-			data::DeptInfo fetchDeptByDeptName(string deptName) throws common::VCIError;
-			data::DeptInfo fetchDeptByParentIdAndName(string parentId,string deptName) throws common::VCIError;
-			/**鑾峰彇椤剁骇閮ㄩ棬**/
-			data::DeptInfoList fetchDepartmentInfoRoot() throws common::VCIError;
-			/**鑾峰彇閮ㄩ棬涓嬬殑瀛愰儴闂�**/
-			data::DeptInfoList fetchDepartmentInfoByParentId(string prtoid) throws common::VCIError;
-			/**鏍规嵁id鑾峰彇閮ㄩ棬鍙婂叾瀛愰儴闂�**/
-			data::DeptInfoList fetchDepartmentInfosById(string id) throws common::VCIError;
-			data::DeptInfoList fetchDepartmentInfosBySonId(string id) throws common::VCIError;
-			//鏍规嵁閮ㄩ棬id鑾峰彇鐢ㄦ埛淇℃伅
-			data::UserInfoList getUserByDeptId(string deptId)throws common::VCIError;
-					
-			/** 鏍规嵁ID杩斿洖瑙掕壊瀵硅薄**/
-			data::RoleInfo fetchRoleInfoById(string roleId) throws common::VCIError;
-			data::RoleInfo fetchRoleByName(string name) throws common::VCIError;
-			/**鑾峰彇鎵�鏈夌殑瑙掕壊**/
-			data::RoleInfoList fetchRoleInfo() throws common::VCIError;
-			/**鏍规嵁鐢ㄦ埛绫诲瀷鑾峰彇瑙掕壊**/
-			data::RoleInfoList fetchRoleInfoByType(short type) throws common::VCIError;
-			/**鏍规嵁瑙掕壊绫诲瀷鑾峰彇瑙掕壊**/
-			data::RoleInfoList fetchRoleInfoByRoleType(short type) throws common::VCIError;
-			/**閫佹璁惧瑙掕壊**/
-			data::RoleInfoList getRoleListByTypeForMeasure(short type) throws common::VCIError;
-			/**鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊**/
-			data::RoleInfoList fetchRoleInfoByUserId(string userId) throws common::VCIError;
-			/**鏍规嵁鐢ㄦ埛鍚嶈幏鍙栬鑹�**/
-			data::RoleInfoList fetchRoleInfoByUserName(string userName) throws common::VCIError;
-			/**鏍规嵁鐢ㄦ埛鍚嶈幏鍙栬鑹茬殑鍒嗛〉瀹炵幇**/
-			data::RoleInfoList fetchRoleInfoByUserNameAndPage(long pageNo,long pageSize,string userName) throws common::VCIError;
-			/**鏍规嵁姣旂敤鎴风被鍨嬩綆鐨勮鑹�**/
-			data::RoleInfoList fetchRoleInfoByUserType(string userName) throws common::VCIError;
-			/**鏍规嵁鐢ㄦ埛鍚嶈幏鍙栬鑹叉�绘暟**/
-			long getRoleTotalByUserName(string userName) throws common::VCIError;
-					
-			/**鏍规嵁鍨嬪彿鑾峰彇璇ュ瀷鍙蜂笅鐨勫瀷鍙锋�诲笀**/
-			data::UserInfoList fetchUserInfoByModel(string model) throws common::VCIError;
-			/**鏍规嵁鍨嬪彿鑾峰彇璇ュ瀷鍙蜂笅鐨勫瀷鍙锋�诲笀**/
-			data::UserInfoList fetchUserInfoByModelId(string modelId) throws common::VCIError;
-			/**鑾峰彇鎵�鏈夌殑鎴愬憳**/
-			data::UserInfoList fetchUserInfo() throws common::VCIError;
-			/**鑾峰彇闄ゅ幓admin锛宒eveloper锛屼笁鍛樺鎵�鏈夌殑鏅�氭垚鍛�**/
-			data::UserInfoList fetchUserInfoWithOutSanYuan() throws common::VCIError;
-			/**鏍规嵁鏉′欢鏌ヨ鐢ㄦ埛**/
-			data::UserInfoList fetchUserInfoByCondition(string searchName ,string searchUserName ,string deptId,
-							string roleId, string userName,long pageNo,long pageSize ) throws common::VCIError;
-			//add by caill 2016.9.26
-			data::UserInfoList fetchUserInfoByConditionUnited(string searchName ,string searchUserName ,string deptId,
-							string roleId, string userName,long pageNo,long pageSize ) throws common::VCIError;
-			data::UserInfoList fetchNoramlUserInfoByConditionUnited(string searchName ,string searchUserName ,string deptId,
-							string roleId, string userName,long pageNo,long pageSize ) throws common::VCIError;   
-			data::UserInfoList fetchNormalUserInfoByCondition(string searchName ,string searchUserName ,string deptId,
-							string roleId, string userName,long pageNo,long pageSize ) throws common::VCIError;                           
-			/**鏍规嵁鏉′欢鑾峰彇浜哄憳鎬绘暟**/
-			long getUserTotalByCondition(string searchName ,string searchUserName ,string deptId,
-							string roleId, string userName) throws common::VCIError;
-							
-			long getNormalUserTotalByCondition(string searchName ,string searchUserName ,string deptId,
-							string roleId, string userName) throws common::VCIError;               
-					
-			/**鑾峰彇鎵�鏈夌殑鎴愬憳**/
-			data::UserInfoList fetchUserInfoByType(short type) throws common::VCIError;
-			/**鏍规嵁鐢ㄦ埛鍚嶈幏鍙栨垚鍛�**/
-			data::UserInfo fetchUserInfoByName(string userName) throws common::VCIError;
-			/**鏍规嵁鏂囦欢鏌淚d鍜屾垚鍛樼被鍨嬭幏鍙栨垚**/
-			data::UserInfoList fetchUserInfoByPvolumeId(string pvolumeId , short type) throws common::VCIError;
-			/**鏍规嵁瑙掕壊Id鍜屾垚鍛樼被鍨嬭幏鍙栨垚**/
-			data::UserInfoList fetchUserInfoByRoleId(string roleId , short type) throws common::VCIError;
-			data::UserInfoList fetchUsersByRoleId(string roleId) throws common::VCIError;
-			data::UserInfoList fetchUserInfoByDeptAndRole(common::data::StringArray deptIds , common::data::StringArray roleIds) throws common::VCIError;
-			/**鍒涘缓鏂囦欢鏌滃拰鐢ㄦ埛鐨勫叧**/
-			bool savePvolumeUser(string pvolumId , common::data::StringArray userIds ,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鍒涘缓瑙掕壊鍜岀敤鎴风殑鍏崇郴**/
-			bool saveRight(string roleId , common::data::StringArray userIds ,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鍒涘缓閮ㄩ棬鍜岀敤鎴风殑鍏崇郴**/
-			bool saveRighForDept(string deptId , common::data::StringArray userIds ,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鍒涘缓瑙掕壊鍜岀敤鎴风殑鍏崇郴**/
-			bool saveRights(common::data::StringArray roleIds , common::data::StringArray userIds ,common::data::UserEntityInfo userEntity) throws common::VCIError;
-					
-			/**鍒涘缓瑙掕壊鍜岀敤鎴风殑鍏崇郴**/
-			bool saveUserDept(common::data::StringArray userIds , string deptId ,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**澧炲姞閮ㄩ棬**/
-			string saveDepartment(data::DeptInfo dept,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鎵归噺淇濆瓨**/
-			bool batchSaveDepart(data::DeptInfoList deptInfo,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**澧炲姞瑙掕壊**/
-			string saveRole(data::RoleInfo role,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鐢ㄤ簬楠岃瘉瑙掕壊鏄惁琚紩鐢�**/
-			long checkRoleIsquotedCount(string id )throws common::VCIError;
-
-			data::UserInfoList selectUserByRoleId(string id) throws common::VCIError;
-			/**澧炲姞鎴愬憳**/
-			string saveUser(data::UserInfo user,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鎵归噺澧炲姞鎴愬憳*/
-			bool batchSaveUsers(data::UserInfoList userInfos,common::data::StringArray2D deptAndUserRelation,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**淇敼閮ㄩ棬**/
-			bool updateDepartment(data::DeptInfo dept, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**淇敼瑙掕壊**/
-			bool updateRole(data::RoleInfo role, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**淇敼鎴愬憳**/
-			bool updateUser(data::UserInfo user, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**淇敼鎴愬憳**/
-			bool saveOrUpdateUser(data::UserInfo user, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鏇存柊閮ㄩ棬鐨勭埗ID**/
-			bool updateDeptParentId(string id, string parentId, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**淇敼鐢ㄦ埛瀵嗙爜**/
-			string modifyUserPassword(string idUser, string oldPW, string newPW, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			
-			
-			/**鍒犻櫎閮ㄩ棬**/
-			bool deleteDepartment(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鍒犻櫎瑙掕壊**/
-			bool deleteRole(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鍒犻櫎鎴愬憳**/
-			bool deleteUser(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鍋滅敤/鍚敤**/
-			bool stopUsers(common::data::StringArray ids ,bool flag, common::data::UserEntityInfo userEntity) throws common::VCIError;
-					
-			/**绯荤粺閰嶇疆妯″潡**/
-			//淇濆瓨鐗规畩瀛楃鍒嗙被
-			string saveSpecialCharClsf(data::SpecialCharClsfInfo specialCharClsf, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鍒犻櫎鐗规畩瀛楃鍒嗙被
-			bool deletSpecialCharClsf(common::data::StringArray ids, common::data::UserEntityInfo userEntity)  throws common::VCIError;
-			//鏇存柊鐗规畩瀛楃鍒嗙被
-			bool updateSpecialCharClsf(data::SpecialCharClsfInfo specialCharClsf, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鑾峰彇鐗规畩瀛楃鍒嗙被
-			data::SpecialCharClsfInfoList getSpecialCharClsfList(long pageNo,long pageSize) throws common::VCIError; 
-			//鑾峰彇鐗规畩瀛楃鍒嗙被
-			data::SpecialCharClsfInfoList getAllSpecialCharClsfList() throws common::VCIError; 
-					
-			//鑾峰彇鐗规畩瀛楃鍒嗙被鎬绘暟
-			long getSpecialCharClsTotal()throws common::VCIError;
-			//鏍规嵁鍒嗙被鑾峰彇瀛楃
-			data::SpecialCharInfoList getBychar(string plscsfoId) throws common::VCIError;
-			//淇濆瓨鐗规畩瀛楃
-			string saveSpecialChar(data::SpecialCharInfoList specialCharInfos, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鍒犻櫎鐗规畩瀛楃
-			bool deletSpecialChar(common::data::StringArray ids, common::data::UserEntityInfo userEntity)  throws common::VCIError;
-			//鍒犻櫎PID鐗规畩瀛楃
-			bool deleteSpecialCharByParentId(string id, common::data::UserEntityInfo userEntity)  throws common::VCIError;
-			//鏇存柊鐗规畩瀛楃
-			bool updateSpecialChar(data::SpecialCharInfo specialChar, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鑾峰彇鐗规畩瀛楃
-			data::SpecialCharInfoList fetchSpecialChar(string classId) throws common::VCIError; 
-							
-			//鑾峰彇鎵�鏈夌殑瀵嗙爜绛栫暐
-			data::PasswordStrategyInfoList fetchAllPasswordStrategy()throws common::VCIError;
-			//鑾峰彇瀵嗙爜绛栫暐鐨勫垎椤靛鐞�
-			data::PasswordStrategyInfoList fetchAllPasswordStrategyByPage(long pageNo,long pageSize)throws common::VCIError;
-			//鑾峰彇瀵嗙爜绛栫暐鎬绘暟
-			long getPasswordStrategyTotal()throws common::VCIError;
-							
-							
-			//淇濆瓨瀵嗙爜绛栫暐
-			bool savePasswordStrategy(data::PasswordStrategyInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//淇敼瀵嗙爜绛栫暐
-			bool editPasswordStrategy(data::PasswordStrategyInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鍒犻櫎瀵嗙爜绛栫暐
-			bool deletePasswordStrategy(common::data::StringArray ids, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//楠岃瘉瀵嗙爜绛栫暐鏄惁琚紩鐢�
-			long checkPasswordStrategyIsquotedCount(string id)throws common::VCIError;
-			//鏍规嵁浜哄憳 鑾峰彇瀵嗙爜绛栫暐
-			data::PasswordStrategyInfo fetchPasswordStrategyByUserId(string userId)throws common::VCIError;
-
-			// 鏍规嵁鐢ㄦ埛妫�鏌ュ瘑鐮佹槸鍚︾鍚堝瘑鐮佺瓥鐣�
-			string checkPasswordStrategyByUserId(string userId, string password, common::data::UserEntityInfo userEnt) throws common::VCIError;
-
-			/**鍒涘缓瀵嗙爜绛栫暐鍜岀敤鎴风殑鍏崇郴**/
-			bool saveUserPasswordStrateg(common::data::StringArray userIds , string passwordStrategId ,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鏍规嵁鐧诲綍鐢ㄦ埛鍚嶈幏鍙栫櫥褰曡处鎴蜂俊鎭�**/
-			data::UserLogonInfo fetchUserLogonObj(string userId) throws common::VCIError;
-			//鑾峰彇鏃堕棿
-			long getSystemTime() throws common::VCIError;
-			/**鏇存柊鐧诲綍淇℃伅**/
-			void updateLogonInfo(string userId,bool flag)throws common::VCIError;
-			//瑙i攣 
-			void deblock(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
-					
-			//閫氳繃ID鍙栧緱鎿嶄綔绫诲瀷淇℃伅
-			data::OperateInfo getOperatetById(string id) throws common::VCIError;
-			//绠�鍗曡褰曠郴缁熺櫥鍏�/鐧诲嚭鏃ュ織
-			void savelog(string content, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			void saveLogV2(string result, string content, string type, short logTypeIntVal, string dataObjOid, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			void savelogfail(string content, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//add by caill绠�鍗曡褰曠敤鎴疯閿佸畾鏃ュ織淇℃伅
-			void blocklog(string userId, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鑾峰彇鎵�鏈夌殑瀵嗙爜缁勫悎鏂瑰紡**/
-			data::CombinationInfoList fetchAllCombinations() throws common::VCIError;
-			/**鍒嗛〉鏌ヨ瀵嗙爜缁勫悎鏂瑰紡**/
-			data::CombinationInfoList fetchCombinationsToPage(long  pageIndex, long pageSize) throws common::VCIError;
-					
-			/**娣诲姞瀵嗙爜缁勫悎鏂瑰紡**/
-			string saveCombination(data::CombinationInfo combination ,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**淇敼瀵嗙爜缁勫悎鏂瑰紡**/
-			bool updateCombination(data::CombinationInfo combination ,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鍒犻櫎瀵嗙爜缁勫悎鏂瑰紡**/
-			bool deleteCombination(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**閫氳繃鐖秈d 鑾峰彇缁勫悎鏂瑰紡鍙栧�艰寖鍥�**/
-			data::CombinationValueInfoList fetchCombinationValuesByParentId(string parentId) throws common::VCIError;
-			/**娣诲姞瀵嗙爜缁勫悎鏂瑰紡鍙栧�艰寖鍥�**/
-			string saveCombinationValue(data::CombinationValueInfoList combinationValues ,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**淇敼瀵嗙爜缁勫悎鏂瑰紡鍙栧�艰寖鍥�**/
-			bool updateCombinationValue(data::CombinationValueInfo combinationValue, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鍒犻櫎瀵嗙爜缁勫悎鏂瑰紡鍙栧�艰寖鍥�**/
-			bool deletCombinationValues(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鏍规嵁瀵嗙爜绛栫暐id 鑾峰彇鍏宠仈鐨勫瘑鐮佺粍鍚堟柟寮�**/
-			data::CombinationInfoList fetchCombinationsByPstId(string pstId) throws common::VCIError;
-			/**妫�楠屽瘑鐮佺粍鍚堟柟寮忔槸鍚﹁瀵嗙爜绛栫暐寮曠敤**/
-			long checkCombinationIsquotedCount(string combinationd )throws common::VCIError;
-					
-			/**淇濆瓨涓夊憳鍜屾垚鍛�**/
-			bool saveSpecialRole(string roleId , common::data::StringArray userIds ,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//涓夊憳鐧诲綍鐨勬ā鍧椾俊鎭�
-			//data::SpecialRoleInfoList getSpecialRoleList()  throws common::VCIError;
-			//鏌ヨ鎵�鏈夌殑瀛愯妭鐐� add by caill
-			common::data::StringArray2D checkLevel() throws common::VCIError;
-			//瀵煎叆鍔熻兘妯″潡绠$悊鏁版嵁 add by caill
-			bool importModules(data::FunctionInfoList functionInfos,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//淇濆瓨鎿嶄綔妯″潡鍏崇郴瀵硅薄 add by caill
-			string saveFunOper(data::FuncOperationInfo funcOperation) throws common::VCIError;
-			//add by caill
-			bool saveFuncOperation2(data::FuncOperationInfo funcOperation,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//鍒ゆ柇绗竴绾ф湁娌℃湁閲嶅悕鐨勬ā鍧� add by caill
-			bool firstLevel(string plName) throws common::VCIError;
-			//瑕嗙洊閲嶅悕鐨勭涓�绾� add by caill
-			string changeFirstLevel(data::FunctionInfo function,string plName) throws common::VCIError;
-			//鍒ゆ柇绗簩绾ф湁娌℃湁閲嶅悕鐨勬ā鍧� add by caill
-			bool secondLevel(string plName,string fParentId) throws common::VCIError;
-			//瑕嗙洊閲嶅悕鐨勭浜岀骇 add by caill
-			string changeSecondLevel(data::FunctionInfo function,string plName,string fParentId) throws common::VCIError;
-			//鍒ゆ柇妯″潡涓槸鍚﹀凡缁忓瓨鍦ㄦ鎿嶄綔绫诲瀷 add by caill
-			bool selSameOper(string dataOperName,string plFuncOid) throws common::VCIError;
-			//瑕嗙洊鎿嶄綔绫诲瀷 add by caill
-			bool updateOperation(data::FuncOperationInfo funcOperation,common::data::UserEntityInfo userEntity,string dataOperName,string plFuncOid) throws common::VCIError;
-			//
-			common::data::StringArray2D getAllDatas(long size) throws common::VCIError;
-			//
-			long getAllOperitionsNum() throws common::VCIError;
-			//
-			common::data::StringArray2D getAllOperitions(long size) throws common::VCIError;
-			//
-			long getAllModelManagementNum() throws common::VCIError;
-			//add by caill 2016.1.19鎵归噺澧炲姞瑙掕壊*/
-			bool batchSaveRoles(data::RoleInfoList roles,common::data::UserEntityInfo userEntity) throws common::VCIError;
-			//淇濆瓨涓�鑸搷浣滅被鍨嬫棩蹇�
-			void savelogGeneralOperation(string result, string content, common::data::UserEntityInfo userEntity,string dataId,string plType) throws common::VCIError;
-			//鑾峰彇鏁版嵁搴撲俊鎭�
-			data::DataSourceInfo getDataSourceInfo() throws common::VCIError;
-					
-			//add by weidy 2021-1-2 鎶婅阿鍐涙坊鍔犵殑瑙掕壊閫夋嫨绛夋帴鍙f暣鍚堣繘鏉�
-			/**鏍规嵁id鑾峰彇閮ㄩ棬**/
-			data::DeptInfoList fetchDepartmentInfoByIds(string otherFiterString) throws common::VCIError;
-			/****鏍规嵁鏌ヨ鏉′欢鑾峰彇涓嬬骇閮ㄩ棬***/
-			data::DeptInfoList fetchChildrenDeptByParentOid(string prtoid,bool iscontains, string otherFiterString) throws common::VCIError;
-			/***鑾峰彇閮ㄩ棬鍒楄〃淇℃伅****/
-			data::DeptInfoList gridDeptDataGrids(string filter,long pageNo,long pageSize)throws common::VCIError;
-
-			long gridDeptDataGridsCount(string filter)throws common::VCIError;
-
-			data::RoleInfoList queryRoleInfos(string filter,long pageNo,long pageSize)throws common::VCIError;
-
-			long queryRoleInfosCount(string filter)throws common::VCIError;
-
-			/****鏍规嵁鏉′欢鏌ヨ闄ゅ幓admin锛宒eveloper锛屼笁鍛樺鎵�鏈夌殑鏅�氭垚鍛�**/
-			data::UserInfoList fetchUserInfoByFilterString( string filterString,long pageNo,long pageSize ) throws common::VCIError;
-
-			long  fetchUserInfoByFilterStringCount( string filterString) throws common::VCIError;
-
-			/****鏍规嵁鏉′欢鏌ヨ闄ゅ幓admin锛宒eveloper锛屼笁鍛樺鎵�鏈夌殑鏅�氭垚鍛�**/
-			data::UserInfoList fetchUserInfosByFilterStringsql( string filterString) throws common::VCIError;
-
-			/**鏍规嵁鐢ㄦ埛鍚嶆壒閲忚幏鍙栨垚鍛�**/
-			data::UserInfoList fetchUserInfoByNames(common::data::StringArray  userNames) throws common::VCIError;
-
-			/**鏍规嵁鐢ㄦ埛涓婚敭鑾峰彇鎴愬憳**/
-			data::UserInfo getUserObjectByoid(string userOid) throws common::VCIError;
-
-			/**鏍规嵁鐢ㄦ埛涓婚敭鎵归噺鑾峰彇鎴愬憳**/
-			data::UserInfoList getUserObjectByoids(common::data::StringArray userOid) throws common::VCIError;
-					
-			//=====================================================================================
-			/**涓撲笟淇℃伅鎿嶄綔鎺ュ彛**/
-			// 鑾峰彇鎵�鏈変笓涓氫俊鎭�
-			data::SpecialtyInfoList getAllSpecialtyInfo() throws common::VCIError;
-
-			// 澧炲姞涓撲笟
-			string saveSpecialty(data::SpecialtyInfo specialty,common::data::UserEntityInfo userEnt) throws common::VCIError;
-
-			/**鎵归噺澧炲姞涓撲笟*/
-			bool batchSaveSpecialties(data::SpecialtyInfoList specialties, common::data::UserEntityInfo userEnt) throws common::VCIError;
-
-			/**淇敼涓撲笟**/
-			bool updateSpecialty(data::SpecialtyInfo specialty, common::data::UserEntityInfo userEnt) throws common::VCIError;
-
-			/**鎵归噺淇敼涓撲笟**/
-			bool batchUpdateSpecialty(data::SpecialtyInfoList specialties, common::data::UserEntityInfo userEnt) throws common::VCIError;
-
-			//鍒犻櫎涓撲笟
-			bool deletSpecialty(common::data::StringArray ids, common::data::UserEntityInfo userEnt)  throws common::VCIError;
-
-			//=====================================================================================
-			/**鏈哄櫒瀵嗙骇淇℃伅鎿嶄綔鎺ュ彛**/
-			// 鑾峰彇鏈哄櫒瀵嗙骇淇℃伅鎬绘暟
-			long getMachSecurityTolal() throws common::VCIError;
-			// 鑾峰彇绗﹀悎鏉′欢鐨勬満鍣ㄥ瘑绾т俊鎭�绘暟
-			long getMachSecurityTolalByCondition(string name, string ipAddress, short security) throws common::VCIError;
-			// 鑾峰彇鎵�鏈夋満鍣ㄥ瘑绾т俊鎭�
-			data::MachSecurityInfoList getAllMachSecurity() throws common::VCIError;
-			// 鍒嗛〉鏌ヨ鑾峰彇鎵�鏈夋満鍣ㄥ瘑绾т俊鎭�
-			data::MachSecurityInfoList fetchMachSecurityByPage(long pageNo, long pageSize)throws common::VCIError;
-			// 鍒嗛〉鏌ヨ鑾峰彇鎵�鏈夋満鍣ㄥ瘑绾т俊鎭紝鎸夋潯浠�
-			data::MachSecurityInfoList fetchMachSecurityConditionByPage(string name, string ipAddress, short security, long pageNo, long pageSize)throws common::VCIError;
-			// 澧炲姞鏈哄櫒瀵嗙骇
-			string saveMachSecurity(data::MachSecurityInfo info,common::data::UserEntityInfo userEnt) throws common::VCIError;
-			/**鎵归噺澧炲姞鏈哄櫒瀵嗙骇*/
-			bool batchSaveMachSecurity(data::MachSecurityInfoList infos, common::data::UserEntityInfo userEnt) throws common::VCIError;
-			/**淇敼鏈哄櫒瀵嗙骇**/
-			bool updateMachSecurity(data::MachSecurityInfo info, common::data::UserEntityInfo userEnt) throws common::VCIError;
-			/**鎵归噺淇敼鏈哄櫒瀵嗙骇**/
-			bool batchUpdateMachSecurity(data::MachSecurityInfoList infos, common::data::UserEntityInfo userEnt) throws common::VCIError;
-			//鍒犻櫎鏈哄櫒瀵嗙骇
-			bool deletMachSecurity(common::data::StringArray ids, common::data::UserEntityInfo userEnt)  throws common::VCIError;
-			//鑾峰彇鏈哄櫒瀵嗙骇, type=0 鏈娇鐢�
-			long getMachSecurity(string ipAddress, short type, common::data::UserEntityInfo userEnt)  throws common::VCIError;
-			//鑾峰彇鏈哄櫒瀵嗙骇淇℃伅, type=0 鏈娇鐢�
-			data::MachSecurityInfo getMachSecurityInfo(string ipAddress, short type, common::data::UserEntityInfo userEnt)  throws common::VCIError;
-			
-			//=====================================================================================
-			/**鏁版嵁鎺堟潈鎺ュ彛**/
-			//淇濆瓨鏁版嵁鎺堟潈
-			bool saveGrand(data::GrandValueArray values) throws common::VCIError;
-			//鏌ヨ鏁版嵁鎺堟潈
-			data::GrandValueArray queryGrand(string identifier) throws common::VCIError;
-			//鍒犻櫎鏁版嵁鎺堟潈
-			bool deleteGrand(string ruleName)throws common::VCIError;
-			//鍒犻櫎绫诲瀷鏁版嵁鎺堟潈
-			bool deleteTypeRuleGrand(string identifier,string ruleName)throws common::VCIError;
-			
-			// 妫�鏌ユ潈闄�
-			string checkRight(data::CheckValue value) throws common::VCIError;
-			
-			//=====================================================================================
-			/**鍗风鐞�**/
-			/**璇诲彇鎵�鏈夌殑鍗�**/
-			data::PvolumeInfoList getAllPvolumes() throws common::VCIError;
-			// 鏌ヨ榛樿鍗�
-			data::PvolumeInfo getDefaultVolume() throws common::VCIError;
-			// 璇诲彇鎸囧畾鍚嶇О鐨勫嵎
-			data::PvolumeInfo getVolumnByName(string volName) throws common::VCIError;
-			/**鍒嗛〉璇诲彇鍗�**/
-			data::PvolumeInfoList getPvolumesPage(short  pageSize, short pageIndex) throws common::VCIError;
-			/**鍗峰垱寤�**/
-			string savePvolume(data::PvolumeInfo vol, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鍗蜂慨鏀�**/
-			bool updatePvolume(data::PvolumeInfo vol, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**鍗峰垹闄�**/
-			bool deletePvolume(common::data::StringArray ids, common::data::UserEntityInfo userEntity) throws common::VCIError;
-			/**妫�鏌ヨ鍒犻櫎鐨勫嵎鏄惁涓洪閫夎矾寰�**/
-			bool checkIsvalid(string id) throws common::VCIError;
-			/**淇敼鍗凤紝灏嗙郴缁熶腑鐨勫叾浠栧嵎璁剧疆涓洪潪棣栭�� 0**/
-			void updatePvolumeInvalid(common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//flag:nonsys鍒犻櫎闈炵郴缁熸ā鍧�
+		//flag:business鍒犻櫎涓氬姟妯″潡
+		bool deleteModules(string flag)throws common::VCIError;
+		common::data::StringArray getClientDeployJarPath() throws common::VCIError;
 		
-		}//end interface
-	}//method
+		/** AppConfigCategory 瀵硅薄鎺ュ彛 **/
+		// 娣诲姞銆佷繚瀛� AppConfigCategory 瀵硅薄 
+		string saveAppConfigCategory(data::AppConfigCategoryInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		// 淇敼銆佹洿鏂� AppConfigCategory 瀵硅薄 
+		bool updateAppConfigCategory(data::AppConfigCategoryInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		// 鏍规嵁ID鍒犻櫎  AppConfigCategory 瀵硅薄锛堟壒閲忥級
+		bool deleteAppConfigCategory(common::data::StringArray ids, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		// 杩斿洖鍏ㄩ儴  AppConfigCategory 瀵硅薄
+		data::AppConfigCategoryInfoList getAppConfigCategorys(common::data::UserEntityInfo userEntity) throws common::VCIError;
+		// 鏍规嵁ID杩斿洖  AppConfigCategory 瀵硅薄
+		data::AppConfigCategoryInfo getAppConfigCategoryById(string id, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/** AppConfigDetail 瀵硅薄鎺ュ彛 **/
+		// 娣诲姞銆佷繚瀛� AppConfigDetail 瀵硅薄 
+		string saveAppConfigDetail(data::AppConfigDetailInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		// 淇敼銆佹洿鏂� AppConfigDetail 瀵硅薄 
+		bool updateAppConfigDetail(data::AppConfigDetailInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		// 鏍规嵁ID鍒犻櫎  AppConfigDetail 瀵硅薄锛堟壒閲忥級
+		bool deleteAppConfigDetail(common::data::StringArray ids, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		// 杩斿洖鍏ㄩ儴  AppConfigDetail 瀵硅薄
+		data::AppConfigDetailInfoList getAppConfigDetails(common::data::UserEntityInfo userEntity) throws common::VCIError;
+		// 杩斿洖鎸囧畾鍒嗙被鐨勫叏閮�  AppConfigDetail 瀵硅薄
+		data::AppConfigDetailInfoList getAppConfigDetailsByCatId(string clsfId, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		data::AppConfigDetailInfoList getAppConfigDetailsByCategory(string catName, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		
+		// 鏍规嵁ID杩斿洖  AppConfigDetail 瀵硅薄
+		data::AppConfigDetailInfo getAppConfigDetailById(string id, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		// 鏍规嵁閰嶇疆Key杩斿洖  AppConfigDetail 瀵硅薄
+		data::AppConfigDetailInfo getAppConfigDetailByKey(string key, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		// 鏍规嵁閰嶇疆Key杩斿洖  AppConfigDetail 瀵硅薄
+		data::AppConfigDetailInfoList getAppConfigDetailsByName(string name, common::data::UserEntityInfo userEntity) throws common::VCIError;
+					
+		/** 鏍规嵁key鑾峰彇conf.properties涓殑鍙傛暟鍊�
+			fileResourcePath锛氳祫婧愭枃浠惰矾寰�  
+			姣斿锛�/properties/conf.properties锛寈xx.properties 鏂囦欢鍦ㄩ」鐩富鐩綍鐨刾roperties鏂囦欢澶逛笅
+			鎴栬�咃細properties/xxx.properties锛寈xx.properties 鏂囦欢鍦╯rc/properties/鏂囦欢澶逛笅
+			濡傛灉浼犲叆绌哄�硷紝鍒欎粠 /properties/conf.properties 涓鍙�
+			key锛�
+		**/
+		string getConfigValue(string key) throws common::VCIError;
+				
+		//寰楀埌涓�涓殢鍗崇殑36浣嶆暟
+		string getRandomGUID36() throws common::VCIError; 
+				
+		/***************************绯荤粺鍔熻兘妯″潡start**************************/
+		//淇濆瓨妯″潡
+		string saveModule(data::FunctionInfo function,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鏇存柊妯″潡
+		string updateModule(data::FunctionInfo function,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鍒犻櫎妯″潡
+		string deleteModule(string moduleId,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鑾峰彇鑷姩鐢熸垚鐨勭紪鍙�
+		//long getAutoModuleNo() throws common::VCIError;
+		//鑾峰彇瀛愮骇妯″潡
+		data::FunctionInfoList getModuleListByParentId(string parentId,bool isAll) throws common::VCIError;
+		data::FunctionInfoList getModuleListByParentIdForBS(string parentId,bool isAll) throws common::VCIError;
+		data::FunctionInfoList getModuleListByParentIdForCS(string parentId,bool isAll) throws common::VCIError;
+		//鑾峰彇鎵�鏈夊瓙绾фā鍧�
+		data::FunctionInfoList getChildrenFunctionsByParentId(string parentId,bool isAll) throws common::VCIError;
+		//鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀛愮骇妯″潡鍒楄〃
+		data::FunctionInfoList getModuleListByRoleRight(string parentId,string userName) throws common::VCIError;
+		data::FunctionInfoList getModuleListByRoleRightForBS(string parentId,string userName) throws common::VCIError;
+		//鏍规嵁class鏌ヨ妯″潡瀵硅薄
+		data::FunctionInfo getModuleByClass(string classPath) throws common::VCIError;
+		//鏍规嵁funcOid鏌ヨ妯″潡瀵硅薄
+		data::FunctionInfo getFunctionObjectById(string funcOid) throws common::VCIError;
+		//鏍规嵁妯″潡鍚嶇О鏌ヨ妯″潡瀵硅薄
+		data::FunctionInfo getModuleByName(string moduleName) throws common::VCIError;
+		//妫�鏌ユā鍧椾笅鏄寕鎺ユā鍧楄繕鏄寕鎺ユ搷浣滐紝true涓烘寕鎺ユā鍧�
+		long checkChildObject(string moduleId) throws common::VCIError;
+		//淇濆瓨鎿嶄綔
+		string saveOperate(data::OperateInfo operate,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//淇敼鎿嶄綔
+		string updateOperate(data::OperateInfo operate,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鍒犻櫎鎿嶄綔
+		bool deleteOperate(string id,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鑾峰彇鍏ㄩ儴鎿嶄綔鍒楄〃锛堝弬鏁版ā鍧桰D涓嶄负绌虹殑鏃跺�欒幏鍙栭櫎璇ユā鍧椾笅鎿嶄綔涔嬪鐨勫叏閮ㄦ搷浣滐級
+		data::OperateInfoList getOperateTreeList(string moduleId) throws common::VCIError;
+		//妫�鏌ユ搷浣滄槸鍚﹁寮曠敤
+		long checkOperateIsReferenced(string operateId) throws common::VCIError;
+		//閫氳繃鏍囪瘑鑾峰彇鎿嶄綔
+		data::OperateInfo getOperateByIdentify(string identify) throws common::VCIError;
+		//閫氳繃鍚嶇О鑾峰彇鎿嶄綔
+		data::OperateInfo fetchOperateTypeByName(string name) throws common::VCIError;
+		//鑾峰彇妯″潡涓嬫寕鎺ョ殑鎿嶄綔瀵硅薄 onlyIsValid 鍙傛暟琛ㄧず鏄惁浠呬粎杩斿洖鏄敓鏁堢殑鎿嶄綔 true锛氭槸 false 锛氫笉鏄紙姝ゆ椂杩斿洖妯″潡涓嬪叏閮ㄧ殑鎿嶄綔锛屼粎鍦ㄥ畾涔夋ā鍧椾笅鐨勬搷浣滄椂闇�瑕佽繑鍥炲叏閮ㄧ殑鎿嶄綔锛屽叾瀹冩儏鍐甸渶瑕佸潎鍙渶瑕佽繑鍥炵敓鏁堢殑鎿嶄綔锛�
+		data::FuncOperationInfoList getFuncOperationByModule(string funcitonId,string operateId, bool onlyIsValid) throws common::VCIError;
+		//閫氳繃鎿嶄綔鏍囪瘑鍜屾ā鍧桰D鑾峰彇鎸傛帴鍏崇郴
+		data::FuncOperationInfo getFuncOperationByIdentify(string funcId,string identify) throws common::VCIError;
+		//淇濆瓨妯″潡涓嬬殑鎿嶄綔
+		bool saveFuncOperation(data::FuncOperationInfoList funcOperationInfos,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//淇敼妯″潡涓嬫搷浣滃埆鍚�
+		bool updateFuncOperation(string id, string alias, bool isSelected, common::data::UserEntityInfo userEntity) throws common::VCIError; 
+		//鍒犻櫎妯″潡涓嬬殑鎿嶄綔
+		bool deleteFuncOperation(data::FuncOperationInfo funcOperation,common::data::UserEntityInfo userEntity) throws common::VCIError;
+				
+		//淇濆瓨瑙掕壊鏉冮檺,閫氳繃鐢ㄦ埛鍚嶅尯鍒嗘潈闄愮被鍨�
+		bool saveRoleRight(data::RoleRightInfoList roleRightInfos,string roleId,string userName,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//澧炲姞瑙掕壊鏉冮檺,閫氳繃鐢ㄦ埛鍚嶅尯鍒嗘潈闄愮被鍨�
+		bool addRoleRight(data::RoleRightInfoList roleRightInfos,string roleId,string userName,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鑾峰彇瑙掕壊鏉冮檺,閫氳繃鐢ㄦ埛鍚嶅尯鍒嗘潈闄愮被鍨�
+		data::RoleRightInfoList getRoleRightList(string roleId,string userName) throws common::VCIError; 
+		//鏍规嵁鎺堟潈瑙掕壊鐨勭被鍨嬭幏鍙栨潈闄� 
+		data::RoleRightInfoList getRoleRightListByType(common::data::StringArray rightType) throws common::VCIError; 
+		//鍒犻櫎瑙掕壊鏉冮檺锛寃eidy@2018-10-12
+		bool removeRoleRight(data::RoleRightInfoList roleRightInfos,string roleId,string userName,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//娓呯┖瑙掕壊鏉冮檺锛寃eidy@2019-01-24
+		bool clearRoleRight(string roleId,string userName,common::data::UserEntityInfo userEntity, short functionType) throws common::VCIError;
+		//鑾峰彇鐢ㄦ埛瀵瑰綋鍓嶆ā鍧楃殑鏉冮檺鍊�
+		data::RoleRightInfoList getRoleRightByModule(string funcId,string userName) throws common::VCIError; 
+		//鑾峰彇褰撳墠鐢ㄦ埛鐨勬潈闄�
+		data::RoleRightInfoList getRoleRightByUserName(string userName) throws common::VCIError; 
+		//鑾峰彇褰撳墠鐢ㄦ埛鐨勫叿鏈夌殑鍔熻兘妯″潡鏉冮檺
+		data::RoleRightInfoList getFunctionRoleRightByUserName(string userName) throws common::VCIError; 
+		
+
+		/***************************绯荤粺鍔熻兘妯″潡end**************************/ 
+				
+		/**鑾峰彇鎵�鏈夐儴闂�**/
+		data::DeptInfoList fetchDepartmentInfo() throws common::VCIError;
+							
+		data::DeptInfoList fetchDeptByUserNames(common::data::StringArray userNames) throws common::VCIError;
+		/**鏍规嵁id鑾峰彇閮ㄩ棬**/
+		data::DeptInfo fetchDepartmentInfoById(string id) throws common::VCIError;
+		/**鏍规嵁浜哄憳id鑾峰彇閮ㄩ棬**/
+		data::DeptInfo fetchDeptByUserId(string userId) throws common::VCIError;
+		data::DeptInfo fetchDeptByDeptName(string deptName) throws common::VCIError;
+		data::DeptInfo fetchDeptByParentIdAndName(string parentId,string deptName) throws common::VCIError;
+		/**鑾峰彇椤剁骇閮ㄩ棬**/
+		data::DeptInfoList fetchDepartmentInfoRoot() throws common::VCIError;
+		/**鑾峰彇閮ㄩ棬涓嬬殑瀛愰儴闂�**/
+		data::DeptInfoList fetchDepartmentInfoByParentId(string prtoid) throws common::VCIError;
+		/**鏍规嵁id鑾峰彇閮ㄩ棬鍙婂叾瀛愰儴闂�**/
+		data::DeptInfoList fetchDepartmentInfosById(string id) throws common::VCIError;
+		data::DeptInfoList fetchDepartmentInfosBySonId(string id) throws common::VCIError;
+		//鏍规嵁閮ㄩ棬id鑾峰彇鐢ㄦ埛淇℃伅
+		data::UserInfoList getUserByDeptId(string deptId)throws common::VCIError;
+				
+		/** 鏍规嵁ID杩斿洖瑙掕壊瀵硅薄**/
+		data::RoleInfo fetchRoleInfoById(string roleId) throws common::VCIError;
+		data::RoleInfo fetchRoleByName(string name) throws common::VCIError;
+		/**鑾峰彇鎵�鏈夌殑瑙掕壊**/
+		data::RoleInfoList fetchRoleInfo() throws common::VCIError;
+		/**鏍规嵁鐢ㄦ埛绫诲瀷鑾峰彇瑙掕壊**/
+		data::RoleInfoList fetchRoleInfoByType(short type) throws common::VCIError;
+		/**鏍规嵁瑙掕壊绫诲瀷鑾峰彇瑙掕壊**/
+		data::RoleInfoList fetchRoleInfoByRoleType(short type) throws common::VCIError;
+		/**閫佹璁惧瑙掕壊**/
+		data::RoleInfoList getRoleListByTypeForMeasure(short type) throws common::VCIError;
+		/**鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊**/
+		data::RoleInfoList fetchRoleInfoByUserId(string userId) throws common::VCIError;
+		/**鏍规嵁鐢ㄦ埛鍚嶈幏鍙栬鑹�**/
+		data::RoleInfoList fetchRoleInfoByUserName(string userName) throws common::VCIError;
+		/**鏍规嵁鐢ㄦ埛鍚嶈幏鍙栬鑹茬殑鍒嗛〉瀹炵幇**/
+		data::RoleInfoList fetchRoleInfoByUserNameAndPage(long pageNo,long pageSize,string userName) throws common::VCIError;
+		/**鏍规嵁姣旂敤鎴风被鍨嬩綆鐨勮鑹�**/
+		data::RoleInfoList fetchRoleInfoByUserType(string userName) throws common::VCIError;
+		/**鏍规嵁鐢ㄦ埛鍚嶈幏鍙栬鑹叉�绘暟**/
+		long getRoleTotalByUserName(string userName) throws common::VCIError;
+				
+		/**鏍规嵁鍨嬪彿鑾峰彇璇ュ瀷鍙蜂笅鐨勫瀷鍙锋�诲笀**/
+		data::UserInfoList fetchUserInfoByModel(string model) throws common::VCIError;
+		/**鏍规嵁鍨嬪彿鑾峰彇璇ュ瀷鍙蜂笅鐨勫瀷鍙锋�诲笀**/
+		data::UserInfoList fetchUserInfoByModelId(string modelId) throws common::VCIError;
+		/**鑾峰彇鎵�鏈夌殑鎴愬憳**/
+		data::UserInfoList fetchUserInfo() throws common::VCIError;
+		/**鑾峰彇闄ゅ幓admin锛宒eveloper锛屼笁鍛樺鎵�鏈夌殑鏅�氭垚鍛�**/
+		data::UserInfoList fetchUserInfoWithOutSanYuan() throws common::VCIError;
+		/**鏍规嵁鏉′欢鏌ヨ鐢ㄦ埛**/
+		data::UserInfoList fetchUserInfoByCondition(string searchName ,string searchUserName ,string deptId,
+						string roleId, string userName,long pageNo,long pageSize ) throws common::VCIError;
+		//add by caill 2016.9.26
+		data::UserInfoList fetchUserInfoByConditionUnited(string searchName ,string searchUserName ,string deptId,
+						string roleId, string userName,long pageNo,long pageSize ) throws common::VCIError;
+		data::UserInfoList fetchNoramlUserInfoByConditionUnited(string searchName ,string searchUserName ,string deptId,
+						string roleId, string userName,long pageNo,long pageSize ) throws common::VCIError;   
+		data::UserInfoList fetchNormalUserInfoByCondition(string searchName ,string searchUserName ,string deptId,
+						string roleId, string userName,long pageNo,long pageSize ) throws common::VCIError;                           
+		/**鏍规嵁鏉′欢鑾峰彇浜哄憳鎬绘暟**/
+		long getUserTotalByCondition(string searchName ,string searchUserName ,string deptId,
+						string roleId, string userName) throws common::VCIError;
+						
+		long getNormalUserTotalByCondition(string searchName ,string searchUserName ,string deptId,
+						string roleId, string userName) throws common::VCIError;               
+				
+		/**鑾峰彇鎵�鏈夌殑鎴愬憳**/
+		data::UserInfoList fetchUserInfoByType(short type) throws common::VCIError;
+		/**鏍规嵁鐢ㄦ埛鍚嶈幏鍙栨垚鍛�**/
+		data::UserInfo fetchUserInfoByName(string userName) throws common::VCIError;
+		/**鏍规嵁鏂囦欢鏌淚d鍜屾垚鍛樼被鍨嬭幏鍙栨垚**/
+		data::UserInfoList fetchUserInfoByPvolumeId(string pvolumeId , short type) throws common::VCIError;
+		/**鏍规嵁瑙掕壊Id鍜屾垚鍛樼被鍨嬭幏鍙栨垚**/
+		data::UserInfoList fetchUserInfoByRoleId(string roleId , short type) throws common::VCIError;
+		data::UserInfoList fetchUsersByRoleId(string roleId) throws common::VCIError;
+		data::UserInfoList fetchUserInfoByDeptAndRole(common::data::StringArray deptIds , common::data::StringArray roleIds) throws common::VCIError;
+		/**鍒涘缓鏂囦欢鏌滃拰鐢ㄦ埛鐨勫叧**/
+		bool savePvolumeUser(string pvolumId , common::data::StringArray userIds ,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鍒涘缓瑙掕壊鍜岀敤鎴风殑鍏崇郴**/
+		bool saveRight(string roleId , common::data::StringArray userIds ,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鍒涘缓閮ㄩ棬鍜岀敤鎴风殑鍏崇郴**/
+		bool saveRighForDept(string deptId , common::data::StringArray userIds ,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鍒涘缓瑙掕壊鍜岀敤鎴风殑鍏崇郴**/
+		bool saveRights(common::data::StringArray roleIds , common::data::StringArray userIds ,common::data::UserEntityInfo userEntity) throws common::VCIError;
+				
+		/**鍒涘缓瑙掕壊鍜岀敤鎴风殑鍏崇郴**/
+		bool saveUserDept(common::data::StringArray userIds , string deptId ,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**澧炲姞閮ㄩ棬**/
+		string saveDepartment(data::DeptInfo dept,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鎵归噺淇濆瓨**/
+		bool batchSaveDepart(data::DeptInfoList deptInfo,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**澧炲姞瑙掕壊**/
+		string saveRole(data::RoleInfo role,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鐢ㄤ簬楠岃瘉瑙掕壊鏄惁琚紩鐢�**/
+		long checkRoleIsquotedCount(string id )throws common::VCIError;
+
+		data::UserInfoList selectUserByRoleId(string id) throws common::VCIError;
+		/**澧炲姞鎴愬憳**/
+		string saveUser(data::UserInfo user,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鎵归噺澧炲姞鎴愬憳*/
+		bool batchSaveUsers(data::UserInfoList userInfos,common::data::StringArray2D deptAndUserRelation,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**淇敼閮ㄩ棬**/
+		bool updateDepartment(data::DeptInfo dept, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**淇敼瑙掕壊**/
+		bool updateRole(data::RoleInfo role, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**淇敼鎴愬憳**/
+		bool updateUser(data::UserInfo user, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**淇敼鎴愬憳**/
+		bool saveOrUpdateUser(data::UserInfo user, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鏇存柊閮ㄩ棬鐨勭埗ID**/
+		bool updateDeptParentId(string id, string parentId, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**淇敼鐢ㄦ埛瀵嗙爜**/
+		string modifyUserPassword(string idUser, string oldPW, string newPW, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		
+		
+		/**鍒犻櫎閮ㄩ棬**/
+		bool deleteDepartment(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鍒犻櫎瑙掕壊**/
+		bool deleteRole(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鍒犻櫎鎴愬憳**/
+		bool deleteUser(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鍋滅敤/鍚敤**/
+		bool stopUsers(common::data::StringArray ids ,bool flag, common::data::UserEntityInfo userEntity) throws common::VCIError;
+				
+		/**绯荤粺閰嶇疆妯″潡**/
+		//淇濆瓨鐗规畩瀛楃鍒嗙被
+		string saveSpecialCharClsf(data::SpecialCharClsfInfo specialCharClsf, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鍒犻櫎鐗规畩瀛楃鍒嗙被
+		bool deletSpecialCharClsf(common::data::StringArray ids, common::data::UserEntityInfo userEntity)  throws common::VCIError;
+		//鏇存柊鐗规畩瀛楃鍒嗙被
+		bool updateSpecialCharClsf(data::SpecialCharClsfInfo specialCharClsf, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鑾峰彇鐗规畩瀛楃鍒嗙被
+		data::SpecialCharClsfInfoList getSpecialCharClsfList(long pageNo,long pageSize) throws common::VCIError; 
+		//鑾峰彇鐗规畩瀛楃鍒嗙被
+		data::SpecialCharClsfInfoList getAllSpecialCharClsfList() throws common::VCIError; 
+				
+		//鑾峰彇鐗规畩瀛楃鍒嗙被鎬绘暟
+		long getSpecialCharClsTotal()throws common::VCIError;
+		//鏍规嵁鍒嗙被鑾峰彇瀛楃
+		data::SpecialCharInfoList getBychar(string plscsfoId) throws common::VCIError;
+		//淇濆瓨鐗规畩瀛楃
+		string saveSpecialChar(data::SpecialCharInfoList specialCharInfos, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鍒犻櫎鐗规畩瀛楃
+		bool deletSpecialChar(common::data::StringArray ids, common::data::UserEntityInfo userEntity)  throws common::VCIError;
+		//鍒犻櫎PID鐗规畩瀛楃
+		bool deleteSpecialCharByParentId(string id, common::data::UserEntityInfo userEntity)  throws common::VCIError;
+		//鏇存柊鐗规畩瀛楃
+		bool updateSpecialChar(data::SpecialCharInfo specialChar, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鑾峰彇鐗规畩瀛楃
+		data::SpecialCharInfoList fetchSpecialChar(string classId) throws common::VCIError; 
+						
+		//鑾峰彇鎵�鏈夌殑瀵嗙爜绛栫暐
+		data::PasswordStrategyInfoList fetchAllPasswordStrategy()throws common::VCIError;
+		//鑾峰彇瀵嗙爜绛栫暐鐨勫垎椤靛鐞�
+		data::PasswordStrategyInfoList fetchAllPasswordStrategyByPage(long pageNo,long pageSize)throws common::VCIError;
+		//鑾峰彇瀵嗙爜绛栫暐鎬绘暟
+		long getPasswordStrategyTotal()throws common::VCIError;
+						
+						
+		//淇濆瓨瀵嗙爜绛栫暐
+		bool savePasswordStrategy(data::PasswordStrategyInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//淇敼瀵嗙爜绛栫暐
+		bool editPasswordStrategy(data::PasswordStrategyInfo info, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鍒犻櫎瀵嗙爜绛栫暐
+		bool deletePasswordStrategy(common::data::StringArray ids, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//楠岃瘉瀵嗙爜绛栫暐鏄惁琚紩鐢�
+		long checkPasswordStrategyIsquotedCount(string id)throws common::VCIError;
+		//鏍规嵁浜哄憳 鑾峰彇瀵嗙爜绛栫暐
+		data::PasswordStrategyInfo fetchPasswordStrategyByUserId(string userId)throws common::VCIError;
+
+		// 鏍规嵁鐢ㄦ埛妫�鏌ュ瘑鐮佹槸鍚︾鍚堝瘑鐮佺瓥鐣�
+		string checkPasswordStrategyByUserId(string userId, string password, common::data::UserEntityInfo userEnt) throws common::VCIError;
+
+		/**鍒涘缓瀵嗙爜绛栫暐鍜岀敤鎴风殑鍏崇郴**/
+		bool saveUserPasswordStrateg(common::data::StringArray userIds , string passwordStrategId ,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鏍规嵁鐧诲綍鐢ㄦ埛鍚嶈幏鍙栫櫥褰曡处鎴蜂俊鎭�**/
+		data::UserLogonInfo fetchUserLogonObj(string userId) throws common::VCIError;
+		//鑾峰彇鏃堕棿
+		long getSystemTime() throws common::VCIError;
+		/**鏇存柊鐧诲綍淇℃伅**/
+		void updateLogonInfo(string userId,bool flag)throws common::VCIError;
+		//瑙i攣 
+		void deblock(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
+				
+		//閫氳繃ID鍙栧緱鎿嶄綔绫诲瀷淇℃伅
+		data::OperateInfo getOperatetById(string id) throws common::VCIError;
+
+		/**鑾峰彇鎵�鏈夌殑瀵嗙爜缁勫悎鏂瑰紡**/
+		data::CombinationInfoList fetchAllCombinations() throws common::VCIError;
+		/**鍒嗛〉鏌ヨ瀵嗙爜缁勫悎鏂瑰紡**/
+		data::CombinationInfoList fetchCombinationsToPage(long  pageIndex, long pageSize) throws common::VCIError;
+				
+		/**娣诲姞瀵嗙爜缁勫悎鏂瑰紡**/
+		string saveCombination(data::CombinationInfo combination ,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**淇敼瀵嗙爜缁勫悎鏂瑰紡**/
+		bool updateCombination(data::CombinationInfo combination ,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鍒犻櫎瀵嗙爜缁勫悎鏂瑰紡**/
+		bool deleteCombination(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**閫氳繃鐖秈d 鑾峰彇缁勫悎鏂瑰紡鍙栧�艰寖鍥�**/
+		data::CombinationValueInfoList fetchCombinationValuesByParentId(string parentId) throws common::VCIError;
+		/**娣诲姞瀵嗙爜缁勫悎鏂瑰紡鍙栧�艰寖鍥�**/
+		string saveCombinationValue(data::CombinationValueInfoList combinationValues ,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**淇敼瀵嗙爜缁勫悎鏂瑰紡鍙栧�艰寖鍥�**/
+		bool updateCombinationValue(data::CombinationValueInfo combinationValue, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鍒犻櫎瀵嗙爜缁勫悎鏂瑰紡鍙栧�艰寖鍥�**/
+		bool deletCombinationValues(common::data::StringArray ids , common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鏍规嵁瀵嗙爜绛栫暐id 鑾峰彇鍏宠仈鐨勫瘑鐮佺粍鍚堟柟寮�**/
+		data::CombinationInfoList fetchCombinationsByPstId(string pstId) throws common::VCIError;
+		/**妫�楠屽瘑鐮佺粍鍚堟柟寮忔槸鍚﹁瀵嗙爜绛栫暐寮曠敤**/
+		long checkCombinationIsquotedCount(string combinationd )throws common::VCIError;
+				
+		/**淇濆瓨涓夊憳鍜屾垚鍛�**/
+		bool saveSpecialRole(string roleId , common::data::StringArray userIds ,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//涓夊憳鐧诲綍鐨勬ā鍧椾俊鎭�
+		//data::SpecialRoleInfoList getSpecialRoleList()  throws common::VCIError;
+		//鏌ヨ鎵�鏈夌殑瀛愯妭鐐� add by caill
+		common::data::StringArray2D checkLevel() throws common::VCIError;
+		//瀵煎叆鍔熻兘妯″潡绠$悊鏁版嵁 add by caill
+		bool importModules(data::FunctionInfoList functionInfos,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//淇濆瓨鎿嶄綔妯″潡鍏崇郴瀵硅薄 add by caill
+		string saveFunOper(data::FuncOperationInfo funcOperation) throws common::VCIError;
+		//add by caill
+		bool saveFuncOperation2(data::FuncOperationInfo funcOperation,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//鍒ゆ柇绗竴绾ф湁娌℃湁閲嶅悕鐨勬ā鍧� add by caill
+		bool firstLevel(string plName) throws common::VCIError;
+		//瑕嗙洊閲嶅悕鐨勭涓�绾� add by caill
+		string changeFirstLevel(data::FunctionInfo function,string plName) throws common::VCIError;
+		//鍒ゆ柇绗簩绾ф湁娌℃湁閲嶅悕鐨勬ā鍧� add by caill
+		bool secondLevel(string plName,string fParentId) throws common::VCIError;
+		//瑕嗙洊閲嶅悕鐨勭浜岀骇 add by caill
+		string changeSecondLevel(data::FunctionInfo function,string plName,string fParentId) throws common::VCIError;
+		//鍒ゆ柇妯″潡涓槸鍚﹀凡缁忓瓨鍦ㄦ鎿嶄綔绫诲瀷 add by caill
+		bool selSameOper(string dataOperName,string plFuncOid) throws common::VCIError;
+		//瑕嗙洊鎿嶄綔绫诲瀷 add by caill
+		bool updateOperation(data::FuncOperationInfo funcOperation,common::data::UserEntityInfo userEntity,string dataOperName,string plFuncOid) throws common::VCIError;
+		//
+		common::data::StringArray2D getAllDatas(long size) throws common::VCIError;
+		//
+		long getAllOperitionsNum() throws common::VCIError;
+		//
+		common::data::StringArray2D getAllOperitions(long size) throws common::VCIError;
+		//
+		long getAllModelManagementNum() throws common::VCIError;
+		//add by caill 2016.1.19鎵归噺澧炲姞瑙掕壊*/
+		bool batchSaveRoles(data::RoleInfoList roles,common::data::UserEntityInfo userEntity) throws common::VCIError;
+		//淇濆瓨涓�鑸搷浣滅被鍨嬫棩蹇�
+		void savelogGeneralOperation(string result, string content, common::data::UserEntityInfo userEntity,string dataId,string plType) throws common::VCIError;
+		//鑾峰彇鏁版嵁搴撲俊鎭�
+		data::DataSourceInfo getDataSourceInfo() throws common::VCIError;
+				
+		//add by weidy 2021-1-2 鎶婅阿鍐涙坊鍔犵殑瑙掕壊閫夋嫨绛夋帴鍙f暣鍚堣繘鏉�
+		/**鏍规嵁id鑾峰彇閮ㄩ棬**/
+		data::DeptInfoList fetchDepartmentInfoByIds(string otherFiterString) throws common::VCIError;
+		/****鏍规嵁鏌ヨ鏉′欢鑾峰彇涓嬬骇閮ㄩ棬***/
+		data::DeptInfoList fetchChildrenDeptByParentOid(string prtoid,bool iscontains, string otherFiterString) throws common::VCIError;
+		/***鑾峰彇閮ㄩ棬鍒楄〃淇℃伅****/
+		data::DeptInfoList gridDeptDataGrids(string filter,long pageNo,long pageSize)throws common::VCIError;
+
+		long gridDeptDataGridsCount(string filter)throws common::VCIError;
+
+		data::RoleInfoList queryRoleInfos(string filter,long pageNo,long pageSize)throws common::VCIError;
+
+		long queryRoleInfosCount(string filter)throws common::VCIError;
+
+		/****鏍规嵁鏉′欢鏌ヨ闄ゅ幓admin锛宒eveloper锛屼笁鍛樺鎵�鏈夌殑鏅�氭垚鍛�**/
+		data::UserInfoList fetchUserInfoByFilterString( string filterString,long pageNo,long pageSize ) throws common::VCIError;
+
+		long  fetchUserInfoByFilterStringCount( string filterString) throws common::VCIError;
+
+		/****鏍规嵁鏉′欢鏌ヨ闄ゅ幓admin锛宒eveloper锛屼笁鍛樺鎵�鏈夌殑鏅�氭垚鍛�**/
+		data::UserInfoList fetchUserInfosByFilterStringsql( string filterString) throws common::VCIError;
+
+		/**鏍规嵁鐢ㄦ埛鍚嶆壒閲忚幏鍙栨垚鍛�**/
+		data::UserInfoList fetchUserInfoByNames(common::data::StringArray  userNames) throws common::VCIError;
+
+		/**鏍规嵁鐢ㄦ埛涓婚敭鑾峰彇鎴愬憳**/
+		data::UserInfo getUserObjectByoid(string userOid) throws common::VCIError;
+
+		/**鏍规嵁鐢ㄦ埛涓婚敭鎵归噺鑾峰彇鎴愬憳**/
+		data::UserInfoList getUserObjectByoids(common::data::StringArray userOid) throws common::VCIError;
+				
+		//=====================================================================================
+		/**涓撲笟淇℃伅鎿嶄綔鎺ュ彛**/
+		// 鑾峰彇鎵�鏈変笓涓氫俊鎭�
+		data::SpecialtyInfoList getAllSpecialtyInfo() throws common::VCIError;
+
+		// 澧炲姞涓撲笟
+		string saveSpecialty(data::SpecialtyInfo specialty,common::data::UserEntityInfo userEnt) throws common::VCIError;
+
+		/**鎵归噺澧炲姞涓撲笟*/
+		bool batchSaveSpecialties(data::SpecialtyInfoList specialties, common::data::UserEntityInfo userEnt) throws common::VCIError;
+
+		/**淇敼涓撲笟**/
+		bool updateSpecialty(data::SpecialtyInfo specialty, common::data::UserEntityInfo userEnt) throws common::VCIError;
+
+		/**鎵归噺淇敼涓撲笟**/
+		bool batchUpdateSpecialty(data::SpecialtyInfoList specialties, common::data::UserEntityInfo userEnt) throws common::VCIError;
+
+		//鍒犻櫎涓撲笟
+		bool deletSpecialty(common::data::StringArray ids, common::data::UserEntityInfo userEnt)  throws common::VCIError;
+
+		//=====================================================================================
+		/**鏈哄櫒瀵嗙骇淇℃伅鎿嶄綔鎺ュ彛**/
+		// 鑾峰彇鏈哄櫒瀵嗙骇淇℃伅鎬绘暟
+		long getMachSecurityTolal() throws common::VCIError;
+		// 鑾峰彇绗﹀悎鏉′欢鐨勬満鍣ㄥ瘑绾т俊鎭�绘暟
+		long getMachSecurityTolalByCondition(string name, string ipAddress, short security) throws common::VCIError;
+		// 鑾峰彇鎵�鏈夋満鍣ㄥ瘑绾т俊鎭�
+		data::MachSecurityInfoList getAllMachSecurity() throws common::VCIError;
+		// 鍒嗛〉鏌ヨ鑾峰彇鎵�鏈夋満鍣ㄥ瘑绾т俊鎭�
+		data::MachSecurityInfoList fetchMachSecurityByPage(long pageNo, long pageSize)throws common::VCIError;
+		// 鍒嗛〉鏌ヨ鑾峰彇鎵�鏈夋満鍣ㄥ瘑绾т俊鎭紝鎸夋潯浠�
+		data::MachSecurityInfoList fetchMachSecurityConditionByPage(string name, string ipAddress, short security, long pageNo, long pageSize)throws common::VCIError;
+		// 澧炲姞鏈哄櫒瀵嗙骇
+		string saveMachSecurity(data::MachSecurityInfo info,common::data::UserEntityInfo userEnt) throws common::VCIError;
+		/**鎵归噺澧炲姞鏈哄櫒瀵嗙骇*/
+		bool batchSaveMachSecurity(data::MachSecurityInfoList infos, common::data::UserEntityInfo userEnt) throws common::VCIError;
+		/**淇敼鏈哄櫒瀵嗙骇**/
+		bool updateMachSecurity(data::MachSecurityInfo info, common::data::UserEntityInfo userEnt) throws common::VCIError;
+		/**鎵归噺淇敼鏈哄櫒瀵嗙骇**/
+		bool batchUpdateMachSecurity(data::MachSecurityInfoList infos, common::data::UserEntityInfo userEnt) throws common::VCIError;
+		//鍒犻櫎鏈哄櫒瀵嗙骇
+		bool deletMachSecurity(common::data::StringArray ids, common::data::UserEntityInfo userEnt)  throws common::VCIError;
+		//鑾峰彇鏈哄櫒瀵嗙骇, type=0 鏈娇鐢�
+		long getMachSecurity(string ipAddress, short type, common::data::UserEntityInfo userEnt)  throws common::VCIError;
+		//鑾峰彇鏈哄櫒瀵嗙骇淇℃伅, type=0 鏈娇鐢�
+		data::MachSecurityInfo getMachSecurityInfo(string ipAddress, short type, common::data::UserEntityInfo userEnt)  throws common::VCIError;
+		
+		//=====================================================================================
+		/**鏁版嵁鎺堟潈鎺ュ彛**/
+		//淇濆瓨鏁版嵁鎺堟潈
+		bool saveGrand(data::GrandValueArray values) throws common::VCIError;
+		//鏌ヨ鏁版嵁鎺堟潈
+		data::GrandValueArray queryGrand(string identifier) throws common::VCIError;
+		//鍒犻櫎鏁版嵁鎺堟潈
+		bool deleteGrand(string ruleName)throws common::VCIError;
+		//鍒犻櫎绫诲瀷鏁版嵁鎺堟潈
+		bool deleteTypeRuleGrand(string identifier,string ruleName)throws common::VCIError;
+		
+		// 妫�鏌ユ潈闄�
+		string checkRight(data::CheckValue value) throws common::VCIError;
+		
+		//=====================================================================================
+		/**鍗风鐞�**/
+		/**璇诲彇鎵�鏈夌殑鍗�**/
+		data::PvolumeInfoList getAllPvolumes() throws common::VCIError;
+		// 鏌ヨ榛樿鍗�
+		data::PvolumeInfo getDefaultVolume() throws common::VCIError;
+		// 璇诲彇鎸囧畾鍚嶇О鐨勫嵎
+		data::PvolumeInfo getVolumnByName(string volName) throws common::VCIError;
+		/**鍒嗛〉璇诲彇鍗�**/
+		data::PvolumeInfoList getPvolumesPage(short  pageSize, short pageIndex) throws common::VCIError;
+		/**鍗峰垱寤�**/
+		string savePvolume(data::PvolumeInfo vol, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鍗蜂慨鏀�**/
+		bool updatePvolume(data::PvolumeInfo vol, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**鍗峰垹闄�**/
+		bool deletePvolume(common::data::StringArray ids, common::data::UserEntityInfo userEntity) throws common::VCIError;
+		/**妫�鏌ヨ鍒犻櫎鐨勫嵎鏄惁涓洪閫夎矾寰�**/
+		bool checkIsvalid(string id) throws common::VCIError;
+		/**淇敼鍗凤紝灏嗙郴缁熶腑鐨勫叾浠栧嵎璁剧疆涓洪潪棣栭�� 0**/
+		void updatePvolumeInvalid(common::data::UserEntityInfo userEntity) throws common::VCIError;
+	
+	}//end interface
 }//framework
 // }}}

--
Gitblit v1.9.3