Browse Source

修改数据解析问题;

maqiang 11 months ago
parent
commit
4224b24ebc

+ 7 - 2
lib/model/api_rsp.dart

@@ -1,8 +1,14 @@
1 1
 import 'package:json_annotation/json_annotation.dart';
2 2
 
3
+import 'num_converter.dart';
4
+import 'string_converter.dart';
5
+
3 6
 part 'api_rsp.g.dart';
4 7
 
5
-@JsonSerializable(genericArgumentFactories: true)
8
+@JsonSerializable(
9
+  genericArgumentFactories: true,
10
+  converters: [NumConverter(), StringConverter()],
11
+)
6 12
 class ApiRsp<T> {
7 13
   /*
8 14
   "code": 0,
@@ -27,5 +33,4 @@ class ApiRsp<T> {
27 33
       _$ApiRspFromJson<T>(json, fromJsonT);
28 34
 
29 35
   Map<String, dynamic> toJson(Object? Function(T value) toJsonT) => _$ApiRspToJson(this, toJsonT);
30
-
31 36
 }

+ 4 - 4
lib/model/api_rsp.g.dart

@@ -11,9 +11,9 @@ ApiRsp<T> _$ApiRspFromJson<T>(
11 11
   T Function(Object? json) fromJsonT,
12 12
 ) =>
13 13
     ApiRsp<T>(
14
-      code: json['code'] as num?,
14
+      code: const NumConverter().fromJson(json['code']),
15 15
       data: _$nullableGenericFromJson(json['data'], fromJsonT),
16
-      string: json['string'] as String?,
16
+      string: const StringConverter().fromJson(json['string']),
17 17
     );
18 18
 
19 19
 Map<String, dynamic> _$ApiRspToJson<T>(
@@ -21,9 +21,9 @@ Map<String, dynamic> _$ApiRspToJson<T>(
21 21
   Object? Function(T value) toJsonT,
22 22
 ) =>
23 23
     <String, dynamic>{
24
-      'code': instance.code,
24
+      'code': const NumConverter().toJson(instance.code),
25 25
       'data': _$nullableGenericToJson(instance.data, toJsonT),
26
-      'string': instance.string,
26
+      'string': const StringConverter().toJson(instance.string),
27 27
     };
28 28
 
29 29
 T? _$nullableGenericFromJson<T>(

+ 4 - 1
lib/model/rsp/login_rsp.dart

@@ -1,8 +1,11 @@
1 1
 import 'package:json_annotation/json_annotation.dart';
2 2
 
3
+import '../num_converter.dart';
4
+import '../string_converter.dart';
5
+
3 6
 part 'login_rsp.g.dart';
4 7
 
5
-@JsonSerializable()
8
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
6 9
 class LoginRsp {
7 10
   /*
8 11
     "userId": 1024,

+ 8 - 8
lib/model/rsp/login_rsp.g.dart

@@ -7,15 +7,15 @@ part of 'login_rsp.dart';
7 7
 // **************************************************************************
8 8
 
9 9
 LoginRsp _$LoginRspFromJson(Map<String, dynamic> json) => LoginRsp(
10
-      userId: json['userId'] as num?,
11
-      accessToken: json['accessToken'] as String?,
12
-      refreshToken: json['refreshToken'] as String?,
13
-      expiresTime: json['expiresTime'] as num?,
10
+      userId: const NumConverter().fromJson(json['userId']),
11
+      accessToken: const StringConverter().fromJson(json['accessToken']),
12
+      refreshToken: const StringConverter().fromJson(json['refreshToken']),
13
+      expiresTime: const NumConverter().fromJson(json['expiresTime']),
14 14
     );
15 15
 
16 16
 Map<String, dynamic> _$LoginRspToJson(LoginRsp instance) => <String, dynamic>{
17
-      'userId': instance.userId,
18
-      'accessToken': instance.accessToken,
19
-      'refreshToken': instance.refreshToken,
20
-      'expiresTime': instance.expiresTime,
17
+      'userId': const NumConverter().toJson(instance.userId),
18
+      'accessToken': const StringConverter().toJson(instance.accessToken),
19
+      'refreshToken': const StringConverter().toJson(instance.refreshToken),
20
+      'expiresTime': const NumConverter().toJson(instance.expiresTime),
21 21
     };

+ 2 - 2
lib/model/rsp/sample_task_rsp.dart

@@ -6,7 +6,7 @@ import '../../service/dict_service.dart';
6 6
 
7 7
 part 'sample_task_rsp.g.dart';
8 8
 
9
-@JsonSerializable()
9
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
10 10
 class SampleTaskListRsp {
11 11
   final num? total;
12 12
   final List<SampleTaskItem>? list;
@@ -295,7 +295,7 @@ class SampleTaskItem {
295 295
   }
296 296
 }
297 297
 
298
-@JsonSerializable()
298
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
299 299
 class UrlItem {
300 300
   final String? name;
301 301
   final String? url;

+ 6 - 6
lib/model/rsp/sample_task_rsp.g.dart

@@ -8,7 +8,7 @@ part of 'sample_task_rsp.dart';
8 8
 
9 9
 SampleTaskListRsp _$SampleTaskListRspFromJson(Map<String, dynamic> json) =>
10 10
     SampleTaskListRsp(
11
-      total: json['total'] as num?,
11
+      total: const NumConverter().fromJson(json['total']),
12 12
       list: (json['list'] as List<dynamic>?)
13 13
           ?.map((e) => SampleTaskItem.fromJson(e as Map<String, dynamic>))
14 14
           .toList(),
@@ -16,7 +16,7 @@ SampleTaskListRsp _$SampleTaskListRspFromJson(Map<String, dynamic> json) =>
16 16
 
17 17
 Map<String, dynamic> _$SampleTaskListRspToJson(SampleTaskListRsp instance) =>
18 18
     <String, dynamic>{
19
-      'total': instance.total,
19
+      'total': const NumConverter().toJson(instance.total),
20 20
       'list': instance.list,
21 21
     };
22 22
 
@@ -234,13 +234,13 @@ Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
234 234
     };
235 235
 
236 236
 UrlItem _$UrlItemFromJson(Map<String, dynamic> json) => UrlItem(
237
-      name: json['name'] as String?,
238
-      url: json['url'] as String?,
237
+      name: const StringConverter().fromJson(json['name']),
238
+      url: const StringConverter().fromJson(json['url']),
239 239
     );
240 240
 
241 241
 Map<String, dynamic> _$UrlItemToJson(UrlItem instance) => <String, dynamic>{
242
-      'name': instance.name,
243
-      'url': instance.url,
242
+      'name': const StringConverter().toJson(instance.name),
243
+      'url': const StringConverter().toJson(instance.url),
244 244
     };
245 245
 
246 246
 EnterpriseItem _$EnterpriseItemFromJson(Map<String, dynamic> json) =>

+ 4 - 4
lib/model/rsp/user_rsp.dart

@@ -4,7 +4,7 @@ import 'package:lszlgl/model/string_converter.dart';
4 4
 
5 5
 part 'user_rsp.g.dart';
6 6
 
7
-@JsonSerializable()
7
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
8 8
 class UserRsp {
9 9
   /*
10 10
   {
@@ -83,9 +83,9 @@ class UserRsp {
83 83
   }
84 84
 }
85 85
 
86
-@JsonSerializable()
86
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
87 87
 class DepartmentRsp {
88
-  final String? id;
88
+  final num? id;
89 89
   final String? name;
90 90
   final num? parentId;
91 91
 
@@ -100,7 +100,7 @@ class DepartmentRsp {
100 100
   Map<String, dynamic> toJson() => _$DepartmentRspToJson(this);
101 101
 }
102 102
 
103
-@JsonSerializable()
103
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
104 104
 class EnumRsp {
105 105
   final num? id;
106 106
   final String? name;

+ 30 - 30
lib/model/rsp/user_rsp.g.dart

@@ -7,16 +7,16 @@ part of 'user_rsp.dart';
7 7
 // **************************************************************************
8 8
 
9 9
 UserRsp _$UserRspFromJson(Map<String, dynamic> json) => UserRsp(
10
-      id: json['id'] as num?,
11
-      username: json['username'] as String?,
12
-      nickname: json['nickname'] as String?,
13
-      email: json['email'] as String?,
14
-      mobile: json['mobile'] as String?,
15
-      sex: json['sex'] as num?,
16
-      avatar: json['avatar'] as String?,
17
-      loginIp: json['loginIp'] as String?,
18
-      loginDate: json['loginDate'] as num?,
19
-      createTime: json['createTime'] as num?,
10
+      id: const NumConverter().fromJson(json['id']),
11
+      username: const StringConverter().fromJson(json['username']),
12
+      nickname: const StringConverter().fromJson(json['nickname']),
13
+      email: const StringConverter().fromJson(json['email']),
14
+      mobile: const StringConverter().fromJson(json['mobile']),
15
+      sex: const NumConverter().fromJson(json['sex']),
16
+      avatar: const StringConverter().fromJson(json['avatar']),
17
+      loginIp: const StringConverter().fromJson(json['loginIp']),
18
+      loginDate: const NumConverter().fromJson(json['loginDate']),
19
+      createTime: const NumConverter().fromJson(json['createTime']),
20 20
       roles: (json['roles'] as List<dynamic>?)
21 21
           ?.map((e) => EnumRsp.fromJson(e as Map<String, dynamic>))
22 22
           .toList(),
@@ -29,16 +29,16 @@ UserRsp _$UserRspFromJson(Map<String, dynamic> json) => UserRsp(
29 29
     );
30 30
 
31 31
 Map<String, dynamic> _$UserRspToJson(UserRsp instance) => <String, dynamic>{
32
-      'id': instance.id,
33
-      'username': instance.username,
34
-      'nickname': instance.nickname,
35
-      'email': instance.email,
36
-      'mobile': instance.mobile,
37
-      'sex': instance.sex,
38
-      'avatar': instance.avatar,
39
-      'loginIp': instance.loginIp,
40
-      'loginDate': instance.loginDate,
41
-      'createTime': instance.createTime,
32
+      'id': const NumConverter().toJson(instance.id),
33
+      'username': const StringConverter().toJson(instance.username),
34
+      'nickname': const StringConverter().toJson(instance.nickname),
35
+      'email': const StringConverter().toJson(instance.email),
36
+      'mobile': const StringConverter().toJson(instance.mobile),
37
+      'sex': const NumConverter().toJson(instance.sex),
38
+      'avatar': const StringConverter().toJson(instance.avatar),
39
+      'loginIp': const StringConverter().toJson(instance.loginIp),
40
+      'loginDate': const NumConverter().toJson(instance.loginDate),
41
+      'createTime': const NumConverter().toJson(instance.createTime),
42 42
       'roles': instance.roles,
43 43
       'dept': instance.dept,
44 44
       'posts': instance.posts,
@@ -46,26 +46,26 @@ Map<String, dynamic> _$UserRspToJson(UserRsp instance) => <String, dynamic>{
46 46
 
47 47
 DepartmentRsp _$DepartmentRspFromJson(Map<String, dynamic> json) =>
48 48
     DepartmentRsp(
49
-      id: json['id'] as String?,
50
-      name: json['name'] as String?,
51
-      parentId: json['parentId'] as num?,
49
+      id: const NumConverter().fromJson(json['id']),
50
+      name: const StringConverter().fromJson(json['name']),
51
+      parentId: const NumConverter().fromJson(json['parentId']),
52 52
     );
53 53
 
54 54
 Map<String, dynamic> _$DepartmentRspToJson(DepartmentRsp instance) =>
55 55
     <String, dynamic>{
56
-      'id': instance.id,
57
-      'name': instance.name,
58
-      'parentId': instance.parentId,
56
+      'id': const NumConverter().toJson(instance.id),
57
+      'name': const StringConverter().toJson(instance.name),
58
+      'parentId': const NumConverter().toJson(instance.parentId),
59 59
     };
60 60
 
61 61
 EnumRsp _$EnumRspFromJson(Map<String, dynamic> json) => EnumRsp(
62
-      id: json['id'] as num?,
63
-      name: json['name'] as String?,
62
+      id: const NumConverter().fromJson(json['id']),
63
+      name: const StringConverter().fromJson(json['name']),
64 64
     );
65 65
 
66 66
 Map<String, dynamic> _$EnumRspToJson(EnumRsp instance) => <String, dynamic>{
67
-      'id': instance.id,
68
-      'name': instance.name,
67
+      'id': const NumConverter().toJson(instance.id),
68
+      'name': const StringConverter().toJson(instance.name),
69 69
     };
70 70
 
71 71
 PersonRsp _$PersonRspFromJson(Map<String, dynamic> json) => PersonRsp(

+ 3 - 1
lib/page/login/login_page.dart

@@ -2,6 +2,7 @@ import 'package:dio/dio.dart';
2 2
 import 'package:flutter/material.dart';
3 3
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
4 4
 import 'package:lszlgl/base/base_lifecycle_state.dart';
5
+import 'package:lszlgl/main.dart';
5 6
 import 'package:lszlgl/model/req/login_req.dart';
6 7
 import 'package:lszlgl/network/my_api.dart';
7 8
 import 'package:lszlgl/service/dict_service.dart';
@@ -61,7 +62,8 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
61 62
       MyNavigator.dismissLoading();
62 63
       startHome();
63 64
     } on DioException catch (_) {
64
-    } catch (_) {
65
+    } on Exception catch (a, _) {
66
+      logger.e('$a');
65 67
       MyNavigator.showToast('获取数据失败');
66 68
     }
67 69
     MyNavigator.dismissLoading();