update server interface

lib/services/adminDB.dart

@@ -5,6 +5,9 @@ import 'package:fis_common/json_convert.dart';
 
 import 'adminDB.m.dart';
 
+import 'device.m.dart';
+
+
 class AdminDBService extends JsonRpcClientBase {
 	AdminDBService(
 		String host, {

lib/services/adminDB.m.dart

@@ -1,4 +1,5 @@
-import 'package:fis_common/json_convert.dart';
+import 'device.m.dart';
+import 'authentication.m.dart';
 
 class AdminInfoDTO {
 	String? adminCode;
@@ -75,7 +76,7 @@ class TableDataItem<T> {
 	factory TableDataItem.fromJson(Map<String, dynamic> map) {
 		return TableDataItem( 
 			data: map['Data'],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
+			platformDatas: map['PlatformDatas'] != null ? map['PlatformDatas'].cast<String,String>() : null,
 			extensionData: map['ExtensionData'],
 		);
 	}
@@ -108,7 +109,7 @@ class CreateAdminDBRequest extends TableDataItem<AdminInfoDTO>{
 	factory CreateAdminDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreateAdminDBRequest( 
 			: map[''],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
+			platformDatas: map['PlatformDatas'] != null ? map['PlatformDatas'].cast<String,String>() : null,
 			extensionData: map['ExtensionData'],
 		);
 	}
@@ -121,93 +122,4 @@ class CreateAdminDBRequest extends TableDataItem<AdminInfoDTO>{
 	}
 }
 
-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 BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class PageRequest extends BaseRequest{
-	int currentPage;
-	int pageSize;
-	Map<String,String>? filter;
-	bool isFuzzy;
-
-	PageRequest({
-		this.currentPage = 0,
-		this.pageSize = 0,
-		this.filter,
-		this.isFuzzy = false,
-	}) : super(
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			currentPage: map['CurrentPage'],
-			pageSize: map['PageSize'],
-			filter: map['Filter'].cast<String,String>(),
-			isFuzzy: map['IsFuzzy'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['CurrentPage'] = currentPage;
-		map['PageSize'] = pageSize;
-		if(filter != null)
-			map['Filter'] = filter;
-		map['IsFuzzy'] = isFuzzy;
-		return map;
-	}
-}
-
-
 

lib/services/authentication.dart

@@ -5,6 +5,7 @@ import 'package:fis_common/json_convert.dart';
 
 import 'authentication.m.dart';
 
+
 class AuthenticationService extends JsonRpcClientBase {
 	AuthenticationService(
 		String host, {

lib/services/authentication.m.dart

@@ -41,8 +41,7 @@ class StorageAuthenticationInfo {
 
 class BaseRequest {
 
-	BaseRequest({
-	});
+	BaseRequest();
 
 	factory BaseRequest.fromJson(Map<String, dynamic> map) {
 		return BaseRequest( 
@@ -146,7 +145,7 @@ class TokenInfo {
 			userCode: map['UserCode'],
 			deviceId: map['DeviceId'],
 			token: map['Token'],
-			headerMap: map['HeaderMap'].cast<String,String>(),
+			headerMap: map['HeaderMap'] != null ? map['HeaderMap'].cast<String,String>() : null,
 		);
 	}
 
@@ -173,7 +172,7 @@ class TokenClientInfo {
 
 	factory TokenClientInfo.fromJson(Map<String, dynamic> map) {
 		return TokenClientInfo( 
-			headerMap: map['HeaderMap'].cast<String,String>(),
+			headerMap: map['HeaderMap'] != null ? map['HeaderMap'].cast<String,String>() : null,
 		);
 	}
 
@@ -212,4 +211,3 @@ class CreateTokenRequest {
 }
 
 
-

lib/services/clientLog.dart

@@ -3,6 +3,7 @@ import 'dart:core';
 import 'package:fis_jsonrpc/client_base.dart';
 
 
+
 class ClientLogService extends JsonRpcClientBase {
 	ClientLogService(
 		String host, {

lib/services/device.dart

@@ -5,6 +5,9 @@ import 'package:fis_common/json_convert.dart';
 
 import 'device.m.dart';
 
+import 'authentication.m.dart';
+
+
 class DeviceService extends JsonRpcClientBase {
 	DeviceService(
 		String host, {

lib/services/device.m.dart

@@ -1,3 +1,5 @@
+import 'authentication.m.dart';
+
 import 'package:fis_jsonrpc/utils.dart';
 
 import 'package:fis_common/json_convert.dart';
@@ -196,44 +198,6 @@ class CreateDeviceRequest extends UploadDeviceDTO{
 	}
 }
 
-class BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class TokenRequest extends BaseRequest{
-	String? token;
-
-	TokenRequest({
-		this.token,
-	}) : super(
-		);
-
-	factory TokenRequest.fromJson(Map<String, dynamic> map) {
-		return TokenRequest( 
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(token != null)
-			map['Token'] = token;
-		return map;
-	}
-}
-
 class GetDeviceRequest extends TokenRequest{
 	String? deviceCode;
 
@@ -315,7 +279,7 @@ class PageRequest extends BaseRequest{
 		return PageRequest( 
 			currentPage: map['CurrentPage'],
 			pageSize: map['PageSize'],
-			filter: map['Filter'].cast<String,String>(),
+			filter: map['Filter'] != null ? map['Filter'].cast<String,String>() : null,
 			isFuzzy: map['IsFuzzy'],
 		);
 	}
@@ -779,4 +743,3 @@ class FindDevicesByOrganizationCodeRequest extends TokenRequest{
 }
 
 
-

lib/services/deviceInfoDB.dart

@@ -5,6 +5,10 @@ import 'package:fis_common/json_convert.dart';
 
 import 'deviceInfoDB.m.dart';
 
+import 'device.m.dart';
+import 'user.m.dart';
+
+
 class DeviceInfoDBService extends JsonRpcClientBase {
 	DeviceInfoDBService(
 		String host, {

lib/services/deviceInfoDB.m.dart

@@ -1,110 +1,7 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-import 'package:fis_common/json_convert.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
-
-enum DictionaryTypeEnum {
-	DeviceModel,
-	DeviceType,
-}
-
-class DictionaryDTO extends BaseDTO{
-	String? dictionaryCode;
-	DictionaryTypeEnum dictionaryType;
-	String? value;
-	String? parentCode;
-
-	DictionaryDTO({
-		this.dictionaryCode,
-		this.dictionaryType = DictionaryTypeEnum.DeviceModel,
-		this.value,
-		this.parentCode,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory DictionaryDTO.fromJson(Map<String, dynamic> map) {
-		return DictionaryDTO( 
-			dictionaryCode: map['DictionaryCode'],
-			dictionaryType: DictionaryTypeEnum.values.firstWhere((e) => e.index == map['DictionaryType']),
-			value: map['Value'],
-			parentCode: map['ParentCode'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(dictionaryCode != null)
-			map['DictionaryCode'] = dictionaryCode;
-		map['DictionaryType'] = dictionaryType.index;
-		if(value != null)
-			map['Value'] = value;
-		if(parentCode != null)
-			map['ParentCode'] = parentCode;
-		return map;
-	}
-}
-
-class TableDataItem<T> {
-	DictionaryDTO? data;
-	Map<String,String>? platformDatas;
-	String? extensionData;
-
-	TableDataItem({
-		this.data,
-		this.platformDatas,
-		this.extensionData,
-	});
-
-	factory TableDataItem.fromJson(Map<String, dynamic> map) {
-		return TableDataItem( 
-			data: map['Data'],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
-			extensionData: map['ExtensionData'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(data != null)
-			map['Data'] = data;
-		if(platformDatas != null)
-			map['PlatformDatas'] = platformDatas;
-		if(extensionData != null)
-			map['ExtensionData'] = extensionData;
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'adminDB.m.dart';
+import 'authentication.m.dart';
+import 'user.m.dart';
 
 class CreateDictionaryItemDBRequest extends TableDataItem<DictionaryDTO>{
 	DictionaryDTO? ;
@@ -122,7 +19,7 @@ class CreateDictionaryItemDBRequest extends TableDataItem<DictionaryDTO>{
 	factory CreateDictionaryItemDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreateDictionaryItemDBRequest( 
 			: map[''],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
+			platformDatas: map['PlatformDatas'] != null ? map['PlatformDatas'].cast<String,String>() : null,
 			extensionData: map['ExtensionData'],
 		);
 	}
@@ -181,176 +78,6 @@ class FindDictionaryItemsDBRequest {
 	}
 }
 
-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 BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class PageRequest extends BaseRequest{
-	int currentPage;
-	int pageSize;
-	Map<String,String>? filter;
-	bool isFuzzy;
-
-	PageRequest({
-		this.currentPage = 0,
-		this.pageSize = 0,
-		this.filter,
-		this.isFuzzy = false,
-	}) : super(
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			currentPage: map['CurrentPage'],
-			pageSize: map['PageSize'],
-			filter: map['Filter'].cast<String,String>(),
-			isFuzzy: map['IsFuzzy'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['CurrentPage'] = currentPage;
-		map['PageSize'] = pageSize;
-		if(filter != null)
-			map['Filter'] = filter;
-		map['IsFuzzy'] = isFuzzy;
-		return map;
-	}
-}
-
-class DeviceInfoDTO extends BaseDTO{
-	String? deviceCode;
-	String? serialNumber;
-	String? name;
-	String? description;
-	String? deviceModel;
-	String? deviceType;
-	String? headPicUrl;
-	String? deviceSoftwareVersion;
-	String? sDKSoftwareVersion;
-	String? organizationCode;
-	String? shortCode;
-	bool isAutoShared;
-
-	DeviceInfoDTO({
-		this.deviceCode,
-		this.serialNumber,
-		this.name,
-		this.description,
-		this.deviceModel,
-		this.deviceType,
-		this.headPicUrl,
-		this.deviceSoftwareVersion,
-		this.sDKSoftwareVersion,
-		this.organizationCode,
-		this.shortCode,
-		this.isAutoShared = false,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory DeviceInfoDTO.fromJson(Map<String, dynamic> map) {
-		return DeviceInfoDTO( 
-			deviceCode: map['DeviceCode'],
-			serialNumber: map['SerialNumber'],
-			name: map['Name'],
-			description: map['Description'],
-			deviceModel: map['DeviceModel'],
-			deviceType: map['DeviceType'],
-			headPicUrl: map['HeadPicUrl'],
-			deviceSoftwareVersion: map['DeviceSoftwareVersion'],
-			sDKSoftwareVersion: map['SDKSoftwareVersion'],
-			organizationCode: map['OrganizationCode'],
-			shortCode: map['ShortCode'],
-			isAutoShared: map['IsAutoShared'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(deviceCode != null)
-			map['DeviceCode'] = deviceCode;
-		if(serialNumber != null)
-			map['SerialNumber'] = serialNumber;
-		if(name != null)
-			map['Name'] = name;
-		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;
-		map['IsAutoShared'] = isAutoShared;
-		return map;
-	}
-}
-
 class CreateDeviceInfoDBRequest extends TableDataItem<DeviceInfoDTO>{
 	DeviceInfoDTO? ;
 
@@ -367,7 +94,7 @@ class CreateDeviceInfoDBRequest extends TableDataItem<DeviceInfoDTO>{
 	factory CreateDeviceInfoDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreateDeviceInfoDBRequest( 
 			: map[''],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
+			platformDatas: map['PlatformDatas'] != null ? map['PlatformDatas'].cast<String,String>() : null,
 			extensionData: map['ExtensionData'],
 		);
 	}
@@ -469,94 +196,6 @@ class ManageDeviceInfoDTO extends DeviceInfoDTO{
 	}
 }
 
-class PageResult<T> {
-	int pageIndex;
-	int pageSize;
-	int totalCount;
-	List<T>? pageData;
-
-	PageResult({
-		this.pageIndex = 0,
-		this.pageSize = 0,
-		this.totalCount = 0,
-		this.pageData,
-	});
-
-	factory PageResult.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 PageResult( 
-			pageIndex: map['PageIndex'],
-			pageSize: map['PageSize'],
-			totalCount: map['TotalCount'],
-			pageData: pageDataList,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		map['PageIndex'] = pageIndex;
-		map['PageSize'] = pageSize;
-		map['TotalCount'] = totalCount;
-		if(pageData != null)
-			map['PageData'] = pageData;
-		return map;
-	}
-}
-
-class TokenRequest extends BaseRequest{
-	String? token;
-
-	TokenRequest({
-		this.token,
-	}) : super(
-		);
-
-	factory TokenRequest.fromJson(Map<String, dynamic> map) {
-		return TokenRequest( 
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(token != null)
-			map['Token'] = token;
-		return map;
-	}
-}
-
-class PageRequest extends TokenRequest{
-	int pageIndex;
-	int pageSize;
-
-	PageRequest({
-		this.pageIndex = 0,
-		this.pageSize = 0,
-		String? token,
-	}) : super(
-			token: token,
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			pageIndex: map['PageIndex'],
-			pageSize: map['PageSize'],
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['PageIndex'] = pageIndex;
-		map['PageSize'] = pageSize;
-		return map;
-	}
-}
-
 class GetDevicePagesRequest extends PageRequest{
 	String? queryType;
 	String? keyword;
@@ -609,4 +248,3 @@ class GetDevicePagesRequest extends PageRequest{
 }
 
 
-

lib/services/email.dart

@@ -3,6 +3,7 @@ import 'dart:core';
 import 'package:fis_jsonrpc/client_base.dart';
 
 
+
 class EmailService extends JsonRpcClientBase {
 	EmailService(
 		String host, {

lib/services/identityApply.dart

@@ -5,6 +5,9 @@ import 'package:fis_common/json_convert.dart';
 
 import 'identityApply.m.dart';
 
+import 'authentication.m.dart';
+
+
 class IdentityApplyService extends JsonRpcClientBase {
 	IdentityApplyService(
 		String host, {

lib/services/identityApply.m.dart

@@ -1,30 +1,5 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'authentication.m.dart';
 
 enum ApplyStateEnum {
 	NotApply,
@@ -92,44 +67,6 @@ class IdentityApplyDTO extends BaseDTO{
 	}
 }
 
-class BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class TokenRequest extends BaseRequest{
-	String? token;
-
-	TokenRequest({
-		this.token,
-	}) : super(
-		);
-
-	factory TokenRequest.fromJson(Map<String, dynamic> map) {
-		return TokenRequest( 
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(token != null)
-			map['Token'] = token;
-		return map;
-	}
-}
-
 class GetLastIdentityApplyRequest extends TokenRequest{
 	String? applyPosition;
 
@@ -212,4 +149,3 @@ class ApplyForRequest extends IdentityApplyDTO{
 }
 
 
-

lib/services/identityApplyDB.dart

@@ -5,6 +5,10 @@ import 'package:fis_common/json_convert.dart';
 
 import 'identityApplyDB.m.dart';
 
+import 'device.m.dart';
+import 'identityApply.m.dart';
+
+
 class IdentityApplyDBService extends JsonRpcClientBase {
 	IdentityApplyDBService(
 		String host, {

lib/services/identityApplyDB.m.dart

@@ -1,129 +1,7 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-import 'package:fis_common/json_convert.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
-
-enum ApplyStateEnum {
-	NotApply,
-	Applying,
-	Refused,
-	Passed,
-}
-
-class IdentityApplyDTO extends BaseDTO{
-	String? identityApplyCode;
-	String? userCode;
-	String? applyPosition;
-	List<String>? identityCard;
-	List<String>? licenseCard;
-	ApplyStateEnum applyState;
-	String? applyNote;
-
-	IdentityApplyDTO({
-		this.identityApplyCode,
-		this.userCode,
-		this.applyPosition,
-		this.identityCard,
-		this.licenseCard,
-		this.applyState = ApplyStateEnum.NotApply,
-		this.applyNote,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory IdentityApplyDTO.fromJson(Map<String, dynamic> map) {
-		final identityCardData = map['IdentityCard'];
-		final licenseCardData = map['LicenseCard'];
-		return IdentityApplyDTO( 
-			identityApplyCode: map['IdentityApplyCode'],
-			userCode: map['UserCode'],
-			applyPosition: map['ApplyPosition'],
-			identityCard: identityCardData != null ? (identityCardData as List).map((e) => e as String).toList(): null,
-			licenseCard: licenseCardData != null ? (licenseCardData as List).map((e) => e as String).toList(): null,
-			applyState: ApplyStateEnum.values.firstWhere((e) => e.index == map['ApplyState']),
-			applyNote: map['ApplyNote'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(identityApplyCode != null)
-			map['IdentityApplyCode'] = identityApplyCode;
-		if(userCode != null)
-			map['UserCode'] = userCode;
-		if(applyPosition != null)
-			map['ApplyPosition'] = applyPosition;
-		if(identityCard != null)
-			map['IdentityCard'] = identityCard;
-		if(licenseCard != null)
-			map['LicenseCard'] = licenseCard;
-		map['ApplyState'] = applyState.index;
-		if(applyNote != null)
-			map['ApplyNote'] = applyNote;
-		return map;
-	}
-}
-
-class TableDataItem<T> {
-	IdentityApplyDTO? data;
-	Map<String,String>? platformDatas;
-	String? extensionData;
-
-	TableDataItem({
-		this.data,
-		this.platformDatas,
-		this.extensionData,
-	});
-
-	factory TableDataItem.fromJson(Map<String, dynamic> map) {
-		return TableDataItem( 
-			data: map['Data'],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
-			extensionData: map['ExtensionData'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(data != null)
-			map['Data'] = data;
-		if(platformDatas != null)
-			map['PlatformDatas'] = platformDatas;
-		if(extensionData != null)
-			map['ExtensionData'] = extensionData;
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'identityApply.m.dart';
+import 'adminDB.m.dart';
+import 'authentication.m.dart';
 
 class CreateIdentityApplyDBRequest extends TableDataItem<IdentityApplyDTO>{
 	IdentityApplyDTO? ;
@@ -141,7 +19,7 @@ class CreateIdentityApplyDBRequest extends TableDataItem<IdentityApplyDTO>{
 	factory CreateIdentityApplyDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreateIdentityApplyDBRequest( 
 			: map[''],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
+			platformDatas: map['PlatformDatas'] != null ? map['PlatformDatas'].cast<String,String>() : null,
 			extensionData: map['ExtensionData'],
 		);
 	}
@@ -154,93 +32,4 @@ class CreateIdentityApplyDBRequest extends TableDataItem<IdentityApplyDTO>{
 	}
 }
 
-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 BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class PageRequest extends BaseRequest{
-	int currentPage;
-	int pageSize;
-	Map<String,String>? filter;
-	bool isFuzzy;
-
-	PageRequest({
-		this.currentPage = 0,
-		this.pageSize = 0,
-		this.filter,
-		this.isFuzzy = false,
-	}) : super(
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			currentPage: map['CurrentPage'],
-			pageSize: map['PageSize'],
-			filter: map['Filter'].cast<String,String>(),
-			isFuzzy: map['IsFuzzy'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['CurrentPage'] = currentPage;
-		map['PageSize'] = pageSize;
-		if(filter != null)
-			map['Filter'] = filter;
-		map['IsFuzzy'] = isFuzzy;
-		return map;
-	}
-}
-
-
 

lib/services/index.dart

@@ -25,3 +25,25 @@ export 'user.dart';
 export 'userAuthorityGroupsDB.dart';
 export 'userDB.dart';
 export 'userFeaturesDB.dart';
+export 'adminDB.m.dart';
+export 'authentication.m.dart';
+export 'device.m.dart';
+export 'deviceInfoDB.m.dart';
+export 'identityApply.m.dart';
+export 'identityApplyDB.m.dart';
+export 'login.m.dart';
+export 'organization.m.dart';
+export 'organizationDB.m.dart';
+export 'platform.m.dart';
+export 'position.m.dart';
+export 'positionDB.m.dart';
+export 'rank.m.dart';
+export 'rankDB.m.dart';
+export 'region.m.dart';
+export 'role.m.dart';
+export 'roleDB.m.dart';
+export 'storageDB.m.dart';
+export 'user.m.dart';
+export 'userAuthorityGroupsDB.m.dart';
+export 'userDB.m.dart';
+export 'userFeaturesDB.m.dart';

lib/services/login.dart

@@ -5,6 +5,7 @@ import 'package:fis_common/json_convert.dart';
 
 import 'login.m.dart';
 
+
 class LoginService extends JsonRpcClientBase {
 	LoginService(
 		String host, {

lib/services/login.m.dart

@@ -126,7 +126,7 @@ class CommonLoginRequest {
 			anyAccount: map['AnyAccount'],
 			anyCode: map['AnyCode'],
 			password: map['Password'],
-			headerMap: map['HeaderMap'].cast<String,String>(),
+			headerMap: map['HeaderMap'] != null ? map['HeaderMap'].cast<String,String>() : null,
 		);
 	}
 
@@ -183,7 +183,7 @@ class CommonSignUpRequest {
 			anyAccount: map['AnyAccount'],
 			anyCode: map['AnyCode'],
 			password: map['Password'],
-			headerMap: map['HeaderMap'].cast<String,String>(),
+			headerMap: map['HeaderMap'] != null ? map['HeaderMap'].cast<String,String>() : null,
 		);
 	}
 
@@ -419,4 +419,3 @@ class VerifyAccountRequest {
 }
 
 
-

lib/services/organization.dart

@@ -5,6 +5,7 @@ import 'package:fis_common/json_convert.dart';
 
 import 'organization.m.dart';
 
+
 class OrganizationService extends JsonRpcClientBase {
 	OrganizationService(
 		String host, {

lib/services/organization.m.dart

@@ -1,30 +1,5 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'authentication.m.dart';
 
 class OrganizationBaseDTO extends BaseDTO{
 	String? organizationCode;
@@ -154,10 +129,10 @@ class OrganizationDTO extends OrganizationBasicDTO{
 			description: map['Description'],
 			rootCode: map['RootCode'],
 			organizationType: OrganizationTypeEnum.values.firstWhere((e) => e.index == map['OrganizationType']),
-			authorityGroups: map['AuthorityGroups'].cast<String>().toList(),
+			authorityGroups: map['AuthorityGroups'] != null ? map['AuthorityGroups'].cast<String>().toList() : null,
 			nautica: map['Nautica'],
 			state: OrganizationStateEnum.values.firstWhere((e) => e.index == map['State']),
-			directors: map['Directors'].cast<String>().toList(),
+			directors: map['Directors'] != null ? map['Directors'].cast<String>().toList() : null,
 			regionCode: map['RegionCode'],
 			parentCode: map['ParentCode'],
 			logoUrl: map['LogoUrl'],
@@ -237,44 +212,6 @@ class GetOrganizationByCodeRequest {
 	}
 }
 
-class BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class TokenRequest extends BaseRequest{
-	String? token;
-
-	TokenRequest({
-		this.token,
-	}) : super(
-		);
-
-	factory TokenRequest.fromJson(Map<String, dynamic> map) {
-		return TokenRequest( 
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(token != null)
-			map['Token'] = token;
-		return map;
-	}
-}
-
 class GetParentOrganizationListRequest extends TokenRequest{
 
 	GetParentOrganizationListRequest({
@@ -401,7 +338,7 @@ class AddOrganizationsRequest extends TokenRequest{
 
 	factory AddOrganizationsRequest.fromJson(Map<String, dynamic> map) {
 		return AddOrganizationsRequest( 
-			organizationInfos: map['OrganizationInfos'].map((e)=>OrganizationItemDTO.fromJson(e as Map<String,dynamic>)).toList(),
+			organizationInfos: map['OrganizationInfos'] != null ? map['OrganizationInfos'].map((e)=>OrganizationItemDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			token: map['Token'],
 		);
 	}
@@ -426,7 +363,7 @@ class RemoveOrganizationsRequest extends TokenRequest{
 
 	factory RemoveOrganizationsRequest.fromJson(Map<String, dynamic> map) {
 		return RemoveOrganizationsRequest( 
-			organizationCodes: map['OrganizationCodes'].cast<String>().toList(),
+			organizationCodes: map['OrganizationCodes'] != null ? map['OrganizationCodes'].cast<String>().toList() : null,
 			token: map['Token'],
 		);
 	}
@@ -440,4 +377,3 @@ class RemoveOrganizationsRequest extends TokenRequest{
 }
 
 
-

lib/services/organizationDB.dart

@@ -5,6 +5,10 @@ import 'package:fis_common/json_convert.dart';
 
 import 'organizationDB.m.dart';
 
+import 'device.m.dart';
+import 'organization.m.dart';
+
+
 class OrganizationDBService extends JsonRpcClientBase {
 	OrganizationDBService(
 		String host, {

lib/services/organizationDB.m.dart

@@ -1,223 +1,7 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-import 'package:fis_common/json_convert.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
-
-class OrganizationBaseDTO extends BaseDTO{
-	String? organizationCode;
-	String? organizationName;
-
-	OrganizationBaseDTO({
-		this.organizationCode,
-		this.organizationName,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory OrganizationBaseDTO.fromJson(Map<String, dynamic> map) {
-		return OrganizationBaseDTO( 
-			organizationCode: map['OrganizationCode'],
-			organizationName: map['OrganizationName'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(organizationCode != null)
-			map['OrganizationCode'] = organizationCode;
-		if(organizationName != null)
-			map['OrganizationName'] = organizationName;
-		return map;
-	}
-}
-
-class OrganizationBasicDTO extends OrganizationBaseDTO{
-	String? regionCode;
-	String? parentCode;
-	String? logoUrl;
-
-	OrganizationBasicDTO({
-		this.regionCode,
-		this.parentCode,
-		this.logoUrl,
-		String? organizationCode,
-		String? organizationName,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			organizationCode: organizationCode,
-			organizationName: organizationName,
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory OrganizationBasicDTO.fromJson(Map<String, dynamic> map) {
-		return OrganizationBasicDTO( 
-			regionCode: map['RegionCode'],
-			parentCode: map['ParentCode'],
-			logoUrl: map['LogoUrl'],
-			organizationCode: map['OrganizationCode'],
-			organizationName: map['OrganizationName'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(regionCode != null)
-			map['RegionCode'] = regionCode;
-		if(parentCode != null)
-			map['ParentCode'] = parentCode;
-		if(logoUrl != null)
-			map['LogoUrl'] = logoUrl;
-		return map;
-	}
-}
-
-enum OrganizationTypeEnum {
-	Corporation,
-	Department,
-	Section,
-}
-
-enum OrganizationStateEnum {
-	WaitAudit,
-	Audited,
-	Rejected,
-}
-
-class OrganizationDTO extends OrganizationBasicDTO{
-	String? description;
-	String? rootCode;
-	OrganizationTypeEnum organizationType;
-	List<String>? authorityGroups;
-	String? nautica;
-	OrganizationStateEnum state;
-	List<String>? directors;
-
-	OrganizationDTO({
-		this.description,
-		this.rootCode,
-		this.organizationType = OrganizationTypeEnum.Corporation,
-		this.authorityGroups,
-		this.nautica,
-		this.state = OrganizationStateEnum.WaitAudit,
-		this.directors,
-		String? regionCode,
-		String? parentCode,
-		String? logoUrl,
-		String? organizationCode,
-		String? organizationName,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			regionCode: regionCode,
-			parentCode: parentCode,
-			logoUrl: logoUrl,
-			organizationCode: organizationCode,
-			organizationName: organizationName,
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory OrganizationDTO.fromJson(Map<String, dynamic> map) {
-		return OrganizationDTO( 
-			description: map['Description'],
-			rootCode: map['RootCode'],
-			organizationType: OrganizationTypeEnum.values.firstWhere((e) => e.index == map['OrganizationType']),
-			authorityGroups: map['AuthorityGroups'].cast<String>().toList(),
-			nautica: map['Nautica'],
-			state: OrganizationStateEnum.values.firstWhere((e) => e.index == map['State']),
-			directors: map['Directors'].cast<String>().toList(),
-			regionCode: map['RegionCode'],
-			parentCode: map['ParentCode'],
-			logoUrl: map['LogoUrl'],
-			organizationCode: map['OrganizationCode'],
-			organizationName: map['OrganizationName'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(description != null)
-			map['Description'] = description;
-		if(rootCode != null)
-			map['RootCode'] = rootCode;
-		map['OrganizationType'] = organizationType.index;
-		if(authorityGroups != null)
-			map['AuthorityGroups'] = authorityGroups;
-		if(nautica != null)
-			map['Nautica'] = nautica;
-		map['State'] = state.index;
-		if(directors != null)
-			map['Directors'] = directors;
-		return map;
-	}
-}
-
-class TableDataItem<T> {
-	OrganizationDTO? data;
-	Map<String,String>? platformDatas;
-	String? extensionData;
-
-	TableDataItem({
-		this.data,
-		this.platformDatas,
-		this.extensionData,
-	});
-
-	factory TableDataItem.fromJson(Map<String, dynamic> map) {
-		return TableDataItem( 
-			data: map['Data'],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
-			extensionData: map['ExtensionData'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(data != null)
-			map['Data'] = data;
-		if(platformDatas != null)
-			map['PlatformDatas'] = platformDatas;
-		if(extensionData != null)
-			map['ExtensionData'] = extensionData;
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'organization.m.dart';
+import 'adminDB.m.dart';
+import 'authentication.m.dart';
 
 class CreateOrganizationsDBRequest {
 	List<TableDataItem<OrganizationDTO>>? infos;
@@ -228,7 +12,7 @@ class CreateOrganizationsDBRequest {
 
 	factory CreateOrganizationsDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreateOrganizationsDBRequest( 
-			infos: map['Infos'].map((e)=>TableDataItem<OrganizationDTO>.fromJson(e as Map<String,dynamic>)).toList(),
+			infos: map['Infos'] != null ? map['Infos'].map((e)=>TableDataItem<OrganizationDTO>.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
 	}
 
@@ -261,94 +45,6 @@ class GetOrganizationDBRequest {
 	}
 }
 
-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 BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class PageRequest extends BaseRequest{
-	int currentPage;
-	int pageSize;
-	Map<String,String>? filter;
-	bool isFuzzy;
-
-	PageRequest({
-		this.currentPage = 0,
-		this.pageSize = 0,
-		this.filter,
-		this.isFuzzy = false,
-	}) : super(
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			currentPage: map['CurrentPage'],
-			pageSize: map['PageSize'],
-			filter: map['Filter'].cast<String,String>(),
-			isFuzzy: map['IsFuzzy'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['CurrentPage'] = currentPage;
-		map['PageSize'] = pageSize;
-		if(filter != null)
-			map['Filter'] = filter;
-		map['IsFuzzy'] = isFuzzy;
-		return map;
-	}
-}
-
 class RemoveOrganizationsDBRequest {
 	List<String>? organizationCodes;
 
@@ -358,7 +54,7 @@ class RemoveOrganizationsDBRequest {
 
 	factory RemoveOrganizationsDBRequest.fromJson(Map<String, dynamic> map) {
 		return RemoveOrganizationsDBRequest( 
-			organizationCodes: map['OrganizationCodes'].cast<String>().toList(),
+			organizationCodes: map['OrganizationCodes'] != null ? map['OrganizationCodes'].cast<String>().toList() : null,
 		);
 	}
 
@@ -371,4 +67,3 @@ class RemoveOrganizationsDBRequest {
 }
 
 
-

lib/services/position.dart

@@ -5,6 +5,7 @@ import 'package:fis_common/json_convert.dart';
 
 import 'position.m.dart';
 
+
 class PositionService extends JsonRpcClientBase {
 	PositionService(
 		String host, {

lib/services/position.m.dart

@@ -1,30 +1,5 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'authentication.m.dart';
 
 class PositionDTO extends BaseDTO{
 	String? positionCode;
@@ -49,7 +24,7 @@ class PositionDTO extends BaseDTO{
 			positionCode: map['PositionCode'],
 			positionName: map['PositionName'],
 			organizationCode: map['OrganizationCode'],
-			underUserCodes: map['UnderUserCodes'].cast<String>().toList(),
+			underUserCodes: map['UnderUserCodes'] != null ? map['UnderUserCodes'].cast<String>().toList() : null,
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);
@@ -69,44 +44,6 @@ class PositionDTO extends BaseDTO{
 	}
 }
 
-class BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class TokenRequest extends BaseRequest{
-	String? token;
-
-	TokenRequest({
-		this.token,
-	}) : super(
-		);
-
-	factory TokenRequest.fromJson(Map<String, dynamic> map) {
-		return TokenRequest( 
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(token != null)
-			map['Token'] = token;
-		return map;
-	}
-}
-
 class GetPositionsRequest extends TokenRequest{
 	List<String>? positionCodes;
 	List<String>? organizationCodes;
@@ -121,8 +58,8 @@ class GetPositionsRequest extends TokenRequest{
 
 	factory GetPositionsRequest.fromJson(Map<String, dynamic> map) {
 		return GetPositionsRequest( 
-			positionCodes: map['PositionCodes'].cast<String>().toList(),
-			organizationCodes: map['OrganizationCodes'].cast<String>().toList(),
+			positionCodes: map['PositionCodes'] != null ? map['PositionCodes'].cast<String>().toList() : null,
+			organizationCodes: map['OrganizationCodes'] != null ? map['OrganizationCodes'].cast<String>().toList() : null,
 			token: map['Token'],
 		);
 	}
@@ -154,7 +91,7 @@ class PositionItemDTO {
 		return PositionItemDTO( 
 			positionName: map['PositionName'],
 			organizationCode: map['OrganizationCode'],
-			underUserCodes: map['UnderUserCodes'].cast<String>().toList(),
+			underUserCodes: map['UnderUserCodes'] != null ? map['UnderUserCodes'].cast<String>().toList() : null,
 			extendsData: map['ExtendsData'],
 		);
 	}
@@ -185,7 +122,7 @@ class AddPositionsRequest {
 	factory AddPositionsRequest.fromJson(Map<String, dynamic> map) {
 		return AddPositionsRequest( 
 			token: map['Token'],
-			positions: map['Positions'].map((e)=>PositionItemDTO.fromJson(e as Map<String,dynamic>)).toList(),
+			positions: map['Positions'] != null ? map['Positions'].map((e)=>PositionItemDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
 	}
 
@@ -211,7 +148,7 @@ class UpdatePositionsRequest extends TokenRequest{
 
 	factory UpdatePositionsRequest.fromJson(Map<String, dynamic> map) {
 		return UpdatePositionsRequest( 
-			positions: map['Positions'].map((e)=>PositionItemDTO.fromJson(e as Map<String,dynamic>)).toList(),
+			positions: map['Positions'] != null ? map['Positions'].map((e)=>PositionItemDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			token: map['Token'],
 		);
 	}
@@ -236,7 +173,7 @@ class RemovePositionRequest extends TokenRequest{
 
 	factory RemovePositionRequest.fromJson(Map<String, dynamic> map) {
 		return RemovePositionRequest( 
-			positionCodes: map['PositionCodes'].cast<String>().toList(),
+			positionCodes: map['PositionCodes'] != null ? map['PositionCodes'].cast<String>().toList() : null,
 			token: map['Token'],
 		);
 	}
@@ -250,4 +187,3 @@ class RemovePositionRequest extends TokenRequest{
 }
 
 
-

lib/services/positionDB.dart

@@ -5,6 +5,9 @@ import 'package:fis_common/json_convert.dart';
 
 import 'positionDB.m.dart';
 
+import 'position.m.dart';
+
+
 class PositionDBService extends JsonRpcClientBase {
 	PositionDBService(
 		String host, {

lib/services/positionDB.m.dart

@@ -1,104 +1,6 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
-
-class PositionDTO extends BaseDTO{
-	String? positionCode;
-	String? positionName;
-	String? organizationCode;
-	List<String>? underUserCodes;
-
-	PositionDTO({
-		this.positionCode,
-		this.positionName,
-		this.organizationCode,
-		this.underUserCodes,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory PositionDTO.fromJson(Map<String, dynamic> map) {
-		return PositionDTO( 
-			positionCode: map['PositionCode'],
-			positionName: map['PositionName'],
-			organizationCode: map['OrganizationCode'],
-			underUserCodes: map['UnderUserCodes'].cast<String>().toList(),
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(positionCode != null)
-			map['PositionCode'] = positionCode;
-		if(positionName != null)
-			map['PositionName'] = positionName;
-		if(organizationCode != null)
-			map['OrganizationCode'] = organizationCode;
-		if(underUserCodes != null)
-			map['UnderUserCodes'] = underUserCodes;
-		return map;
-	}
-}
-
-class TableDataItem<T> {
-	PositionDTO? data;
-	Map<String,String>? platformDatas;
-	String? extensionData;
-
-	TableDataItem({
-		this.data,
-		this.platformDatas,
-		this.extensionData,
-	});
-
-	factory TableDataItem.fromJson(Map<String, dynamic> map) {
-		return TableDataItem( 
-			data: map['Data'],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
-			extensionData: map['ExtensionData'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(data != null)
-			map['Data'] = data;
-		if(platformDatas != null)
-			map['PlatformDatas'] = platformDatas;
-		if(extensionData != null)
-			map['ExtensionData'] = extensionData;
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'position.m.dart';
+import 'adminDB.m.dart';
 
 class CreatePositionsDBRequest {
 	List<TableDataItem<PositionDTO>>? infos;
@@ -109,7 +11,7 @@ class CreatePositionsDBRequest {
 
 	factory CreatePositionsDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreatePositionsDBRequest( 
-			infos: map['Infos'].map((e)=>TableDataItem<PositionDTO>.fromJson(e as Map<String,dynamic>)).toList(),
+			infos: map['Infos'] != null ? map['Infos'].map((e)=>TableDataItem<PositionDTO>.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
 	}
 
@@ -132,8 +34,8 @@ class GetPositionsDBRequest {
 
 	factory GetPositionsDBRequest.fromJson(Map<String, dynamic> map) {
 		return GetPositionsDBRequest( 
-			positionCodes: map['PositionCodes'].cast<String>().toList(),
-			organizationCodes: map['OrganizationCodes'].cast<String>().toList(),
+			positionCodes: map['PositionCodes'] != null ? map['PositionCodes'].cast<String>().toList() : null,
+			organizationCodes: map['OrganizationCodes'] != null ? map['OrganizationCodes'].cast<String>().toList() : null,
 		);
 	}
 
@@ -156,7 +58,7 @@ class RemovePositionDBRequest {
 
 	factory RemovePositionDBRequest.fromJson(Map<String, dynamic> map) {
 		return RemovePositionDBRequest( 
-			positionCodes: map['PositionCodes'].cast<String>().toList(),
+			positionCodes: map['PositionCodes'] != null ? map['PositionCodes'].cast<String>().toList() : null,
 		);
 	}
 
@@ -177,7 +79,7 @@ class UpdatePositionsDBRequest {
 
 	factory UpdatePositionsDBRequest.fromJson(Map<String, dynamic> map) {
 		return UpdatePositionsDBRequest( 
-			positions: map['Positions'].map((e)=>TableDataItem<PositionDTO>.fromJson(e as Map<String,dynamic>)).toList(),
+			positions: map['Positions'] != null ? map['Positions'].map((e)=>TableDataItem<PositionDTO>.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
 	}
 
@@ -190,4 +92,3 @@ class UpdatePositionsDBRequest {
 }
 
 
-

lib/services/rank.dart

@@ -5,6 +5,7 @@ import 'package:fis_common/json_convert.dart';
 
 import 'rank.m.dart';
 
+
 class RankService extends JsonRpcClientBase {
 	RankService(
 		String host, {

lib/services/rank.m.dart

@@ -1,30 +1,5 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'authentication.m.dart';
 
 class RankDTO extends BaseDTO{
 	String? rankCode;
@@ -64,44 +39,6 @@ class RankDTO extends BaseDTO{
 	}
 }
 
-class BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class TokenRequest extends BaseRequest{
-	String? token;
-
-	TokenRequest({
-		this.token,
-	}) : super(
-		);
-
-	factory TokenRequest.fromJson(Map<String, dynamic> map) {
-		return TokenRequest( 
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(token != null)
-			map['Token'] = token;
-		return map;
-	}
-}
-
 class GetRankByCodeRequest extends TokenRequest{
 	String? rankCode;
 
@@ -141,8 +78,8 @@ class GetRanksRequest extends TokenRequest{
 
 	factory GetRanksRequest.fromJson(Map<String, dynamic> map) {
 		return GetRanksRequest( 
-			rankCodes: map['RankCodes'].cast<String>().toList(),
-			organizationCodes: map['OrganizationCodes'].cast<String>().toList(),
+			rankCodes: map['RankCodes'] != null ? map['RankCodes'].cast<String>().toList() : null,
+			organizationCodes: map['OrganizationCodes'] != null ? map['OrganizationCodes'].cast<String>().toList() : null,
 			token: map['Token'],
 		);
 	}
@@ -200,7 +137,7 @@ class AddRanksRequest extends TokenRequest{
 
 	factory AddRanksRequest.fromJson(Map<String, dynamic> map) {
 		return AddRanksRequest( 
-			rankInfos: map['RankInfos'].map((e)=>RankItemDTO.fromJson(e as Map<String,dynamic>)).toList(),
+			rankInfos: map['RankInfos'] != null ? map['RankInfos'].map((e)=>RankItemDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			token: map['Token'],
 		);
 	}
@@ -225,7 +162,7 @@ class RemoveRanksRequest extends TokenRequest{
 
 	factory RemoveRanksRequest.fromJson(Map<String, dynamic> map) {
 		return RemoveRanksRequest( 
-			rankCodes: map['RankCodes'].cast<String>().toList(),
+			rankCodes: map['RankCodes'] != null ? map['RankCodes'].cast<String>().toList() : null,
 			token: map['Token'],
 		);
 	}
@@ -250,7 +187,7 @@ class UpdateRanksRequest extends TokenRequest{
 
 	factory UpdateRanksRequest.fromJson(Map<String, dynamic> map) {
 		return UpdateRanksRequest( 
-			ranks: map['Ranks'].map((e)=>RankItemDTO.fromJson(e as Map<String,dynamic>)).toList(),
+			ranks: map['Ranks'] != null ? map['Ranks'].map((e)=>RankItemDTO.fromJson(e as Map<String,dynamic>)).toList() : null,
 			token: map['Token'],
 		);
 	}
@@ -264,4 +201,3 @@ class UpdateRanksRequest extends TokenRequest{
 }
 
 
-

lib/services/rankDB.dart

@@ -5,6 +5,9 @@ import 'package:fis_common/json_convert.dart';
 
 import 'rankDB.m.dart';
 
+import 'rank.m.dart';
+
+
 class RankDBService extends JsonRpcClientBase {
 	RankDBService(
 		String host, {

lib/services/rankDB.m.dart

@@ -1,99 +1,6 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
-
-class RankDTO extends BaseDTO{
-	String? rankCode;
-	String? rankName;
-	String? organizationCode;
-
-	RankDTO({
-		this.rankCode,
-		this.rankName,
-		this.organizationCode,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory RankDTO.fromJson(Map<String, dynamic> map) {
-		return RankDTO( 
-			rankCode: map['RankCode'],
-			rankName: map['RankName'],
-			organizationCode: map['OrganizationCode'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(rankCode != null)
-			map['RankCode'] = rankCode;
-		if(rankName != null)
-			map['RankName'] = rankName;
-		if(organizationCode != null)
-			map['OrganizationCode'] = organizationCode;
-		return map;
-	}
-}
-
-class TableDataItem<T> {
-	RankDTO? data;
-	Map<String,String>? platformDatas;
-	String? extensionData;
-
-	TableDataItem({
-		this.data,
-		this.platformDatas,
-		this.extensionData,
-	});
-
-	factory TableDataItem.fromJson(Map<String, dynamic> map) {
-		return TableDataItem( 
-			data: map['Data'],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
-			extensionData: map['ExtensionData'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(data != null)
-			map['Data'] = data;
-		if(platformDatas != null)
-			map['PlatformDatas'] = platformDatas;
-		if(extensionData != null)
-			map['ExtensionData'] = extensionData;
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'rank.m.dart';
+import 'adminDB.m.dart';
 
 class CreateRanksDBRequest {
 	List<TableDataItem<RankDTO>>? infos;
@@ -104,7 +11,7 @@ class CreateRanksDBRequest {
 
 	factory CreateRanksDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreateRanksDBRequest( 
-			infos: map['Infos'].map((e)=>TableDataItem<RankDTO>.fromJson(e as Map<String,dynamic>)).toList(),
+			infos: map['Infos'] != null ? map['Infos'].map((e)=>TableDataItem<RankDTO>.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
 	}
 
@@ -127,8 +34,8 @@ class GetRanksDBRequest {
 
 	factory GetRanksDBRequest.fromJson(Map<String, dynamic> map) {
 		return GetRanksDBRequest( 
-			rankCodes: map['RankCodes'].cast<String>().toList(),
-			organizationCodes: map['OrganizationCodes'].cast<String>().toList(),
+			rankCodes: map['RankCodes'] != null ? map['RankCodes'].cast<String>().toList() : null,
+			organizationCodes: map['OrganizationCodes'] != null ? map['OrganizationCodes'].cast<String>().toList() : null,
 		);
 	}
 
@@ -151,7 +58,7 @@ class RemoveRanksDBRequest {
 
 	factory RemoveRanksDBRequest.fromJson(Map<String, dynamic> map) {
 		return RemoveRanksDBRequest( 
-			rankCodes: map['RankCodes'].cast<String>().toList(),
+			rankCodes: map['RankCodes'] != null ? map['RankCodes'].cast<String>().toList() : null,
 		);
 	}
 
@@ -172,7 +79,7 @@ class UpdateRanksDBRequest {
 
 	factory UpdateRanksDBRequest.fromJson(Map<String, dynamic> map) {
 		return UpdateRanksDBRequest( 
-			ranks: map['Ranks'].map((e)=>TableDataItem<RankDTO>.fromJson(e as Map<String,dynamic>)).toList(),
+			ranks: map['Ranks'] != null ? map['Ranks'].map((e)=>TableDataItem<RankDTO>.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
 	}
 
@@ -185,4 +92,3 @@ class UpdateRanksDBRequest {
 }
 
 
-

lib/services/region.dart

@@ -5,6 +5,7 @@ import 'package:fis_common/json_convert.dart';
 
 import 'region.m.dart';
 
+
 class RegionService extends JsonRpcClientBase {
 	RegionService(
 		String host, {

lib/services/region.m.dart

@@ -1,30 +1,4 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
+import 'device.m.dart';
 
 class RegionDTO extends BaseDTO{
 	String? regionVersion;
@@ -91,4 +65,3 @@ class GetRegionsRequest {
 }
 
 
-

lib/services/remedical.dart

@@ -3,6 +3,7 @@ import 'dart:core';
 import 'package:fis_jsonrpc/client_base.dart';
 
 
+
 class RemedicalService extends JsonRpcClientBase {
 	RemedicalService(
 		String host, {

lib/services/role.dart

@@ -5,6 +5,7 @@ import 'package:fis_common/json_convert.dart';
 
 import 'role.m.dart';
 
+
 class RoleService extends JsonRpcClientBase {
 	RoleService(
 		String host, {

lib/services/role.m.dart

@@ -1,30 +1,5 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'authentication.m.dart';
 
 enum RoleShowTypeEnum {
 	NotShow,
@@ -104,44 +79,6 @@ class RoleDTO extends BaseDTO{
 	}
 }
 
-class BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class TokenRequest extends BaseRequest{
-	String? token;
-
-	TokenRequest({
-		this.token,
-	}) : super(
-		);
-
-	factory TokenRequest.fromJson(Map<String, dynamic> map) {
-		return TokenRequest( 
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(token != null)
-			map['Token'] = token;
-		return map;
-	}
-}
-
 class GetRoleByCodeRequest extends TokenRequest{
 	String? roleCode;
 
@@ -218,4 +155,3 @@ class FindAuthenticationRolesRequest extends TokenRequest{
 }
 
 
-

lib/services/roleDB.dart

@@ -5,6 +5,10 @@ import 'package:fis_common/json_convert.dart';
 
 import 'roleDB.m.dart';
 
+import 'device.m.dart';
+import 'role.m.dart';
+
+
 class RoleDBService extends JsonRpcClientBase {
 	RoleDBService(
 		String host, {

lib/services/roleDB.m.dart

@@ -1,141 +1,7 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-import 'package:fis_common/json_convert.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
-
-enum RoleShowTypeEnum {
-	NotShow,
-	ISShow,
-}
-
-enum RoleQualificationEnum {
-	NoNeed,
-	ID,
-	DocLicense,
-	Both,
-}
-
-class RoleDTO extends BaseDTO{
-	String? roleCode;
-	String? roleName;
-	RoleShowTypeEnum roleShowType;
-	String? description;
-	String? iConUrl;
-	String? colorStart;
-	String? colorEnd;
-	RoleQualificationEnum roleQualification;
-	String? userGroupCode;
-
-	RoleDTO({
-		this.roleCode,
-		this.roleName,
-		this.roleShowType = RoleShowTypeEnum.NotShow,
-		this.description,
-		this.iConUrl,
-		this.colorStart,
-		this.colorEnd,
-		this.roleQualification = RoleQualificationEnum.NoNeed,
-		this.userGroupCode,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory RoleDTO.fromJson(Map<String, dynamic> map) {
-		return RoleDTO( 
-			roleCode: map['RoleCode'],
-			roleName: map['RoleName'],
-			roleShowType: RoleShowTypeEnum.values.firstWhere((e) => e.index == map['RoleShowType']),
-			description: map['Description'],
-			iConUrl: map['IConUrl'],
-			colorStart: map['ColorStart'],
-			colorEnd: map['ColorEnd'],
-			roleQualification: RoleQualificationEnum.values.firstWhere((e) => e.index == map['RoleQualification']),
-			userGroupCode: map['UserGroupCode'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(roleCode != null)
-			map['RoleCode'] = roleCode;
-		if(roleName != null)
-			map['RoleName'] = roleName;
-		map['RoleShowType'] = roleShowType.index;
-		if(description != null)
-			map['Description'] = description;
-		if(iConUrl != null)
-			map['IConUrl'] = iConUrl;
-		if(colorStart != null)
-			map['ColorStart'] = colorStart;
-		if(colorEnd != null)
-			map['ColorEnd'] = colorEnd;
-		map['RoleQualification'] = roleQualification.index;
-		if(userGroupCode != null)
-			map['UserGroupCode'] = userGroupCode;
-		return map;
-	}
-}
-
-class TableDataItem<T> {
-	RoleDTO? data;
-	Map<String,String>? platformDatas;
-	String? extensionData;
-
-	TableDataItem({
-		this.data,
-		this.platformDatas,
-		this.extensionData,
-	});
-
-	factory TableDataItem.fromJson(Map<String, dynamic> map) {
-		return TableDataItem( 
-			data: map['Data'],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
-			extensionData: map['ExtensionData'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(data != null)
-			map['Data'] = data;
-		if(platformDatas != null)
-			map['PlatformDatas'] = platformDatas;
-		if(extensionData != null)
-			map['ExtensionData'] = extensionData;
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'role.m.dart';
+import 'adminDB.m.dart';
+import 'authentication.m.dart';
 
 class CreateRoleDBRequest extends TableDataItem<RoleDTO>{
 	RoleDTO? ;
@@ -153,7 +19,7 @@ class CreateRoleDBRequest extends TableDataItem<RoleDTO>{
 	factory CreateRoleDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreateRoleDBRequest( 
 			: map[''],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
+			platformDatas: map['PlatformDatas'] != null ? map['PlatformDatas'].cast<String,String>() : null,
 			extensionData: map['ExtensionData'],
 		);
 	}
@@ -166,93 +32,4 @@ class CreateRoleDBRequest extends TableDataItem<RoleDTO>{
 	}
 }
 
-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 BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class PageRequest extends BaseRequest{
-	int currentPage;
-	int pageSize;
-	Map<String,String>? filter;
-	bool isFuzzy;
-
-	PageRequest({
-		this.currentPage = 0,
-		this.pageSize = 0,
-		this.filter,
-		this.isFuzzy = false,
-	}) : super(
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			currentPage: map['CurrentPage'],
-			pageSize: map['PageSize'],
-			filter: map['Filter'].cast<String,String>(),
-			isFuzzy: map['IsFuzzy'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['CurrentPage'] = currentPage;
-		map['PageSize'] = pageSize;
-		if(filter != null)
-			map['Filter'] = filter;
-		map['IsFuzzy'] = isFuzzy;
-		return map;
-	}
-}
-
-
 

lib/services/sMS.dart

@@ -3,6 +3,7 @@ import 'dart:core';
 import 'package:fis_jsonrpc/client_base.dart';
 
 
+
 class SMSService extends JsonRpcClientBase {
 	SMSService(
 		String host, {

lib/services/storage.dart

@@ -3,6 +3,7 @@ import 'dart:core';
 import 'package:fis_jsonrpc/client_base.dart';
 
 
+
 class StorageService extends JsonRpcClientBase {
 	StorageService(
 		String host, {

lib/services/storageDB.dart

@@ -5,6 +5,7 @@ import 'package:fis_common/json_convert.dart';
 
 import 'storageDB.m.dart';
 
+
 class StorageDBService extends JsonRpcClientBase {
 	StorageDBService(
 		String host, {

lib/services/storageDB.m.dart

@@ -1,30 +1,4 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
+import 'device.m.dart';
 
 class StorageInfoDTO extends BaseDTO{
 	String? token;
@@ -65,4 +39,3 @@ class StorageInfoDTO extends BaseDTO{
 }
 
 
-

lib/services/user.dart

@@ -5,6 +5,7 @@ import 'package:fis_common/json_convert.dart';
 
 import 'user.m.dart';
 
+
 class UserService extends JsonRpcClientBase {
 	UserService(
 		String host, {

lib/services/user.m.dart

@@ -1,45 +1,14 @@
-import 'package:fis_jsonrpc/utils.dart';
+import 'device.m.dart';
+import 'identityApply.m.dart';
+import 'authentication.m.dart';
 
 import 'package:fis_common/json_convert.dart';
 
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
-
 enum UserInfoStateEnum {
 	Nonactivated,
 	Activated,
 }
 
-enum ApplyStateEnum {
-	NotApply,
-	Applying,
-	Refused,
-	Passed,
-}
-
 class UserDTO extends BaseDTO{
 	String? userCode;
 	String? userName;
@@ -97,14 +66,14 @@ class UserDTO extends BaseDTO{
 			headImageUrl: map['HeadImageUrl'],
 			organizationCode: map['OrganizationCode'],
 			rootOrganizationCode: map['RootOrganizationCode'],
-			authorityGroups: map['AuthorityGroups'].cast<String>().toList(),
-			bindDevices: map['BindDevices'].cast<String>().toList(),
+			authorityGroups: map['AuthorityGroups'] != null ? map['AuthorityGroups'].cast<String>().toList() : null,
+			bindDevices: map['BindDevices'] != null ? map['BindDevices'].cast<String>().toList() : null,
 			lastIP: map['LastIP'],
 			logintimes: map['Logintimes'],
 			userState: UserInfoStateEnum.values.firstWhere((e) => e.index == map['UserState']),
-			roleCodes: map['RoleCodes'].cast<String>().toList(),
-			rankCodes: map['RankCodes'].cast<String>().toList(),
-			positionCodes: map['PositionCodes'].cast<String>().toList(),
+			roleCodes: map['RoleCodes'] != null ? map['RoleCodes'].cast<String>().toList() : null,
+			rankCodes: map['RankCodes'] != null ? map['RankCodes'].cast<String>().toList() : null,
+			positionCodes: map['PositionCodes'] != null ? map['PositionCodes'].cast<String>().toList() : null,
 			applyState: ApplyStateEnum.values.firstWhere((e) => e.index == map['ApplyState']),
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
@@ -150,44 +119,6 @@ class UserDTO extends BaseDTO{
 	}
 }
 
-class BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class TokenRequest extends BaseRequest{
-	String? token;
-
-	TokenRequest({
-		this.token,
-	}) : super(
-		);
-
-	factory TokenRequest.fromJson(Map<String, dynamic> map) {
-		return TokenRequest( 
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(token != null)
-			map['Token'] = token;
-		return map;
-	}
-}
-
 class GetUserInfoRequest extends TokenRequest{
 
 	GetUserInfoRequest({
@@ -271,14 +202,14 @@ class AlterUserInfoRequest extends UserDTO{
 			headImageUrl: map['HeadImageUrl'],
 			organizationCode: map['OrganizationCode'],
 			rootOrganizationCode: map['RootOrganizationCode'],
-			authorityGroups: map['AuthorityGroups'].cast<String>().toList(),
-			bindDevices: map['BindDevices'].cast<String>().toList(),
+			authorityGroups: map['AuthorityGroups'] != null ? map['AuthorityGroups'].cast<String>().toList() : null,
+			bindDevices: map['BindDevices'] != null ? map['BindDevices'].cast<String>().toList() : null,
 			lastIP: map['LastIP'],
 			logintimes: map['Logintimes'],
 			userState: UserInfoStateEnum.values.firstWhere((e) => e.index == map['UserState']),
-			roleCodes: map['RoleCodes'].cast<String>().toList(),
-			rankCodes: map['RankCodes'].cast<String>().toList(),
-			positionCodes: map['PositionCodes'].cast<String>().toList(),
+			roleCodes: map['RoleCodes'] != null ? map['RoleCodes'].cast<String>().toList() : null,
+			rankCodes: map['RankCodes'] != null ? map['RankCodes'].cast<String>().toList() : null,
+			positionCodes: map['PositionCodes'] != null ? map['PositionCodes'].cast<String>().toList() : null,
 			applyState: ApplyStateEnum.values.firstWhere((e) => e.index == map['ApplyState']),
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
@@ -347,7 +278,7 @@ class RemoveUsersFromOrganizationRequest extends TokenRequest{
 
 	factory RemoveUsersFromOrganizationRequest.fromJson(Map<String, dynamic> map) {
 		return RemoveUsersFromOrganizationRequest( 
-			userCodes: map['UserCodes'].cast<String>().toList(),
+			userCodes: map['UserCodes'] != null ? map['UserCodes'].cast<String>().toList() : null,
 			token: map['Token'],
 		);
 	}
@@ -381,9 +312,9 @@ class SetUserOrganizationInfoRequest extends TokenRequest{
 	factory SetUserOrganizationInfoRequest.fromJson(Map<String, dynamic> map) {
 		return SetUserOrganizationInfoRequest( 
 			userCode: map['UserCode'],
-			roleCodes: map['RoleCodes'].cast<String>().toList(),
-			rankCodes: map['RankCodes'].cast<String>().toList(),
-			positionCodes: map['PositionCodes'].cast<String>().toList(),
+			roleCodes: map['RoleCodes'] != null ? map['RoleCodes'].cast<String>().toList() : null,
+			rankCodes: map['RankCodes'] != null ? map['RankCodes'].cast<String>().toList() : null,
+			positionCodes: map['PositionCodes'] != null ? map['PositionCodes'].cast<String>().toList() : null,
 			organizationCode: map['OrganizationCode'],
 			token: map['Token'],
 		);
@@ -465,14 +396,14 @@ class AlterPersonInfoRequest extends UserDTO{
 			headImageUrl: map['HeadImageUrl'],
 			organizationCode: map['OrganizationCode'],
 			rootOrganizationCode: map['RootOrganizationCode'],
-			authorityGroups: map['AuthorityGroups'].cast<String>().toList(),
-			bindDevices: map['BindDevices'].cast<String>().toList(),
+			authorityGroups: map['AuthorityGroups'] != null ? map['AuthorityGroups'].cast<String>().toList() : null,
+			bindDevices: map['BindDevices'] != null ? map['BindDevices'].cast<String>().toList() : null,
 			lastIP: map['LastIP'],
 			logintimes: map['Logintimes'],
 			userState: UserInfoStateEnum.values.firstWhere((e) => e.index == map['UserState']),
-			roleCodes: map['RoleCodes'].cast<String>().toList(),
-			rankCodes: map['RankCodes'].cast<String>().toList(),
-			positionCodes: map['PositionCodes'].cast<String>().toList(),
+			roleCodes: map['RoleCodes'] != null ? map['RoleCodes'].cast<String>().toList() : null,
+			rankCodes: map['RankCodes'] != null ? map['RankCodes'].cast<String>().toList() : null,
+			positionCodes: map['PositionCodes'] != null ? map['PositionCodes'].cast<String>().toList() : null,
 			applyState: ApplyStateEnum.values.firstWhere((e) => e.index == map['ApplyState']),
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
@@ -517,7 +448,7 @@ class ShareDeviceUserDTO extends BaseDTO{
 			fullName: map['FullName'],
 			phone: map['Phone'],
 			headImageUrl: map['HeadImageUrl'],
-			rankNames: map['RankNames'].cast<String>().toList(),
+			rankNames: map['RankNames'] != null ? map['RankNames'].cast<String>().toList() : null,
 			rootOrganizationCode: map['RootOrganizationCode'],
 			rootOrganizationName: map['RootOrganizationName'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
@@ -583,34 +514,6 @@ class PageResult<T> {
 	}
 }
 
-class PageRequest extends TokenRequest{
-	int pageIndex;
-	int pageSize;
-
-	PageRequest({
-		this.pageIndex = 0,
-		this.pageSize = 0,
-		String? token,
-	}) : super(
-			token: token,
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			pageIndex: map['PageIndex'],
-			pageSize: map['PageSize'],
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['PageIndex'] = pageIndex;
-		map['PageSize'] = pageSize;
-		return map;
-	}
-}
-
 class GetShareDeviceUsersPageRequest extends PageRequest{
 	String? deviceCode;
 
@@ -643,4 +546,3 @@ class GetShareDeviceUsersPageRequest extends PageRequest{
 }
 
 
-

lib/services/userAuthorityGroupsDB.dart

@@ -5,6 +5,9 @@ import 'package:fis_common/json_convert.dart';
 
 import 'userAuthorityGroupsDB.m.dart';
 
+import 'device.m.dart';
+
+
 class UserAuthorityGroupsDBService extends JsonRpcClientBase {
 	UserAuthorityGroupsDBService(
 		String host, {

lib/services/userAuthorityGroupsDB.m.dart

@@ -1,32 +1,6 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-import 'package:fis_common/json_convert.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
+import 'device.m.dart';
+import 'adminDB.m.dart';
+import 'authentication.m.dart';
 
 class UserAuthorityGroupDTO extends BaseDTO{
 	String? userGroupCode;
@@ -52,8 +26,8 @@ class UserAuthorityGroupDTO extends BaseDTO{
 		return UserAuthorityGroupDTO( 
 			userGroupCode: map['UserGroupCode'],
 			description: map['Description'],
-			adminCodes: map['AdminCodes'].cast<String>().toList(),
-			features: map['Features'].cast<String>().toList(),
+			adminCodes: map['AdminCodes'] != null ? map['AdminCodes'].cast<String>().toList() : null,
+			features: map['Features'] != null ? map['Features'].cast<String>().toList() : null,
 			createAdmin: map['CreateAdmin'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
@@ -76,37 +50,6 @@ class UserAuthorityGroupDTO extends BaseDTO{
 	}
 }
 
-class TableDataItem<T> {
-	UserAuthorityGroupDTO? data;
-	Map<String,String>? platformDatas;
-	String? extensionData;
-
-	TableDataItem({
-		this.data,
-		this.platformDatas,
-		this.extensionData,
-	});
-
-	factory TableDataItem.fromJson(Map<String, dynamic> map) {
-		return TableDataItem( 
-			data: map['Data'],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
-			extensionData: map['ExtensionData'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(data != null)
-			map['Data'] = data;
-		if(platformDatas != null)
-			map['PlatformDatas'] = platformDatas;
-		if(extensionData != null)
-			map['ExtensionData'] = extensionData;
-		return map;
-	}
-}
-
 class CreateFrontAuthorityGroupsDBRequest extends TableDataItem<UserAuthorityGroupDTO>{
 	UserAuthorityGroupDTO? ;
 
@@ -123,7 +66,7 @@ class CreateFrontAuthorityGroupsDBRequest extends TableDataItem<UserAuthorityGro
 	factory CreateFrontAuthorityGroupsDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreateFrontAuthorityGroupsDBRequest( 
 			: map[''],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
+			platformDatas: map['PlatformDatas'] != null ? map['PlatformDatas'].cast<String,String>() : null,
 			extensionData: map['ExtensionData'],
 		);
 	}
@@ -136,93 +79,4 @@ class CreateFrontAuthorityGroupsDBRequest extends TableDataItem<UserAuthorityGro
 	}
 }
 
-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 BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class PageRequest extends BaseRequest{
-	int currentPage;
-	int pageSize;
-	Map<String,String>? filter;
-	bool isFuzzy;
-
-	PageRequest({
-		this.currentPage = 0,
-		this.pageSize = 0,
-		this.filter,
-		this.isFuzzy = false,
-	}) : super(
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			currentPage: map['CurrentPage'],
-			pageSize: map['PageSize'],
-			filter: map['Filter'].cast<String,String>(),
-			isFuzzy: map['IsFuzzy'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['CurrentPage'] = currentPage;
-		map['PageSize'] = pageSize;
-		if(filter != null)
-			map['Filter'] = filter;
-		map['IsFuzzy'] = isFuzzy;
-		return map;
-	}
-}
-
-
 

lib/services/userDB.dart

@@ -5,6 +5,10 @@ import 'package:fis_common/json_convert.dart';
 
 import 'userDB.m.dart';
 
+import 'device.m.dart';
+import 'user.m.dart';
+
+
 class UserDBService extends JsonRpcClientBase {
 	UserDBService(
 		String host, {

lib/services/userDB.m.dart

@@ -1,44 +1,9 @@
-import 'package:fis_jsonrpc/utils.dart';
-
-import 'package:fis_common/json_convert.dart';
-
-class BaseDTO {
-	DateTime? createTime;
-	DateTime? updateTime;
-
-	BaseDTO({
-		this.createTime,
-		this.updateTime,
-	});
-
-	factory BaseDTO.fromJson(Map<String, dynamic> map) {
-		return BaseDTO( 
-			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(createTime != null)
-			map['CreateTime'] = JsonRpcUtils.dateFormat(createTime!);
-		if(updateTime != null)
-			map['UpdateTime'] = JsonRpcUtils.dateFormat(updateTime!);
-		return map;
-	}
-}
-
-enum UserInfoStateEnum {
-	Nonactivated,
-	Activated,
-}
-
-enum ApplyStateEnum {
-	NotApply,
-	Applying,
-	Refused,
-	Passed,
-}
+import 'device.m.dart';
+import 'user.m.dart';
+import 'identityApply.m.dart';
+import 'adminDB.m.dart';
+import 'authentication.m.dart';
+import 'organization.m.dart';
 
 class UserPasswordDTO extends BaseDTO{
 	String? userCode;
@@ -100,14 +65,14 @@ class UserPasswordDTO extends BaseDTO{
 			headImageUrl: map['HeadImageUrl'],
 			organizationCode: map['OrganizationCode'],
 			rootOrganizationCode: map['RootOrganizationCode'],
-			authorityGroups: map['AuthorityGroups'].cast<String>().toList(),
-			bindDevices: map['BindDevices'].cast<String>().toList(),
+			authorityGroups: map['AuthorityGroups'] != null ? map['AuthorityGroups'].cast<String>().toList() : null,
+			bindDevices: map['BindDevices'] != null ? map['BindDevices'].cast<String>().toList() : null,
 			lastIP: map['LastIP'],
 			logintimes: map['Logintimes'],
 			userState: UserInfoStateEnum.values.firstWhere((e) => e.index == map['UserState']),
-			roleCodes: map['RoleCodes'].cast<String>().toList(),
-			rankCodes: map['RankCodes'].cast<String>().toList(),
-			positionCodes: map['PositionCodes'].cast<String>().toList(),
+			roleCodes: map['RoleCodes'] != null ? map['RoleCodes'].cast<String>().toList() : null,
+			rankCodes: map['RankCodes'] != null ? map['RankCodes'].cast<String>().toList() : null,
+			positionCodes: map['PositionCodes'] != null ? map['PositionCodes'].cast<String>().toList() : null,
 			applyState: ApplyStateEnum.values.firstWhere((e) => e.index == map['ApplyState']),
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
@@ -155,37 +120,6 @@ class UserPasswordDTO extends BaseDTO{
 	}
 }
 
-class TableDataItem<T> {
-	UserPasswordDTO? data;
-	Map<String,String>? platformDatas;
-	String? extensionData;
-
-	TableDataItem({
-		this.data,
-		this.platformDatas,
-		this.extensionData,
-	});
-
-	factory TableDataItem.fromJson(Map<String, dynamic> map) {
-		return TableDataItem( 
-			data: map['Data'],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
-			extensionData: map['ExtensionData'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(data != null)
-			map['Data'] = data;
-		if(platformDatas != null)
-			map['PlatformDatas'] = platformDatas;
-		if(extensionData != null)
-			map['ExtensionData'] = extensionData;
-		return map;
-	}
-}
-
 class CreateUserInfoDBRequest extends TableDataItem<UserPasswordDTO>{
 	UserPasswordDTO? ;
 
@@ -202,7 +136,7 @@ class CreateUserInfoDBRequest extends TableDataItem<UserPasswordDTO>{
 	factory CreateUserInfoDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreateUserInfoDBRequest( 
 			: map[''],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
+			platformDatas: map['PlatformDatas'] != null ? map['PlatformDatas'].cast<String,String>() : null,
 			extensionData: map['ExtensionData'],
 		);
 	}
@@ -215,204 +149,6 @@ class CreateUserInfoDBRequest extends TableDataItem<UserPasswordDTO>{
 	}
 }
 
-class UserDTO extends BaseDTO{
-	String? userCode;
-	String? userName;
-	String? phone;
-	String? email;
-	String? nickName;
-	String? fullName;
-	String? headImageUrl;
-	String? organizationCode;
-	String? rootOrganizationCode;
-	List<String>? authorityGroups;
-	List<String>? bindDevices;
-	String? lastIP;
-	int logintimes;
-	UserInfoStateEnum userState;
-	List<String>? roleCodes;
-	List<String>? rankCodes;
-	List<String>? positionCodes;
-	ApplyStateEnum applyState;
-
-	UserDTO({
-		this.userCode,
-		this.userName,
-		this.phone,
-		this.email,
-		this.nickName,
-		this.fullName,
-		this.headImageUrl,
-		this.organizationCode,
-		this.rootOrganizationCode,
-		this.authorityGroups,
-		this.bindDevices,
-		this.lastIP,
-		this.logintimes = 0,
-		this.userState = UserInfoStateEnum.Nonactivated,
-		this.roleCodes,
-		this.rankCodes,
-		this.positionCodes,
-		this.applyState = ApplyStateEnum.NotApply,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory UserDTO.fromJson(Map<String, dynamic> map) {
-		return UserDTO( 
-			userCode: map['UserCode'],
-			userName: map['UserName'],
-			phone: map['Phone'],
-			email: map['Email'],
-			nickName: map['NickName'],
-			fullName: map['FullName'],
-			headImageUrl: map['HeadImageUrl'],
-			organizationCode: map['OrganizationCode'],
-			rootOrganizationCode: map['RootOrganizationCode'],
-			authorityGroups: map['AuthorityGroups'].cast<String>().toList(),
-			bindDevices: map['BindDevices'].cast<String>().toList(),
-			lastIP: map['LastIP'],
-			logintimes: map['Logintimes'],
-			userState: UserInfoStateEnum.values.firstWhere((e) => e.index == map['UserState']),
-			roleCodes: map['RoleCodes'].cast<String>().toList(),
-			rankCodes: map['RankCodes'].cast<String>().toList(),
-			positionCodes: map['PositionCodes'].cast<String>().toList(),
-			applyState: ApplyStateEnum.values.firstWhere((e) => e.index == map['ApplyState']),
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(userCode != null)
-			map['UserCode'] = userCode;
-		if(userName != null)
-			map['UserName'] = userName;
-		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(headImageUrl != null)
-			map['HeadImageUrl'] = headImageUrl;
-		if(organizationCode != null)
-			map['OrganizationCode'] = organizationCode;
-		if(rootOrganizationCode != null)
-			map['RootOrganizationCode'] = rootOrganizationCode;
-		if(authorityGroups != null)
-			map['AuthorityGroups'] = authorityGroups;
-		if(bindDevices != null)
-			map['BindDevices'] = bindDevices;
-		if(lastIP != null)
-			map['LastIP'] = lastIP;
-		map['Logintimes'] = logintimes;
-		map['UserState'] = userState.index;
-		if(roleCodes != null)
-			map['RoleCodes'] = roleCodes;
-		if(rankCodes != null)
-			map['RankCodes'] = rankCodes;
-		if(positionCodes != null)
-			map['PositionCodes'] = positionCodes;
-		map['ApplyState'] = applyState.index;
-		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 BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class PageRequest extends BaseRequest{
-	int currentPage;
-	int pageSize;
-	Map<String,String>? filter;
-	bool isFuzzy;
-
-	PageRequest({
-		this.currentPage = 0,
-		this.pageSize = 0,
-		this.filter,
-		this.isFuzzy = false,
-	}) : super(
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			currentPage: map['CurrentPage'],
-			pageSize: map['PageSize'],
-			filter: map['Filter'].cast<String,String>(),
-			isFuzzy: map['IsFuzzy'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['CurrentPage'] = currentPage;
-		map['PageSize'] = pageSize;
-		if(filter != null)
-			map['Filter'] = filter;
-		map['IsFuzzy'] = isFuzzy;
-		return map;
-	}
-}
-
 class UpdateUsersDBRequest {
 	List<TableDataItem<UserPasswordDTO>>? users;
 
@@ -422,7 +158,7 @@ class UpdateUsersDBRequest {
 
 	factory UpdateUsersDBRequest.fromJson(Map<String, dynamic> map) {
 		return UpdateUsersDBRequest( 
-			users: map['Users'].map((e)=>TableDataItem<UserPasswordDTO>.fromJson(e as Map<String,dynamic>)).toList(),
+			users: map['Users'] != null ? map['Users'].map((e)=>TableDataItem<UserPasswordDTO>.fromJson(e as Map<String,dynamic>)).toList() : null,
 		);
 	}
 
@@ -481,8 +217,8 @@ class BingDevicesToUsersRequest {
 
 	factory BingDevicesToUsersRequest.fromJson(Map<String, dynamic> map) {
 		return BingDevicesToUsersRequest( 
-			deviceCodes: map['DeviceCodes'].cast<String>().toList(),
-			userCodes: map['UserCodes'].cast<String>().toList(),
+			deviceCodes: map['DeviceCodes'] != null ? map['DeviceCodes'].cast<String>().toList() : null,
+			userCodes: map['UserCodes'] != null ? map['UserCodes'].cast<String>().toList() : null,
 		);
 	}
 
@@ -547,94 +283,6 @@ class ManageDeviceUserDTO {
 	}
 }
 
-class PageResult<T> {
-	int pageIndex;
-	int pageSize;
-	int totalCount;
-	List<T>? pageData;
-
-	PageResult({
-		this.pageIndex = 0,
-		this.pageSize = 0,
-		this.totalCount = 0,
-		this.pageData,
-	});
-
-	factory PageResult.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 PageResult( 
-			pageIndex: map['PageIndex'],
-			pageSize: map['PageSize'],
-			totalCount: map['TotalCount'],
-			pageData: pageDataList,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		map['PageIndex'] = pageIndex;
-		map['PageSize'] = pageSize;
-		map['TotalCount'] = totalCount;
-		if(pageData != null)
-			map['PageData'] = pageData;
-		return map;
-	}
-}
-
-class TokenRequest extends BaseRequest{
-	String? token;
-
-	TokenRequest({
-		this.token,
-	}) : super(
-		);
-
-	factory TokenRequest.fromJson(Map<String, dynamic> map) {
-		return TokenRequest( 
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(token != null)
-			map['Token'] = token;
-		return map;
-	}
-}
-
-class PageRequest extends TokenRequest{
-	int pageIndex;
-	int pageSize;
-
-	PageRequest({
-		this.pageIndex = 0,
-		this.pageSize = 0,
-		String? token,
-	}) : super(
-			token: token,
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			pageIndex: map['PageIndex'],
-			pageSize: map['PageSize'],
-			token: map['Token'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['PageIndex'] = pageIndex;
-		map['PageSize'] = pageSize;
-		return map;
-	}
-}
-
 class GetDeviceUserPagesRequest extends PageRequest{
 	String? deviceCode;
 	String? queryType;
@@ -731,166 +379,6 @@ class ManageOrganizationUserDTO {
 	}
 }
 
-class OrganizationBaseDTO extends BaseDTO{
-	String? organizationCode;
-	String? organizationName;
-
-	OrganizationBaseDTO({
-		this.organizationCode,
-		this.organizationName,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory OrganizationBaseDTO.fromJson(Map<String, dynamic> map) {
-		return OrganizationBaseDTO( 
-			organizationCode: map['OrganizationCode'],
-			organizationName: map['OrganizationName'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(organizationCode != null)
-			map['OrganizationCode'] = organizationCode;
-		if(organizationName != null)
-			map['OrganizationName'] = organizationName;
-		return map;
-	}
-}
-
-class OrganizationBasicDTO extends OrganizationBaseDTO{
-	String? regionCode;
-	String? parentCode;
-	String? logoUrl;
-
-	OrganizationBasicDTO({
-		this.regionCode,
-		this.parentCode,
-		this.logoUrl,
-		String? organizationCode,
-		String? organizationName,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			organizationCode: organizationCode,
-			organizationName: organizationName,
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory OrganizationBasicDTO.fromJson(Map<String, dynamic> map) {
-		return OrganizationBasicDTO( 
-			regionCode: map['RegionCode'],
-			parentCode: map['ParentCode'],
-			logoUrl: map['LogoUrl'],
-			organizationCode: map['OrganizationCode'],
-			organizationName: map['OrganizationName'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(regionCode != null)
-			map['RegionCode'] = regionCode;
-		if(parentCode != null)
-			map['ParentCode'] = parentCode;
-		if(logoUrl != null)
-			map['LogoUrl'] = logoUrl;
-		return map;
-	}
-}
-
-enum OrganizationTypeEnum {
-	Corporation,
-	Department,
-	Section,
-}
-
-enum OrganizationStateEnum {
-	WaitAudit,
-	Audited,
-	Rejected,
-}
-
-class OrganizationDTO extends OrganizationBasicDTO{
-	String? description;
-	String? rootCode;
-	OrganizationTypeEnum organizationType;
-	List<String>? authorityGroups;
-	String? nautica;
-	OrganizationStateEnum state;
-	List<String>? directors;
-
-	OrganizationDTO({
-		this.description,
-		this.rootCode,
-		this.organizationType = OrganizationTypeEnum.Corporation,
-		this.authorityGroups,
-		this.nautica,
-		this.state = OrganizationStateEnum.WaitAudit,
-		this.directors,
-		String? regionCode,
-		String? parentCode,
-		String? logoUrl,
-		String? organizationCode,
-		String? organizationName,
-		DateTime? createTime,
-		DateTime? updateTime,
-	}) : super(
-			regionCode: regionCode,
-			parentCode: parentCode,
-			logoUrl: logoUrl,
-			organizationCode: organizationCode,
-			organizationName: organizationName,
-			createTime: createTime,
-			updateTime: updateTime,
-		);
-
-	factory OrganizationDTO.fromJson(Map<String, dynamic> map) {
-		return OrganizationDTO( 
-			description: map['Description'],
-			rootCode: map['RootCode'],
-			organizationType: OrganizationTypeEnum.values.firstWhere((e) => e.index == map['OrganizationType']),
-			authorityGroups: map['AuthorityGroups'].cast<String>().toList(),
-			nautica: map['Nautica'],
-			state: OrganizationStateEnum.values.firstWhere((e) => e.index == map['State']),
-			directors: map['Directors'].cast<String>().toList(),
-			regionCode: map['RegionCode'],
-			parentCode: map['ParentCode'],
-			logoUrl: map['LogoUrl'],
-			organizationCode: map['OrganizationCode'],
-			organizationName: map['OrganizationName'],
-			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
-			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		if(description != null)
-			map['Description'] = description;
-		if(rootCode != null)
-			map['RootCode'] = rootCode;
-		map['OrganizationType'] = organizationType.index;
-		if(authorityGroups != null)
-			map['AuthorityGroups'] = authorityGroups;
-		if(nautica != null)
-			map['Nautica'] = nautica;
-		map['State'] = state.index;
-		if(directors != null)
-			map['Directors'] = directors;
-		return map;
-	}
-}
-
 class GetOrganizationUserPagesRequest extends PageRequest{
 	String? organizationCode;
 	String? queryType;
@@ -933,4 +421,3 @@ class GetOrganizationUserPagesRequest extends PageRequest{
 }
 
 
-

lib/services/userFeaturesDB.dart

@@ -5,6 +5,9 @@ import 'package:fis_common/json_convert.dart';
 
 import 'userFeaturesDB.m.dart';
 
+import 'device.m.dart';
+
+
 class UserFeaturesDBService extends JsonRpcClientBase {
 	UserFeaturesDBService(
 		String host, {

lib/services/userFeaturesDB.m.dart

@@ -1,4 +1,6 @@
-import 'package:fis_common/json_convert.dart';
+import 'adminDB.m.dart';
+import 'device.m.dart';
+import 'authentication.m.dart';
 
 class UserFeatureInfoDTO {
 	String? featureCode;
@@ -31,37 +33,6 @@ class UserFeatureInfoDTO {
 	}
 }
 
-class TableDataItem<T> {
-	UserFeatureInfoDTO? data;
-	Map<String,String>? platformDatas;
-	String? extensionData;
-
-	TableDataItem({
-		this.data,
-		this.platformDatas,
-		this.extensionData,
-	});
-
-	factory TableDataItem.fromJson(Map<String, dynamic> map) {
-		return TableDataItem( 
-			data: map['Data'],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
-			extensionData: map['ExtensionData'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		if(data != null)
-			map['Data'] = data;
-		if(platformDatas != null)
-			map['PlatformDatas'] = platformDatas;
-		if(extensionData != null)
-			map['ExtensionData'] = extensionData;
-		return map;
-	}
-}
-
 class CreateUserFeatureDBRequest extends TableDataItem<UserFeatureInfoDTO>{
 	UserFeatureInfoDTO? ;
 
@@ -78,7 +49,7 @@ class CreateUserFeatureDBRequest extends TableDataItem<UserFeatureInfoDTO>{
 	factory CreateUserFeatureDBRequest.fromJson(Map<String, dynamic> map) {
 		return CreateUserFeatureDBRequest( 
 			: map[''],
-			platformDatas: map['PlatformDatas'].cast<String,String>(),
+			platformDatas: map['PlatformDatas'] != null ? map['PlatformDatas'].cast<String,String>() : null,
 			extensionData: map['ExtensionData'],
 		);
 	}
@@ -91,93 +62,4 @@ class CreateUserFeatureDBRequest extends TableDataItem<UserFeatureInfoDTO>{
 	}
 }
 
-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 BaseRequest {
-
-	BaseRequest({
-	});
-
-	factory BaseRequest.fromJson(Map<String, dynamic> map) {
-		return BaseRequest( 
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = Map<String, dynamic>();
-		return map;
-	}
-}
-
-class PageRequest extends BaseRequest{
-	int currentPage;
-	int pageSize;
-	Map<String,String>? filter;
-	bool isFuzzy;
-
-	PageRequest({
-		this.currentPage = 0,
-		this.pageSize = 0,
-		this.filter,
-		this.isFuzzy = false,
-	}) : super(
-		);
-
-	factory PageRequest.fromJson(Map<String, dynamic> map) {
-		return PageRequest( 
-			currentPage: map['CurrentPage'],
-			pageSize: map['PageSize'],
-			filter: map['Filter'].cast<String,String>(),
-			isFuzzy: map['IsFuzzy'],
-		);
-	}
-
-	Map<String, dynamic> toJson() {
-		final map = super.toJson();
-		map['CurrentPage'] = currentPage;
-		map['PageSize'] = pageSize;
-		if(filter != null)
-			map['Filter'] = filter;
-		map['IsFuzzy'] = isFuzzy;
-		return map;
-	}
-}
-
-