合并

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

@@ -71,6 +71,10 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	
 	@Autowired
 	private TaUserVerifyMapper taUserVerifyMapper;
+
+	@Autowired
+	private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
+
 	
 	/**
 	 * 获取整个小区的基础数据
@@ -293,6 +297,15 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		//楼栋
 		/*查询出期*/
 		if(type.equals("phase")) {
+			//是否存在同样的名字
+			QueryWrapper<TpPhase> tpPhaseQuery = new QueryWrapper<>();
+			tpPhaseQuery.eq("community_id",communityId);
+			tpPhaseQuery.eq("NAME",nodeNumber);
+			TpPhase phase= tpPhaseMapper.selectOne(tpPhaseQuery);
+			if (null!=phase){
+				responseBean.addError("节点名称已存在");
+				return responseBean;
+			}
 			TpPhase tpPhase= new TpPhase();
 					tpPhase.setCommunityId(communityId);
 					tpPhase.setName(nodeNumber);
@@ -301,21 +314,40 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		}
 		TpPhase	tpPhase= tpPhaseMapper.selectById(id);
 		if(type.equals("building")){
+			//是否存在同样的名字
+			QueryWrapper<TpBuilding> tpBuildingQuery = new QueryWrapper<>();
+			tpBuildingQuery.eq("community_id",communityId);
+			tpBuildingQuery.eq("phase_id",tpPhase.getId());
+			tpBuildingQuery.eq("phase_name",tpPhase.getName());
+			tpBuildingQuery.eq("name",nodeNumber);
+			TpBuilding building= tpBuildingMapper.selectOne(tpBuildingQuery);
+			if (null!=building){
+				responseBean.addError("节点名称已存在");
+				return responseBean;
+			}
 		 TpBuilding tpBuilding= new TpBuilding();
 					tpBuilding.setCommunityId(tpPhase.getCommunityId())
 						 .setPhaseId(tpPhase.getId())
 						 .setPhaseName(tpPhase.getName())
 						 .setName(nodeNumber)
 						 .setCreateDate(LocalDateTime.now());
-		 //判断书否为期
-
 			tpBuildingMapper.insert(tpBuilding);
 		}
 		//单元
 		//查询栋，维护单元
-
 		 TpBuilding selectTpBuilding= tpBuildingMapper.selectById(id);
 		if (type.equals("unit")){
+			// 校验节点名称
+			QueryWrapper<TpUnit> unitQuery=new QueryWrapper<>();
+			unitQuery.eq("community_id",selectTpBuilding.getCommunityId());
+			unitQuery.eq("phase_id",selectTpBuilding.getPhaseId());
+			unitQuery.eq("building_id",selectTpBuilding.getId());
+			unitQuery.eq("name",nodeNumber);
+			TpUnit unit= tpUnitMapper.selectOne(unitQuery);
+			if (null!=unit){
+				responseBean.addError("节点名称已存在");
+				return responseBean;
+			}
 		 TpUnit tpUnit= new TpUnit();
 				tpUnit.setCommunityId(selectTpBuilding.getCommunityId())
 						.setPhaseId(selectTpBuilding.getPhaseId())
@@ -323,7 +355,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 						.setBuildingId(selectTpBuilding.getId())
 						.setName(nodeNumber)
 						.setCreateDate(LocalDateTime.now());
-		//判断是否为单
 		 	 tpUnitMapper.insert(tpUnit);
 		 }
 
@@ -331,6 +362,18 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		//查询单元，维护楼层
 		 TpUnit selectTpUnit= tpUnitMapper.selectById(id);
 		if(type.equals("level")){
+			//校验楼层名称
+			QueryWrapper<TpLevel>  levelQuery=new  QueryWrapper<>();
+			levelQuery.eq("community_id",selectTpUnit.getCommunityId());
+			levelQuery.eq("phase_id",selectTpUnit.getPhaseId());
+			levelQuery.eq("building_id",selectTpUnit.getBuildingId());
+			levelQuery.eq("unit_id",selectTpUnit.getId());
+			levelQuery.eq("name",nodeNumber);
+			TpLevel level= tpLevelMapper.selectOne(levelQuery);
+			if (null!=level){
+				responseBean.addError("节点名称已存在");
+				return responseBean;
+			}
 		 TpLevel tpLevel= new TpLevel();
 		tpLevel.setId(selectTpUnit.getId())
 				.setCommunityId(selectTpUnit.getCommunityId())
@@ -342,15 +385,23 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				.setUnitName(selectTpUnit.getName())
 				.setName(nodeNumber)
 				.setCreateDate(LocalDateTime.now());
-		//判断是否是楼层
-
 			 tpLevelMapper.insert(tpLevel);
 			}
