人脸门禁

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientPersonManageControllerTest.java

@@ -356,11 +356,16 @@ public class ClientPersonManageControllerTest {
         Integer farmId = (int) params.get("farmId");
         Object action = null;
         String startSwingTime = (String)params.get("startSwingTime");
+        String endSwingTime = (String)params.get("endSwingTime");
+        Integer openType = (Integer) params.get("openType");
+
         if (farmId == 1) {
             System.out.println("shuguang");
             ClientPersonDoorRecordRequestSg requestSg = new ClientPersonDoorRecordRequestSg(oauthConfigBaseInfo);
             requestSg.setPageNum(1);
-            requestSg.setPageSize("20");
+            requestSg.setPageSize(20);
+            requestSg.setEndSwingTime(endSwingTime);
+            requestSg.setOpenType(openType);
             if (StringUtils.isNotBlank(startSwingTime)){
                 requestSg.setStartSwingTime(startSwingTime);
             }
@@ -371,7 +376,9 @@ public class ClientPersonManageControllerTest {
             System.out.println("haining");
             ClientPersonDoorRecordRequestHn requestHn = new ClientPersonDoorRecordRequestHn(oauthConfigBaseInfo02);
             requestHn.setPageNum(1);
-            requestHn.setPageSize("20");
+            requestHn.setPageSize(20);
+            requestHn.setEndSwingTime(endSwingTime);
+            requestHn.setOpenType(openType);
             if (StringUtils.isNotBlank(startSwingTime)){
                 requestHn.setStartSwingTime(startSwingTime);
             }
@@ -382,7 +389,9 @@ public class ClientPersonManageControllerTest {
             System.out.println("cangnan");
             ClientPersonDoorRecordRequestCn requestCn = new ClientPersonDoorRecordRequestCn(oauthConfigBaseInfo03);
             requestCn.setPageNum(1);
-            requestCn.setPageSize("20");
+            requestCn.setPageSize(20);
+            requestCn.setEndSwingTime(endSwingTime);
+            requestCn.setOpenType(openType);
             if (StringUtils.isNotBlank(startSwingTime)){
                 requestCn.setStartSwingTime(startSwingTime);
             }
@@ -403,7 +412,7 @@ public class ClientPersonManageControllerTest {
             System.out.println("shuguang");
             ClientPersonDoorRecordRequestSg requestSg = new ClientPersonDoorRecordRequestSg(oauthConfigBaseInfo);
             requestSg.setPageNum(1);
-            requestSg.setPageSize("20");
+            requestSg.setPageSize(20);
             requestSg.setStartSwingTime(timestamp);
             Object action1 = requestSg.doAction();
             action=action1;
@@ -412,7 +421,7 @@ public class ClientPersonManageControllerTest {
             System.out.println("haining");
             ClientPersonDoorRecordRequestHn requestHn = new ClientPersonDoorRecordRequestHn(oauthConfigBaseInfo02);
             requestHn.setPageNum(1);
-            requestHn.setPageSize("20");
+            requestHn.setPageSize(20);
             requestHn.setStartSwingTime(timestamp);
             Object action1 = requestHn.doAction();
             action=action1;
@@ -421,7 +430,7 @@ public class ClientPersonManageControllerTest {
             System.out.println("cangnan");
             ClientPersonDoorRecordRequestCn requestCn = new ClientPersonDoorRecordRequestCn(oauthConfigBaseInfo03);
             requestCn.setPageNum(1);
-            requestCn.setPageSize("20");
+            requestCn.setPageSize(20);
             requestCn.setStartSwingTime(timestamp);
             Object action1 = requestCn.doAction();
             action=action1;

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/Person/Cn/ClientPersonDoorRecordRequestCn.java

@@ -20,8 +20,10 @@ public class ClientPersonDoorRecordRequestCn extends BaseRequest03<Object> {
 
 
     private Integer pageNum;
-    private String pageSize;
+    private Integer pageSize;
     private String startSwingTime;
+    private Integer openType;
+    private String endSwingTime;
 
 
 
@@ -60,6 +62,8 @@ public class ClientPersonDoorRecordRequestCn extends BaseRequest03<Object> {
         Map<String, Object> map = new HashMap<>();
         map.put("pageNum", this.pageNum);
         map.put("pageSize", this.pageSize);
+        map.put("openType", this.openType);
+        map.put("endSwingTime", this.endSwingTime);
         map.put("startSwingTime", this.startSwingTime);
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/Person/Hn/ClientPersonDoorRecordRequestHn.java

@@ -20,8 +20,10 @@ public class ClientPersonDoorRecordRequestHn extends BaseRequest02<Object> {
 
 
     private Integer pageNum;
-    private String pageSize;
+    private Integer pageSize;
     private String startSwingTime;
+    private Integer openType;
+    private String endSwingTime;
 
 
 
@@ -60,6 +62,8 @@ public class ClientPersonDoorRecordRequestHn extends BaseRequest02<Object> {
         map.put("pageNum", this.pageNum);
         map.put("pageSize", this.pageSize);
         map.put("startSwingTime", this.startSwingTime);
+        map.put("openType", this.openType);
+        map.put("endSwingTime", this.endSwingTime);
         this.setBody(JSON.toJSONString(map));
 
     }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/Person/Sg/ClientPersonDoorRecordRequestSg.java

@@ -19,8 +19,10 @@ public class ClientPersonDoorRecordRequestSg extends BaseRequest<Object> {
 
 
     private Integer pageNum;
-    private String pageSize;
+    private Integer pageSize;
     private String startSwingTime;
+    private Integer openType;
+    private String endSwingTime;
 
 
 
@@ -50,7 +52,7 @@ public class ClientPersonDoorRecordRequestSg extends BaseRequest<Object> {
         JSONObject jsonObject=JSONObject.parseObject(res);
         System.out.println(jsonObject);
         Object action = jsonObject.get("data");
-        return action;
+        return res;
     }
 
     private void setBody() {
@@ -60,6 +62,8 @@ public class ClientPersonDoorRecordRequestSg extends BaseRequest<Object> {
         map.put("pageNum", this.pageNum);
         map.put("pageSize", this.pageSize);
         map.put("startSwingTime", this.startSwingTime);
+        map.put("openType", this.openType);
+        map.put("endSwingTime", this.endSwingTime);
         this.setBody(JSON.toJSONString(map));
 
     }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/Video/VideoRecordQueryRequestSg.java

@@ -33,6 +33,7 @@ public class VideoRecordQueryRequestSg extends BaseRequest<JSONObject> {
         this.setUrl(UrlUtil.dealVersion(this.getUrl()));
         //设置请求参数
         setBody();
+        System.out.println("body:"+body);
         //发送请求
         String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
      //   System.out.println(res);
@@ -49,6 +50,7 @@ public class VideoRecordQueryRequestSg extends BaseRequest<JSONObject> {
         //设置请求参数
         Map<String, Object> map = new HashMap<>();
         map.put("data", this.data);
+        System.out.println("查看map:"+map);
         this.setBody(JSON.toJSONString(map));
 
     }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/Video/VideoRecordRequestHn.java

@@ -41,6 +41,7 @@ public class VideoRecordRequestHn extends BaseRequest02<Object> {
         this.setUrl(UrlUtil.dealVersion(this.getUrl()));
         //设置请求参数
         setBody();
+        System.out.println("body: "+body);
         //发送请求
         String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
         System.out.println(res);
@@ -60,6 +61,7 @@ public class VideoRecordRequestHn extends BaseRequest02<Object> {
         map.put("isContain", this.project);
         map.put("searchKey", this.method);
         map.put("data", this.data);
+        System.out.println("查看map："+map);
         this.setBody(JSON.toJSONString(map));
 
     }