合并冲突

CODE/smart-community/app-api/pom.xml

@@ -174,9 +174,18 @@
 			<version>1.4</version>
 		</dependency>
 
+		<dependency>
+			<groupId>net.coobird</groupId>
+			<artifactId>thumbnailator</artifactId>
+			<version>0.4.2</version>
+		</dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
 
 
-	</dependencies>
+    </dependencies>
 
 	<dependencyManagement>
 		<dependencies>

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

@@ -0,0 +1,82 @@
+package com.community.huiju.common;
+
+import net.coobird.thumbnailator.Thumbnails;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+/**
+ * 图片压缩Utils
+ *
+ * @author worstEzreal
+ * @version V1.1.0
+ * @date 2018/3/12
+ */
+public class PicUtils {
+
+    private static Logger logger = LoggerFactory.getLogger(PicUtils.class);
+
+    /**
+     * 根据指定大小压缩图片
+     *
+     * @param imageBytes  源图片字节数组
+     * @param desFileSize 指定图片大小，单位kb
+     * @param imageId     影像编号
+     * @return 压缩质量后的图片字节数组
+     */
+    public static byte[] compressPicForScale(byte[] imageBytes, long desFileSize, String imageId) {
+        if (imageBytes == null || imageBytes.length <= 0 || imageBytes.length < desFileSize * 1024) {
+            return imageBytes;
+        }
+        long srcSize = imageBytes.length;
+        double accuracy = getAccuracy(srcSize / 1024);
+        try {
+            while (imageBytes.length > desFileSize * 1024) {
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(imageBytes);
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream(imageBytes.length);
+                Thumbnails.of(inputStream)
+                        .scale(accuracy)
+                        .outputQuality(accuracy)
+                        .toOutputStream(outputStream);
+                imageBytes = outputStream.toByteArray();
+            }
+            logger.info("【图片压缩】imageId={} | 图片原大小={}kb | 压缩后大小={}kb",
+                    imageId, srcSize / 1024, imageBytes.length / 1024);
+        } catch (Exception e) {
+            logger.error("【图片压缩】msg=图片压缩失败!", e);
+        }
+        return imageBytes;
+    }
+
+    /**
+     * 自动调节精度(经验数值)
+     *
+     * @param size 源图片大小
+     * @return 图片压缩质量比
+     */
+    private static double getAccuracy(long size) {
+        double accuracy;
+        if (size < 900) {
+            accuracy = 0.85;
+        } else if (size < 2047) {
+            accuracy = 0.6;
+        } else if (size < 3275) {
+            accuracy = 0.44;
+        } else {
+            accuracy = 0.4;
+        }
+        return accuracy;
+    }
+    
+    /**
+     * 将本地图片进行Base64位编码
+     * @param fileBytes
+     * @return
+     */
+    public static String getImgStr(byte [] fileBytes) {
+        return new String(org.apache.commons.codec.binary.Base64.encodeBase64(fileBytes));
+    }
+    
+}

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