-
 		 //房间号
 	 	TpLevel selectTpLevel= tpLevelMapper.selectById(id);
 		if(type.equals("roomNo")){
-		 TpRoomNo tpRoomNo= new TpRoomNo();
+			 QueryWrapper<TpRoomNo> tpRoomNoQuery= new QueryWrapper<>();
+			tpRoomNoQuery.eq("community_id",selectTpLevel.getCommunityId());
+			tpRoomNoQuery.eq("phase_id",selectTpLevel.getPhaseId());
+			tpRoomNoQuery.eq("building_id",selectTpLevel.getBuildingId());
+			tpRoomNoQuery.eq("unit_id",selectTpLevel.getUnitId());
+			tpRoomNoQuery.eq("name",nodeNumber);
+			TpRoomNo roomNo= tpRoomNoMapper.selectOne(tpRoomNoQuery);
+			if (null!=roomNo){
+				responseBean.addError("节点名称已存在");
+				return  responseBean;
+			}
+			TpRoomNo tpRoomNo= new TpRoomNo();
 			tpRoomNo.setCommunityId(selectTpLevel.getCommunityId())
 							.setPhaseId(selectTpLevel.getPhaseId())
 							.setPhaseName(selectTpLevel.getPhaseName())
@@ -362,8 +413,6 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 							.setLevelName(selectTpLevel.getName())
 							.setName(nodeNumber)
 							.setCreateDate(LocalDateTime.now());
-
-
 			tpRoomNoMapper.insert(tpRoomNo);
 		}
 		responseBean.addSuccess("成功");
@@ -383,7 +432,11 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		String nodeNumber= object.getString("nodeNumber");
 
 		//审核是否通过
-		InfoPass(type,id);
+		  Boolean isA= InfoPass(type,id);
+		  if (isA==false){
+		  	responseBean.addError("需要先删除相关人员");
+		  	return responseBean;
+		  }
 		if (type.equals("end")) {
 			tpRoomNoMapper.deleteById(id);
 		}
@@ -413,18 +466,19 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			//查询楼层ID
 			Integer tpLevelID=null;
 
