信息牌接口 指纹和刷卡 2023-04-05

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -816,14 +816,8 @@ public class LabSecurityApplyController extends BaseController
     @RequestMapping("/app/securityFingerList")
     public ResultData securityFingerList(Long labId)
     {
-        List fingerList=new ArrayList();
-        List<String> list = labSecurityApplyService.selectSecurityFingerList(labId);
-        for(String str: list){
-            if(null!=str){
-                fingerList.add(str);
-            }
-        }
-        return ResultData.success(fingerList);
+        List<Map<String,Object>> list = labSecurityApplyService.selectSecurityFingerList(labId);
+        return ResultData.success(list);
     }
 
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabSecurityApplyMapper.java

@@ -154,7 +154,7 @@ public interface LabSecurityApplyMapper
      * @param subjectId
      * @return
      */
-    List<String> selectSecurityFingerList(Long subjectId);
+    List<Map<String,Object>> selectSecurityFingerList(Long subjectId);
 
     /**
      * 电子信息牌获取卡号列表

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabSecurityApplyService.java

@@ -184,7 +184,7 @@ public interface ILabSecurityApplyService
      * @param subjectId
      * @return
      */
-    List<String> selectSecurityFingerList(Long subjectId);
+    List<Map<String,Object>> selectSecurityFingerList(Long subjectId);
 
     /**
      *获取安全准入人员的卡号信息

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSecurityApplyServiceImpl.java

@@ -498,7 +498,7 @@ public class LabSecurityApplyServiceImpl implements ILabSecurityApplyService
      * @return
      */
     @Override
-    public List<String> selectSecurityFingerList(Long subjectId) {
+    public List<Map<String,Object>> selectSecurityFingerList(Long subjectId) {
         return labSecurityApplyMapper.selectSecurityFingerList(subjectId);
     }
 

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSecurityApplyMapper.xml

@@ -587,8 +587,8 @@
     </select>
 
     <!--获取准入人员的手指信息-->
-    <select id="selectSecurityFingerList" resultType="java.lang.String">
-            SELECT  finger  FROM  xxp_user_auth WHERE user_id IN (SELECT user_id
+    <select id="selectSecurityFingerList" resultType="java.util.Map">
+            SELECT  finger,user_id userId,user_name userName,user_type userType FROM  xxp_user_auth WHERE user_id IN (SELECT user_id
                 FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} and valid_end_time <![CDATA[<]]> now())
     </select>