修复 资料库关联未更新异常

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

@@ -3,6 +3,7 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TpBuildingOwnerInfo;
 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;
@@ -21,6 +22,7 @@ public interface TpBuildingOwnerInfoMapper {
 
     int updateByPrimaryKey(TpBuildingOwnerInfo record);
 
+    @ResultMap("BaseResultMap")
     @Select("select * from tp_building_owner_info where community_id=#{communityId} and owner_tel=#{ownerTel}")
     List<TpBuildingOwnerInfo> getByCommunityIdAndOwnerTel(@Param("communityId") Integer communityId, @Param("ownerTel") String ownerTel);
 }

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

@@ -64,6 +64,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
+    @Deprecated
     public ResponseBean login(TaUser user) {
         ResponseBean response = new ResponseBean();
         log.info("{} 手机号校验结果: {}",user.getLoginName(),AccountValidatorUtil.isPhone(user.getLoginName()));
@@ -200,20 +201,34 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setCreateUser(user.getId());
         user.setUpdateUser(user.getId());
 
+        // 这里先默认 type=4 (未认证)
+        int roleType = 4;
+
         // 查询资料库
+        // TODO 这里默认List接收, 后期会有多个小区认证,可能会返回多条
         List<TpBuildingOwnerInfo> buildingOwnerInfoList = tpBuildingOwnerInfoMapper.getByCommunityIdAndOwnerTel(user.getCommunityId(), user.getLoginName());
         if (CollectionUtils.isNotEmpty(buildingOwnerInfoList)) {
+            // TODO 目前是一个业主对应单个小区, 所以取第一个
             TpBuildingOwnerInfo buildingOwnerInfo = buildingOwnerInfoList.get(0);
             user.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
             user.setVerifyStatus("1");
+            // 标记位1, 业主身份
+            roleType = 1;
+
+            // 更新资料库的关联状态 和 认证状态
+            buildingOwnerInfo.setVerifyStatus("1");
+            buildingOwnerInfo.setPairStatus("1");
+            buildingOwnerInfo.setUpdateDate(new Date());
+            tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(buildingOwnerInfo);
+
         }
 
         // 更新
         taUserMapper.updateByPrimaryKeySelective(user);
 
-        // TODO 这里先默认 type=4 (未认证), 后期需要和 资料库对接
-        // TODO 资料库已经对接, 新注册的默认为 未认证, 后期需要改为只有匹配了资料库后才是业主
-        addOrUpdateUserRole(4,response,user,true);
+        // 这里默认 roleType=4 (未认证),  资料库认证后, 变为 1 (业主)
+        // 资料库已经对接, 新注册的默认为 未认证, 只有匹配了资料库后才是业主
+        addOrUpdateUserRole(roleType,response,user,true);
 
 
         // 推送海康

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java

@@ -74,7 +74,7 @@ public class BuildingOwnerInfoController extends BaseController {
     public ResponseBean update(@RequestBody String parameter, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.update(parameter,userElement.getId());
+        responseBean = iBuildingOwnerInfoService.update(parameter, userElement);
         return responseBean;
     }
 
@@ -90,7 +90,7 @@ public class BuildingOwnerInfoController extends BaseController {
     public ResponseBean add(@RequestBody String parameter, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfoService.add(parameter,userElement.getId());
+        responseBean = iBuildingOwnerInfoService.add(parameter, userElement);
         return responseBean;
     }
 

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

@@ -28,8 +28,9 @@ public class User implements Serializable {
     private Integer id;
 
     /**
-     * 小区id
+     * 小区id, 这字段作废不使用
      */
+    @Deprecated
     private Integer communityId;
 
     /**

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

@@ -33,18 +33,18 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
     /**
      * 修改 楼栋业主信息
      * @param parameter
-     * @param userId
+     * @param userElement
      * @return
      */
-    ResponseBean update(String parameter, Integer userId);
+    ResponseBean update(String parameter, UserElement userElement);
 
     /**
      * 添加 楼栋业主信息
      * @param parameter
-     * @param userId
+     * @param userElement
      * @return
      */
-    ResponseBean add(String parameter, Integer userId);
+    ResponseBean add(String parameter, UserElement userElement);
     
     /**
      * 根据excel获取相关信息

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

@@ -128,7 +128,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean update(String parameter, Integer userId) {
+    public ResponseBean update(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
@@ -144,7 +144,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
         // 物业端的用户,也就是正在操作的物业人员
-        User user = userMapper.selectById(userId);
+        User user = userMapper.selectById(userElement.getId());
 
         /**
          * 修改的时候, 如果提交上来的数据和要被修改的数据是一样的! 直接返回操作成功!
@@ -154,7 +154,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         boolean phoneBool = false;
 
         // 校验楼栋信息表
-        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, user.getCommunityId());
+        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, tpBuildingOwnerInfo.getCommunityId());
         // 如果数据查询到了, 并且手机号和传上来的手机号是一样的是, 代表就是原数据, 直接返回操作成功
         if (null != selectBuild && selectBuild.getOwnerTel().equals(tpBuildingOwnerInfo.getOwnerTel())) {
             tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
@@ -167,7 +167,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             // 校验楼栋信息表里面的业主手机号
             QueryWrapper<TpBuildingOwnerInfo> queryWrapperPhone = new QueryWrapper<>();
             queryWrapperPhone.eq("owner_tel", tpBuildingOwnerInfo.getOwnerTel());
-            TpBuildingOwnerInfo selectBuildPhone = getBuildingInfo(tpBuildingOwnerInfo, user.getCommunityId());
+            TpBuildingOwnerInfo selectBuildPhone = getBuildingInfo(tpBuildingOwnerInfo, tpBuildingOwnerInfo.getCommunityId());
 
             // 如果 通过手机号查询出来的楼栋信息数据的 id 和 传上来的 楼栋,单元,楼层,单元,户号 查询出来的数据的id 匹配, 那么就表示这个手机号已经绑定了其他的楼栋信息
             if (selectBuildPhone.getId().intValue() != selectBuild.getId().intValue()){
@@ -189,7 +189,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         BeanTools.copyProperties(tpBuildingOwnerInfo, oldTpBuildingOwnerInfo);
 
         oldTpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
-        oldTpBuildingOwnerInfo.setUpdateUser(userId);
+        oldTpBuildingOwnerInfo.setUpdateUser(userElement.getId());
 
         int row = tpBuildingOwnerInfoMapper.updateById(oldTpBuildingOwnerInfo);
         if (row <= 0) {
@@ -223,12 +223,12 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean add(String parameter, Integer userId) {
+    public ResponseBean add(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
         // 物业端的用户,也就是正在操作的物业人员
-        User user = userMapper.selectById(userId);
+        User user = userMapper.selectById(userElement.getId());
         if (!AccountValidatorUtil.isPhone(tpBuildingOwnerInfo.getOwnerTel())){
             responseBean.addError("请输入正取的手机号!");
             return responseBean;
@@ -244,7 +244,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
         // 校验楼栋信息表
-        selectBuild = getBuildingInfo(tpBuildingOwnerInfo, user.getCommunityId());
+        selectBuild = getBuildingInfo(tpBuildingOwnerInfo, userElement.getCommunityId());
         if (null != selectBuild) {
             responseBean.addError("该楼层的户号,已存在!");
             return responseBean;
@@ -252,14 +252,14 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 主键是自增的, 所以设置为 null
         tpBuildingOwnerInfo.setId(null);
-        tpBuildingOwnerInfo.setUpdateUser(userId);
+        tpBuildingOwnerInfo.setUpdateUser(userElement.getId());
         tpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
         tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
-        tpBuildingOwnerInfo.setCreateUser(userId);
+        tpBuildingOwnerInfo.setCreateUser(userElement.getId());
         tpBuildingOwnerInfo.setVerifyStatus("0");
 
         // 添加的时候, 默认是当前操作的小区
-        tpBuildingOwnerInfo.setCommunityId(user.getCommunityId());
+        tpBuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
 
         int row = tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
         if (row <= 0) {