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-applet/src/main/java/com/ruoyi/web/controller/api/SysApiDoorMachineController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiDoorMachineController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiDoorMachineController.java
index 486ecf1..8839b42 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiDoorMachineController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/SysApiDoorMachineController.java
@@ -4,6 +4,8 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.*;
import com.ruoyi.system.service.ISysVisitorMachineService;
import io.swagger.annotations.Api;
@@ -36,7 +38,11 @@
@PostMapping("/activate")
@ApiOperation(value = "激活访客机设备")
public AjaxResult activate(@Valid @RequestBody ApiVisitorMachineRequest request) {
- int result = visitorMachineService.activateDevice(request.getMachineId());
+ if (StringUtils.isEmpty(request.getFingerprint())) {
+ throw new ServiceException("缺少参数");
+ }
+
+ int result = visitorMachineService.activateDevice(request.getMachineId(), request.getFingerprint());
return result > 0 ? success("设备激活成功") : error("设备激活失败");
}
--
Gitblit v1.7.1