优化iot 业主同步代码

java110-core/src/main/java/com/java110/core/client/OssUploadTemplate.java

@@ -4,8 +4,6 @@ import com.aliyun.oss.OSSClient;
 import com.java110.utils.util.Base64Convert;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.OSSUtil;
-import org.apache.commons.net.ftp.FTP;
-import org.apache.commons.net.ftp.FTPClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -43,6 +41,7 @@ public class OssUploadTemplate {
         String fileName = "";
         OSSClient ossClient = null;
         ByteArrayInputStream is = null;
+        String urlPath = "";
         try {
             ossClient = OSSUtil.getOSSClient();
             fileName = UUID.randomUUID().toString();
@@ -61,11 +60,10 @@ public class OssUploadTemplate {
             } else {
                 fileName += ".jpg";
             }
-            ftpPath = ftpPath + IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
-
+            urlPath = IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
             byte[] context = Base64Convert.base64ToByte(imageBase64);
             is = new ByteArrayInputStream(context);
-            OSSUtil.uploadByInputStream(ossClient, is, "java110", ftpPath);
+            OSSUtil.uploadByInputStream(ossClient, is, "java110", ftpPath + urlPath);
         } catch (Exception e) {
             logger.error("上传文件失败", e);
             throw new IllegalArgumentException("上传文件失败");
@@ -78,7 +76,7 @@ public class OssUploadTemplate {
                 }
             }
         }
-        return IMAGE_DEFAULT_PATH + DateUtil.getNowII() + "/" + fileName;
+        return urlPath;
     }
 
 

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/AddOwnerToIotAdapt.java

@@ -135,7 +135,7 @@ public class AddOwnerToIotAdapt extends DatabusAdaptImpl {
 
         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;

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java

@@ -94,7 +94,6 @@ public class DeleteOwnerToIotAdapt extends DatabusAdaptImpl {
         locationObjIds.add(communityId);
         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;

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/EditOwnerToIotAdapt.java

@@ -137,7 +137,6 @@ public class EditOwnerToIotAdapt extends DatabusAdaptImpl {
 
         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;

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerBindRoomToIotAdapt.java

@@ -155,7 +155,6 @@ public class OwnerBindRoomToIotAdapt extends DatabusAdaptImpl {
 
         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;

service-job/src/main/java/com/java110/job/adapt/hcIot/owner/OwnerUnBindRoomToIotAdapt.java

@@ -134,7 +134,6 @@ public class OwnerUnBindRoomToIotAdapt extends DatabusAdaptImpl {
 
         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;