Merge remote-tracking branch 'origin/master'

huimv-farm-video/src/main/java/com/huimv/video/dhicc/icc/CommonConstant.java

@@ -89,7 +89,9 @@ public class CommonConstant {
     //1.1.3熏蒸
     public static final String[] Sg_XunZhengChannle = {"1003444$1$0$0"};
     //1.1.4卖猪
-    public static final String[] Sh_MaiZhuChannle = {"1002873$1$0$0"};
+    public static final String[] Sg_MaiZhuChannle = {"1002873$1$0$0"};
+    //1.1.5洗消通道
+    public static final String[] Sg_XiXiaoChannle = {"1002871$1$0$0", "1002872$1$0$0", "1002873$1$0$0"};
     //档案图片
     public static final String Sg_Document_Oss_Addr = "172.16.3.223:9876";
     //事件图片

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/constant/Constant.java

@@ -240,6 +240,10 @@ public class Constant {
     //videoRecord
     public static final String CHANNEL_URL_VIDEO_RECORD = "/evo-apigw/admin/API/SS/Playback/StartPlaybackByTime";
 
+
+    //videoRecord
+    public static final String CHANNEL_URL_VIDEO_QUERY = "/evo-apigw/admin/API/SS/Record/QueryRecords";
+
     //获取事件url
     public static final String CHANNEL_URL_ALARM_RECORD = "/evo-apigw/evo-event/1.2.0/alarm-record/page";
 
@@ -279,6 +283,24 @@ public class Constant {
     //车辆通行列表
     public static final String CAR_CAPTURE_RECORD = "/evo-apigw/ipms/carcapture/find/conditions?pageNum={pageNum}&pageSize={pageSize}";
 
+    //添加图片
+    public static final String CAR_PERSON_ADD_PICTURE = "/evo-apigw/evo-brm/1.0.0/person/upload/img";
+
+    //删除人员
+    public static final String CAR_PERSON_DELETE = "/evo-apigw/evo-brm/1.2.0/person/delete";
+
+
+    //添加人员
+    public static final String CAR_PERSON_ADD = "/evo-apigw/evo-brm/1.0.0/person/subsystem/add";
+
+    //人员管理--添加绑定用户的图片
+    public static final String CAR_PERSON_SAVE = "/evo-apigw/evo-brm/1.0.0/person/subsystem/update-biosignature-face";
+
+    //刷脸失败记录查询
+    public static final String CAR_PERSON_FACE_FAIL = "/evo-apigw/evo-accesscontrol/1.0.0/card/accessControl/swingCardRecord/bycondition/combined";
+
+    //刷卡记录详情
+    public static final String CAR_PERSON_CARD_DETAIL = "/evo-apigw/evo-accesscontrol/${version}/card/accessControl/swingCardRecord/{id}";
     //event
     public static final String EVENT_URL = "/evo-apigw/evo-event/1.2.0/alarm-record/page";
 

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

@@ -8,9 +8,9 @@ import com.huimv.video.dhicc.result.R;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
-import com.huimv.video.dhicc.test.request.ClientAllVideoPlayBackRequestCn;
-import com.huimv.video.dhicc.test.request.ClientAllVideoPlayBackRequestHn;
-import com.huimv.video.dhicc.test.request.ClientAllVideoPlayBackRequestSg;
+import com.huimv.video.dhicc.test.request.Video.ClientAllVideoPlayBackRequestCn;
+import com.huimv.video.dhicc.test.request.Video.ClientAllVideoPlayBackRequestHn;
+import com.huimv.video.dhicc.test.request.Video.ClientAllVideoPlayBackRequestSg;
 import com.huimv.video.video.entity.Camera;
 import com.huimv.video.video.service.ICameraService;
 import net.sf.json.JSONObject;

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

@@ -1,6 +1,5 @@
 package com.huimv.video.dhicc.test.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.dahuatech.hutool.http.Method;
 import com.dahuatech.icc.exception.ClientException;
 import com.dahuatech.icc.oauth.http.DefaultClient;
@@ -10,8 +9,9 @@ import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
-import com.huimv.video.dhicc.test.constant.Constant;
-import com.huimv.video.dhicc.test.request.*;
+import com.huimv.video.dhicc.test.request.Car.Cn.*;
+import com.huimv.video.dhicc.test.request.Car.Hn.*;
+import com.huimv.video.dhicc.test.request.Car.Sg.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,22 +1,29 @@
 package com.huimv.video.dhicc.test.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.dahuatech.icc.exception.ClientException;
+import com.huimv.common.utils.StringUtilsWork;
 import com.huimv.video.dhicc.result.R;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
-import com.huimv.video.dhicc.test.request.DepartmentRequest.Cn.DepartmentListRequestCn;
-import com.huimv.video.dhicc.test.request.DepartmentRequest.Hn.DepartmentListRequestHn;
-import com.huimv.video.dhicc.test.request.DepartmentRequest.Sg.DepartmentListRequestSg;
-import com.huimv.video.dhicc.test.request.PersonListRequestCn;
-import com.huimv.video.dhicc.test.request.PersonListRequestHn;
-import com.huimv.video.dhicc.test.request.PersonListRequestSg;
+import com.huimv.video.dhicc.test.request.*;
+import com.huimv.video.dhicc.test.request.Person.Cn.*;
+import com.huimv.video.dhicc.test.request.Person.Hn.*;
+import com.huimv.video.dhicc.test.request.Person.Sg.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Map;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @RestController
 @RequestMapping("personTest")
@@ -28,10 +35,281 @@ public class ClientPersonManageControllerTest {
     @Autowired
     private OauthConfigBaseInfo03 oauthConfigBaseInfo03;
 
+    //添加图片
+    @RequestMapping("/addPersonPicture")
+    public R addPersonPicture(@RequestParam(name = "file") MultipartFile multipartFile,
+                              @RequestParam(name = "farmId") Integer farmId) throws ClientException, IOException {
+
+        //文件上传前的名称
+        long s = System.currentTimeMillis();
+        String fileName = multipartFile.getOriginalFilename();
+        File file = new File(fileName);
+        OutputStream out = null;
+        try {
+            //获取文件流，以文件流的方式输出到新文件
+            out = new FileOutputStream(file);
+            byte[] ss = multipartFile.getBytes();
+            for (int i = 0; i < ss.length; i++) {
+                out.write(ss[i]);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (out != null) {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        long e = System.currentTimeMillis();
+        System.out.println(e - s);
+        HashMap<String, Object> formMap = new HashMap<>();
+        formMap.put("file", file);
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientPersonAddPictureRequestSg requestSg = new ClientPersonAddPictureRequestSg(oauthConfigBaseInfo);
+            requestSg.setFile(formMap);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        }
+        if (farmId==22) {
+            System.out.println("haining");
+            ClientPersonAddPictureRequestHn requestHn = new ClientPersonAddPictureRequestHn(oauthConfigBaseInfo02);
+            requestHn.setFile(formMap);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        }
+        if (farmId==21) {
+            System.out.println("cangnan");
+            ClientPersonAddPictureRequestCn requestCn = new ClientPersonAddPictureRequestCn(oauthConfigBaseInfo03);
+            requestCn.setFile(formMap);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+
+        // 操作完上的文件 需要删除在根目录下生成的文件
+        File f = new File(file.toURI());
+        if (f.delete()) {
+            System.out.println("删除成功");
+        } else {
+            System.out.println("删除失败");
+        }
+        JSONObject jsonObject1 = JSONObject.parseObject((String) action);
+        Object fileUrl = jsonObject1.get("fileUrl");
+        return R.ok("请求成功").put("data", fileUrl.toString());
+    }
+
+
+    //删除人员
+    @RequestMapping("/deletePercon")
+    public R deletePercon(@RequestBody Map<String, Object> params1) throws ClientException {
+        List<Integer> ids = (List<Integer>) params1.get("ids");
+
+        Object farmId = params1.get("farmId");
+        JSONObject jsonObject = null;
+        if ("1".equals(farmId)) {
+            System.out.println("shuguang");
+            ClientPersonDeleteRequestSg requestSg = new ClientPersonDeleteRequestSg(oauthConfigBaseInfo);
+            requestSg.setIds(ids);
+            JSONObject jsonObject1 = requestSg.doAction();
+            jsonObject = jsonObject1;
+        }
+        if ("22".equals(farmId)) {
+            System.out.println("haining");
+            ClientPersonDeleteRequestHn requestHn = new ClientPersonDeleteRequestHn(oauthConfigBaseInfo02);
+            requestHn.setIds(ids);
+            JSONObject jsonObject1 = requestHn.doAction();
+            jsonObject = jsonObject1;
+        }
+        if ("21".equals(farmId)) {
+            System.out.println("cangnan");
+            ClientPersonDeleteRequestCn requestCn = new ClientPersonDeleteRequestCn(oauthConfigBaseInfo03);
+            requestCn.setIds(ids);
+            JSONObject jsonObject1 = requestCn.doAction();
+            jsonObject = jsonObject1;
+        }
+        return R.ok("请求成功").put("data", jsonObject);
+    }
+
+
+    //人员管理--添加用户
+    @RequestMapping("/addPerson")
+    public R addPerson(@RequestBody Map<String, Object> params1) throws ClientException {
+        Object paperType = params1.put("paperType", 111);
+        Object code = params1.put("code", (int) ((Math.random() * 9 + 1) * 10000));
+        Object departmentId = params1.put("departmentId", (int) params1.get("departmentId"));
+        Object name = params1.put("name", (String) params1.get("name"));
+        Object paperNumber = params1.put("paperNumber", "1101011990d3d" + (int) ((Math.random() * 9 + 1) * 10000));
+        Object phone = params1.put("phone", 15171709858L + (int) ((Math.random() * 9 + 1) * 10000));
+        Object id = params1.put("id", (int) ((Math.random() * 9 + 1) * 10000));
+        Object farmId = params1.get("farmId");
+        JSONObject jsonObject = null;
+        if ("1".equals(farmId)) {
+            System.out.println("shuguang");
+            ClientPersonAddRequestSg requestSg = new ClientPersonAddRequestSg(oauthConfigBaseInfo);
+            requestSg.setPagerType((Integer) paperType);
+            requestSg.setCode((Integer) code);
+            requestSg.setDepartmentId((Integer)departmentId);
+            requestSg.setName((String) name);
+            requestSg.setPaperNumber((String) paperNumber);
+            requestSg.setPhone((Integer) phone);
+            requestSg.setId((Integer) id);
+            JSONObject jsonObject1 = requestSg.doAction();
+            jsonObject = jsonObject1;
+        }
+        if ("22".equals(farmId)) {
+            System.out.println("haining");
+            ClientPersonAddRequestHn requestHn = new ClientPersonAddRequestHn(oauthConfigBaseInfo02);
+            requestHn.setPagerType((Integer) paperType);
+            requestHn.setCode((Integer) code);
+            requestHn.setDepartmentId((Integer)departmentId);
+            requestHn.setName((String) name);
+            requestHn.setPaperNumber((String) paperNumber);
+            requestHn.setPhone((Integer) phone);
+            requestHn.setId((Integer) id);
+            JSONObject jsonObject1 = requestHn.doAction();
+            jsonObject = jsonObject1;
+        }
+        if ("21".equals(farmId)) {
+            System.out.println("cangnan");
+            ClientPersonAddRequestCn requestCn = new ClientPersonAddRequestCn(oauthConfigBaseInfo03);
+            requestCn.setPagerType((Integer) paperType);
+            requestCn.setCode((Integer) code);
+            requestCn.setDepartmentId((Integer)departmentId);
+            requestCn.setName((String) name);
+            requestCn.setPaperNumber((String) paperNumber);
+            requestCn.setPhone((Integer) phone);
+            requestCn.setId((Integer) id);
+            JSONObject jsonObject1 = requestCn.doAction();
+            jsonObject = jsonObject1;
+        }
+        return R.ok("请求成功").put("data", jsonObject);
+    }
+
+    //人员管理--添加绑定用户的图片
+    @RequestMapping("/addPictureToPerson")
+    public Object addPicture(@RequestBody Map<String, Object> params1) throws ClientException {
+
+        Object farmId = params1.get("farmId");
+        Map<String, Object> value = new HashMap<>();
+        value.put("personId", (int) params1.get("personId"));
+        value.put("type", 3);
+        value.put("index", 1);
+        value.put("path", (String) params1.get("path"));
+        Object action = null;
+        List mapList = new ArrayList();
+        System.out.println(mapList);
+        mapList.add(value);
+        if ("1".equals(farmId)) {
+            System.out.println("shuguang");
+            ClientPersonSaveRequestSg requestSg = new ClientPersonSaveRequestSg(oauthConfigBaseInfo);
+            requestSg.setPersonBiosignatures(mapList);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        }
+        if ("22".equals(farmId)) {
+            System.out.println("haining");
+            ClientPersonSaveRequestHn requestHn = new ClientPersonSaveRequestHn(oauthConfigBaseInfo02);
+            requestHn.setPersonBiosignatures(mapList);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        }
+        if ("33".equals(farmId)) {
+            System.out.println("cangnan");
+            ClientPersonSaveRequestCn requestCn = new ClientPersonSaveRequestCn(oauthConfigBaseInfo03);
+            requestCn.setPersonBiosignatures(mapList);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+
+        return action;
+    }
+
+    //刷脸失败记录
+    @RequestMapping("/getPersonOpenDoorFail")
+    public R getAccidentRecord(@RequestBody Map<String, Object> params1) throws ClientException {
+        Integer farmId = (int) params1.get("farmId");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Calendar c = Calendar.getInstance();
+        Date date = new Date();
+        c.setTime(date);
+        c.set(Calendar.HOUR_OF_DAY, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        Date A = c.getTime();
+        String formatA = format.format(A);
+        c.set(Calendar.HOUR, +24);
+        Date d = c.getTime();
+        String formatD = format.format(d);
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientPersonDoorListRequestSg requestSg = new ClientPersonDoorListRequestSg(oauthConfigBaseInfo);
+            requestSg.setPageNum(1);
+            requestSg.setPageSize("20");
+            requestSg.setOpenResult("0");
+            if (!StringUtilsWork.isNotEmpty((String) params1.get("startSwingTime"))) {
+                requestSg.setStartSwingTime((String) params1.get("startSwingTime"));
+                requestSg.setEndSwingTime(formatD);
+            } else {
+                requestSg.setStartSwingTime(formatA);
+                requestSg.setEndSwingTime(formatD);
+            }
+            params1.put("containDomain", "1");
+            params1.put("openResult", 0); //刷脸失败
+            Object action1 = requestSg.doAction();
+            action = action1;
+        }
+        if (farmId == 22) {
+            System.out.println("haining");
+            ClientPersonDoorListRequestHn requestHn = new ClientPersonDoorListRequestHn(oauthConfigBaseInfo02);
+            requestHn.setPageNum(1);
+            requestHn.setPageSize("20");
+            requestHn.setOpenResult("0");
+            if (!StringUtilsWork.isNotEmpty((String) params1.get("startSwingTime"))) {
+                requestHn.setStartSwingTime((String) params1.get("startSwingTime"));
+                requestHn.setEndSwingTime(formatD);
+            } else {
+                requestHn.setStartSwingTime(formatA);
+                requestHn.setEndSwingTime(formatD);
+            }
+            params1.put("containDomain", "1");
+            params1.put("openResult", 0); //刷脸失败
+            Object action1 = requestHn.doAction();
+            action = action1;
+
+        }
+        if (farmId == 21) {
+            System.out.println("cangnan");
+            ClientPersonDoorListRequestCn requestSg = new ClientPersonDoorListRequestCn(oauthConfigBaseInfo03);
+            requestSg.setPageNum(1);
+            requestSg.setPageSize("20");
+            requestSg.setOpenResult("0");
+            if (!StringUtilsWork.isNotEmpty((String) params1.get("startSwingTime"))) {
+                requestSg.setStartSwingTime((String) params1.get("startSwingTime"));
+                requestSg.setEndSwingTime(formatD);
+            } else {
+                requestSg.setStartSwingTime(formatA);
+                requestSg.setEndSwingTime(formatD);
+            }
+            params1.put("containDomain", "1");
+            params1.put("openResult", 0); //刷脸失败
+            Object action1 = requestSg.doAction();
+            action = action1;
+        }
+
+
+        return R.ok("请求成功").put("data", action);
+    }
+
 
     @RequestMapping("/ge_person_list")
-    public R ge_person_list(@RequestBody PersonListRequestSg personListRequestSg) throws ClientException {
+    public String ge_person_list(@RequestBody PersonListRequestSg personListRequestSg) throws ClientException {
         Integer farmId = personListRequestSg.getFarmId();
+        String request = null;
         if (farmId == 1) {
             System.out.println("曙光");
             PersonListRequestSg requestSg = new PersonListRequestSg(oauthConfigBaseInfo);
@@ -42,8 +320,8 @@ public class ClientPersonManageControllerTest {
             requestSg.setSearchKey(personListRequestSg.getSearchKey());
             requestSg.setStatusList(personListRequestSg.getStatusList());
             String s = requestSg.doAction();
-            return R.ok("请求成功").put("data",s);
-        } else if (farmId == 2) {
+            request = s;
+        } else if (farmId == 22) {
             PersonListRequestHn requestHn = new PersonListRequestHn(oauthConfigBaseInfo02);
             requestHn.setDepartmentId(personListRequestSg.getDepartmentId());
             requestHn.setIsContain(personListRequestSg.getIsContain());
@@ -52,9 +330,9 @@ public class ClientPersonManageControllerTest {
             requestHn.setSearchKey(personListRequestSg.getSearchKey());
             requestHn.setStatusList(personListRequestSg.getStatusList());
             String s = requestHn.doAction();
+            request = s;
             System.out.println("海宁");
-            return R.ok("请求成功").put("data",s);
-        } else {
+        } else if (farmId==21) {
             PersonListRequestCn requestCn = new PersonListRequestCn(oauthConfigBaseInfo03);
             requestCn.setDepartmentId(personListRequestSg.getDepartmentId());
             requestCn.setIsContain(personListRequestSg.getIsContain());
@@ -63,28 +341,108 @@ public class ClientPersonManageControllerTest {
             requestCn.setSearchKey(personListRequestSg.getSearchKey());
             requestCn.setStatusList(personListRequestSg.getStatusList());
             String s = requestCn.doAction();
+            request = s;
             System.out.println("苍南");
-            return R.ok("请求成功").put("data",s);
         }
+        return request;
     }
-    @RequestMapping("departmentList")
-    public R departmentList(@RequestBody Map<String,Integer> paramsMap){
-        Integer farmId = paramsMap.get("farmId");
-        if (farmId == 1){
-            System.out.println("曙光");
-            DepartmentListRequestSg departmentList = new DepartmentListRequestSg(oauthConfigBaseInfo);
-            return R.ok("请求成功").put("data",departmentList.doAction());
-        }else if (farmId == 22){
-            System.out.println("海宁");
-            DepartmentListRequestHn departmentList = new DepartmentListRequestHn(oauthConfigBaseInfo02);
-            return R.ok("请求成功").put("data",departmentList.doAction());
-        }else if (farmId == 21){
-            System.out.println("苍南");
-            DepartmentListRequestCn departmentList = new DepartmentListRequestCn(oauthConfigBaseInfo03);
-            return R.ok("请求成功").put("data",departmentList.doAction());
-        }else {
-            return R.error();
+
+    @RequestMapping("/get_person_record")
+    public Object getAccidentRecord1(@RequestBody Map<String, Object> params) throws ClientException {
+        Integer farmId = (int) params.get("farmId");
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientPersonDoorRecordRequestSg requestSg = new ClientPersonDoorRecordRequestSg(oauthConfigBaseInfo);
+            requestSg.setPageNum(1);
+            requestSg.setPageSize("20");
+            Object action1 = requestSg.doAction();
+            action=action1;
+        }
+        if (farmId == 22) {
+            System.out.println("haining");
+            ClientPersonDoorRecordRequestHn requestHn = new ClientPersonDoorRecordRequestHn(oauthConfigBaseInfo02);
+            requestHn.setPageNum(1);
+            requestHn.setPageSize("20");
+            Object action1 = requestHn.doAction();
+            action=action1;
+        }
+        if (farmId == 21) {
+            System.out.println("cangnan");
+            ClientPersonDoorRecordRequestCn requestCn = new ClientPersonDoorRecordRequestCn(oauthConfigBaseInfo03);
+            requestCn.setPageNum(1);
+            requestCn.setPageSize("20");
+            Object action1 = requestCn.doAction();
+            action=action1;
+        }
+        return action;
+    }
+
+    //总页数
+    @RequestMapping("/get_person_record_totalpage")
+    public Object get_person_record_totalpage(@RequestBody Map<String, Object> params) throws ClientException {
+        Integer farmId = (int) params.get("farmId");
+        String timestamp = String.valueOf((new Date()).getTime());
+        Object action = null;
+
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientPersonDoorRecordRequestSg requestSg = new ClientPersonDoorRecordRequestSg(oauthConfigBaseInfo);
+            requestSg.setPageNum(1);
+            requestSg.setPageSize("20");
+            requestSg.setStartSwingTime(timestamp);
+            Object action1 = requestSg.doAction();
+            action=action1;
+        }
+        if (farmId == 22) {
+            System.out.println("haining");
+            ClientPersonDoorRecordRequestHn requestHn = new ClientPersonDoorRecordRequestHn(oauthConfigBaseInfo02);
+            requestHn.setPageNum(1);
+            requestHn.setPageSize("20");
+            requestHn.setStartSwingTime(timestamp);
+            Object action1 = requestHn.doAction();
+            action=action1;
+        }
+        if (farmId == 21) {
+            System.out.println("cangnan");
+            ClientPersonDoorRecordRequestCn requestCn = new ClientPersonDoorRecordRequestCn(oauthConfigBaseInfo03);
+            requestCn.setPageNum(1);
+            requestCn.setPageSize("20");
+            requestCn.setStartSwingTime(timestamp);
+            Object action1 = requestCn.doAction();
+            action=action1;
+        }
+        return action;
+    }
+
+
+    @RequestMapping("/get_person_detail")
+    public Object getPersonDetail(@RequestBody Map<String, Object> params) throws ClientException {
+
+        Integer farmId = (int) params.get("farmId");
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientPersonDoorDetailRequestSg requestSg = new ClientPersonDoorDetailRequestSg(oauthConfigBaseInfo);
+            requestSg.setId((String) params.get("id"));
+            Object action1 = requestSg.doAction();
+            action = action1;
+        }
+        if (farmId == 22) {
+            System.out.println("haining");
+            ClientPersonDoorDetailRequestHn requestHn = new ClientPersonDoorDetailRequestHn(oauthConfigBaseInfo02);
+            requestHn.setId((String) params.get("id"));
+            Object action1 = requestHn.doAction();
+            action = action1;
+        }
+        if (farmId == 21) {
+            System.out.println("cangnan");
+            ClientPersonDoorDetailRequestCn requestCn = new ClientPersonDoorDetailRequestCn(oauthConfigBaseInfo03);
+            requestCn.setId((String) params.get("id"));
+            Object action1 = requestCn.doAction();
+            action = action1;
         }
 
+        return action;
     }
 }

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

@@ -35,9 +35,6 @@ public class ClientXunZhengControllerTest {
             System.out.println("曙光");
             XunZhengRequestSg requestSg = new XunZhengRequestSg(oauthConfigBaseInfo);
             Token token = requestSg.getToken();
-
-            System.out.println(token);
-            System.out.println(token.getAccess_token());
             requestSg.setEventType(xunZhengRequestSg.getEventType());
             requestSg.setPageNum(xunZhengRequestSg.getPageNum());
             requestSg.setPageSize(xunZhengRequestSg.getPageSize());

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

@@ -1,7 +1,6 @@
 package com.huimv.video.dhicc.test.controller;
 
-import com.huimv.video.dhicc.test.request.GetPublicKeyRes;
-import com.huimv.video.dhicc.test.response.GetTokenResponse;
+import com.huimv.video.dhicc.test.request.Oauth.GetPublicKeyRes;
 import com.huimv.video.dhicc.test.service.IOauthService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -3,21 +3,19 @@ package com.huimv.video.dhicc.test.controller;
 //拿视频回放
 
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dahuatech.icc.exception.ClientException;
-import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
 import com.huimv.video.dhicc.entity.IccChannel;
 import com.huimv.video.dhicc.mapper.IccChannelMapper;
 import com.huimv.video.dhicc.result.R;
-import com.huimv.video.dhicc.service.IIccChannelService;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
-import com.huimv.video.dhicc.test.request.VideoRecordRequestCn;
-import com.alibaba.fastjson.JSONObject;
-import com.huimv.video.dhicc.test.request.VideoRecordRequestHn;
-import com.huimv.video.dhicc.test.request.VideoRecordRequestSg;
+import com.huimv.video.dhicc.test.request.Video.*;
+import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,30 +35,26 @@ import java.util.Map;
 public class VideoRecorControllerSg {
 
     @Autowired
-    private IIccChannelService iIccChannelService;
-
-    @Autowired
-    private IccChannelMapper iccChannelMapper;
-    @Autowired
     private OauthConfigBaseInfo oauthConfigBaseInfo;
     @Autowired
     private OauthConfigBaseInfo02 oauthConfigBaseInfo02;
     @Autowired
     private OauthConfigBaseInfo03 oauthConfigBaseInfo03;
 
+    @Autowired
+    private IccChannelMapper iccChannelMapper;
+
     @RequestMapping("/getVideoRecord")
     public R getVideoRecord(@RequestBody Map<String, Object> params1) throws ClientException, ParseException {
         String happendTime = (String) params1.get("happendTime");
-        String channelId = (String) params1.get("channelId");
-        String farmId = (String) params1.get("farmId");
+        Integer farmId = (Integer) params1.get("farmId");
+        String channelName = (String) params1.get("channelName");
 
-        Map<String, Object> value = new HashMap<>();
-        value.put("nvrId", "");
-        value.put("optional", "/evo-apigw/admin/API/SS/Playback/StartPlaybackByTime");
-        value.put("recordType", "1");
-        value.put("streamType", "1");
-        value.put("recordSource", "2");
-        value.put("channelId", channelId);
+        LambdaQueryWrapper<IccChannel> wrapper3 = Wrappers.lambdaQuery();
+        wrapper3.eq(IccChannel::getChannelName, channelName);
+        wrapper3.eq(IccChannel::getRemark, farmId);
+        IccChannel iccChannel = iccChannelMapper.selectOne(wrapper3);
+        System.out.println(iccChannel);
 
         //开始结束时间代为处理
         DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -70,23 +64,63 @@ public class VideoRecorControllerSg {
         Date GapAfter = new Date(Time.getTime() + 1000 * 60 * 5);// end   事件五分钟之后
         String befor = String.valueOf(GapTimeBefor_gap.getTime() / 1000);
         String after = String.valueOf(GapAfter.getTime() / 1000);
-        value.put("endTime", after);
-        value.put("startTime", befor);
 
 
-        if ("1".equals(farmId)) {
+        Map<String, Object> test = new HashMap<>();
+        test.put("channelId", iccChannel.getChannelId());
+        test.put("recordSource", "2");
+        test.put("startTime", befor);
+        test.put("endTime", after);
+        test.put("streamType", "0");
+        test.put("recordType", "0");
+        if (farmId == 1) {
             System.out.println("曙光");
+            VideoRecordQueryRequestSg queryRequestSg = new VideoRecordQueryRequestSg(oauthConfigBaseInfo);
+            queryRequestSg.setData(test);
+            System.out.println(queryRequestSg);
+            com.alibaba.fastjson.JSONObject jsonObject2 = queryRequestSg.doAction();
+            System.out.println(jsonObject2);
+            JSONArray jsonArray = JSONArray.parseArray(jsonObject2.get("records").toString());
+            System.out.println(jsonArray);
+            com.alibaba.fastjson.JSONObject json = (com.alibaba.fastjson.JSONObject) jsonArray.get(0);
+            System.out.println(json);
+            Map<String, Object> value = new HashMap<>();
+            value.put("recordType", json.get("recordType"));
+            value.put("streamType", json.get("streamType"));
+            value.put("recordSource", json.get("recordSource"));
+            value.put("channelId", json.get("channelId"));
+            value.put("endTime", json.get("endTime"));
+            value.put("startTime", json.get("startTime"));
+
             VideoRecordRequestSg requestSg = new VideoRecordRequestSg(oauthConfigBaseInfo);
-            requestSg.setClientMac("30:9c:23:79:40:08");
-            requestSg.setClientPushId("");
-            requestSg.setProject("PSDK");
-            requestSg.setMethod("SS.Playback.StartPlaybackByTime");
             requestSg.setData(value);
             Object jsonObject1 = requestSg.doAction();
             System.out.println(jsonObject1);
-            return R.ok().put("data",jsonObject1);
-        } else if ("2".equals(farmId)) {
+            String action = (String) JSONObject.fromObject(jsonObject1).get("url");
+            String token = (String) JSONObject.fromObject(jsonObject1).get("token");
+            String[] split = action.split("\\|");// |需要转义符
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("url", split[1] + "?token=" + token + "&trackID=701");
+            return R.ok().put("data", jsonObject);
+        } else if (farmId == 22) {
             System.out.println("海宁");
+            VideoRecordQueryRequestHn queryRequestHn = new VideoRecordQueryRequestHn(oauthConfigBaseInfo02);
+            queryRequestHn.setData(test);
+            System.out.println(queryRequestHn);
+            com.alibaba.fastjson.JSONObject jsonObject2 = queryRequestHn.doAction();
+            System.out.println(jsonObject2);
+            JSONArray jsonArray = JSONArray.parseArray(jsonObject2.get("records").toString());
+            System.out.println(jsonArray);
+            com.alibaba.fastjson.JSONObject json = (com.alibaba.fastjson.JSONObject) jsonArray.get(0);
+            System.out.println(json);
+            Map<String, Object> value = new HashMap<>();
+            value.put("recordType", json.get("recordType"));
+            value.put("streamType", json.get("streamType"));
+            value.put("recordSource", json.get("recordSource"));
+            value.put("channelId", json.get("channelId"));
+            value.put("endTime", json.get("endTime"));
+            value.put("startTime", json.get("startTime"));
+
             VideoRecordRequestHn requestHn = new VideoRecordRequestHn(oauthConfigBaseInfo02);
             requestHn.setClientMac("30:9c:23:79:40:08");
             requestHn.setClientPushId("");
@@ -94,10 +128,31 @@ public class VideoRecorControllerSg {
             requestHn.setMethod("SS.Playback.StartPlaybackByTime");
             requestHn.setData(value);
             Object jsonObject1 = requestHn.doAction();
-            System.out.println(jsonObject1);
-            return R.ok().put("data",jsonObject1);
-        } else {
+            String action = (String) JSONObject.fromObject(jsonObject1).get("url");
+            String token = (String) JSONObject.fromObject(jsonObject1).get("token");
+            String[] split = action.split("\\|");// |需要转义符
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("url", split[1] + "?token=" + token);
+            return R.ok().put("data", jsonObject);
+        } else if (farmId == 21) {
             System.out.println("苍南");
+            VideoRecordQueryRequestCn queryRequestCn = new VideoRecordQueryRequestCn(oauthConfigBaseInfo03);
+            queryRequestCn.setData(test);
+            System.out.println(queryRequestCn);
+            com.alibaba.fastjson.JSONObject jsonObject2 = queryRequestCn.doAction();
+            System.out.println(jsonObject2);
+            JSONArray jsonArray = JSONArray.parseArray(jsonObject2.get("records").toString());
+            System.out.println(jsonArray);
+            com.alibaba.fastjson.JSONObject json = (com.alibaba.fastjson.JSONObject) jsonArray.get(0);
+            System.out.println(json);
+            Map<String, Object> value = new HashMap<>();
+            value.put("recordType", json.get("recordType"));
+            value.put("streamType", json.get("streamType"));
+            value.put("recordSource", json.get("recordSource"));
+            value.put("channelId", json.get("channelId"));
+            value.put("endTime", json.get("endTime"));
+            value.put("startTime", json.get("startTime"));
+
             VideoRecordRequestCn requestCn = new VideoRecordRequestCn(oauthConfigBaseInfo03);
             requestCn.setClientMac("30:9c:23:79:40:08");
             requestCn.setClientPushId("");
@@ -105,8 +160,14 @@ public class VideoRecorControllerSg {
             requestCn.setMethod("SS.Playback.StartPlaybackByTime");
             requestCn.setData(value);
             Object jsonObject1 = requestCn.doAction();
-            System.out.println(jsonObject1);
-            return R.ok().put("data",jsonObject1);
+            String action = (String) JSONObject.fromObject(jsonObject1).get("url");
+            String token = (String) JSONObject.fromObject(jsonObject1).get("token");
+            String[] split = action.split("\\|");// |需要转义符
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("url", split[1] + "?token=" + token + "&trackID=701");
+            return R.ok().put("data", jsonObject);
+        } else {
+            return R.error();
         }
 
     }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/manager/impl/OauthIntegrationManager.java

@@ -6,10 +6,10 @@ import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.manager.IOauthIntegrationManager;
 import com.huimv.video.dhicc.test.other.BaseIntegrationManager;
-import com.huimv.video.dhicc.test.request.GetPublicKeyRequest;
-import com.huimv.video.dhicc.test.request.GetTokenRequestTest01;
-import com.huimv.video.dhicc.test.request.GetTokenRequestTest02;
-import com.huimv.video.dhicc.test.request.GetTokenRequestTest03;
+import com.huimv.video.dhicc.test.request.Oauth.GetPublicKeyRequest;
+import com.huimv.video.dhicc.test.request.Oauth.GetTokenRequestTest01;
+import com.huimv.video.dhicc.test.request.Oauth.GetTokenRequestTest02;
+import com.huimv.video.dhicc.test.request.Oauth.GetTokenRequestTest03;
 import com.huimv.video.dhicc.test.response.GetPublicKeyResponse;
 import com.huimv.video.dhicc.test.response.GetTokenResponse;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -3,6 +3,7 @@ package com.huimv.video.dhicc.test.request;
 
 import com.dahuatech.icc.oauth.profile.GrantType;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.request.Oauth.GetTokenRequestTest01;
 import com.huimv.video.dhicc.test.response.GetTokenResponse;
 import com.huimv.video.dhicc.test.schedule.UpdateTokenSchedule;
 import com.huimv.video.dhicc.test.token.*;

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

@@ -3,6 +3,7 @@ package com.huimv.video.dhicc.test.request;
 
 import com.dahuatech.icc.oauth.profile.GrantType;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.request.Oauth.GetTokenRequestTest02;
 import com.huimv.video.dhicc.test.response.GetTokenResponse;
 import com.huimv.video.dhicc.test.schedule.UpdateTokenSchedule;
 import com.huimv.video.dhicc.test.token.*;

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

@@ -3,6 +3,7 @@ package com.huimv.video.dhicc.test.request;
 
 import com.dahuatech.icc.oauth.profile.GrantType;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.request.Oauth.GetTokenRequestTest03;
 import com.huimv.video.dhicc.test.response.GetTokenResponse;
 import com.huimv.video.dhicc.test.schedule.UpdateTokenSchedule;
 import com.huimv.video.dhicc.test.token.*;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
-import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
-import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
-import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
-import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
-import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
-import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
-import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
-import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
-import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Cn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;
@@ -12,7 +13,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
-public class ClientCarListRequestHn extends BaseRequest02<Object>{
+public class ClientCarListRequestHn extends BaseRequest02<Object> {
 
 
     private Integer pageNum;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Hn;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;
@@ -13,7 +14,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
-public class ClientCarListRequestSg extends BaseRequest<Object>{
+public class ClientCarListRequestSg extends BaseRequest<Object> {
 
 
     private Integer pageNum;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Car.Sg;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Oauth;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.response.GetPublicKeyResponse;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Oauth;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.response.GetPublicKeyResponse;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;

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

@@ -1,8 +1,9 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Oauth;
 
 import com.alibaba.fastjson.JSON;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.response.GetPublicKeyResponse;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;

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

@@ -1,4 +1,4 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Oauth;
 
 
 import com.huimv.video.dhicc.test.other.BaseRes;

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

@@ -1,10 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Oauth;
 
 import com.alibaba.fastjson.JSON;
 import com.dahuatech.icc.util.SignUtil;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigUserPwdInfoTest01;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.response.GetPublicKeyResponse;
 import com.huimv.video.dhicc.test.response.GetTokenResponse;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;

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

@@ -1,10 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Oauth;
 
 import com.alibaba.fastjson.JSON;
 import com.dahuatech.icc.util.SignUtil;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigUserPwdInfoTest02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.response.GetPublicKeyResponse;
 import com.huimv.video.dhicc.test.response.GetTokenResponse;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;

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

@@ -1,12 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Oauth;
 
 import com.alibaba.fastjson.JSON;
 import com.dahuatech.icc.util.SignUtil;
-import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
-import com.huimv.video.dhicc.test.config.OauthConfigUserPwdInfoTest02;
 import com.huimv.video.dhicc.test.config.OauthConfigUserPwdInfoTest03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.response.GetPublicKeyResponse;
 import com.huimv.video.dhicc.test.response.GetTokenResponse;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;

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

@@ -1,10 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Oauth;
 
 import com.alibaba.fastjson.JSON;
 import com.dahuatech.icc.oauth.model.v202010.OauthRefreshTokenResponse;
 import com.dahuatech.icc.oauth.profile.GrantType;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;
 import lombok.Data;

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

@@ -1,9 +1,10 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Oauth;
 
 import com.alibaba.fastjson.JSON;
 import com.dahuatech.icc.oauth.profile.GrantType;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.response.OauthRefreshTokenResponse;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -1,10 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Oauth;
 
 import com.alibaba.fastjson.JSON;
 import com.dahuatech.icc.oauth.profile.GrantType;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.response.OauthRefreshTokenResponse;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request.Person.Cn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonAddPictureRequestCn extends BaseRequest03<Object> {
+
+
+
+    private Map<String,Object> file;
+
+
+    public ClientPersonAddPictureRequestCn() {
+    }
+
+    public ClientPersonAddPictureRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_ADD_PICTURE, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        Object data = jsonObject.get("data");
+//        GeneralResponse devicePageResponse = JSON.parseObject(res, GeneralResponse.class);
+        System.out.println(data);
+        return data;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("file", this.file);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.huimv.video.dhicc.test.request.Person.Cn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonAddRequestCn extends BaseRequest03<JSONObject> {
+
+
+
+    private Integer pagerType;
+    private Integer code;
+    private Integer departmentId;
+    private String name;
+    private String paperNumber;
+    private Integer phone;
+    private Integer id;
+
+
+    public ClientPersonAddRequestCn() {
+    }
+
+    public ClientPersonAddRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_ADD, true);
+    }
+
+    @Override
+    public JSONObject doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+//        Object data = jsonObject.get("data");
+//        GeneralResponse devicePageResponse = JSON.parseObject(res, GeneralResponse.class);
+//        System.out.println(data);
+        return jsonObject;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pagerType", this.pagerType);
+        map.put("code", this.code);
+        map.put("departmentId", this.departmentId);
+        map.put("name", this.name);
+        map.put("paperNumber", this.paperNumber);
+        map.put("phone", this.phone);
+        map.put("id", this.id);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.huimv.video.dhicc.test.request.Person.Cn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ClientPersonDeleteRequestCn extends BaseRequest03<JSONObject> {
+
+
+
+    private List<Integer> ids;
+
+
+
+
+
+
+    public ClientPersonDeleteRequestCn() {
+    }
+
+    public ClientPersonDeleteRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_DELETE, true);
+    }
+
+    @Override
+    public JSONObject doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        return jsonObject;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("ids", this.ids);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.huimv.video.dhicc.test.request.Person.Cn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonDoorDetailRequestCn extends BaseRequest03<Object> {
+
+
+    private String id;
+
+
+    public ClientPersonDoorDetailRequestCn() {
+    }
+
+    public ClientPersonDoorDetailRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_CARD_DETAIL, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{id}", id));
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        Object action = jsonObject.get("data");
+        return action;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("id", this.id);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.huimv.video.dhicc.test.request.Person.Cn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonDoorListRequestCn extends BaseRequest03<Object> {
+
+
+
+    private Integer pageNum;
+    private String pageSize;
+    private String startSwingTime;
+    private String endSwingTime;
+    private String openResult;
+
+
+
+
+
+
+
+    public ClientPersonDoorListRequestCn() {
+    }
+
+    public ClientPersonDoorListRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_FACE_FAIL, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject=JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        Object action = jsonObject.get("data");
+        return action;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        map.put("startSwingTime", this.startSwingTime);
+        map.put("endSwingTime", this.endSwingTime);
+        map.put("openResult", this.openResult);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.huimv.video.dhicc.test.request.Person.Cn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonDoorRecordRequestCn extends BaseRequest03<Object> {
+
+
+
+    private Integer pageNum;
+    private String pageSize;
+    private String startSwingTime;
+
+
+
+
+
+
+
+
+    public ClientPersonDoorRecordRequestCn() {
+    }
+
+    public ClientPersonDoorRecordRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_FACE_FAIL, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject=JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        Object action = jsonObject.get("data");
+        return action;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        map.put("startSwingTime", this.startSwingTime);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.huimv.video.dhicc.test.request.Person.Cn;
+
+import com.alibaba.fastjson.JSON;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ClientPersonSaveRequestCn extends BaseRequest03<Object> {
+
+
+
+    private List<Object> personBiosignatures;
+
+
+
+    public ClientPersonSaveRequestCn() {
+    }
+
+    public ClientPersonSaveRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_PUT, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_SAVE, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPut(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+        System.out.println(res);
+        //获取响应
+//        JSONObject jsonObject = JSONObject.parseObject(res);
+//        Object data = jsonObject.get("data");
+//        GeneralResponse devicePageResponse = JSON.parseObject(res, GeneralResponse.class);
+//        System.out.println(data);
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("personBiosignatures", this.personBiosignatures);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request.Person.Hn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonAddPictureRequestHn extends BaseRequest02<Object> {
+
+
+
+    private Map<String,Object> file;
+
+
+    public ClientPersonAddPictureRequestHn() {
+    }
+
+    public ClientPersonAddPictureRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_ADD_PICTURE, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        Object data = jsonObject.get("data");
+//        GeneralResponse devicePageResponse = JSON.parseObject(res, GeneralResponse.class);
+        System.out.println(data);
+        return data;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("file", this.file);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.huimv.video.dhicc.test.request.Person.Hn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonAddRequestHn extends BaseRequest02<JSONObject> {
+
+
+
+    private Integer pagerType;
+    private Integer code;
+    private Integer departmentId;
+    private String name;
+    private String paperNumber;
+    private Integer phone;
+    private Integer id;
+
+
+    public ClientPersonAddRequestHn() {
+    }
+
+    public ClientPersonAddRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_ADD, true);
+    }
+
+    @Override
+    public JSONObject doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+//        Object data = jsonObject.get("data");
+//        GeneralResponse devicePageResponse = JSON.parseObject(res, GeneralResponse.class);
+//        System.out.println(data);
+        return jsonObject;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pagerType", this.pagerType);
+        map.put("code", this.code);
+        map.put("departmentId", this.departmentId);
+        map.put("name", this.name);
+        map.put("paperNumber", this.paperNumber);
+        map.put("phone", this.phone);
+        map.put("id", this.id);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.huimv.video.dhicc.test.request.Person.Hn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ClientPersonDeleteRequestHn extends BaseRequest02<JSONObject> {
+
+
+
+    private List<Integer> ids;
+
+
+
+
+
+
+    public ClientPersonDeleteRequestHn() {
+    }
+
+    public ClientPersonDeleteRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_DELETE, true);
+    }
+
+    @Override
+    public JSONObject doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        return jsonObject;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("ids", this.ids);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.huimv.video.dhicc.test.request.Person.Hn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonDoorDetailRequestHn extends BaseRequest02<Object> {
+
+
+    private String id;
+
+
+    public ClientPersonDoorDetailRequestHn() {
+    }
+
+    public ClientPersonDoorDetailRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_CARD_DETAIL, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{id}", id));
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        Object action = jsonObject.get("data");
+        return action;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("id", this.id);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.huimv.video.dhicc.test.request.Person.Hn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonDoorListRequestHn extends BaseRequest02<Object> {
+
+
+
+    private Integer pageNum;
+    private String pageSize;
+    private String startSwingTime;
+    private String endSwingTime;
+    private String openResult;
+
+
+
+
+
+
+
+    public ClientPersonDoorListRequestHn() {
+    }
+
+    public ClientPersonDoorListRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_FACE_FAIL, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject=JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        Object action = jsonObject.get("data");
+        return action;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        map.put("startSwingTime", this.startSwingTime);
+        map.put("endSwingTime", this.endSwingTime);
+        map.put("openResult", this.openResult);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.huimv.video.dhicc.test.request.Person.Hn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonDoorRecordRequestHn extends BaseRequest02<Object> {
+
+
+
+    private Integer pageNum;
+    private String pageSize;
+    private String startSwingTime;
+
+
+
+
+
+
+
+
+    public ClientPersonDoorRecordRequestHn() {
+    }
+
+    public ClientPersonDoorRecordRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_FACE_FAIL, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject=JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        Object action = jsonObject.get("data");
+        return action;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("startSwingTime", this.pageSize);
+        map.put("startSwingTime", this.startSwingTime);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.huimv.video.dhicc.test.request.Person.Hn;
+
+import com.alibaba.fastjson.JSON;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ClientPersonSaveRequestHn extends BaseRequest02<Object> {
+
+
+
+    private List<Object> personBiosignatures;
+
+
+
+    public ClientPersonSaveRequestHn() {
+    }
+
+    public ClientPersonSaveRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_PUT, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_SAVE, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPut(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+        System.out.println(res);
+        //获取响应
+//        JSONObject jsonObject = JSONObject.parseObject(res);
+//        Object data = jsonObject.get("data");
+//        GeneralResponse devicePageResponse = JSON.parseObject(res, GeneralResponse.class);
+//        System.out.println(data);
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("personBiosignatures", this.personBiosignatures);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.huimv.video.dhicc.test.request.Person.Sg;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonAddPictureRequestSg extends BaseRequest<Object> {
+
+
+
+    private Map<String,Object> file;
+
+
+    public ClientPersonAddPictureRequestSg() {
+    }
+
+    public ClientPersonAddPictureRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_ADD_PICTURE, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        Object data = jsonObject.get("data");
+//        GeneralResponse devicePageResponse = JSON.parseObject(res, GeneralResponse.class);
+        System.out.println(data);
+        return data;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("file", this.file);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.huimv.video.dhicc.test.request.Person.Sg;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonAddRequestSg extends BaseRequest<JSONObject> {
+
+
+
+    private Integer pagerType;
+    private Integer code;
+    private Integer departmentId;
+    private String name;
+    private String paperNumber;
+    private Integer phone;
+    private Integer id;
+
+
+    public ClientPersonAddRequestSg() {
+    }
+
+    public ClientPersonAddRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_ADD, true);
+    }
+
+    @Override
+    public JSONObject doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+//        Object data = jsonObject.get("data");
+//        GeneralResponse devicePageResponse = JSON.parseObject(res, GeneralResponse.class);
+//        System.out.println(data);
+        return jsonObject;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pagerType", this.pagerType);
+        map.put("code", this.code);
+        map.put("departmentId", this.departmentId);
+        map.put("name", this.name);
+        map.put("paperNumber", this.paperNumber);
+        map.put("phone", this.phone);
+        map.put("id", this.id);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,66 @@
+package com.huimv.video.dhicc.test.request.Person.Sg;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ClientPersonDeleteRequestSg extends BaseRequest<JSONObject> {
+
+
+
+    private List<Integer> ids;
+
+
+
+
+
+
+    public ClientPersonDeleteRequestSg() {
+    }
+
+    public ClientPersonDeleteRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_DELETE, true);
+    }
+
+    @Override
+    public JSONObject doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        return jsonObject;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("ids", this.ids);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request.Person.Sg;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonDoorDetailRequestSg extends BaseRequest<Object> {
+
+
+    private String id;
+
+
+    public ClientPersonDoorDetailRequestSg() {
+    }
+
+    public ClientPersonDoorDetailRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_CARD_DETAIL, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{id}", id));
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        Object action = jsonObject.get("data");
+        return action;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("id", this.id);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,76 @@
+package com.huimv.video.dhicc.test.request.Person.Sg;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ClientPersonDoorListRequestSg extends BaseRequest<Object> {
+
+
+
+    private Integer pageNum;
+    private String pageSize;
+    private String startSwingTime;
+    private String endSwingTime;
+    private String openResult;
+
+
+
+
+
+
+
+    public ClientPersonDoorListRequestSg() {
+    }
+
+    public ClientPersonDoorListRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_FACE_FAIL, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject=JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        Object action = jsonObject.get("data");
+        return action;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        map.put("startSwingTime", this.startSwingTime);
+        map.put("endSwingTime", this.endSwingTime);
+        map.put("openResult", this.openResult);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,71 @@
+package com.huimv.video.dhicc.test.request.Person.Sg;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class ClientPersonDoorRecordRequestSg extends BaseRequest<Object> {
+
+
+
+    private Integer pageNum;
+    private String pageSize;
+    private String startSwingTime;
+
+
+
+
+
+
+
+
+    public ClientPersonDoorRecordRequestSg() {
+    }
+
+    public ClientPersonDoorRecordRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_FACE_FAIL, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+
+        System.out.println(res);
+        //获取响应
+        JSONObject jsonObject=JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        Object action = jsonObject.get("data");
+        return action;
+    }
+
+    private void setBody() {
+        //设置请求参数
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        map.put("startSwingTime", this.startSwingTime);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request.Person.Sg;
+
+import com.alibaba.fastjson.JSON;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class ClientPersonSaveRequestSg extends BaseRequest<Object> {
+
+
+
+    private List<Object> personBiosignatures;
+
+
+
+    public ClientPersonSaveRequestSg() {
+    }
+
+    public ClientPersonSaveRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_PUT, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_PERSON_SAVE, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPut(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+        System.out.println(res);
+        //获取响应
+//        JSONObject jsonObject = JSONObject.parseObject(res);
+//        Object data = jsonObject.get("data");
+//        GeneralResponse devicePageResponse = JSON.parseObject(res, GeneralResponse.class);
+//        System.out.println(data);
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("personBiosignatures", this.personBiosignatures);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -1,10 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Video;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;
@@ -14,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
-public class ClientAllVideoPlayBackRequestCn extends BaseRequest03<Object>{
+public class ClientAllVideoPlayBackRequestCn extends BaseRequest03<Object> {
 
 
     private String clientPushId;

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

@@ -1,10 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Video;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;
@@ -14,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
-public class ClientAllVideoPlayBackRequestHn extends BaseRequest02<Object>{
+public class ClientAllVideoPlayBackRequestHn extends BaseRequest02<Object> {
 
 
     private String clientPushId;

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

@@ -1,10 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Video;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.response.PersonListResponseSg;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
@@ -15,7 +16,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
-public class ClientAllVideoPlayBackRequestSg extends BaseRequest<Object>{
+public class ClientAllVideoPlayBackRequestSg extends BaseRequest<Object> {
 
 
     private String clientPushId;

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

@@ -0,0 +1,62 @@
+package com.huimv.video.dhicc.test.request.Video;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class VideoRecordQueryRequestCn extends BaseRequest03<JSONObject> {
+
+
+    private Map<String,Object> data;
+
+
+    public VideoRecordQueryRequestCn() {
+    }
+
+    public VideoRecordQueryRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_VIDEO_QUERY, true);
+    }
+
+    @Override
+    public JSONObject doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+     //   System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        JSONObject data = (JSONObject) jsonObject.get("data");
+        // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
+
+        return data;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.huimv.video.dhicc.test.request.Video;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class VideoRecordQueryRequestHn extends BaseRequest02<JSONObject> {
+
+
+    private Map<String,Object> data;
+
+
+    public VideoRecordQueryRequestHn() {
+    }
+
+    public VideoRecordQueryRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_VIDEO_QUERY, true);
+    }
+
+    @Override
+    public JSONObject doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+     //   System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        JSONObject data = (JSONObject) jsonObject.get("data");
+        // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
+
+        return data;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.huimv.video.dhicc.test.request.Video;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class VideoRecordQueryRequestSg extends BaseRequest<JSONObject> {
+
+
+    private Map<String,Object> data;
+
+
+    public VideoRecordQueryRequestSg() {
+    }
+
+    public VideoRecordQueryRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_VIDEO_QUERY, true);
+    }
+
+    @Override
+    public JSONObject doAction() {
+        //重置url信息，替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader()) : HttpsURLConnectionUtil.doPost(this.getUrl(), this.getBody(), this.getHeader());
+     //   System.out.println(res);
+        //获取响应
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        System.out.println(jsonObject);
+        JSONObject data = (JSONObject) jsonObject.get("data");
+        // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
+
+        return data;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -1,10 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Video;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;
@@ -13,7 +14,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
-public class VideoRecordRequestCn extends BaseRequest03<Object>{
+public class VideoRecordRequestCn extends BaseRequest03<Object> {
 
     private String clientMac;
 

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

@@ -1,10 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Video;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;
@@ -14,7 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
-public class VideoRecordRequestHn extends BaseRequest02<Object>{
+public class VideoRecordRequestHn extends BaseRequest02<Object> {
 
     private String clientMac;
 

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

@@ -1,10 +1,11 @@
-package com.huimv.video.dhicc.test.request;
+package com.huimv.video.dhicc.test.request.Video;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
 import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
 import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
 import com.huimv.video.dhicc.test.utils.UrlUtil;
@@ -14,15 +15,15 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
-public class VideoRecordRequestSg extends BaseRequest<Object>{
+public class VideoRecordRequestSg extends BaseRequest<Object> {
 
-    private String clientMac;
+  /*  private String clientMac;
 
     private String clientPushId;
 
     private String project;
 
-    private String method;
+    private String method;*/
 
     private Map<String,Object> data;
 
@@ -54,10 +55,10 @@ public class VideoRecordRequestSg extends BaseRequest<Object>{
     private void setBody() {
         //设置请求参数
         Map<String, Object> map = new HashMap<>();
-        map.put("pageNum", this.clientMac);
-        map.put("pageSize", this.clientPushId);
-        map.put("isContain", this.project);
-        map.put("searchKey", this.method);
+     /*   map.put("clientMac", this.clientMac);
+        map.put("clientPushId", this.clientPushId);
+        map.put("project", this.project);
+        map.put("method", this.method);*/
         map.put("data", this.data);
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Cn/XunZhengCountRequestCn.java

@@ -61,8 +61,10 @@ public class XunZhengCountRequestCn extends BaseRequest03 {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Cn/XunZhengRequestCn.java

@@ -70,8 +70,10 @@ public class XunZhengRequestCn extends BaseRequest03 {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Hn/XunZhengCountRequestHn.java

@@ -61,8 +61,10 @@ public class XunZhengCountRequestHn extends BaseRequest02 {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Hn/XunZhengRequestHn.java

@@ -68,8 +68,10 @@ public class XunZhengRequestHn extends BaseRequest02 {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Sg/XunZhengCountRequestSg.java

@@ -59,8 +59,10 @@ public class XunZhengCountRequestSg extends BaseRequest {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Sg/XunZhengRequestSg.java

@@ -66,8 +66,10 @@ public class XunZhengRequestSg extends BaseRequest {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/schedule/UpdateTokenSchedule.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.dahuatech.icc.oauth.model.v202010.OauthRefreshTokenResponse;
 import com.dahuatech.icc.oauth.profile.GrantType;
 import com.huimv.video.dhicc.test.config.*;
-import com.huimv.video.dhicc.test.request.OauthRefreshTokenRequest;
+import com.huimv.video.dhicc.test.request.Oauth.OauthRefreshTokenRequest;
 import com.huimv.video.dhicc.test.token.LocalTokenStore;
 import com.huimv.video.dhicc.test.token.RedisTokenStore;
 import com.huimv.video.dhicc.test.token.Token;

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/service/IOauthService.java

@@ -1,7 +1,7 @@
 package com.huimv.video.dhicc.test.service;
 
 
-import com.huimv.video.dhicc.test.request.GetPublicKeyRes;
+import com.huimv.video.dhicc.test.request.Oauth.GetPublicKeyRes;
 import com.huimv.video.dhicc.test.response.GetTokenResponse;
 
 import java.util.Map;

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/service/impl/OauthService.java

@@ -2,7 +2,7 @@ package com.huimv.video.dhicc.test.service.impl;
 
 import com.huimv.video.dhicc.test.manager.IOauthIntegrationManager;
 import com.huimv.video.dhicc.test.other.BaseService;
-import com.huimv.video.dhicc.test.request.GetPublicKeyRes;
+import com.huimv.video.dhicc.test.request.Oauth.GetPublicKeyRes;
 import com.huimv.video.dhicc.test.response.GetPublicKeyResponse;
 import com.huimv.video.dhicc.test.response.GetTokenResponse;
 import com.huimv.video.dhicc.test.service.IOauthService;