@@ -31,6 +31,7 @@ public class HKConstant {
      * <p>请将地址配置正确.</p>
      * <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://6wnrrtr3.wkdl.ltd";
 
@@ -38,7 +39,6 @@ public class HKConstant {
      * <p>操作用户UUID，即用户UUID，首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>
      * <p>也可以通过接口[分页获取用户]来获取</p>
      */
-    public static final String OP_USER_UUID = "5b2eb534696b11e89c2e438f92627767";
 
     /**
      * 获取默认用户UUID的接口地址，此地址可以从《海康威视iVMS-8700平台SDKV2.*.* HTTP-OpenAPI使用说明书.chm》中具体的接口说明上获取
@@ -53,7 +53,39 @@ public class HKConstant {
     /**
      * 查询监控点地址
      */
+    public static final String OP_USER_UUID = "5b2eb534696b11e89c2e438f92627767";
+
+    /**--主要是推送图片到海康
+     * 通过此接口将人员名单添加到指定的人员分组当中，此接口适合一次添加一个人员，如果需要批量添加可以使用平台上自带的图片压缩包的方式批量添加。
+     */
+    public  static  final  String OP_IMG="/openapi/service/fas/personInfo/addPersonInfoIntoGroup";
+
     public static final String ITF_MONITORY_POINT = "/openapi/service/vss/res/getCamerasEx";
+    
+    /**
+     * 根据区域UUID集获取门禁点
+     */
+    public static final String DOORS_BY_REGION_UUIDS = "/openapi/service/acs/res/getDoorsByRegionUuids";
+    
+    /**
+     * 根据人员ID集添加权限
+     */
+    public static final String ADD_AUTHORITIES_BY_PERSONIDS = "/openapi/service/acs/auth/addAuthoritiesByPersonIds";
+    
+    /**
+     * 根据设备UUID集异动下载门禁权限
+     */
+    public static final String DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS = "/openapi/service/acs/auth/downloadAuthorityByDeviceUuids";
+    
+    /**
+     * 指定人员人脸/指纹权限下载
+     */
+    public static final String DOWNLOAD_FACE_AND_FINGERINFOS = "/openapi/service/acs/auth/downloadFaceAndFingerInfos";
+
+    /**--推送图片时需要获取人员分组下的，人员分组ID
+     * --personGroupId--
+     */
+    public static final  String OP_PERSON_ID="/openapi/service/fas/personGroup/getPersonGroup";
 
     /**
      * 分页获取部门
@@ -70,8 +102,10 @@ public class HKConstant {
      */
     public static final String ITF_ADD_USER = "/openapi/service/base/person/addPersonInfo";
 
+
     /**
      * 批量开卡
      */
     public static final String ITF_OPEN_CARD = "/openapi/service/base/person/batchOpenCards";
+
 }

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

@@ -1,159 +1,392 @@
-package com.community.huiju.common.hk;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.community.commom.hk.Digests;
-import com.community.commom.hk.HttpClientSSLUtils;
-import com.google.common.collect.Maps;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 海康 API
- * @author weiximei
- */
-@Slf4j
-public class HKOpenApi {
-
-    /**
-     * 根据
-     * 组织中心UUID集 ,第几页, 一页多少行
-     *
-     * 获取  监控点 数据列表
-     * @return
-     */
-    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",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;
-        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;
-    }
-
-    /**
-     * 根据部门名称分页获取部门
-     *      第几页, 一页多少行, 操作用户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;
-    }
-
-
-    /**
-     * 添加人员
-     *
-     *      比如 住户
-     * @return
-     */
-    public static String addUser(Map<String,Object> map){
-        Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
-        //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
-        //设置时间参数
-        parMap.put("time", System.currentTimeMillis());
-        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"));
-        parMap.put("phoneNo",map.get("phoneNo"));
-        parMap.put("deptUuid",map.get("deptUuid"));
-        // parMap.put("cardNo",map.get("cardNo"));
-        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;
-    }
-
-    /**
-     * 批量开卡
-     *
-     * 其中参数 cardAndPerson 形式为“卡号，人员ID”，开卡数量不得超过50个，若没有该卡号，则添加一张新卡进行绑定 List<String>
-     * @return
-     */
-    public static String openCard(Map<String,Object> map){
-        Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_OPEN_CARD;
-        //设置APPKEY
-        parMap.put("appkey", HKConstant.APPKEY);
-        //设置时间参数
-        parMap.put("time", System.currentTimeMillis());
-        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
-        parMap.put("cardAndPerson",map.get("cardAndPerson"));
-        parMap.put("startTime",map.get("startTime"));
-        parMap.put("endTime",map.get("endTime"));
-
-        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("deptName","住户");
-        String result = HKOpenApi.getDeptName(parMap);
-        Map<String,Object> deptMap = JSONObject.parseObject(result, HashMap.class);
-        System.out.println(result);
-    }
-}
+
+package com.community.huiju.common.hk;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.hk.Digests;
+import com.community.commom.hk.HttpClientSSLUtils;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 海康 API
+ * @author weiximei
+ */
+@Slf4j
+public class HKOpenApi {
+
+    /**
+     * 根据
+     * 组织中心UUID集 ,第几页, 一页多少行
+     *
+     * 获取  监控点 数据列表
+     * @return
+     */
+    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",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;
+        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;
+    }
+
+    /**
+     * 根据部门名称分页获取部门
+     *      第几页, 一页多少行, 操作用户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;
+    }
+
+
+    /**
+     * 添加人员
+     *
+     *      比如 住户
+     * @return
+     */
+    public static String addUser(Map<String,Object> map){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        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"));
+        parMap.put("phoneNo",map.get("phoneNo"));
+        parMap.put("deptUuid",map.get("deptUuid"));
+        // parMap.put("cardNo",map.get("cardNo"));
+        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;
+    }
+
+    /**
+     * 批量开卡
+     *
+     * 其中参数 cardAndPerson 形式为“卡号，人员ID”，开卡数量不得超过50个，若没有该卡号，则添加一张新卡进行绑定 List<String>
+     * @return
+     */
+    public static String openCard(Map<String,Object> map){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_OPEN_CARD;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("cardAndPerson",map.get("cardAndPerson"));
+        parMap.put("startTime",map.get("startTime"));
+        parMap.put("endTime",map.get("endTime"));
+
+        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;
+    }
+
+    /**
+     * 根据中心UUID集获取中心下的门禁设备信息
+     *
+     * @return
+     */
+    public static String getACDevicesByUnitUuids(){
+        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",1);
+        parMap.put("pageSize",10);
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("unitUuids","1048576");
+        String params =  JSON.toJSONString(parMap);
+        log.info("获取中心UUID集获取中心下的门禁设备请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("获取 中心UUID集获取中心下的门禁设备 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取失败!",e);
+        }
+        
+        return data;
+    }
+    
+    /**
+     * 分页获取门禁点信息。
+     *
+     * @return
+     */
+    public static String getDoors(){
+        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",1);
+        parMap.put("pageSize",10);
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        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;
+    }
+    
+    /**
+     * 批量获取控制中心信息，多个中心的UUID用“,”分割组成的字符串。
+     *
+     * @return
+     */
+    public static String getUnitsByUuids(){
+        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",1);
+        parMap.put("pageSize",10);
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("unitUuids","1048576");
+        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;
+    }
+    
+    /**
+     *  根据中心UUID分页获取下级区域
+     * @return
+     */
+    public static String getRegionsByUnitUuid(){
+        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",1);
+        parMap.put("pageSize",10);
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("parentUuid","1048576");
+        parMap.put("allChildren",1);
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据中心UUID分页获取下级区域请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据中心UUID分页获取下级区域 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取失败!",e);
+        }
+        
+        return data;
+    }
+    
+    /**
+     * 根据区域UUID集获取门禁点
+     * @return
+     */
+    public static String getDoorsByRegionUuids(){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOORS_BY_REGION_UUIDS;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("regionUuids","2a36878c9a4a49d290d253ac1b4746dc");
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据区域UUID集获取门禁点请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据区域UUID集获取门禁点 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取失败!",e);
+        }
+        
+        return data;
+    }
+    
+    /**
+     * 根据人员ID集添加权限
+     * @return
+     */
+    public static String addAuthoritiesByPersonIds(String personIds){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ADD_AUTHORITIES_BY_PERSONIDS;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("personIds",personIds);
+        parMap.put("doorGroupUuids","");
+        parMap.put("doorUuids","57231a05fd3b45f7a2570a28a85821c4,efcb9a3fe4e64e2f9c0f546c54465524,9da7c0073138453fa7782b629743cff7,85c22fde220d4b35ac13f805f05fd04c");
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据人员ID集添加权限请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据人员ID集添加权限 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取失败!",e);
+        }
+        
+        return data;
+    }
+    
+    /**
+     * 根据设备UUID集异动下载门禁权限
+     * @return
+     */
+    public static String downloadAuthorityByDeviceUuids(){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("deviceUuids","57231a05fd3b45f7a2570a28a85821c4,efcb9a3fe4e64e2f9c0f546c54465524,9da7c0073138453fa7782b629743cff7,85c22fde220d4b35ac13f805f05fd04c");
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据设备UUID集异动下载门禁权限请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据设备UUID集异动下载门禁权限 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取失败!",e);
+        }
+        
+        return data;
+    }
+    
+    /**
+     * 指定人员人脸/指纹权限下载
+     * @return
+     */
+    public static String downloadFaceAndFingerInfos(String personIds){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_FACE_AND_FINGERINFOS;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("deviceUuids","83dfab0eef52411d991d6e621296b60a,dfd80b22f00545b8b36fa981019df83c");
+        parMap.put("personIds",personIds);
+        parMap.put("type",1);
+        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("deptName","住户");
+        String result = HKOpenApi.getDeptName(parMap);
+        Map<String,Object> deptMap = JSONObject.parseObject(result, HashMap.class);
+        System.out.println(result);
+    }
+}
+

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

