From bf4918a7cb3a896d31dd05efff87ee6fcfd9f629 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 24 Apr 2025 13:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E5=B1=8F=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceServiceImpl.java       | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java
index 3050cd3..0517625 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java
@@ -12,29 +12,25 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class DeviceServiceImpl implements DeviceService {
+    @Autowired
+    private DeviceMapper mapper;
+
+
+    @Value("${face.android.appId}")
+    private String appId;
+    @Value("${face.android.sdkKey}")
+    private String appKey;
+
     @Override
     public AjaxResult getDeviceInfo(AppDTO dto) {
-        return null;
+        //判断设备是否存在
+        DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto);
+        if (deviceInfoVo == null) {
+            return AjaxResult.error("设备不存在");
+        }
+        deviceInfoVo.setAppId(appId);
+        deviceInfoVo.setAppKey(appKey);
+        deviceInfoVo.setTenantId(String.valueOf(GlobalConstants.TENANT_ID));
+        return AjaxResult.success(deviceInfoVo);
     }
-//    @Autowired
-//    private DeviceMapper mapper;
-//
-//
-//    @Value("${face.android.appId}")
-//    private String appId;
-//    @Value("${face.android.sdkKey}")
-//    private String appKey;
-//
-//    @Override
-//    public AjaxResult getDeviceInfo(AppDTO dto) {
-//        //判断设备是否存在
-//        DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto);
-//        if (deviceInfoVo == null){
-//            return AjaxResult.error("设备不存在");
-//        }
-//        deviceInfoVo.setAppId(appId);
-//        deviceInfoVo.setAppKey(appKey);
-//        deviceInfoVo.setTenantId(String.valueOf(GlobalConstants.TENANT_ID));
-//        return AjaxResult.success(deviceInfoVo);
-//    }
 }