合并

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

@@ -0,0 +1,31 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 登陆的状态跳转url配置
+ * @author weiximei
+ */
+@ConfigurationProperties(prefix = "login-code-perproties")
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoginCodePerproties {
+
+    private Map<String, String> loginCode;
+
+    public Map<String, String> getLoginCode() {
+        return loginCode;
+    }
+
+    public void setLoginCode(Map<String, String> loginCode) {
+        this.loginCode = loginCode;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.perproties.LoginCodePerproties;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author weiximei
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "根据code获取url API", description = "根据code获取url API")
+public class LoginCodeController {
+
+    @Autowired
+    private LoginCodePerproties loginCodePerproties;
+
+    @RequestMapping(value = "/url", method = RequestMethod.GET)
+    public ResponseBean getUrl(@RequestParam String code) {
+        ResponseBean responseBean = new ResponseBean();
+        String url = loginCodePerproties.getLoginCode().get(code);
+        Map<String, String> map = Maps.newHashMap();
+        map.put("url", url);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+}

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

@@ -218,13 +218,14 @@ public class UserController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "userId",value = "租客或者家属的ID(可选值)"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "userVerifyId",value = "审核id，只有在 userId 参数生效才有效")
     })
     @RequestMapping(value = "/user/info",method = RequestMethod.GET)
