wwh 2 年之前
父節點
當前提交
c2153510ad
共有 50 個文件被更改,包括 3876 次插入44 次删除
  1. 41 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/constant/Constant.java
  2. 162 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientAllEventControllerTest.java
  3. 178 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientAllVideoPlayBackGTest.java
  4. 516 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientCarManageControllerTest.java
  5. 16 1
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientPersonManageControllerTest.java
  6. 55 43
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/VideoRecorControllerSg.java
  7. 79 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientAllEventRecordRequestSg.java
  8. 68 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientAllVideoPlayBackRequestCn.java
  9. 68 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientAllVideoPlayBackRequestHn.java
  10. 69 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientAllVideoPlayBackRequestSg.java
  11. 106 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarAddRequestCn.java
  12. 106 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarAddRequestHn.java
  13. 106 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarAddRequestSg.java
  14. 62 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarAllListRequestCn.java
  15. 62 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarAllListRequestHn.java
  16. 61 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarAllListRequestSg.java
  17. 61 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBaseDeleteRequestCn.java
  18. 61 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBaseDeleteRequestHn.java
  19. 60 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBaseDeleteRequestSg.java
  20. 63 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBlackAddRequestCn.java
  21. 63 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBlackAddRequestHn.java
  22. 64 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBlackAddRequestSg.java
  23. 61 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBlackDeleteRequestCn.java
  24. 61 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBlackDeleteRequestHn.java
  25. 60 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBlackDeleteRequestSg.java
  26. 58 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBlackListRequestCn.java
  27. 58 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBlackListRequestHn.java
  28. 57 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarBlackListRequestSg.java
  29. 68 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarCaptureRequestCn.java
  30. 68 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarCaptureRequestHn.java
  31. 69 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarCaptureRequestSg.java
  32. 55 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarDeleteRequestCn.java
  33. 55 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarDeleteRequestHn.java
  34. 54 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarDeleteRequestSg.java
  35. 67 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarListRequestCn.java
  36. 66 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarListRequestHn.java
  37. 67 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarListRequestSg.java
  38. 63 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarWhiteAddRequestCn.java
  39. 63 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarWhiteAddRequestHn.java
  40. 62 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarWhiteAddRequestSg.java
  41. 61 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarWhiteDeleteRequestCn.java
  42. 61 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarWhiteDeleteRequestHn.java
  43. 60 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarWhiteDeleteRequestSg.java
  44. 58 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarWhiteListRequestCn.java
  45. 58 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarWhiteListRequestHn.java
  46. 57 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientCarWhiteListRequestSg.java
  47. 73 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/PersonListRequestCn.java
  48. 69 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/VideoRecordRequestCn.java
  49. 70 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/VideoRecordRequestHn.java
  50. 70 0
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/VideoRecordRequestSg.java

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

@@ -237,4 +237,45 @@ public class Constant {
     //personList
     public static final String CHANNEL_URL_PERSON_LIST = "/evo-apigw/evo-brm/1.2.0/person/page";
 
+    //videoRecord
+    public static final String CHANNEL_URL_VIDEO_RECORD = "/evo-apigw/admin/API/SS/Playback/StartPlaybackByTime";
+
+    //获取事件url
+    public static final String CHANNEL_URL_ALARM_RECORD = "/evo-apigw/evo-event/1.2.0/alarm-record/page";
+
+    //车辆列表
+    public static final String CAR_LIST = "/evo-apigw/ipms/car/list";
+
+    //添加车辆
+    public static final String CAR_LIST_ADD = "/evo-apigw/ipms/car/add";
+
+    //删除车辆
+    public static final String CAR_LIST_DELETE = "/evo-apigw/ipms/car/delete/{id}";
+
+    //白名单列表
+    public static final String CAR_WHITE_LIST = "/evo-apigw/ipms/carWhiteList/sendCars?pageNum={pageNum}&pageSize={pageSize}";
+
+    //黑名单列表
+    public static final String CAR_BLACK_LIST = "/evo-apigw/ipms/carBlackList/sendCars?pageNum={pageNum}&pageSize={pageSize}";
+
+    //所有名单列表
+    public static final String CAR_ALL_LIST = "/evo-apigw/ipms/carBlackList/unSendCars?pageNum={pageNum}&pageSize={pageSize}&draw={draw}";
+
+    //添加车辆进黑名单
+    public static final String CAR_BLACK_ADD = "/evo-apigw/ipms/carBlackList/update";
+
+    //添加车辆进黑名单
+    public static final String CAR_WHITE_ADD = "/evo-apigw/ipms/carWhiteList/update";
+
+    //从白名单删除
+    public static final String CAR_WHITE_DELETE = "/evo-apigw/ipms/carWhiteList/delete/batch";
+
+    //从黑名单删除
+    public static final String CAR_BLACK_DELETE = "evo-apigw/ipms/carBlackList/delete/batch";
+
+    //从基础列表中删除
+    public static final String CAR_BASE_DELETE = "/evo-apigw/ipms/car/delete/batch";
+
+    //车辆通行列表
+    public static final String CAR_CAPTURE_RECORD = "/evo-apigw/ipms/carcapture/find/conditions?pageNum={pageNum}&pageSize={pageSize}";
 }

+ 162 - 0
huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientAllEventControllerTest.java

