提交

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

@@ -45,15 +45,18 @@ public class UserVerifyController extends BaseController {
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "idCard", value = "身份证"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageNum", value = "第几页"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageSize", value = "一页多少行"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
     })
     public ResponseBean getAll(@RequestParam(value = "phone", required = false) String phone,
                                @RequestParam(value = "userName", required = false) String userName,
                                @RequestParam(value = "idCard", required = false) String idCard,
                                @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                               HttpSession session) {
 
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iTaUserVerifyService.selectAll(phone, userName, idCard, pageNum, pageSize);
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserVerifyService.selectAll(phone, userName, idCard, pageNum, pageSize, userElement);
         return responseBean;
     }
 

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

@@ -30,7 +30,7 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
      * @param idCard
      * @return
      */
-    IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard);
+    IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard, @Param("communityId") Integer communityId);
 
     /**
      * 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主

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

@@ -17,9 +17,10 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      * @param idCard
      * @param pageNum
      * @param pageSize
+     * @param userElement
      * @return
      */
-    ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize);
+    ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize, UserElement userElement);
 
     /**
      * 审核 用户

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

@@ -599,7 +599,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		
 		for (TpBuildingOwnerInfo tpBuildingOwnerInfo : list){
 			//插入期/区数据
-			if (!tpBuildingOwnerInfo.getPhaseName().equals(lastPhaseName)){
 				TpPhase tpPhase = new TpPhase();
 				tpPhase.setName(tpBuildingOwnerInfo.getPhaseName());
 				tpPhase.setCommunityId(communityId);
@@ -608,11 +607,11 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				QueryWrapper<TpPhase> phaseQueryWrapper = new QueryWrapper<>();
 				phaseQueryWrapper.eq("community_id", communityId);
 				phaseQueryWrapper.eq("`NAME`", tpBuildingOwnerInfo.getPhaseName());
-				TpPhase selectOne = tpPhaseMapper.selectOne(phaseQueryWrapper);
+				TpPhase selectPhase = tpPhaseMapper.selectOne(phaseQueryWrapper);
 				// 判断是否存在库里
-				if (null != selectOne) {
-					lastPhaseName = selectOne.getName();
-					lastPhaseId = selectOne.getId();
+				if (null != selectPhase) {
+					lastPhaseName = selectPhase.getName();
+					lastPhaseId = selectPhase.getId();
 				} else {
 					tpPhaseMapper.insert(tpPhase);
 					//重置Last
@@ -623,9 +622,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 					lastRoomNoName = "";
 					lastPhaseId = tpPhase.getId();
 				}
-			}
 			//插入楼栋数据
-			if (!tpBuildingOwnerInfo.getBuildingName().equals(lastBuildingName)){
 				TpBuilding tpBuilding = new TpBuilding();
 				tpBuilding.setCommunityId(communityId);
 				tpBuilding.setPhaseId(lastPhaseId);
@@ -637,18 +634,17 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				buildingQueryWrapper.eq("community_id", communityId);
 				buildingQueryWrapper.eq("phase_id", lastPhaseId);
 				buildingQueryWrapper.eq("`name`", tpBuildingOwnerInfo.getBuildingName());
-				TpBuilding selectOne = tpBuildingMapper.selectOne(buildingQueryWrapper);
-				if (null != selectOne) {
-					lastBuildingName = selectOne.getName();
-					lastBuildingId = selectOne.getId();
+				TpBuilding selectBuilding = tpBuildingMapper.selectOne(buildingQueryWrapper);
+				if (null != selectBuilding) {
+					lastBuildingName = selectBuilding.getName();
+					lastBuildingId = selectBuilding.getId();
 				} else {
 					tpBuildingMapper.insert(tpBuilding);
 					lastBuildingName = tpBuildingOwnerInfo.getBuildingName();
 					lastBuildingId = tpBuilding.getId();
 				}
-			}
+
 			//插入单元信息
-			if (!tpBuildingOwnerInfo.getUnitName().equals(lastUnitName)){
 				TpUnit tpUnit = new TpUnit();
 				tpUnit.setCommunityId(communityId);
 				tpUnit.setPhaseId(lastPhaseId);
@@ -663,19 +659,19 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				unitQueryWrapper.eq("phase_id", lastPhaseId);
 				unitQueryWrapper.eq("building_id", lastBuildingId);
 				unitQueryWrapper.eq("`name`",tpBuildingOwnerInfo.getUnitName());
-				TpUnit selectOne = tpUnitMapper.selectOne(unitQueryWrapper);
+				TpUnit selectUnit = tpUnitMapper.selectOne(unitQueryWrapper);
 				// 校验是否存在库里
-				if (null != selectOne) {
-					lastUnitName = selectOne.getName();
-					lastUnitId = selectOne.getId();
+				if (null != selectUnit) {
+					lastUnitName = selectUnit.getName();
+					lastUnitId = selectUnit.getId();
 				} else {
 					tpUnitMapper.insert(tpUnit);
 					lastUnitName = tpBuildingOwnerInfo.getUnitName();
 					lastUnitId = tpUnit.getId();
 				}
-			}
+
 			//插入楼层信息
-			if (!tpBuildingOwnerInfo.getLevelName().equals(lastLevelName)){
+
 				TpLevel tpLevel = new TpLevel();
 				tpLevel.setCommunityId(communityId);
 				tpLevel.setPhaseId(lastPhaseId);
@@ -693,19 +689,18 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				levelQueryWrapper.eq("building_id", lastBuildingId);
 				levelQueryWrapper.eq("unit_id", lastUnitId);
 				levelQueryWrapper.eq("`name`", tpBuildingOwnerInfo.getLevelName());
-				TpLevel selectOne = tpLevelMapper.selectOne(levelQueryWrapper);
+				TpLevel selectLevel = tpLevelMapper.selectOne(levelQueryWrapper);
 				// 校验是否存在库里
-				if (null != selectOne) {
-					lastLevelName = selectOne.getName();
-					lastLevelId = selectOne.getId();
+				if (null != selectLevel) {
+					lastLevelName = selectLevel.getName();
+					lastLevelId = selectLevel.getId();
 				} else {
 					tpLevelMapper.insert(tpLevel);
 					lastLevelName = tpBuildingOwnerInfo.getLevelName();
 					lastLevelId = tpLevel.getId();
 				}
-			}
+
 			//插入房间号信息
-			if (!tpBuildingOwnerInfo.getRoomNoName().equals(lastRoomNoName)){
 				TpRoomNo tpRoomNo = new TpRoomNo();
 				tpRoomNo.setCommunityId(communityId);
 				tpRoomNo.setPhaseId(lastPhaseId);
@@ -726,11 +721,11 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				roomNoQueryWrapper.eq("unit_id", lastUnitId);
 				roomNoQueryWrapper.eq("level_id", lastLevelId);
 				roomNoQueryWrapper.eq("`name`", tpBuildingOwnerInfo.getRoomNoName());
-				TpRoomNo selectOne = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
-				if (null == selectOne) {
+				TpRoomNo selectRoomNo = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
+				if (null == selectRoomNo) {
 					tpRoomNoMapper.insert(tpRoomNo);
 				}
-			}
+
 		}
 	}
 	//删除当前节点判断是否有审核通过的

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

@@ -13,6 +13,7 @@ import com.community.huiju.exception.WisdomException;
 import com.community.huiju.feign.TaUserFeignService;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITaUserVerifyService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +29,7 @@ import java.util.List;
  * @author weiximei
  */
 @Service
