图片查重

src/main/java/com/poteviohealth/cgp/statistics/controller/OrderController.java

@@ -1,6 +1,7 @@
 package com.poteviohealth.cgp.statistics.controller;
 
 
+import com.beust.jcommander.internal.Lists;
 import com.google.common.collect.Maps;
 import com.poteviohealth.cgp.common.controller.BaseWebController;
 import com.poteviohealth.cgp.common.exception.BusinessException;
@@ -16,6 +17,7 @@ import com.poteviohealth.cgp.common.integrated.finance.model.CardAccTransRecharg
 import com.poteviohealth.cgp.common.integrated.finance.model.MemberPlanDTO;
 import com.poteviohealth.cgp.common.integrated.finance.model.MemberPlanPageDTO;
 import com.poteviohealth.cgp.common.model.VaultsResponse;
+import com.poteviohealth.cgp.statistics.model.Distinction;
 import com.poteviohealth.cgp.statistics.model.indto.*;
 import com.poteviohealth.cgp.statistics.model.outdto.DishesOrderWebOutDTO;
 import com.poteviohealth.cgp.statistics.model.outdto.DistinctionDTO;
@@ -40,6 +42,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -269,7 +272,8 @@ public class OrderController extends BaseWebController {
                         VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId,new FileInputStream(tempFile2));
                         dto.setUrl(vaultsResponse.getData());
                     }
-                    // tempFile2.deleteOnExit();
+                    imageFile.delete();
+                     tempFile2.deleteOnExit();
                 }else{
                     File imageFile = ossUtils.generateCover(tempFile);
                     dto = distinctionService.checkImg(imageFile,orderId,uidList);
@@ -277,9 +281,10 @@ public class OrderController extends BaseWebController {
                         VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId,inputStream);
                         dto.setUrl(vaultsResponse.getData());
                     }
+                    imageFile.delete();
                 }
 
-                //imageFile.delete();
+
             }else{
                 //图片处理
                 dto = distinctionService.checkImg(tempFile,orderId,uidList);
@@ -289,7 +294,7 @@ public class OrderController extends BaseWebController {
                 }
             }
 
-            //tempFile.delete();
+            tempFile.delete();
 
             return VaultsResponse.success(dto);
         } catch (IOException e) {
@@ -311,6 +316,25 @@ public class OrderController extends BaseWebController {
            return vaultsResponse;
        }
         list = vaultsResponse.getData();
+       //处理图片指纹
+        List<Distinction> distinctionList = Lists.newArrayList();
+        for (PriceUploadDto priceUploadDto : list) {
+            if(priceUploadDto.getUid() == null){
+                continue;
+            }
+            Distinction distinction = new Distinction();
+            distinction.setOperatorId(TokenContext.cureOperatorId());
+            distinction.setSupplierId(TokenContext.curSupplierId());
+            distinction.setStationId(TokenContext.curStationId());
+            distinction.setOrderId(priceUploadDto.getOrderId());
+            distinction.setUploadDate(new Date());
+            distinction.setUrl(priceUploadDto.getUrl());
+            distinction.setUid(priceUploadDto.getUid());
+            distinctionList.add(distinction);
+        }
+        if(!distinctionList.isEmpty()){
+            distinctionService.saveBatch(distinctionList);
+        }
         //处理照片
         watermarkImgService.updateOrderUrl(list);
 

src/main/java/com/poteviohealth/cgp/statistics/model/indto/PriceUploadDto.java

@@ -34,6 +34,9 @@ public class PriceUploadDto {
     @ApiModelProperty(value="类型")
     private String type;
 
+    @ApiModelProperty(value="指纹")
+    private Long uid;
+
     @ApiModelProperty(value = "打卡经度")
     private Double punchLongitude;
     @ApiModelProperty(value = "打卡纬度")

src/main/java/com/poteviohealth/cgp/statistics/service/impl/WatermarkImgServiceImpl.java

@@ -44,7 +44,7 @@ public class WatermarkImgServiceImpl extends BaseServiceImpl<WatermarkImgMapper,
         for (PriceUploadDto dto : list) {
             orderId = dto.getOrderId();
             if(StringUtils.isNotEmpty(dto.getUrl())){
-                if(dto.getIndex() <=6){
+                if(dto.getIndex() <=5){
                     startUrl.add(dto.getUrl());
                 }else{
                     endUrl.add(dto.getUrl());