合并

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

@@ -50,6 +50,8 @@ public interface TaUserVerifyMapper {
                                            @Param("roomNoId") Integer roomNoId,
                                            @Param("verifyStatus") Integer verifyStatus);
 
+
+
     /**
      * 根据 小区id 、 期、栋、单元、楼层、户号, 角色id(业主), 审核通过(值为1) 进行条件查询
      * @param communityId

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

@@ -96,13 +96,22 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
     @Override
     public ResponseBean hasBuild(UserElement userElement, Integer communityId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
         ResponseBean responseBean = new ResponseBean();
-        // 1.检验该用户关联有没有这个 户号
-        List<TaUserVerify> taUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId, 1);
-        if (null != taUserVerify && taUserVerify.size() > 0) {
-            responseBean.addError("您已关联此房产，无法再次关联！");
+        // 1.检验该用户关联有没有这个 户号，审核通过的
+       List<TaUserVerify> taUserVerifyEqVerifyStatus1 = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId, 1);
+        // List<TaUserVerify> taUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
+        if (null != taUserVerifyEqVerifyStatus1 && taUserVerifyEqVerifyStatus1.size() > 0) {
+            responseBean.addError("你已关联此房间，无法再次关联！");
+            return  responseBean;
+        }
+
+        // 1.检验该用户关联有没有这个 户号，待审核
+        List<TaUserVerify> taUserVerifyEqVerifyStatus0 = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId, 0);
+        if (null != taUserVerifyEqVerifyStatus0 && taUserVerifyEqVerifyStatus0.size() > 0) {
+            responseBean.addError("您已提交了这个房产的审核！请等待户主或者物业审核后，再进行下一步操作！");
             return responseBean;
         }
 
+
         Map<String,Object> result = Maps.newHashMap();
 
         // 2.检验这个户号是否关联了 户主

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

@@ -138,7 +138,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
                 taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(),
                 taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
         if (null != userVerifyList && userVerifyList.size() > 0) {
-            responseBean.addError("您已提交了这个房产的审核！请等待户主或者物业审核后，在进行下一步操作！");
+            responseBean.addError("您已提交了这个房产的审核！请等待户主或者物业审核后，再进行下一步操作！");
             return responseBean;
         }
 

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

@@ -31,7 +31,7 @@ welcome:
 
 # 登陆的状态跳转url配置
 login-code-perproties:
-  phone: 15988888888
+  phone: 15675548888
   app-url: http://106.14.20.193:8011/#/
   login-code:
     1000: linkBuilding?from=index # 无关联房产

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

@@ -329,6 +329,17 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             messageMapper.insert(message);
         }
 
+        try {
+            // 推送海康
+            ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(appUser.getId(), taUserVerify.getId());
+            if (!"0".equals(pushHKPerson.getCode())) {
+                throw new WisdomException("设备推送失败！");
+            }
+        } catch (Exception e) {
+            log.info("设备推送失败！，人员id：{}", userVerify.getUserId());
+            throw new WisdomException("设备推送失败！");
+        }
+
         if (row <= 0) {
             throw new WisdomException("操作失败!");
         } else {

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

@@ -15,6 +15,7 @@ mybatis-plus:
 # 二维码生成地址
 qr-code:
   url: http://106.14.20.193:8011/#/forum/sign?id=
+#  url: http://ycapi.jcjyhn.com/#/forum/sign?id=
 
 # 富士E7+云平台
 fu-shi: