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 | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 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 f6c0490..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,20 +21,21 @@
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;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
import java.util.ArrayList;
import java.util.List;
@@ -58,10 +59,15 @@
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
@Autowired
+ private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
+ @Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
@Autowired
private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+
/**
* accessToken={access_token}
@@ -115,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());
@@ -136,19 +148,24 @@
machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));
List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
- Assert.listOnlyOne(machineDtos, "鏈壘鍒拌澶�");
+ //Assert.listOnlyOne(machineDtos, "鏈壘鍒拌澶�");
for (MachineDto tmpMachineDto : machineDtos) {
if (!"9999".equals(tmpMachineDto.getMachineTypeCd())) {
continue;
}
- MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
+ JSONObject postParameters = new JSONObject();
- postParameters.add("extCommunityUuid", ownerPo.getCommunityId());
- postParameters.add("addAuthorizationDevSn", tmpMachineDto.getMachineCode());
- postParameters.add("uuid", ownerPo.getMemberId());
- postParameters.add("name", ownerPo.getName());
- postParameters.add("faceFileBase64Array", fileDtos.get(0).getContext());
- hcMachineAsynImpl.sendOwner(postParameters);
+ postParameters.put("userId", ownerPo.getMemberId());
+ postParameters.put("faceBase64", fileDtos.get(0).getContext());
+ postParameters.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ postParameters.put("endTime", DateUtil.LAST_TIME);
+ postParameters.put("name", ownerPo.getName());
+ postParameters.put("idNumber", ownerPo.getIdCard());
+ 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