提交

CODE/foreign-service/src/main/java/com/community/huiju/controller/TaFceController.java

@@ -32,10 +32,10 @@ public class TaFceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
             @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
     })
     public ResponseBean addFace(@RequestParam(value = "userId") Integer userId,
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
@@ -54,10 +54,10 @@ public class TaFceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
             @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
     })
     public ResponseBean updateFace(@RequestParam(value = "userId") Integer userId,
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
@@ -74,10 +74,10 @@ public class TaFceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
     })
     public ResponseBean deleteFace(@RequestParam(value = "userId") Integer userId,
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {
@@ -94,10 +94,10 @@ public class TaFceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userVerifyId", value = "房产审核Id"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
     public ResponseBean getTaFaceByUserId(@RequestParam(value = "userId") Integer userId,
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {

CODE/foreign-service/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java

@@ -49,5 +49,5 @@ public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
             "from tp_unit_equipment trne left join tp_equipment te " +
             "on trne.equipment_id = te.id " +
             "where trne.community_id=#{communityId} and trne.unit_id=#{unitId} and te.equipment_type=#{equipmentType}")
-    List<TpEquipment> selectByCommunityIdAndUnitId(Integer communityId, Integer unitId, int i);
+    List<TpEquipment> selectByCommunityIdAndUnitId(Integer communityId, Integer unitId, Integer equipmentType);
 }

CODE/foreign-service/src/main/java/com/community/huiju/enums/ResponseErrorsMessages.java

@@ -33,7 +33,8 @@ public enum ResponseErrorsMessages {
     FACE_ERROR(1021, "请录入正确的人脸图片！"),
     SIGN_ERROR(1022, "签名错误！"),
     SIGN_DATETIME_ERROR(1023, "签名已过期！"),
-    SIGN_ENCRYPT_MD5_ERROR(1024, "未使用md5加密方式加密！")
+    SIGN_ENCRYPT_MD5_ERROR(1024, "未使用md5加密方式加密！"),
+    NOT_EQUIPMENT(1025, "系统设备未设置！")
     ;
 
 

CODE/foreign-service/src/main/java/com/community/huiju/filter/SignFilter.java

@@ -29,7 +29,7 @@ import java.util.TreeMap;
  *
  * @author weiximei on 2019-05-17
  */
-@Component
+//@Component
 @Slf4j
 public class SignFilter implements Filter {
 

CODE/foreign-service/src/main/java/com/community/huiju/model/TpConfiguration.java

@@ -34,6 +34,7 @@ public class TpConfiguration implements Serializable {
     /**
      * 配置key
      */
+    @TableField(value = "`key`")
     private String key;
 
     /**

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -16,6 +16,7 @@ import com.community.huiju.service.IHKService;
 import com.community.huiju.service.ImageServiceI;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -348,6 +349,10 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(taUserVerify.getCommunityId());
         // 所有设备
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(taUserVerify.getCommunityId(), taUserVerify.getUnitId(), 4);
+        if (CollectionUtils.isEmpty(tpEquipments)) {
+            responseBean.addError(ResponseErrorsMessages.NOT_EQUIPMENT.getCode(), ResponseErrorsMessages.NOT_EQUIPMENT.getMsg());
+            return responseBean;
+        }
         List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
         StringBuilder doorUuids = new StringBuilder();
         StringBuilder deviceUuids = new StringBuilder();

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/HKServiceImpl.java

@@ -7,6 +7,7 @@ import com.community.commom.hk.HKOpenApi;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.uuid.IdGen;
 import com.community.huiju.dao.*;
+import com.community.huiju.enums.ResponseErrorsMessages;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
 import com.community.huiju.service.IHKService;
@@ -98,6 +99,9 @@ public class HKServiceImpl implements IHKService {
         // 给用户添加 海康门禁权限
 
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 4);
+        if (CollectionUtils.isEmpty(tpEquipments)) {
+            throw new WisdomException(ResponseErrorsMessages.NOT_EQUIPMENT.getCode(), ResponseErrorsMessages.NOT_EQUIPMENT.getMsg());
+        }
         List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
         StringBuilder doorUuids = new StringBuilder();
         StringBuilder deviceUuids = new StringBuilder();

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKOpenApi.java

@@ -26,7 +26,7 @@ public class HKOpenApi {
      */
     public static String getMonitoryPoint(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -58,7 +58,7 @@ public class HKOpenApi {
      */
     public static String getDeptName(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_LIKE_DEPT_NAME;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_LIKE_DEPT_NAME;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -91,7 +91,7 @@ public class HKOpenApi {
      */
     public static String addUser(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_ADD_USER;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_ADD_USER;
         //设置APPKEY获取中心信息
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -125,7 +125,7 @@ public class HKOpenApi {
      */
     public static String openCard(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_OPEN_CARD;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_OPEN_CARD;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -157,7 +157,7 @@ public class HKOpenApi {
      */
     public static String getACDevicesByUnitUuids(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -188,7 +188,7 @@ public class HKOpenApi {
      */
     public static String getDoors(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GET_DOORS; // HKConstant.ITF_MONITORY_POINT;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.GET_DOORS; // HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -218,7 +218,7 @@ public class HKOpenApi {
      */
     public static String getUnitsByUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -248,7 +248,7 @@ public class HKOpenApi {
      */
     public static String getRegionsByUnitUuid(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -279,7 +279,7 @@ public class HKOpenApi {
      */
     public static String getDoorsByRegionUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOORS_BY_REGION_UUIDS;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.DOORS_BY_REGION_UUIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -307,7 +307,7 @@ public class HKOpenApi {
      */
     public static String addAuthoritiesByPersonIds(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ADD_AUTHORITIES_BY_PERSONIDS;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ADD_AUTHORITIES_BY_PERSONIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -339,7 +339,7 @@ public class HKOpenApi {
      */
     public static String downloadAuthorityByDeviceUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -370,7 +370,7 @@ public class HKOpenApi {
      */
     public static String downloadAuthorityByPersonIds(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOAD_AUTHORITY_BY_PERSONIDS;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.DOWNLOAD_AUTHORITY_BY_PERSONIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -407,7 +407,7 @@ public class HKOpenApi {
     public static String getPlans(Integer pageNo, Integer pageSize, Map<String, Object> map) {
 
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETPLANS;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.GETPLANS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -436,7 +436,7 @@ public class HKOpenApi {
      */
     public static String downloadFaceAndFingerInfos(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOAD_FACE_AND_FINGERINFOS;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.DOWNLOAD_FACE_AND_FINGERINFOS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -469,7 +469,7 @@ public class HKOpenApi {
      * @return
      */
     public static String HKpersonGroupId(MultipartFile faceImg,Integer personNo,String personName, String openapi_ip_port_http){
-        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_ADD_USER;
+        String url = (openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http) + HKConstant.ITF_ADD_USER;
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         map.put("time", System.currentTimeMillis());
@@ -544,7 +544,7 @@ public class HKOpenApi {
      * @return
      */
     public static String updateUser(Map<String,Object> map) {
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_UPDATE_USER;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -583,7 +583,7 @@ public class HKOpenApi {
      */
     public static String temporaryRegister(String visitorName, String phoneNo,Integer personNum,Long startTime,Long endTime,Integer personId, String opUserUuid, String appkey, String secret, String openapi_ip_port_http){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.TEMPORARY_REGISTER;
+        String url = (openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http) + HKConstant.TEMPORARY_REGISTER;
         //设置APPKEY
         parMap.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         //设置时间参数
@@ -625,7 +625,7 @@ public class HKOpenApi {
      */
     public static String HKpersonPhone(Integer personId,Long personNo,String personName,String phoneNo, String openapi_ip_port_http) {
 
-        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_UPDATE_USER;
+        String url = (openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http) + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         map.put("time", System.currentTimeMillis());
@@ -666,7 +666,7 @@ public class HKOpenApi {
      */
     public static String HKgetDoorDevicesByUnitUuids(Map<String, Object> map){
 
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETDOORDEVICESBYUNITUUIDS;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.GETDOORDEVICESBYUNITUUIDS;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -703,7 +703,7 @@ public class HKOpenApi {
      * @return
      */
     public static String syncControl(Map<String, Object> map) {
-        String url =  map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") +  HKConstant.SYNCCONTROL;
+        String url =  (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) +  HKConstant.SYNCCONTROL;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -734,7 +734,7 @@ public class HKOpenApi {
      * @return
      */
     public static String visualIntercom(String opUserUuid, Integer opType,List<Integer> personIds,List<String> longNums, String appkey, String secret, String openapi_ip_port_http) {
-        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.DOWNLOADFACE;
+        String url = (openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http) + HKConstant.DOWNLOADFACE;
         HashMap map = new HashMap<>();
         map.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         map.put("time", System.currentTimeMillis());
@@ -767,7 +767,7 @@ public class HKOpenApi {
      * @return
      */
     public static String addOutDoorAuth(Map<String, Object> map) {
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ADDOUTDOORAUTH;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ADDOUTDOORAUTH;
 
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -804,7 +804,7 @@ public class HKOpenApi {
      * @return
      */
     public static String delOutDoorAuth(Map<String, Object> map) {
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DELOUTDOORAUTH;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.DELOUTDOORAUTH;
 
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -841,7 +841,7 @@ public class HKOpenApi {
      * @return
      */
     public static String downloadFinger(Map<String, Object> map) {
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOADFINGER;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.DOWNLOADFINGER;
 
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -872,7 +872,7 @@ public class HKOpenApi {
      * @return
      */
     public static String getUsers(Map<String, Object> map){
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETUSERS;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.GETUSERS;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -901,7 +901,7 @@ public class HKOpenApi {
      * @return
      */
     public static String getPersonInfosEx(Map<String, Object> map){
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETPERSONINFOSEX;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.GETPERSONINFOSEX;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -930,7 +930,7 @@ public class HKOpenApi {
      */
     public static String getDefaultUserUuid(String appkey, String secret, String openapi_ip_port_http){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_ADDRESS_GET_DEFAULT_USER_UUID;
+        String url = (openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http) + HKConstant.ITF_ADDRESS_GET_DEFAULT_USER_UUID;
         //设置APPKEY
         parMap.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         //设置时间参数
@@ -979,7 +979,7 @@ public class HKOpenApi {
      *     删除当前人脸设备信息
      */
     public static String deleteUser(Map<String,Object> map) {
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_DELETE_USER;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_DELETE_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1008,7 +1008,7 @@ public class HKOpenApi {
      *     查询当前人脸设备信息
      */
     public static String selectUserFace(Map<String,Object> map) {
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_SELECT_USER;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_SELECT_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1037,7 +1037,7 @@ public class HKOpenApi {
      * @return
      */
     public static String selectUserSynchronization(Map<String,Object> map) {
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_SELECT_USER_SDH;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_SELECT_USER_SDH;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1064,7 +1064,7 @@ public class HKOpenApi {
      * @return
      */
     public static String appointJurisdiction(Map<String,Object> map) {
-        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_SELECT_APPOIN;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_SELECT_APPOIN;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));