-    public ResponseBean getUserInfo(@RequestParam(value = "userId",required = false) Integer userId,
+    public ResponseBean getUserInfo(@RequestParam(value = "userId",required = false) Integer userId, @RequestParam(value = "userVerifyId", required = false) Integer userVerifyId,
                                     HttpSession session){
         ResponseBean response = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        response = iTaUserService.getUserInfo(userElement,userId);
+        response = iTaUserService.getUserInfo(userElement,userId, userVerifyId);
         if ("1".equals(response.getCode())) {
             // 清空 session
             removeUserElement(session);

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

@@ -4,6 +4,8 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TaUserVerify;
 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;
 
@@ -29,14 +31,68 @@ public interface TaUserVerifyMapper {
     List<TaUserVerify> selectByUserId(@Param("userId") Integer userId);
 
     /**
-     * 根据 用户id、小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询
+     * 根据 用户id、小区id 、 期、栋、单元、楼层、户号、审核状态  进行条件查询
      * @param communityId
      * @param phaseId
      * @param buildingId
      * @param unitId
      * @param levelId
      * @param roomNoId
+     * @param verifyStatus
      * @return
      */
-    TaUserVerify selectCommunityAndAddress(Integer userId,Integer communityId,Integer phaseId,Integer buildingId, Integer unitId,Integer levelId,Integer roomNoId);
+    List<TaUserVerify> selectCommunityAndAddress(@Param("userId") Integer userId,
+                                           @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("verifyStatus") Integer verifyStatus);
+
+    /**
+     * 根据 小区id 、 期、栋、单元、楼层、户号, 角色id(业主), 审核通过(值为1) 进行条件查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_verify where community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId}" +
+            " and unit_id=#{unitId} and level_id=#{levelId}" +
+            " and room_no_id=#{roomNoId} and role_id=1 and verify_status=1")
+    TaUserVerify selectCommunityAndAddressAndRoleId(@Param("communityId") Integer communityId,
+                                                    @Param("phaseId") Integer phaseId,
+                                                    @Param("buildingId") Integer buildingId,
+                                                    @Param("unitId") Integer unitId,
+                                                    @Param("levelId") Integer levelId,
+                                                    @Param("roomNoId") Integer roomNoId);
+
+
+    /**
+     * 根据 用户id、小区id 、 期、栋、单元、楼层、户号、审核状态(不等于2)  进行条件查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_verify where user_id=#{userId} and community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId}" +
+            " and unit_id=#{unitId} and level_id=#{levelId}" +
+            " and room_no_id=#{roomNoId} and verify_status != 2")
+    List<TaUserVerify> selectCommunityAndAddressAndNotVerifyStatus2(@Param("userId") Integer userId,
+                                           @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/TpBuildingOwnerInfoMapper.java

@@ -44,9 +44,27 @@ public interface TpBuildingOwnerInfoMapper {
     @ResultMap("BaseResultMap")
     @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
             " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
-            " and level_id=#{levelId} and room_no_id=#{roomNoId} and verify_status=1")
+            " and level_id=#{levelId} and room_no_id=#{roomNoId}")
     TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId,
                                                     @Param("buildingId") Integer building, @Param("unitId") Integer unitId,
                                                     @Param("levelId") Integer level, @Param("roomNoId") Integer roomNoId);
 
+    /*
+     * 根据 小区，期，楼栋，单元，楼层，户号, 手机号
+     * @param communityId
+     * @param phase
+     * @param building
+     * @param unit
+     * @param level
+     * @param roomNo
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
+            " and level_id=#{levelId} and room_no_id=#{roomNoId} and owner_tel=#{phone}")
+    TpBuildingOwnerInfo selectCommunityAndAddressAndPhone(@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("phone") String phone);
 }

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

@@ -134,9 +134,10 @@ public interface ITaUserService {
      *
      * @param userElement 当前用户
      * @param userId      被查询用户, 一般是业主情况下有效, 查的是下面的家属或者租客
+     * @param userVerifyId  审核id 只有在 userId 参数存在的情况才有效
      * @return
      */
-    ResponseBean getUserInfo(UserElement userElement, Integer userId);
+    ResponseBean getUserInfo(UserElement userElement, Integer userId, Integer userVerifyId);
 
     /**
      * 游客登录

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

@@ -25,6 +25,9 @@ import java.util.Map;
 @Service
 public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     /**
      * 栋
      */
@@ -94,19 +97,19 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
     public ResponseBean hasBuild(UserElement userElement,  Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
         ResponseBean responseBean = new ResponseBean();
         // 1.检验该用户关联有没有这个 户号
-        TaUserVerify taUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
-        if (null != taUserVerify) {
+        List<TaUserVerify> taUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId, 1);
+        if (null != taUserVerify && taUserVerify.size() > 0) {
             responseBean.addError("您已关联此房产，无法再次关联！");
             return responseBean;
         }
 
         Map<String,Object> result = Maps.newHashMap();
 
-        // TODO 楼栋资料库查询有变动
         // 2.检验这个户号是否关联了 户主
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
-        if (null != tpBuildingOwnerInfo) {
-            result.put("ownerName",tpBuildingOwnerInfo.getOwnerName());
+        TaUserVerify ownerUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
+        if (null != ownerUserVerify) {
+            TaUser user = taUserMapper.selectByPrimaryKey(ownerUserVerify.getUserId());
+            result.put("ownerName",user.getUserName());
             result.put("roleName", "OWNER");
             responseBean.addSuccess(result);
             return responseBean;

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

@@ -217,16 +217,16 @@ public class FaceServicelimpl implements FaceServiceI {
      */
     public TaUserVerify getTaFaceParentId(UserElement userElement, Integer otherUserId) {
         // 根据 家属/租客 的id， 和 当前的房产信息进行查询是否有值，有值就说明是 家属/租客
-        TaUserVerify todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(otherUserId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
+        List<TaUserVerify> todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(otherUserId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId(), 1);
         // 判断 家属或者租客 属不属于这个业主的下面
-        if (null == todUserVerify) {
-            throw new WisdomException("您输入的家属或租户ID有误");
+        if (null == todUserVerify || todUserVerify.size() == 0) {
+            throw new WisdomException("您输入的家属或租户ID有误或审核未通过！");
         }
-        if (!Constant.VERIFY_STATUS.equals(todUserVerify.getVerifyStatus())) {
+        if (!Constant.VERIFY_STATUS.equals(todUserVerify.get(0).getVerifyStatus())) {
             throw new WisdomException("用户房产审核未通过！");
         }
 
-        return todUserVerify;
+        return todUserVerify.get(0);
     }
 
     /**

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

@@ -604,8 +604,10 @@ public class SocialServiceImpl implements SocialServiceI {
         ResponseBean response= new ResponseBean();
         JSONObject object= JSONObject.parseObject(paramets);
         JSONArray array= object.getJSONArray("imgArr");
-        String[]	reply= array.toArray(new String[]{});
-
+        String[] reply = null;
+        if (null!=array) {
+            reply= array.toArray(new String[]{});
+        }
         TpTransactionReply tpTransactionReply= JSONObject.parseObject(paramets,TpTransactionReply.class);
         tpTransactionReply.setCommunityId(userElement.getCommunityId());
         tpTransactionReply.setTaUserId(userElement.getId());
@@ -621,14 +623,16 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransactionReply.setCreateDate(new Date());
         tpTransactionReplyMapper.insert(tpTransactionReply);
 
-        for (String img:reply){
-            TdImages tdImages= new TdImages();
-            tdImages.setImageUrl(img);
-            tdImages.setType("reply");
-            tdImages.setUuid(tpTransactionReply.getId());
-            tdImages.setCreateTime(new Date());
-            tdImages.setCreateUser(userElement.getId());
-            tdImagesMapper.insert(tdImages);
+        if (null!=array) {
+            for (String img : reply) {
+                TdImages tdImages = new TdImages();
+                tdImages.setImageUrl(img);
+                tdImages.setType("reply");
+                tdImages.setUuid(tpTransactionReply.getId());
+                tdImages.setCreateTime(new Date());
+                tdImages.setCreateUser(userElement.getId());
+                tdImagesMapper.insert(tdImages);
+            }
         }
         response.addSuccess("成功");
         return response;

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

@@ -812,7 +812,7 @@ public class TaUserServiceImpl implements ITaUserService {
     }
 
     @Override
-    public ResponseBean getUserInfo(UserElement userElement, Integer userId) {
+    public ResponseBean getUserInfo(UserElement userElement, Integer userId, Integer userVerifyId) {
 
         ResponseBean response = new ResponseBean();
 
@@ -838,15 +838,20 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 查询 家属或者租客
         if (null != userId) {
-            TaUserVerify todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
+            List<TaUserVerify> todUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userId, userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId(), null);
             // 判断 家属或者租客 属不属于这个业主的下面
-            if (null == todUserVerify) {
+            if (null == todUserVerify || todUserVerify.size() == 0) {
+                response.addError("您的下面没有该家属或者租客!");
+                return response;
+            }
+            boolean anyMatch = todUserVerify.stream().anyMatch(e -> e.getId().intValue() == userVerifyId.intValue());
+            if (!anyMatch) {
                 response.addError("您的下面没有该家属或者租客!");
                 return response;
             }
             TaUser todUser = taUserMapper.selectByPrimaryKey(userId);
-            todUser.setUserVerifyId(todUserVerify.getId());
-            todUser.setCommunityId(todUserVerify.getCommunityId());
+            todUser.setUserVerifyId(userVerifyId);
+            todUser.setCommunityId(userElement.getCommunityId());
             user = todUser;
         }
 
@@ -1062,9 +1067,9 @@ public class TaUserServiceImpl implements ITaUserService {
 
         TaUserVO userVO = new TaUserVO();
         BeanTools.copyProperties(user, userVO);
-        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(user.getId(), userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId());
-        if (null != userVerify) {
-            TaFace face = taFaceMapper.getByUserVerifyId(userVerify.getId());
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddress(user.getId(), userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(), userElement.getRoomNoId(), 1);
+        if (null != userVerifyList && userVerifyList.size() > 0) {
+            TaFace face = taFaceMapper.getByUserVerifyId(userVerifyList.get(0).getId());
             if (null == face) {
                 userVO.setFace("register");
             } else {

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 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.TaUserVerifyServicel;
 import com.community.huiju.vo.TaUserVO;
@@ -12,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -103,6 +105,16 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         String roleName = jsonObject.getString("roleName");
         TaSysRole sysRole = taSysRoleMapper.selectByRoleName(roleName);
 
+        // 校验该用户是否已经提交了一个当前房产的审核, 包含 待审核和已审核通过
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(), userElement.getCommunityId(),
+                userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(),
+                userElement.getLevelId(), userElement.getRoomNoId());
+        if (null != userVerifyList && userVerifyList.size() > 0) {
+            responseBean.addError("您已提交了这个房产的审核！请等待业主或者物业审核后，在进行下一步操作！");
+            return responseBean;
+        }
+
+
         // 查询 期/栋/单元/楼层/户号 -> 设置 相应 id 和 name
         TpPhase phase = tpPhaseMapper.selectByPrimaryKey(taUserVerify.getPhaseId());
         TpBuilding building = tpBuildingMapper.selectByPrimaryKey(taUserVerify.getBuildingId());
@@ -223,10 +235,89 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
             userVerify.setVerifyStatus(userVerifyStatus);
             userVerify.setRemark(remark);
             taUserVerifyMapper.updateByPrimaryKeySelective(userVerify);
+
+            // 获取这个被审核的用户
+            TaUser user = taUserMapper.selectByPrimaryKey(userVerify.getUserId());
+
+            // 往楼栋资料库插入数据
+            // 校验楼栋信息表
+            TpBuildingOwnerInfo selectBuild = getBuildingInfo(userElement, user.getLoginName());
+            if (null == selectBuild) {
+                // 插入楼栋信息数据
+                insertTpBuildingOwnerInfo(userElement, user, null);
+            }
+
             responseBean.addSuccess("操作成功！");
             return responseBean;
         }
         responseBean.addError("操作失败！");
         return responseBean;
     }
+
+    /**
+     * 查询 楼栋信息
+     *      根据小区Id, 栋,单元,楼层,房号, 手机号
+     * @param userElement
+     * @param phone
+     * @return
+     */
+    private TpBuildingOwnerInfo getBuildingInfo(UserElement userElement, String phone) {
+
+        TpBuildingOwnerInfo selectBuild = tpBuildingOwnerInfoMapper.selectCommunityAndAddressAndPhone(userElement.getCommunityId(),
+                userElement.getPhaseId(), userElement.getBuildingId(), userElement.getUnitId(), userElement.getLevelId(),
+                userElement.getRoomNoId(), phone);
+
+        return selectBuild;
+    }
+
+    /**
+     * 插入 楼栋资料库
+     *
+     * @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;
+    }
+
 }

CODE/smart-community/app-api/src/main/resources/application.yml

@@ -29,3 +29,14 @@ welcome:
   communityId: 83
   url: http://127.0.0.1:8823/push/face
 
+# 登陆的状态跳转url配置
+login-code-perproties:
+  login-code:
+    1000: url # 无关联房产
+    1001: url # 关联一个审核通过的房产
+    1002: url # 关联一个待审核房产
+    1003: url # 关联一个审核未通过房产
+    1004: url  # 有多个关联房产
+    1005: url # 该房产，暂无审核通过的业主！
+    1006: url # 无关联账号!
+    1007: url # 未注册!

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

@@ -260,5 +260,9 @@
     and unit_id = #{unitId,jdbcType=INTEGER}
     and level_id = #{levelId,jdbcType=INTEGER}
     and room_no_id = #{roomNoId,jdbcType=INTEGER}
+    <if test="verifyStatus != null and verifyStatus != ''">
+      and verify_status = #{verifyStatus}
+    </if>
+
   </select>
 </mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/QRCode.java

@@ -36,9 +36,9 @@ public class QRCode {
      * @throws WriterException
      * @throws IOException
      */
-    public static InputStream encode(String tpActivityId) throws WriterException, IOException {
+    public static InputStream encode(String url, String tpActivityId) throws WriterException, IOException {
         // 内容
-        String content = "http://jhhhhh?activeId=" + tpActivityId;
+        String content = url + tpActivityId;
         // 图像宽度
         int width = 200;
         // 图像高度

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/perproties/QRCodePerproties.java

@@ -0,0 +1,26 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/4/12
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ConfigurationProperties(prefix = "qr-code")
+@Component
+public class QRCodePerproties {
+
+    private String url;
+
+}

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

@@ -734,16 +734,17 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean deleteIds(List<Integer> ids, Integer propertyUserId) {
 
+        /**
+         * 楼栋资料删除的是 审核表里面的数据
+         */
+
         ResponseBean responseBean = new ResponseBean();
         ids.stream().forEach(e->{
-            TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
-            if ("1".equals(buildingOwnerInfo.getVerifyStatus())) {
-                throw new WisdomException("不能删除已认证的楼栋资料!");
-                /**
-                 * 批量删除的时候,只要存在一个已认证的楼栋资料, 就停止删除!
-                 */
+            TaUserVerify userVerify = taUserVerifyMapper.selectById(e);
+            if ("1".equals(userVerify.getVerifyStatus())) {
+                throw new WisdomException("不能删除已审核的资料!");
             }
-            tpBuildingOwnerInfoMapper.deleteById(buildingOwnerInfo.getId());
+            taUserVerifyMapper.deleteById(e);
         });
 
         responseBean.addSuccess("操作成功!");

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

@@ -11,6 +11,7 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.commom.utils.BeanTools;
 import com.community.huiju.common.base.QRCode;
+import com.community.huiju.common.perproties.QRCodePerproties;
 import com.community.huiju.dao.MessageMapper;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.TdImagesMapper;
@@ -70,6 +71,10 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
     @Autowired
     private ImageServiceI imageServiceI;
+
+    @Autowired
+    private QRCodePerproties qrCodePerproties;
+
     @Override
     public ResponseBean listQuery(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
@@ -340,7 +345,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
 
         if (radio==1){
             try {
-                InputStream inputStream= QRCode.encode(tpActivity.getId()+"");
+                InputStream inputStream= QRCode.encode(qrCodePerproties.getUrl(), tpActivity.getId()+"");
                 String codeUrl= imageServiceI.getImageUrl(inputStream);
                 TdImages tdImages= new TdImages();
                 tdImages.setImageUrl(codeUrl);

CODE/smart-community/property-api/src/main/resources/application.yml

@@ -11,3 +11,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
   mapper-locations: classpath:mapper/*.xml
+
+# 二维码生成地址
+qr-code:
+  url: http://jhhhhh?activeId=

VUECODE/smart-property-manage/src/views/building/edi/index.vue

@@ -4,6 +4,12 @@
       <el-form-item label="手机号" prop="ownerTel" placeholder="手机号">
         <span>{{ ownerTel }}</span>
       </el-form-item>
+      <el-form-item>
+        <span style="color: #99a9bf;">
+          若想修改业主登录手机号，需要业主自己登录APP在个人中心修改。或者联系荟房网络运营人员核实后修改，因为此手机号可能在其他社区在用。
+          若想修改成员为其他成员的手机号，请删除此成员后添加新成员。
+        </span>
+      </el-form-item>
       <el-form-item label="身份" prop="roleId">
         <el-select v-model="listQuery.roleId" placeholder="身份">
           <el-option :disabled="roleDisabled" label="业主" value="1" />