@@ -1,90 +0,0 @@
-package com.community.huiju.common.hk.test;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Base64;
-import java.util.Base64.Decoder;
-import java.util.Base64.Encoder;
-
-import javax.imageio.ImageIO;
-
-/**
- * Openapi接口调用过程中会用到的一些工具方法
- * @author shengyiling
- *
- */
-public class OpenapiUtil {
-
-	/**
-	 * BASE64加密网络图片，返回加密之后的字符串
-	 * @param imageUrl 图片的绝对地址
-	 * @param extensioName 图片的扩展名，例如 jpg、bmp等
-	 * @return 加密之后的字符串
-	 */
-	public static String encodeImage2Base64(URL imageUrl, String extensioName){
-		ByteArrayOutputStream outputStream = null;  
-        try {  
-            BufferedImage bufferedImage = ImageIO.read(imageUrl);  //读取网络图片
-            outputStream = new ByteArrayOutputStream();  //文件输出流
-            ImageIO.write(bufferedImage, extensioName, outputStream);  
-        } catch (MalformedURLException e1) {  
-            e1.printStackTrace();  
-        } catch (IOException e) {  
-            e.printStackTrace();  
-        }  
-        Encoder encoder = Base64.getEncoder();
-        
-        return encoder.encodeToString(outputStream.toByteArray());// 返回Base64编码过的字节数组字符串  
-	}
-	
-	/** 
-     * 将本地图片进行Base64位编码 
-     *  
-     * @param imgUrl 
-     *            图片的url路径，如http://.....xx.jpg 
-     * @param extensioName 图片的扩展名
-     * @return 加密之后的字符串
-     */  
-    public static String encodeImgageToBase64(File imageFile, String extensioName) {// 将图片文件转化为字节数组字符串，并对其进行Base64编码处理  
-        ByteArrayOutputStream outputStream = null;  
-        try {  
-            BufferedImage bufferedImage = ImageIO.read(imageFile);  
-            outputStream = new ByteArrayOutputStream();  
-            ImageIO.write(bufferedImage, extensioName, outputStream);  
-        } catch (MalformedURLException e1) {  
-            e1.printStackTrace();  
-        } catch (IOException e) {  
-            e.printStackTrace();  
-        }  
-        // 对字节数组Base64编码  
-        Encoder encoder = Base64.getEncoder(); 
-        
-        return encoder.encodeToString(outputStream.toByteArray());// 返回Base64编码过的字节数组字符串  
-    }
-    
-    
-    /**
-     * 将Base64位编码的图片进行解码，并保存到指定目录
-     * @param base64Str 利用base64加密之后的字符串
-     * @param path 文件解密之后存放的地址 例如：D：//
-     * @param imgName 文件解密之后命名的名称 例如： test.jpg
-     */
-    public static void decodeBase64ToImage(String base64Str, String path,  
-            String imgName) {  
-        Decoder decoder = Base64.getDecoder();  
-        try {  
-            FileOutputStream write = new FileOutputStream(new File(path  
-                    + imgName));  
-            byte[] decoderBytes = decoder.decode(base64Str);  
-            write.write(decoderBytes);  
-            write.close();  
-        } catch (IOException e) {  
-            e.printStackTrace();  
-        }  
-    }  
-}

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/FaceController.java

