解决合并冲突

CODE/foreign-service/src/main/java/com/community/huiju/common/message/MessagePush.java

@@ -0,0 +1,22 @@
+package com.community.huiju.common.message;
+
+public class MessagePush {
+
+    public String[]  messagePushAll() {
+        String[] messageArr= new String[13];
+        messageArr[0] = "账号已审核通过，看看下面的消息了解下APP如何使用吧！";
+        messageArr[1] = "点击顶部小区名称，切换到其他房产或小区，或关联更多房产";
+        messageArr[2] = "点击上方 人脸录入，为自己或家人录入人脸信息，家人未注册可先替TA注册";
+        messageArr[3] = "点击上方 访客邀请，将生成的二维码发送给访客，访客即可使用二维码开门";
+        messageArr[4] = "点击上方 公区监控，查看小区公共区域视频直播，看看大家都在干什么";
+        messageArr[5] = "点击上方 智能家居，安装APP玩转室内智能家居设备";
+        messageArr[6] = "想知道物业公告和社区活动？点击底部 论坛 查看";
+        messageArr[7] = "参与社区议事，发布二手/求购/租赁等热门话题，点击底部 论坛 话题";
+        messageArr[8] = "点击底部开锁图标，获取开门二维码，即可扫码开门";
+        messageArr[9] = "楼道灯不亮，电梯坏了，通下水道，找保洁？点击底部 服务 报修";
+        messageArr[10] = "想投诉施工扰民、乱搭乱建、乱停车？点击底部 服务 投诉";
+        messageArr[11] = "有很急的事需要马上联系物业？点击底部 服务 物业 电话联系物业";
+        messageArr[12] = "家人想刷脸进门不会操作？点击底部 个人 房屋成员管理 邀请新成员为TA录入人脸";
+        return  messageArr;
+    }
+}

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

@@ -41,7 +41,7 @@ public class TaUserController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
     })
     public ResponseBean addUser(@RequestParam(value = "userName") String userName,
-                                @RequestParam(value = "idCard") String idCard,
+                                @RequestParam(value = "idCard", required = false) String idCard,
                                 @RequestParam(value = "gender") String gender,
                                 @RequestParam(value = "phone") String phone){
         ResponseBean responseBean = iTaUserService.addTaUser(userName, idCard, gender, phone);

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

@@ -1,6 +1,7 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TaUserHk;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultMap;
@@ -17,14 +18,8 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface TaUserHkMapper extends BaseMapper<TaUserHk> {
 
-    /**
-     * 根据用户id 和 小区id 进行查询
-     * @param userId
-     * @param communityId
-     * @return
-     */
-    @ResultType(TaUserHk.class)
-    @Select("select * from ta_user_hk where ta_user_id = #{userId} and community_id = #{communityId}")
-    TaUserHk selectByUserIdAndCommunityId(@Param("userId") Integer userId, @Param("communityId") Integer communityId);
 
+    @ResultType(TaUserHk.class)
+    @Select("select * from ta_user_hk where ta_user_id = #{userVerifyId} and community_id = #{communityId}")
+    TaUserHk selectByUserVerifyIdAndCommunityId(Integer userVerifyId, Integer communityId);
 }

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

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpMessage;
+
+/**
+ * <p>
+ * 物业端消息表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-24
+ */
+public interface TpMessageMapper extends BaseMapper<TpMessage> {
+
+}

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

@@ -0,0 +1,32 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpUnitHkSetting;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-18
+ */
+public interface TpUnitHkSettingMapper extends BaseMapper<TpUnitHkSetting> {
+
+
+
+    /**
+     * 根据 小区id 和 单元id
+     *
+     * @param communityId
+     * @param unitId
+     * @return
+     */
+    @ResultType(TpUnitHkSetting.class)
+    @Select("select * from tp_unit_hk_setting where community_id = #{communityId} and unit_id = #{unitId}")
+    TpUnitHkSetting selectByCommunityIdAndUnitId(Integer communityId, Integer unitId);
+
+}

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

@@ -34,7 +34,11 @@ public enum ResponseErrorsMessages {
     SIGN_ERROR(1022, "签名错误！"),
     SIGN_DATETIME_ERROR(1023, "签名已过期！"),
     SIGN_ENCRYPT_MD5_ERROR(1024, "未使用md5加密方式加密！"),
-    NOT_EQUIPMENT(1025, "系统设备未设置！")
+    NOT_EQUIPMENT(1025, "系统设备未设置！"),
+    NOT_PERMISSIONS_SET(1025, "权限组未配置！"),
+    ERROR_ID_CARD(1026, "身份证不合法！"),
+    NO_HK_AUTH(1027, "海康权限信息 未配置"),
+    NO_ET(1028, "设备树 未配置"),
     ;
 
 

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

@@ -0,0 +1,139 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 物业端消息表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_message")
+public class TpMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 工单id 非工单不填
+     */
+    private Integer ticketId;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 消息类型  1：投诉   2：报修 3：联系物业  4： 访客  5:公告  6:系统通知  7:账单 8:活动 9:帖子 10:物业发送消息
+     */
+    private String messageType;
+
+    /**
+     * 通知方式  1 是app内通知  2是短信通知 3 是通知栏消息  4 是 web端消息
+     */
+    private String adviceType;
+
+    /**
+     * 模板类型 1 是消息模板 2是待办模板
+     */
+    private String modelType;
+
+    /**
+     * 接收人id
+     */
+    private Integer uuid;
+
+    /**
+     * 接收人id的类型  1是app用户 2是物业端用户
+     */
+    private String uuidType;
+
+    /**
+     * 来源 1 是app端  2是物业端
+     */
+    private String source;
+
+    /**
+     * 消息内容
+     */
+    private String messageContent;
+
+    /**
+     * 状态 1 是有效 0是无效
+     */
+    private String status;
+
+    /**
+     * 推送结果
+     */
+    private String result;
+
+    /**
+     * 事件类型表的id 预留字段
+     */
+    private String meaasgeTypeId;
+
+    /**
+     * 阅读状态 0 是未读  1是已读
+     */
+    private String readStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 缴费项ID
+     */
+    private Integer billId;
+
+    /**
+     * 活动Id
+     */
+    private Integer activityId;
+
+    /**
+     * 公告Id
+     */
+    private Integer announcementId;
+
+    /**
+     * 二手租赁
+     */
+    private Integer transactionId;
+
+
+}

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

@@ -0,0 +1,49 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_unit_hk_setting")
+public class TpUnitHkSetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 单元ID
+     */
+    private Integer unitId;
+
+    /**
+     * 海康权限ID
+     */
+    private String permissionId;
+
+    private String departmentId;
+
+
+}

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

@@ -1,13 +1,14 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.*;
 
 /**
  * 海康 业务
  * @author weiximei
  */
 public interface IHKService {
-
     /**
      * 推送海康人员
      * @param appUserId
@@ -16,17 +17,23 @@ public interface IHKService {
     ResponseBean pushPerson(String appUserId, Integer userVerifyId);
 
     /**
-     * 下发门禁权限
+     * 添加门禁权限 和 下发门禁权限
+     * @return
+     */
+    ResponseBean addAuthoritiesAnddownloadAuthorityByPersonIds(TaUserVerify userVerify, TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree);
+
+
+    /**
+     * 下发门禁权限(异动方式)
      * @return
      */
     ResponseBean downloadAuthorityByDeviceUuids();
 
     /**
-     * 异步反控开门 (远程开门)
-     *
-     * @param userVerifyId 审核ID
+     * 下发 可视对讲 权限
      * @return
      */
-    ResponseBean syncControl(Integer userVerifyId);
+    ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify, TaUser user);
+
 
 }

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

@@ -2,11 +2,13 @@ package com.community.huiju.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.community.commom.utils.AccountValidatorUtil;
+import com.community.commom.utils.IdcardValidator;
 import com.community.huiju.common.base.ResponseBean;
 import com.community.huiju.enums.ResponseErrorsMessages;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.TaUser;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +35,18 @@ public interface ITaUserService extends IService<TaUser> {
         }
     }
 
+    /**
+     * 校验身份证
+     * @param idCard
+     */
+    default void checkIdCart(String idCard) {
+        if (StringUtils.isBlank(idCard)) {
+            throw new WisdomException(ResponseErrorsMessages.NOT_ID_CARD.getCode(), ResponseErrorsMessages.NOT_ID_CARD.getMsg());
+        }
+        if (!IdcardValidator.isValidatedAllIdcard(idCard)) {
+            throw  new WisdomException(ResponseErrorsMessages.ERROR_ID_CARD.getCode(), ResponseErrorsMessages.ERROR_ID_CARD.getMsg());
+        }
+    }
 
     /**
      * 添加用户

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpMessage;
+
+/**
+ * <p>
+ * 物业端消息表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-24
+ */
+public interface ITpMessageService extends IService<TpMessage> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpUnitHkSetting;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-18
+ */
+public interface ITpUnitHkSettingService extends IService<TpUnitHkSetting> {
+
+}

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

@@ -72,6 +72,9 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
     @Autowired
     private TaUserHkMapper taUserHkMapper;
 
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(Integer userId, Integer userVerifyId, MultipartFile uploadFile) {
@@ -83,8 +86,6 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
             return responseBean;
         }
 
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
-
         // 当前人脸图片url
         String faceImg = img(uploadFile);
 
@@ -105,7 +106,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         taFace.setUpdateDate(new Date());
 
         /*验证身份*/
-        responseBean = addVerify(userId, userVerifyId, uploadFile, faceImg, taFace, tpEquipmentTree);
+        responseBean = addVerify(userId, userVerifyId, uploadFile, faceImg, taFace);
         return responseBean;
     }
 
@@ -128,7 +129,6 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
             return responseBean;
         }
 
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
         // 人脸图片地址url
         String faceImg = img(uploadFile);
 
@@ -139,7 +139,13 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         ihkService.pushPerson(userId + "", userVerifyId);
 
         // 海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), userVerify.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getUserVerifyId(), userVerify.getCommunityId());
+
+        // 海康权限信息
+        TpUnitHkSetting tpUnitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
+        // 设备树
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
 
         //当前修改的id否存在
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
@@ -152,7 +158,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         face.setFaceImg(faceImg);
         face.setUpdateUser(userId);
         face.setUpdateDate(new Date());
