From 72b30f7b2ee7fa04db2920ed037a65ec5e70be2a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 30 三月 2023 16:40:31 +0800
Subject: [PATCH] optimzie delete owner face bug
---
service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java
index d611cb2..4dbcca5 100755
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java
@@ -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("杩涘叆鍒犻櫎鍒犻櫎涓氫富鐨刣atabus 澶勭悊绫伙紝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) {
--
Gitblit v1.8.0