多元融合

src/main/java/com/fdkankan/fusion/mq/consumer/OsgbToB3dmConsumer.java

@@ -42,7 +42,7 @@ public class OsgbToB3dmConsumer {
     UploadToOssUtil uploadToOssUtil;
 
     //@Async
-    public void consumerQueue(Integer uploadId)  {
+    public void consumerQueue(String uploadId)  {
         String sourcePath = null;
         String localPath = null;
         try {

src/main/java/com/fdkankan/fusion/service/impl/CommonUploadServiceImpl.java

@@ -181,6 +181,9 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
             }
 
             Integer status = StringUtils.isNotBlank(url) ?1:-1;
+            if("osgb".equals(modelFileFormat)){
+                status =0;
+            }
             url = StringUtils.isNotBlank(url) ?ossUrlPrefix + url:null;
             sourcePath = StringUtils.isNotBlank(sourcePath) ?ossUrlPrefix + sourcePath:null;
             CommonUpload commonUpload = commonUploadService.add(oldName,url, String.valueOf(fileSize),