修改照片分辨率辨别的方式

fdkanfang-common/src/main/java/com/fdkanfang/common/enums/ImageResolutionRate.java

@@ -9,8 +9,8 @@ import org.apache.commons.lang3.StringUtils;
  * @desciption
  */
 public enum ImageResolutionRate {
-      TWO_K(2048*1024,"2K分辨率" , 1),
-      FOUR_K(4096*2048,"4K分辨率" , 2),
+      TWO_K(2048,"2K分辨率" , 1),
+      FOUR_K(4096,"4K分辨率" , 2),
     ;
 
     private Integer rate;
@@ -26,7 +26,7 @@ public enum ImageResolutionRate {
         if(null == rate){
             return  null;
         }
-        if(rate.compareTo(2048*1024) <= 0){
+        if(rate.compareTo(4096) < 0){
             return TWO_K;
         }else{
             return FOUR_K;

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

@@ -121,10 +121,14 @@ public class FileUtils {
         if(needCheckResolutin){
             SimpleImageInfo simpleImageInfo = new SimpleImageInfo(file);
             if(null != simpleImageInfo){
-                totalResolutinRate = simpleImageInfo.getWidth()*simpleImageInfo.getHeight();
+                if(simpleImageInfo.getWidth() <  simpleImageInfo.getHeight()){
+                    totalResolutinRate = simpleImageInfo.getHeight();
+                }else{
+                    totalResolutinRate = simpleImageInfo.getWidth();
+                }
+
             }
         }
-
         return totalResolutinRate;
     }
 

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

@@ -270,9 +270,10 @@ public class HouseController extends BaseController {
         image.setFloor(1);
         image.setType(imageType);
         //将图片保存到本地指定目录filePath eg: /root/data/kanfang/d_9iRDUgn3l/input_img/xxx.jpg
-        int  resolutionRate = FileUtils.downloanAndGetResolutionRate(file.getInputStream(), fileFullPath , false);
+        int  resolutionRate = FileUtils.downloanAndGetResolutionRate(file.getInputStream(), fileFullPath , true);
         //照片分辨率
         ImageResolutionRate maxResolutionRate = ImageResolutionRate.getResolutionRateByRate(resolutionRate);
+        log.info("照片{}的像素为:{}" , fileFullPath , resolutionRate);
         image.setResolutionRate(null != maxResolutionRate ? maxResolutionRate.name() : "TWO_K");
         int insert = imageService2.save(image);
         if(insert != 1){