@@ -0,0 +1,162 @@
+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;
+import com.dahuatech.icc.oauth.http.IClient;
+import com.dahuatech.icc.oauth.model.v202010.GeneralRequest;
+import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
+import com.huimv.common.utils.StringUtilsWork;
+import com.huimv.video.dhicc.icc.CommonConstant;
+import com.huimv.video.dhicc.result.R;
+import com.huimv.video.dhicc.service.IClientAllEventService;
+import com.huimv.video.dhicc.service.ISysTelecomEventService;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.request.ClientAllEventRecordRequestSg;
+import net.sf.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/client/event/test")
+public class ClientAllEventControllerTest {
+    @Autowired
+    private ISysTelecomEventService sysTelecomEventService;
+    @Autowired
+    private IClientAllEventService iClientAllEventService;
+    @Autowired
+    private OauthConfigBaseInfo oauthConfigBaseInfo;
+
+    //所有的事件接口
+    @RequestMapping("/ListAllEvent")
+    public R SiZhuList(@RequestBody Map<String, Object> params1) throws ClientException, ParseException {
+        Integer farmId = (int) params1.get("farmId");
+        if (farmId != 1) {
+            return R.ok("当前牧场无设备").put("data", null);
+        }
+        return R.ok("请求成功").put("data", getEventList(params1)).put("total", CountTimes(params1));
+    }
+
+
+    //返回所有的事件 的集合  包括死猪和洗消和大门 --分页参数
+    public Object getEventList(Map<String, Object> params1) throws ClientException {
+        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, 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);
+//        Map<String, Object> params = new HashMap<>();
+        ClientAllEventRecordRequestSg requestSg = new ClientAllEventRecordRequestSg(oauthConfigBaseInfo);
+        requestSg.setAlarmStartDateString(formatA);
+        requestSg.setAlarmEndDateString(formatD);
+
+        if (StringUtilsWork.isNotEmpty((String) params1.get("alarmStartDateString"))) {
+            requestSg.setAlarmStartDateString((String) params1.get("alarmStartDateString"));
+            requestSg.setAlarmEndDateString((String) params1.get("alarmEndDateString"));
+        }
+        requestSg.setPageNum((Integer) params1.get("pageNum"));
+        requestSg.setPageSize((Integer) params1.get("pageSize"));
+        requestSg.setAlarmType(303);
+        requestSg.setDbType(0);
+        requestSg.setDeviceCategory(1);
+        String[] nodeCodeList = CommonConstant.AllChannle;
+        requestSg.setNodeCodeList(nodeCodeList);
+        Object action = requestSg.doAction();
+
+      /*  String URL = "/evo-apigw/evo-event/1.2.0/alarm-record/page";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
+        generalRequest.header("Content-Type", " application/json");
+        generalRequest.body(JSON.toJSONString(params));
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());*/
+        return action;
+    }
+
+
+    public String CountTimes(Map<String, Object> params1) throws ClientException {
+        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, 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);
+        Map<String, Object> params = new HashMap<>();
+        params.put("alarmStartDateString", formatA);
+        params.put("alarmEndDateString", formatD);
+        if (StringUtilsWork.isNotEmpty((String) params1.get("alarmStartDateString"))) {
+            params.put("alarmStartDateString", params1.get("alarmStartDateString"));
+            params.put("alarmEndDateString", params1.get("alarmEndDateString"));
+        }
+        params.put("alarmType", 303);
+        params.put("dbType", 0);
+        params.put("deviceCategory", 1);
+        String[] nodeCodeList = CommonConstant.AllChannle;
+        params.put("nodeCodeList", nodeCodeList);
+        String URL = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
+        generalRequest.header("Content-Type", " application/json");
+        generalRequest.body(JSON.toJSONString(params));
+        JSONObject jsonObject = JSONObject.fromObject(JSONObject.fromObject(iClient.doAction(generalRequest, generalRequest.getResponseClass()).getResult()).get("data"));
+        return jsonObject.get("value").toString();
+    }
+
+    /**
+     * @Method : getEventBySort
+     * @Description : 分类查看事件
+     * @Params : [farmId, sort, startDateText, endDateText, pageNum, pageSize, request]
+     * @Return : com.huimv.video.dhicc.result.R
+     * @Author : ZhuoNing
+     * @Date : 2021/12/24
+     * @Time : 13:34
+     */
+    @RequestMapping(value = "/listEventBySort", method = RequestMethod.GET)
+    public R getEventBySort(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "sort", required = true) Integer sort,
+                            @RequestParam(value = "alarmStartDateString", required = true) String startDateText, @RequestParam(value = "alarmEndDateString", required = true) String endDateText,
+                            @RequestParam(value = "pageNum", required = true) Integer pageNum, @RequestParam(value = "pageSize", required = true) Integer pageSize, HttpServletRequest request) throws ClientException {
+        //牧场id
+        if (farmId != 1) {
+            return R.ok("当前牧场无数据。").put("data", null);
+        }
+        //事件分类
+        if (sort == null) {
+            return R.ok("请选择事件分类。").put("data", null);
+        }
+        System.out.println("farmId=" + farmId);
+        System.out.println("sort=" + sort);
+        System.out.println("startDateText=" + startDateText);
+        System.out.println("endDateText=" + endDateText);
+        System.out.println("pageNum=" + pageNum);
+        System.out.println("pageSize=" + pageSize);
+        System.out.println("request=" + request.toString());
+        //
+        return iClientAllEventService.getEventBySort(farmId, sort, startDateText, endDateText, pageNum, pageSize, request);
+    }
+
+
+}
+

File diff suppressed because it is too large
+ 178 - 0
huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientAllVideoPlayBackGTest.java


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