+@Slf4j
 public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaUserVerify> implements ITaUserVerifyService {
 
     @Autowired
@@ -62,21 +64,23 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 
     @Autowired
     private MessageMapper tpmessageMapper;
+
     @Override
-    public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize) {
+    public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         Page<TaUserVerify> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
 
-        IPage<TaUserVerify> userVerifyIPage = taUserVerifyMapper.selectAllByPhoneAndUserNameAndIdCard(page, phone, userName, idCard);
+        IPage<TaUserVerify> userVerifyIPage = taUserVerifyMapper.selectAllByPhoneAndUserNameAndIdCard(page, phone, userName, idCard, userElement.getCommunityId());
         responseBean.addSuccess(userVerifyIPage);
 
         return responseBean;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean auditUser(UserElement userElement, Integer userVerifyId, Boolean verifyStatus, String remark) {
         ResponseBean responseBean = new ResponseBean();
 
@@ -115,12 +119,18 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         userVerify.setVerifyName(user.getUserName());
         taUserVerifyMapper.updateById(userVerify);
 
-        // 推送海康
-        ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());
-        if (!"0".equals(pushHKPerson.getCode())) {
+        try {
+            // 推送海康
+            ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());
+            if (!"0".equals(pushHKPerson.getCode())) {
+                throw new WisdomException("设备推送失败！");
+            }
+        } catch (Exception e) {
+            log.info("设备推送失败！，人员id：{}", userVerify.getUserId());
             throw new WisdomException("设备推送失败！");
         }
 
+
         String[] messageArr= new messagePush().messagePushAll( );
         for (String count : messageArr) {
             Message message = new Message();

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

@@ -23,6 +23,9 @@
                 <if test="idCard != null and idCard != ''">
                     and tu.id_card like CONCAT('%',#{idCard},'%')
                 </if>
+                <if test="communityId != null and communityId != ''">
+                    and tav.community_id = #{communityId,jdbcType=INTEGER}
+                </if>
             </trim>
         </where>
     </select>

VUECODE/smart-property-manage/src/router/index.js

@@ -28,7 +28,7 @@ export const constantRouterMap = [
     redirect: '/building/index',
     name: 'building',
     alwaysShow: true,
-    meta: { title: '户主/楼栋', icon: 'zip' },
+    meta: { title: '业主/楼栋', icon: 'zip' },
     children: [
       {
         path: '/building/buildingdata/index',
@@ -47,7 +47,7 @@ export const constantRouterMap = [
         path: '/building/index',
         component: () => import('@/views/building/index'),
         name: 'building-index',
-        meta: { title: '户主资料库', icon: 'building' }
+        meta: { title: '业主资料库', icon: 'building' }
       },
       {
         path: '/building/info/index',