将连接的蓝牙设备信息传给服务器

lib/drfit/dao/device_info_table_dao.dart

@@ -1,6 +1,7 @@
 import 'package:drift/drift.dart';
 import 'package:lszlgl/drfit/database.dart';
 import 'package:lszlgl/drfit/device_info_table.dart';
+import 'package:lszlgl/service/user_service.dart';
 
 part 'device_info_table_dao.g.dart';
 
@@ -12,6 +13,15 @@ class DeviceInfoTableDao extends DatabaseAccessor<MyDatabase> {
     return into(db.deviceInfoTable).insert(deviceInfoTableCompanion, mode: InsertMode.insertOrReplace);
   }
 
+  Future<List<DeviceInfo>> queryAllDeviceInfo() async {
+
+    int deviceInfoTableTime = UserService.get().getDeviceInfoTableTime();
+    return (select(db.deviceInfoTable)
+      ..where((tbl) => tbl.createdAt.isBiggerThanValue(deviceInfoTableTime))
+      ..orderBy([(row) => OrderingTerm.asc(row.createdAt)])).get();
+  }
+
+
 
 
 }

lib/drfit/database.dart

@@ -1,11 +1,15 @@
 import 'dart:io';
 
+import 'package:dio/dio.dart';
 import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:lszlgl/main.dart';
+import 'package:lszlgl/model/req/device_req.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as p;
 
+import '../network/my_api.dart';
+import '../service/user_service.dart';
 import 'dao/device_info_table_dao.dart';
 import 'device_info_table.dart';
 
@@ -20,6 +24,31 @@ class MyDatabase extends _$MyDatabase {
 
   @override
   int get schemaVersion => 1;
+
+
+  /// 同步数据到服务器
+  Future<void> savaBleDataToServer() async {
+    List<DeviceInfo> deviceInfos = await database.deviceInfoTableDao.queryAllDeviceInfo();
+
+    List<DeviceReq> deviceRes = [];
+    for(DeviceInfo device in deviceInfos) {
+      deviceRes.add(DeviceReq.fromJson(device.toJson()));
+    }
+    if(deviceRes.isEmpty) {
+      return;
+    }
+    try {
+      // 获取用户数据
+      var user = await MyApi.get().postDeviceInfos(deviceRes);
+      logger.d('====user:$user');
+      // 记录末次同步id
+      UserService.get().saveDeviceInfoTableTime(deviceInfos.last.createdAt);
+    } on DioException catch (_) {
+    } on Exception catch (a, _) {
+    }
+
+  }
+
 }
 
 LazyDatabase _openConnection() {

lib/drfit/database.g.dart

@@ -50,6 +50,12 @@ class $DeviceInfoTableTable extends DeviceInfoTable
   late final GeneratedColumn<String> bleName = GeneratedColumn<String>(
       'ble_name', aliasedName, false,
       type: DriftSqlType.string, requiredDuringInsert: true);
+  static const VerificationMeta _createdAtMeta =
+      const VerificationMeta('createdAt');
+  @override
+  late final GeneratedColumn<int> createdAt = GeneratedColumn<int>(
+      'created_at', aliasedName, false,
+      type: DriftSqlType.int, requiredDuringInsert: true);
   @override
   List<GeneratedColumn> get $columns => [
         username,
@@ -58,7 +64,8 @@ class $DeviceInfoTableTable extends DeviceInfoTable
         phoneRelease,
         phoneAddress,
         bleMac,
-        bleName
+        bleName,
+        createdAt
       ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -120,11 +127,17 @@ class $DeviceInfoTableTable extends DeviceInfoTable
     } else if (isInserting) {
       context.missing(_bleNameMeta);
     }
+    if (data.containsKey('created_at')) {
+      context.handle(_createdAtMeta,
+          createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta));
+    } else if (isInserting) {
+      context.missing(_createdAtMeta);
+    }
     return context;
   }
 
   @override
-  Set<GeneratedColumn> get $primaryKey => {bleMac};
+  Set<GeneratedColumn> get $primaryKey => {bleMac, username};
   @override
   DeviceInfo map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
@@ -143,6 +156,8 @@ class $DeviceInfoTableTable extends DeviceInfoTable
           .read(DriftSqlType.string, data['${effectivePrefix}ble_mac'])!,
       bleName: attachedDatabase.typeMapping
           .read(DriftSqlType.string, data['${effectivePrefix}ble_name'])!,
+      createdAt: attachedDatabase.typeMapping
+          .read(DriftSqlType.int, data['${effectivePrefix}created_at'])!,
     );
   }
 
