瀏覽代碼

修改连接sdk bug

Anthony 1 周之前
父節點
當前提交
e52610bdef

+ 3 - 3
supervision-admin/src/main/java/com/supervision/web/ConnectSDK/peopleDoor/Acs/UserManage.java

@@ -214,9 +214,9 @@ public class UserManage {
      * 按条件分页查询人员信息
      *
      * @param userID   用户登录句柄
-     * @param lHandler 远程配置句柄
+     * @param condition
      */
-    public void getUserInfo(int userID, int lHandler) {
+    public void getUserInfo(int userID, Map<String, Object> condition) {
         String jsonQueryCondition = generateQueryCondition(); // 生成查询条件 JSON
         HCNetSDK.BYTE_ARRAY ptrInbuff = new HCNetSDK.BYTE_ARRAY(jsonQueryCondition.length());
         System.arraycopy(jsonQueryCondition.getBytes(), 0, ptrInbuff.byValue, 0, jsonQueryCondition.length());
@@ -227,7 +227,7 @@ public class UserManage {
 
         while (true) {
             int dwState = hCNetSDK.NET_DVR_SendWithRecvRemoteConfig(
-                    lHandler,
+                    userID,
                     ptrInbuff.getPointer(),
                     jsonQueryCondition.length(),
                     ptrOutbuff.getPointer(),

+ 2 - 6
supervision-admin/src/main/java/com/supervision/web/ConnectSDK/peopleDoor/PeopleDoorDeviceManager.java

@@ -385,7 +385,7 @@ public class PeopleDoorDeviceManager {
             }
             case "22": {
                 logger.info("[Module]查询人员示例代码");
-                userManage.searchUserInfo(userID);
+                userManage.getUserInfo(userID, request);
                 break;
             }
             case "23": {
@@ -410,10 +410,7 @@ public class PeopleDoorDeviceManager {
             case "26": {
                 logger.info("[Module]按条件分页查询人员信息");
                 // 从 request 取出 handle 参数
-                Object handlerObj = request.get("handler");
-                int lHandler = handlerObj != null ? (int) handlerObj : -1;
-
-                userManage.getUserInfo(userID, lHandler);
+                userManage.getUserInfo(userID, request);
                 break;
             }
             // 新加的
@@ -453,7 +450,6 @@ public class PeopleDoorDeviceManager {
             }
             // 查询所有卡号(新加的)
             case "34": {
-
                 logger.info("[Module]查询所有卡号");
                 cardManage.searchAllCardInfo(userID);
                 break;