更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/Device2UseUsableService.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/service/permissVerify/Device2UseUsableService.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.service.devices.permiss;
+package com.zhongshu.card.server.core.service.permissVerify;
 
 import com.github.microservice.models.gateDoor.use.GateDoorUseParam;
 import com.github.microservice.net.ResultContent;
@@ -9,7 +9,6 @@ import com.zhongshu.card.server.core.dao.visitor.VisitorSettingDeviceDao;
 import com.zhongshu.card.server.core.domain.devices.permiss.Device2UseUsable;
 import com.zhongshu.card.server.core.domain.visitor.VisitorMain;
 import com.zhongshu.card.server.core.domain.visitor.VisitorSettingDevice;
-import com.zhongshu.card.server.core.service.permissVerify.SuperPermissService;
 import com.zhongshu.card.server.core.service.visitor.VisitorMainService;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -41,9 +40,6 @@ public class Device2UseUsableService {
     @Autowired
     private VisitorSettingDeviceDao visitorSettingDeviceDao;
 
-    @Autowired
-    private VisitorMainService visitorMainService;
-
     @Autowired
     private ApplicationContext applicationContext;
 
@@ -90,8 +86,8 @@ public class Device2UseUsableService {
     /**
      * 验证失败 临时权限
      *
-     * @param userId
-     * @param deviceId
+     * @param userId   用户id或临时用户id
+     * @param deviceId 设备id
      * @return
      */
     public ResultContent<String> verifyDevice(String userId, String deviceId, String projectOid, GateDoorUseParam deviceUserParam) {
@@ -105,6 +101,7 @@ public class Device2UseUsableService {
         Pageable pageable = PageRequest.of(0, 1);
         Page<Device2UseUsable> page = device2UseUsableDao.page(pageable, param);
         List<Device2UseUsable> list = page.getContent();
+
         if (ObjectUtils.isNotEmpty(list)) {
             msg = "成功";
             for (Device2UseUsable device2UseUsable : list) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/permissVerify/DevicePermissVerifyService.java

@@ -21,7 +21,6 @@ import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.domain.devices.permiss.PermissTimeSlot;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
-import com.zhongshu.card.server.core.service.devices.permiss.Device2UseUsableService;
 import com.zhongshu.card.server.core.service.devices.permiss.UserPermissDataCacheService;
 import com.zhongshu.card.server.core.util.TempUserUtil;
 import lombok.extern.slf4j.Slf4j;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/permissVerify/SuperPermissService.java

@@ -5,6 +5,9 @@ import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 用户 、 设备权限验证 的超类
  *
@@ -23,4 +26,14 @@ public abstract class SuperPermissService extends SuperService {
      */
     public abstract ResultContent markUse(String fromDataId, GateDoorUseParam deviceUserParam);
 
+    /**
+     * 设备使用记录时， 查询关联的信息详情
+     *
+     * @param fromDataId
+     * @return
+     */
+    public ResultContent detailInfo(String fromDataId) {
+        Map<String, Object> map = new HashMap<>();
+        return ResultContent.buildSuccess(map);
+    }
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorMainService.java

@@ -26,10 +26,10 @@ import com.zhongshu.card.server.core.domain.scene.SceneComponent;
 import com.zhongshu.card.server.core.domain.visitor.VisitorMain;
 import com.zhongshu.card.server.core.domain.visitor.VisitorSetting;
 import com.zhongshu.card.server.core.service.base.CommonService;
-import com.zhongshu.card.server.core.service.permissVerify.SuperPermissService;
 import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
-import com.zhongshu.card.server.core.service.devices.permiss.Device2UseUsableService;
+import com.zhongshu.card.server.core.service.permissVerify.Device2UseUsableService;
 import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;
+import com.zhongshu.card.server.core.service.permissVerify.SuperPermissService;
 import com.zhongshu.card.server.core.service.user.UserAccountServiceImpl;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import com.zhongshu.card.server.core.util.TempUserUtil;
@@ -311,6 +311,11 @@ public class VisitorMainService extends SuperPermissService {
         return ResultContent.buildFail(ResultMessage.DATA_NOT_EXIST);
     }
 
+    @Override
+    public ResultContent detailInfo(String fromDataId) {
+        return super.detailInfo(fromDataId);
+    }
+
     /**
      * 检查数据 审核是否是否已过期
      *