图片比对

src/main/java/com/poteviohealth/cgp/statistics/mapper/DistinctionMapper.java

@@ -21,7 +21,7 @@ public interface DistinctionMapper extends BaseMapper<Distinction>{
     DistinctionDTO checkDis(@Param("operatorId")Integer operatorId, @Param("dbName") String dbName, @Param("uid1") String uid1,@Param("uid2") String uid2,@Param("uid3") String uid3,@Param("uid4") String uid4,@Param("uid5") String uid5,@Param("uid6") String uid6,@Param("uid7") String uid7,@Param("uid8") String uid8,@Param("uid9") String uid9, @Param("dCount") Integer dCount, @Param("date") String date);
 
     @SqlParser(filter = true)
-    DistinctionDTO checkDis2(@Param("operatorId")Integer operatorId, @Param("dbName") String dbName, @Param("uid1") String uid1,@Param("uid2") String uid2,@Param("uid3") String uid3,@Param("uid4") String uid4,@Param("uid5") String uid5,@Param("uid6") String uid6,@Param("uid7") String uid7,@Param("uid8") String uid8,@Param("uid9") String uid9, @Param("dCount") Integer dCount, @Param("date") String date);
+    DistinctionDTO checkDis2(@Param("operatorId")Integer operatorId, @Param("dbName") String dbName, @Param("uid1") String uid1,@Param("uid2") String uid2,@Param("uid3") String uid3,@Param("uid4") String uid4,@Param("uid5") String uid5,@Param("uid6") String uid6,@Param("uid7") String uid7,@Param("uid8") String uid8,@Param("uid9") String uid9,@Param("uid10") String uid10, @Param("dCount") Integer dCount, @Param("date") String date);
 
     @SqlParser(filter = true)
     void insertBatch(@Param("list") List<Distinction> list);

src/main/java/com/poteviohealth/cgp/statistics/model/Distinction.java

@@ -50,6 +50,8 @@ public class Distinction extends BaseEntity {
     private String uid8;
     @ApiModelProperty(value = "图片标识")
     private String uid9;
+    @ApiModelProperty(value = "图片标识")
+    private String uid10;
     @ApiModelProperty(value = "图片路径")
     private String url;
     @ApiModelProperty(value = "对比id")

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

@@ -91,7 +91,7 @@ public class DistinctionServiceImpl extends BaseServiceImpl<DistinctionMapper, D
                     }
                 }
             }
-            DistinctionDTO dis = baseMapper.checkDis2(TokenContext.cureOperatorId(),dbName,uid1,uid2,uid3,uid4,uid5,uid6,uid7,uid8,uid9,count, DateFormatUtils.format(DateUtils.caculDays(new Date(), -day),"yyyy-MM-dd HH:mm:ss"));
+            DistinctionDTO dis = baseMapper.checkDis2(TokenContext.cureOperatorId(),dbName,uid1,uid2,uid3,uid4,uid5,uid6,uid7,uid8,uid9,uid,count, DateFormatUtils.format(DateUtils.caculDays(new Date(), -day),"yyyy-MM-dd HH:mm:ss"));
             if(dis != null){
                 dto.setOrderId(dis.getOrderId());
                 dto.setRurl(dis.getRurl());
@@ -130,11 +130,11 @@ public class DistinctionServiceImpl extends BaseServiceImpl<DistinctionMapper, D
                     }
                 }
             }
-
+            distinction.setUid10(distinction.getUid());
             //97%
             DistinctionDTO dis = baseMapper.checkDis2(distinction.getOperatorId(),dbName,distinction.getUid1(),distinction.getUid2(),
                     distinction.getUid3(),distinction.getUid4(),distinction.getUid5(),distinction.getUid6(),
-                    distinction.getUid7(),distinction.getUid8(),distinction.getUid9(),
+                    distinction.getUid7(),distinction.getUid8(),distinction.getUid9(),distinction.getUid10(),
                     0, "2025-01-01 00:00:00");
             if(dis != null){
                 distinction.setErrorId(dis.getId());

src/main/resources/mapper/statistics/DistinctionMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.poteviohealth.cgp.statistics.mapper.DistinctionMapper">
     <insert id="insertBatch">
-        INSERT INTO f_distinction_img (created_date,modified_date,yn,operator_id,supplier_id,station_id,order_id,upload_date,url,uid1,uid2,uid3,uid4,uid5,uid6,uid7,uid8,uid9,error_id) VALUES
+        INSERT INTO f_distinction_img (created_date,modified_date,yn,operator_id,supplier_id,station_id,order_id,upload_date,url,uid1,uid2,uid3,uid4,uid5,uid6,uid7,uid8,uid9,uid10,error_id) VALUES
         <foreach collection="list" item="d" separator=",">
-            (NOW(),NOW(),0,#{d.operatorId},#{d.supplierId},#{d.stationId},#{d.orderId},NOW(),#{d.url},b#{d.uid1},b#{d.uid2},b#{d.uid3},b#{d.uid4},b#{d.uid5},b#{d.uid6},b#{d.uid7},b#{d.uid8},b#{d.uid9},#{d.errorId})
+            (NOW(),NOW(),0,#{d.operatorId},#{d.supplierId},#{d.stationId},#{d.orderId},NOW(),#{d.url},b#{d.uid1},b#{d.uid2},b#{d.uid3},b#{d.uid4},b#{d.uid5},b#{d.uid6},b#{d.uid7},b#{d.uid8},b#{d.uid9},#{d.uid10},#{d.errorId})
         </foreach>
     </insert>
     <select id="checkDis" resultType="com.poteviohealth.cgp.statistics.model.outdto.DistinctionDTO">
@@ -54,15 +54,15 @@
         where yn = 0
         and operator_id = #{operatorId}
             and upload_date >= #{date}
-          and uid1 = b#{uid1}
-          and uid2 = b#{uid2}
+          and uid10 =#{uid10}
+         /* and uid2 = b#{uid2}
           and uid3 = b#{uid3}
           and uid4 = b#{uid4}
           and uid5 = b#{uid5}
           and uid6 = b#{uid6}
           and uid7 = b#{uid7}
           and uid8 = b#{uid8}
-          and uid9 = b#{uid9}
+          and uid9 = b#{uid9}*/
             limit 1
     </select>
 </mapper>