1，操作记录接口新增参数（指纹ID、卡ID、密码ID）

2023-08-31 14:40:50 +08:00 · 2023-08-31 14:40:50 +08:00 · 504f604ad0
commit 504f604ad0
parent cc6f206651
8 changed files with 106 additions and 14 deletions
--- a/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart
+++ b/star_lock/lib/main/lockDetail/authorizedAdmin/authorizedAdminList/authorizedAdminList_page.dart
@ -133,8 +133,8 @@ class _AuthorizedAdminListPageState extends State<AuthorizedAdminListPage> {
          }
          return _electronicKeyItem('images/controls_user.png',
              indexEntity.keyName!, useDateStr, keyStatus, isAdminKey, () {
-            // Navigator.pushNamed(context, Routers.authorizedAdminDetailPage);
-            Navigator.pushNamed(context, Routers.electronicKeyDetailPage);
+            Navigator.pushNamed(context, Routers.electronicKeyDetailPage,
+                arguments: {'itemData': indexEntity});
          });
        });
  }
--- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart
+++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart
@ -96,7 +96,7 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
          const SizedBox(height: 1),
          CommonItem(
              leftTitel: TranslationLoader.lanKeys!.senderTime!.tr,
-              rightTitle: itemData.date.toString(),
+              rightTitle: getSenderDate(itemData),
              action: () {}),
          Container(height: 10.h),
          CommonItem(
@ -115,7 +115,10 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
              isHaveDirection: true,
              action: () {
                Navigator.pushNamed(context, Routers.keyOperationRecordPage,
-                    arguments: {});
+                    arguments: {
+                      'lockId': itemData.lockId.toString(),
+                      'keyId': itemData.keyId.toString()
+                    });
              }),
          Container(height: 40.h),
          SubmitBtn(
@ -160,6 +163,14 @@ class _ElectronicKeyDetailPageState extends State<ElectronicKeyDetailPage> {
    return useDateStr;
  }

+  //发送时间
+  String getSenderDate(ElectronicKeyListItem indexEntity) {
+    String senderDate = '';
+    DateTime dateStr = DateTime.fromMillisecondsSinceEpoch(indexEntity.date!);
+    senderDate = dateStr.toLocal().toString().substring(0, 16);
+    return senderDate;
+  }
+
  Widget commonItem(String leftTitle, String rightTitle,
      {bool isHaveDirection = false,
      bool isHaveLine = false,
--- a/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord_page.dart
+++ b/star_lock/lib/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord_page.dart
@ -17,8 +17,31 @@ class KeyOperationRecordPage extends StatefulWidget {
 }

 class _KeyOperationRecordPageState extends State<KeyOperationRecordPage> {
+  String _keyId = '';
+  String _lockId = '';
+  String _keyboardPwdId = ''; //密码ID
+  String _cardId = ''; //卡ID
+  String _fingerprintId = ''; //指纹ID
  @override
  Widget build(BuildContext context) {
+    dynamic obj = ModalRoute.of(context)?.settings.arguments;
+    if (obj != null && (obj["keyId"] != null)) {
+      _keyId = obj["keyId"];
+    }
+    if (obj != null && (obj["lockId"] != null)) {
+      _lockId = obj["lockId"];
+    }
+    if (obj != null && (obj["keyboardPwdId"] != null)) {
+      _keyboardPwdId = obj["keyboardPwdId"];
+    }
+    if (obj != null && (obj["cardId"] != null)) {
+      _cardId = obj["cardId"];
+    }
+
+    if (obj != null && (obj["fingerprintId"] != null)) {
+      _fingerprintId = obj["fingerprintId"];
+    }
+
    return Scaffold(
      backgroundColor: AppColors.mainBackgroundColor,
      appBar: TitleAppBar(
@ -55,8 +78,21 @@ class _KeyOperationRecordPageState extends State<KeyOperationRecordPage> {

  //请求操作记录列表
  Future<List<KeyRecordDataItem>> mockNetworkDataRequest() async {
-    KeyOperationRecordEntity entity = await ApiRepository.to
-        .lockRecordList('0', '63', '0', '28', '1', '1', '20', '0', '', '', '');
+    KeyOperationRecordEntity entity = await ApiRepository.to.lockRecordList(
+        '0',
+        _keyId,
+        '0',
+        _lockId,
+        '1',
+        '1',
+        '20',
+        '0',
+        '',
+        '',
+        '',
+        _keyboardPwdId,
+        _cardId,
+        _fingerprintId);
    if (entity.errorCode!.codeIsSuccessful) {
      print("操作记录列表成功:${entity.data?.itemList}");
    }
--- a/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
+++ b/star_lock/lib/main/lockDetail/lockDetail/lockDetail_page.dart
@ -226,7 +226,11 @@ class _LockDetailPageState extends State<LockDetailPage> {
            }),
            bottomItem('images/main/icon_main_operatingRecord.png',
                TranslationLoader.lanKeys!.operatingRecord!.tr, () {
-              Navigator.pushNamed(context, Routers.lockOperatingRecordPage);
+              Navigator.pushNamed(context, Routers.lockOperatingRecordPage,
+                  arguments: {
+                    "lockMainEntity": widget.lockMainEntity,
+                    "keyInfo": widget.keyInfo
+                  });
            }),
            bottomItem('images/main/icon_main_set.png',
                TranslationLoader.lanKeys!.set!.tr, () {
--- a/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart
+++ b/star_lock/lib/main/lockDetail/lockOperatingRecord/lockOperatingRecord_page.dart
@ -4,6 +4,7 @@ import 'package:get/get.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecordEntity.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
+import 'package:star_lock/main/lockMian/entity/lockInfoEntity.dart';

 import '../../../app_settings/app_colors.dart';
 import '../../../tools/jh_pop_menus.dart';
@ -19,8 +20,19 @@ class LockOperatingRecordPage extends StatefulWidget {
 }

 class _LockOperatingRecordPageState extends State<LockOperatingRecordPage> {
+  late KeyInfos keyInfo;
+  late LockMainEntity lockMainEntity;
+
  @override
  Widget build(BuildContext context) {
+    dynamic obj = ModalRoute.of(context)?.settings.arguments;
+    if (obj != null && (obj["lockMainEntity"] != null)) {
+      lockMainEntity = obj["lockMainEntity"];
+    }
+    if (obj != null && (obj["keyInfo"] != null)) {
+      keyInfo = obj["keyInfo"];
+    }
+
    return Scaffold(
      backgroundColor: AppColors.mainBackgroundColor,
      appBar: TitleAppBar(
@ -93,8 +105,21 @@ class _LockOperatingRecordPageState extends State<LockOperatingRecordPage> {

  //请求操作记录列表
  Future<List<KeyRecordDataItem>> mockNetworkDataRequest() async {
-    KeyOperationRecordEntity entity = await ApiRepository.to
-        .lockRecordList('0', '63', '0', '28', '1', '1', '20', '0', '', '', '');
+    KeyOperationRecordEntity entity = await ApiRepository.to.lockRecordList(
+        '0',
+        keyInfo.keyId.toString(),
+        '0',
+        keyInfo.lockId.toString(),
+        '1',
+        '1',
+        '20',
+        '0',
+        '',
+        '',
+        '',
+        '',
+        '',
+        '');
    if (entity.errorCode!.codeIsSuccessful) {
      print("操作记录列表成功:${entity.data?.itemList}");
    }
--- a/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart
+++ b/star_lock/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart
@ -99,7 +99,11 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage> {
              rightTitle: "",
              isHaveDirection: true,
              action: () {
-                Navigator.pushNamed(context, Routers.keyOperationRecordPage);
+                Navigator.pushNamed(context, Routers.keyOperationRecordPage,
+                    arguments: {
+                      'lockId': itemData.lockId.toString(),
+                      'keyId': itemData.keyboardPwdId.toString()
+                    });
              }),
          Container(height: 40.h),
          SizedBox(
--- a/star_lock/lib/network/api_provider.dart
+++ b/star_lock/lib/network/api_provider.dart
@ -209,7 +209,10 @@ class ApiProvider extends BaseProvider {
          String startDate,
          String recordType,
          String searchStr,
-          String timezoneRawOffSet) =>
+          String timezoneRawOffSet,
+          String keyboardPwdId,
+          String cardId,
+          String fingerprintId) =>
      post(
          keyOperationRecordURL.toUrl,
          jsonEncode({
@ -223,7 +226,10 @@ class ApiProvider extends BaseProvider {
            'startDate': startDate,
            'recordType': recordType,
            'searchStr': searchStr,
-            'timezoneRawOffSet': timezoneRawOffSet
+            'timezoneRawOffSet': timezoneRawOffSet,
+            'keyboardPwdId': keyboardPwdId,
+            'cardId': cardId,
+            'fingerprintId': fingerprintId
          }));

  // 绑定蓝牙管理员
--- a/star_lock/lib/network/api_repository.dart
+++ b/star_lock/lib/network/api_repository.dart
@ -160,7 +160,10 @@ class ApiRepository {
      String startDate,
      String recordType,
      String searchStr,
-      String timezoneRawOffSet) async {
+      String timezoneRawOffSet,
+      String keyboardPwdId,
+      String cardId,
+      String fingerprintId) async {
    final res = await apiProvider.lockRecordList(
        endDate,
        keyId,
@ -172,7 +175,10 @@ class ApiRepository {
        startDate,
        recordType,
        searchStr,
-        timezoneRawOffSet);
+        timezoneRawOffSet,
+        keyboardPwdId,
+        cardId,
+        fingerprintId);
    return KeyOperationRecordEntity.fromJson(res.body);
  }