修改 海康权限组

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,8 @@ 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, "权限组未配置！")
     ;
 
 

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/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/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;
@@ -56,6 +57,9 @@ public class HKServiceImpl implements IHKService {
 //    @Autowired
 //    private TaRemotelyDoorMapper taRemotelyDoorMapper;
 
+    @Autowired
+    private TpUnitHkSettingMapper tpUnitHkSettingMapper;
+
     /**
      * 获取设备UUID
      * @param equipmentList
@@ -89,6 +93,9 @@ public class HKServiceImpl implements IHKService {
             taUserHk = new TaUserHk();
         }
 
+        // 海康权限信息
+        TpUnitHkSetting unitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
         // 这两个值一般都是同时存在的
         // 当这两个值不存在的时候，就添加海康人员
         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);
         }
 
         // 卡片操作
@@ -157,7 +164,8 @@ public class HKServiceImpl implements IHKService {
         //--------- 可视对讲 ----------
 
         Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
-        addOutDoorAuthMap.put("authName", "app用户权限勿动");
+        // app用户权限勿动
+        addOutDoorAuthMap.put("authName", unitHkSetting.getPermissionId());
         addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
         addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
         addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
@@ -198,15 +206,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) {
+//        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,7 +223,7 @@ 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("deptUuid", unitHkSetting.getDepartmentId());
         parUser.put("remark", user.getLoginName());
         parUser.put("secret", tpEquipmentTree.getSecret());
         parUser.put("appkey", tpEquipmentTree.getAppkey());
@@ -365,6 +373,18 @@ 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(ResponseErrorsMessages.NOT_PERMISSIONS_SET.getCode(), ResponseErrorsMessages.NOT_PERMISSIONS_SET.getMsg());
+        }
+        return tpUnitHkSetting;
+    }
+
     /**
      * 可视对讲下发 权限
      *

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;
     }
 

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/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/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);
 
     /**
      * 检验登录房产

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;
 
@@ -89,6 +92,9 @@ public class HKServiceImpl implements IHKService {
             taUserHk = new TaUserHk();
         }
 
+        // 海康权限信息
+        TpUnitHkSetting unitHkSetting = getUnitHkSetting(userVerify.getCommunityId(), userVerify.getUnitId());
+
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
 
         // 这两个值一般都是同时存在的
@@ -101,7 +107,7 @@ public class HKServiceImpl implements IHKService {
              * 2.根据部门编号推送 海康
              */
             taUserMapper.updateByPrimaryKeySelective(user);
-            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk);
+            addUserAndOpenCard(responseBean, user, tpEquipmentTree, taUserHk, unitHkSetting);
         }
 
         // 卡片操作
@@ -161,7 +167,8 @@ public class HKServiceImpl implements IHKService {
         //--------- 可视对讲 ----------
 
         Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
-        addOutDoorAuthMap.put("authName", "app用户权限勿动");
+        // app用户权限勿动
+        addOutDoorAuthMap.put("authName", unitHkSetting.getPermissionId());
         addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
         addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
         addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
@@ -202,15 +209,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) {
+//        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 +227,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());
@@ -364,6 +371,18 @@ 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;
+    }
+
     /**
      * 可视对讲下发 权限
      *

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

@@ -195,7 +195,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 +215,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 +518,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())) {
             // 用户数据查询出来

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>