@@ -1,18 +1,14 @@
 package com.community.huiju.controller;
+
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
-import com.community.huiju.model.TaAgreement;
-import com.community.huiju.model.TaFace;
-import com.community.huiju.service.FaceServicel;
-import com.community.huiju.service.FaceServicel;
+import com.community.huiju.service.FaceServiceI;
 import io.swagger.annotations.*;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -24,12 +20,13 @@ import javax.servlet.http.HttpSession;
 @Api(value = "人脸相关API", description = "人脸相关API")
 public class FaceController {
     @Autowired
-    private FaceServicel faceServicel;
+    private FaceServiceI faceServicel;
 
     @ApiOperation(value = "添加人脸图片", notes = "添加人脸图片")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
+    
     @RequestMapping(value = "/addFace",method = RequestMethod.POST)
     public Object getTaFace(HttpSession session,
                             @ApiParam(value = "file" ,required = true) MultipartFile uploadFile){

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -88,9 +88,8 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
-        List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId, title, pageNum, pageSize);
-        responseBean.addSuccess(announcementList);
-        return responseBean;
+        ResponseBean announcementList = socialServiceI.getAnnouncements(communityId, title, pageNum, pageSize);
+        return announcementList;
     }
 
     @ApiOperation(value = "获取公告轮播图", notes = "获取公告轮播图")