-        ResponseBean resps = checKout(faceImg, face, false, uploadFile, userId, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid(), taUserHk);
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, tpUnitHkSetting, userVerify, tpEquipmentTree, taUserHk);
         if (resps.getCode().equals("0")) {
             resps.addSuccess(face);
         } else {
@@ -167,20 +173,34 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
      * @param taFace
      * @param isA
      * @param uploadFile
-     * @param userId
-     * @param communityId
-     * @param roomNoId
-     * @param unitId
-     * @param appkey
-     * @param secret
-     * @param openapi_ip_port_http 海康服务器地址
+     * @param unitHkSetting
+     * @param userVerify
+     * @param tpEquipmentTree
+     * @param taUserHk
      * @return
      */
-    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, Integer unitId, String  appkey, String secret, String openapi_ip_port_http,String opUserUuid, TaUserHk taUserHk) {
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, TpUnitHkSetting unitHkSetting , TaUserVerify userVerify, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk) {
         ResponseBean responseBean = new ResponseBean();
-        TaUser user = taUserMapper.selectById(userId);
+
+        if (null == unitHkSetting) {
+            responseBean.addError(ResponseErrorsMessages.NO_HK_AUTH.getCode(), ResponseErrorsMessages.NO_HK_AUTH.getMsg());
+            return responseBean;
+        }
+
+        if (null == tpEquipmentTree) {
+            responseBean.addError(ResponseErrorsMessages.NO_ET.getCode(), ResponseErrorsMessages.NO_ET.getMsg());
+            return responseBean;
+        }
+
+        if (null == userVerify) {
+            responseBean.addError(ResponseErrorsMessages.NOT_VERIFY.getCode(), ResponseErrorsMessages.NOT_VERIFY.getMsg());
+            return responseBean;
+        }
+
+
+        TaUser user = taUserMapper.selectById(userVerify.getUserId());
         if (taUserHk.getHkUserId() == null) {
-            log.error("本地库人员ID：{}  的海康人员ID不存在", userId);
+            log.error("本地库人员ID：{}  的海康人员ID不存在", userVerify.getUserId());
             throw new WisdomException(ResponseErrorsMessages.NOT_PUSH_FACE.getCode(), ResponseErrorsMessages.NOT_PUSH_FACE.getMsg());
         }
         AESDecode aesd = new AESDecode();
@@ -192,25 +212,39 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
             Integer faceNum = (Integer) jsonObject.get("face_num");
 
             /*推送海康*/
-            String data = HKOpenApi.HKpersonGroupId(uploadFile, taUserHk.getHkUserId(), taUserHk.getHkPersonNo(), user.getUserName(), taUserHk.getHkCardNo(), appkey, secret, openapi_ip_port_http, opUserUuid);
+            // 修改人脸操作
+            String data = HKOpenApi.HKpersonGroupId(uploadFile, taUserHk.getHkUserId(), taUserHk.getHkPersonNo(), user.getUserName(), taUserHk.getHkCardNo(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid());
+
+            // 等待 1s
+            Thread.sleep(1000);
+
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
-                    log.error("未得到，海康数据反馈！");
-                    throw new WisdomException(ResponseErrorsMessages.NOT_PUSH_FACE.getCode(), ResponseErrorsMessages.NOT_PUSH_FACE.getMsg());
+                    log.error("海康人脸推送失败！");
+                    throw new RuntimeException("人脸推送失败！");
                 }
+
+                // 下发卡权限
+                // 下发可是对讲卡权限
+                ihkService.visualIntercomPermissions(unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user);
+
                 if (isA) {
                     taFaceMapper.insert(taFace);
                 } else {
                     taFaceMapper.updateById(taFace);
                 }
+
+                // 等待 1s
+                Thread.sleep(3000);
+
+                responseBean.addSuccess("操作成功");
+
                 responseBean.addSuccess(taFace);
 
-                // 设备树
-                TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
                 // 所有设备
                 //List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
-                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(communityId, unitId, 4);
+                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(tpEquipmentTree.getCommunityId(), userVerify.getUnitId(), 4);
                 if (CollectionUtils.isNotEmpty(tpEquipments)) {
                     List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
                     StringBuilder doorUuids = new StringBuilder();
@@ -229,10 +263,13 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
                     map.put("type", 1);
                     map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
                     HKOpenApi.downloadFaceAndFingerInfos(map);
+
+                    // 等待 2s
+                    Thread.sleep(2000);
                 }
 
                 // 单元门口机
-                List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 3);
+                List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(tpEquipmentTree.getCommunityId(), userVerify.getUnitId(), 3);
                 if (CollectionUtils.isNotEmpty(visualEquipments)) {
                     List<String> visualList = visualEquipments.stream()
                             .map(e-> tpConfigurationMapper.selectById(e.getUuidId()).getConfigurationValue())
@@ -315,7 +352,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
     /**
      * 各种身份校验
      */
-    public ResponseBean addVerify(Integer userid, Integer userVerifyId, MultipartFile uploadFile, String faceImg, TaFace taFace, TpEquipmentTree tpEquipmentTree) {
+    public ResponseBean addVerify(Integer userid, Integer userVerifyId, MultipartFile uploadFile, String faceImg, TaFace taFace) {
         ResponseBean response = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
@@ -332,14 +369,21 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         }
 
         // 海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), userVerify.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getUserVerifyId(), userVerify.getCommunityId());
+
+        // 海康权限信息
+        TpUnitHkSetting tpUnitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
+        // 设备树
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
 
         //查询当前用户是否有人脸记录
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
         if (null == face) {
             boolean isA = true;
             if (Constant.EFFECTIVE_STATUS.equals(taUser.getStatus())) {
-                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(),tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid(), taUserHk);
+                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, tpUnitHkSetting, userVerify,tpEquipmentTree, taUserHk);
                 if (responseBean.getCode().equals("0")) {
                     responseBean.addSuccess("人脸录入成功");
                 } else {
@@ -352,6 +396,18 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         return response;
     }
 
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
     @Override
     public ResponseBean deleteFace(Integer userId, Integer userVerifyId) {
         ResponseBean responseBean= new ResponseBean();
@@ -372,7 +428,7 @@ public class FaceServicelimpl  extends ServiceImpl<TaFaceMapper, TaFace> impleme
         }
 
         // 海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(taUserVerify.getUserId(), taUserVerify.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(taUserVerify.getUserVerifyId(), taUserVerify.getCommunityId());
 
         // 设备树
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(taUserVerify.getCommunityId());

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

@@ -7,6 +7,7 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.uuid.IdGen;
 import com.community.commom.hk.HKOpenApi;
 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;
@@ -33,6 +34,9 @@ import java.util.stream.Collectors;
 @Slf4j
 public class HKServiceImpl implements IHKService {
 
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
     @Autowired
     private TaUserMapper taUserMapper;
 
@@ -50,12 +54,10 @@ public class HKServiceImpl implements IHKService {
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+
     @Autowired
     private TaUserHkMapper taUserHkMapper;
 
-//    @Autowired
-//    private TaRemotelyDoorMapper taRemotelyDoorMapper;
-
     /**
      * 获取设备UUID
      * @param equipmentList
@@ -81,14 +83,19 @@ public class HKServiceImpl implements IHKService {
         if (null == userVerify) {
             throw new WisdomException("审核数据不存在！");
         }
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
 
         // 海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), userVerify.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getUserVerifyId(), userVerify.getCommunityId());
         if (null == taUserHk) {
             taUserHk = new TaUserHk();
         }
 
+        // 海康权限信息
+        TpUnitHkSetting unitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
+        // 设备树
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
         // 这两个值一般都是同时存在的
         // 当这两个值不存在的时候，就添加海康人员
         if (null == taUserHk.getHkUserId() && null == taUserHk.getHkPersonNo()) {
@@ -99,7 +106,7 @@ public class HKServiceImpl implements IHKService {
              * 2.根据部门编号推送 海康
              */
             taUserMapper.updateById(user);
-            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk);
+            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk, unitHkSetting, userVerify);
         }
 
         // 卡片操作
@@ -115,11 +122,21 @@ public class HKServiceImpl implements IHKService {
         }
 
 
+        // 判断是否成功
+        if ("0".equals(responseBean.getCode())) {
+            responseBean.addSuccess("操作成功！");
+            return responseBean;
+        }
+        throw new WisdomException("操作失败!");
+    }
 
-        // 推送海康
 
-        // 给用户添加 海康门禁权限
+    @Override
+    public ResponseBean addAuthoritiesAnddownloadAuthorityByPersonIds(TaUserVerify userVerify, TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree) {
 
+        ResponseBean responseBean = new ResponseBean();
+
+        // 给用户添加 海康门禁权限
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 4);
         List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
         StringBuilder doorUuids = new StringBuilder();
@@ -132,14 +149,15 @@ public class HKServiceImpl implements IHKService {
         });
 
         if (org.apache.commons.lang3.StringUtils.isNotBlank(doorUuids)) {
-
             Map<String, Object> map = Maps.newHashMap();
             map.put("personIds",String.valueOf(taUserHk.getHkUserId()));
             map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
             map.put("secret", tpEquipmentTree.getSecret());
             map.put("appkey", tpEquipmentTree.getAppkey());
             map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-            HKOpenApi.addAuthoritiesByPersonIds(map);
+            map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+            String addAuthoritiesJSONString = HKOpenApi.addAuthoritiesByPersonIds(map);
+            validHKError(addAuthoritiesJSONString);
 
             // 下发门禁权限
             Map<String, Object> downloadAuthorityByPersonIdsMap = Maps.newHashMap();
@@ -150,35 +168,13 @@ public class HKServiceImpl implements IHKService {
             downloadAuthorityByPersonIdsMap.put("secret", tpEquipmentTree.getSecret());
             downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
             downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-            HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
-
+            downloadAuthorityByPersonIdsMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+            String downloadAuthorityJSON = HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
+            validHKError(downloadAuthorityJSON);
         }
 
-        //--------- 可视对讲 ----------
-
-        Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
-        addOutDoorAuthMap.put("authName", "app用户权限勿动");
-        addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
-        addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
-        addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
-        addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-
-                // 单元门口机
-        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
-        List<String> visualList = visualEquipments.stream()
-                .map(e-> tpConfigurationMapper.selectById(e.getUuidId()).getConfigurationValue())
-                .collect(Collectors.toList());
-//        List<String> visualList = new ArrayList<>();
-//        visualList.add("10010100000");
-        addOutDoorAuthMap.put("longNums", visualList);
-        // 可视对讲下发 权限
-        visualIntercomPermissions(addOutDoorAuthMap);
-        if ("0".equals(responseBean.getCode())) {
-            responseBean.addSuccess("操作成功！");
-            return responseBean;
-        }
-        throw new WisdomException("操作失败!");
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
     }
 
     @Override
