From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerBindRoomToIotAdapt.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerBindRoomToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerBindRoomToIotAdapt.java
old mode 100644
new mode 100755
index 5330490..7b076dc
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerBindRoomToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerBindRoomToIotAdapt.java
@@ -34,6 +34,7 @@
import com.java110.po.owner.OwnerRoomRelPo;
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;
@@ -150,23 +151,27 @@
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);
- 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", tOwnerDto.getCommunityId());
- postParameters.add("addAuthorizationDevSn", tmpMachineDto.getMachineCode());
- postParameters.add("uuid", tOwnerDto.getMemberId());
- postParameters.add("name", tOwnerDto.getName());
- postParameters.add("faceFileBase64Array", fileDtos.get(0).getContext());
- hcMachineAsynImpl.sendOwner(postParameters);
+ postParameters.put("userId", tOwnerDto.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", tOwnerDto.getName());
+ postParameters.put("idNumber", tOwnerDto.getIdCard());
+ postParameters.put("machineCode", tmpMachineDto.getMachineCode());
+ postParameters.put("extMachineId", tmpMachineDto.getMachineId());
+ postParameters.put("extCommunityId", tmpMachineDto.getCommunityId());
+ hcMachineAsynImpl.addOwner(postParameters);
}
}
}
--
Gitblit v1.8.0