@@ -0,0 +1,516 @@
+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;
+import com.dahuatech.icc.oauth.http.IClient;
+import com.dahuatech.icc.oauth.model.v202010.GeneralRequest;
+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 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 javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+
+@RestController
+@RequestMapping("/carTest")
+public class ClientCarManageControllerTest {
+
+    @Autowired
+    private OauthConfigBaseInfo oauthConfigBaseInfo;
+    @Autowired
+    private OauthConfigBaseInfo02 oauthConfigBaseInfo02;
+    @Autowired
+    private OauthConfigBaseInfo03 oauthConfigBaseInfo03;
+
+    //列表车辆
+    @RequestMapping("/geCarList")
+    public Object geCarList(@RequestParam (name = "farmId") Integer farmId,
+                            @RequestParam (name = "pageNum") Integer pageNum,
+                            @RequestParam (name = "pageSize") Integer pageSize) throws ClientException {
+
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("曙光");
+            ClientCarListRequestSg requestSg = new ClientCarListRequestSg(oauthConfigBaseInfo);
+            requestSg.setPageNum(pageNum);
+            requestSg.setPageSize(pageSize);
+            System.out.println(requestSg);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        } else if (farmId == 22) {
+            System.out.println("海宁");
+            ClientCarListRequestHn requestHn = new ClientCarListRequestHn(oauthConfigBaseInfo02);
+            requestHn.setPageNum(pageNum);
+            requestHn.setPageSize(pageSize);
+            System.out.println(requestHn);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        } else if (farmId==21){
+            System.out.println("苍南");
+            ClientCarListRequestCn requestCn = new ClientCarListRequestCn(oauthConfigBaseInfo03);
+            requestCn.setPageNum(pageNum);
+            requestCn.setPageSize(pageSize);
+            System.out.println(requestCn);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+        return action;
+    }
+
+
+    //添加基础车辆
+    @RequestMapping("/addCarBase")
+    public Object addCarBase(@RequestParam (name = "carNum") String carNum,
+                             @RequestParam (name = "farmId") String farmId) throws ClientException {
+
+        Object action = null;
+        if ("1".equals(farmId)) {
+            System.out.println("曙光");
+            ClientCarAddRequestSg requestSg = new ClientCarAddRequestSg(oauthConfigBaseInfo);
+            requestSg.setCarCode(String.valueOf((Math.random() * 9 + 1) * 10000));
+            requestSg.setCarNum(carNum);
+            requestSg.setCarNumColor("0");
+            requestSg.setCarType("1");
+            requestSg.setCarBrand("-1");
+            requestSg.setCarColor("0");
+            requestSg.setListType(0);
+            requestSg.setParkType(1);
+            requestSg.setOwnerId(null);
+            requestSg.setParkinglotCode("1");
+            requestSg.setDeptName("技术部门");
+            requestSg.setDeptId("2");
+            System.out.println(requestSg);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        }  if ("22".equals(farmId)) {
+            System.out.println("海宁");
+            ClientCarAddRequestHn requestHn = new ClientCarAddRequestHn(oauthConfigBaseInfo02);
+            requestHn.setCarCode(String.valueOf((Math.random() * 9 + 1) * 10000));
+            requestHn.setCarNum(carNum);
+            requestHn.setCarNumColor("0");
+            requestHn.setCarType("1");
+            requestHn.setCarBrand("-1");
+            requestHn.setCarColor("0");
+            requestHn.setListType(0);
+            requestHn.setParkType(1);
+            requestHn.setOwnerId(null);
+            requestHn.setParkinglotCode("1");
+            requestHn.setDeptName("技术部门");
+            requestHn.setDeptId("2");
+            System.out.println(requestHn);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        }  if ("21".equals(farmId)) {
+            System.out.println("苍南");
+            ClientCarAddRequestCn requestCn = new ClientCarAddRequestCn(oauthConfigBaseInfo03);
+            requestCn.setCarCode(String.valueOf((Math.random() * 9 + 1) * 10000));
+            requestCn.setCarNum(carNum);
+            requestCn.setCarNumColor("0");
+            requestCn.setCarType("1");
+            requestCn.setCarBrand("-1");
+            requestCn.setCarColor("0");
+            requestCn.setListType(0);
+            requestCn.setParkType(1);
+            requestCn.setOwnerId(null);
+            requestCn.setParkinglotCode("1");
+            requestCn.setDeptName("技术部门");
+            requestCn.setDeptId("1");
+            System.out.println(requestCn);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+        return action;
+    }
+
+
+    //删除基础车辆
+    @RequestMapping("/deleteFromCarBase")
+    public Object deleteFromCarBase(@RequestBody Map<String, Object> params
+    ) throws ClientException {
+        Integer farmId = (int) params.get("farmId");
+        Object id = params.get("id");
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("曙光");
+            ClientCarDeleteRequestSg requestSg = new ClientCarDeleteRequestSg(oauthConfigBaseInfo);
+            requestSg.setId((String) id);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        } else if (farmId == 22) {
+            System.out.println("海宁");
+            ClientCarDeleteRequestHn requestHn = new ClientCarDeleteRequestHn(oauthConfigBaseInfo02);
+            requestHn.setId((String) id);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        } else if (farmId==21){
+            System.out.println("苍南");
+            ClientCarDeleteRequestCn requestCn = new ClientCarDeleteRequestCn(oauthConfigBaseInfo03);
+            requestCn.setId((String) id);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+        return action;
+    }
+
+
+    //白名单列表
+    @RequestMapping("/ShowCarWhiteList")
+    public Object ShowCarWhiteList(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId,
+                                            @RequestParam(name = "pageNum") String pageNum,//车辆编号
+                                            @RequestParam(name = "pageSize") String pageSize //车牌号
+    ) throws ClientException {
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("曙光");
+            ClientCarWhiteListRequestSg requestSg = new ClientCarWhiteListRequestSg(oauthConfigBaseInfo);
+            requestSg.setPageNum(pageNum);
+            requestSg.setPageSize(pageSize);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        } else if (farmId == 22) {
+            System.out.println("海宁");
+            ClientCarWhiteListRequestHn requestHn = new ClientCarWhiteListRequestHn(oauthConfigBaseInfo02);
+            requestHn.setPageNum(pageNum);
+            requestHn.setPageSize(pageSize);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        } else if (farmId==21) {
+            System.out.println("苍南");
+            ClientCarWhiteListRequestCn requestCn = new ClientCarWhiteListRequestCn(oauthConfigBaseInfo03);
+            requestCn.setPageNum(pageNum);
+            requestCn.setPageSize(pageSize);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+        return action;
+
+    }
+
+
+    //黑名单列表
+    @RequestMapping("/ShowCarBlackList")
+    public Object ShowCarBlackList(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId,
+                                            @RequestParam(name = "pageNum") String pageNum,//车辆编号
+                                            @RequestParam(name = "pageSize") String pageSize //车牌号
+    ) throws ClientException {
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("曙光");
+            ClientCarBlackListRequestSg requestSg = new ClientCarBlackListRequestSg(oauthConfigBaseInfo);
+            requestSg.setPageNum(pageNum);
+            requestSg.setPageSize(pageSize);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        } else if (farmId == 22) {
+            System.out.println("海宁");
+            ClientCarBlackListRequestHn requestHn = new ClientCarBlackListRequestHn(oauthConfigBaseInfo02);
+            requestHn.setPageNum(pageNum);
+            requestHn.setPageSize(pageSize);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        } else if (farmId==21) {
+            System.out.println("苍南");
+            ClientCarBlackListRequestCn requestCn = new ClientCarBlackListRequestCn(oauthConfigBaseInfo03);
+            requestCn.setPageNum(pageNum);
+            requestCn.setPageSize(pageSize);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+        return action;
+    }
+
+
+    //为添加到任何名单  //draw=4是白名单    draw=5是黑名单
+    @RequestMapping("/ShowUnSendCar")
+    public Object ShowUnSendCar(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId,
+                                         @RequestParam(name = "pageNum") String pageNum,//车辆编号
+                                         @RequestParam(name = "draw") Integer draw,//车辆编号
+                                         @RequestParam(name = "pageSize") String pageSize //车牌号
+    ) throws ClientException {
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("曙光");
+            ClientCarAllListRequestSg requestSg = new ClientCarAllListRequestSg(oauthConfigBaseInfo);
+            requestSg.setPageNum(pageNum);
+            requestSg.setPageSize(pageSize);
+            requestSg.setDraw(String.valueOf(draw));
+            Object action1 = requestSg.doAction();
+            action = action1;
+        } else if (farmId == 22) {
+            System.out.println("海宁");
+            ClientCarAllListRequestHn requestHn = new ClientCarAllListRequestHn(oauthConfigBaseInfo02);
+            requestHn.setPageNum(pageNum);
+            requestHn.setPageSize(pageSize);
+            requestHn.setDraw(String.valueOf(draw));
+            Object action1 = requestHn.doAction();
+            action = action1;
+        } else if (farmId==21) {
+            System.out.println("苍南");
+            ClientCarAllListRequestCn requestCn = new ClientCarAllListRequestCn(oauthConfigBaseInfo03);
+            requestCn.setPageNum(pageNum);
+            requestCn.setPageSize(pageSize);
+            requestCn.setDraw(String.valueOf(draw));
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+        return action;
+    }
+
+
+    //添加车辆进黑名单列表
+    @RequestMapping("/addCarBlackList")
+    public Object addCarBlackList(@RequestBody Map<String, Object> params) throws ClientException {
+        Integer farmId = (int) params.get("farmId");
+
+        List<String> carIdList = (List<String>) params.get("carIdList");
+        List<Object> a = new ArrayList<>();
+        for (String s : carIdList) {
+            Map<String, Object> value = new HashMap<>();
+            value.put("carId", s);
+            value.put("validStartDay", "2021-12-22");
+            value.put("validEndDay", "2036-12-22");
+            value.put("deviceCodes", "1002931,1002928");
+            a.add(value);
+        }
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientCarBlackAddRequestSg requestSg = new ClientCarBlackAddRequestSg(oauthConfigBaseInfo);
+            requestSg.setA(a);
+            System.out.println(requestSg);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        }  if (farmId == 22) {
+            System.out.println("haining");
+            ClientCarBlackAddRequestHn requestHn = new ClientCarBlackAddRequestHn(oauthConfigBaseInfo02);
+            requestHn.setA(a);
+            System.out.println(requestHn);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        }  if (farmId==21) {
+            System.out.println("cangnan");
+            ClientCarBlackAddRequestCn requestCn = new ClientCarBlackAddRequestCn(oauthConfigBaseInfo03);
+            requestCn.setA(a);
+            System.out.println(requestCn);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+        return action;
+    }
+
+    public static void main(String[] args) {
+        System.out.println((int) ((Math.random() * 9 + 1) * 10000));
+    }
+
+
+    //添加车辆进白名单列表
+    @RequestMapping("/addCarWhiteList")
+    public Object addCarWhiteList(@RequestBody Map<String, Object> params) throws ClientException {
+        Integer farmId = (int) params.get("farmId");
+
+        List<String> carIdList = (List<String>) params.get("carIdList");
+        List<Object> a = new ArrayList<>();
+        for (String s : carIdList) {
+            Map<String, Object> value = new HashMap<>();
+            value.put("carId", s);
+            value.put("validStartDay", "2021-12-22");
+            value.put("validEndDay", "2036-12-22");
+            value.put("deviceCodes", "1002931,1002928");
+            a.add(value);
+        }
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientCarWhiteAddRequestSg requestSg = new ClientCarWhiteAddRequestSg(oauthConfigBaseInfo);
+            requestSg.setA(a);
+            System.out.println(requestSg);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        } else if (farmId == 22) {
+            System.out.println("haining");
+            ClientCarWhiteAddRequestHn requestHn = new ClientCarWhiteAddRequestHn(oauthConfigBaseInfo02);
+            requestHn.setA(a);
+            System.out.println(requestHn);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        } else if (farmId==21) {
+            System.out.println("cangnan");
+            ClientCarWhiteAddRequestCn requestCn = new ClientCarWhiteAddRequestCn(oauthConfigBaseInfo03);
+            requestCn.setA(a);
+            System.out.println(requestCn);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+        return action;
+    }
+
+
+    //从白名单删除
+    @RequestMapping("/deleteFromCarWhiteList")
+    public Object deleteFromCarWhiteList(@RequestBody Map<String, Object> params
+    ) throws ClientException {
+        Integer farmId = (int) params.get("farmId");
+        List<String> carIdList = (List<String>) params.get("carIdList");
+        System.out.println(carIdList);
+
+        Object action=null;
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientCarWhiteDeleteRequestSg requestSg = new ClientCarWhiteDeleteRequestSg(oauthConfigBaseInfo);
+            requestSg.setA(carIdList);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        } else if (farmId == 22) {
+            System.out.println("hangning");
+            ClientCarWhiteDeleteRequestHn requestHn = new ClientCarWhiteDeleteRequestHn(oauthConfigBaseInfo02);
+            requestHn.setA(carIdList);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        } else if (farmId==21) {
+            System.out.println("cangnan");
+            ClientCarWhiteDeleteRequestCn requestCn = new ClientCarWhiteDeleteRequestCn(oauthConfigBaseInfo03);
+            requestCn.setA(carIdList);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+        return action;
+    }
+
+    //从黑名单删除
+    @RequestMapping("/deleteFromCarBlackList")
+    public Object deleteFromCarBlackList(@RequestBody Map<String, Object> params
+    ) throws ClientException {
+        Integer farmId = (int) params.get("farmId");
+        List<String> carIdList = (List<String>) params.get("carIdList");
+        System.out.println(carIdList);
+
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientCarBlackDeleteRequestSg requestSg = new ClientCarBlackDeleteRequestSg(oauthConfigBaseInfo);
+            requestSg.setA(carIdList);
+            Object action1 = requestSg.doAction();
+            action = action1;
+        } else if (farmId == 22) {
+            System.out.println("hangning");
+            ClientCarBlackDeleteRequestHn requestHn = new ClientCarBlackDeleteRequestHn(oauthConfigBaseInfo02);
+            requestHn.setA(carIdList);
+            Object action1 = requestHn.doAction();
+            action = action1;
+        } else if (farmId==21) {
+            System.out.println("cangnan");
+            ClientCarBlackDeleteRequestCn requestCn = new ClientCarBlackDeleteRequestCn(oauthConfigBaseInfo03);
+            requestCn.setA(carIdList);
+            Object action1 = requestCn.doAction();
+            action = action1;
+        }
+        return action;
+    }
+
+
+    //从基础表中删除
+    @RequestMapping("/deleteFromBaseCarList")
+    public Object deleteFromBaseCarList(@RequestBody Map<String, Object> params
+    ) throws ClientException {
+        Integer farmId = (int) params.get("farmId");
+        List<String> carIdList = (List<String>) params.get("carIdList");
+        System.out.println(carIdList);
+
+        Object action1 = null;
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientCarBaseDeleteRequestSg requestSg = new ClientCarBaseDeleteRequestSg(oauthConfigBaseInfo);
+            requestSg.setA(carIdList);
+            Object action = requestSg.doAction();
+            action1 = action;
+        } else if (farmId == 22) {
+            System.out.println("hangning");
+            ClientCarBaseDeleteRequestHn requestHn = new ClientCarBaseDeleteRequestHn(oauthConfigBaseInfo02);
+            requestHn.setA(carIdList);
+            Object action = requestHn.doAction();
+            action1 = action;
+        } else if (farmId==21) {
+            System.out.println("cangnan");
+            ClientCarBaseDeleteRequestCn requestCn = new ClientCarBaseDeleteRequestCn(oauthConfigBaseInfo03);
+            requestCn.setA(carIdList);
+            Object action = requestCn.doAction();
+            action1 = action;
+        }
+        return action1;
+    }
+
+
+    //过车的数据
+
+    /**
+     * 保存ntamade
+     */
+    @RequestMapping("/get_car_record")
+    public Object getCarRecord(HttpServletRequest request, @RequestParam(name = "farmId") Integer farmId
+            , @RequestParam(name = "pageNum") String pageNum
+            , @RequestParam(name = "pageSize") String pageSize) throws ClientException {
+        Object action = null;
+        if (farmId == 1) {
+            System.out.println("shuguang");
+            ClientCarCaptureRequestSg requestSg = new ClientCarCaptureRequestSg(oauthConfigBaseInfo);
+            requestSg.setPageNum(pageNum);
+            requestSg.setPageSize(pageSize);
+            Object action1 = requestSg.doAction();
+            System.out.println("执行结束");
+            action = action1;
+        } else if (farmId == 22) {
+            System.out.println("haining");
+            ClientCarCaptureRequestHn requestHn = new ClientCarCaptureRequestHn(oauthConfigBaseInfo02);
+            requestHn.setPageNum(pageNum);
+            requestHn.setPageSize(pageSize);
+            Object action1 = requestHn.doAction();
+            System.out.println("执行结束");
+            action = action1;
+        } else if (farmId==21){
+            System.out.println("cangnan");
+            ClientCarCaptureRequestCn requestCn = new ClientCarCaptureRequestCn(oauthConfigBaseInfo03);
+            requestCn.setPageNum(pageNum);
+            requestCn.setPageSize(pageSize);
+            Object action1 = requestCn.doAction();
+            System.out.println("执行结束");
+            action = action1;
+        }
+        return action;
+
+    }
+
+
+    @RequestMapping("/get_person_detail")
+    public GeneralResponse getPersonDetail(@RequestBody Map<String, Object> params) throws ClientException {
+
+        Integer farmId = (int) params.get("farmId");
+        if (farmId != 1) {
+            //返回为空数据
+            return new GeneralResponse();
+        }
+        String URL = "/evo-apigw/evo-accesscontrol/${version}/card/accessControl/swingCardRecord/19241";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        System.out.println("开始执行");
+        String URL_id = URL + params.get("id");
+        //这种已经在配置文件里面安排了账号ip以及密码
+        GeneralRequest generalRequest = new GeneralRequest(URL_id, Method.POST);
+        generalRequest.header("Content-Type", " application/json");
+        //发起请求处理应答
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("执行结束");
+        return generalResponse;
+    }
+
+
+}

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

