暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKConstant.java

@@ -32,7 +32,6 @@ public class HKConstant {
      * <p>默认情况下是127.0.0.1:80 ，如果地址不通请根据实际情况修改IP端口</p>
      */
 //    public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
-    public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
     public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
     // public static final String OPENAPI_IP_PORT_HTTP = "http://6wnrrtr3.wkdl.ltd";
 
@@ -67,4 +66,20 @@ public class HKConstant {
      * --personGroupId--
      */
     public static final  String OP_PERSON_ID="/openapi/service/fas/personGroup/getPersonGroup";
+
+    /**
+     * 分页获取部门
+     */
+    public static final String ITF_DEPT= "/openapi/service/base/dept/getDeptInfos";
+
+    /**
+     * 根据部门名称分页获取部门
+     */
+    public static final String ITF_LIKE_DEPT_NAME = "/openapi/service/base/dept/getDeptInfosByName";
+
+    /**
+     * 添加 人员
+     */
+    public static final String ITF_ADD_USER = "/openapi/service/base/person/addPersonInfo";
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -1,9 +1,7 @@
 package com.community.huiju.common.hk;
 
 import com.alibaba.fastjson.JSON;
-<<<<<<< HEAD
 import com.community.huiju.common.hk.test.PicUtils;
-import com.community.commom.hk.HKDigests;
 import com.community.commom.hk.HttpClientSSLUtils;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
@@ -27,16 +25,17 @@ import java.util.Map;
 public class HKOpenApi {
     private static Logger logger = LoggerFactory.getLogger(PicUtils.class);
 
-    public static String getMonitoryPoint(){
+    public static String getMonitoryPoint(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", HKConstant.APPKEY);
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
-        parMap.put("pageNo","");
-        parMap.put("pageSize","");
-        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("pageNo",map.get("pageNo"));
+        parMap.put("pageSize",map.get("pageSize"));
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("unitUuids",map.get("unitUuids"));
         String params =  JSON.toJSONString(parMap);
         log.info("获取 监控列表 请求参数：{}", params);
         String data = null;
@@ -51,7 +50,6 @@ public class HKOpenApi {
         return data;
     }
 
-
     /**
      *
      * @param img_path 获取图片的扩展名
@@ -82,11 +80,43 @@ public class HKOpenApi {
     }
 
     //将本地图片进行Base64位编码
-    public static String getImgStr(byte [] fileBytes){
+    public static String getImgStr(byte [] fileBytes) {
         return new String(org.apache.commons.codec.binary.Base64.encodeBase64(fileBytes));
     }
 
 
+    /**
+     * 根据部门名称分页获取部门
+     *      第几页, 一页多少行, 操作用户uuid
+     * @param map
+     * @return
+     */
+    public static String getDeptName(Map<String,Object> map){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_LIKE_DEPT_NAME;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo",map.get("pageNo"));
+        parMap.put("pageSize",map.get("pageSize"));
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("deptName",map.get("deptName"));
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据部门名称分页获取部门 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据部门名称分页获取部门 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("根据部门名称分页获取部门失败!",e);
+        }
+
+        return data;
+    }
+
+
     /**
      * 根据指定大小压缩图片
      *
@@ -139,13 +169,46 @@ public class HKOpenApi {
         return accuracy;
     }
 
+    /**
+     *
+     * 添加人员
+     *
+     *      比如 住户
+     */
+    public static String getAddUser(Map<String,Object> map){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_LIKE_DEPT_NAME;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo",map.get("pageNo"));
+        parMap.put("pageSize",map.get("pageSize"));
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("personNo",map.get("personNo"));
+        parMap.put("personName",map.get("personName"));
+        String params =  JSON.toJSONString(parMap);
+        log.info("添加人员 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("添加人员 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("添加人员失败!",e);
+        }
+
+        return data;
+    }
+
+
     public static void main(String[] args) {
         Map<String,Object> parMap = Maps.newHashMap();
         parMap.put("pageNo",1);
         parMap.put("pageSize",100);
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
-        parMap.put("unitUuids","1048576");
-        String result = HKOpenApi.getMonitoryPoint(parMap);
+        parMap.put("deptName","住户");
+        String result = HKOpenApi.getDeptName(parMap);
         System.out.println(result);
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/test/OpenapiTest.java

@@ -4,8 +4,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
-import com.hikvision.cms.api.common.util.Digests;
-import com.hikvision.cms.api.common.util.HttpClientSSLUtils;
+import com.community.commom.hk.Digests;
+import com.community.commom.hk.HttpClientSSLUtils;
+
 
 /**
  * openapi 测试DEMO

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MonitoringServiceImpl.java

@@ -31,7 +31,7 @@ public class MonitoringServiceImpl implements IMonitoringService {
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
         parMap.put("unitUuids","1048576");
 
-        String result = HKOpenApi.getMonitoryPoint();
+        String result = HKOpenApi.getMonitoryPoint(parMap);
         Map<String, Object> map = JSONObject.parseObject(result,HashMap.class);
         response.addSuccess(map);