@@ -198,15 +194,15 @@ public class HKServiceImpl implements IHKService {
      * @param response
      * @param user
      */
-    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk) {
-        Map<String, Object> parDept = Maps.newHashMap();
-        parDept.put("pageNo", 1);
-        parDept.put("pageSize", 100);
-        parDept.put("deptName", Constant.DEPT_RESIDENTS);
-        parDept.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        parDept.put("appkey", tpEquipmentTree.getAppkey());
-        parDept.put("secret", tpEquipmentTree.getSecret());
-        parDept.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TpUnitHkSetting unitHkSetting, TaUserVerify userVerify) {
+//        Map<String, Object> parDept = Maps.newHashMap();
+//        parDept.put("pageNo", 1);
+//        parDept.put("pageSize", 100);
+//        parDept.put("deptName", Constant.DEPT_RESIDENTS);
+//        parDept.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        parDept.put("appkey", tpEquipmentTree.getAppkey());
+//        parDept.put("secret", tpEquipmentTree.getSecret());
+//        parDept.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         // 部门UUID
         //String deptUuid = getDeptUUID(parDept);
 
@@ -215,14 +211,14 @@ public class HKServiceImpl implements IHKService {
         parUser.put("personNo", taUserHk.getHkPersonNo());
         parUser.put("personName", user.getUserName());
         // parUser.put("phoneNo", user.getLoginName());
-        //parUser.put("deptUuid", deptUuid);
         parUser.put("remark", user.getLoginName());
+        parUser.put("deptUuid", unitHkSetting.getDepartmentId());
         parUser.put("secret", tpEquipmentTree.getSecret());
         parUser.put("appkey", tpEquipmentTree.getAppkey());
-        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
-        int errorCode = (int) resultMap.get("errorCode");
+        Integer errorCode = (Integer) resultMap.get("errorCode");
         if (errorCode == 0) {
             Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
 
@@ -230,19 +226,17 @@ public class HKServiceImpl implements IHKService {
             Integer personId = (Integer) resultDataMap.get("personId");
 
             taUserHk.setHkUserId(personId);
-            // 存储海康人员ID
+
             int row = 0;
             if (null == taUserHk.getId()) {
-                taUserHk.setTaUserId(user.getUserId());
+                // 存储的是审核id
+                taUserHk.setTaUserId(userVerify.getUserVerifyId());
                 taUserHk.setCommunityId(tpEquipmentTree.getCommunityId());
+                taUserHk.setCreateDate(new Date());
+                taUserHk.setUpdateDate(new Date());
                 // 存储海康人员ID
                 row = taUserHkMapper.insert(taUserHk);
-                taUserHk.setCreateUser(taUserHk.getId());
-                taUserHk.setCreateDate(new Date());
-                taUserHkMapper.updateById(taUserHk);
             } else {
-                taUserHk.setUpdateUser(taUserHk.getId());
-                taUserHk.setUpdateDate(new Date());
                 row = taUserHkMapper.updateById(taUserHk);
             }
 
@@ -332,8 +326,8 @@ public class HKServiceImpl implements IHKService {
         parOpenCard.put("endTime", time);
         parOpenCard.put("secret", tpEquipmentTree.getSecret());
         parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
-        parOpenCard.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         parOpenCard.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parOpenCard.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
         int code = (int) openCardJSON.get("errorCode");
         if (code == 0) {
@@ -348,6 +342,18 @@ public class HKServiceImpl implements IHKService {
         return response;
     }
 
+    /**
+     * 校验错误
+     * @param json
+     */
+    private void validHKError(String json) {
+        Map<String, Object> resultMap = JSONObject.parseObject(json, HashMap.class);
+        Integer errorCode = (Integer) resultMap.get("errorCode");
+        if (errorCode.intValue() != 0) {
+            throw new RuntimeException(String.valueOf(resultMap.get("errorMessage")));
+        }
+    }
+
     /**
      * 获取部门 uuid
      * <p>
@@ -365,19 +371,31 @@ public class HKServiceImpl implements IHKService {
         return deptUuid;
     }
 
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
     /**
      * 可视对讲下发 权限
      *
      * @param map
      */
-    private void visualIntercomPermissions(Map<String,Object> map) {
+    private String visualIntercomPermissions(Map<String,Object> map) {
         // TODO 目前下发的 authName权限组是我们自定义的, 后面肯定是按照小区的 期楼栋号来设置的
         // TODO longNums设备编号, 可视对讲的机器编号, 应该根据 期楼栋号 下面的机器编号来设置的
 
         //--------- 可视对讲 ----------
 
         // 可视对讲 根据人员 ID 集添加权限并下发
-        HKOpenApi.addOutDoorAuth(map);
+        return HKOpenApi.addOutDoorAuth(map);
 
     }
 
@@ -392,61 +410,61 @@ public class HKServiceImpl implements IHKService {
         downloadFingerMap.put("opType", 1);
         downloadFingerMap.put("personIds", map.get("personIds"));
         downloadFingerMap.put("longNums", map.get("longNums"));
-        downloadFingerMap.put("opUserUuid", map.get("opUserUuid"));
         downloadFingerMap.put("openapi_ip_port_http", map.get("openapi_ip_port_http"));
+        downloadFingerMap.put("opUserUuid", map.get("opUserUuid"));
         // 可视对讲 指定人员指纹权限下载
         HKOpenApi.downloadFinger(downloadFingerMap);
     }
 
     @Override
-    public ResponseBean syncControl(Integer userVerifyId) {
-        // TODO 暂时只支持开单元门
+    public ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify, TaUser user) {
 
         ResponseBean responseBean = new ResponseBean();
 
-        // 查询当前的房产
-        TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
-        // 单元门口机
-        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+        if (null == unitHkSetting) {
+            responseBean.addError("海康权限信息 未配置");
+            return responseBean;
+        }
 
-        if (CollectionUtils.isEmpty(tpEquipments)) {
-            responseBean.addError("无设备信息!");
+        if (null == tpEquipmentTree) {
+            responseBean.addError("设备树 未配置");
             return responseBean;
         }
 
-        String str = "";
-        for (TpEquipment e : tpEquipments) {
-            TpConfiguration tpConfiguration = tpConfigurationMapper.selectById(e.getUuidId());
-            str += tpConfiguration.getConfigurationValue();
-            str += ",";
+        if (null == userVerify) {
+            responseBean.addError("审核数据 不能为null");
+            return responseBean;
         }
 
-        // 查询设备编号
-
-        Map<String,Object> parMap = com.beust.jcommander.internal.Maps.newHashMap();
-        parMap.put("longNums", str);
-        parMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        parMap.put("secret", tpEquipmentTree.getSecret());
-        parMap.put("appkey", tpEquipmentTree.getAppkey());
-        parMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-        String data = HKOpenApi.syncControl(parMap);
-        JSONObject jsonObject = JSONObject.parseObject(data);
-        int errorCode = jsonObject.getInteger("errorCode");
-        if (errorCode == 0) {
-//
-//            // 记录 远程开门次数
-//            TaRemotelyDoor taRemotelyDoor = new TaRemotelyDoor();
-//            taRemotelyDoor.setCommunityId(userVerify.getCommunityId());
-//            taRemotelyDoor.setTaUserVerifyId(userVerify.getUserId());
-//            taRemotelyDoor.setUnitId(userVerify.getUnitId());
-//            taRemotelyDoor.setCreateDate(new Date());
-//            taRemotelyDoorMapper.insertSelective(taRemotelyDoor);
-//
-//            responseBean.addSuccess("操作成功!");
-//            return responseBean;
+        //--------- 可视对讲 ----------
+
+        Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
+        // app用户权限勿动
+        addOutDoorAuthMap.put("authName", user.getUserName() + userVerify.getUserVerifyId());
+        addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
+        addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
+        addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+        addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+
+        // 单元门口机
+        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+        List<String> visualList = visualEquipments.stream()
+                .map(e-> tpConfigurationMapper.selectById(e.getUuidId()).getConfigurationValue())
+                .collect(Collectors.toList());
+//        List<String> visualList = new ArrayList<>();
+//        visualList.add("10010100000");
+        addOutDoorAuthMap.put("longNums", visualList);
+        // 可视对讲下发 权限
+        String permissionsJSON = visualIntercomPermissions(addOutDoorAuthMap);
+        JSONObject addCardsJsonObject = JSONObject.parseObject(permissionsJSON);
+        Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+        if (0 == addCardsResultCode.intValue()) {
+            responseBean.addSuccess("操作成功！");
+            return responseBean;
         }
-        responseBean.addError("操作失败!");
-        return responseBean;
+
+        responseBean.addError("操作失败");
+        throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
     }
 }

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

@@ -42,9 +42,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             responseBean.addError(ResponseErrorsMessages.NOT_USER_NAME.getCode(), ResponseErrorsMessages.NOT_USER_NAME.getMsg());
             return responseBean;
         }
-        if (StringUtils.isBlank(idCard)) {
-            responseBean.addError(ResponseErrorsMessages.NOT_ID_CARD.getCode(), ResponseErrorsMessages.NOT_ID_CARD.getMsg());
-            return responseBean;
+        if (StringUtils.isNotBlank(idCard)) {
+            this.checkIdCart(idCard);
         }
         if (StringUtils.isBlank(gender)) {
             responseBean.addError(ResponseErrorsMessages.NOT_GENDER.getCode(), ResponseErrorsMessages.NOT_GENDER.getMsg());
@@ -64,6 +63,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         taUser.setCreateDate(new Date());
         taUser.setStatus("1");
         taUser.setVerifyStatus("1");
+        taUser.setRemark("大苏");
 
         boolean saveBool = this.save(taUser);
         if (saveBool) {
@@ -97,6 +97,10 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             return responseBean;
         }
 
+        if (StringUtils.isNotBlank(idCard)) {
+            this.checkIdCart(idCard);
+        }
+
         UpdateWrapper<TaUser> userUpdateWrapper = new UpdateWrapper<>();
         userUpdateWrapper.eq("id", userId);
         userUpdateWrapper.set(StringUtils.isNotBlank(userName), "user_name", userName);

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

@@ -3,6 +3,7 @@ package com.community.huiju.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.common.message.MessagePush;
 import com.community.huiju.dao.*;
 import com.community.huiju.enums.ResponseErrorsMessages;
 import com.community.huiju.exception.WisdomException;
@@ -55,6 +56,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     @Autowired
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
+    @Autowired
+    private TpMessageMapper tpMessageMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addUserVerify(Integer userId, Integer roleId, Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
@@ -176,6 +180,30 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 
         tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
 
+        // 推送默认消息
+
+        //审核通过后推送消息（临时数据）
+        String[] messageArr= new MessagePush().messagePushAll();
+        for (String count:messageArr) {
+            TpMessage message = new TpMessage();
+            message.setCommunityId(taUserVerify.getCommunityId());
+            message.setMessageType("9");
+            message.setAdviceType("1");
+            message.setModelType("1");
+            message.setUuid(taUserVerify.getUserVerifyId());
+            message.setUuidType("1");
+            message.setSource("1");
+            message.setMessageContent(count);
+            message.setStatus("1");
+            message.setResult("");
+            message.setMeaasgeTypeId("");
+            message.setReadStatus("0");
+            message.setCreateUser(taUserVerify.getUserId());
+            message.setCreateDate(new Date());
+            tpMessageMapper.insert(message);
+        }
+
+
         responseBean.addSuccess(taUserVerify);
         return responseBean;
     }

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpMessageMapper;
+import com.community.huiju.model.TpMessage;
+import com.community.huiju.service.ITpMessageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 物业端消息表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-24
+ */
+@Service
+public class TpMessageServiceImpl extends ServiceImpl<TpMessageMapper, TpMessage> implements ITpMessageService {
+
+}

CODE/foreign-service/src/main/resources/mapper/TpMessageMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpMessageMapper">
+
+</mapper>

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

@@ -44,11 +44,11 @@ public class AppApplication {
 	/**
 	 * 文件上传临时路径
 	 */
-	@Bean
-	public MultipartConfigElement multipartConfigElement() {
-		MultipartConfigFactory factory = new MultipartConfigFactory();
-		factory.setLocation("/tmp/smart-community");
-		return factory.createMultipartConfig();
-	}
+//	@Bean
+//	public MultipartConfigElement multipartConfigElement() {
+//		MultipartConfigFactory factory = new MultipartConfigFactory();
+//		factory.setLocation("/tmp/smart-community");
+//		return factory.createMultipartConfig();
+//	}
 
 }

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

@@ -6,13 +6,12 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.model.HkVisitorBill;
 import com.community.huiju.service.IHKService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import com.community.huiju.service.ISenCartId;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -30,6 +29,9 @@ public class HkController extends BaseController {
 	@Autowired
 	private IHKService ihkService;
 
+	@Autowired
+	private ISenCartId iSenCartId;
+
 	@ApiOperation(value = "发送访客账单", notes = "发送访客账单")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "body", name = "hkVisitorBill", dataType = "String",value = "billNum: 账单号,reservationNum:预约单号,plateNum:出场车牌号,leaveTime:出场时间,billFee:账单金额")})
 	@RequestMapping(value = "/sendVisitorBill",method = RequestMethod.POST)
@@ -72,5 +74,23 @@ public class HkController extends BaseController {
 		return responseBean;
 	}
 
+	@ApiOperation(value = "添加人员并卡卡")
+	@RequestMapping(value = "/addUserAndOpenCart", method = RequestMethod.POST)
+	public ResponseBean addUser(@RequestParam("communityId") Integer communityId) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = iSenCartId.addUserAndAddCartId(communityId);
+		return responseBean;
+	}
+
+	@RequestMapping(value = "/addUserOne", method = RequestMethod.POST)
+	@ApiOperation(value = "根据人员为主下发，测试用的")
+	public ResponseBean addUserOne(@ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
+								   @RequestParam(required = false) Integer communityId) {
+
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = iSenCartId.addUserOne(communityId, uploadFile);
+		return responseBean;
+
+	}
 
 }

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

@@ -63,7 +63,7 @@ public class UserController extends BaseController {
     @RequestMapping(value = "/user/register",method = RequestMethod.POST)
     public ResponseBean register(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iTaUserService.register(parameter);
+        responseBean = iTaUserService.register(parameter, true);
         return responseBean;
     }
 
@@ -383,6 +383,28 @@ public class UserController extends BaseController {
 
     }
 
+    @ApiOperation(value = "获取所有家属", notes = "获取所有家属")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "X-Auth-Token", value = "Token")
+    })
+    @RequestMapping(value = "/user/relation/all", method = RequestMethod.GET)
+    public ResponseBean getRelationAll(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserService.getRelationAll(userElement);
+        return responseBean;
+    }
 
+    @ApiOperation(value = "切换户主", notes = "切换户主")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "relationUserVerifyId", value = "被切换的家属房产审核id")
+    })
+    @RequestMapping(value = "/user/switchoverOwner/{relationUserVerifyId}", method = RequestMethod.PUT)
+    public ResponseBean switchoverOwner(HttpSession session, @PathVariable("relationUserVerifyId") Integer relationUserVerifyId) {
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iTaUserService.switchoverOwner(userElement, relationUserVerifyId);
+        return responseBean;
+    }
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserHkMapper.java

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 @Mapper
 public interface TaUserHkMapper {
     int deleteByPrimaryKey(Integer id);
@@ -21,7 +23,11 @@ public interface TaUserHkMapper {
     int updateByPrimaryKey(TaUserHk record);
 
     @ResultMap("BaseResultMap")
-    @Select("select * from ta_user_hk where ta_user_id = #{userId} and community_id = #{communityId}")
-    TaUserHk selectByUserIdAndCommunityId(@Param("userId") Integer userId, @Param("communityId") Integer communityId);
+    @Select("select * from ta_user_hk where ta_user_id = #{userVerifyId} and community_id = #{communityId}")
+    TaUserHk selectByUserVerifyIdAndCommunityId(@Param("userVerifyId") Integer userVerifyId, @Param("communityId") Integer communityId);
+
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_hk where community_id = #{communityId}")
+    List<TaUserHk> selectByCommunityId(@Param("communityId") Integer communityId);
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -3,6 +3,8 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TaUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -78,4 +80,36 @@ public interface TaUserMapper {
     List<TaUser> getByLoginNameList(@Param("loginName") String loginName);
 	
 	TaUser getByOpenId(@Param("openid") String openid);
+
+    /**
+     * 查询已审核通过的，但是没有 海康id 的用户
+     * @param communityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT " +
+            "tuv.id as userVerifyId, " +
+            "tuv.unit_id as unitId, " +
+            " tau.* " +
+            "FROM " +
+            " ta_user_verify tuv " +
+            " LEFT JOIN ta_user tau ON tuv.user_id = tau.id " +
+            " LEFT JOIN ta_user_hk tuh on tuv.user_id = tuh.ta_user_id " +
+            "WHERE " +
+            " tuv.verify_status = 1 " +
+            " AND tuv.community_id = #{communityId} " +
+            " and tuh.hk_user_id is NULL")
+    List<TaUser> selectNotHKuserId(@Param("communityId") Integer communityId);
+
+    /**
+     * 获取所有家属
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    List<TaUser> selectHouseRelationUserList(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserVerifyMapper.java

@@ -98,4 +98,80 @@ public interface TaUserVerifyMapper {
                                            @Param("levelId") Integer levelId,
                                            @Param("roomNoId") Integer roomNoId);
 
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_verify where community_id=#{communityId}" +
+            " and verify_status =  1 and id in (1120,1122,1128,1133,1134,1119)")
+    List<TaUserVerify> selectByCommunityId(@Param("communityId") Integer communityId);
+
+
+    /**
+     * 查询没有推送默认消息的审核数据
+     * @param communityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select(
+            "SELECT *  FROM " +
+            "ta_user_verify uv " +
+            "WHERE   uv.verify_status = \"1\" " +
+             "and " +
+               "uv.community_id = #{communityId} " +
+             "and " +
+              "uv.id NOT IN (" +
+                "SELECT " +
+                    "tuv.id  " +
+                "FROM " +
+                "ta_user_verify tuv  LEFT JOIN tp_message tm ON tuv.id = tm.uuid " +
+                "WHERE " +
+                    "tm.uuid_type = \"1\" " +
+                    "AND tuv.verify_status = \"1\" " +
+                    "AND tuv.community_id = #{communityId} " +
+                    "AND tm.message_type = \"9\" " +
+                    "AND tm.advice_type = \"1\" " +
+                    "AND tm.model_type = \"1\" " +
+                    "AND tm.source = \"1\" " +
+                    "AND tm.`status` = \"1\" " +
+                "GROUP BY " +
+                "tuv.id  " +
+            ") "
+    )
+    List<TaUserVerify> selectNotMessage(@Param("communityId") Integer communityId);
+
+    /**
+     * 查询 这个审核id 是否已经推送过消息
+     * @param communityId
+     * @param userVerfiyId
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT " +
+            "* " +
+            "FROM " +
+            "ta_user_verify tuv " +
+            "LEFT JOIN tp_message tm ON tuv.id = tm.uuid  " +
+            "WHERE " +
+            "tm.uuid_type = \"1\"  " +
+            "AND tuv.verify_status = \"1\"  " +
+            "AND tuv.community_id = #{communityId}  " +
+            "AND tm.message_type = \"9\"  " +
+            "AND tm.advice_type = \"1\"  " +
+            "AND tm.model_type = \"1\"  " +
+            "AND tm.source = \"1\"  " +
+            "AND tm.`status` = \"1\"  " +
+            "and tm.uuid = #{userVerfiyId} " +
+            "GROUP BY " +
+            "tuv.id ")
+    TaUserVerify selectChcekNotMessage(@Param("communityId") Integer communityId, @Param("userVerfiyId") Integer userVerfiyId);
+
+    /**
+     * 校验这个审核id, 是不是这个房产下面的
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @param userVerifyId
+     * @return
+     */
+    TaUserVerify selectChcekInHouseUserVerify(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("userVerifyId") Integer userVerifyId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpUnitHkSettingMapper.java

@@ -0,0 +1,32 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpUnitHkSetting;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TpUnitHkSettingMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpUnitHkSetting record);
+
+    int insertSelective(TpUnitHkSetting record);
+
+    TpUnitHkSetting selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpUnitHkSetting record);
+
+    int updateByPrimaryKey(TpUnitHkSetting record);
+
+    /**
+     * 根据 小区id 和 单元id
+     *
+     * @param communityId
+     * @param unitId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_unit_hk_setting where community_id = #{communityId} and unit_id = #{unitId}")
+    TpUnitHkSetting selectByCommunityIdAndUnitId(Integer communityId, Integer unitId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java

@@ -82,6 +82,11 @@ public class TaUser {
      */
     private String faceImg;
 
+    /**
+     * 单元id
+     */
+    private Integer unitId;
+
     public void setHouseList(List<TpBuildingOwnerInfo> houseList) {
         this.houseList = houseList;
     }
@@ -329,4 +334,12 @@ public class TaUser {
     public void setFaceImg(String faceImg) {
         this.faceImg = faceImg;
     }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUserVerify.java

@@ -264,4 +264,5 @@ public class TaUserVerify {
     public void setLoginName(String loginName) {
         this.loginName = loginName;
     }
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpUnitHkSetting.java

@@ -0,0 +1,53 @@
+package com.community.huiju.model;
+
+public class TpUnitHkSetting {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer unitId;
+
+    private String permissionId;
+
+    private String departmentId;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getPermissionId() {
+        return permissionId;
+    }
+
+    public void setPermissionId(String permissionId) {
+        this.permissionId = permissionId == null ? null : permissionId.trim();
+    }
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId == null ? null : departmentId.trim();
+    }
+}

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

@@ -2,6 +2,7 @@ package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.model.*;
 
 /**
  * 海康 业务
@@ -17,7 +18,19 @@ public interface IHKService {
     ResponseBean pushPerson(String appUserId, Integer userVerifyId);
 
     /**
-     * 下发门禁权限
+     * 添加门禁权限 和 下发门禁权限
+     * @return
+     */
+    ResponseBean addAuthoritiesAnddownloadAuthorityByPersonIds(TaUserVerify userVerify, TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree);
+
+    /**
+     * 下发门禁人脸权限 指定人员人脸/指纹权限下载
+     * @return
+     */
+    ResponseBean downloadFaceAndFingerInfos(TpEquipmentTree tpEquipmentTree, TaUserVerify userVerify, TaUserHk taUserHk);
+
+    /**
+     * 下发门禁权限(异动方式)
      * @return
      */
     ResponseBean downloadAuthorityByDeviceUuids();
@@ -30,4 +43,17 @@ public interface IHKService {
      */
     ResponseBean syncControl(UserElement userElement, Integer equipmentId);
 
+    /**
+     * 下发 可视对讲 权限
+     * @return
+     */
+    ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify, TaUser user);
+
+    /**
+     * 可视对讲时 指定人员人脸权限下载
+     * @return
+     */
+    ResponseBean visualIntercom(TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify);
+
+
 }

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

@@ -0,0 +1,26 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 添加人员，建卡
+ *
+ * @author weiximei on 2019-06-21
+ */
+public interface ISenCartId {
+
+    /**
+     * 添加人员，建卡
+     * @param communityId
+     * @return
+     */
+    ResponseBean addUserAndAddCartId(Integer communityId);
+
+    /**
+     * 添加人员，用于测试以人员的方式下发
+     * @return
+     */
+    ResponseBean addUserOne(Integer communityId, MultipartFile uploadFile);
+
+}

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

@@ -57,9 +57,10 @@ public interface ITaUserService {
      * 注册用户
      *
      * @param parameter
+     * @param isIdCart true 开启身份证校验
      * @return
      */
-    ResponseBean register(String parameter);
+    ResponseBean register(String parameter, boolean isIdCart);
 
     /**
      * 检验登录房产
@@ -252,4 +253,18 @@ public interface ITaUserService {
      * @return
      */
     ResponseBean propertyHistoryDdetails(Integer id);
+    /**
+     * 获取所有家属
+     * @param userElement
+     * @return
+     */
+    ResponseBean getRelationAll(UserElement userElement);
+
+    /**
+     * 切换户主
+     * @param userElement
+     * @param relationUserVerifyId 被切换的家属房产审核id
+     * @return
+     */
+    ResponseBean switchoverOwner(UserElement userElement, Integer relationUserVerifyId);
 }

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

@@ -79,10 +79,12 @@ public class FaceServicelimpl implements FaceServiceI {
     @Autowired
     private TaUserHkMapper taUserHkMapper;
 
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId) {
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
         ResponseBean responseBean = new ResponseBean();
         /*审核房产是否通过*/
         TaUserVerify taUserVerify= infoExist(userElement.getUserVerifyId());
@@ -111,16 +113,10 @@ public class FaceServicelimpl implements FaceServiceI {
         }
         Integer activeUser = otherUserId == null ? userElement.getId() : otherUserId;
 
-        /**
-         * 删除的时候，将所有的海康设备的关联关系删除了，需要重新下发一次
-         */
-        // 下发门禁
-        ihkService.pushPerson(activeUser + "", userVerifyId);
-
         TaUser user = taUserMapper.selectByPrimaryKey(activeUser);
         TaFace taFace = new TaFace();
         taFace.setFaceImg(faceImg);
-        taFace.setCommunityId(user.getCommunityId());
+        taFace.setCommunityId(userElement.getCommunityId());
         taFace.setTaUserVerifyId(userVerifyId);
         taFace.setCreateUser(userElement.getId());
         taFace.setUpdateUser(activeUser);
@@ -128,7 +124,7 @@ public class FaceServicelimpl implements FaceServiceI {
         taFace.setUpdateDate(new Date());
 
         /*验证身份*/
-        responseBean = addVerify(activeUser, userVerifyId, uploadFile, faceImg, taFace, tpEquipmentTree);
+        responseBean = addVerify(activeUser, userVerifyId, uploadFile, faceImg, taFace);
         return responseBean;
     }
 
@@ -143,7 +139,7 @@ public class FaceServicelimpl implements FaceServiceI {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean upDateFace(UserElement userElement, MultipartFile uploadFile, Integer otherUserId) {
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
+
         ResponseBean responseBean = new ResponseBean();
         // 人脸图片地址url
         String faceImg = img(uploadFile);
@@ -159,14 +155,17 @@ public class FaceServicelimpl implements FaceServiceI {
         }
 
         // 海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userElement.getId(), userElement.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerifyId, userElement.getCommunityId());
 
-        /**
-         * 删除的时候，将所有的海康设备的关联关系删除了，需要重新下发一次
-         */
+        // 审核数据
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
-        // 下发门禁
-        ihkService.pushPerson(activeUser + "", userVerifyId);
+        // 海康权限信息
+        TpUnitHkSetting tpUnitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
+        // 设备树
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
+
 
         //当前修改的id否存在
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
@@ -179,7 +178,7 @@ public class FaceServicelimpl implements FaceServiceI {
         face.setFaceImg(faceImg);
         face.setUpdateUser(userElement.getId());
         face.setUpdateDate(new Date());
-        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid(), taUserHk);
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, taUserHk, tpUnitHkSetting, tpEquipmentTree, userVerify);
         if (resps.getCode().equals("0")) {
             resps.addSuccess((Object) faceImg);
         } else {
@@ -194,21 +193,35 @@ public class FaceServicelimpl implements FaceServiceI {
      * @param taFace
      * @param isA
      * @param uploadFile
-     * @param userId
-     * @param communityId
-     * @param roomNoId
-     * @param unitId
-     * @param appkey
-     * @param secret
-     * @param openapi_ip_port_http 海康服务器地址
+     * @param taUserHk
+     * @param unitHkSetting
+     * @param tpEquipmentTree
+     * @param userVerify
      * @return
      */
-    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, Integer unitId, String  appkey, String secret, String openapi_ip_port_http, String opUserUuid, TaUserHk taUserHk) {
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, TaUserHk taUserHk, TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserVerify userVerify) {
         ResponseBean responseBean = new ResponseBean();
-        TaUser user = taUserMapper.selectByPrimaryKey(userId);
+
+        if (null == unitHkSetting) {
+            responseBean.addError("海康权限信息 未配置");
+            return responseBean;
+        }
+
+        if (null == tpEquipmentTree) {
+            responseBean.addError("设备树 未配置");
+            return responseBean;
+        }
+
+        if (null == userVerify) {
+            responseBean.addError("审核数据 不能为null");
+            return responseBean;
+        }
+
+
+        TaUser user = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
         if (taUserHk.getHkUserId() == null) {
             responseBean.addError("海康人员ID不存在，无法录入");
-            log.error("本地库人员ID：{}  的海康人员ID不存在", userId);
+            log.error("本地库人员ID：{}  的海康人员ID不存在", userVerify.getUserId());
             return responseBean;
         }
         AESDecode aesd = new AESDecode();
@@ -219,67 +232,46 @@ public class FaceServicelimpl implements FaceServiceI {
             Integer type = (Integer) jsonObject.get("errno");
             Integer faceNum = (Integer) jsonObject.get("face_num");
 
-            /*推送海康*/
-            String data = HKOpenApi.HKpersonGroupId(uploadFile, taUserHk.getHkUserId(), taUserHk.getHkPersonNo(), user.getUserName(), taUserHk.getHkCardNo(), appkey, secret, openapi_ip_port_http, opUserUuid);
+            // 修改人脸操作
+            String data = HKOpenApi.HKpersonGroupId(uploadFile, taUserHk.getHkUserId(), taUserHk.getHkPersonNo(), user.getUserName(), taUserHk.getHkCardNo(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid());
+
+            // 等待 1s
+            Thread.sleep(1000);
+
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
                     log.error("海康人脸推送失败！");
                     throw new RuntimeException("人脸推送失败！");
                 }
+
                 if (isA) {
+                    /**
+                     * 添加人脸的时候下发可视对讲卡权限，修改人脸的时候不下发卡权限
+                     */
+                    // 下发可是对讲卡权限
+                    ihkService.visualIntercomPermissions(unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user);
+
+                    // 下发门禁权限
+                    ihkService.addAuthoritiesAnddownloadAuthorityByPersonIds(userVerify, taUserHk, tpEquipmentTree);
+
                     taFaceMapper.insertSelective(taFace);
                 } else {
                     taFaceMapper.updateByPrimaryKeySelective(taFace);
                 }
-                responseBean.addSuccess("操作成功");
-
-                // 设备树
-                TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
-                // 所有设备
-                // List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
-                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(communityId, unitId, 4);
-                if (CollectionUtils.isNotEmpty(tpEquipments)) {
-                    List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
-                    StringBuilder doorUuids = new StringBuilder();
-                    StringBuilder deviceUuids = new StringBuilder();
-                    equipmentUUID.forEach(e-> {
-                        doorUuids.append(e.get("doorUuid"));
-                        doorUuids.append(",");
-                        deviceUuids.append(e.get("deviceUuid"));
-                        deviceUuids.append(",");
-                    });
-                    if (StringUtils.isBlank(deviceUuids)) {
-                        responseBean.addError("系统未配置设备！");
-                        throw new WisdomException("系统未配置设备！");
-                    }
-                    Map<String,Object> map = Maps.newHashMap();
-                    map.put("appkey", tpEquipmentTree.getAppkey());
-                    map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-                    map.put("personIds", String.valueOf(taUserHk.getHkUserId()));
-                    map.put("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
-                    map.put("type", 1);
-                    map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-                    HKOpenApi.downloadFaceAndFingerInfos(map);
-                }
+
+                // 等待 1s
+                Thread.sleep(3000);
+
+                responseBean.addSuccess(taFace);
+
+                // 下发门禁人脸权限
+                ihkService.downloadFaceAndFingerInfos(tpEquipmentTree, userVerify, taUserHk);
 
 
                 //可视对讲时 指定人员人脸权限下载
-                List<Integer> userIdList = new ArrayList<>();
-                userIdList.add(taUserHk.getHkUserId());
-                //临时设备编号
-                // TODO 根据期楼栋号，来查询出门口机
-
-                // 单元门口机
-                List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 3);
-                if (CollectionUtils.isNotEmpty(visualEquipments)) {
-                    List<String> visualList = visualEquipments.stream()
-                            .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
-                            .collect(Collectors.toList());
-//                List<String> visualList = new ArrayList<>();
-//                visualList.add("10010100000");
-                    HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
-                }
+                ihkService.visualIntercom(tpEquipmentTree, taUserHk, userVerify);
+
             } else {
                 responseBean.addError("请录入正确图片");
             }
@@ -386,7 +378,7 @@ public class FaceServicelimpl implements FaceServiceI {
     /**
      * 各种身份校验
      */
-    public ResponseBean addVerify(Integer userid, Integer userVerifyId, MultipartFile uploadFile, String faceImg, TaFace taFace, TpEquipmentTree tpEquipmentTree) {
+    public ResponseBean addVerify(Integer userid, Integer userVerifyId, MultipartFile uploadFile, String faceImg, TaFace taFace) {
         ResponseBean response = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
@@ -394,6 +386,7 @@ public class FaceServicelimpl implements FaceServiceI {
             response.addError("当前房产审核记录不存在！");
             return response;
         }
+
         TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
 
         //身份为家属租客，状态为已停用
@@ -403,14 +396,21 @@ public class FaceServicelimpl implements FaceServiceI {
         }
 
         // 海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), userVerify.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getId(), userVerify.getCommunityId());
+
+        // 海康权限信息
+        TpUnitHkSetting tpUnitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
+        // 设备树
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
 
         //查询当前用户是否有人脸记录
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
         if (null == face) {
             boolean isA = true;
             if (Constant.EFFECTIVE_STATUS.equals(taUser.getStatus())) {
-                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(),tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid(), taUserHk);
+                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, taUserHk, tpUnitHkSetting, tpEquipmentTree, userVerify);
                 if (responseBean.getCode().equals("0")) {
                     responseBean.addSuccess("图片录入成功");
                 } else {
@@ -423,6 +423,18 @@ public class FaceServicelimpl implements FaceServiceI {
         return response;
     }
 
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean addWelcomeFace(MultipartFile uploadFile, TaUser user) {

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

@@ -34,6 +34,9 @@ import java.util.stream.Collectors;
 @Slf4j
 public class HKServiceImpl implements IHKService {
 
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
     @Autowired
     private TaUserMapper taUserMapper;
 
@@ -73,7 +76,7 @@ public class HKServiceImpl implements IHKService {
     }
 
     @Override
-    // @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean pushPerson(String appUserId, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(Integer.parseInt(appUserId));
@@ -84,11 +87,15 @@ public class HKServiceImpl implements IHKService {
         }
 
         // 海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(userVerify.getUserId(), userVerify.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getId(), userVerify.getCommunityId());
         if (null == taUserHk) {
             taUserHk = new TaUserHk();
         }
 
+        // 海康权限信息
+        TpUnitHkSetting unitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
+        // 设备树
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
 
         // 这两个值一般都是同时存在的
@@ -101,7 +108,7 @@ public class HKServiceImpl implements IHKService {
              * 2.根据部门编号推送 海康
              */
             taUserMapper.updateByPrimaryKeySelective(user);
-            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk);
+            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk, unitHkSetting, userVerify);
         }
 
         // 卡片操作
@@ -117,11 +124,21 @@ public class HKServiceImpl implements IHKService {
         }
 
 
+        // 判断是否成功
+        if ("0".equals(responseBean.getCode())) {
+            responseBean.addSuccess("操作成功！");
+            return responseBean;
+        }
+        throw new WisdomException("操作失败!");
+    }
 
-        // 推送海康
 
-        // 给用户添加 海康门禁权限
+    @Override
+    public ResponseBean addAuthoritiesAnddownloadAuthorityByPersonIds(TaUserVerify userVerify, TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree) {
 
+        ResponseBean responseBean = new ResponseBean();
+
+        // 给用户添加 海康门禁权限
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 4);
         List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
         StringBuilder doorUuids = new StringBuilder();
@@ -134,7 +151,6 @@ public class HKServiceImpl implements IHKService {
         });
 
         if (org.apache.commons.lang3.StringUtils.isNotBlank(doorUuids)) {
-
             Map<String, Object> map = Maps.newHashMap();
             map.put("personIds",String.valueOf(taUserHk.getHkUserId()));
             map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
@@ -142,7 +158,8 @@ public class HKServiceImpl implements IHKService {
             map.put("appkey", tpEquipmentTree.getAppkey());
             map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
             map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-            HKOpenApi.addAuthoritiesByPersonIds(map);
+            String addAuthoritiesJSONString = HKOpenApi.addAuthoritiesByPersonIds(map);
+            validHKError(addAuthoritiesJSONString);
 
             // 下发门禁权限
             Map<String, Object> downloadAuthorityByPersonIdsMap = Maps.newHashMap();
@@ -154,35 +171,48 @@ public class HKServiceImpl implements IHKService {
             downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
             downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
             downloadAuthorityByPersonIdsMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-            HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
-
+            String downloadAuthorityJSON = HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
+            validHKError(downloadAuthorityJSON);
         }
 
-        //--------- 可视对讲 ----------
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
 
-        Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
-        addOutDoorAuthMap.put("authName", "app用户权限勿动");
-        addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
-        addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
-        addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
-        addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+    @Override
+    public ResponseBean downloadFaceAndFingerInfos(TpEquipmentTree tpEquipmentTree, TaUserVerify userVerify, TaUserHk taUserHk) {
+
+        ResponseBean responseBean = new ResponseBean();
+
+        // 所有设备
+        // List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(tpEquipmentTree.getCommunityId(), userVerify.getUnitId(), 4);
+        if (CollectionUtils.isNotEmpty(tpEquipments)) {
+            List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
+            StringBuilder doorUuids = new StringBuilder();
+            StringBuilder deviceUuids = new StringBuilder();
+            equipmentUUID.forEach(e-> {
+                doorUuids.append(e.get("doorUuid"));
+                doorUuids.append(",");
+                deviceUuids.append(e.get("deviceUuid"));
+                deviceUuids.append(",");
+            });
+            if (org.apache.commons.lang3.StringUtils.isBlank(deviceUuids)) {
+                responseBean.addError("系统未配置设备！");
+                throw new WisdomException("系统未配置设备！");
+            }
+            Map<String,Object> map = Maps.newHashMap();
+            map.put("appkey", tpEquipmentTree.getAppkey());
+            map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+            map.put("personIds", String.valueOf(taUserHk.getHkUserId()));
+            map.put("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
+            map.put("type", 1);
+            map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            HKOpenApi.downloadFaceAndFingerInfos(map);
 
-        // 单元门口机
-        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
-        List<String> visualList = visualEquipments.stream()
-                .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
-                .collect(Collectors.toList());
-//        List<String> visualList = new ArrayList<>();
-//        visualList.add("10010100000");
-        addOutDoorAuthMap.put("longNums", visualList);
-        // 可视对讲下发 权限
-        visualIntercomPermissions(addOutDoorAuthMap);
-        if ("0".equals(responseBean.getCode())) {
-            responseBean.addSuccess("操作成功！");
-            return responseBean;
         }
-        throw new WisdomException("操作失败!");
+
+        return responseBean;
     }
 
     @Override
@@ -202,15 +232,15 @@ public class HKServiceImpl implements IHKService {
      * @param response
      * @param user
      */
-    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk) {
-        Map<String, Object> parDept = Maps.newHashMap();
-        parDept.put("pageNo", 1);
-        parDept.put("pageSize", 100);
-        parDept.put("deptName", Constant.DEPT_RESIDENTS);
-        parDept.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        parDept.put("appkey", tpEquipmentTree.getAppkey());
-        parDept.put("secret", tpEquipmentTree.getSecret());
-        parDept.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TpUnitHkSetting unitHkSetting, TaUserVerify userVerify) {
+//        Map<String, Object> parDept = Maps.newHashMap();
+//        parDept.put("pageNo", 1);
+//        parDept.put("pageSize", 100);
+//        parDept.put("deptName", Constant.DEPT_RESIDENTS);
+//        parDept.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        parDept.put("appkey", tpEquipmentTree.getAppkey());
+//        parDept.put("secret", tpEquipmentTree.getSecret());
+//        parDept.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         // 部门UUID
         //String deptUuid = getDeptUUID(parDept);
 
@@ -220,7 +250,7 @@ public class HKServiceImpl implements IHKService {
         parUser.put("personName", user.getUserName());
         // parUser.put("phoneNo", user.getLoginName());
         parUser.put("remark", user.getLoginName());
-        //parUser.put("deptUuid", deptUuid);
+        parUser.put("deptUuid", unitHkSetting.getDepartmentId());
         parUser.put("secret", tpEquipmentTree.getSecret());
         parUser.put("appkey", tpEquipmentTree.getAppkey());
         parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
@@ -237,8 +267,11 @@ public class HKServiceImpl implements IHKService {
 
             int row = 0;
             if (null == taUserHk.getId()) {
-                taUserHk.setTaUserId(user.getId());
+                // 存储的是审核id
+                taUserHk.setTaUserId(userVerify.getId());
                 taUserHk.setCommunityId(tpEquipmentTree.getCommunityId());
+                taUserHk.setCreateDate(new Date());
+                taUserHk.setUpdateDate(new Date());
                 // 存储海康人员ID
                 row = taUserHkMapper.insertSelective(taUserHk);
             } else {
@@ -347,6 +380,18 @@ public class HKServiceImpl implements IHKService {
         return response;
     }
 
+    /**
+     * 校验错误
+     * @param json
+     */
+    private void validHKError(String json) {
+        Map<String, Object> resultMap = JSONObject.parseObject(json, HashMap.class);
+        Integer errorCode = (Integer) resultMap.get("errorCode");
+        if (errorCode.intValue() != 0) {
+            throw new RuntimeException(String.valueOf(resultMap.get("errorMessage")));
+        }
+    }
+
     /**
      * 获取部门 uuid
      * <p>
@@ -364,19 +409,31 @@ public class HKServiceImpl implements IHKService {
         return deptUuid;
     }
 
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
     /**
      * 可视对讲下发 权限
      *
      * @param map
      */
-    private void visualIntercomPermissions(Map<String,Object> map) {
+    private String visualIntercomPermissions(Map<String,Object> map) {
         // TODO 目前下发的 authName权限组是我们自定义的, 后面肯定是按照小区的 期楼栋号来设置的
         // TODO longNums设备编号, 可视对讲的机器编号, 应该根据 期楼栋号 下面的机器编号来设置的
 
         //--------- 可视对讲 ----------
 
         // 可视对讲 根据人员 ID 集添加权限并下发
-        HKOpenApi.addOutDoorAuth(map);
+        return HKOpenApi.addOutDoorAuth(map);
 
     }
 
@@ -450,4 +507,89 @@ public class HKServiceImpl implements IHKService {
         responseBean.addError("操作失败!");
         return responseBean;
     }
+
+    @Override
+    public ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify, TaUser user) {
+
+        ResponseBean responseBean = new ResponseBean();
+
+        if (null == unitHkSetting) {
+            responseBean.addError("海康权限信息 未配置");
+            return responseBean;
+        }
+
+        if (null == tpEquipmentTree) {
+            responseBean.addError("设备树 未配置");
+            return responseBean;
+        }
+
+        if (null == userVerify) {
+            responseBean.addError("审核数据 不能为null");
+            return responseBean;
+        }
+
+        //--------- 可视对讲 ----------
+
+        Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
+        // app用户权限勿动 unitHkSetting.getPermissionId()
+        addOutDoorAuthMap.put("authName", user.getUserName()+userVerify.getId());
+        addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
+        addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
+        addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+        addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+
+        // 单元门口机
+        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+        List<String> visualList = visualEquipments.stream()
+                .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                .collect(Collectors.toList());
+//        List<String> visualList = new ArrayList<>();
+//        visualList.add("10010100000");
+        addOutDoorAuthMap.put("longNums", visualList);
+        // 可视对讲下发 权限
+        String permissionsJSON = visualIntercomPermissions(addOutDoorAuthMap);
+        JSONObject addCardsJsonObject = JSONObject.parseObject(permissionsJSON);
+        Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+        if (0 == addCardsResultCode.intValue()) {
+            responseBean.addSuccess("操作成功！");
+            return responseBean;
+        }
+
+        responseBean.addError("操作失败");
+        throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
+    }
+
+
+    @Override
+    public ResponseBean visualIntercom(TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify) {
+
+        ResponseBean responseBean = new ResponseBean();
+
+        //可视对讲时 指定人员人脸权限下载
+        List<Integer> userIdList = new ArrayList<>();
+        userIdList.add(taUserHk.getHkUserId());
+        //临时设备编号
+        // TODO 根据期楼栋号，来查询出门口机
+
+        // 单元门口机
+        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(tpEquipmentTree.getCommunityId(), userVerify.getUnitId(), 3);
+        if (CollectionUtils.isNotEmpty(visualEquipments)) {
+            List<String> visualList = visualEquipments.stream()
+                    .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                    .collect(Collectors.toList());
+//                List<String> visualList = new ArrayList<>();
+//                visualList.add("10010100000");
+            String visualIntercomJSON = HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+            JSONObject addCardsJsonObject = JSONObject.parseObject(visualIntercomJSON);
+            Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+            if (0 == addCardsResultCode.intValue()) {
+                responseBean.addSuccess("操作成功！");
+                return responseBean;
+            }
+
+        }
+
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,414 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+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.exception.WisdomException;
+import com.community.huiju.model.*;
+import com.community.huiju.service.IHKService;
+import com.community.huiju.service.ISenCartId;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.bouncycastle.cms.PasswordRecipientId;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * weiximei on 2019-06-21
+ */
+@Service
+@Slf4j
+public class SenCartIdImpl implements ISenCartId {
+
+    @Autowired
+    private IHKService ihkService;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
+
+    @Autowired
+    private TpEquipmentTreeMapper tpEquipmentTreeMapper;
+
+    private IdGen idGen = IdGen.get();
+
+    @Autowired
+    private TaUserHkMapper taUserHkMapper;
+
+    @Autowired
+    private TpEquipmentMapper tpEquipmentMapper;
+
+    @Autowired
+    private TpConfigurationMapper tpConfigurationMapper;
+
+    @Override
+    public ResponseBean addUserAndAddCartId(Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 查询审核已通过的，但是没有海康id的
+        List<TaUser> taUserList = taUserMapper.selectNotHKuserId(communityId);
+
+        for (TaUser user : taUserList) {
+
+            // 海康权限信息
+            TpUnitHkSetting unitHkSetting = getUnitHkSetting(communityId, user.getUnitId());
+
+            TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
+
+            TaUserHk taUserHk = new TaUserHk();
+            // 设置 海康id
+            taUserHk.setHkPersonNo(idGen.nextId());
+            /**
+             * 1.获取部门(比如 住户)
+             * 2.根据部门编号推送 海康
+             */
+            taUserMapper.updateByPrimaryKeySelective(user);
+            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk, unitHkSetting);
+
+
+            // 卡片操作
+
+            // 添加卡片
+            responseBean = addCards(taUserHk, tpEquipmentTree);
+
+            // 开卡
+            responseBean = openCard(taUserHk.getHkUserId(), Long.valueOf(taUserHk.getHkCardNo()), null,tpEquipmentTree);
+
+        }
+
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+
+
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
+    /**
+     * 公共方法
+     * 添加人员
+     *
+     * @param response
+     * @param user
+     */
+    private void addUserAndOpenCard(ResponseBean response, TaUser user, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TpUnitHkSetting unitHkSetting) {
+//        Map<String, Object> parDept = Maps.newHashMap();
+//        parDept.put("pageNo", 1);
+//        parDept.put("pageSize", 100);
+//        parDept.put("deptName", Constant.DEPT_RESIDENTS);
+//        parDept.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        parDept.put("appkey", tpEquipmentTree.getAppkey());
+//        parDept.put("secret", tpEquipmentTree.getSecret());
+//        parDept.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        // 部门UUID
+        //String deptUuid = getDeptUUID(parDept);
+
+        // 添加人员
+        Map<String, Object> parUser = Maps.newHashMap();
+        parUser.put("personNo", taUserHk.getHkPersonNo());
+        parUser.put("personName", user.getUserName());
+        // parUser.put("phoneNo", user.getLoginName());
+        parUser.put("remark", user.getLoginName());
+        parUser.put("deptUuid", unitHkSetting.getDepartmentId());
+        parUser.put("secret", tpEquipmentTree.getSecret());
+        parUser.put("appkey", tpEquipmentTree.getAppkey());
+        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
+        Integer errorCode = (Integer) resultMap.get("errorCode");
+        if (errorCode == 0) {
+            Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
+
+            // 海康人员ID
+            Integer personId = (Integer) resultDataMap.get("personId");
+
+            taUserHk.setHkUserId(personId);
+
+            int row = 0;
+            if (null == taUserHk.getId()) {
+                taUserHk.setTaUserId(user.getId());
+                taUserHk.setCommunityId(tpEquipmentTree.getCommunityId());
+                // 存储海康人员ID
+                row = taUserHkMapper.insertSelective(taUserHk);
+            } else {
+                row = taUserHkMapper.updateByPrimaryKeySelective(taUserHk);
+            }
+
+            if (row > 0) {
+                response.addSuccess("操作成功!");
+            } else {
+                response.addError("操作失败");
+                throw new RuntimeException("数据库添加 家属/租客 人员失败!");
+            }
+
+        } else {
+            String errorMessage = String.valueOf(resultMap.get("errorMessage"));
+            response.addError(errorMessage);
+            log.error("海康添加人员失败! {}", errorMessage);
+            throw new RuntimeException(errorMessage);
+        }
+    }
+
+    /**
+     * 添加卡片
+     * @return
+     */
+    public ResponseBean addCards(TaUserHk taUserHk, TpEquipmentTree tpEquipmentTree) {
+
+        ResponseBean response = new ResponseBean();
+
+        // 开卡 卡号
+        long cardNo = System.currentTimeMillis();
+
+        // 添加卡片
+        Map<String,Object> addCardsMap = new HashMap<>();
+        addCardsMap.put("secret", tpEquipmentTree.getSecret());
+        addCardsMap.put("appkey", tpEquipmentTree.getAppkey());
+        addCardsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        addCardsMap.put("startCardNo", cardNo);
+        addCardsMap.put("endCardNo", cardNo);
+        addCardsMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        String addCardsJSON = HKOpenApi.addCards(addCardsMap);
+        JSONObject addCardsJsonObject = JSONObject.parseObject(addCardsJSON);
+        Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+        if (0 != addCardsResultCode) {
+            response.addError("操作失败");
+            throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
+        }
+
+        // 卡片入库
+        taUserHk.setHkCardNo(cardNo + "");
+        taUserHkMapper.updateByPrimaryKeySelective(taUserHk);
+        return response;
+    }
+
+    /**
+     * 卡片开卡
+     *
+     * @param personId 人员海康id
+     * @param cardNo 卡号
+     * @param expirationTime    有效期为多少? 单位为 年
+     * @return
+     */
+    private ResponseBean openCard(Integer personId, Long cardNo, Integer expirationTime, TpEquipmentTree tpEquipmentTree) {
+        ResponseBean response = new ResponseBean();
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        LocalDate today = LocalDate.now();
+        int year = today.getYear();
+        // 加上20, 表示加上20年,默认
+        if (null == expirationTime || expirationTime <= 0) {
+            year += 20;
+        } else {
+            year += expirationTime;
+        }
+        int month = today.getMonthValue();
+        int day = today.getDayOfMonth();
+
+        Long time = null;
+        try {
+            time = formatter.parse(year + "-" + month + "-" + day).getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        // 开卡
+        Map<String, Object> parOpenCard = Maps.newHashMap();
+        parOpenCard.put("personId", personId);
+        parOpenCard.put("cardNo", cardNo);
+        parOpenCard.put("startTime", System.currentTimeMillis());
+        parOpenCard.put("endTime", time);
+        parOpenCard.put("secret", tpEquipmentTree.getSecret());
+        parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
+        parOpenCard.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parOpenCard.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
+        int code = (int) openCardJSON.get("errorCode");
+        if (code == 0) {
+            response.addSuccess("操作成功!");
+        } else {
+            String errorMessage = String.valueOf(openCardJSON.get("errorMessage"));
+            response.addError(errorMessage);
+            log.error("开卡失败! {}", errorMessage);
+            throw new RuntimeException(errorMessage);
+        }
+
+        return response;
+    }
+
+    @Override
+    public ResponseBean addUserOne(Integer communityId, MultipartFile uploadFile) {
+        ResponseBean responseBean = new ResponseBean();
+
+
+        TaUser user = new TaUser();
+        user.setLoginName("15677789713");
+        user.setUnitId(110);
+        user.setHkPersonNo(idGen.nextId());
+        user.setUserName("魏熙美测试1");
+
+        // 海康权限信息
+        TpUnitHkSetting unitHkSetting = getUnitHkSetting(communityId, user.getUnitId());
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
+
+        // =================== 添加人员 ===========================
+//        Map<String, Object> parUser = Maps.newHashMap();
+//        parUser.put("personNo", user.getHkPersonNo());
+//        parUser.put("personName", user.getUserName());
+//        // parUser.put("phoneNo", user.getLoginName());
+//        parUser.put("remark", user.getLoginName());
+//        parUser.put("deptUuid", unitHkSetting.getDepartmentId());
+//        parUser.put("secret", tpEquipmentTree.getSecret());
+//        parUser.put("appkey", tpEquipmentTree.getAppkey());
+//        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+//        Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
+//        Integer errorCode = (Integer) resultMap.get("errorCode");
+//        if (errorCode != 0) {
+//            responseBean.addError("人员添加 操作失败");
+//            throw new RuntimeException(String.valueOf(resultMap.get("errorMessage")));
+//        }
+//        Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
+//        // 海康人员ID
+//        Integer personId = (Integer) resultDataMap.get("personId");
+//        user.setHkUserId(personId);
+//
+//        // =================== 添加卡片 =====================
+//
+//        // 开卡 卡号
+//        long cardNo = System.currentTimeMillis();
+//        // 添加卡片
+//        Map<String,Object> addCardsMap = new HashMap<>();
+//        addCardsMap.put("secret", tpEquipmentTree.getSecret());
+//        addCardsMap.put("appkey", tpEquipmentTree.getAppkey());
+//        addCardsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        addCardsMap.put("startCardNo", cardNo);
+//        addCardsMap.put("endCardNo", cardNo);
+//        addCardsMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+//        String addCardsJSON = HKOpenApi.addCards(addCardsMap);
+//        JSONObject addCardsJsonObject = JSONObject.parseObject(addCardsJSON);
+//        Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+//        if (0 != addCardsResultCode) {
+//            responseBean.addError("操作失败");
+//            throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
+//        }
+//
+//        user.setHkCardNo(cardNo + "");
+//
+//        // ============== 人员绑定卡片 ======================
+//
+//        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+//        LocalDate today = LocalDate.now();
+//        int year = today.getYear();
+//        // 加上20, 表示加上20年,默认
+//        year += 20;
+//
+//        int month = today.getMonthValue();
+//        int day = today.getDayOfMonth();
+//
+//        Long time = null;
+//        try {
+//            time = formatter.parse(year + "-" + month + "-" + day).getTime();
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//        }
+//
+//        // 开卡
+//        Map<String, Object> parOpenCard = Maps.newHashMap();
+//        parOpenCard.put("personId", user.getHkUserId());
+//        parOpenCard.put("cardNo", Long.valueOf(cardNo));
+//        parOpenCard.put("startTime", System.currentTimeMillis());
+//        parOpenCard.put("endTime", time);
+//        parOpenCard.put("secret", tpEquipmentTree.getSecret());
+//        parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
+//        parOpenCard.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        parOpenCard.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+//        JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
+//        int code = (int) openCardJSON.get("errorCode");
+//        if (code != 0) {
+//            String errorMessage = String.valueOf(openCardJSON.get("errorMessage"));
+//            responseBean.addError(errorMessage);
+//            log.error("人员绑定开卡失败! {}", errorMessage);
+//            throw new RuntimeException(errorMessage);
+//        }
+
+
+
+        // ============= 修改人脸 ==================
+        String data = HKOpenApi.HKpersonGroupId(uploadFile, 1236, 1142018896048422912L, user.getUserName(), "1561113497593", tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer(), tpEquipmentTree.getOpUserUuid());
+
+
+        //=================== 下发可是对讲卡权限 =====================
+
+        //--------- 可视对讲 ----------
+
+//        Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
+//        // app用户权限勿动 unitHkSetting.getPermissionId()
+//        addOutDoorAuthMap.put("authName", "魏熙美测试1");
+//        addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
+//        addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
+//        addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+//        addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+//        addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+//
+//        // 单元门口机
+//        List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, user.getUnitId(), 3);
+//        // 可是对讲设备号
+//        List<String> visualList = visualEquipments.stream()
+//                .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+//                .collect(Collectors.toList());
+////        List<String> visualList = new ArrayList<>();
+////        visualList.add("10030100001");
+//        addOutDoorAuthMap.put("longNums", visualList); // visualList
+//        // 可视对讲下发 权限
+//         String addOutDoorAuthJSONString = HKOpenApi.addOutDoorAuth(addOutDoorAuthMap);
+//        JSONObject addOutDoorAuthJSON = JSONObject.parseObject(addOutDoorAuthJSONString);
+//        int addOutDoorAuthJSONCode = (int) addOutDoorAuthJSON.get("errorCode");
+//        if (addOutDoorAuthJSONCode != 0 ) {
+//            String errorMessage = String.valueOf(addOutDoorAuthJSON.get("errorMessage"));
+//            responseBean.addError(errorMessage);
+//            log.error("可视对讲下发 权限失败! {}", errorMessage);
+//            throw new RuntimeException(errorMessage);
+//        }
+
+//        try {
+//            Thread.sleep(1000);
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        }
+
+        // ================ 可是对讲人脸权限下发 ==============
+
+        //可视对讲时 指定人员人脸权限下载
+//        List<Integer> userIdList = new ArrayList<>();
+//        userIdList.add(user.getHkUserId());
+//
+//        HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+//
+//        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+}

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

@@ -173,6 +173,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TaUserHkMapper taUserHkMapper;
 
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean login(String loginName, String code, HttpSession session) {
@@ -195,7 +198,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseBean register(String parameter) {
+    public ResponseBean register(String parameter, boolean isIdCart) {
         ResponseBean<TaUser> response = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(parameter);
@@ -215,8 +218,11 @@ public class TaUserServiceImpl implements ITaUserService {
             iCode.checkPhoneAndCode(user.getLoginName(), code);
         }
 
-        // 校验身份证
-        this.checkIdCart(user);
+        if (isIdCart) {
+            // 校验身份证
+            this.checkIdCart(user);
+        }
+
 
         // 开始注册
         user.setCreateDate(new Date());
@@ -515,10 +521,10 @@ public class TaUserServiceImpl implements ITaUserService {
         TaUser user = jsonObject.toJavaObject(TaUser.class);
 
         // 校验身份证
-        this.checkIdCart(user);
+        // this.checkIdCart(user);
 
         // 调用注册接口
-        response = register(parameter);
+        response = register(parameter, false);
         // 返回值 code 为 1，表示已经注册
         if ("1".equals(response.getCode())) {
             // 用户数据查询出来
@@ -574,6 +580,20 @@ public class TaUserServiceImpl implements ITaUserService {
         if ("1".equals(response.getCode())) {
             throw new WisdomException("推送HK失败！");
         }
+
+//        // 海康权限信息
+//        TpUnitHkSetting unitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+//
+//        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+//
+//        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getId(), userElement.getCommunityId());
+//
+//        // 下发可是对讲卡权限
+//        response = ihkService.visualIntercomPermissions(unitHkSetting, tpEquipmentTree, taUserHk, userVerify);
+//        if ("1".equals(response.getCode())) {
+//            throw new WisdomException("可视对讲卡权限下发失败！");
+//        }
+
         // 推送消息
         String[] messageArr= new messagePush().messagePushAll( );
         for (String count : messageArr) {
@@ -599,6 +619,18 @@ public class TaUserServiceImpl implements ITaUserService {
         return response;
     }
 
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
     /**
      * 查询 楼栋信息
      *      根据小区Id, 栋,单元,楼层,房号, 手机号
@@ -1095,7 +1127,7 @@ public class TaUserServiceImpl implements ITaUserService {
         taUserVO.setVerifyStatus(userVerify.getVerifyStatus());
 
         // 设置海康数据
-        TaUserHk taUserHk = taUserHkMapper.selectByUserIdAndCommunityId(taUserVO.getId(), userVerify.getCommunityId());
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userVerify.getId(), userVerify.getCommunityId());
         if (null != taUserHk) {
             taUserVO.setHkUserId(taUserHk.getHkUserId() + "");
             taUserVO.setHkPersonNo(taUserHk.getHkPersonNo() + "");
@@ -1322,12 +1354,74 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Override
     public ResponseBean propertyHistoryDdetails(Integer id) {
-        ResponseBean responseBean= new ResponseBean();
+        ResponseBean responseBean = new ResponseBean();
 
-        TaFeedback taFeedback= taFeedbackMapper.propertyHistoryDdetails(id);
-        List<String> img= taFeedbackImgMapper.selectImg(taFeedback.getId());
+        TaFeedback taFeedback = taFeedbackMapper.propertyHistoryDdetails(id);
+        List<String> img = taFeedbackImgMapper.selectImg(taFeedback.getId());
         taFeedback.setTaFeedbackImgLsit(img);
         responseBean.addSuccess(taFeedback);
         return responseBean;
     }
+    public ResponseBean getRelationAll(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 1.查询出当前用户的，期、楼栋、单元、楼层、户号
+        // 2. 根据 期、楼栋、单元、楼层、户号、小区id，查询 审核表 得到审核记录
+
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        List<TaUser> userList = taUserMapper.selectHouseRelationUserList(userElement.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId());
+
+        userList.stream().forEach(e-> {
+            // 如果有人脸图片，则显示人脸图片信息
+            if (StringUtils.isNotBlank(e.getFaceImg())) {
+                e.setHeadPortrait(e.getFaceImg());
+            }
+        });
+
+        responseBean.addSuccess(userList);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean switchoverOwner(UserElement userElement, Integer relationUserVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUserVerify taUserVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        if (null == taUserVerify) {
+            responseBean.addError("房产审核记录不存在！");
+            return responseBean;
+        }
+        if (taUserVerify.getRoleId().intValue() != Constant.OWNER_ID.intValue()) {
+            responseBean.addError("当前用户不是户主！");
+            return responseBean;
+        }
+        if (!taUserVerify.getVerifyStatus().equals(Constant.APPROVED)) {
+            responseBean.addError("被切换的用户，必须是房产审核通过的！");
+            return responseBean;
+        }
+
+        // 查询审核id，是否在这个房产下的
+        TaUserVerify relationUserVerify = taUserVerifyMapper.selectChcekInHouseUserVerify(userElement.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId(), relationUserVerifyId);
+        if (null == relationUserVerify) {
+            responseBean.addError("该房产下面没有此房产审核记录！");
+            return responseBean;
+        }
+
+        if (relationUserVerify.getRoleId().intValue() != Constant.RELATION_ID.intValue()) {
+            responseBean.addError("被切换的用户，不是家属！");
+            return responseBean;
+        }
+
+        // 业主切换为家属
+        taUserVerify.setRoleId(Constant.RELATION_ID);
+        taUserVerifyMapper.updateByPrimaryKeySelective(taUserVerify);
+
+        // 家属切换为业主
+        relationUserVerify.setRoleId(Constant.OWNER_ID);
+        taUserVerifyMapper.updateByPrimaryKeySelective(relationUserVerify);
+
+
+        responseBean.addSuccess("操作成功");
+        return responseBean;
+    }
 }

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

@@ -7,6 +7,7 @@ import com.community.commom.session.UserElement;
 import com.community.commom.hk.HKOpenApi;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
+import com.community.huiju.service.IHKService;
 import com.community.huiju.service.TaVistorServiceI;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
@@ -50,6 +51,12 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     @Autowired
     private ToCommunitiesMapper toCommunitiesMapper;
 
+    @Autowired
+    private TaUserHkMapper taUserHkMapper;
+
+    @Autowired
+    private IHKService ihkService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -147,10 +154,11 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         // 获取设备树，里面有 opUserId
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
 
-        TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
+        TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(userElement.getUserVerifyId(), communityId);
+
         String result = HKOpenApi.temporaryRegister(visitor.getVisitorName(),visitor.getVisitorTel(),
                 Integer.valueOf(visitor.getVisitorNum()),visitor.getVisitorStartTime().getTime(),
-                visitor.getVisitorEndTime().getTime(),taUser.getHkUserId(), tpEquipmentTree.getOpUserUuid(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+                visitor.getVisitorEndTime().getTime(),taUserHk.getHkUserId(), tpEquipmentTree.getOpUserUuid(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
 
         JSONObject resultJSON = JSONObject.parseObject(result);
         int errorCode = resultJSON.getInteger("errorCode");

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

@@ -0,0 +1,428 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.beust.jcommander.internal.Lists;
+import com.beust.jcommander.internal.Maps;
+import com.community.commom.hk.HKOpenApi;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.uuid.IdGen;
+import com.community.huiju.common.messagePush;
+import com.community.huiju.dao.*;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.model.*;
+import com.community.huiju.service.IHKService;
+import com.community.huiju.service.userDataHKsiteI;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import sun.misc.BASE64Encoder;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+@Service
+@Slf4j
+@Transactional(rollbackFor = Exception.class)
+public class userDataHKsiteImpl  implements userDataHKsiteI {
+
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
+
+    @Autowired
+    private TpEquipmentTreeMapper tpEquipmentTreeMapper;
+
+    private IdGen idGen = IdGen.get();
+
+    @Autowired
+    private TaUserHkMapper taUserHkMapper;
+
+    @Autowired
+    private TpEquipmentMapper tpEquipmentMapper;
+
+
+    @Autowired
+    private TpConfigurationMapper tpConfigurationMapper;
+
+    @Autowired
+    private TaFaceMapper taFaceMapper;
+
+    @Autowired
+    private TpMessageMapper tpMessageMapper;
+
+    @Autowired
+    private IHKService ihkService;
+
+    @Override
+    public ResponseBean cleanHKdata(Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+        //根据小区id查询审核数据
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectByCommunityId(communityId);
+
+        int i = 1;
+        for (TaUserVerify taUserVerify : userVerifyList){
+            log.info("当前编号：{}, 人员审核id：{}", i, taUserVerify.getId());
+            //重新构建海康和我们的关系
+            TaUserHk taUserHk = taUserHkMapper.selectByUserVerifyIdAndCommunityId(taUserVerify.getId(), taUserVerify.getCommunityId());
+            if (null == taUserHk) {
+                buildHKData(taUserVerify);
+            }
+        }
+
+        return responseBean;
+    }
+
+    private void buildHKData(TaUserVerify taUserVerify) {
+
+        TaUserHk taUserHk = new TaUserHk();
+        taUserHk.setHkPersonNo(idGen.nextId());
+
+        //查询人脸信息
+        TaFace taFace = taFaceMapper.getByUserVerifyId(taUserVerify.getId());
+
+        TaUser taUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
+
+        // 海康权限信息
+        TpUnitHkSetting unitHkSetting = getUnitHkSetting(taUserVerify.getCommunityId(), taUserVerify.getUnitId());
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(taUserVerify.getCommunityId());
+        // 开卡 卡号
+        long cardNo = System.currentTimeMillis();
+        // 添加卡片
+        Map<String,Object> addCardsMap = new HashMap<>();
+        addCardsMap.put("secret", tpEquipmentTree.getSecret());
+        addCardsMap.put("appkey", tpEquipmentTree.getAppkey());
+        addCardsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        addCardsMap.put("startCardNo", cardNo);
+        addCardsMap.put("endCardNo", cardNo);
+        addCardsMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        String addCardsJSON = HKOpenApi.addCards(addCardsMap);
+        JSONObject addCardsJsonObject = JSONObject.parseObject(addCardsJSON);
+        Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+        if (0 != addCardsResultCode) {
+            throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
+        }
+
+
+
+        // =================== 添加人员 ===========================
+        Map<String, Object> parUser = Maps.newHashMap();
+        parUser.put("personNo", taUserHk.getHkPersonNo());
+        parUser.put("personName", taUser.getUserName());
+        // parUser.put("phoneNo", user.getLoginName());
+        parUser.put("remark", taUser.getLoginName());
+        parUser.put("deptUuid", unitHkSetting.getDepartmentId());
+        parUser.put("secret", tpEquipmentTree.getSecret());
+        parUser.put("appkey", tpEquipmentTree.getAppkey());
+        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parUser.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+        if (null != taFace){
+            try {
+                parUser.put("facePhoto", encodeImageToBase64(new URL(taFace.getFaceImg())));
+            } catch (Exception e) {
+                log.info("解析图片出错");
+                e.printStackTrace();
+            }
+            parUser.put("cardNo", cardNo + "");
+        }
+
+        Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
+
+
+        Integer errorCode = (Integer) resultMap.get("errorCode");
+        if (errorCode != 0) {
+            throw new RuntimeException(String.valueOf(resultMap.get("errorMessage")));
+        }
+        Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
+        // 海康人员ID
+        Integer personId = (Integer) resultDataMap.get("personId");
+        taUserHk.setHkUserId(personId);
+
+        // =================== 添加卡片 =====================
+
+
+
+        taUserHk.setHkCardNo(cardNo + "");
+
+        taUserHk.setCommunityId(taUserVerify.getCommunityId());
+        taUserHk.setTaUserId(taUserVerify.getId());
+        taUserHk.setCreateDate(new Date());
+        taUserHk.setCreateUser(1);
+        taUserHkMapper.insertSelective(taUserHk);
+        // ============== 人员绑定卡片 ======================
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        LocalDate today = LocalDate.now();
+        int year = today.getYear();
+        // 加上20, 表示加上20年,默认
+        year += 20;
+
+        int month = today.getMonthValue();
+        int day = today.getDayOfMonth();
+
+        Long time = null;
+        try {
+            time = formatter.parse(year + "-" + month + "-" + day).getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        if (null == taFace){
+            // 开卡
+            Map<String, Object> parOpenCard = Maps.newHashMap();
+            parOpenCard.put("personId", taUserHk.getHkUserId());
+            parOpenCard.put("cardNo", Long.valueOf(cardNo));
+            parOpenCard.put("startTime", System.currentTimeMillis());
+            parOpenCard.put("endTime", time);
+            parOpenCard.put("secret", tpEquipmentTree.getSecret());
+            parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
+            parOpenCard.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            parOpenCard.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+            JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
+            int code = (int) openCardJSON.get("errorCode");
+            if (code != 0) {
+                String errorMessage = String.valueOf(openCardJSON.get("errorMessage"));
+                log.error("人员绑定开卡失败! {}", errorMessage);
+                throw new RuntimeException(errorMessage);
+            }
+        }
+
+        // 存在人脸的时候才下发人脸 卡权限/人脸权限
+        if (null != taFace) {
+
+            //=================== 下发可是对讲卡权限 =====================
+
+            //--------- 可视对讲 ----------
+
+            Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
+            // app用户权限勿动 unitHkSetting.getPermissionId()
+            addOutDoorAuthMap.put("authName", taUser.getUserName()+taUserVerify.getId());
+            addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
+            addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
+            addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+            addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+
+            // 单元门口机
+            List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(taUserVerify.getCommunityId(), taUserVerify.getUnitId(), 3);
+            // 可是对讲设备号
+            List<String> visualList = visualEquipments.stream()
+                    .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                    .collect(Collectors.toList());
+
+            addOutDoorAuthMap.put("longNums", visualList); // visualList
+            // 可视对讲下发 权限
+            String addOutDoorAuthJSONString = HKOpenApi.addOutDoorAuth(addOutDoorAuthMap);
+            JSONObject addOutDoorAuthJSON = JSONObject.parseObject(addOutDoorAuthJSONString);
+            int addOutDoorAuthJSONCode = (int) addOutDoorAuthJSON.get("errorCode");
+            if (addOutDoorAuthJSONCode != 0 ) {
+                String errorMessage = String.valueOf(addOutDoorAuthJSON.get("errorMessage"));
+                log.error("可视对讲下发 权限失败! {}", errorMessage);
+                throw new RuntimeException(errorMessage);
+            }
+
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+
+            //================ 可是对讲人脸权限下发 ==============
+
+            // 可视对讲时 指定人员人脸权限下载
+            List<Integer> userIdList = new ArrayList<>();
+            userIdList.add(taUserHk.getHkUserId());
+
+            HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
+
+
+            // 下发门禁权限
+            ihkService.addAuthoritiesAnddownloadAuthorityByPersonIds(taUserVerify, taUserHk, tpEquipmentTree);
+
+            // 下发门禁人脸
+            ihkService.downloadFaceAndFingerInfos(tpEquipmentTree, taUserVerify, taUserHk);
+
+        }
+
+
+        TaUserVerify tempVerify = taUserVerifyMapper.selectChcekNotMessage(tpEquipmentTree.getCommunityId(), taUserVerify.getId());
+        if (null == tempVerify) {
+            // 推送默认消息
+            sendMessage(taUserVerify);
+        }
+
+
+    }
+
+    /**
+     * 海康权限组
+     * @return
+     */
+    private TpUnitHkSetting getUnitHkSetting(Integer communityId, Integer unitId) {
+        TpUnitHkSetting tpUnitHkSetting = tpUnitHkSettingMapper.selectByCommunityIdAndUnitId(communityId, unitId);
+        if (null == tpUnitHkSetting) {
+            throw new WisdomException("权限组未配置");
+        }
+        return tpUnitHkSetting;
+    }
+
+    public String encodeImageToBase64(URL url) throws Exception {
+        //将图片文件转化为字节数组字符串，并对其进行Base64编码处理
+        System.out.println("图片的路径为:" + url.toString());
+        //打开链接
+        HttpURLConnection conn = null;
+        try {
+            conn = (HttpURLConnection) url.openConnection();
+        //设置请求方式为"GET"
+            conn.setRequestMethod("GET");
+        //超时响应时间为5秒
+            conn.setConnectTimeout(5 * 1000);
+        //通过输入流获取图片数据
+            InputStream inStream = conn.getInputStream();
+        //得到图片的二进制数据，以二进制封装得到数据，具有通用性
+            ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        //创建一个Buffer字符串
+            byte[] buffer = new byte[1024];
+        //每次读取的字符串长度，如果为-1，代表全部读取完毕
+            int len = 0;
+        //使用一个输入流从buffer里把数据读取出来
+            while ((len = inStream.read(buffer)) != -1) {
+        //用输出流往buffer里写入数据，中间参数代表从哪个位置开始读，len代表读取的长度
+                outStream.write(buffer, 0, len);
+            }
+        //关闭输入流
+            inStream.close();
+            byte[] data = outStream.toByteArray();
+        //对字节数组Base64编码
+            BASE64Encoder encoder = new BASE64Encoder();
+            String base64 = encoder.encode(data);
+            System.out.println("网络文件[{}]编码成base64字符串:[{}]"+url.toString()+base64);
+            return base64;//返回Base64编码过的字节数组字符串
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new Exception("图片上传失败,请联系客服!");
+        }
+    }
+
+    @Override
+    public ResponseBean cleanMessage(Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 查询所有没有关联消息的审核数据
+
+         List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectNotMessage(communityId);
+         // TaUserVerify tempUserVerify = taUserVerifyMapper.selectByPrimaryKey(1151);
+         // List<TaUserVerify> userVerifyList = Lists.newArrayList(tempUserVerify);
+        for (TaUserVerify userVerify : userVerifyList) {
+            TaUserVerify tempVerify = taUserVerifyMapper.selectChcekNotMessage(userVerify.getCommunityId(), userVerify.getId());
+            if (null == tempVerify) {
+                // 推送默认消息
+                sendMessage(userVerify);
+            }
+        }
+
+        return responseBean;
+    }
+
+    /**
+     * 给人员推送默认消息
+     * @param userVerify
+     */
+    private void sendMessage(TaUserVerify userVerify) {
+
+        //审核通过后推送消息（临时数据）
+        String[] messageArr= new messagePush().messagePushAll();
+        Date createDate = new Date();
+        for (String count:messageArr) {
+            TpMessage message = new TpMessage();
+            message.setCommunityId(userVerify.getCommunityId());
+            message.setMessageType("9");
+            message.setAdviceType("1");
+            message.setModelType("1");
+            message.setUuid(userVerify.getId());
+            message.setUuidType("1");
+            message.setSource("1");
+            message.setMessageContent(count);
+            message.setStatus("1");
+            message.setResult("");
+            message.setMeaasgeTypeId("");
+            message.setReadStatus("0");
+            message.setCreateUser(userVerify.getUserId());
+            message.setCreateDate(createDate);
+            tpMessageMapper.insert(message);
+        }
+    }
+
+    @Override
+    public ResponseBean cleanCardPersionHk(Integer communityId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        //根据小区id查询审核数据
+        List<TaUserHk> taUserHkList = taUserHkMapper.selectByCommunityId(communityId);
+        for (TaUserHk taUserHk : taUserHkList) {
+
+            TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(taUserHk.getTaUserId());
+            if (null == userVerify){
+                continue;
+            }
+            TaUser taUser = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
+
+            // 海康权限信息
+            TpUnitHkSetting unitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+            TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
+            //--------- 可视对讲 ----------
+
+            Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
+            // app用户权限勿动 unitHkSetting.getPermissionId()
+            addOutDoorAuthMap.put("authName", taUser.getUserName()+userVerify.getId());
+            addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
+            addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
+            addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+            addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            addOutDoorAuthMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+
+            // 单元门口机
+            List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+            // 可是对讲设备号
+            List<String> visualList = visualEquipments.stream()
+                    .map(e-> tpConfigurationMapper.selectByPrimaryKey(e.getUuidId()).getConfigurationValue())
+                    .collect(Collectors.toList());
+
+            addOutDoorAuthMap.put("longNums", visualList); // visualList
+            // 可视对讲下发 权限
+            String addOutDoorAuthJSONString = HKOpenApi.addOutDoorAuth(addOutDoorAuthMap);
+            JSONObject addOutDoorAuthJSON = JSONObject.parseObject(addOutDoorAuthJSONString);
+            int addOutDoorAuthJSONCode = (int) addOutDoorAuthJSON.get("errorCode");
+            if (addOutDoorAuthJSONCode != 0 ) {
+                String errorMessage = String.valueOf(addOutDoorAuthJSON.get("errorMessage"));
+                log.error("可视对讲下发 权限失败! {}", errorMessage);
+                throw new RuntimeException(errorMessage);
+            }
+
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+
+public interface userDataHKsiteI {
+    ResponseBean cleanHKdata(Integer communityId);
+
+    /**
+     * 消息清洗
+     * @param communityId
+     * @return
+     */
+    ResponseBean cleanMessage(Integer communityId);
+
+    /**
+     * 清洗数据，人员可是对讲卡权限下发
+     * @param communityId
+     * @return
+     */
+    ResponseBean cleanCardPersionHk(Integer communityId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/siteutil/userDataHKsite.java

@@ -0,0 +1,62 @@
+package com.community.huiju.siteutil;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.ISenCartId;
+import com.community.huiju.service.userDataHKsiteI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "现场调试工具", description = "现场调试工具")
+@Slf4j
+public class userDataHKsite {
+
+
+    @Autowired
+    private userDataHKsiteI userDataHKsite;
+
+    @ApiOperation(value = "清洗海康人员录入人脸信息", notes = "清洗海康人员录入人脸信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "communityId", value = "小区ID") })
+    @RequestMapping(value = "/site/{communityId}",method = RequestMethod.GET)
+    public ResponseBean sitePersionData(@PathVariable("communityId") Integer communityId){
+        ResponseBean responseBean = new ResponseBean();
+        //查询出审核表中的数据并建人脸
+        responseBean = userDataHKsite.cleanHKdata(communityId);
+        responseBean.addSuccess("ok");
+        return responseBean;
+    }
+
+    @ApiOperation(value = "清洗人员默认消息", notes = "清洗人员默认消息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "communityId", value = "小区ID") })
+    @RequestMapping(value = "/site/message/{communityId}",method = RequestMethod.GET)
+    public ResponseBean sitePersionMessageData(@PathVariable("communityId") Integer communityId){
+        ResponseBean responseBean = new ResponseBean();
+        //查询出审核表中的数据并建人脸
+        responseBean = userDataHKsite.cleanMessage(communityId);
+        responseBean.addSuccess("ok");
+        return responseBean;
+    }
+
+    @ApiOperation(value = "清洗人员可是对讲卡权限", notes = "清洗人员可是对讲卡权限")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "communityId", value = "小区ID") })
+    @RequestMapping(value = "/site/permission/{communityId}",method = RequestMethod.GET)
+    public ResponseBean cleanCardPermissionHk(@PathVariable("communityId") Integer communityId){
+        ResponseBean responseBean = userDataHKsite.cleanCardPersionHk(communityId);
+        return responseBean;
+    }
+}

CODE/smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml

@@ -414,4 +414,29 @@
     where openid = #{openid,jdbcType=INTEGER}
   </select>
 
+  <select id="selectHouseRelationUserList" resultType="com.community.huiju.model.TaUser" >
+    SELECT
+    tu.id as id,
+    tu.gender as gender,
+    tu.user_name as userName,
+    tu.login_name as loginName,
+    tu.head_portrait as headPortrait,
+    tu.face_status as faceStatus,
+    tuv.verify_status as userVerifyStatus,
+    tuv.id as userVerifyId,
+    tsr.role_name as roleName,
+    tf.face_img as faceImg
+    FROM ta_user tu INNER JOIN ta_user_verify tuv ON tu.id = tuv.user_id
+    INNER JOIN ta_sys_role tsr ON tuv.role_id = tsr.id
+    LEFT JOIN ta_face tf ON tf.ta_user_verify_id = tuv.id
+    WHERE
+	tuv.community_id = #{communityId}
+	AND tuv.phase_id = #{phaseId}
+	AND tuv.building_id = #{buildingId}
+	AND tuv.unit_id = #{unitId}
+	AND tuv.`level_id` = #{levelId}
+	AND tuv.room_no_id = #{roomNoId}
+	AND tuv.role_id = 3
+  </select>
+
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TaUserVerifyMapper.xml

@@ -267,7 +267,7 @@
     from ta_user_verify tuv
     where tuv.user_id = #{userId,jdbcType=INTEGER}
   </select>
-  <select id="selectCommunityAndAddress" resultType="com.community.huiju.model.TaUserVerify">
+  <select id="selectCommunityAndAddress" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List"/>
     from ta_user_verify
@@ -282,4 +282,17 @@
       and verify_status = #{verifyStatus}
     </if>
   </select>
+
+  <select id="selectChcekInHouseUserVerify" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from ta_user_verify
+    where community_id = #{communityId,jdbcType=INTEGER}
+    and phase_id = #{phaseId,jdbcType=INTEGER}
+    and building_id = #{buildingId,jdbcType=INTEGER}
+    and unit_id = #{unitId,jdbcType=INTEGER}
+    and level_id = #{levelId,jdbcType=INTEGER}
+    and room_no_id = #{roomNoId,jdbcType=INTEGER}
+    and id = #{userVerifyId}
+  </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpUnitHkSettingMapper.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpUnitHkSettingMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpUnitHkSetting" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="unit_id" property="unitId" jdbcType="INTEGER" />
+    <result column="permission_id" property="permissionId" jdbcType="VARCHAR" />
+    <result column="department_id" property="departmentId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, unit_id, permission_id, department_id
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_unit_hk_setting
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_unit_hk_setting
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpUnitHkSetting" >
+    insert into tp_unit_hk_setting (id, community_id, unit_id, 
+      permission_id, department_id)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{unitId,jdbcType=INTEGER}, 
+      #{permissionId,jdbcType=VARCHAR}, #{departmentId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpUnitHkSetting" >
+    insert into tp_unit_hk_setting
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="unitId != null" >
+        unit_id,
+      </if>
+      <if test="permissionId != null" >
+        permission_id,
+      </if>
+      <if test="departmentId != null" >
+        department_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="unitId != null" >
+        #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="permissionId != null" >
+        #{permissionId,jdbcType=VARCHAR},
+      </if>
+      <if test="departmentId != null" >
+        #{departmentId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpUnitHkSetting" >
+    update tp_unit_hk_setting
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="unitId != null" >
+        unit_id = #{unitId,jdbcType=INTEGER},
+      </if>
+      <if test="permissionId != null" >
+        permission_id = #{permissionId,jdbcType=VARCHAR},
+      </if>
+      <if test="departmentId != null" >
+        department_id = #{departmentId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpUnitHkSetting" >
+    update tp_unit_hk_setting
+    set community_id = #{communityId,jdbcType=INTEGER},
+      unit_id = #{unitId,jdbcType=INTEGER},
+      permission_id = #{permissionId,jdbcType=VARCHAR},
+      department_id = #{departmentId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

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

@@ -103,6 +103,12 @@ public class HKOpenApi {
         // parMap.put("phoneNo",map.get("phoneNo"));
         parMap.put("remark", map.get("remark"));
         parMap.put("deptUuid",map.get("deptUuid"));
+
+        if (null != map.get("cardNo")) {
+            parMap.put("facePhoto",map.get("facePhoto"));
+            parMap.put("cardNo",map.get("cardNo"));
+        }
+
         // parMap.put("cardNo",map.get("cardNo"));
         String params =  JSON.toJSONString(parMap);
         log.info("添加人员 请求参数：{}", params);
@@ -797,7 +803,7 @@ public class HKOpenApi {
             log.error("可视对讲人脸下发错误：{}", e);
             throw new RuntimeException("下发错误!");
         }
-        return null;
+        return data;
     }
     /**
      * 可视对讲 根据人员 ID 集添加权限并下发

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java

@@ -162,4 +162,10 @@ public class TpBuildingOwnerInfo implements Serializable {
      */
     @TableField(exist = false)
     private Integer userVerifyId;
+
+    /**
+     * 记录上传文件时候，是 excel 第几行数据
+     */
+    @TableField(exist = false)
+    private Integer index;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -564,7 +564,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                     tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
                     tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId());
             if (null != hasUserVerify) {
-                throw new WisdomException("一户只能有1个户主");
+                throw new WisdomException(" Excel 第" + tpBuildingOwnerInfo.getIndex() + "行房间已存在户主，请修改为其他身份或删除原户主资料后再导入");
             }
         }
 
@@ -598,8 +598,40 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
 
         tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
+
+        // 推送消息
+        sendMessage(taUserVerify);
     }
-    
+
+    /**
+     * 给人员推送默认消息
+     * @param userVerify
+     */
+    private void sendMessage(TaUserVerify userVerify) {
+
+        //审核通过后推送消息（临时数据）
+        String[] messageArr= new messagePush().messagePushAll();
+        LocalDateTime localDateTime = LocalDateTime.now();
+        for (String count:messageArr) {
+            Message message = new Message();
+            message.setCommunityId(userVerify.getCommunityId());
+            message.setMessageType("9");
+            message.setAdviceType("1");
+            message.setModelType("1");
+            message.setUuid(userVerify.getId());
+            message.setUuidType("1");
+            message.setSource("1");
+            message.setMessageContent(count);
+            message.setStatus("1");
+            message.setResult("");
+            message.setMeaasgeTypeId("");
+            message.setReadStatus("0");
+            message.setCreateUser(userVerify.getUserId());
+            message.setCreateDate(localDateTime);
+            messageMapper.insert(message);
+        }
+    }
+
     @Override
     public ResponseBean updataApprove(String paramets) {
         ResponseBean response = new ResponseBean();
@@ -745,6 +777,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 checkOwnerInfo.setLevelName(tpRoomNo.getLevelName());
                 checkOwnerInfo.setRoomNoId(tpRoomNo.getId());
                 checkOwnerInfo.setRoomNoName(tpRoomNo.getName());
+                // 记录行数
+                checkOwnerInfo.setIndex(currentRow);
                 list.add(checkOwnerInfo);
             }
         }

VUECODE/smart-operate-manage/src/views/banner/addBanner/index.vue

@@ -25,7 +25,7 @@
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
           class="avatar-uploader"
-          action="http://106.14.20.193:8086/operate-api/uploadimage"
+          :action="uploadImgUrl"
           name="uploadFiles">
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
@@ -156,6 +156,7 @@ export default {
         bannerContent: '',
         bannerDescription: ''
       },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
       dialogStatus: '',
       downloadLoading: false,
       formLabelWidth: '120px',

VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue

@@ -25,7 +25,7 @@
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
           class="avatar-uploader"
-          action="http://106.14.20.193:8086/operate-api/uploadimage"
+          :action="uploadImgUrl"
           name="uploadFiles">
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>
@@ -153,6 +153,7 @@ export default {
         bannerContent: '',
         bannerDescription: ''
       },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
       dialogStatus: '',
       downloadLoading: false,
       formLabelWidth: '120px',

VUECODE/smart-property-manage/src/views/banner/addBanner/index.vue

@@ -22,7 +22,7 @@
       <el-form-item :label-width="formLabelWidth" label="banner图 *">
         <el-upload
           class="avatar-uploader"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          :action="uploadImgUrl"
           name="uploadFiles"
           :show-file-list="false"
           :on-success="handleAvatarSuccess">
@@ -149,6 +149,7 @@ export default {
         bannerContent: '',
         bannerDescription: ''
       },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
       dialogStatus: '',
       downloadLoading: false,
       formLabelWidth: '120px',

VUECODE/smart-property-manage/src/views/banner/ediBanner/index.vue

@@ -22,7 +22,7 @@
       <el-form-item :label-width="formLabelWidth" label="banner图">
         <el-upload
           class="avatar-uploader"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          :action= "uploadImgUrl"
           name="uploadFiles"
           :show-file-list="false"
           :on-success="handleAvatarSuccess">
@@ -152,6 +152,7 @@ export default {
         bannerContent: '',
         bannerDescription: ''
       },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
       dialogStatus: '',
       downloadLoading: false,
       formLabelWidth: '120px',

VUECODE/smart-property-manage/src/views/social/transaction/reply/transactionreply.vue

@@ -82,7 +82,7 @@
           :on-success="handleSuccessContentImg"
           :file-list="contentImgList"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          :action="uploadImgUrl"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
@@ -124,6 +124,7 @@ export default {
         contentImg: [], 
         close: false  
       },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
       contentImgList: [],
       dialogVisible: false,
       dialogImageUrl: '',

VUECODE/smart-property-manage/src/views/social/transaction/transactionDetails.vue

@@ -44,7 +44,7 @@
           :on-success="handleSuccessContentImg"
           :file-list="contentImgList"
           name="uploadFiles"
-          action="http://106.14.20.193:8086/property-api/uploadimage"
+          :action="uploadImgUrl"
           list-type="picture-card">
           <i class="el-icon-plus"/>
         </el-upload>
@@ -89,6 +89,7 @@ export default {
         replyType: 1,
         replySum: '' 
       },
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
       dialogVisible: false,
       dialogImageUrl: '',
       contentImgList: [],