update from server

lib/rpc.dart

@@ -14,9 +14,6 @@ typedef T ServiceBuilder<T extends JsonRpcClientBase>();
 /// 默认地址标识
 const String _defaultAddressSign = "FLYINSONO";
 
-/// 测试
-const String JSON_RPC_CLIENT_VERSION = "1.0.1-rc3";
-
 /// JSON-RPC 代理
 class JsonRpcProxy {
   JsonRpcProxy({
@@ -52,43 +49,44 @@ class JsonRpcProxy {
     return _platformService!;
   }
 
-  ClientLogService get clientLog =>
-      findService(() => new ClientLogService(currentHostAddress));
+	ClientLogService get clientLog =>
+	findService(() => new ClientLogService(currentHostAddress));
+
+	DepartmentService get department =>
+	findService(() => new DepartmentService(currentHostAddress));
 
-  DepartmentService get department =>
-      findService(() => new DepartmentService(currentHostAddress));
+	DeviceService get device =>
+	findService(() => new DeviceService(currentHostAddress));
 
-  DeviceService get device =>
-      findService(() => new DeviceService(currentHostAddress));
+	IdentityApplyService get identityApply =>
+	findService(() => new IdentityApplyService(currentHostAddress));
 
-  IdentityApplyService get identityApply =>
-      findService(() => new IdentityApplyService(currentHostAddress));
+	LoginService get login =>
+	findService(() => new LoginService(currentHostAddress));
 
-  LoginService get login =>
-      findService(() => new LoginService(currentHostAddress));
+	ManagementService get management =>
+	findService(() => new ManagementService(currentHostAddress));
 
-  ManagementService get management =>
-      findService(() => new ManagementService(currentHostAddress));
+	OrganizationService get organization =>
+	findService(() => new OrganizationService(currentHostAddress));
 
-  OrganizationService get organization =>
-      findService(() => new OrganizationService(currentHostAddress));
+	RankService get rank =>
+	findService(() => new RankService(currentHostAddress));
 
-  RankService get rank =>
-      findService(() => new RankService(currentHostAddress));
+	RegionService get region =>
+	findService(() => new RegionService(currentHostAddress));
 
-  RegionService get region =>
-      findService(() => new RegionService(currentHostAddress));
+	RemedicalService get remedical =>
+	findService(() => new RemedicalService(currentHostAddress));
 
-  RemedicalService get remedical =>
-      findService(() => new RemedicalService(currentHostAddress));
+	RoleService get role =>
+	findService(() => new RoleService(currentHostAddress));
 
-  RoleService get role =>
-      findService(() => new RoleService(currentHostAddress));
+	UserService get user =>
+	findService(() => new UserService(currentHostAddress));
 
-  UserService get user =>
-      findService(() => new UserService(currentHostAddress));
 
-  /* 服务代理设置 End */
+    /* 服务代理设置 End */
 
   /// 设置服务主机地址
   void setServerHost(String address) {
@@ -110,3 +108,4 @@ class JsonRpcProxy {
     return _serviceCache[serviceType] as T;
   }
 }
+

lib/services/identityApply.dart

@@ -19,7 +19,6 @@ class IdentityApplyService extends JsonRpcClientBase {
 				) {
 		/// 注册响应实体反序列化处理器
 		FJsonConvert.setDecoder((map) => IdentityApplyInfo.fromJson(map));
-		FJsonConvert.setDecoder((map) => RoleInfo.fromJson(map));
 	}
 
 	Future<List<IdentityApplyInfo>> getIdentityApplys(String sessionId,String userCode) async {
@@ -33,11 +32,5 @@ class IdentityApplyService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
-	Future<List<RoleInfo>> getAuthenticationRoles(String sessionId) async {
-		var rpcRst = await call("GetAuthenticationRoles", sessionId);
-		var result = (rpcRst as List).map((e)=>RoleInfo.fromJson(e as Map<String, dynamic>)).toList();
-		return result;
-	}
-
 }
 

lib/services/identityApply.m.dart

@@ -81,54 +81,4 @@ class IdentityApplyInfo {
 	}
 }
 
-enum RoleTypeEnum {
-	Default,
-	Authentication,
-}
-
-class RoleInfo {
-	String? roleCode;
-	String? roleName;
-	String? frontGroupCode;
-	RoleTypeEnum roleType;
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	RoleInfo({
-		this.roleCode,
-		this.roleName,
-		this.frontGroupCode,
-		this.roleType=RoleTypeEnum.Default,
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory RoleInfo.fromJson(Map<String, dynamic> map) {
-		return RoleInfo( 
-			roleCode: map['RoleCode'],
-			roleName: map['RoleName'],
-			frontGroupCode: map['FrontGroupCode'],
-			roleType: RoleTypeEnum.values.firstWhere((e) => e.index == map['RoleType']),
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(roleCode != null)
-			map['RoleCode'] = roleCode;
-		if(roleName != null)
-			map['RoleName'] = roleName;
-		if(frontGroupCode != null)
-			map['FrontGroupCode'] = frontGroupCode;
-		map['RoleType'] = roleType.index;
-		if(createTime != null)
-			map['CreateTime'] = createTime;
-		if(updateTime != null)
-			map['UpdateTime'] = updateTime;
-		return map;
-	}
-}
-
 

lib/services/organization.dart

@@ -21,8 +21,8 @@ class OrganizationService extends JsonRpcClientBase {
 		FJsonConvert.setDecoder((map) => OrganizationInfo.fromJson(map));
 	}
 
-	Future<List<OrganizationInfo>> searchOrganizations(String keyword,OrganizationTypeEnum organizationType) async {
-		var rpcRst = await call("SearchOrganizations", [keyword,organizationType]);
+	Future<List<OrganizationInfo>> searchOrganizations(String keyword,String parentCode,OrganizationTypeEnum organizationType) async {
+		var rpcRst = await call("SearchOrganizations", [keyword,parentCode,organizationType]);
 		var result = (rpcRst as List).map((e)=>OrganizationInfo.fromJson(e as Map<String, dynamic>)).toList();
 		return result;
 	}

lib/services/rank.dart

@@ -27,8 +27,8 @@ class RankService extends JsonRpcClientBase {
 		return result;
 	}
 
-	Future<List<RankInfo>> getAllRanks(String sessionId) async {
-		var rpcRst = await call("GetAllRanks", sessionId);
+	Future<List<RankInfo>> getAllRanks(String sessionId,String organizationCode) async {
+		var rpcRst = await call("GetAllRanks", [sessionId,organizationCode]);
 		var result = (rpcRst as List).map((e)=>RankInfo.fromJson(e as Map<String, dynamic>)).toList();
 		return result;
 	}

lib/services/role.dart

@@ -27,8 +27,14 @@ class RoleService extends JsonRpcClientBase {
 		return result;
 	}
 
-	Future<List<RoleInfo>> findDefaultRoles(String sessionId) async {
-		var rpcRst = await call("FindDefaultRoles", sessionId);
+	Future<List<RoleInfo>> findDefaultRoles(String sessionId,String organizationCode) async {
+		var rpcRst = await call("FindDefaultRoles", [sessionId,organizationCode]);
+		var result = (rpcRst as List).map((e)=>RoleInfo.fromJson(e as Map<String, dynamic>)).toList();
+		return result;
+	}
+
+	Future<List<RoleInfo>> findAuthenticationRoles(String sessionId,String organizationCode) async {
+		var rpcRst = await call("FindAuthenticationRoles", [sessionId,organizationCode]);
 		var result = (rpcRst as List).map((e)=>RoleInfo.fromJson(e as Map<String, dynamic>)).toList();
 		return result;
 	}