加入设备信息

java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java

@@ -16,6 +16,7 @@ import java.util.List;
 public class MachineDto extends PageDto implements Serializable {
 
     public static final String MACHINE_TYPE_CAR = "9996";
+    public static final String MACHINE_TYPE_ACCESS_CONTROL = "9999";
     public static final String MACHINE_STATE_ON = "1200";
     public static final String MACHINE_STATE_OFF = "1300";
 

service-job/src/main/java/com/java110/job/adapt/hcIot/machine/AddMachineToIotAdapt.java

@@ -132,7 +132,12 @@ public class AddMachineToIotAdapt extends DatabusAdaptImpl {
 
         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();
 
@@ -202,6 +207,9 @@ public class AddMachineToIotAdapt extends DatabusAdaptImpl {
             ownerDto.setRoomId(machinePo.getLocationObjId());
             owners = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
         }
+        if (owners == null) {
+            return ownerDtos;
+        }
 
         for (OwnerDto tOwnerDto : owners) {
             FileRelDto fileRelDto = new FileRelDto();