@@ -3,6 +3,8 @@ package com.huimv.video.dhicc.test.controller;
 import com.dahuatech.icc.exception.ClientException;
 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.PersonListRequestCn;
 import com.huimv.video.dhicc.test.request.PersonListRequestHn;
 import com.huimv.video.dhicc.test.request.PersonListRequestSg;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,8 @@ public class ClientPersonManageControllerTest {
     private OauthConfigBaseInfo oauthConfigBaseInfo;
     @Autowired
     private OauthConfigBaseInfo02 oauthConfigBaseInfo02;
+    @Autowired
+    private OauthConfigBaseInfo03 oauthConfigBaseInfo03;
 
 
     @RequestMapping("/ge_person_list")
@@ -35,7 +39,7 @@ public class ClientPersonManageControllerTest {
             requestSg.setStatusList(personListRequestSg.getStatusList());
             String s = requestSg.doAction();
             return s;
-        } else {
+        } else if (farmId == 2) {
             PersonListRequestHn requestHn = new PersonListRequestHn(oauthConfigBaseInfo02);
             requestHn.setDepartmentId(personListRequestSg.getDepartmentId());
             requestHn.setIsContain(personListRequestSg.getIsContain());
@@ -46,6 +50,17 @@ public class ClientPersonManageControllerTest {
             String s = requestHn.doAction();
             System.out.println("海宁");
             return s;
+        } else {
+            PersonListRequestCn requestCn = new PersonListRequestCn(oauthConfigBaseInfo03);
+            requestCn.setDepartmentId(personListRequestSg.getDepartmentId());
+            requestCn.setIsContain(personListRequestSg.getIsContain());
+            requestCn.setPageNum(personListRequestSg.getPageNum());
+            requestCn.setPageSize(personListRequestSg.getPageSize());
+            requestCn.setSearchKey(personListRequestSg.getSearchKey());
+            requestCn.setStatusList(personListRequestSg.getStatusList());
+            String s = requestCn.doAction();
+            System.out.println("苍南");
+            return s;
         }
 
 

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

@@ -2,20 +2,22 @@ package com.huimv.video.dhicc.test.controller;
 
 //拿视频回放
 
-import com.alibaba.fastjson.JSON;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.dahuatech.hutool.http.Method;
 import com.dahuatech.icc.exception.ClientException;
-import com.dahuatech.icc.oauth.http.DefaultClient;
-import com.dahuatech.icc.oauth.http.IClient;
-import com.dahuatech.icc.oauth.model.v202010.GeneralRequest;
 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 net.sf.json.JSONObject;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,34 +41,27 @@ public class VideoRecorControllerSg {
 
     @Autowired
     private IccChannelMapper iccChannelMapper;
+    @Autowired
+    private OauthConfigBaseInfo oauthConfigBaseInfo;
+    @Autowired
+    private OauthConfigBaseInfo02 oauthConfigBaseInfo02;
+    @Autowired
+    private OauthConfigBaseInfo03 oauthConfigBaseInfo03;
 
     @RequestMapping("/getVideoRecord")
     public R getVideoRecord(@RequestBody Map<String, Object> params1) throws ClientException, ParseException {
         String happendTime = (String) params1.get("happendTime");
-        String channelNmae = (String) params1.get("channelName");
-        Integer farmId = (int) params1.get("farmId");
-
-        if (farmId != 1) {
-            return R.ok("当前牧场无设备").put("URL", null);
-        }
+        String channelId = (String) params1.get("channelId");
+        String farmId = (String) params1.get("farmId");
 
-        LambdaQueryWrapper<IccChannel> wrapper3 = Wrappers.lambdaQuery();
-        wrapper3.eq(IccChannel::getChannelName, channelNmae);
-        IccChannel iccChannel = iccChannelMapper.selectOne(wrapper3);
-        System.out.println(iccChannel);
-        String URL = "/evo-apigw/admin/API/SS/Playback/StartPlaybackByTime";  //获取事件URL    post请求
-        IClient iClient = new DefaultClient();
-        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
-        System.out.println("开始执行");
-        Map<String, Object> params = new HashMap<>();
         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", iccChannel.getChannelId());
-        System.out.println(iccChannel.toString());
+        value.put("channelId", channelId);
+
         //开始结束时间代为处理
         DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         //格式化传入的时间---拿传入时间前后五分钟的视频
@@ -77,26 +72,43 @@ public class VideoRecorControllerSg {
         String after = String.valueOf(GapAfter.getTime() / 1000);
         value.put("endTime", after);
         value.put("startTime", befor);
-        params.put("clientMac", "30:9c:23:79:40:08");
-        params.put("clientPushId", "");
-        params.put("project", "PSDK");
-        params.put("method", "SS.Playback.StartPlaybackByTime");
-        params.put("data", value);
-        generalRequest.body(JSON.toJSONString(params));
-        System.out.println(JSON.toJSONString(params));
-        //这种已经在配置文件里面安排了账号ip以及密码
-        generalRequest.header("Content-Type", " application/json");
-        //发起请求处理应答
-        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
-        JSONObject jsonObject = JSONObject.fromObject(generalResponse.getResult());
-        System.out.println(jsonObject.toString());
-        Object data = jsonObject.get("data");
-        String url = (String) JSONObject.fromObject(data).get("url");
-        String token = (String) JSONObject.fromObject(data).get("token");
-        // "|"  特殊字符需要加转义字符
-        String[] sourceStrArray = url.split("\\|");
-        String recordUrl = sourceStrArray[1] + "?token=" + token + "&trackID=701";
-        return R.ok("请求成功").put("URL", recordUrl);
+
+
+        if ("1".equals(farmId)) {
+            System.out.println("曙光");
+            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)) {
+            System.out.println("海宁");
+            VideoRecordRequestHn requestHn = new VideoRecordRequestHn(oauthConfigBaseInfo02);
+            requestHn.setClientMac("30:9c:23:79:40:08");
+            requestHn.setClientPushId("");
+            requestHn.setProject("PSDK");
+            requestHn.setMethod("SS.Playback.StartPlaybackByTime");
+            requestHn.setData(value);
+            Object jsonObject1 = requestHn.doAction();
+            System.out.println(jsonObject1);
+            return R.ok().put("data",jsonObject1);
+        } else {
+            System.out.println("苍南");
+            VideoRecordRequestCn requestCn = new VideoRecordRequestCn(oauthConfigBaseInfo03);
+            requestCn.setClientMac("30:9c:23:79:40:08");
+            requestCn.setClientPushId("");
+            requestCn.setProject("PSDK");
+            requestCn.setMethod("SS.Playback.StartPlaybackByTime");
+            requestCn.setData(value);
+            Object jsonObject1 = requestCn.doAction();
+            System.out.println(jsonObject1);
+            return R.ok().put("data",jsonObject1);
+        }
+
     }
 
 

+ 79 - 0
huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/ClientAllEventRecordRequestSg.java

@@ -0,0 +1,79 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientAllEventRecordRequestSg extends BaseRequest<Object>{
+
+
+    private String alarmStartDateString;
+
+    private String alarmEndDateString;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private Integer alarmType;
+
+    private Integer dbType;
+
+    private Integer deviceCategory;
+
+    private String[] nodeCodeList;
+
+
+    public ClientAllEventRecordRequestSg() {
+    }
+
+    public ClientAllEventRecordRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_ALARM_RECORD, 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");
+        // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
+
+        return data;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("alarmStartDateString", this.alarmStartDateString);
+        map.put("alarmEndDateString", this.alarmEndDateString);
+        map.put("alarmType", this.alarmType);
+        map.put("dbType", this.dbType);
+        map.put("deviceCategory", this.deviceCategory);
+        map.put("nodeCodeList", this.nodeCodeList);
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientAllVideoPlayBackRequestCn extends BaseRequest03<Object>{
+
+
+    private String clientPushId;
+
+    private String project;
+
+    private String method;
+
+    private Map<String,Object> data;
+
+
+    public ClientAllVideoPlayBackRequestCn() {
+    }
+
+    public ClientAllVideoPlayBackRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_VIDEO_RECORD, 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("clientPushId", this.clientPushId);
+        map.put("project", this.project);
+        map.put("method", this.method);
+        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientAllVideoPlayBackRequestHn extends BaseRequest02<Object>{
+
+
+    private String clientPushId;
+
+    private String project;
+
+    private String method;
+
+    private Map<String,Object> data;
+
+
+    public ClientAllVideoPlayBackRequestHn() {
+    }
+
+    public ClientAllVideoPlayBackRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_VIDEO_RECORD, 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("clientPushId", this.clientPushId);
+        map.put("project", this.project);
+        map.put("method", this.method);
+        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.huimv.video.dhicc.test.request;
+
+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.response.PersonListResponseSg;
+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 ClientAllVideoPlayBackRequestSg extends BaseRequest<Object>{
+
+
+    private String clientPushId;
+
+    private String project;
+
+    private String method;
+
+    private Map<String,Object> data;
+
+
+    public ClientAllVideoPlayBackRequestSg() {
+    }
+
+    public ClientAllVideoPlayBackRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_VIDEO_RECORD, 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("clientPushId", this.clientPushId);
+        map.put("project", this.project);
+        map.put("method", this.method);
+        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarAddRequestCn extends BaseRequest03<Object> {
+
+
+    /*车牌号码*/
+    private String carNum;
+
+    /*车辆编号*/
+    private String carCode;
+
+    /*汽车颜色*/
+    private String carColor;
+
+    /*车牌颜色*/
+    private String carNumColor;
+
+    /*车辆类型*/
+    private String carType;
+
+    /*黑白名单*/
+    private Integer listType;
+
+    /*人员id*/
+    private Long ownerId;
+
+    /*停车类型*/
+    private Integer parkType;
+
+    /*绑定场区编号*/
+    private String parkinglotCode;
+
+    /*车辆品牌*/
+    private String carBrand;
+
+    /*部门Id*/
+    private String deptId;
+
+    /*部门名称*/
+    private String deptName;
+
+
+    public ClientCarAddRequestCn() {
+    }
+
+    public ClientCarAddRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_LIST_ADD, 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 res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("carNum", this.carNum);
+        map.put("carCode", this.carCode);
+        map.put("carColor", this.carColor);
+        map.put("carNumColor", this.carNumColor);
+        map.put("carType", this.carType);
+        map.put("listType", this.listType);
+        map.put("ownerId", this.ownerId);
+        map.put("parkType", this.parkType);
+        map.put("parkinglotCode", this.parkinglotCode);
+        map.put("carBrand", this.carBrand);
+        map.put("deptId", this.deptId);
+        map.put("deptName", this.deptName);
+//        map.put("method", this.method);
+//        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarAddRequestHn extends BaseRequest02<Object> {
+
+
+    /*车牌号码*/
+    private String carNum;
+
+    /*车辆编号*/
+    private String carCode;
+
+    /*汽车颜色*/
+    private String carColor;
+
+    /*车牌颜色*/
+    private String carNumColor;
+
+    /*车辆类型*/
+    private String carType;
+
+    /*黑白名单*/
+    private Integer listType;
+
+    /*人员id*/
+    private Long ownerId;
+
+    /*停车类型*/
+    private Integer parkType;
+
+    /*绑定场区编号*/
+    private String parkinglotCode;
+
+    /*车辆品牌*/
+    private String carBrand;
+
+    /*部门Id*/
+    private String deptId;
+
+    /*部门名称*/
+    private String deptName;
+
+
+    public ClientCarAddRequestHn() {
+    }
+
+    public ClientCarAddRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_LIST_ADD, 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 res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("carNum", this.carNum);
+        map.put("carCode", this.carCode);
+        map.put("carColor", this.carColor);
+        map.put("carNumColor", this.carNumColor);
+        map.put("carType", this.carType);
+        map.put("listType", this.listType);
+        map.put("ownerId", this.ownerId);
+        map.put("parkType", this.parkType);
+        map.put("parkinglotCode", this.parkinglotCode);
+        map.put("carBrand", this.carBrand);
+        map.put("deptId", this.deptId);
+        map.put("deptName", this.deptName);
+//        map.put("method", this.method);
+//        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarAddRequestSg extends BaseRequest<Object> {
+
+
+    /*车牌号码*/
+    private String carNum;
+
+    /*车辆编号*/
+    private String carCode;
+
+    /*汽车颜色*/
+    private String carColor;
+
+    /*车牌颜色*/
+    private String carNumColor;
+
+    /*车辆类型*/
+    private String carType;
+
+    /*黑白名单*/
+    private Integer listType;
+
+    /*人员id*/
+    private Long ownerId;
+
+    /*停车类型*/
+    private Integer parkType;
+
+    /*绑定场区编号*/
+    private String parkinglotCode;
+
+    /*车辆品牌*/
+    private String carBrand;
+
+    /*部门Id*/
+    private String deptId;
+
+    /*部门名称*/
+    private String deptName;
+
+
+    public ClientCarAddRequestSg() {
+    }
+
+    public ClientCarAddRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_LIST_ADD, 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 res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("carNum", this.carNum);
+        map.put("carCode", this.carCode);
+        map.put("carColor", this.carColor);
+        map.put("carNumColor", this.carNumColor);
+        map.put("carType", this.carType);
+        map.put("listType", this.listType);
+        map.put("ownerId", this.ownerId);
+        map.put("parkType", this.parkType);
+        map.put("parkinglotCode", this.parkinglotCode);
+        map.put("carBrand", this.carBrand);
+        map.put("deptId", this.deptId);
+        map.put("deptName", this.deptName);
+//        map.put("method", this.method);
+//        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarAllListRequestCn extends BaseRequest03<Object> {
+
+
+    private String pageNum;//车牌编号
+    private String pageSize;//车牌号
+    private String draw;
+
+
+    public ClientCarAllListRequestCn() {
+    }
+
+    public ClientCarAllListRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_ALL_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        this.setUrl(this.getUrl().replace("{draw}",draw));
+
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet03(this) : HttpsURLConnectionUtil.doGet03(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        map.put("draw", this.draw);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarAllListRequestHn extends BaseRequest02<Object> {
+
+
+    private String pageNum;//车牌编号
+    private String pageSize;//车牌号
+    private String draw;
+
+
+    public ClientCarAllListRequestHn() {
+    }
+
+    public ClientCarAllListRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_ALL_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        this.setUrl(this.getUrl().replace("{draw}",draw));
+
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet02(this) : HttpsURLConnectionUtil.doGet02(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        map.put("draw", this.draw);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarAllListRequestSg extends BaseRequest<Object> {
+
+
+    private String pageNum;//车牌编号
+    private String pageSize;//车牌号
+    private String draw;
+
+
+    public ClientCarAllListRequestSg() {
+    }
+
+    public ClientCarAllListRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_ALL_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        this.setUrl(this.getUrl().replace("{draw}",draw));
+
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet(this) : HttpsURLConnectionUtil.doGet(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        map.put("draw", this.draw);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarBaseDeleteRequestCn extends BaseRequest03<Object> {
+
+
+
+    private List<String> a;
+
+
+
+
+
+
+    public ClientCarBaseDeleteRequestCn() {
+    }
+
+    public ClientCarBaseDeleteRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BASE_DELETE, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        List<String> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarBaseDeleteRequestHn extends BaseRequest02<Object> {
+
+
+
+    private List<String> a;
+
+
+
+
+
+
+    public ClientCarBaseDeleteRequestHn() {
+    }
+
+    public ClientCarBaseDeleteRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BASE_DELETE, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        List<String> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarBaseDeleteRequestSg extends BaseRequest<Object> {
+
+
+
+    private List<String> a;
+
+
+
+
+
+
+    public ClientCarBaseDeleteRequestSg() {
+    }
+
+    public ClientCarBaseDeleteRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BASE_DELETE, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        List<String> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarBlackAddRequestCn extends BaseRequest03<Object> {
+
+
+
+    private List<Object> a;
+
+
+
+
+
+
+    public ClientCarBlackAddRequestCn() {
+    }
+
+    public ClientCarBlackAddRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BLACK_ADD, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        /*Map<String, Object> map = new HashMap<>();
+        map.put("a", a);*/
+        List<Object> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarBlackAddRequestHn extends BaseRequest02<Object> {
+
+
+
+    private List<Object> a;
+
+
+
+
+
+
+    public ClientCarBlackAddRequestHn() {
+    }
+
+    public ClientCarBlackAddRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BLACK_ADD, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        /*Map<String, Object> map = new HashMap<>();
+        map.put("a", a);*/
+        List<Object> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarBlackAddRequestSg extends BaseRequest<Object> {
+
+
+
+    private List<Object> a;
+
+
+
+
+
+
+    public ClientCarBlackAddRequestSg() {
+    }
+
+    public ClientCarBlackAddRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BLACK_ADD, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        /*Map<String, Object> map = new HashMap<>();
+        map.put("a", a);*/
+        List<Object> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarBlackDeleteRequestCn extends BaseRequest03<Object> {
+
+
+
+    private List<String> a;
+
+
+
+
+
+
+    public ClientCarBlackDeleteRequestCn() {
+    }
+
+    public ClientCarBlackDeleteRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BLACK_DELETE, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        List<String> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarBlackDeleteRequestHn extends BaseRequest02<Object> {
+
+
+
+    private List<String> a;
+
+
+
+
+
+
+    public ClientCarBlackDeleteRequestHn() {
+    }
+
+    public ClientCarBlackDeleteRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BLACK_DELETE, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        List<String> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarBlackDeleteRequestSg extends BaseRequest<Object> {
+
+
+
+    private List<String> a;
+
+
+
+
+
+
+    public ClientCarBlackDeleteRequestSg() {
+    }
+
+    public ClientCarBlackDeleteRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BLACK_DELETE, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        List<String> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarBlackListRequestCn extends BaseRequest03<Object> {
+
+
+    private String pageNum;
+    private String pageSize;
+
+
+    public ClientCarBlackListRequestCn() {
+    }
+
+    public ClientCarBlackListRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BLACK_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet03(this) : HttpsURLConnectionUtil.doGet03(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarBlackListRequestHn extends BaseRequest02<Object> {
+
+
+    private String pageNum;
+    private String pageSize;
+
+
+    public ClientCarBlackListRequestHn() {
+    }
+
+    public ClientCarBlackListRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BLACK_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet02(this) : HttpsURLConnectionUtil.doGet02(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarBlackListRequestSg extends BaseRequest<Object> {
+
+
+    private String pageNum;
+    private String pageSize;
+
+
+    public ClientCarBlackListRequestSg() {
+    }
+
+    public ClientCarBlackListRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_BLACK_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet(this) : HttpsURLConnectionUtil.doGet(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarCaptureRequestCn extends BaseRequest03<Object> {
+
+
+
+//    private List<String> a;
+    private String pageNum;
+
+    private String pageSize;
+
+
+
+
+
+
+    public ClientCarCaptureRequestCn() {
+    }
+
+    public ClientCarCaptureRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_CAPTURE_RECORD, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet03(this) : HttpsURLConnectionUtil.doGet03(this);
+
+        System.out.println(res);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        /*List<String> map = new ArrayList<>();
+        map = this.a;*/
+        Map<String, String> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarCaptureRequestHn extends BaseRequest02<Object> {
+
+
+
+//    private List<String> a;
+    private String pageNum;
+
+    private String pageSize;
+
+
+
+
+
+
+    public ClientCarCaptureRequestHn() {
+    }
+
+    public ClientCarCaptureRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_CAPTURE_RECORD, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet02(this) : HttpsURLConnectionUtil.doGet02(this);
+
+        System.out.println(res);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        /*List<String> map = new ArrayList<>();
+        map = this.a;*/
+        Map<String, String> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarCaptureRequestSg extends BaseRequest<Object> {
+
+
+
+//    private List<String> a;
+    private String pageNum;
+
+    private String pageSize;
+
+
+
+
+
+
+    public ClientCarCaptureRequestSg() {
+    }
+
+    public ClientCarCaptureRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_CAPTURE_RECORD, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet(this) : HttpsURLConnectionUtil.doGet(this);
+
+        System.out.println(res);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        /*List<String> map = new ArrayList<>();
+        map = this.a;*/
+        Map<String, String> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarDeleteRequestCn extends BaseRequest03<Object> {
+
+
+    private String id;
+
+
+    public ClientCarDeleteRequestCn() {
+    }
+
+    public ClientCarDeleteRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_LIST_DELETE, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{id}",id));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet03(this) : HttpsURLConnectionUtil.doGet03(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    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();
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarDeleteRequestHn extends BaseRequest02<Object> {
+
+
+    private String id;
+
+
+    public ClientCarDeleteRequestHn() {
+    }
+
+    public ClientCarDeleteRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_LIST_DELETE, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{id}",id));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet02(this) : HttpsURLConnectionUtil.doGet02(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    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();
+    }
+}

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

@@ -0,0 +1,54 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarDeleteRequestSg extends BaseRequest<Object> {
+
+
+    private String id;
+
+
+    public ClientCarDeleteRequestSg() {
+    }
+
+    public ClientCarDeleteRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_LIST_DELETE, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{id}",id));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet(this) : HttpsURLConnectionUtil.doGet(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    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();
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarListRequestCn extends BaseRequest03<Object>{
+
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+//    private String method;
+//
+//    private Map<String,Object> data;
+
+
+    public ClientCarListRequestCn() {
+    }
+
+    public ClientCarListRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet03(this) : HttpsURLConnectionUtil.doGet03(this);
+        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("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+//        map.put("method", this.method);
+//        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,66 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarListRequestHn extends BaseRequest02<Object>{
+
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+//    private String method;
+//
+//    private Map<String,Object> data;
+
+
+    public ClientCarListRequestHn() {
+    }
+
+    public ClientCarListRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet02(this) : HttpsURLConnectionUtil.doGet02(this);
+        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("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+//        map.put("method", this.method);
+//        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,67 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarListRequestSg extends BaseRequest<Object>{
+
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+//    private String method;
+//
+//    private Map<String,Object> data;
+
+
+    public ClientCarListRequestSg() {
+    }
+
+    public ClientCarListRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        setBody();
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet(this) : HttpsURLConnectionUtil.doGet(this);
+        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("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+//        map.put("method", this.method);
+//        map.put("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarWhiteAddRequestCn extends BaseRequest03<Object> {
+
+
+
+    private List<Object> a;
+
+
+
+
+
+
+    public ClientCarWhiteAddRequestCn() {
+    }
+
+    public ClientCarWhiteAddRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_WHITE_ADD, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        /*Map<String, Object> map = new HashMap<>();
+        map.put("a", a);*/
+        List<Object> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarWhiteAddRequestHn extends BaseRequest02<Object> {
+
+
+
+    private List<Object> a;
+
+
+
+
+
+
+    public ClientCarWhiteAddRequestHn() {
+    }
+
+    public ClientCarWhiteAddRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_WHITE_ADD, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        /*Map<String, Object> map = new HashMap<>();
+        map.put("a", a);*/
+        List<Object> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,62 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarWhiteAddRequestSg extends BaseRequest<Object> {
+
+
+
+    private List<Object> a;
+
+
+
+
+
+
+    public ClientCarWhiteAddRequestSg() {
+    }
+
+    public ClientCarWhiteAddRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_WHITE_ADD, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        /*Map<String, Object> map = new HashMap<>();
+        map.put("a", a);*/
+        List<Object> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarWhiteDeleteRequestCn extends BaseRequest03<Object> {
+
+
+
+    private List<String> a;
+
+
+
+
+
+
+    public ClientCarWhiteDeleteRequestCn() {
+    }
+
+    public ClientCarWhiteDeleteRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_WHITE_DELETE, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        List<String> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarWhiteDeleteRequestHn extends BaseRequest02<Object> {
+
+
+
+    private List<String> a;
+
+
+
+
+
+
+    public ClientCarWhiteDeleteRequestHn() {
+    }
+
+    public ClientCarWhiteDeleteRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_WHITE_DELETE, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        List<String> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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.List;
+
+@Data
+public class ClientCarWhiteDeleteRequestSg extends BaseRequest<Object> {
+
+
+
+    private List<String> a;
+
+
+
+
+
+
+    public ClientCarWhiteDeleteRequestSg() {
+    }
+
+    public ClientCarWhiteDeleteRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_WHITE_DELETE, 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);
+        //获取响应
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        List<String> map = new ArrayList<>();
+        map = this.a;
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarWhiteListRequestCn extends BaseRequest03<Object> {
+
+
+    private String pageNum;
+    private String pageSize;
+
+
+    public ClientCarWhiteListRequestCn() {
+    }
+
+    public ClientCarWhiteListRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_WHITE_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet03(this) : HttpsURLConnectionUtil.doGet03(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,58 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarWhiteListRequestHn extends BaseRequest02<Object> {
+
+
+    private String pageNum;
+    private String pageSize;
+
+
+    public ClientCarWhiteListRequestHn() {
+    }
+
+    public ClientCarWhiteListRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_WHITE_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet02(this) : HttpsURLConnectionUtil.doGet02(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 ClientCarWhiteListRequestSg extends BaseRequest<Object> {
+
+
+    private String pageNum;
+    private String pageSize;
+
+
+    public ClientCarWhiteListRequestSg() {
+    }
+
+    public ClientCarWhiteListRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_GET, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CAR_WHITE_LIST, true);
+    }
+
+    @Override
+    public Object doAction() {
+        //重置url信息,替换版本号
+        this.setUrl(UrlUtil.dealVersion(this.getUrl()));
+        //设置请求参数
+        this.setUrl(this.getUrl().replace("{pageNum}",pageNum));
+        this.setUrl(this.getUrl().replace("{pageSize}",pageSize));
+        //发送请求
+        String res = isEnableHttpTest() ? HttpURLConnectionUtil.doGet(this) : HttpsURLConnectionUtil.doGet(this);
+
+        System.out.println(res);
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

+ 73 - 0
huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/PersonListRequestCn.java

@@ -0,0 +1,73 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 PersonListRequestCn extends BaseRequest03<String> {
+
+    private Integer farmId;
+
+    private String searchKey;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private Integer departmentId;
+
+    private Boolean isContain;
+
+    private List<Integer> statusList;
+
+
+    public PersonListRequestCn() {
+    }
+
+    public PersonListRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_PERSON_LIST, true);
+    }
+
+    @Override
+    public String 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());
+        //获取响应
+
+       // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
+
+        return res;
+    }
+
+    private void setBody() {
+        //设置请求参数
+        Map<String, Object> map = new HashMap<>();
+        map.put("pageNum", this.pageNum);
+        map.put("pageSize", this.pageSize);
+        map.put("isContain", this.isContain);
+        map.put("searchKey", this.searchKey);
+        map.put("statusList", this.statusList);
+        map.put("departmentId", this.departmentId);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 VideoRecordRequestCn extends BaseRequest03<Object>{
+
+    private String clientMac;
+
+    private String clientPushId;
+
+    private String project;
+
+    private String method;
+
+    private Map<String,Object> data;
+
+
+    public VideoRecordRequestCn() {
+    }
+
+    public VideoRecordRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_VIDEO_RECORD, 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");
+        // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
+
+        return data;
+    }
+
+    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("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 VideoRecordRequestHn extends BaseRequest02<Object>{
+
+    private String clientMac;
+
+    private String clientPushId;
+
+    private String project;
+
+    private String method;
+
+    private Map<String,Object> data;
+
+
+    public VideoRecordRequestHn() {
+    }
+
+    public VideoRecordRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_VIDEO_RECORD, 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");
+        // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
+
+        return data;
+    }
+
+    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("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.huimv.video.dhicc.test.request;
+
+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.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 VideoRecordRequestSg extends BaseRequest<Object>{
+
+    private String clientMac;
+
+    private String clientPushId;
+
+    private String project;
+
+    private String method;
+
+    private Map<String,Object> data;
+
+
+    public VideoRecordRequestSg() {
+    }
+
+    public VideoRecordRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo) {
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.CHANNEL_URL_VIDEO_RECORD, 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");
+        // PersonListResponseSg devicePageResponse = JSON.parseObject(res, PersonListResponseSg.class);
+
+        return data;
+    }
+
+    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("data", this.data);
+        this.setBody(JSON.toJSONString(map));
+
+    }
+
+
+    public boolean isEnableHttpTest() {
+        return super.getOauthConfigBaseInfo().getHttpConfigInfo().isEnableHttpTest();
+    }
+}