暂存

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

@@ -103,19 +103,7 @@ public class BuildingOwnerInfoController extends BaseController {
     public ResponseBean delete(@RequestBody List<Integer> ids, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        List<TpBuildingOwnerInfo> infoList = ids.stream().map(e->{
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-            tpBuildingOwnerInfo.setId(e);
-            tpBuildingOwnerInfo.setVerifyStatus("2");
-            tpBuildingOwnerInfo.setUpdateUser(userElement.getId());
-            return tpBuildingOwnerInfo;
-        }).collect(Collectors.toList());
-        boolean result = iBuildingOwnerInfoService.updateBatchById(infoList);
-        if (result) {
-            responseBean.addSuccess("操作成功!");
-        }else {
-            responseBean.addError("操作失败!");
-        }
+        responseBean = iBuildingOwnerInfoService.deleteIds(ids, userElement.getId());
         return responseBean;
     }
 

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

@@ -6,6 +6,8 @@ import com.community.commom.session.UserElement;
 import com.community.huiju.model.TpBuildingOwnerInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * <p>
  * 楼栋业主资料信息表 服务类
@@ -76,4 +78,12 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @return
      */
     ResponseBean updataApprove(String paramets);
+
+    /**
+     * 根据Id删除
+     * @param ids
+     * @param propertyUserId
+     * @return
+     */
+    ResponseBean deleteIds(List<Integer> ids, Integer propertyUserId);
 }

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TaUser;
+
+/**
+ * <p>
+ * 住户app端用户表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-24
+ */
+public interface ITaUserService extends IService<TaUser> {
+
+}

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

@@ -2,7 +2,10 @@ package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.constant.Constant;
@@ -23,7 +26,11 @@ import com.community.huiju.model.TpBuildingOwnerInfo;
 
 import com.community.huiju.model.User;
 import com.community.huiju.service.IBuildingOwnerInfoService;
+import com.community.huiju.service.ITaUserService;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.ibatis.binding.MapperMethod;
+import org.apache.ibatis.session.SqlSession;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -39,10 +46,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -68,6 +73,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     @Autowired
     private TaSysUserRoleMapper taSysUserRoleMapper;
+
+    @Autowired
+    private ITaUserService iTaUserService;
     
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
@@ -146,18 +154,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         boolean phoneBool = false;
 
         // 校验楼栋信息表
