From 9cf55daaafbdf49b6e7eee8298f81a3c2e602112 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期二, 31 八月 2021 18:44:15 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java
old mode 100644
new mode 100755
index 0f7b44d..37e3a52
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java
@@ -18,7 +18,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.RoomDto;
-import com.java110.dto.communityLocation.CommunityLocationDto;
+import com.java110.dto.community.CommunityLocationDto;
import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.machine.MachineAttrDto;
@@ -151,6 +151,7 @@
postParameters.put("extCommunityId", machinePo.getCommunityId());
postParameters.put("machineIp", machinePo.getMachineIp());
postParameters.put("machineMac", machinePo.getMachineMac());
+ postParameters.put("direction", machinePo.getDirection());
postParameters.put("hmId", hmId);
hcMachineAsynImpl.addMachine(postParameters, ownerDtos);
}
@@ -206,6 +207,17 @@
} else if ("3000".equals(communityLocationDto.getLocationType())) {// 3000 鎴垮眿闂�
ownerDto.setRoomId(machinePo.getLocationObjId());
owners = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+ }else if ("6000".equals(communityLocationDto.getLocationType())) {// 3000 鎴垮眿闂�
+ //鍏堟牴鎹崟鍏冮棬ID 鏌ヨ 鎴垮眿
+ RoomDto roomDto = new RoomDto();
+ roomDto.setFloorId(machinePo.getLocationObjId());
+ roomDto.setCommunityId(machinePo.getCommunityId());
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+ if (roomDtos == null || roomDtos.size() == 0) { // 妤兼爧涓嬫病鏈夋埧灞�
+ return ownerDtos;
+ }
+ ownerDto.setRoomIds(getRoomIds(roomDtos));
+ owners = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
}
if (owners == null) {
return ownerDtos;
@@ -237,6 +249,7 @@
postParameters.put("machineCode", machinePo.getMachineCode());
postParameters.put("extMachineId", machinePo.getMachineId());
postParameters.put("extCommunityId", machinePo.getCommunityId());
+ postParameters.put("attrs",tOwnerDto.getOwnerAttrDtos());
ownerDtos.add(postParameters);
}
--
Gitblit v1.8.0