修复.JPG格式的文件解析失败的问题

fdkanfang-application/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=8084
 
-spring.profiles.active=test
+spring.profiles.active=prod
 
 # \u8BBF\u95EE\u9759\u6001\u8D44\u6E90\u8BBE\u7F6E
 spring.resources.static-locations=classpath:templates/,classpath:static/,classpath:web/

fdkanfang-common/src/main/java/com/fdkanfang/common/util/AliyunOssUtil.java

@@ -60,6 +60,7 @@ public class AliyunOssUtil {
 			File file = new File(filePath);
 			if (!file.exists()) {
 				log.error("要上传的文件不存在：" + filePath);
+				return;
 			}
 			ossClient.putObject(BUCKET_NAME, key, new File(filePath));
 
@@ -104,6 +105,7 @@ public class AliyunOssUtil {
 	}
 
 
+
 	/**
 	 * 可以删除目录
 	 * @param prefix 图片路径
@@ -123,17 +125,6 @@ public class AliyunOssUtil {
 	    return sums.size();  
 	}
 	
-	public static void main(String[] args) throws IOException {
-
-		HashMap<String, String> map = new HashMap<>();
-//		map.put("F:\\test\\aa.jpg", "kanfang/test/aa.jpg");
-		map.put("F:\\test\\oss\\floor.json", "kanfang/test/faa.json");
-		uploadMulFiles(map);
-
-//		deleteFile("kanfang/test/aa.jpg");
-
-    }
-
 
 	public static String upload5(String filePath, String key) {
 		PutObjectResult result = null;

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/HouseController.java

@@ -229,7 +229,7 @@ public class HouseController extends BaseController {
                 if (!StringUtils.isNoneEmpty(origin, newFileName)) {
                     continue;
                 }
-                checkAndChangeFileName(newFileName);
+                newFileName =  checkAndChangeFileName(newFileName);
                 //从oss获取照片，然后用新的名字下载到本地
                 Map<String, Object> ossInfo = getOssBucketInfo(origin);
                 if (CollectionUtils.isEmpty(ossInfo)) {
@@ -365,6 +365,7 @@ public class HouseController extends BaseController {
     }
 
 
+
     //    @RequiresRoles(value = {"admin", "edit", "upload"}, logical = Logical.OR)
     @ApiOperation("生成houseId和场景码")
     @PostMapping(value = "addPosition")

fdkanfang-web/src/main/java/com/fdkanfang/web/mq/listener/VerticalListener.java

@@ -18,8 +18,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Created by owen on 2020/3/16 0016 18:17
@@ -79,6 +81,28 @@ public class VerticalListener {
                 log.error("rsaVertical 计算异常");
                 throw new BaseRuntimeException(MsgCode.e_RSA_VERTICAL_6000, MsgCode.msg_RSA_VERTICAL_6000);
             }
+            boolean isAllExit = true;
+            //先校验nas中垂直校验生成的文件是否可访问，如果不行，则需要休眠3s
+            for (String path : ossImageHigh.keySet()) {
+                File tmp = new File(path);
+                if(!tmp.exists()){
+                    isAllExit = false;
+                    break;
+                }
+            }
+
+            for (String path : ossImageLow.keySet()) {
+                File tmp = new File(path);
+                if(!tmp.exists()){
+                    isAllExit = false;
+                    break;
+                }
+            }
+
+            if(!isAllExit){
+                log.info("垂直交验的文件存在获取不到的情况，休眠3秒再尝试读取");
+                TimeUnit.SECONDS.sleep(3);
+            }
 
             // 模型上传oss
             AliyunOssUtil.uploadMulFiles(ossImageHigh);