-        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
-        // 小区ID
-        queryWrapper.eq("community_id", user.getCommunityId());
-        // 栋
-        queryWrapper.eq("building", tpBuildingOwnerInfo.getBuilding());
-        // 单元
-        queryWrapper.eq("unit", tpBuildingOwnerInfo.getUnit());
-        // 楼层
-        queryWrapper.eq("level", tpBuildingOwnerInfo.getLevel());
-        // 房号
-        queryWrapper.eq("room_no", tpBuildingOwnerInfo.getRoomNo());
-        TpBuildingOwnerInfo selectBuild = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
+        TpBuildingOwnerInfo selectBuild = getBuildingInfo(tpBuildingOwnerInfo, user.getId());
         // 如果数据查询到了, 并且手机号和传上来的手机号是一样的是, 代表就是原数据, 直接返回操作成功
         if (null != selectBuild && selectBuild.getOwnerTel().equals(tpBuildingOwnerInfo.getOwnerTel())) {
             tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
@@ -170,7 +167,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             // 校验楼栋信息表里面的业主手机号
             QueryWrapper<TpBuildingOwnerInfo> queryWrapperPhone = new QueryWrapper<>();
             queryWrapperPhone.eq("owner_tel", tpBuildingOwnerInfo.getOwnerTel());
-            TpBuildingOwnerInfo selectBuildPhone = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
+            TpBuildingOwnerInfo selectBuildPhone = getBuildingInfo(tpBuildingOwnerInfo, user.getId());
 
             // 如果 通过手机号查询出来的楼栋信息数据的 id 和 传上来的 楼栋,单元,楼层,单元,户号 查询出来的数据的id 匹配, 那么就表示这个手机号已经绑定了其他的楼栋信息
             if (selectBuildPhone.getId().intValue() != selectBuild.getId().intValue()){
@@ -250,18 +247,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
         // 校验楼栋信息表
-        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
-        // 小区ID
-        queryWrapper.eq("community_id", user.getCommunityId());
-        // 栋
-        queryWrapper.eq("building", tpBuildingOwnerInfo.getBuilding());
-        // 单元
-        queryWrapper.eq("unit", tpBuildingOwnerInfo.getUnit());
-        // 楼层
-        queryWrapper.eq("level", tpBuildingOwnerInfo.getLevel());
-        // 房号
-        queryWrapper.eq("room_no", tpBuildingOwnerInfo.getRoomNo());
-        selectBuild = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
+        selectBuild = getBuildingInfo(tpBuildingOwnerInfo, user.getId());
         if (null != selectBuild) {
             responseBean.addError("该楼层的户号,已存在!");
             return responseBean;
@@ -285,11 +271,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
         // 开始匹配 APP 端用户表
-        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-        taUserQueryWrapper.eq("login_name", tpBuildingOwnerInfo.getOwnerTel());
-        taUserQueryWrapper.eq("community_id", tpBuildingOwnerInfo.getCommunityId());
         // 查询 APP 端业主
-        TaUser appOwnerUser = taUserMapper.selectOne(taUserQueryWrapper);
+        TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getCommunityId());
         if (null != appOwnerUser) {
             // 更新 APP 端用户认证的状态
             appOwnerUser.setBuildingOwnerInfoId(tpBuildingOwnerInfo.getId());
@@ -579,4 +562,86 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         return responseBean;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean deleteIds(List<Integer> ids, Integer propertyUserId) {
+
+        ResponseBean responseBean = new ResponseBean();
+
+        List<TpBuildingOwnerInfo> infoList = ids.stream().map(e->{
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
+            tpBuildingOwnerInfo.setId(e);
+            tpBuildingOwnerInfo.setVerifyStatus("2");
+            tpBuildingOwnerInfo.setUpdateUser(propertyUserId);
+            return tpBuildingOwnerInfo;
+        }).collect(Collectors.toList());
+        boolean result = updateBatchById(infoList);
+
+        // APP 端用户
+        List<TaUser> taUserList = Lists.newArrayList();
+
+        ids.forEach(e-> {
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
+            if (null == tpBuildingOwnerInfo) {
+                // 查询 APP 端业主
+                TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getCommunityId());
+                appOwnerUser.setVerifyStatus(2+"");
+                taUserList.add(appOwnerUser);
+            }
+        });
+
+        result = iTaUserService.updateBatchById(taUserList);
+
+        if (result) {
+            responseBean.addSuccess("操作成功!");
+        }else {
+            responseBean.addError("操作失败!");
+        }
+
+
+        return responseBean;
+    }
+
+    /**
+     * 根据 手机号 和 小区Id 查询用户
+     * @param phone
+     * @param communityId
+     * @return
+     */
+    private TaUser getByIdAndCommunityId(String phone, Integer communityId){
+        // 开始匹配 APP 端用户表
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("login_name", phone);
+        taUserQueryWrapper.eq("community_id", communityId);
+        // 查询 APP 端业主
+        TaUser appOwnerUser = taUserMapper.selectOne(taUserQueryWrapper);
+
+        return appOwnerUser;
+    }
+
+    /**
+     * 查询 楼栋信息
+     *      根据小区Id, 栋,单元,楼层,房号
+     * @param tpBuildingOwnerInfo 楼栋信息
+     * @param communityId 小区Id
+     * @return
+     */
+    private TpBuildingOwnerInfo getBuildingInfo(TpBuildingOwnerInfo tpBuildingOwnerInfo, Integer communityId) {
+        // 校验楼栋信息表
+        QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        // 小区ID
+        queryWrapper.eq("community_id", communityId);
+        // 栋
+        queryWrapper.eq("building", tpBuildingOwnerInfo.getBuilding());
+        // 单元
+        queryWrapper.eq("unit", tpBuildingOwnerInfo.getUnit());
+        // 楼层
+        queryWrapper.eq("level", tpBuildingOwnerInfo.getLevel());
+        // 房号
+        queryWrapper.eq("room_no", tpBuildingOwnerInfo.getRoomNo());
+        TpBuildingOwnerInfo selectBuild = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
+
+        return selectBuild;
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.service.ITaUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 住户app端用户表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-24
+ */
+@Service
+public class TaTaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
+
+}