From 80d78b00a9bb319ece2d95a73520a4e7e503b3c5 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Fri, 7 Mar 2025 18:10:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=8C=87=E7=BA=B9?=
 =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C=E3=80=81=E5=AF=B9?=
 =?UTF-8?q?=E5=A4=96=E7=9A=84=E6=8C=87=E7=BA=B9=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star-cloud/generalExtend.js | 48 ++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/star-cloud/generalExtend.js b/star-cloud/generalExtend.js
index d5d9eea..f5ef77b 100644
--- a/star-cloud/generalExtend.js
+++ b/star-cloud/generalExtend.js
@@ -3,9 +3,9 @@ import {cmdIds, Result, subCmdIds} from '../constant'
 import {convertWeekdaysToNumber, createPackageEnd, md5Encrypt, parseTimeToList, timestampToArray} from "../format.js";
 import {sm4} from "sm-crypto";
 import {
-    checkRepeatCardName,
+    checkRepeatCardName, checkRepeatFingerprintName,
     clearAllIcCard,
-    deleteIcCardRequest,
+    deleteIcCardRequest, getFingerprintListRequest,
     getIcCardListRequest,
     updateIcCardRequest
 } from "../api.js";
@@ -99,10 +99,35 @@ export async function registerExtendedProducts(params) {
 
     // 如果是指纹的话需要增加的参数
     if (params.type === 'fingerprint') {
-        const cardRequiredFields = ['fingerprintName', 'fingerprintNumber', 'fingerprintType'];
-        const missingField = _checkRequiredFields(params, cardRequiredFields);
-        if (missingField) {
-            return new Result(Result.NotMoreData, null, `指纹信息不完整: ${missingField}`);
+        if (params.operate === 0) {
+            const cardRequiredFields = ['fingerprintName', 'fingerprintNumber', 'fingerprintType'];
+            const missingField = _checkRequiredFields(params, cardRequiredFields);
+            if (missingField) {
+                return new Result(Result.NotMoreData, null, `指纹信息不完整: ${missingField}`);
+            }
+            // 检查卡昵称是否重复
+            const checkRepeatCardNameResult = await checkRepeatFingerprintName({
+                lockId: this.lockInfo.lockId,
+                fingerprintName: params.fingerprintName
+            })
+            if (checkRepeatCardNameResult.code !== Result.Success.code) {
+                return checkRepeatCardNameResult
+            }
+        }
+
+        // 修改指纹时的参数校验
+        if (params.operate === 1 || params.operate === 2) {
+            let cardRequiredFields = ['fingerprintId'];
+            if (params.operate === 1) {
+                cardRequiredFields.push('fingerprintType')
+            }
+            if (params.operate === 2) {
+                cardRequiredFields.push('fingerprintNumber')
+            }
+            const missingField = _checkRequiredFields(params, cardRequiredFields);
+            if (missingField) {
+                return new Result(Result.NotMoreData, null, `指纹信息不完整: ${missingField}`);
+            }
         }
     }
 
@@ -334,4 +359,15 @@ export async function registerExtendedProductsCancel(params) {
  */
 export async function getIcCardList(params) {
     return await getIcCardListRequest(params)
+}
+
+/**
+ *  获取指纹列表
+ * @param params.lockId 锁id （必填）
+ * @param params.pageNo 页码（选填）
+ * @param params.pageSize 每页显示数（选填）
+ * @returns {Promise<unknown>}
+ */
+export async function getFingerprintList(params) {
+    return await getFingerprintListRequest(params)
 }
\ No newline at end of file