@@ -173,6 +188,9 @@ class DeviceInfo extends DataClass implements Insertable<DeviceInfo> {
 
   /// 登录蓝牙名称
   final String bleName;
+
+  /// 日期
+  final int createdAt;
   const DeviceInfo(
       {required this.username,
       required this.phoneBrand,
@@ -180,7 +198,8 @@ class DeviceInfo extends DataClass implements Insertable<DeviceInfo> {
       required this.phoneRelease,
       required this.phoneAddress,
       required this.bleMac,
-      required this.bleName});
+      required this.bleName,
+      required this.createdAt});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
@@ -191,6 +210,7 @@ class DeviceInfo extends DataClass implements Insertable<DeviceInfo> {
     map['phone_address'] = Variable<String>(phoneAddress);
     map['ble_mac'] = Variable<String>(bleMac);
     map['ble_name'] = Variable<String>(bleName);
+    map['created_at'] = Variable<int>(createdAt);
     return map;
   }
 
@@ -203,6 +223,7 @@ class DeviceInfo extends DataClass implements Insertable<DeviceInfo> {
       phoneAddress: Value(phoneAddress),
       bleMac: Value(bleMac),
       bleName: Value(bleName),
+      createdAt: Value(createdAt),
     );
   }
 
@@ -217,6 +238,7 @@ class DeviceInfo extends DataClass implements Insertable<DeviceInfo> {
       phoneAddress: serializer.fromJson<String>(json['phoneAddress']),
       bleMac: serializer.fromJson<String>(json['bleMac']),
       bleName: serializer.fromJson<String>(json['bleName']),
+      createdAt: serializer.fromJson<int>(json['createdAt']),
     );
   }
   @override
@@ -230,6 +252,7 @@ class DeviceInfo extends DataClass implements Insertable<DeviceInfo> {
       'phoneAddress': serializer.toJson<String>(phoneAddress),
       'bleMac': serializer.toJson<String>(bleMac),
       'bleName': serializer.toJson<String>(bleName),
+      'createdAt': serializer.toJson<int>(createdAt),
     };
   }
 
@@ -240,7 +263,8 @@ class DeviceInfo extends DataClass implements Insertable<DeviceInfo> {
           String? phoneRelease,
           String? phoneAddress,
           String? bleMac,
-          String? bleName}) =>
+          String? bleName,
+          int? createdAt}) =>
       DeviceInfo(
         username: username ?? this.username,
         phoneBrand: phoneBrand ?? this.phoneBrand,
@@ -249,6 +273,7 @@ class DeviceInfo extends DataClass implements Insertable<DeviceInfo> {
         phoneAddress: phoneAddress ?? this.phoneAddress,
         bleMac: bleMac ?? this.bleMac,
         bleName: bleName ?? this.bleName,
+        createdAt: createdAt ?? this.createdAt,
       );
   @override
   String toString() {
@@ -259,14 +284,15 @@ class DeviceInfo extends DataClass implements Insertable<DeviceInfo> {
           ..write('phoneRelease: $phoneRelease, ')
           ..write('phoneAddress: $phoneAddress, ')
           ..write('bleMac: $bleMac, ')
-          ..write('bleName: $bleName')
+          ..write('bleName: $bleName, ')
+          ..write('createdAt: $createdAt')
           ..write(')'))
         .toString();
   }
 
   @override
   int get hashCode => Object.hash(username, phoneBrand, phoneModel,
-      phoneRelease, phoneAddress, bleMac, bleName);
+      phoneRelease, phoneAddress, bleMac, bleName, createdAt);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -277,7 +303,8 @@ class DeviceInfo extends DataClass implements Insertable<DeviceInfo> {
           other.phoneRelease == this.phoneRelease &&
           other.phoneAddress == this.phoneAddress &&
           other.bleMac == this.bleMac &&
-          other.bleName == this.bleName);
+          other.bleName == this.bleName &&
+          other.createdAt == this.createdAt);
 }
 
 class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
@@ -288,6 +315,7 @@ class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
   final Value<String> phoneAddress;
   final Value<String> bleMac;
   final Value<String> bleName;
+  final Value<int> createdAt;
   final Value<int> rowid;
   const DeviceInfoTableCompanion({
     this.username = const Value.absent(),
@@ -297,6 +325,7 @@ class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
     this.phoneAddress = const Value.absent(),
     this.bleMac = const Value.absent(),
     this.bleName = const Value.absent(),
+    this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   });
   DeviceInfoTableCompanion.insert({
@@ -307,6 +336,7 @@ class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
     required String phoneAddress,
     required String bleMac,
     required String bleName,
+    required int createdAt,
     this.rowid = const Value.absent(),
   })  : username = Value(username),
         phoneBrand = Value(phoneBrand),
