repaire right codes

.gitignore

@@ -73,3 +73,4 @@ build/
 !**/ios/**/default.mode2v3
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
+/pubspec.lock

lib/base_model.dart

@@ -1,4 +1,4 @@
-import 'package:fiscommon/json_convert.dart';
+import 'package:fis_common/json_convert.dart';
 
 class RpcResult<T> {
   final bool isSuccess;

lib/client_base.dart

@@ -1,6 +1,6 @@
 import 'dart:convert';
 import 'package:dio/dio.dart';
-import 'package:fiscommon/http/options.dart';
+import 'package:fis_common/http/options.dart';
 import 'package:flutter/foundation.dart';
 
 import 'exception.dart';

lib/http_pool.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:fiscommon/http/http.dart';
-import 'package:fiscommon/http/options.dart';
+import 'package:fis_common/http/http.dart';
+import 'package:fis_common/http/options.dart';
 import 'package:dio/dio.dart' as dio;
 
 class _JsonRpcHttpPool {

lib/rpc.dart

@@ -1,8 +1,8 @@
-library fisjsonrpc;
+library fis_jsonrpc;
 
 import 'dart:collection';
 
-import 'package:fiscommon/extensions/type.dart';
+import 'package:fis_common/extensions/type.dart';
 
 import 'client_base.dart';
 import 'services/index.dart';
@@ -45,23 +45,27 @@ class JsonRpcProxy {
   /// 平台服务
   PlatformService get platform {
     if (_platformService == null)
-      _platformService = PlatformService(platformHost);
+      _platformService = PlatformService("http://$platformHost");
     return _platformService!;
   }
 
-  /// 登录服务
-  LoginService get login =>
-      findService(() => new LoginService(currentHostAddress));
+	ClientLogService get clientLog =>
+	findService(() => new ClientLogService(currentHostAddress));
 
-  /// 诊断服务
-  RemedicalService get remedical =>
-      findService(() => new RemedicalService(currentHostAddress));
+	DeviceService get device =>
+	findService(() => new DeviceService(currentHostAddress));
 
-  /// 用户服务
-  UserService get user =>
-      findService(() => new UserService(currentHostAddress));
+	LoginService get login =>
+	findService(() => new LoginService(currentHostAddress));
 
-  /* 服务代理设置 End */
+	RemedicalService get remedical =>
+	findService(() => new RemedicalService(currentHostAddress));
+
+	UserService get user =>
+	findService(() => new UserService(currentHostAddress));
+
+
+    /* 服务代理设置 End */
 
   /// 设置服务主机地址
   void setServerHost(String address) {
@@ -83,3 +87,4 @@ class JsonRpcProxy {
     return _serviceCache[serviceType] as T;
   }
 }
+

lib/services/checkSession.dart

@@ -0,0 +1,22 @@
+import 'dart:core';
+
+import 'package:fis_jsonrpc/client_base.dart';
+
+class CheckSessionService extends JsonRpcClientBase {
+  CheckSessionService(
+    String host, {
+    String serviceName = "ICheckSessionService",
+    Map<String, String>? headers,
+    int? timeout,
+  }) : super(
+          host,
+          serviceName,
+          headers: headers,
+          timeout: timeout,
+        );
+
+  Future<bool> checkSessionIdAsync(String sessionId) async {
+    var rpcRst = await call("CheckSessionIdAsync", sessionId);
+    return rpcRst;
+  }
+}

lib/services/clientLog.dart

@@ -0,0 +1,35 @@
+import 'dart:core';
+
+import 'package:fis_jsonrpc/client_base.dart';
+
+
+class ClientLogService extends JsonRpcClientBase {
+	ClientLogService(
+		String host, {
+		String serviceName = "IClientLogService",
+		Map<String, String>? headers,
+		int? timeout,
+	}) : super(
+						host,
+						serviceName,
+						headers: headers,
+						timeout: timeout,
+				);
+
+	Future<bool> writeInfoAsync(String clientDeviceId,String platform,String requestChain,String logContent) async {
+		var rpcRst = await call("WriteInfoAsync", [clientDeviceId,platform,requestChain,logContent]);
+		return rpcRst;
+	}
+
+	Future<bool> writeWarnAsync(String clientDeviceId,String platform,String requestChain,String logContent) async {
+		var rpcRst = await call("WriteWarnAsync", [clientDeviceId,platform,requestChain,logContent]);
+		return rpcRst;
+	}
+
+	Future<bool> writeErrorAsync(String clientDeviceId,String platform,String requestChain,String logContent) async {
+		var rpcRst = await call("WriteErrorAsync", [clientDeviceId,platform,requestChain,logContent]);
+		return rpcRst;
+	}
+
+}
+

lib/services/config.dart

@@ -0,0 +1,45 @@
+import 'dart:core';
+
+import 'package:fis_jsonrpc/client_base.dart';
+import 'package:fis_common/json_convert.dart';
+
+import 'config.m.dart';
+
+class ConfigService extends JsonRpcClientBase {
+  ConfigService(
+    String host, {
+    String serviceName = "IConfigService",
+    Map<String, String>? headers,
+    int? timeout,
+  }) : super(
+          host,
+          serviceName,
+          headers: headers,
+          timeout: timeout,
+        ) {
+    /// 注册响应实体反序列化处理器
+    FJsonConvert.setDecoder((map) => ConfigItem.fromJson(map));
+  }
+
+  Future<List<ConfigItem>> getConfigListAsync(PageParams pageParams) async {
+    var rpcRst = await call("GetConfigListAsync", pageParams);
+    var result = (rpcRst as List)
+        .map((e) => ConfigItem.fromJson(e as Map<String, dynamic>))
+        .toList();
+    return result;
+  }
+
+  Future<String> getConfigAsync(String service, String section,
+      String settingNode, String defaultValue) async {
+    var rpcRst = await call(
+        "GetConfigAsync", [service, section, settingNode, defaultValue]);
+    return rpcRst;
+  }
+
+  Future<bool> setConfigAsync(String service, String section,
+      String settingNode, String settingValue) async {
+    var rpcRst = await call(
+        "SetConfigAsync", [service, section, settingNode, settingValue]);
+    return rpcRst;
+  }
+}

lib/services/config.m.dart

@@ -0,0 +1,66 @@
+class ConfigItem {
+	String? id;
+	String? service;
+	String? section;
+	String? settingNode;
+	String? settingValue;
+
+	ConfigItem({
+		this.id,
+		this.service,
+		this.section,
+		this.settingNode,
+		this.settingValue,
+	});
+
+	factory ConfigItem.fromJson(Map<String, dynamic> map) {
+		return ConfigItem( 
+			id: map['Id'],
+			service: map['Service'],
+			section: map['Section'],
+			settingNode: map['SettingNode'],
+			settingValue: map['SettingValue'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(id != null)
+			map['Id'] = id;
+		if(service != null)
+			map['Service'] = service;
+		if(section != null)
+			map['Section'] = section;
+		if(settingNode != null)
+			map['SettingNode'] = settingNode;
+		if(settingValue != null)
+			map['SettingValue'] = settingValue;
+		return map;
+	}
+}
+
+class PageParams {
+	int currentPage;
+	int pageSize;
+
+	PageParams({
+		this.currentPage=0,
+		this.pageSize=0,
+	});
+
+	factory PageParams.fromJson(Map<String, dynamic> map) {
+		return PageParams( 
+			currentPage: map['CurrentPage'],
+			pageSize: map['PageSize'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		map['CurrentPage'] = currentPage;
+		map['PageSize'] = pageSize;
+		return map;
+	}
+}
+
+

lib/services/device.dart

@@ -0,0 +1,43 @@
+import 'dart:core';
+
+import 'package:fis_jsonrpc/client_base.dart';
+import 'package:fis_common/json_convert.dart';
+
+import 'device.m.dart';
+
+class DeviceService extends JsonRpcClientBase {
+	DeviceService(
+		String host, {
+		String serviceName = "IDeviceService",
+		Map<String, String>? headers,
+		int? timeout,
+	}) : super(
+						host,
+						serviceName,
+						headers: headers,
+						timeout: timeout,
+				) {
+		/// 注册响应实体反序列化处理器
+		FJsonConvert.setDecoder((map) => DeviceInfo.fromJson(map));
+		FJsonConvert.setDecoder((map) => PageCollection<DeviceInfo>.fromJson(map));
+	}
+
+	Future<String> createDeviceInfoAsync(CreateDeviceInfoRequest request) async {
+		var rpcRst = await call("CreateDeviceInfoAsync", request);
+		return rpcRst;
+	}
+
+	Future<DeviceInfo> getDeviceInfoAsync(String deviceCode) async {
+		var rpcRst = await call("GetDeviceInfoAsync", deviceCode);
+		var result = DeviceInfo.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<PageCollection<DeviceInfo>> getDeviceInfoPageAsync(PageRequest request) async {
+		var rpcRst = await call("GetDeviceInfoPageAsync", request);
+		var result = PageCollection<DeviceInfo>.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+}
+

lib/services/device.m.dart

@@ -0,0 +1,186 @@
+import 'package:fis_common/json_convert.dart';
+
+class DeviceInfo {
+	String? deviceCode;
+	String? serialNumber;
+	String? description;
+	String? deviceModel;
+	String? deviceType;
+	String? headPicUrl;
+	String? deviceSoftwareVersion;
+	String? sDKSoftwareVersion;
+	String? organizationCode;
+	String? shortCode;
+	String? id;
+	DateTime? createTime;
+	DateTime? updateTime;
+	bool isDelete;
+
+	DeviceInfo({
+		this.deviceCode,
+		this.serialNumber,
+		this.description,
+		this.deviceModel,
+		this.deviceType,
+		this.headPicUrl,
+		this.deviceSoftwareVersion,
+		this.sDKSoftwareVersion,
+		this.organizationCode,
+		this.shortCode,
+		this.id,
+		this.createTime,
+		this.updateTime,
+		this.isDelete=false,
+	});
+
+	factory DeviceInfo.fromJson(Map<String, dynamic> map) {
+		return DeviceInfo( 
+			deviceCode: map['DeviceCode'],
+			serialNumber: map['SerialNumber'],
+			description: map['Description'],
+			deviceModel: map['DeviceModel'],
+			deviceType: map['DeviceType'],
+			headPicUrl: map['HeadPicUrl'],
+			deviceSoftwareVersion: map['DeviceSoftwareVersion'],
+			sDKSoftwareVersion: map['SDKSoftwareVersion'],
+			organizationCode: map['OrganizationCode'],
+			shortCode: map['ShortCode'],
+			id: map['Id'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
+			isDelete: map['IsDelete'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(deviceCode != null)
+			map['DeviceCode'] = deviceCode;
+		if(serialNumber != null)
+			map['SerialNumber'] = serialNumber;
+		if(description != null)
+			map['Description'] = description;
+		if(deviceModel != null)
+			map['DeviceModel'] = deviceModel;
+		if(deviceType != null)
+			map['DeviceType'] = deviceType;
+		if(headPicUrl != null)
+			map['HeadPicUrl'] = headPicUrl;
+		if(deviceSoftwareVersion != null)
+			map['DeviceSoftwareVersion'] = deviceSoftwareVersion;
+		if(sDKSoftwareVersion != null)
+			map['SDKSoftwareVersion'] = sDKSoftwareVersion;
+		if(organizationCode != null)
+			map['OrganizationCode'] = organizationCode;
+		if(shortCode != null)
+			map['ShortCode'] = shortCode;
+		if(id != null)
+			map['Id'] = id;
+		if(createTime != null)
+			map['CreateTime'] = createTime;
+		if(updateTime != null)
+			map['UpdateTime'] = updateTime;
+		map['IsDelete'] = isDelete;
+		return map;
+	}
+}
+
+class CreateDeviceInfoRequest {
+	DeviceInfo? info;
+	String? sessionId;
+
+	CreateDeviceInfoRequest({
+		this.info,
+		this.sessionId,
+	});
+
+	factory CreateDeviceInfoRequest.fromJson(Map<String, dynamic> map) {
+		return CreateDeviceInfoRequest( 
+			info: map['Info'],
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(info != null)
+			map['Info'] = info;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
+}
+
+class PageCollection<T> {
+	int currentPage;
+	int pageSize;
+	int dataCount;
+	List<T>? pageData;
+
+	PageCollection({
+		this.currentPage=0,
+		this.pageSize=0,
+		this.dataCount=0,
+		this.pageData,
+	});
+
+	factory PageCollection.fromJson(Map<String, dynamic> map) {
+		List<T> pageDataList = [];
+		if (map['PageData'] != null) {
+			pageDataList.addAll(
+					(map['PageData'] as List).map((e) => FJsonConvert.fromJson<T>(e)!));
+		}
+		return PageCollection( 
+			currentPage: map['CurrentPage'],
+			pageSize: map['PageSize'],
+			dataCount: map['DataCount'],
+			pageData: pageDataList,
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		map['CurrentPage'] = currentPage;
+		map['PageSize'] = pageSize;
+		map['DataCount'] = dataCount;
+		if(pageData != null)
+			map['PageData'] = pageData;
+		return map;
+	}
+}
+
+class PageRequest {
+	int currentPage;
+	int pageSize;
+	Map<String,String>? filter;
+	String? sessionId;
+
+	PageRequest({
+		this.currentPage=0,
+		this.pageSize=0,
+		this.filter,
+		this.sessionId,
+	});
+
+	factory PageRequest.fromJson(Map<String, dynamic> map) {
+		return PageRequest( 
+			currentPage: map['CurrentPage'],
+			pageSize: map['PageSize'],
+			filter: map['Filter'].cast<String,String>(),
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		map['CurrentPage'] = currentPage;
+		map['PageSize'] = pageSize;
+		if(filter != null)
+			map['Filter'] = filter;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
+}
+
+

lib/services/email.dart

@@ -0,0 +1,24 @@
+import 'dart:core';
+
+import '../client_base.dart';
+
+class EmailService extends JsonRpcClientBase {
+  EmailService(
+    String host, {
+    String serviceName = "IEmailService",
+    Map<String, String>? headers,
+    int? timeout,
+  }) : super(
+          host,
+          serviceName,
+          headers: headers,
+          timeout: timeout,
+        );
+
+  Future<bool> sendEmailAsync(List<String> receivers, String templateName,
+      List<String> templateArg) async {
+    var rpcRst =
+        await call("SendEmailAsync", [receivers, templateName, templateArg]);
+    return rpcRst;
+  }
+}

lib/services/index.dart

@@ -1,8 +1,6 @@
+export 'clientLog.dart';
+export 'device.dart';
 export 'login.dart';
-export 'login.m.dart';
 export 'platform.dart';
-export 'platform.m.dart';
 export 'remedical.dart';
-export 'remedical.m.dart';
 export 'user.dart';
-export 'user.m.dart';

lib/services/login.dart

@@ -1,60 +1,56 @@
 import 'dart:core';
 
-import 'package:fiscommon/json_convert.dart';
-import 'package:fisjsonrpc/client_base.dart';
+import 'package:fis_jsonrpc/client_base.dart';
+import 'package:fis_common/json_convert.dart';
+
 import 'login.m.dart';
 
-/// 登录服务
 class LoginService extends JsonRpcClientBase {
-  LoginService(
-    String host, {
-    String serviceName = "ILoginService",
-    Map<String, String>? headers,
-    int? timeout,
-  }) : super(
-          host,
-          serviceName,
-          headers: headers,
-          timeout: timeout,
-        ) {
-    /// 注册响应实体反序列化处理器
-    FJsonConvert.setDecoder((map) => LoginResult.fromJson(map));
-  }
-
-  /// 登录
-  Future<LoginResult> clientLoginAsync(LoginRequest request) async {
-    var rpcRst = await call("ClientLoginAsync", request);
-    var result = LoginResult.fromJson(rpcRst as Map<String, dynamic>);
-    return result;
-  }
-
-  /// 注册
-  Future<bool> signInAsync(SignInRequest request) async {
-    var rpcRst = await call("SignInAsync", request);
-    return rpcRst == true;
-  }
-
-  /// 发送邮件验证码
-  Future<bool> sendEmailVerificationCode(String address) async {
-    var rpcRst = await call("SendEmailVerificationCode", address);
-    return rpcRst == true;
-  }
-
-  /// 校验邮件验证码
-  Future<bool> checkEmailVerificationCode(String address, String code) async {
-    var rpcRst = await call("CheckEmailVerificationCode", [address, code]);
-    return rpcRst == true;
-  }
-
-  /// 发送短信验证码
-  Future<bool> sendSMSVerificationCode(String phone) async {
-    var rpcRst = await call("SendSMSVerificationCode", phone);
-    return rpcRst == true;
-  }
-
-  /// 校验短信验证码
-  Future<bool> checkSMSVerificationCode(String phone, String code) async {
-    var rpcRst = await call("CheckSMSVerificationCode", [phone, code]);
-    return rpcRst == true;
-  }
+	LoginService(
+		String host, {
+		String serviceName = "ILoginService",
+		Map<String, String>? headers,
+		int? timeout,
+	}) : super(
+						host,
+						serviceName,
+						headers: headers,
+						timeout: timeout,
+				) {
+		/// 注册响应实体反序列化处理器
+		FJsonConvert.setDecoder((map) => UserSessionInfo.fromJson(map));
+	}
+
+	Future<UserSessionInfo> clientLoginAsync(UserLoginInfo userLoginInfo) async {
+		var rpcRst = await call("ClientLoginAsync", userLoginInfo);
+		var result = UserSessionInfo.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<bool> signInAsync(UserInfo userInfo) async {
+		var rpcRst = await call("SignInAsync", userInfo);
+		return rpcRst;
+	}
+
+	Future<bool> checkSMSVerificationCode(String userPhone,String verifyCode) async {
+		var rpcRst = await call("CheckSMSVerificationCode", [userPhone,verifyCode]);
+		return rpcRst;
+	}
+
+	Future<bool> sendSMSVerificationCode(String userPhone) async {
+		var rpcRst = await call("SendSMSVerificationCode", userPhone);
+		return rpcRst;
+	}
+
+	Future<bool> sendEmailVerificationCode(String emailAddress) async {
+		var rpcRst = await call("SendEmailVerificationCode", emailAddress);
+		return rpcRst;
+	}
+
+	Future<bool> checkEmailVerificationCode(String emailAddress,String verifyCode) async {
+		var rpcRst = await call("CheckEmailVerificationCode", [emailAddress,verifyCode]);
+		return rpcRst;
+	}
+
 }
+

lib/services/login.m.dart

@@ -1,129 +1,233 @@
-enum LoginType {
-  UserNameAndPwd,
-  MobileNumber,
+class UserSessionInfo {
+	String? userCode;
+	String? deviceId;
+	String? sessionId;
+
+	UserSessionInfo({
+		this.userCode,
+		this.deviceId,
+		this.sessionId,
+	});
+
+	factory UserSessionInfo.fromJson(Map<String, dynamic> map) {
+		return UserSessionInfo( 
+			userCode: map['UserCode'],
+			deviceId: map['DeviceId'],
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(userCode != null)
+			map['UserCode'] = userCode;
+		if(deviceId != null)
+			map['DeviceId'] = deviceId;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
 }
 
-enum RegisterType {
-  MobileNumber,
-  Email,
+enum EnumLoginProcessorType {
+	Official,
+	Wechat,
 }
 
-class LoginRequest {
-  final LoginType loginType;
-  final ProcessorInfo processorInfo;
-  final ClientInfo? clientInfo;
-
-  LoginRequest({
-    required this.loginType,
-    required this.processorInfo,
-    this.clientInfo,
-  });
-
-  Map<String, dynamic> toJson() {
-    final map = Map<String, dynamic>();
-    map['LoginType'] = loginType.index;
-    map['ProcessorInfo'] = processorInfo;
-    if (clientInfo != null) map['ClientInfo'] = clientInfo;
-    return map;
-  }
-}
-
-class ProcessorInfo {
-  final String? userName;
-  final String? password;
-
-  ProcessorInfo({
-    this.userName,
-    this.password,
-  });
-
-  factory ProcessorInfo.fromJson(Map<String, dynamic> map) {
-    return ProcessorInfo(
-      userName: map['UserName'],
-      password: map['Password'],
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    final map = Map<String, dynamic>();
-    if (userName != null && userName!.isNotEmpty) map['UserName'] = userName;
-    if (password != null && password!.isNotEmpty) map['Password'] = password;
-    return map;
-  }
+class LoginProcessorInfo {
+	String? userName;
+	String? password;
+	String? wechatToken;
+
+	LoginProcessorInfo({
+		this.userName,
+		this.password,
+		this.wechatToken,
+	});
+
+	factory LoginProcessorInfo.fromJson(Map<String, dynamic> map) {
+		return LoginProcessorInfo( 
+			userName: map['UserName'],
+			password: map['Password'],
+			wechatToken: map['WechatToken'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(userName != null)
+			map['UserName'] = userName;
+		if(password != null)
+			map['Password'] = password;
+		if(wechatToken != null)
+			map['WechatToken'] = wechatToken;
+		return map;
+	}
 }
 
 class ClientInfo {
-  final String? clientSource;
-
-  ClientInfo({
-    this.clientSource,
-  });
-
-  factory ClientInfo.fromJson(Map<String, dynamic> map) {
-    return ClientInfo(
-      clientSource: map['ClientSource'],
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    final map = Map<String, dynamic>();
-    if (clientSource != null && clientSource!.isNotEmpty)
-      map['ClientSource'] = clientSource;
-    return map;
-  }
+	String? clientIpAndPort;
+	String? clientDeviceId;
+	String? clientSource;
+	String? clientExtensionInfo;
+
+	ClientInfo({
+		this.clientIpAndPort,
+		this.clientDeviceId,
+		this.clientSource,
+		this.clientExtensionInfo,
+	});
+
+	factory ClientInfo.fromJson(Map<String, dynamic> map) {
+		return ClientInfo( 
+			clientIpAndPort: map['ClientIpAndPort'],
+			clientDeviceId: map['ClientDeviceId'],
+			clientSource: map['ClientSource'],
+			clientExtensionInfo: map['ClientExtensionInfo'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(clientIpAndPort != null)
+			map['ClientIpAndPort'] = clientIpAndPort;
+		if(clientDeviceId != null)
+			map['ClientDeviceId'] = clientDeviceId;
+		if(clientSource != null)
+			map['ClientSource'] = clientSource;
+		if(clientExtensionInfo != null)
+			map['ClientExtensionInfo'] = clientExtensionInfo;
+		return map;
+	}
 }
 
-class LoginResult {
-  final String userCode;
-  final String sessionId;
-  final String? deviceId;
-  LoginResult({
-    required this.userCode,
-    required this.sessionId,
-    this.deviceId,
-  });
-
-  factory LoginResult.fromJson(Map<String, dynamic> map) {
-    return LoginResult(
-      userCode: map['UserCode'],
-      sessionId: map['SessionId'],
-      deviceId: map['DeviceId'],
-    );
-  }
+class UserLoginInfo {
+	EnumLoginProcessorType loginType;
+	LoginProcessorInfo? processorInfo;
+	ClientInfo? clientInfo;
+
+	UserLoginInfo({
+		this.loginType=EnumLoginProcessorType.Official,
+		this.processorInfo,
+		this.clientInfo,
+	});
+
+	factory UserLoginInfo.fromJson(Map<String, dynamic> map) {
+		return UserLoginInfo( 
+			loginType: EnumLoginProcessorType.values.firstWhere((e) => e.index == map['LoginType']),
+			processorInfo: map['ProcessorInfo'],
+			clientInfo: map['ClientInfo'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		map['LoginType'] = loginType.index;
+		if(processorInfo != null)
+			map['ProcessorInfo'] = processorInfo;
+		if(clientInfo != null)
+			map['ClientInfo'] = clientInfo;
+		return map;
+	}
 }
 
-class SignInRequest {
-  final String userName;
-  final String secretPassword;
-  final String? phone;
-  final String? email;
-  final String? nickName;
-  final String? fullName;
-  final String? headImageToken;
-  final String? lastIp;
-
-  SignInRequest({
-    required this.userName,
-    required this.secretPassword,
-    this.phone,
-    this.email,
-    this.nickName,
-    this.fullName,
-    this.headImageToken,
-    this.lastIp,
-  });
-
-  Map<String, dynamic> toJson() {
-    final map = Map<String, dynamic>();
-    map['UserName'] = userName;
-    map['SecretPassword'] = secretPassword;
-    if (phone != null && phone!.isNotEmpty) map['Phone'] = phone;
-    if (email != null && email!.isNotEmpty) map['Email'] = email;
-    if (nickName != null && nickName!.isNotEmpty) map['NickName'] = nickName;
-    if (fullName != null && fullName!.isNotEmpty) map['FullName'] = fullName;
-    if (headImageToken != null && headImageToken!.isNotEmpty)
-      map['HeadImageToken'] = headImageToken;
-    if (lastIp != null && lastIp!.isNotEmpty) map['LastIp'] = lastIp;
-    return map;
-  }
+class UserInfo {
+	String? userCode;
+	String? userName;
+	String? secretPassword;
+	String? phone;
+	String? email;
+	String? nickName;
+	String? fullName;
+	String? headImageToken;
+	String? organizationCode;
+	List<String>? authorityGroups;
+	List<String>? bindDevices;
+	int score;
+	String? lastIP;
+	String? id;
+	DateTime? createTime;
+	DateTime? updateTime;
+	bool isDelete;
+
+	UserInfo({
+		this.userCode,
+		this.userName,
+		this.secretPassword,
+		this.phone,
+		this.email,
+		this.nickName,
+		this.fullName,
+		this.headImageToken,
+		this.organizationCode,
+		this.authorityGroups,
+		this.bindDevices,
+		this.score=0,
+		this.lastIP,
+		this.id,
+		this.createTime,
+		this.updateTime,
+		this.isDelete=false,
+	});
+
+	factory UserInfo.fromJson(Map<String, dynamic> map) {
+		return UserInfo( 
+			userCode: map['UserCode'],
+			userName: map['UserName'],
+			secretPassword: map['SecretPassword'],
+			phone: map['Phone'],
+			email: map['Email'],
+			nickName: map['NickName'],
+			fullName: map['FullName'],
+			headImageToken: map['HeadImageToken'],
+			organizationCode: map['OrganizationCode'],
+			authorityGroups: map['AuthorityGroups'].cast<String>().toList(),
+			bindDevices: map['BindDevices'].cast<String>().toList(),
+			score: map['Score'],
+			lastIP: map['LastIP'],
+			id: map['Id'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
+			isDelete: map['IsDelete'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(userCode != null)
+			map['UserCode'] = userCode;
+		if(userName != null)
+			map['UserName'] = userName;
+		if(secretPassword != null)
+			map['SecretPassword'] = secretPassword;
+		if(phone != null)
+			map['Phone'] = phone;
+		if(email != null)
+			map['Email'] = email;
+		if(nickName != null)
+			map['NickName'] = nickName;
+		if(fullName != null)
+			map['FullName'] = fullName;
+		if(headImageToken != null)
+			map['HeadImageToken'] = headImageToken;
+		if(organizationCode != null)
+			map['OrganizationCode'] = organizationCode;
+		if(authorityGroups != null)
+			map['AuthorityGroups'] = authorityGroups;
+		if(bindDevices != null)
+			map['BindDevices'] = bindDevices;
+		map['Score'] = score;
+		if(lastIP != null)
+			map['LastIP'] = lastIP;
+		if(id != null)
+			map['Id'] = id;
+		if(createTime != null)
+			map['CreateTime'] = createTime;
+		if(updateTime != null)
+			map['UpdateTime'] = updateTime;
+		map['IsDelete'] = isDelete;
+		return map;
+	}
 }
+
+

lib/services/platform.dart

@@ -1,4 +1,4 @@
-import 'package:fisjsonrpc/client_base.dart';
+import '../client_base.dart';
 
 /// 平台服务
 class PlatformService extends JsonRpcClientBase {
@@ -16,15 +16,15 @@ class PlatformService extends JsonRpcClientBase {
 
   /// 加载主题
   Future<bool> loadTheme(String name) async {
-    var rpcRst = await call("loadTheme", name);
-    return rpcRst == true;
+    var rpcRst = await call("LoadTheme", name);
+    return rpcRst;
   }
 
   /// 保存配置
   ///
   /// [moduleName] 模块名
   ///
-  /// [jsonText] json文本
+  /// [jsonText] 配置json文本
   Future<bool> saveConfig(String moduleName, String jsonText) async {
     var rpcRst = await call("SaveConfig", [moduleName, jsonText]);
     return rpcRst;

lib/services/remedical.dart

@@ -1,35 +1,73 @@
 import 'dart:core';
 
-import 'package:fiscommon/json_convert.dart';
-import 'package:fisjsonrpc/base_model.dart';
-import 'package:fisjsonrpc/client_base.dart';
+import 'package:fis_jsonrpc/client_base.dart';
+import 'package:fis_common/json_convert.dart';
 
 import 'remedical.m.dart';
 
-/// 诊断服务
 class RemedicalService extends JsonRpcClientBase {
-  RemedicalService(
-    String host, {
-    String serviceName = "IRemedicalService",
-    Map<String, String>? headers,
-    int? timeout,
-  }) : super(
-          host,
-          serviceName,
-          headers: headers,
-          timeout: timeout,
-        ) {
-    /// 注册响应实体反序列化处理器
-    FJsonConvert.setDecoder((map) => RemedicalModel.fromJson(map));
-    FJsonConvert.setDecoder((map) => PagedData<RemedicalModel>.fromJson(map));
-  }
-
-  /// 获取诊断分页列表
-  Future<PagedData<RemedicalModel>> getRemedicalPageAsync(
-      RemedicalQueryRequest request) async {
-    var rpcRst = await call("GetRemedicalPageAsync", request);
-    var result =
-        PagedData<RemedicalModel>.fromJson(rpcRst as Map<String, dynamic>);
-    return result;
-  }
+	RemedicalService(
+		String host, {
+		String serviceName = "IRemedicalService",
+		Map<String, String>? headers,
+		int? timeout,
+	}) : super(
+						host,
+						serviceName,
+						headers: headers,
+						timeout: timeout,
+				) {
+		/// 注册响应实体反序列化处理器
+		FJsonConvert.setDecoder((map) => DeviceData.fromJson(map));
+		FJsonConvert.setDecoder((map) => RecordInfo.fromJson(map));
+		FJsonConvert.setDecoder((map) => PageCollection<RecordInfo>.fromJson(map));
+		FJsonConvert.setDecoder((map) => PatientInfo.fromJson(map));
+	}
+
+	Future<String> createPatientInfoAsync(CreatePatientInfoRequest request) async {
+		var rpcRst = await call("CreatePatientInfoAsync", request);
+		return rpcRst;
+	}
+
+	Future<String> createDeviceDataAsync(CreateDeviceDataRequest request) async {
+		var rpcRst = await call("CreateDeviceDataAsync", request);
+		return rpcRst;
+	}
+
+	Future<String> createRecordInfoAsync(CreateRecordInfoRequest request) async {
+		var rpcRst = await call("CreateRecordInfoAsync", request);
+		return rpcRst;
+	}
+
+	Future<DeviceData> getDeviceDataDetailAsync(GetDeviceDataDetailRequest request) async {
+		var rpcRst = await call("GetDeviceDataDetailAsync", request);
+		var result = DeviceData.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<RecordInfo> getRecordInfoDetailAsync(GetRecordInfoDetailRequest request) async {
+		var rpcRst = await call("GetRecordInfoDetailAsync", request);
+		var result = RecordInfo.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<List<DeviceData>> getDeviceDataListAsync(GetDeviceDataListRequest request) async {
+		var rpcRst = await call("GetDeviceDataListAsync", request);
+		var result = (rpcRst as List).map((e)=>DeviceData.fromJson(e as Map<String, dynamic>)).toList();
+		return result;
+	}
+
+	Future<PageCollection<RecordInfo>> getRecordInfoPageAsync(PageRequest request) async {
+		var rpcRst = await call("GetRecordInfoPageAsync", request);
+		var result = PageCollection<RecordInfo>.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<PatientInfo> getPatientInfoAsync(GetPatientInfoRequest request) async {
+		var rpcRst = await call("GetPatientInfoAsync", request);
+		var result = PatientInfo.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
 }
+

lib/services/remedical.m.dart

@@ -1,123 +1,522 @@
-import 'package:fisjsonrpc/base_model.dart';
-
-class RemedicalFilterModel {
-  RemedicalFilterModel({
-    this.recordId,
-  });
-
-  String? recordId;
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> map = {};
-    if (this.recordId != null) map['RecordId'] = this.recordId;
-    return map;
-  }
-}
-
-class RemedicalQueryRequest extends PagedRequest {
-  RemedicalQueryRequest({
-    required this.sessionId,
-    int currentPage = 1,
-    int pageSize = 10,
-    this.filter = const {},
-  }) : super();
-
-  final String sessionId;
-  final Map<String, String> filter;
-
-  @override
-  Map<String, dynamic> toJson() {
-    var map = super.toJson();
-    map['filter'] = this.filter;
-    map['sessionId'] = this.sessionId;
-    return map;
-  }
-
-  factory RemedicalQueryRequest.fromJson(Map<String, dynamic> map) {
-    return RemedicalQueryRequest(
-      sessionId: map['sessionId'],
-      currentPage: map['currentPage'],
-      pageSize: map['pageSize'],
-      filter: map['filter'],
-    );
-  }
-}
-
-class RemedicalModel {
-  RemedicalModel({
-    required this.id,
-    required this.createTime,
-    required this.recordId,
-    required this.patientName,
-    required this.idCardNo,
-    required this.birthday,
-    required this.genderType,
-    this.sourceOrg,
-    this.terminalImages = const [],
-  });
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> map = {};
-    map['id'] = this.id;
-    map['createTime'] = this.createTime;
-    map['recordId'] = this.recordId;
-    map['patientName'] = this.patientName;
-    map['idCardNo'] = this.idCardNo;
-    map['birthday'] = this.birthday;
-    map['genderType'] = this.genderType;
-    map['terminalImages'] = this.terminalImages.map((e) => e.toJson()).toList();
-    return map;
-  }
-
-  factory RemedicalModel.fromJson(Map<String, dynamic> map) {
-    final imgsData = map['TerminalImages'];
-    return RemedicalModel(
-      id: map['Id'],
-      createTime: map['CreateTime'],
-      recordId: map['RecordId'],
-      patientName: map['PatientName'],
-      idCardNo: map['IdCardNo'],
-      birthday: map['Birthday'],
-      genderType: map['GenderType'],
-      sourceOrg: map['SourceOrg'],
-      terminalImages: imgsData != null
-          ? (imgsData as List)
-              .map((e) => RemedicalTerminalImageModel.fromJson(e))
-              .toList()
-          : const [],
-    );
-  }
-
-  final String id;
-  final String createTime;
-  final String recordId;
-  final String patientName;
-  final String idCardNo;
-  final String birthday;
-  final int genderType;
-  final String? sourceOrg;
-  final List<RemedicalTerminalImageModel> terminalImages;
-}
-
-class RemedicalTerminalImageModel {
-  RemedicalTerminalImageModel({
-    required this.previewUrl,
-    required this.imageUrl,
-  });
-  factory RemedicalTerminalImageModel.fromJson(Map<String, dynamic> map) {
-    return RemedicalTerminalImageModel(
-      imageUrl: map['ImageUrl'],
-      previewUrl: map['PreviewUrl'],
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    Map<String, dynamic> map = {};
-    map['previewUrl'] = this.previewUrl;
-    map['imageUrl'] = this.imageUrl;
-    return map;
-  }
-
-  final String previewUrl;
-  final String imageUrl;
+import 'package:fis_common/json_convert.dart';
+
+enum GenderTypeEnum {
+	Male,
+	Female,
+}
+
+enum PatientTypeEnum {
+	Default,
+}
+
+class PatientInfo {
+	String? patientCode;
+	String? firstName;
+	String? lastName;
+	String? patientCardNo;
+	DateTime? birthday;
+	GenderTypeEnum genderType;
+	String? patientCaseHistory;
+	String? patientPhone;
+	PatientTypeEnum patientType;
+	String? id;
+	DateTime? createTime;
+	DateTime? updateTime;
+	bool isDelete;
+
+	PatientInfo({
+		this.patientCode,
+		this.firstName,
+		this.lastName,
+		this.patientCardNo,
+		this.birthday,
+		this.genderType=GenderTypeEnum.Male,
+		this.patientCaseHistory,
+		this.patientPhone,
+		this.patientType=PatientTypeEnum.Default,
+		this.id,
+		this.createTime,
+		this.updateTime,
+		this.isDelete=false,
+	});
+
+	factory PatientInfo.fromJson(Map<String, dynamic> map) {
+		return PatientInfo( 
+			patientCode: map['PatientCode'],
+			firstName: map['FirstName'],
+			lastName: map['LastName'],
+			patientCardNo: map['PatientCardNo'],
+			birthday: map['Birthday'] != null ? DateTime.parse(map['Birthday']) : null,
+			genderType: GenderTypeEnum.values.firstWhere((e) => e.index == map['GenderType']),
+			patientCaseHistory: map['PatientCaseHistory'],
+			patientPhone: map['PatientPhone'],
+			patientType: PatientTypeEnum.values.firstWhere((e) => e.index == map['PatientType']),
+			id: map['Id'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
+			isDelete: map['IsDelete'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(patientCode != null)
+			map['PatientCode'] = patientCode;
+		if(firstName != null)
+			map['FirstName'] = firstName;
+		if(lastName != null)
+			map['LastName'] = lastName;
+		if(patientCardNo != null)
+			map['PatientCardNo'] = patientCardNo;
+		if(birthday != null)
+			map['Birthday'] = birthday;
+		map['GenderType'] = genderType.index;
+		if(patientCaseHistory != null)
+			map['PatientCaseHistory'] = patientCaseHistory;
+		if(patientPhone != null)
+			map['PatientPhone'] = patientPhone;
+		map['PatientType'] = patientType.index;
+		if(id != null)
+			map['Id'] = id;
+		if(createTime != null)
+			map['CreateTime'] = createTime;
+		if(updateTime != null)
+			map['UpdateTime'] = updateTime;
+		map['IsDelete'] = isDelete;
+		return map;
+	}
 }
+
+class CreatePatientInfoRequest {
+	PatientInfo? info;
+	String? sessionId;
+
+	CreatePatientInfoRequest({
+		this.info,
+		this.sessionId,
+	});
+
+	factory CreatePatientInfoRequest.fromJson(Map<String, dynamic> map) {
+		return CreatePatientInfoRequest( 
+			info: map['Info'],
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(info != null)
+			map['Info'] = info;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
+}
+
+enum DeviceDataTypeEnum {
+	Default,
+}
+
+class DeviceData {
+	String? deviceDataCode;
+	String? deviceCode;
+	String? deviceFileCode;
+	String? recordCode;
+	String? patientCode;
+	String? previewImageToken;
+	String? dataToken;
+	DeviceDataTypeEnum deviceDataType;
+	String? processResult;
+	String? id;
+	DateTime? createTime;
+	DateTime? updateTime;
+	bool isDelete;
+
+	DeviceData({
+		this.deviceDataCode,
+		this.deviceCode,
+		this.deviceFileCode,
+		this.recordCode,
+		this.patientCode,
+		this.previewImageToken,
+		this.dataToken,
+		this.deviceDataType=DeviceDataTypeEnum.Default,
+		this.processResult,
+		this.id,
+		this.createTime,
+		this.updateTime,
+		this.isDelete=false,
+	});
+
+	factory DeviceData.fromJson(Map<String, dynamic> map) {
+		return DeviceData( 
+			deviceDataCode: map['DeviceDataCode'],
+			deviceCode: map['DeviceCode'],
+			deviceFileCode: map['DeviceFileCode'],
+			recordCode: map['RecordCode'],
+			patientCode: map['PatientCode'],
+			previewImageToken: map['PreviewImageToken'],
+			dataToken: map['DataToken'],
+			deviceDataType: DeviceDataTypeEnum.values.firstWhere((e) => e.index == map['DeviceDataType']),
+			processResult: map['ProcessResult'],
+			id: map['Id'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
+			isDelete: map['IsDelete'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(deviceDataCode != null)
+			map['DeviceDataCode'] = deviceDataCode;
+		if(deviceCode != null)
+			map['DeviceCode'] = deviceCode;
+		if(deviceFileCode != null)
+			map['DeviceFileCode'] = deviceFileCode;
+		if(recordCode != null)
+			map['RecordCode'] = recordCode;
+		if(patientCode != null)
+			map['PatientCode'] = patientCode;
+		if(previewImageToken != null)
+			map['PreviewImageToken'] = previewImageToken;
+		if(dataToken != null)
+			map['DataToken'] = dataToken;
+		map['DeviceDataType'] = deviceDataType.index;
+		if(processResult != null)
+			map['ProcessResult'] = processResult;
+		if(id != null)
+			map['Id'] = id;
+		if(createTime != null)
+			map['CreateTime'] = createTime;
+		if(updateTime != null)
+			map['UpdateTime'] = updateTime;
+		map['IsDelete'] = isDelete;
+		return map;
+	}
+}
+
+class CreateDeviceDataRequest {
+	DeviceData? info;
+	String? sessionId;
+
+	CreateDeviceDataRequest({
+		this.info,
+		this.sessionId,
+	});
+
+	factory CreateDeviceDataRequest.fromJson(Map<String, dynamic> map) {
+		return CreateDeviceDataRequest( 
+			info: map['Info'],
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(info != null)
+			map['Info'] = info;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
+}
+
+enum RecordTypeEnum {
+	Ultrasound,
+	Electrocardio,
+}
+
+enum CheckTypeEnum {
+	Default,
+}
+
+enum RecordStatusEnum {
+	Default,
+}
+
+class RecordInfo {
+	String? recordCode;
+	String? patientCode;
+	String? patientName;
+	String? orgName;
+	RecordTypeEnum recordType;
+	CheckTypeEnum checkType;
+	String? localRecordCode;
+	RecordStatusEnum recordStatus;
+	String? recordRemark;
+	String? tags;
+	String? id;
+	DateTime? createTime;
+	DateTime? updateTime;
+	bool isDelete;
+
+	RecordInfo({
+		this.recordCode,
+		this.patientCode,
+		this.patientName,
+		this.orgName,
+		this.recordType=RecordTypeEnum.Ultrasound,
+		this.checkType=CheckTypeEnum.Default,
+		this.localRecordCode,
+		this.recordStatus=RecordStatusEnum.Default,
+		this.recordRemark,
+		this.tags,
+		this.id,
+		this.createTime,
+		this.updateTime,
+		this.isDelete=false,
+	});
+
+	factory RecordInfo.fromJson(Map<String, dynamic> map) {
+		return RecordInfo( 
+			recordCode: map['RecordCode'],
+			patientCode: map['PatientCode'],
+			patientName: map['PatientName'],
+			orgName: map['OrgName'],
+			recordType: RecordTypeEnum.values.firstWhere((e) => e.index == map['RecordType']),
+			checkType: CheckTypeEnum.values.firstWhere((e) => e.index == map['CheckType']),
+			localRecordCode: map['LocalRecordCode'],
+			recordStatus: RecordStatusEnum.values.firstWhere((e) => e.index == map['RecordStatus']),
+			recordRemark: map['RecordRemark'],
+			tags: map['Tags'],
+			id: map['Id'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
+			isDelete: map['IsDelete'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(recordCode != null)
+			map['RecordCode'] = recordCode;
+		if(patientCode != null)
+			map['PatientCode'] = patientCode;
+		if(patientName != null)
+			map['PatientName'] = patientName;
+		if(orgName != null)
+			map['OrgName'] = orgName;
+		map['RecordType'] = recordType.index;
+		map['CheckType'] = checkType.index;
+		if(localRecordCode != null)
+			map['LocalRecordCode'] = localRecordCode;
+		map['RecordStatus'] = recordStatus.index;
+		if(recordRemark != null)
+			map['RecordRemark'] = recordRemark;
+		if(tags != null)
+			map['Tags'] = tags;
+		if(id != null)
+			map['Id'] = id;
+		if(createTime != null)
+			map['CreateTime'] = createTime;
+		if(updateTime != null)
+			map['UpdateTime'] = updateTime;
+		map['IsDelete'] = isDelete;
+		return map;
+	}
+}
+
+class CreateRecordInfoRequest {
+	RecordInfo? info;
+	String? sessionId;
+
+	CreateRecordInfoRequest({
+		this.info,
+		this.sessionId,
+	});
+
+	factory CreateRecordInfoRequest.fromJson(Map<String, dynamic> map) {
+		return CreateRecordInfoRequest( 
+			info: map['Info'],
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(info != null)
+			map['Info'] = info;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
+}
+
+class GetDeviceDataDetailRequest {
+	String? deviceDataCode;
+	String? sessionId;
+
+	GetDeviceDataDetailRequest({
+		this.deviceDataCode,
+		this.sessionId,
+	});
+
+	factory GetDeviceDataDetailRequest.fromJson(Map<String, dynamic> map) {
+		return GetDeviceDataDetailRequest( 
+			deviceDataCode: map['DeviceDataCode'],
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(deviceDataCode != null)
+			map['DeviceDataCode'] = deviceDataCode;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
+}
+
+class GetRecordInfoDetailRequest {
+	String? recordCode;
+	String? sessionId;
+
+	GetRecordInfoDetailRequest({
+		this.recordCode,
+		this.sessionId,
+	});
+
+	factory GetRecordInfoDetailRequest.fromJson(Map<String, dynamic> map) {
+		return GetRecordInfoDetailRequest( 
+			recordCode: map['RecordCode'],
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(recordCode != null)
+			map['RecordCode'] = recordCode;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
+}
+
+class GetDeviceDataListRequest {
+	String? recordCode;
+	String? sessionId;
+
+	GetDeviceDataListRequest({
+		this.recordCode,
+		this.sessionId,
+	});
+
+	factory GetDeviceDataListRequest.fromJson(Map<String, dynamic> map) {
+		return GetDeviceDataListRequest( 
+			recordCode: map['RecordCode'],
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(recordCode != null)
+			map['RecordCode'] = recordCode;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
+}
+
+class PageCollection<T> {
+	int currentPage;
+	int pageSize;
+	int dataCount;
+	List<T>? pageData;
+
+	PageCollection({
+		this.currentPage=0,
+		this.pageSize=0,
+		this.dataCount=0,
+		this.pageData,
+	});
+
+	factory PageCollection.fromJson(Map<String, dynamic> map) {
+		List<T> pageDataList = [];
+		if (map['PageData'] != null) {
+			pageDataList.addAll(
+					(map['PageData'] as List).map((e) => FJsonConvert.fromJson<T>(e)!));
+		}
+		return PageCollection( 
+			currentPage: map['CurrentPage'],
+			pageSize: map['PageSize'],
+			dataCount: map['DataCount'],
+			pageData: pageDataList,
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		map['CurrentPage'] = currentPage;
+		map['PageSize'] = pageSize;
+		map['DataCount'] = dataCount;
+		if(pageData != null)
+			map['PageData'] = pageData;
+		return map;
+	}
+}
+
+class PageRequest {
+	int currentPage;
+	int pageSize;
+	Map<String,String>? filter;
+	String? sessionId;
+
+	PageRequest({
+		this.currentPage=0,
+		this.pageSize=0,
+		this.filter,
+		this.sessionId,
+	});
+
+	factory PageRequest.fromJson(Map<String, dynamic> map) {
+		return PageRequest( 
+			currentPage: map['CurrentPage'],
+			pageSize: map['PageSize'],
+			filter: map['Filter'].cast<String,String>(),
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		map['CurrentPage'] = currentPage;
+		map['PageSize'] = pageSize;
+		if(filter != null)
+			map['Filter'] = filter;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
+}
+
+class GetPatientInfoRequest {
+	String? patientCode;
+	String? sessionId;
+
+	GetPatientInfoRequest({
+		this.patientCode,
+		this.sessionId,
+	});
+
+	factory GetPatientInfoRequest.fromJson(Map<String, dynamic> map) {
+		return GetPatientInfoRequest( 
+			patientCode: map['PatientCode'],
+			sessionId: map['SessionId'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(patientCode != null)
+			map['PatientCode'] = patientCode;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		return map;
+	}
+}
+
+

lib/services/sMS.dart

@@ -0,0 +1,28 @@
+import 'dart:core';
+
+import '../client_base.dart';
+
+class SMSService extends JsonRpcClientBase {
+  SMSService(
+    String host, {
+    String serviceName = "ISMSService",
+    Map<String, String>? headers,
+    int? timeout,
+  }) : super(
+          host,
+          serviceName,
+          headers: headers,
+          timeout: timeout,
+        );
+
+  Future<bool> sendMessage(List<String> mobiles, String template) async {
+    var rpcRst = await call("SendMessage", [mobiles, template]);
+    return rpcRst;
+  }
+
+  Future<bool> checkVerificationCode(
+      String userPhone, String verifyCode) async {
+    var rpcRst = await call("CheckVerificationCode", [userPhone, verifyCode]);
+    return rpcRst;
+  }
+}

lib/services/serverLog.dart

@@ -0,0 +1,38 @@
+import 'dart:core';
+
+import '../client_base.dart';
+
+class ServerLogService extends JsonRpcClientBase {
+  ServerLogService(
+    String host, {
+    String serviceName = "IServerLogService",
+    Map<String, String>? headers,
+    int? timeout,
+  }) : super(
+          host,
+          serviceName,
+          headers: headers,
+          timeout: timeout,
+        );
+
+  Future<bool> writeInfoAsync(String serviceName, String module,
+      String requestChain, String logContent) async {
+    var rpcRst = await call(
+        "WriteInfoAsync", [serviceName, module, requestChain, logContent]);
+    return rpcRst;
+  }
+
+  Future<bool> writeWarnAsync(String serviceName, String module,
+      String requestChain, String logContent) async {
+    var rpcRst = await call(
+        "WriteWarnAsync", [serviceName, module, requestChain, logContent]);
+    return rpcRst;
+  }
+
+  Future<bool> writeErrorAsync(String serviceName, String module,
+      String requestChain, String logContent) async {
+    var rpcRst = await call(
+        "WriteErrorAsync", [serviceName, module, requestChain, logContent]);
+    return rpcRst;
+  }
+}

lib/services/session.dart

@@ -0,0 +1,35 @@
+import 'dart:core';
+
+import '../client_base.dart';
+import 'package:fis_common/json_convert.dart';
+
+import 'session.m.dart';
+
+class SessionService extends JsonRpcClientBase {
+  SessionService(
+    String host, {
+    String serviceName = "ISessionService",
+    Map<String, String>? headers,
+    int? timeout,
+  }) : super(
+          host,
+          serviceName,
+          headers: headers,
+          timeout: timeout,
+        ) {
+    /// 注册响应实体反序列化处理器
+    FJsonConvert.setDecoder((map) => SessionInfo.fromJson(map));
+  }
+
+  Future<SessionInfo> createSessionAsync(
+      String userCode, SessionClientInfo clientInfo) async {
+    var rpcRst = await call("CreateSessionAsync", [userCode, clientInfo]);
+    var result = SessionInfo.fromJson(rpcRst as Map<String, dynamic>);
+    return result;
+  }
+
+  Future<bool> removeSessionAsync(String sessionId) async {
+    var rpcRst = await call("RemoveSessionAsync", sessionId);
+    return rpcRst;
+  }
+}

lib/services/session.m.dart

@@ -0,0 +1,87 @@
+class SessionInfo {
+	String? userCode;
+	String? deviceId;
+	String? sessionId;
+	String? id;
+	DateTime? createTime;
+	DateTime? updateTime;
+	bool isDelete;
+
+	SessionInfo({
+		this.userCode,
+		this.deviceId,
+		this.sessionId,
+		this.id,
+		this.createTime,
+		this.updateTime,
+		this.isDelete=false,
+	});
+
+	factory SessionInfo.fromJson(Map<String, dynamic> map) {
+		return SessionInfo( 
+			userCode: map['UserCode'],
+			deviceId: map['DeviceId'],
+			sessionId: map['SessionId'],
+			id: map['Id'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
+			isDelete: map['IsDelete'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(userCode != null)
+			map['UserCode'] = userCode;
+		if(deviceId != null)
+			map['DeviceId'] = deviceId;
+		if(sessionId != null)
+			map['SessionId'] = sessionId;
+		if(id != null)
+			map['Id'] = id;
+		if(createTime != null)
+			map['CreateTime'] = createTime;
+		if(updateTime != null)
+			map['UpdateTime'] = updateTime;
+		map['IsDelete'] = isDelete;
+		return map;
+	}
+}
+
+class SessionClientInfo {
+	String? clientIpAndPort;
+	String? clientDeviceId;
+	String? clientSource;
+	String? clientExtensionInfo;
+
+	SessionClientInfo({
+		this.clientIpAndPort,
+		this.clientDeviceId,
+		this.clientSource,
+		this.clientExtensionInfo,
+	});
+
+	factory SessionClientInfo.fromJson(Map<String, dynamic> map) {
+		return SessionClientInfo( 
+			clientIpAndPort: map['ClientIpAndPort'],
+			clientDeviceId: map['ClientDeviceId'],
+			clientSource: map['ClientSource'],
+			clientExtensionInfo: map['ClientExtensionInfo'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(clientIpAndPort != null)
+			map['ClientIpAndPort'] = clientIpAndPort;
+		if(clientDeviceId != null)
+			map['ClientDeviceId'] = clientDeviceId;
+		if(clientSource != null)
+			map['ClientSource'] = clientSource;
+		if(clientExtensionInfo != null)
+			map['ClientExtensionInfo'] = clientExtensionInfo;
+		return map;
+	}
+}
+
+

lib/services/user.dart

@@ -1,31 +1,31 @@
 import 'dart:core';
 
-import 'package:fiscommon/json_convert.dart';
-import 'package:fisjsonrpc/base_model.dart';
-import 'package:fisjsonrpc/client_base.dart';
+import 'package:fis_jsonrpc/client_base.dart';
+import 'package:fis_common/json_convert.dart';
 
 import 'user.m.dart';
 
-/// 用户服务
 class UserService extends JsonRpcClientBase {
-  UserService(
-    String host, {
-    String serviceName = "IUserService",
-    Map<String, String>? headers,
-    int? timeout,
-  }) : super(
-          host,
-          serviceName,
-          headers: headers,
-          timeout: timeout,
-        ) {
-    /// 注册响应实体反序列化处理器
-  }
+	UserService(
+		String host, {
+		String serviceName = "IUserService",
+		Map<String, String>? headers,
+		int? timeout,
+	}) : super(
+						host,
+						serviceName,
+						headers: headers,
+						timeout: timeout,
+				) {
+		/// 注册响应实体反序列化处理器
+		FJsonConvert.setDecoder((map) => UserInfo.fromJson(map));
+	}
+
+	Future<UserInfo> getUserInfoAsync(String userCode,String sessionId) async {
+		var rpcRst = await call("GetUserInfoAsync", [userCode,sessionId]);
+		var result = UserInfo.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
 
-  /// 获取用户信息
-  Future<UserInfo> getUserInfoAsync(String userCode, String sessionId) async {
-    var rpcRst = await call("GetUserInfoAsync", [userCode, sessionId]);
-    var result = UserInfo.fromJson(rpcRst as Map<String, dynamic>);
-    return result;
-  }
 }
+

lib/services/user.m.dart

@@ -1,43 +1,100 @@
 class UserInfo {
-  UserInfo({
-    required this.userCode,
-    required this.userName,
-    this.phone,
-    this.email,
-    this.nickName,
-    this.fullName,
-    this.headImageToken,
-    this.organizationCode,
-    this.authorityGroups = const [],
-    this.bindDevices = const [],
-    this.score = 0,
-  });
+	String? userCode;
+	String? userName;
+	String? secretPassword;
+	String? phone;
+	String? email;
+	String? nickName;
+	String? fullName;
+	String? headImageToken;
+	String? organizationCode;
+	List<String>? authorityGroups;
+	List<String>? bindDevices;
+	int score;
+	String? lastIP;
+	String? id;
+	DateTime? createTime;
+	DateTime? updateTime;
+	bool isDelete;
 
-  final String userCode;
-  final String userName;
-  final String? phone;
-  final String? email;
-  final String? nickName;
-  final String? fullName;
-  final String? headImageToken;
-  final String? organizationCode;
-  final List<String> authorityGroups;
-  final List<String> bindDevices;
-  final double score;
+	UserInfo({
+		this.userCode,
+		this.userName,
+		this.secretPassword,
+		this.phone,
+		this.email,
+		this.nickName,
+		this.fullName,
+		this.headImageToken,
+		this.organizationCode,
+		this.authorityGroups,
+		this.bindDevices,
+		this.score=0,
+		this.lastIP,
+		this.id,
+		this.createTime,
+		this.updateTime,
+		this.isDelete=false,
+	});
 
-  factory UserInfo.fromJson(Map<String, dynamic> map) {
-    return UserInfo(
-      userCode: map['UserCode'],
-      userName: map['UserName'],
-      phone: map['Phone'],
-      email: map['Email'],
-      nickName: map['NickName'],
-      fullName: map['FullName'],
-      headImageToken: map['HeadImageToken'],
-      organizationCode: map['OrganizationCode'],
-      score: map['Score'],
-      authorityGroups: (map['AuthorityGroups'] as List).cast<String>(),
-      bindDevices: (map['BindDevices'] as List).cast<String>(),
-    );
-  }
+	factory UserInfo.fromJson(Map<String, dynamic> map) {
+		return UserInfo( 
+			userCode: map['UserCode'],
+			userName: map['UserName'],
+			secretPassword: map['SecretPassword'],
+			phone: map['Phone'],
+			email: map['Email'],
+			nickName: map['NickName'],
+			fullName: map['FullName'],
+			headImageToken: map['HeadImageToken'],
+			organizationCode: map['OrganizationCode'],
+			authorityGroups: map['AuthorityGroups'].cast<String>().toList(),
+			bindDevices: map['BindDevices'].cast<String>().toList(),
+			score: map['Score'],
+			lastIP: map['LastIP'],
+			id: map['Id'],
+			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
+			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
+			isDelete: map['IsDelete'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if(userCode != null)
+			map['UserCode'] = userCode;
+		if(userName != null)
+			map['UserName'] = userName;
+		if(secretPassword != null)
+			map['SecretPassword'] = secretPassword;
+		if(phone != null)
+			map['Phone'] = phone;
+		if(email != null)
+			map['Email'] = email;
+		if(nickName != null)
+			map['NickName'] = nickName;
+		if(fullName != null)
+			map['FullName'] = fullName;
+		if(headImageToken != null)
+			map['HeadImageToken'] = headImageToken;
+		if(organizationCode != null)
+			map['OrganizationCode'] = organizationCode;
+		if(authorityGroups != null)
+			map['AuthorityGroups'] = authorityGroups;
+		if(bindDevices != null)
+			map['BindDevices'] = bindDevices;
+		map['Score'] = score;
+		if(lastIP != null)
+			map['LastIP'] = lastIP;
+		if(id != null)
+			map['Id'] = id;
+		if(createTime != null)
+			map['CreateTime'] = createTime;
+		if(updateTime != null)
+			map['UpdateTime'] = updateTime;
+		map['IsDelete'] = isDelete;
+		return map;
+	}
 }
+
+

pubspec.lock

@@ -1,289 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.6.1"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.0"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.1.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.2.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.1.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.15.0"
-  dio:
-    dependency: transitive
-    description:
-      name: dio
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "4.0.0"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.2.0"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.1.2"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "6.1.2"
-  fiscommon:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "62cfa3bc0011892328863d4c7fc44d67be405027"
-      url: "http://git.ius.plus:88/Flyinsono-Packages/fis-common.git"
-    source: git
-    version: "0.0.1"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.13.3"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "4.0.0"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.17.0"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.6.3"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.12.10"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.3.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.8.0"
-  path_provider:
-    dependency: transitive
-    description:
-      name: path_provider
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.4"
-  path_provider_linux:
-    dependency: transitive
-    description:
-      name: path_provider_linux
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.0"
-  path_provider_macos:
-    dependency: transitive
-    description:
-      name: path_provider_macos
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.2"
-  path_provider_platform_interface:
-    dependency: transitive
-    description:
-      name: path_provider_platform_interface
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.1"
-  path_provider_windows:
-    dependency: transitive
-    description:
-      name: path_provider_windows
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.3"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.11.1"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "3.0.2"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.1"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "4.2.3"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.8.1"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.10.0"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.1.0"
-  synchronized:
-    dependency: transitive
-    description:
-      name: synchronized
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "3.0.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.2.0"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.3.0"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.3.0"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.0"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.2.9"
-  xdg_directories:
-    dependency: transitive
-    description:
-      name: xdg_directories
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.2.0"
-sdks:
-  dart: ">=2.13.0 <3.0.0"
-  flutter: ">=2.0.0"

pubspec.yaml

@@ -1,5 +1,5 @@
 name: fis_jsonrpc
-description: Flyinsono app json-rpc client package project.
+description: A JSON-RPC client package project for Flyinsono application.
 version: 0.0.1
 homepage:
 
@@ -14,9 +14,9 @@ dependencies:
   flutter:
     sdk: flutter
 
-  fiscommon:
+  fis_common:
       git:
-        url: http://git.ius.plus:88/Flyinsono-Packages/fis-common.git
+        url: http://git.ius.plus:88/Project-Wing/fis_lib_common.git
 
 dev_dependencies:
   flutter_test: