1、更新jsonrpc

lib/services/authentication.m.dart

@@ -58,6 +58,8 @@ enum AccountType {
 	US,
 	USBox,
 	ThirdParty,
+	Breath,
+	Oxygen,
 }
 
 enum Platform {
@@ -65,6 +67,7 @@ enum Platform {
 	Android,
 	Ios,
 	Linux,
+	SingleChip,
 }
 
 enum ProxyTypeEnum {
@@ -6307,7 +6310,7 @@ enum CustomerRpcCode {
 	OrganizationNotSet,
 	ReferralOrgNotBindSameParentOrg,
 	OrgNameRepeat,
-	placeHolder_6080,
+	UserRegisteredFail,
 	placeHolder_6081,
 	placeHolder_6082,
 	placeHolder_6083,

lib/services/login.dart

@@ -128,5 +128,11 @@ class LoginService extends JsonRpcClientBase {
 		return result;
 	}
 
+	Future<LoginResult> wXCommonSignUpAsync(CommonSignUpRequest request) async {
+		var rpcRst = await call("WXCommonSignUpAsync", request);
+		var result = LoginResult.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
 }
 

lib/services/login.m.dart

@@ -5,6 +5,7 @@ import 'liveConsultation.m.dart';
 enum LoginStateEnum {
 	Succeed,
 	PasswordIncorrect,
+	SignOrLoginFail,
 }
 
 class LoginResult {
@@ -13,6 +14,7 @@ class LoginResult {
 	int? lockRemainingTimes;
 	bool passwordExpired;
 	String? accountName;
+	String? openId;
 
 	LoginResult({
 		this.loginState = LoginStateEnum.Succeed,
@@ -20,6 +22,7 @@ class LoginResult {
 		this.lockRemainingTimes,
 		this.passwordExpired = false,
 		this.accountName,
+		this.openId,
 	});
 
 	factory LoginResult.fromJson(Map<String, dynamic> map) {
@@ -29,6 +32,7 @@ class LoginResult {
 			lockRemainingTimes: map['LockRemainingTimes'],
 			passwordExpired: map['PasswordExpired'],
 			accountName: map['AccountName'],
+			openId: map['OpenId'],
 		);
 	}
 
@@ -45,6 +49,9 @@ class LoginResult {
 		if (accountName != null) {
 			map['AccountName'] = accountName;
 		}
+		if (openId != null) {
+			map['OpenId'] = openId;
+		}
 		return map;
 	}
 }
@@ -129,13 +136,19 @@ class CommonSignUpRequest {
 	String? anyAccount;
 	String? anyCode;
 	String? password;
+	String? openId;
 	Map<String,String>? headerMap;
+	Platform platform;
+	String? wXPhoneAnyCode;
 
 	CommonSignUpRequest({
 		this.anyAccount,
 		this.anyCode,
 		this.password,
+		this.openId,
 		this.headerMap,
+		this.platform = Platform.Windows,
+		this.wXPhoneAnyCode,
 	});
 
 	factory CommonSignUpRequest.fromJson(Map<String, dynamic> map) {
@@ -143,7 +156,10 @@ class CommonSignUpRequest {
 			anyAccount: map['AnyAccount'],
 			anyCode: map['AnyCode'],
 			password: map['Password'],
+			openId: map['OpenId'],
 			headerMap: map['HeaderMap']?.cast<String,String>(),
+			platform: Platform.values.firstWhere((e) => e.index == map['Platform']),
+			wXPhoneAnyCode: map['WXPhoneAnyCode'],
 		);
 	}
 
@@ -158,9 +174,16 @@ class CommonSignUpRequest {
 		if (password != null) {
 			map['Password'] = password;
 		}
+		if (openId != null) {
+			map['OpenId'] = openId;
+		}
 		if (headerMap != null) {
 			map['HeaderMap'] = headerMap;
 		}
+		map['Platform'] = platform.index;
+		if (wXPhoneAnyCode != null) {
+			map['WXPhoneAnyCode'] = wXPhoneAnyCode;
+		}
 		return map;
 	}
 }
@@ -371,12 +394,18 @@ class ModifyPasswordRequest extends CommonSignUpRequest{
 		String? anyAccount,
 		String? anyCode,
 		String? password,
+		String? openId,
 		Map<String,String>? headerMap,
+		Platform platform = Platform.Windows,
+		String? wXPhoneAnyCode,
 	}) : super(
 			anyAccount: anyAccount,
 			anyCode: anyCode,
 			password: password,
+			openId: openId,
 			headerMap: headerMap,
+			platform: platform,
+			wXPhoneAnyCode: wXPhoneAnyCode,
 		);
 
 	factory ModifyPasswordRequest.fromJson(Map<String, dynamic> map) {
@@ -386,7 +415,10 @@ class ModifyPasswordRequest extends CommonSignUpRequest{
 			anyAccount: map['AnyAccount'],
 			anyCode: map['AnyCode'],
 			password: map['Password'],
+			openId: map['OpenId'],
 			headerMap: map['HeaderMap']?.cast<String,String>(),
+			platform: Platform.values.firstWhere((e) => e.index == map['Platform']),
+			wXPhoneAnyCode: map['WXPhoneAnyCode'],
 		);
 	}
 

lib/services/notification.m.dart

@@ -158,6 +158,7 @@ enum LoginSource {
 	Pad,
 	Web,
 	US,
+	WX,
 }
 
 class ApplyProbeApplicationSettingNotification extends NotificationDTO{

lib/services/vinnoIOT.dart

@@ -6,6 +6,7 @@ import 'package:fis_common/json_convert.dart';
 import 'vinnoIOT.m.dart';
 
 import 'liveConsultation.m.dart';
+import 'connect.m.dart';
 
 
 class VinnoIOTService extends JsonRpcClientBase {
@@ -33,6 +34,7 @@ class VinnoIOTService extends JsonRpcClientBase {
 		FJsonConvert.setDecoder((map) => IOTDeviceVersionResult.fromJson(map));
 		FJsonConvert.setDecoder((map) => IOTDeviceBasicDataResult.fromJson(map));
 		FJsonConvert.setDecoder((map) => IOTDeviceBasicWeatherResult.fromJson(map));
+		FJsonConvert.setDecoder((map) => ConnectResult.fromJson(map));
 	}
 
 	Future<List<IOTDeviceCarouselsResult>> getCarousels(TokenRequest request) async {
@@ -146,5 +148,17 @@ class VinnoIOTService extends JsonRpcClientBase {
 		return result;
 	}
 
+	Future<ConnectResult> iOTDeviceConnectAsync(IOTDeviceConnectRequest request) async {
+		var rpcRst = await call("IOTDeviceConnectAsync", request);
+		var result = ConnectResult.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
+	Future<ConnectResult> checkDeviceTokenAsync(TokenRequest request) async {
+		var rpcRst = await call("CheckDeviceTokenAsync", request);
+		var result = ConnectResult.fromJson(rpcRst as Map<String, dynamic>);
+		return result;
+	}
+
 }
 

lib/services/vinnoIOT.m.dart

@@ -1,4 +1,5 @@
 import 'liveConsultation.m.dart';
+import 'connect.m.dart';
 
 import 'package:fis_jsonrpc/utils.dart';
 
@@ -1531,12 +1532,16 @@ class IOTDeviceRegisterRequest extends TokenRequest{
 	String? deviceSN;
 	String? deviceMac;
 	String? deviceKey;
+	String? name;
+	String? description;
 
 	IOTDeviceRegisterRequest({
 		this.deviceModel,
 		this.deviceSN,
 		this.deviceMac,
 		this.deviceKey,
+		this.name,
+		this.description,
 		String? token,
 	}) : super(
 			token: token,
@@ -1548,6 +1553,8 @@ class IOTDeviceRegisterRequest extends TokenRequest{
 			deviceSN: map['DeviceSN'],
 			deviceMac: map['DeviceMac'],
 			deviceKey: map['DeviceKey'],
+			name: map['Name'],
+			description: map['Description'],
 			token: map['Token'],
 		);
 	}
@@ -1562,6 +1569,10 @@ class IOTDeviceRegisterRequest extends TokenRequest{
 			map['DeviceMac'] = deviceMac;
 		if (deviceKey != null)
 			map['DeviceKey'] = deviceKey;
+		if (name != null)
+			map['Name'] = name;
+		if (description != null)
+			map['Description'] = description;
 		return map;
 	}
 }
@@ -1645,4 +1656,51 @@ class IOTWeatherRequest extends TokenRequest{
 	}
 }
 
+class IOTDeviceConnectRequest extends IOTDeviceRegisterRequest{
+	int deviceType;
+	String? iP;
+
+	IOTDeviceConnectRequest({
+		this.deviceType = 0,
+		this.iP,
+		String? deviceModel,
+		String? deviceSN,
+		String? deviceMac,
+		String? deviceKey,
+		String? name,
+		String? description,
+		String? token,
+	}) : super(
+			deviceModel: deviceModel,
+			deviceSN: deviceSN,
+			deviceMac: deviceMac,
+			deviceKey: deviceKey,
+			name: name,
+			description: description,
+			token: token,
+		);
+
+	factory IOTDeviceConnectRequest.fromJson(Map<String, dynamic> map) {
+		return IOTDeviceConnectRequest( 
+			deviceType: map['DeviceType'],
+			iP: map['IP'],
+			deviceModel: map['DeviceModel'],
+			deviceSN: map['DeviceSN'],
+			deviceMac: map['DeviceMac'],
+			deviceKey: map['DeviceKey'],
+			name: map['Name'],
+			description: map['Description'],
+			token: map['Token'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = super.toJson();
+		map['DeviceType'] = deviceType;
+		if (iP != null)
+			map['IP'] = iP;
+		return map;
+	}
+}
+
 

lib/services/vitalExam.dart

@@ -99,5 +99,11 @@ class VitalExamService extends JsonRpcClientBase {
 		return rpcRst;
 	}
 
+	Future<List<ExamDTO>> getExamListByPhysicalExamNumberAsync(GetExamListByPhysicalExamNumberRequest request) async {
+		var rpcRst = await call("GetExamListByPhysicalExamNumberAsync", request);
+		var result = (rpcRst as List).map((e)=>ExamDTO.fromJson(e as Map<String, dynamic>)).toList();
+		return result;
+	}
+
 }
 

lib/services/vitalExam.m.dart

@@ -14,6 +14,7 @@ class CreateExamRequest extends TokenRequest{
 	String? contractedDoctor;
 	String? examData;
 	String? templateCode;
+	String? physicalExamNumber;
 
 	CreateExamRequest({
 		this.code,
@@ -23,6 +24,7 @@ class CreateExamRequest extends TokenRequest{
 		this.contractedDoctor,
 		this.examData,
 		this.templateCode,
+		this.physicalExamNumber,
 		String? token,
 	}) : super(
 			token: token,
@@ -37,6 +39,7 @@ class CreateExamRequest extends TokenRequest{
 			contractedDoctor: map['ContractedDoctor'],
 			examData: map['ExamData'],
 			templateCode: map['TemplateCode'],
+			physicalExamNumber: map['PhysicalExamNumber'],
 			token: map['Token'],
 		);
 	}
@@ -57,6 +60,8 @@ class CreateExamRequest extends TokenRequest{
 			map['ExamData'] = examData;
 		if (templateCode != null)
 			map['TemplateCode'] = templateCode;
+		if (physicalExamNumber != null)
+			map['PhysicalExamNumber'] = physicalExamNumber;
 		return map;
 	}
 }
@@ -644,4 +649,26 @@ class UpdateExamByBatchNumberRequest extends TokenRequest{
 	}
 }
 
+class GetExamListByPhysicalExamNumberRequest {
+	String? physicalExamNumber;
+
+	GetExamListByPhysicalExamNumberRequest({
+		this.physicalExamNumber,
+	});
+
+	factory GetExamListByPhysicalExamNumberRequest.fromJson(Map<String, dynamic> map) {
+		return GetExamListByPhysicalExamNumberRequest( 
+			physicalExamNumber: map['PhysicalExamNumber'],
+		);
+	}
+
+	Map<String, dynamic> toJson() {
+		final map = Map<String, dynamic>();
+		if (physicalExamNumber != null) {
+			map['PhysicalExamNumber'] = physicalExamNumber;
+		}
+		return map;
+	}
+}
+
 

lib/services/vitalHealthExamBooking.m.dart

@@ -423,6 +423,7 @@ class AddRegiterInfoRequest {
 	String? phone;
 	String? adress;
 	String? orgUniqueCode;
+	String? organizationCode;
 
 	AddRegiterInfoRequest({
 		this.iDCardNo,
@@ -432,6 +433,7 @@ class AddRegiterInfoRequest {
 		this.phone,
 		this.adress,
 		this.orgUniqueCode,
+		this.organizationCode,
 	});
 
 	factory AddRegiterInfoRequest.fromJson(Map<String, dynamic> map) {
@@ -443,6 +445,7 @@ class AddRegiterInfoRequest {
 			phone: map['Phone'],
 			adress: map['Adress'],
 			orgUniqueCode: map['OrgUniqueCode'],
+			organizationCode: map['OrganizationCode'],
 		);
 	}
 
@@ -469,6 +472,9 @@ class AddRegiterInfoRequest {
 		if (orgUniqueCode != null) {
 			map['OrgUniqueCode'] = orgUniqueCode;
 		}
+		if (organizationCode != null) {
+			map['OrganizationCode'] = organizationCode;
+		}
 		return map;
 	}
 }
@@ -485,6 +491,7 @@ class UpdateRegiterInfoRequest extends AddRegiterInfoRequest{
 		String? phone,
 		String? adress,
 		String? orgUniqueCode,
+		String? organizationCode,
 	}) : super(
 			iDCardNo: iDCardNo,
 			name: name,
@@ -493,6 +500,7 @@ class UpdateRegiterInfoRequest extends AddRegiterInfoRequest{
 			phone: phone,
 			adress: adress,
 			orgUniqueCode: orgUniqueCode,
+			organizationCode: organizationCode,
 		);
 
 	factory UpdateRegiterInfoRequest.fromJson(Map<String, dynamic> map) {
@@ -505,6 +513,7 @@ class UpdateRegiterInfoRequest extends AddRegiterInfoRequest{
 			phone: map['Phone'],
 			adress: map['Adress'],
 			orgUniqueCode: map['OrgUniqueCode'],
+			organizationCode: map['OrganizationCode'],
 		);
 	}
 
@@ -532,6 +541,7 @@ class RegisterInfoDTO extends BaseDTO{
 	String? phone;
 	String? adress;
 	ExamStateEnum state;
+	String? organizationCode;
 
 	RegisterInfoDTO({
 		this.code,
@@ -543,6 +553,7 @@ class RegisterInfoDTO extends BaseDTO{
 		this.phone,
 		this.adress,
 		this.state = ExamStateEnum.Unchecked,
+		this.organizationCode,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -561,6 +572,7 @@ class RegisterInfoDTO extends BaseDTO{
 			phone: map['Phone'],
 			adress: map['Adress'],
 			state: ExamStateEnum.values.firstWhere((e) => e.index == map['State']),
+			organizationCode: map['OrganizationCode'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);
@@ -585,6 +597,8 @@ class RegisterInfoDTO extends BaseDTO{
 		if (adress != null)
 			map['Adress'] = adress;
 		map['State'] = state.index;
+		if (organizationCode != null)
+			map['OrganizationCode'] = organizationCode;
 		return map;
 	}
 }

lib/services/vitalOrganization.m.dart

@@ -121,6 +121,7 @@ class OrganizationDTO2 extends BaseDTO{
 	CustomTypeEnum customType;
 	List<String>? peripheralDeviceKeys;
 	String? dynamicParameter;
+	String? organizationUniqueCode;
 
 	OrganizationDTO2({
 		this.code,
@@ -142,6 +143,7 @@ class OrganizationDTO2 extends BaseDTO{
 		this.customType = CustomTypeEnum.General,
 		this.peripheralDeviceKeys,
 		this.dynamicParameter,
+		this.organizationUniqueCode,
 		DateTime? createTime,
 		DateTime? updateTime,
 	}) : super(
@@ -170,6 +172,7 @@ class OrganizationDTO2 extends BaseDTO{
 			customType: CustomTypeEnum.values.firstWhere((e) => e.index == map['CustomType']),
 			peripheralDeviceKeys: map['PeripheralDeviceKeys']?.cast<String>().toList(),
 			dynamicParameter: map['DynamicParameter'],
+			organizationUniqueCode: map['OrganizationUniqueCode'],
 			createTime: map['CreateTime'] != null ? DateTime.parse(map['CreateTime']) : null,
 			updateTime: map['UpdateTime'] != null ? DateTime.parse(map['UpdateTime']) : null,
 		);
@@ -214,6 +217,8 @@ class OrganizationDTO2 extends BaseDTO{
 			map['PeripheralDeviceKeys'] = peripheralDeviceKeys;
 		if (dynamicParameter != null)
 			map['DynamicParameter'] = dynamicParameter;
+		if (organizationUniqueCode != null)
+			map['OrganizationUniqueCode'] = organizationUniqueCode;
 		return map;
 	}
 }