@@ -314,7 +344,8 @@ class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
         phoneRelease = Value(phoneRelease),
         phoneAddress = Value(phoneAddress),
         bleMac = Value(bleMac),
-        bleName = Value(bleName);
+        bleName = Value(bleName),
+        createdAt = Value(createdAt);
   static Insertable<DeviceInfo> custom({
     Expression<String>? username,
     Expression<String>? phoneBrand,
@@ -323,6 +354,7 @@ class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
     Expression<String>? phoneAddress,
     Expression<String>? bleMac,
     Expression<String>? bleName,
+    Expression<int>? createdAt,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
@@ -333,6 +365,7 @@ class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
       if (phoneAddress != null) 'phone_address': phoneAddress,
       if (bleMac != null) 'ble_mac': bleMac,
       if (bleName != null) 'ble_name': bleName,
+      if (createdAt != null) 'created_at': createdAt,
       if (rowid != null) 'rowid': rowid,
     });
   }
@@ -345,6 +378,7 @@ class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
       Value<String>? phoneAddress,
       Value<String>? bleMac,
       Value<String>? bleName,
+      Value<int>? createdAt,
       Value<int>? rowid}) {
     return DeviceInfoTableCompanion(
       username: username ?? this.username,
@@ -354,6 +388,7 @@ class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
       phoneAddress: phoneAddress ?? this.phoneAddress,
       bleMac: bleMac ?? this.bleMac,
       bleName: bleName ?? this.bleName,
+      createdAt: createdAt ?? this.createdAt,
       rowid: rowid ?? this.rowid,
     );
   }
@@ -382,6 +417,9 @@ class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
     if (bleName.present) {
       map['ble_name'] = Variable<String>(bleName.value);
     }
+    if (createdAt.present) {
+      map['created_at'] = Variable<int>(createdAt.value);
+    }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
     }
@@ -398,6 +436,7 @@ class DeviceInfoTableCompanion extends UpdateCompanion<DeviceInfo> {
           ..write('phoneAddress: $phoneAddress, ')
           ..write('bleMac: $bleMac, ')
           ..write('bleName: $bleName, ')
+          ..write('createdAt: $createdAt, ')
           ..write('rowid: $rowid')
           ..write(')'))
         .toString();
@@ -427,6 +466,7 @@ typedef $$DeviceInfoTableTableInsertCompanionBuilder = DeviceInfoTableCompanion
   required String phoneAddress,
   required String bleMac,
   required String bleName,
+  required int createdAt,
   Value<int> rowid,
 });
 typedef $$DeviceInfoTableTableUpdateCompanionBuilder = DeviceInfoTableCompanion
@@ -438,6 +478,7 @@ typedef $$DeviceInfoTableTableUpdateCompanionBuilder = DeviceInfoTableCompanion
   Value<String> phoneAddress,
   Value<String> bleMac,
   Value<String> bleName,
+  Value<int> createdAt,
   Value<int> rowid,
 });
 
@@ -469,6 +510,7 @@ class $$DeviceInfoTableTableTableManager extends RootTableManager<
             Value<String> phoneAddress = const Value.absent(),
             Value<String> bleMac = const Value.absent(),
             Value<String> bleName = const Value.absent(),
+            Value<int> createdAt = const Value.absent(),
             Value<int> rowid = const Value.absent(),
           }) =>
               DeviceInfoTableCompanion(
@@ -479,6 +521,7 @@ class $$DeviceInfoTableTableTableManager extends RootTableManager<
             phoneAddress: phoneAddress,
             bleMac: bleMac,
             bleName: bleName,
+            createdAt: createdAt,
             rowid: rowid,
           ),
           getInsertCompanionBuilder: ({
@@ -489,6 +532,7 @@ class $$DeviceInfoTableTableTableManager extends RootTableManager<
             required String phoneAddress,
             required String bleMac,
             required String bleName,
+            required int createdAt,
             Value<int> rowid = const Value.absent(),
           }) =>
               DeviceInfoTableCompanion.insert(
@@ -499,6 +543,7 @@ class $$DeviceInfoTableTableTableManager extends RootTableManager<
             phoneAddress: phoneAddress,
             bleMac: bleMac,
             bleName: bleName,
+            createdAt: createdAt,
             rowid: rowid,
           ),
         ));
@@ -553,6 +598,11 @@ class $$DeviceInfoTableTableFilterComposer
       column: $state.table.bleName,
       builder: (column, joinBuilders) =>
           ColumnFilters(column, joinBuilders: joinBuilders));