-			TpLevel levelevel = tpLevelMapper.selectOne(tpLevel);
-			QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
-			Info.eq("community_id", tpUnit.getCommunityId());
-			Info.eq("phase_id", tpUnit.getPhaseId());
-			Info.eq("building_id",tpUnit.getBuildingId());
-			Info.eq("unit_id", tpUnit.getId());
-			if (null!=levelevel) {
-				Info.eq("level_id", levelevel.getId());
+			List<TpLevel> levelevelList = tpLevelMapper.selectList(tpLevel);
+			for (TpLevel levelevel:levelevelList) {
+				QueryWrapper<TpRoomNo> Info = new QueryWrapper<>();
+				Info.eq("community_id", tpUnit.getCommunityId());
+				Info.eq("phase_id", tpUnit.getPhaseId());
+				Info.eq("building_id", tpUnit.getBuildingId());
+				Info.eq("unit_id", tpUnit.getId());
+				if (null != levelevel) {
+					Info.eq("level_id", levelevel.getId());
+				}
+				//先删除所有房间
+				tpRoomNoMapper.delete(Info);
 			}
-
-			//先删除所有房间
-			tpRoomNoMapper.delete(Info);
 			//再删除所有楼层
 			tpLevelMapper.delete(tpLevel);
 			//删除此单元
@@ -451,34 +505,36 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			//先删除所有房间
 			tpRoomNoMapper.delete(Info);
 			//先查询楼层
-			TpUnit unit= tpUnitMapper.selectOne(tpUnit);
+			List<TpUnit> unitList= tpUnitMapper.selectList(tpUnit);
 			QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
-			if (null!=unit) {
-				tpLevel.eq("phase_id", unit.getPhaseId());
-				tpLevel.eq("community_id", unit.getCommunityId());
-				tpLevel.eq("building_id", unit.getBuildingId());
-				tpLevel.eq("unit_id", unit.getId());
-			}
-			//查询房间
-			List<TpLevel> levelList= tpLevelMapper.selectList(tpLevel);
-			QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
-			if (null!=levelList) {
-				for (TpLevel level:levelList) {
-					tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
-					tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
-					tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
-					tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
-					tpRoomNoQueryWrapper.eq("level_id", level.getId());
-					//先删除所有房间
-					tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
+			if (null!=unitList) {
+				for (TpUnit unit: unitList) {
+					tpLevel.eq("phase_id", unit.getPhaseId());
+					tpLevel.eq("community_id", unit.getCommunityId());
+					tpLevel.eq("building_id", unit.getBuildingId());
+					tpLevel.eq("unit_id", unit.getId());
+					//查询房间
+					List<TpLevel> levelList= tpLevelMapper.selectList(tpLevel);
+					QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
+					if (null!=levelList) {
+						for (TpLevel level:levelList) {
+							tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
+							tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
+							tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
+							tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
+							tpRoomNoQueryWrapper.eq("level_id", level.getId());
+							//先删除所有房间
+							tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
+						}
 				}
 			}
 
-			//再删除所有楼层
+			}
+			//删除所有楼层
 			tpLevelMapper.delete(tpLevel);
 			//删除此单元
 			tpUnitMapper.delete(tpUnit);
-			//判断是否为单
+			//删除栋
 			tpBuildingMapper.deleteById(id);
 		}
 
@@ -504,16 +560,18 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 					tpLevel.eq("unit_id", unit.getId());
 
 					//查询房间
-					TpLevel level= tpLevelMapper.selectOne(tpLevel);
-					if (null!=level) {
-						QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
-						tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
-						tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
-						tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
-						tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
-						tpRoomNoQueryWrapper.eq("level_id", level.getId());
-						//先删除所有房间
-						tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
+					List<TpLevel> levelList= tpLevelMapper.selectList(tpLevel);
+					if (null!=levelList) {
+						for (TpLevel level :levelList) {
+							QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
+							tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
+							tpRoomNoQueryWrapper.eq("community_id", level.getCommunityId());
+							tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
+							tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
+							tpRoomNoQueryWrapper.eq("level_id", level.getId());
+							//先删除所有房间
+							tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
+						}
 				}
 					//再删除所有楼层
 					tpLevelMapper.delete(tpLevel);
@@ -622,7 +680,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		}
 	}
 	//删除当前节点判断是否有审核通过的
-	private ResponseBean InfoPass(String type,Integer id ) {
+	private boolean InfoPass(String type,Integer id ) {
 		ResponseBean responseBean = new ResponseBean();
 		if (type.equals("end")) {
 			//判断书否有已审核人员
@@ -636,67 +694,60 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 					.eq("room_no_id", id)
 					.eq("verify_status", 1);
 			List<TaUserVerify> taUserVerifyList = taUserVerifyMapper.selectList(taUserVerify);
-			if (null != taUserVerifyList) {
-				responseBean.addError("不可删除审核已通过人员");
-				return responseBean;
+			if (null != taUserVerifyList && taUserVerifyList.size()>0) {
+				return false;
 			}
 		}
 		if (type.equals("roomNo")) {
 			TpLevel tpLevel = tpLevelMapper.selectById(id);
-			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
-			taUserVerify.eq("community_id", tpLevel.getCommunityId())
-					.eq("phase_id", tpLevel.getPhaseId())
-					.eq("building_id", tpLevel.getBuildingId())
-					.eq("unit_id", tpLevel.getUnitId())
-					.eq("level_id", tpLevel.getId())
-					.eq("verify_status", 1);
-			List<TaUserVerify> taUserVerifyList = taUserVerifyMapper.selectList(taUserVerify);
-			if (null != taUserVerifyList) {
-				responseBean.addError("不可删除审核已通过人员");
-				return responseBean;
+			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
+			 tpBuildingOwnerInfo.eq("community_id", tpLevel.getCommunityId())
+								.eq("phase_id", tpLevel.getPhaseId())
+								.eq("building_id", tpLevel.getBuildingId())
+								.eq("unit_id", tpLevel.getUnitId())
+								.eq("level_id", tpLevel.getId())
+								.eq("verify_status", 1);
+			List<TpBuildingOwnerInfo> ifoBuid = tpBuildingOwnerInfoMapper .selectList(tpBuildingOwnerInfo);
+			if (null != ifoBuid && ifoBuid.size()>0) {
+				return false;
 			}
 		}
 		if (type.equals("level")) {
 			TpUnit tpUnit = tpUnitMapper.selectById(id);
-			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
-			taUserVerify.eq("community_id", tpUnit.getCommunityId())
-					.eq("phase_id", tpUnit.getPhaseId())
-					.eq("building_id", tpUnit.getBuildingId())
-					.eq("verify_status", 1);
-			List<TaUserVerify> taUserVerifyList = taUserVerifyMapper.selectList(taUserVerify);
-			if (null != taUserVerifyList) {
-				responseBean.addError("不可删除审核已通过人员");
-				return responseBean;
+			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
+			 tpBuildingOwnerInfo.eq("community_id", tpUnit.getCommunityId())
+								.eq("phase_id", tpUnit.getPhaseId())
+								.eq("building_id", tpUnit.getBuildingId())
+								.eq("verify_status", 1);
+			List<TpBuildingOwnerInfo> ifoBuid = tpBuildingOwnerInfoMapper.selectList(tpBuildingOwnerInfo);
+			if (null != ifoBuid && ifoBuid.size()>0) {
+				return false;
 			}
 		}
 		if (type.equals("unit")) {
 			//判断书否有已审核人员
 			TpBuilding tpBuilding = tpBuildingMapper.selectById(id);
-			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
-			taUserVerify.eq("community_id", tpBuilding.getCommunityId())
-					.eq("phase_id", tpBuilding.getPhaseId())
-					.eq("building_id", tpBuilding.getId())
-					.eq("verify_status", 1);
-			List<TaUserVerify> taUserVerifyList = taUserVerifyMapper.selectList(taUserVerify);
-			if (null != taUserVerifyList) {
-				responseBean.addError("不可删除审核已通过人员");
-
-				return responseBean;
+			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
+			 tpBuildingOwnerInfo.eq("community_id", tpBuilding.getCommunityId())
+								.eq("phase_id", tpBuilding.getPhaseId())
+								.eq("building_id", tpBuilding.getId())
+								.eq("verify_status", 1);
+			List<TpBuildingOwnerInfo> ifoBuid = tpBuildingOwnerInfoMapper.selectList(tpBuildingOwnerInfo);
+			if (null != ifoBuid && ifoBuid.size()>0) {
+				return false;
 			}
 		}
 		if (type.equals("building")) {
 			TpPhase phase = tpPhaseMapper.selectById(id);
-			QueryWrapper<TaUserVerify> taUserVerify = new QueryWrapper<>();
-			taUserVerify.eq("community_id", phase.getCommunityId())
-					.eq("phase_id", phase.getId())
-					.eq("verify_status", 1);
-			List<TaUserVerify> taUserVerifyList = taUserVerifyMapper.selectList(taUserVerify);
-			if (null != taUserVerifyList) {
-				responseBean.addError("不可删除审核已通过人员");
-				return responseBean;
+			QueryWrapper<TpBuildingOwnerInfo> tpBuildingOwnerInfo = new QueryWrapper<>();
+			 tpBuildingOwnerInfo.eq("community_id", phase.getCommunityId())
+								.eq("phase_id", phase.getId())
+								.eq("verify_status", 1);
+			List<TpBuildingOwnerInfo> ifoBuid = tpBuildingOwnerInfoMapper.selectList(tpBuildingOwnerInfo);
+			if (null != ifoBuid && ifoBuid.size()>0) {
+				return false;
 			}
 		}
-		responseBean.addError("成功");
-		return responseBean;
+		return true;
 	}
 }

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

@@ -96,11 +96,18 @@ export default {
       aAddNode(id){
       // 添加当前节点
       this.$store.dispatch('AddNode', this.treeQuery).then((res) => {
-         
-          
+         console.log('res.code',res)
+        if(res.code=='1'){
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'warning'
+        })
+        return
+        }   
           this.$router.go(0)
            
-           this.suo()
+          //  this.suo()
 
       }).catch(() => {
         console.log('error addNode')
@@ -119,10 +126,11 @@ export default {
       console.log('当前名称',data.name)
       console.log('当前类型',data.type)
       this.$store.dispatch('DeleteNode', this.treeQuery).then((res) => {
+         location.reload()
+        // this.liste=[]    
       }).catch(() => {
         console.log('error addNode')
       })
-      location.reload()
       },
     ...mapActions('buildingTree', [
       'BuildingTreeList'