From 3ee306e4a8db75680960f5eb4eec9fb7d05b5f29 Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期五, 24 七月 2026 16:21:54 +0800
Subject: [PATCH] Merge branch 'master' into electron_dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorMachineServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorMachineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorMachineServiceImpl.java
index 187d2ab..cc3d2da 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorMachineServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysVisitorMachineServiceImpl.java
@@ -153,7 +153,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public int activateDevice(String deviceId) {
+ public int activateDevice(String deviceId, String fingerprint) {
// 1. 根据deviceId查询设备
SysVisitorMachine device = visitorMachineMapper.checkDeviceIdUnique(deviceId, null);
if (device == null || device.getDelFlag().equals("1")) {
@@ -175,7 +175,7 @@
update.setMachineId(device.getMachineId());
update.setOnlineStatus("ONLINE"); // 或 "ACTIVATED"，根据你的枚举定义
update.setUpdateTime(new Date());
-
+ update.setFingerprint(fingerprint);
return visitorMachineMapper.updateMachine(update);
}
--
Gitblit v1.7.1