提交

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

@@ -5,16 +5,14 @@ import com.community.commom.mode.HkResponseBean;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
 
@@ -27,7 +25,10 @@ import javax.servlet.http.HttpSession;
 @RequestMapping("/")
 @Api(value = "海康相关的API",description = "海康相关的API")
 public class HkController {
-	
+
+	@Autowired
+	private IHKService ihkService;
+
 	@ApiOperation(value = "发送访客账单", notes = "发送访客账单")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "body", name = "hkVisitorBill", dataType = "String",value = "billNum: 账单号,reservationNum:预约单号,plateNum:出场车牌号,leaveTime:出场时间,billFee:账单金额")})
 	@RequestMapping(value = "/sendVisitorBill",method = RequestMethod.POST)
@@ -41,4 +42,11 @@ public class HkController {
 		hkResponseBean.addSuccess("账单发送成功","");
 		return hkResponseBean;
 	}
+
+	@RequestMapping(value = "推送HK人员", method = RequestMethod.POST)
+	public ResponseBean pushHKPerson(@RequestParam("appUserId") String appUserId) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = ihkService.pushPerson(appUserId);
+		return responseBean;
+	}
 }

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

@@ -71,9 +71,9 @@ public class WxLoginController extends BaseController {
 			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户姓名;idCard身份证;gender性别(1：男  2：女);loginName手机号;code验证码;openid微信标识;nickname微信用户名称")
 	})
 	@RequestMapping(value = "/wx/register",method = RequestMethod.POST)
