Merge remote-tracking branch 'origin/master'

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

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

@@ -285,5 +285,8 @@ public class Constant {
     //event-count
     public static final String EVENT_COUNT_URL = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";
 
+    //departmentList
+    public static final String DEPARTMENT_LIST_URL = "/evo-apigw/evo-brm/1.2.0/department/page";
+
     public static final String MASSAGE_XIXIAO_PERSION = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";
 }

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

@@ -1,9 +1,13 @@
 package com.huimv.video.dhicc.test.controller;
 
 import com.dahuatech.icc.exception.ClientException;
+import com.huimv.video.dhicc.result.R;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
 import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.request.DepartmentRequest.Cn.DepartmentListRequestCn;
+import com.huimv.video.dhicc.test.request.DepartmentRequest.Hn.DepartmentListRequestHn;
+import com.huimv.video.dhicc.test.request.DepartmentRequest.Sg.DepartmentListRequestSg;
 import com.huimv.video.dhicc.test.request.PersonListRequestCn;
 import com.huimv.video.dhicc.test.request.PersonListRequestHn;
 import com.huimv.video.dhicc.test.request.PersonListRequestSg;
@@ -26,7 +30,7 @@ public class ClientPersonManageControllerTest {
 
 
     @RequestMapping("/ge_person_list")
-    public String ge_person_list(@RequestBody PersonListRequestSg personListRequestSg) throws ClientException {
+    public R ge_person_list(@RequestBody PersonListRequestSg personListRequestSg) throws ClientException {
         Integer farmId = personListRequestSg.getFarmId();
         if (farmId == 1) {
             System.out.println("曙光");
@@ -38,7 +42,7 @@ public class ClientPersonManageControllerTest {
             requestSg.setSearchKey(personListRequestSg.getSearchKey());
             requestSg.setStatusList(personListRequestSg.getStatusList());
             String s = requestSg.doAction();
-            return s;
+            return R.ok("请求成功").put("data",s);
         } else if (farmId == 2) {
             PersonListRequestHn requestHn = new PersonListRequestHn(oauthConfigBaseInfo02);
             requestHn.setDepartmentId(personListRequestSg.getDepartmentId());
@@ -49,7 +53,7 @@ public class ClientPersonManageControllerTest {
             requestHn.setStatusList(personListRequestSg.getStatusList());
             String s = requestHn.doAction();
             System.out.println("海宁");
-            return s;
+            return R.ok("请求成功").put("data",s);
         } else {
             PersonListRequestCn requestCn = new PersonListRequestCn(oauthConfigBaseInfo03);
             requestCn.setDepartmentId(personListRequestSg.getDepartmentId());
@@ -60,9 +64,27 @@ public class ClientPersonManageControllerTest {
             requestCn.setStatusList(personListRequestSg.getStatusList());
             String s = requestCn.doAction();
             System.out.println("苍南");
-            return s;
+            return R.ok("请求成功").put("data",s);
+        }
+    }
+    @RequestMapping("departmentList")
+    public R departmentList(@RequestBody Map<String,Integer> paramsMap){
+        Integer farmId = paramsMap.get("farmId");
+        if (farmId == 1){
+            System.out.println("曙光");
+            DepartmentListRequestSg departmentList = new DepartmentListRequestSg(oauthConfigBaseInfo);
+            return R.ok("请求成功").put("data",departmentList.doAction());
+        }else if (farmId == 22){
+            System.out.println("海宁");
+            DepartmentListRequestHn departmentList = new DepartmentListRequestHn(oauthConfigBaseInfo02);
+            return R.ok("请求成功").put("data",departmentList.doAction());
+        }else if (farmId == 21){
+            System.out.println("苍南");
+            DepartmentListRequestCn departmentList = new DepartmentListRequestCn(oauthConfigBaseInfo03);
+            return R.ok("请求成功").put("data",departmentList.doAction());
+        }else {
+            return R.error();
         }
-
 
     }
 }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/DepartmentRequest/Cn/DepartmentListRequestCn.java

@@ -0,0 +1,63 @@
+package com.huimv.video.dhicc.test.request.DepartmentRequest.Cn;
+
+import com.alibaba.fastjson.JSON;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo03;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.request.BaseRequest03;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class DepartmentListRequestCn extends BaseRequest03 {
+
+    private Integer farmId;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    public DepartmentListRequestCn(OauthConfigBaseInfo03 oauthConfigBaseInfo){
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.DEPARTMENT_LIST_URL, 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();
+    }
+
+
+
+}

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/DepartmentRequest/Hn/DepartmentListRequestHn.java

@@ -0,0 +1,63 @@
+package com.huimv.video.dhicc.test.request.DepartmentRequest.Hn;
+
+import com.alibaba.fastjson.JSON;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo02;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.request.BaseRequest02;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class DepartmentListRequestHn extends BaseRequest02 {
+
+    private Integer farmId;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    public DepartmentListRequestHn(OauthConfigBaseInfo02 oauthConfigBaseInfo){
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.DEPARTMENT_LIST_URL, 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();
+    }
+
+
+
+}

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/DepartmentRequest/Sg/DepartmentListRequestSg.java

@@ -0,0 +1,61 @@
+package com.huimv.video.dhicc.test.request.DepartmentRequest.Sg;
+
+import com.alibaba.fastjson.JSON;
+import com.huimv.video.dhicc.test.config.OauthConfigBaseInfo;
+import com.huimv.video.dhicc.test.constant.Constant;
+import com.huimv.video.dhicc.test.request.BaseRequest;
+import com.huimv.video.dhicc.test.utils.HttpURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.HttpsURLConnectionUtil;
+import com.huimv.video.dhicc.test.utils.UrlUtil;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class DepartmentListRequestSg extends BaseRequest {
+
+    private Integer farmId;
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    public DepartmentListRequestSg(OauthConfigBaseInfo oauthConfigBaseInfo){
+        super(oauthConfigBaseInfo, Constant.HTTP_POST, oauthConfigBaseInfo.getHttpConfigInfo().getPrefixUrl() + Constant.DEPARTMENT_LIST_URL, 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();
+    }
+
+
+
+}