@@ -146,9 +145,8 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
-        List<TpActivity> activityList = socialServiceI.getActivitys(communityId, title, pageNum, pageSize);
-        responseBean.addSuccess(activityList);
-        return responseBean;
+        ResponseBean activityList = socialServiceI.getActivitys(communityId, title, pageNum, pageSize);
+        return activityList;
     }
 
     @ApiOperation(value = "论坛活动帖子详情", notes = "获取论坛活动帖子详情")
@@ -207,9 +205,8 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
-        List<TpTransaction> tpTransactions = socialServiceI.findAllTransaction(communityId, type, pageNum, pageSize);
-        responseBean.addSuccess(tpTransactions);
-        return responseBean;
+        ResponseBean tpTransactions = socialServiceI.findAllTransaction(communityId, type, pageNum, pageSize);
+        return tpTransactions;
     }
 
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/FaceServicel.java → CODE/smart-community/app-api/src/main/java/com/community/huiju/service/FaceServiceI.java

@@ -4,7 +4,7 @@ package com.community.huiju.service;
 import com.community.commom.mode.ResponseBean;
 import org.springframework.web.multipart.MultipartFile;
 
-public interface FaceServicel {
+public interface FaceServiceI {
     /**
      * 添加人脸
      * @param userId

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

@@ -2,7 +2,6 @@ package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;
@@ -24,7 +23,7 @@ public interface SocialServiceI {
 	 * @param pageSize
 	 * @return
 	 */
-	List<TpAnnouncement> getAnnouncements(Integer communityId, String title, Integer pageNum, Integer pageSize);
+	ResponseBean getAnnouncements(Integer communityId, String title, Integer pageNum, Integer pageSize);
 
 	/**
 	 * 公告轮播图
@@ -41,7 +40,7 @@ public interface SocialServiceI {
 	 * @param pageSize
 	 * @return
 	 */
-	List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize);
+	ResponseBean getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 获取活动帖子详情
@@ -66,7 +65,7 @@ public interface SocialServiceI {
 	 * @param type
 	 * @return
 	 */
-	List<TpTransaction> findAllTransaction(Integer communityId, String type, Integer pageNum, Integer paeSize);
+	ResponseBean findAllTransaction(Integer communityId, String type, Integer pageNum, Integer paeSize);
 
 	/**
 	 * 添加二手租赁帖子

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

@@ -1,27 +1,35 @@
 package com.community.huiju.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.ailiyun.AESDecode;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.controller.ImageController;
+import com.community.huiju.common.PicUtils;
+import com.community.huiju.common.hk.HKConstant;
 import com.community.huiju.dao.TaFaceMapper;
 import com.community.huiju.dao.TaSysRoleMapper;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.model.TaFace;
 import com.community.huiju.model.TaSysRole;
 import com.community.huiju.model.TaUser;
+import com.community.huiju.service.FaceServiceI;
 import com.community.huiju.service.ImageServiceI;
-import com.community.huiju.service.FaceServicel;
+import com.hikvision.cms.api.common.util.Digests;
+import com.hikvision.cms.api.common.util.HttpClientSSLUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
-@Service
-public class FaceServicelimpl implements FaceServicel {
+@Service("faceServicel")
+@Transactional
+public class FaceServicelimpl implements FaceServiceI {
 
 
     @Autowired
@@ -76,45 +84,40 @@ public class FaceServicelimpl implements FaceServicel {
 
         //查询当前用户是否有人脸记录
         TaFace User = taFaceMapper.getByUserId(userid);
-        if (null == User) {   //为业主，已认证
+        if (null == User) {
             boolean isA=true;
             if (Constant.OWNER.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
                 ResponseBean responseBean = new ResponseBean();
-                boolean resps=checKout(faceImg,taFace,isA,null);
-                if (resps==true) {
+                Object resps=checKout(faceImg,taFace,isA,null,user.getUserName(),uploadFile);
+                if (null!=resps && "true".equals(resps)) {
                     responseBean.addSuccess("图片录入成功");
                 }else {
-                    responseBean.addError("7771","请录入正确的图片");
+                    if ("1".equals(resps)) {
+                        responseBean.addError("7772", "推送海康服务器失败");
+                    }else {
+                        responseBean.addError("7771","请录入正确的图片");
+                    }
                 }
                 return responseBean;
             }
-            //家属或者租客
+            //家属或者租客，已认证
             if (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getDescription()) && "1".equals(taUser.getVerifyStatus())) {
                 ResponseBean responseBeans = new ResponseBean();
-                boolean resps=checKout(faceImg,taFace,isA,null);
-                if (resps==true) {
+                Object resps=checKout(faceImg,taFace,isA,null,user.getUserName(),uploadFile);
+                if (null!=resps && "true".equals(resps)) {
+                    imgPush(user.getUserName(), uploadFile);
                     responseBeans.addSuccess("图片录入成功");
                 }else {
-                    responseBeans.addError("7771","请录入正确的图片");
+                        if ("1".equals(resps)) {
+                            responseBeans.addError("7772", "推送海康服务器失败");
+                        }else {
+                            responseBeans.addError("7771","请录入正确的图片");
+                        }
                 }
                 return responseBeans;
             }
-        } else {
-            //为业主，已认证
-            if (Constant.OWNER.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
-                response.addError("8885", "您的信息已存在");
-                return response;
-            }
-            //家属或者租客
-            if (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getDescription()) && "1".equals(taUser.getVerifyStatus())) {
-                response.addError("8885", "您的信息已存在");
-                return response;
-            }
         }
-        response.addError("9995", "无法确认您的身份，请联系物业");
         return response;
-
-
     }
 
     @Override
@@ -133,29 +136,45 @@ public class FaceServicelimpl implements FaceServicel {
         taFace.setTaUserId(userId);
         taFace.setUpdateUser(userId);
         taFace.setUpdateDate(new Date());
-        boolean ck=checKout(faceImg,taFace,isA,userId);
-        if (ck == true) {
+        Object resps=checKout(faceImg,taFace,isA,userId,user.getUserName(),uploadFile);
+        if (null!=resps && "true".equals(resps)) {
             responseBean.addSuccess("修改成功");
         }else {
-            responseBean.addError("7771","请录入正确图片");
+            if ("1".equals(resps)) {
+                responseBean.addError("7772", "推送海康服务器失败");
+            }else {
+                responseBean.addError("7771","请录入正确的图片");
+            }
         }
         return responseBean;
     }
-
-    //人脸录入验证
-    public boolean checKout(String faceImg, TaFace taFace, boolean isA,Integer user) {
+    
+    /**
+     * 人脸录入验证
+     */
+    public Object checKout(String faceImg, TaFace taFace, boolean isA,Integer user,String name,MultipartFile uploadFile) {
         AESDecode aesd = new AESDecode();
-                String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
+        String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
         try {
-             ResponseBean responseBean = aesd.send(body);
+            ResponseBean responseBean = aesd.send(body);
             JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
             Integer type = (Integer) jsonObject.get("errno");
             Integer faceNum= (Integer) jsonObject.get("face_num");
-            if (0==type && null!=faceNum && 1==faceNum && isA==true) {
-                taFace.setFaceImg(faceImg);
-                taFaceMapper.insertSelective(taFace);
-                return true;
+            if (0==type && null!=faceNum && 1==faceNum && isA) {
+                //校验通过后
+                String errorCode= (String) imgPush(name, uploadFile);
+                JSONObject Code = JSONObject.parseObject(errorCode);
+                Integer personGroupId = (Integer) Code.get("personGroupId");
+                if (null!=personGroupId && personGroupId == 1) {
+                    taFace.setFaceImg(faceImg);
+                    taFaceMapper.insertSelective(taFace);
+                    return true;
+                }else{
+                    String code="1";
+                    return code;
+                }
             }else if (0==type && null!=faceNum && 1==faceNum && isA==false){
+
                 taFace.setFaceImg(faceImg);
                 taFaceMapper.updateByPrimaryKeySelective(taFace);
                 return true;
@@ -166,4 +185,76 @@ public class FaceServicelimpl implements FaceServicel {
         }
         return false;
     }
+    
+    /**
+     * 在图片验证通过的情况下，推送到海康
+     * @param name
+     * @param uploadFile
+     * @return
+     */
+    public Object imgPush(String name,MultipartFile uploadFile){
+        //把图片压缩成100K以下
+        // 压缩后的图片字节数组
+        byte [] picByte = null;
+        try {
+            long l = System.currentTimeMillis();
+            byte[] bytes  = uploadFile.getBytes();
+            // 拿到转换后的图片字节
+            picByte= PicUtils.compressPicForScale(bytes,99L,"x");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        // 推送海康服务器
+        String imgs = PicUtils.getImgStr(picByte);
+        String pgId= (String) HKpersonGroupId();
+        JSONObject jsonObject = JSONObject.parseObject(pgId);
+        Integer personGroupId = (Integer) jsonObject.get("personGroupId");
+        System.out.println(personGroupId);
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.OP_IMG;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("appkey", HKConstant.APPKEY);
+        map.put("time", System.currentTimeMillis());
+        map.put("token", HKConstant.SECRET);
+        map.put("opUserUuid",HKConstant.OP_USER_UUID);
+        map.put("facePhotos", imgs);
+        map.put("personName",name);
+        map.put("personGroupId",personGroupId);
+        map.put("birthday",System.currentTimeMillis());
+        String params =  JSON.toJSONString(map);
+        System.out.println(" ====== testGetDefaultUserUUID 请求参数：【" + params + "】");
+        String data = null;
+        try {
+
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        System.out.println(" ====== testGetDefaultUserUUID 请求返回结果：【{" + data + "}】");
+        return data;
+    }
+    
+    /**
+     * 把图片推送海康，需要获得海康人员分组下的
+     * @return
+     */
+    public Object HKpersonGroupId(){
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.OP_PERSON_ID;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("appkey", HKConstant.APPKEY);
+        map.put("time", System.currentTimeMillis());
+        map.put("token", HKConstant.SECRET);
+        map.put("opUserUuid",HKConstant.OP_USER_UUID);
+        map.put("pageNo",1);
+        map.put("pageSize",100);
+        map.put("birthday",System.currentTimeMillis());
+        String params =  JSON.toJSONString(map);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return data;
+    }
+
 }

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

@@ -1,6 +1,4 @@
 package com.community.huiju.service.impl;
-
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.common.hk.HKConstant;
@@ -32,9 +30,11 @@ public class MonitoringServiceImpl implements IMonitoringService {
         parMap.put("pageSize",100);
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
         parMap.put("unitUuids","1048576");
+
         String result = HKOpenApi.getMonitoryPoint(parMap);
         Map<String, Object> map = JSONObject.parseObject(result,HashMap.class);
         response.addSuccess(map);
+
         return response;
     }
 }

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

@@ -7,15 +7,18 @@ import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ImageServiceI;
 import com.community.huiju.service.SocialServiceI;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author weichaochao
@@ -84,12 +87,17 @@ public class SocialServiceImpl implements SocialServiceI {
      * @return
      */
     @Override
-    public List<TpAnnouncement> getAnnouncements(Integer communityId,String title, Integer pageNum, Integer pageSize) {
+    public ResponseBean getAnnouncements(Integer communityId, String title, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean=new ResponseBean();
+        Map<String, Object> parameter = Maps.newHashMap();
         //使用分页插件
-        PageHelper.startPage(pageNum, pageSize);
+        Page<TpAnnouncement> pageannouncementList=PageHelper.startPage(pageNum, pageSize);
+        parameter.put("total",pageannouncementList.getTotal());
         // 获取数据
         List<TpAnnouncement> announcementList = tpAnnouncementMapper.getAnnouncements(communityId,title);
-        return announcementList;
+        parameter.put("list",announcementList);
+        responseBean.addSuccess(parameter);
+        return responseBean;
     }
     /**
      * 根据当前小区ID查出轮播图
@@ -113,12 +121,17 @@ public class SocialServiceImpl implements SocialServiceI {
      * @return
      */
     @Override
-    public List<TpActivity> getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
+    public ResponseBean getActivitys(Integer communityId, String title, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean= new ResponseBean();
+        Map<String, Object> result = Maps.newHashMap();
         //使用分页插件
-        PageHelper.startPage(pageNum, pageSize);
+        Page<TpActivity> pageactivityList=PageHelper.startPage(pageNum, pageSize);
         // 获取数据
         List<TpActivity> activityList = tpActivityMapper.getActivitys(communityId,title);
-        return activityList;
+        result.put("list",activityList);
+        result.put("total",pageactivityList.getTotal());
+        responseBean.addSuccess(result);
+        return responseBean;
     }
     
     /**
@@ -220,9 +233,16 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public List<TpTransaction> findAllTransaction(Integer communityId, String type, Integer pageNum, Integer paeSize) {
-        PageHelper.startPage(pageNum, paeSize);
-        return tpTransactionMapper.findAllTransaction(communityId, type);
+    public ResponseBean findAllTransaction(Integer communityId, String type, Integer pageNum, Integer paeSize) {
+        Map<String, Object> parameter = Maps.newHashMap();
+       ResponseBean  responseBean= new ResponseBean();
+        Page<TpTransaction> pageList=PageHelper.startPage(pageNum, paeSize);
+        List<TpTransaction> List= tpTransactionMapper.findAllTransaction(communityId, type);
+        parameter.put("list",List);
+        parameter.put("total",pageList.getTotal());
+        responseBean.addSuccess(parameter);
+        return responseBean;
+
     }
 
 
@@ -313,9 +333,13 @@ public class SocialServiceImpl implements SocialServiceI {
         }
 
         if (Constant.EFFECTIVE.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()) || Constant.OWNER.equals(sysRole.getRoleName()))){
-            PageHelper.startPage(pageNum, paeSize);
+            Map<String, Object> parameter = Maps.newHashMap();
+            Page<TpTransaction> pageLsit=PageHelper.startPage(pageNum, paeSize);
             List<TpTransaction> tpTransactions=tpTransactionMapper.selectTransaction(userId,communityId,type);
-            responseBean.addSuccess(tpTransactions);
+            parameter.put("list",tpTransactions);
+            parameter.put("total",pageLsit.getTotal());
+            responseBean.addSuccess(parameter);
+            return responseBean;
         }
         responseBean.addError("9995", "无法确认您的身份，请联系物业");
         return responseBean;

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

@@ -8,6 +8,7 @@ import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITicketService;
 import com.community.huiju.vo.TpTicketVO;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -18,9 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 工单业务 实现
@@ -59,7 +58,7 @@ public class TicketServiceImpl implements ITicketService {
         //  0 代表 报修  1 代表 投诉  2代表 联系单
         parameter.put("type", 0);
         // 报修
-        PageHelper.startPage(pageNum, pageSize);
+        Page<TpTicket> pageRepairs = PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketRepairsList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
         List<TpTicketVO> repairsList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketRepairsList, repairsList);
@@ -67,7 +66,7 @@ public class TicketServiceImpl implements ITicketService {
         // 投诉
         //  0 代表 报修  1 代表 投诉  2代表 联系单
         parameter.put("type", 1);
-        PageHelper.startPage(pageNum, pageSize);
+        Page<TpTicket> pageComplaint = PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketComplaintList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
         List<TpTicketVO> complaintList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketComplaintList, complaintList);
@@ -75,14 +74,16 @@ public class TicketServiceImpl implements ITicketService {
         // 联系工单
         //  0 代表 报修  1 代表 投诉  2代表 联系单
         parameter.put("type", 2);
-        PageHelper.startPage(pageNum, pageSize);
+        Page<TpTicket> pageLiaison = PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketLiaisonList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
         List<TpTicketVO> liaisonList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketLiaisonList, liaisonList);
-
+        Long [] arr = new Long[] {pageComplaint.getTotal(), pageLiaison.getTotal(), pageRepairs.getTotal()};
+        Arrays.sort(arr);
         result.put("repairs", repairsList);
         result.put("complaint", complaintList);
         result.put("liaison", liaisonList);
+        result.put("total",arr[2]);
 
         responseBean.addSuccess(result);
         return responseBean;
@@ -142,13 +143,16 @@ public class TicketServiceImpl implements ITicketService {
         //  0 代表 报修  1 代表 投诉  2代表 联系单
         parameter.put("type", tpTicket.getType());
 
-        PageHelper.startPage(pageNum, pageSize);
+       Page<TpTicket> pagelist=PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
 
         List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketList, tpTicketVOList);
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("pagelist",pagelist.getTotal());
+        map.put("total",tpTicketVOList);
 
-        response.addSuccess(tpTicketVOList);
+        response.addSuccess(map);
 
         return response;
     }