-	public ResponseBean register(@RequestBody String parameter, HttpSession session) {
+	public ResponseBean register(@RequestBody String parameter, HttpServletRequest request ,HttpSession session) {
 		ResponseBean responseBean = new ResponseBean();
-		responseBean = wxLoginService.register(parameter);
+		responseBean = wxLoginService.register(parameter, request);
 		TaUserVO userVO = (TaUserVO) responseBean.getData();
 		if (null != userVO) {
 			setUserElement(userVO, session);

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

@@ -163,4 +163,5 @@ public class TaVisitor {
     public void setCarLicense(List<String> carLicense) {
         this.carLicense = carLicense;
     }
+
 }

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

@@ -0,0 +1,18 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+
+/**
+ * 海康 业务
+ * @author weiximei
+ */
+public interface IHKService {
+
+    /**
+     * 推送海康人员
+     * @param appUserId
+     * @return
+     */
+    ResponseBean pushPerson(String appUserId);
+
+}

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

@@ -2,6 +2,8 @@ package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
 
+import javax.servlet.http.HttpServletRequest;
+
 public interface WxLoginServiceI {
 
 	/**
@@ -23,5 +25,5 @@ public interface WxLoginServiceI {
 	 * @param parameter
 	 * @return
 	 */
-	ResponseBean register(String parameter);
+	ResponseBean register(String parameter, HttpServletRequest request);
 }

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

@@ -0,0 +1,221 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.uuid.IdGen;
+import com.community.huiju.common.hk.HKOpenApi;
+import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.service.IHKService;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 海康 业务实现
+ * @author weiximei
+ */
+@Service
+@Slf4j
+public class HKServiceImpl implements IHKService {
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    private IdGen idGen = IdGen.get();
+
+    @Override
+    public ResponseBean pushPerson(String appUserId) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUser user = taUserMapper.selectByPrimaryKey(Integer.parseInt(appUserId));
+
+        // 设置 海康id
+        user.setHkPersonNo(idGen.nextId());
+
+
+        // 推送海康
+        /**
+         * 1.获取部门(比如 住户)
+         * 2.根据部门编号推送 海康
+         */
+        addUserAndOpenCard(responseBean, user);
+
+        // 给用户添加 海康门禁权限
+        HKOpenApi.addAuthoritiesByPersonIds(String.valueOf(user.getHkUserId()));
+
+        // 下发门禁权限
+        HKOpenApi.downloadAuthorityByDeviceUuids();
+
+        //--------- 可视对讲 ----------
+        visualIntercom(user);
+        if ("0".equals(responseBean.getCode())) {
+            responseBean.addSuccess("操作成功！");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
+
+    /**
+     * 公共方法
+     * 添加人员, 开卡
+     *
+     * @param response
+     * @param user
+     */
+    private void addUserAndOpenCard(ResponseBean response, TaUser user) {
+        Map<String, Object> parDept = Maps.newHashMap();
+        parDept.put("pageNo", 1);
+        parDept.put("pageSize", 100);
+        parDept.put("deptName", Constant.DEPT_RESIDENTS);
+        // 部门UUID
+        String deptUuid = getDeptUUID(parDept);
+
+        // 添加人员
+        Map<String, Object> parUser = Maps.newHashMap();
+        parUser.put("personNo", user.getHkPersonNo());
+        parUser.put("personName", user.getUserName());
+        parUser.put("phoneNo", user.getLoginName());
+        parUser.put("deptUuid", deptUuid);
+        Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
+        int errorCode = (int) resultMap.get("errorCode");
+        if (errorCode == 0) {
+            Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
+            // 开卡 卡号
+            long cardNo = System.currentTimeMillis();
+            // 海康人员ID
+            Integer personId = (Integer) resultDataMap.get("personId");
+            TaUser tempUser = taUserMapper.selectByPrimaryKey(user.getId());
+            tempUser.setHkUserId(personId);
+            tempUser.setHkCardNo(cardNo + "");
+
+            user.setHkUserId(personId);
+            // 存储海康人员ID
+            int row = taUserMapper.updateByPrimaryKeySelective(tempUser);
+            if (row > 0) {
+                response.addSuccess("操作成功!");
+            } else {
+                response.addError("操作失败");
+                throw new RuntimeException("数据库添加 家属/租客 人员失败!");
+            }
+
+            // 开卡
+            List<String> cardAndPersonList = Lists.newArrayList();
+            cardAndPersonList.add(cardNo + "," + personId);
+            response = openCard(cardAndPersonList, null);
+        } else {
+            String errorMessage = String.valueOf(resultMap.get("errorMessage"));
+            response.addError(errorMessage);
+            log.error("海康添加人员失败! {}", errorMessage);
+            throw new RuntimeException(errorMessage);
+        }
+    }
+
+    /**
+     * 批量开卡
+     *
+     * @param cardIdAndHKUserID list.add("卡号,人员ID")
+     * @param expirationTime    有效期为多少? 单位为 年
+     * @return
+     */
+    private ResponseBean openCard(List<String> cardIdAndHKUserID, Integer expirationTime) {
+        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("cardAndPerson", cardIdAndHKUserID);
+        parOpenCard.put("startTime", System.currentTimeMillis());
+        parOpenCard.put("endTime", time);
+        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;
+    }
+
+    /**
+     * 获取部门 uuid
+     * <p>
+     * 这里的部门相当于 小区
+     *
+     * @return
+     */
+    private String getDeptUUID(Map<String, Object> parDept) {
+        Map<String, Object> deptMap = JSONObject.parseObject(HKOpenApi.getDeptName(parDept), HashMap.class);
+        Map<String, Object> deptDataMap = (Map<String, Object>) deptMap.get("data");
+        JSONArray jsonArray = (JSONArray) deptDataMap.get("list");
+        Map<String, Object> deptListData = (Map<String, Object>) jsonArray.get(0);
+        // 部门UUID
+        String deptUuid = (String) deptListData.get("deptUuid");
+        return deptUuid;
+    }
+
+    /**
+     * 可视对讲下发
+     *
+     * @param user
+     */
+    private void visualIntercom(TaUser user) {
+        // TODO 目前下发的 authName权限组是我们自定义的, 后面肯定是按照小区的 期楼栋号来设置的
+        // TODO longNums设备编号, 可视对讲的机器编号, 应该根据 期楼栋号 下面的机器编号来设置的
+
+        //--------- 可视对讲 ----------
+
+        // 可视对讲 根据人员 ID 集添加权限并下发
+        Map<String, Object> addOutDoorAuthMap = new HashMap<>();
+        addOutDoorAuthMap.put("authName", "荟居");
+        addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
+        addOutDoorAuthMap.put("longNums", Arrays.asList("10010100000"));
+        // 可视对讲 根据人员 ID 集添加权限并下发
+        HKOpenApi.addOutDoorAuth(addOutDoorAuthMap);
+
+        // 可视对讲 指定人员指纹权限下载
+//        Map<String, Object> downloadFingerMap = new HashMap<>();
+//        // opType 操作类型 Integer 是 1 为下发权限；2 为删除权限
+//        downloadFingerMap.put("opType", 1);
+//        downloadFingerMap.put("personIds", Arrays.asList(user.getHkUserId()));
+//        downloadFingerMap.put("longNums", Arrays.asList("10010100000"));
+//        // 可视对讲 指定人员指纹权限下载
+//        HKOpenApi.downloadFinger(downloadFingerMap);
+
+    }
+}

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

@@ -20,6 +20,7 @@ import com.community.huiju.dao.*;
 import com.community.huiju.enums.UserVerifyEnum;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
+import com.community.huiju.service.IHKService;
 import com.community.huiju.service.ITaUserService;
 import com.community.huiju.service.ImageServiceI;
 import com.community.huiju.vo.TaUserVO;
@@ -71,9 +72,6 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TaUserMapper taUserMapper;
 
-    @Autowired
-    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
-
     @Autowired
     private TaSysRoleMapper taSysRoleMapper;
 
@@ -105,6 +103,45 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private LoginCodePerproties loginCodePerproties;
 
+    @Autowired
+    private IHKService ihkService;
+
+    /**
+     * 期
+     */
+    @Autowired
+    private TpPhaseMapper tpPhaseMapper;
+
+    /**
+     * 单元
+     */
+    @Autowired
+    private TpUnitMapper tpUnitMapper;
+
+    /**
+     * 楼层
+     */
+    @Autowired
+    private TpLevelMapper tpLevelMapper;
+
+    /**
+     * 栋
+     */
+    @Autowired
+    private TpBuildingMapper tpBuildingMapper;
+
+    /**
+     * 楼栋资料库
+     */
+    @Autowired
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
+    /**
+     * 户号
+     */
+    @Autowired
+    private TpRoomNoMapper tpRoomNoMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean login(String loginName, String code, HttpSession session) {
@@ -192,6 +229,10 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 校验房产
         List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectByUserId(currentUser.getId());
+        taUserVerifies.forEach(e->{
+            e.setVerifyUrl(loginCodePerproties.getLoginCode().get("-1") + e.getId());
+        });
+        taUserVO.setUserVerifyList(taUserVerifies);
         // 无关联房产
         if (null == taUserVerifies || taUserVerifies.size() == 0) {
             String token = null;
@@ -213,10 +254,6 @@ public class TaUserServiceImpl implements ITaUserService {
 
             return checkHouse(response, taUserVO, userVerify);
         } else if (taUserVerifies.size() >= 2) {
-            taUserVerifies.forEach(e->{
-                e.setVerifyUrl(loginCodePerproties.getLoginCode().get("-1") + e.getId());
-            });
-            taUserVO.setUserVerifyList(taUserVerifies);
             response.addSuccess(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode()));
             return response;
         }
@@ -247,35 +284,6 @@ public class TaUserServiceImpl implements ITaUserService {
         userVO.setCommunityName(toCommunities.getCommunityName());
     }
 
-    /**
-     * 可视对讲下发
-     *
-     * @param user
-     */
-    private void visualIntercom(TaUser user) {
-        // TODO 目前下发的 authName权限组是我们自定义的, 后面肯定是按照小区的 期楼栋号来设置的
-        // TODO longNums设备编号, 可视对讲的机器编号, 应该根据 期楼栋号 下面的机器编号来设置的
-
-        //--------- 可视对讲 ----------
-
-        // 可视对讲 根据人员 ID 集添加权限并下发
-        Map<String, Object> addOutDoorAuthMap = new HashMap<>();
-        addOutDoorAuthMap.put("authName", "荟居");
-        addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
-        addOutDoorAuthMap.put("longNums", Arrays.asList("10010100000"));
-        // 可视对讲 根据人员 ID 集添加权限并下发
-        HKOpenApi.addOutDoorAuth(addOutDoorAuthMap);
-
-        // 可视对讲 指定人员指纹权限下载
-//        Map<String, Object> downloadFingerMap = new HashMap<>();
-//        // opType 操作类型 Integer 是 1 为下发权限；2 为删除权限
-//        downloadFingerMap.put("opType", 1);
-//        downloadFingerMap.put("personIds", Arrays.asList(user.getHkUserId()));
-//        downloadFingerMap.put("longNums", Arrays.asList("10010100000"));
-//        // 可视对讲 指定人员指纹权限下载
-//        HKOpenApi.downloadFinger(downloadFingerMap);
-
-    }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -475,7 +483,9 @@ public class TaUserServiceImpl implements ITaUserService {
         // 返回值 code 为 1，表示已经注册
         if ("1".equals(response.getCode())) {
             // 用户数据查询出来
-            user = taUserMapper.selectByPrimaryKey(user.getId());
+            Map<String, Object> map = Maps.newHashMap();
+            map.put("loginName", user.getLoginName());
+            user = taUserMapper.selectByLoginName(map);
         } else {
             user = (TaUser) response.getData();
         }
@@ -505,31 +515,86 @@ public class TaUserServiceImpl implements ITaUserService {
 
         taUserVerifyMapper.insertSelective(userVerify);
 
-        // 设置 海康id
-        user.setHkPersonNo(idGen.nextId());
-
+        // 插入楼栋资料库
+        TpBuildingOwnerInfo buildingInfo = getBuildingInfo(userElement, user.getLoginName());
+        if (null == buildingInfo) {
+            insertTpBuildingOwnerInfo(userElement, user, null);
+        }
 
         // 推送海康
-        /**
-         * 1.获取部门(比如 住户)
-         * 2.根据部门编号推送 海康
-         */
-        addUserAndOpenCard(response, user);
+        response = ihkService.pushPerson(user.getId()+"");
+        if ("1".equals(response.getCode())) {
+            throw new WisdomException("推送HK失败！");
+        }
 
-        // 给用户添加 海康门禁权限
-        HKOpenApi.addAuthoritiesByPersonIds(String.valueOf(user.getHkUserId()));
+        response.addSuccess(user);
+        return response;
+    }
 
-        // 下发门禁权限
-        HKOpenApi.downloadAuthorityByDeviceUuids();
+    /**
+     * 查询 楼栋信息
+     *      根据小区Id, 栋,单元,楼层,房号, 手机号
+     * @param userElement
+     * @param phone
+     * @return
+     */
+    private TpBuildingOwnerInfo getBuildingInfo(UserElement userElement, String phone) {
 
-        //--------- 可视对讲 ----------
-        visualIntercom(user);
+        TpBuildingOwnerInfo selectBuild = tpBuildingOwnerInfoMapper.selectCommunityAndAddressAndPhone(userElement.getCommunityId(),
+                userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(),
+                userElement.getRoomNoId(), phone);
 
-        if ("0".equals(response.getCode())) {
-            response.addSuccess(user);
-        }
+        return selectBuild;
+    }
 
-        return response;
+    /**
+     * 插入 楼栋资料库
+     *
+     * @param userElement
+     * @param user
+     * @param userId 创建人
+     */
+    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo (UserElement userElement, TaUser user, Integer userId) {
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
+        // 查询 期/楼栋/单元/层/户号
+        TpPhase phase = tpPhaseMapper.selectByPrimaryKey(userElement.getPhaseId());
+        TpBuilding building = tpBuildingMapper.selectByPrimaryKey(userElement.getBuildingId());
+        TpUnit unit = tpUnitMapper.selectByPrimaryKey(userElement.getUnitId());
+        TpLevel level = tpLevelMapper.selectByPrimaryKey(userElement.getLevelId());
+        TpRoomNo roomNo = tpRoomNoMapper.selectByPrimaryKey(userElement.getRoomNoId());
+
+
+        // 主键是自增的, 所以设置为 null
+        tpBuildingOwnerInfo.setId(null);
+        tpBuildingOwnerInfo.setPhaseId(phase.getId());
+        tpBuildingOwnerInfo.setPhaseName(phase.getName());
+        tpBuildingOwnerInfo.setBuildingId(building.getId());
+        tpBuildingOwnerInfo.setBuildingName(building.getName());
+        tpBuildingOwnerInfo.setUnitId(unit.getId());
+        tpBuildingOwnerInfo.setUnitName(unit.getName());
+        tpBuildingOwnerInfo.setLevelId(level.getId());
+        tpBuildingOwnerInfo.setLevelName(level.getName());
+        tpBuildingOwnerInfo.setRoomNoId(roomNo.getId());
+        tpBuildingOwnerInfo.setRoomNoName(roomNo.getName());
+        tpBuildingOwnerInfo.setOwnerName(user.getUserName());
+        tpBuildingOwnerInfo.setOwnerTel(user.getLoginName());
+        tpBuildingOwnerInfo.setGender(user.getGender());
+        // tpBuildingOwnerInfo.setUpdateUser(userId);
+        tpBuildingOwnerInfo.setUpdateDate(new Date());
+        tpBuildingOwnerInfo.setCreateDate(new Date());
+        // tpBuildingOwnerInfo.setCreateUser(userId);
+        tpBuildingOwnerInfo.setVerifyStatus("1");
+        tpBuildingOwnerInfo.setPairStatus("1");
+
+        // 添加的时候, 默认是当前操作的小区
+        tpBuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
+
+        int row = tpBuildingOwnerInfoMapper.insertSelective(tpBuildingOwnerInfo);
+        if (row <= 0) {
+            log.error("添加操作! 楼栋业主信息表 失败!");
+            throw new WisdomException("操作失败!");
+        }
+        return tpBuildingOwnerInfo;
     }
 
     @Override
@@ -595,60 +660,7 @@ public class TaUserServiceImpl implements ITaUserService {
         return response;
     }
 
-    /**
-     * 公共方法
-     * 添加人员, 开卡
-     *
-     * @param response
-     * @param user
-     */
-    private void addUserAndOpenCard(ResponseBean response, TaUser user) {
-        Map<String, Object> parDept = Maps.newHashMap();
-        parDept.put("pageNo", 1);
-        parDept.put("pageSize", 100);
-        parDept.put("deptName", Constant.DEPT_RESIDENTS);
-        // 部门UUID
-        String deptUuid = getDeptUUID(parDept);
 
-        // 添加人员
-        Map<String, Object> parUser = Maps.newHashMap();
-        parUser.put("personNo", user.getHkPersonNo());
-        parUser.put("personName", user.getUserName());
-        parUser.put("phoneNo", user.getLoginName());
-        parUser.put("deptUuid", deptUuid);
-        Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
-        int errorCode = (int) resultMap.get("errorCode");
-        if (errorCode == 0) {
-            Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
-            // 开卡 卡号
-            long cardNo = System.currentTimeMillis();
-            // 海康人员ID
-            Integer personId = (Integer) resultDataMap.get("personId");
-            TaUser tempUser = taUserMapper.selectByPrimaryKey(user.getId());
-            tempUser.setHkUserId(personId);
-            tempUser.setHkCardNo(cardNo + "");
-
-            user.setHkUserId(personId);
-            // 存储海康人员ID
-            int row = taUserMapper.updateByPrimaryKeySelective(tempUser);
-            if (row > 0) {
-                response.addSuccess("操作成功!");
-            } else {
-                response.addError("操作失败");
-                throw new RuntimeException("数据库添加 家属/租客 人员失败!");
-            }
-
-            // 开卡
-            List<String> cardAndPersonList = Lists.newArrayList();
-            cardAndPersonList.add(cardNo + "," + personId);
-            response = openCard(cardAndPersonList, null);
-        } else {
-            String errorMessage = String.valueOf(resultMap.get("errorMessage"));
-            response.addError(errorMessage);
-            log.error("海康添加人员失败! {}", errorMessage);
-            throw new RuntimeException(errorMessage);
-        }
-    }
 
     /**
      * 公共方法
@@ -701,53 +713,7 @@ public class TaUserServiceImpl implements ITaUserService {
         return deptUuid;
     }
 
-    /**
-     * 批量开卡
-     *
-     * @param cardIdAndHKUserID list.add("卡号,人员ID")
-     * @param expirationTime    有效期为多少? 单位为 年
-     * @return
-     */
-    private ResponseBean openCard(List<String> cardIdAndHKUserID, Integer expirationTime) {
-        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("cardAndPerson", cardIdAndHKUserID);
-        parOpenCard.put("startTime", System.currentTimeMillis());
-        parOpenCard.put("endTime", time);
-        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;
-    }
 
     /**
      * 公共方法,添加或者修改 角色.

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

@@ -2,11 +2,13 @@ package com.community.huiju.service.impl;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 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.TaUserVerifyServicel;
 import com.community.huiju.vo.TaUserVO;
 import lombok.extern.slf4j.Slf4j;
@@ -80,6 +82,9 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
     @Autowired
     private TpRoomNoMapper tpRoomNoMapper;
 
+    @Autowired
+    private IHKService ihkService;
+
     @Override
     public ResponseBean getToAuditNotApproved(Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
@@ -228,7 +233,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
             responseBean.addError("该审核不存在！");
             return responseBean;
         }
-        if (!"0".equals(userVerify.getVerifyStatus())) {
+        if (!Constant.TO_AUDIT.equals(userVerify.getVerifyStatus())) {
             responseBean.addError("只能审核待审状态！");
             return responseBean;
         }
@@ -238,6 +243,11 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
             userVerify.setVerifyStatus(userVerifyStatus);
             userVerify.setRemark(remark);
             taUserVerifyMapper.updateByPrimaryKeySelective(userVerify);
+            // 如果业主审核 租客/家属 不是审核通过的状态， 就不在往下执行
+            if (!Constant.APPROVED.equals(userVerifyStatus)) {
+                responseBean.addError("操作成功！");
+                return responseBean;
+            }
 
             // 获取这个被审核的用户
             TaUser user = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
@@ -283,6 +293,12 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
                 message.setCreateDate(new Date());
                 tpMessageMapper.insert(message);
             }
+            // 推送海康
+            responseBean = ihkService.pushPerson(user.getId()+"");
+            if ("1".equals(responseBean.getCode())) {
+                throw new WisdomException("推送HK失败！");
+            }
+
             responseBean.addSuccess("操作成功！");
             return responseBean;
         }

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

@@ -7,6 +7,7 @@ import com.community.huiju.common.code.ICode;
 import com.community.huiju.common.perproties.LoginCodePerproties;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.enums.UserVerifyEnum;
+import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.service.ITaUserService;
 import com.community.huiju.service.WxLoginServiceI;
@@ -26,6 +27,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.Date;
@@ -77,8 +80,8 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 			result.put("openid", openId);
 
 			JSONObject userInfoJSON = JSONObject.parseObject(userInfo);
-			String wxPar = "&openid=" + openId + "&nickname=" + userInfoJSON.getString("nickname");
-			responseBean.addError(UserVerifyEnum.NO_ACCOUNT.getMsg(), result, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_ACCOUNT.getCode()) + URLEncoder.encode(wxPar));
+			String wxPar = "&openid=" + URLEncoder.encode(openId) + "&nickname=" + URLEncoder.encode(userInfoJSON.getString("nickname"));
+			responseBean.addError(UserVerifyEnum.NO_ACCOUNT.getMsg(), result, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_ACCOUNT.getCode()) + wxPar);
 			return responseBean;
 		}
 
@@ -135,11 +138,11 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		}
 
 		JSONObject jsonObject = JSONObject.parseObject(parameter);
+		logger.info("绑定的微信数据是：{}", parameter);
 
 		String openid = jsonObject.getString("openid");
-		if (StringUtils.isNotBlank(openid)) {
-			responseBean.addError("openid 参数缺失！");
-			return responseBean;
+		if (StringUtils.isBlank(openid)) {
+			throw new WisdomException("openid 参数缺失！");
 		}
 
 		user.setOpenid(openid);
@@ -157,11 +160,13 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
-	public ResponseBean register(String parameter) {
-		ResponseBean<TaUser> response = new ResponseBean();
+	public ResponseBean register(String parameter, HttpServletRequest request) {
+		ResponseBean response = new ResponseBean();
 
 		JSONObject jsonObject = JSONObject.parseObject(parameter);
+		String userName = jsonObject.getString("userName");
 		TaUser user = jsonObject.toJavaObject(TaUser.class);
+		user.setUserName(userName);
 
 		Map<String,Object> map = Maps.newHashMap();
 		map.put("loginName",user.getLoginName());
@@ -190,11 +195,28 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		user.setCreateUser(user.getId());
 		user.setUpdateUser(user.getId());
 
+		// 这里设置为null，因为在上面的 jsonObject.toJavaObject 装换的时候，自动的吧openid设置到这个user对象了
+		// 下面的校验微信绑定时候，会把openid设置上去的
+		user.setOpenid(null);
+
 		// 更新
 		taUserMapper.updateByPrimaryKeySelective(user);
 
-		// 检验微信绑定
-		response = checkWX(response, user, parameter);
+		// 如果是 普通注册 就把用户数据返回出去
+		TaUserVO userVO = new TaUserVO();
+		BeanTools.copyProperties(user, userVO);
+		// 刚注册的用户，跳转到绑定房产页面
+		response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), userVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + request.getSession().getId());
+
+		/**
+		 * 这里是因为 手机号注册 和 社交登录的手机号注册，公用的一个接口，所以有 openid 的时候，表示是微信那边的社交登录
+		 * 否则就是普通的 手机号注册
+		 */
+		String openid = jsonObject.getString("openid");
+		if (StringUtils.isNotBlank(openid)) {
+			// 检验微信绑定
+			response = checkWX(response, user, parameter);
+		}
 
 		return response;
 	}