Lianxun_Java.git

			@@ -272,6 +272,7 @@
			OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
			ownerRoomRelDto.setOwnerId(roomDto.getOwnerId());
			ownerRoomRelDto.setOwnerNameLike(roomDto.getOwnerNameLike());
			ownerRoomRelDto.setStatusCd(roomDto.getStatusCd());
			List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
			if (ownerRoomRelDtos == null \|\| ownerRoomRelDtos.size() < 1) {
			return new ArrayList<>();

			@@ -17,10 +17,12 @@

			import com.alibaba.fastjson.JSONArray;
			import com.alibaba.fastjson.JSONObject;
			import com.java110.dto.RoomDto;
			import com.java110.dto.machine.MachineDto;
			import com.java110.dto.owner.OwnerDto;
			import com.java110.entity.order.Business;
			import com.java110.intf.common.IMachineInnerServiceSMO;
			import com.java110.intf.community.IRoomInnerServiceSMO;
			import com.java110.intf.user.IOwnerInnerServiceSMO;
			import com.java110.job.adapt.DatabusAdaptImpl;
			import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
			@@ -52,6 +54,9 @@
			@Autowired
			private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;

			@Autowired
			private IRoomInnerServiceSMO roomInnerServiceSMOImpl;


			/**
			* {
			@@ -65,6 +70,8 @@
			@Override
			public void execute(Business business, List<Business> businesses) {
			JSONObject data = business.getData();
			System.out.println("进入删除删除业主的databus 处理类，DeleteOwnerToIotAdapt,{}"+data.toJSONString());

			JSONArray businessMachines = new JSONArray();
			if (data.containsKey(OwnerPo.class.getSimpleName())) {
			Object bObj = data.get(OwnerPo.class.getSimpleName());
			@@ -97,6 +104,7 @@
			List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);

			Assert.listOnlyOne(ownerDtos, "未找到删除的业主信息");

			//拿到小区ID
			String communityId = ownerPo.getCommunityId();
			//根据小区ID查询现有设备
			@@ -105,6 +113,20 @@
			//String[] locationObjIds = new String[]{communityId};
			List<String> locationObjIds = new ArrayList<>();
			locationObjIds.add(communityId);

			RoomDto roomDto = new RoomDto();
			roomDto.setOwnerId(ownerPo.getOwnerId());
			roomDto.setStatusCd("");
			//这种情况说明业主已经删掉了需要查询状态为 1 的数据
			List<RoomDto> rooms = roomInnerServiceSMOImpl.queryRoomsByOwner(roomDto);

			if(rooms != null && rooms.size()>0) {
			for (RoomDto tRoomDto : rooms) {
			locationObjIds.add(tRoomDto.getUnitId());
			locationObjIds.add(tRoomDto.getRoomId());
			locationObjIds.add(tRoomDto.getFloorId());
			}
			}
			machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));
			List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
			for (MachineDto tmpMachineDto : machineDtos) {

			@@ -133,7 +133,7 @@
			if (flag < 1) {
			throw new CmdException("删除失败");
			}
			if (reqJson.containsKey("ownerTypeCd") && !StringUtil.isEmpty(reqJson.getString("ownerTypeCd")) && reqJson.getString("ownerTypeCd").equals("1001")) {
			if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(reqJson.getString("ownerTypeCd"))) {
			OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
			ownerAppUserDto.setMemberId(reqJson.getString("ownerId"));
			//查询app用户表

	service-community/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCmd.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史