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 | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 e9c6628..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;
@@ -77,6 +77,7 @@
@Autowired
private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
/**
* accessToken={access_token}
* &extCommunityUuid=01000
@@ -122,19 +123,35 @@
Assert.listOnlyOne(machineDtos, "鏈壘鍒拌澶�");
+ CommunityLocationDto communityLocationDto = new CommunityLocationDto();
+ communityLocationDto.setLocationId(machineDtos.get(0).getLocationTypeCd());
+ communityLocationDto.setCommunityId(machineDtos.get(0).getCommunityId());
+ List<CommunityLocationDto> communityLocationDtos = communityLocationInnerServiceSMOImpl.queryCommunityLocations(communityLocationDto);
+
+ Assert.listOnlyOne(communityLocationDtos, "璁惧浣嶇疆涓嶅瓨鍦�");
+
String hmId = getHmId(machineDtos.get(0));
- List<JSONObject> ownerDtos = getOwners(machinePo);
+ List<JSONObject> ownerDtos = null;
+ if (MachineDto.MACHINE_TYPE_ACCESS_CONTROL.equals(machineDtos.get(0).getMachineTypeCd())) {
+ ownerDtos = getOwners(machinePo);
+ } else {
+ ownerDtos = new ArrayList<>();
+ }
JSONObject postParameters = new JSONObject();
postParameters.put("machineCode", machinePo.getMachineCode());
postParameters.put("machineName", machinePo.getMachineName());
+ postParameters.put("machineVersion", machinePo.getMachineVersion());
postParameters.put("machineTypeCd", machinePo.getMachineTypeCd());
+ postParameters.put("locationType", communityLocationDtos.get(0).getLocationType());
+ postParameters.put("locationObjId", machineDtos.get(0).getLocationObjId());
postParameters.put("extMachineId", machineDtos.get(0).getMachineId());
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);
}
@@ -190,6 +207,20 @@
} 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;
}
for (OwnerDto tOwnerDto : owners) {
@@ -218,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