From 403a6bfc457251f87da9da1bf9f67cf32c8d100b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 19 四月 2021 14:58:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-job/src/main/java/com/java110/job/adapt/hcIot/owner/AddOwnerToIotAdapt.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/AddOwnerToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/AddOwnerToIotAdapt.java
index 76cbff6..e05849e 100644
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/AddOwnerToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/AddOwnerToIotAdapt.java
@@ -21,11 +21,13 @@
 import com.java110.dto.file.FileDto;
 import com.java110.dto.file.FileRelDto;
 import com.java110.dto.machine.MachineDto;
+import com.java110.dto.owner.OwnerDto;
 import com.java110.entity.order.Business;
 import com.java110.intf.common.IFileInnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 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;
 import com.java110.po.owner.OwnerPo;
@@ -57,10 +59,15 @@
     private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
 
     @Autowired
+    private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
+    @Autowired
     private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
 
     @Autowired
     private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+
 
     /**
      * accessToken={access_token}
@@ -114,6 +121,12 @@
         if (fileDtos == null || fileDtos.size() != 1) {
             return;
         }
+        OwnerDto ownerDto = new OwnerDto();
+        ownerDto.setMemberId(ownerPo.getMemberId());
+        ownerDto.setCommunityId(ownerPo.getCommunityId());
+        List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+
+        Assert.listOnlyOne(ownerDtos,"涓氫富涓嶅瓨鍦�");
 
         RoomDto roomDto = new RoomDto();
         roomDto.setOwnerId(ownerPo.getOwnerId());
@@ -151,6 +164,7 @@
             postParameters.put("machineCode", tmpMachineDto.getMachineCode());
             postParameters.put("extMachineId", tmpMachineDto.getMachineId());
             postParameters.put("extCommunityId", tmpMachineDto.getCommunityId());
+            postParameters.put("attrs",ownerDtos.get(0).getOwnerAttrDtos());
             hcMachineAsynImpl.addOwner(postParameters);
         }
 

--
Gitblit v1.8.0