+
+  ColumnFilters<int> get createdAt => $state.composableBuilder(
+      column: $state.table.createdAt,
+      builder: (column, joinBuilders) =>
+          ColumnFilters(column, joinBuilders: joinBuilders));
 }
 
 class $$DeviceInfoTableTableOrderingComposer
@@ -592,6 +642,11 @@ class $$DeviceInfoTableTableOrderingComposer
       column: $state.table.bleName,
       builder: (column, joinBuilders) =>
           ColumnOrderings(column, joinBuilders: joinBuilders));
+
+  ColumnOrderings<int> get createdAt => $state.composableBuilder(
+      column: $state.table.createdAt,
+      builder: (column, joinBuilders) =>
+          ColumnOrderings(column, joinBuilders: joinBuilders));
 }
 
 class _$MyDatabaseManager {

lib/drfit/device_info_table.dart

@@ -1,5 +1,6 @@
 import 'package:drift/drift.dart';
 
+
 @DataClassName('DeviceInfo')
 class DeviceInfoTable extends Table {
 
@@ -17,7 +18,9 @@ class DeviceInfoTable extends Table {
   TextColumn get bleMac => text()();
   /// 登录蓝牙名称
   TextColumn get bleName => text()();
+  /// 日期
+  IntColumn get createdAt => integer()();
 
   @override
-  Set<Column<Object>>? get primaryKey => {bleMac};
+  Set<Column<Object>>? get primaryKey => {bleMac, username};
 }

lib/drfit/model_factory.dart

@@ -20,6 +20,7 @@ class ModelFactory {
       phoneAddress: Value(phoneAddress),
       bleMac: Value(bleMac),
       bleName: Value(bleName),
+      createdAt: Value(DateTime.now().millisecondsSinceEpoch)
     );
     return tsc;
   }

lib/main.dart

@@ -11,9 +11,6 @@ import 'package:logger/logger.dart';
 import 'package:lszlgl/config/colors.dart';
 import 'package:lszlgl/drfit/database.dart';
 import 'package:lszlgl/router/my_navigator.dart';
-import 'package:lszlgl/service/print_service.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:path/path.dart' as p;
 
 late Logger logger;
 late MyDatabase database;
@@ -21,9 +18,6 @@ late MyDatabase database;
 void main() async {
   logger = Logger(printer: PrettyPrinter(methodCount: 0));
 
-
-  // database = MyDatabase(NativeDatabase.memory());
-
   initReportException(() async {
     SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle.light.copyWith(statusBarColor: Colors.transparent));
     SystemChrome.setPreferredOrientations([
@@ -33,7 +27,6 @@ void main() async {
 
     runApp(const MyApp());
     database = MyDatabase();
-    PrintService.getDeviceInfo();
   });
 }
 

lib/model/req/device_req.dart

@@ -0,0 +1,42 @@
+
+import 'package:json_annotation/json_annotation.dart';
+
+part 'device_req.g.dart';
+
+@JsonSerializable()
+class DeviceReq {
+
+  /// 登录用户名
+  final String username;
+
+  /// 登录手机品牌，如Redmi
+  final String phoneBrand;
+
+  /// 登录手机认证型号，如22120RN86C
+  final String phoneModel;
+
+  /// 登录手机版本，如14
+  final String phoneRelease;
+
+  /// 登录手机所在地址，如"北京市西城区月坛北街18号靠近物资大院"
+  final String phoneAddress;
+
+  /// 登录蓝牙mac地址
+  final String bleMac;
+
+  /// 登录蓝牙名称
+  final String bleName;
+  const DeviceReq(
+      {required this.username,
+        required this.phoneBrand,
+        required this.phoneModel,
+        required this.phoneRelease,
+        required this.phoneAddress,
+        required this.bleMac,
+        required this.bleName});
+
+
+  factory DeviceReq.fromJson(Map<String, dynamic> json) => _$DeviceReqFromJson(json);
+
+  Map<String, dynamic> toJson() => _$DeviceReqToJson(this);
+}

lib/model/req/device_req.g.dart

@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'device_req.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+DeviceReq _$DeviceReqFromJson(Map<String, dynamic> json) => DeviceReq(
+      username: json['username'] as String,
+      phoneBrand: json['phoneBrand'] as String,
+      phoneModel: json['phoneModel'] as String,
+      phoneRelease: json['phoneRelease'] as String,
+      phoneAddress: json['phoneAddress'] as String,
+      bleMac: json['bleMac'] as String,
+      bleName: json['bleName'] as String,
+    );
+
+Map<String, dynamic> _$DeviceReqToJson(DeviceReq instance) => <String, dynamic>{
+      'username': instance.username,
+      'phoneBrand': instance.phoneBrand,
+      'phoneModel': instance.phoneModel,
+      'phoneRelease': instance.phoneRelease,
+      'phoneAddress': instance.phoneAddress,
+      'bleMac': instance.bleMac,
+      'bleName': instance.bleName,
+    };

lib/network/api.dart

@@ -10,6 +10,8 @@ import 'package:lszlgl/model/rsp/user_rsp.dart';
 import 'package:lszlgl/network/base_dio.dart';
 import 'package:retrofit/retrofit.dart';
 
+import '../drfit/database.dart';
+import '../model/req/device_req.dart';
 import '../model/rsp/district_rsp.dart';
 
 part 'api.g.dart';
@@ -83,4 +85,9 @@ abstract class Api {
   /// 上传图片
   @POST('/admin-api/infra/file/upload')
   Future<ApiRsp<String?>> upload(@Part(name: 'file') File file);
+
+  /// 提交设备绑定信息
+  @POST('/admin-api/zj/base-device/createBatch')
+  Future<ApiRsp> postDeviceInfos(@Body() List<DeviceReq> req);
+
 }

lib/network/api.g.dart

@@ -513,6 +513,36 @@ class _Api implements Api {
     return value;
   }
 
+  @override
+  Future<ApiRsp<dynamic>> postDeviceInfos(List<DeviceReq> req) async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final _data = req.map((e) => e.toJson()).toList();
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<ApiRsp<dynamic>>(Options(
+      method: 'POST',
+      headers: _headers,
+      extra: _extra,
+    )
+            .compose(
+              _dio.options,
+              '/admin-api/zj/base-device/createBatch',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    final value = ApiRsp<dynamic>.fromJson(
+      _result.data!,
+      (json) => json as dynamic,
+    );
+    return value;
+  }
+
   RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
     if (T != dynamic &&
         !(requestOptions.responseType == ResponseType.bytes ||

lib/network/my_api.dart

@@ -10,6 +10,7 @@ class MyApi {
   static String testUrl = 'http://121.36.17.6:19090';
 
   static Api get({Dio? dio, String? baseUrl}) {
+
     if (kReleaseMode) {
       baseUrl ??= productUrl;
     } else {

lib/page/login/login_page.dart

@@ -12,9 +12,13 @@ import 'package:lszlgl/service/user_service.dart';
 import 'package:lszlgl/widget/button.dart';
 
 import '../../config/reresh_config.dart';
+import '../../drfit/database.dart';
 import '../../network/base_dio.dart';
 import '../../utils/location_utils.dart';
 import '../../utils/sp_utils.dart';
+import 'package:lszlgl/service/print_service.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:path/path.dart' as p;
 
 /// 登录页面
 class LoginPage extends StatefulWidget {
@@ -92,6 +96,10 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
     LocationUtils.updatePrivacyShow(true, true);
     LocationUtils.updatePrivacyAgree(true);
     LocationUtils.setApiKey(kReleaseMode ? '2c783509376e267b24d63b21681686fa' : '7d0c033909f84adc14a0e60a835f044f', '');
+    /// 获取手机设备信息
+    PrintService.getDeviceInfo();
+    /// 同步数据库里的蓝牙设备信息到服务器
+    database.savaBleDataToServer();
 
     /// 初始化基础库 end
     MyNavigator.dismissLoading();

lib/page/print/print_page.dart

@@ -143,6 +143,7 @@ class _PrintPageState extends BaseLifecycleState<PrintPage> {
           PrintService.connectedDeviceList.add(deviceInfo);
         });
         await savaToSqlite(deviceInfo); // 保存记录到数据库
+        database.savaBleDataToServer(); // 同步记录到服务器
       } else {
         MyNavigator.dismiss();
         MyNavigator.showToast('连接失败');

lib/service/user_service.dart

@@ -54,4 +54,16 @@ class UserService {
     if (user == null) return null;
     return UserRsp.fromJson(jsonDecode(user));
   }
+
+  /// 存储数据库DeviceInfoTable表的id号，用于记录同步的位置
+  Future<void> saveDeviceInfoTableTime(int timeId) async {
+
+    await SPUtils.getInstance().saveInt('DeviceInfoTableTimeInt', timeId);
+  }
+
+  /// 获取登录信息
+  int getDeviceInfoTableTime() {
+    return SPUtils.getInstance().getInt('DeviceInfoTableTimeInt') ?? -1;
+  }
+
 }