qin 1 gadu atpakaļ
vecāks
revīzija
08882b1eeb

+ 2 - 1
src/main/java/com/poteviohealth/cgp/statistics/mapper/DistinctionMapper.java

@@ -3,6 +3,7 @@ package com.poteviohealth.cgp.statistics.mapper;
 import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.poteviohealth.cgp.statistics.model.Distinction;
+import com.poteviohealth.cgp.statistics.model.outdto.DistinctionDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,5 +15,5 @@ import org.apache.ibatis.annotations.Param;
 public interface DistinctionMapper extends BaseMapper<Distinction>{
 
     @SqlParser(filter = true)
-    Long checkDis(@Param("operatorId")Integer operatorId, @Param("dbName") String dbName, @Param("uid") String uid, @Param("dCount") Integer dCount, @Param("date") String date);
+    DistinctionDTO checkDis(@Param("operatorId")Integer operatorId, @Param("dbName") String dbName, @Param("uid") String uid, @Param("dCount") Integer dCount, @Param("date") String date);
 }

+ 2 - 0
src/main/java/com/poteviohealth/cgp/statistics/model/Distinction.java

@@ -30,4 +30,6 @@ public class Distinction extends BaseEntity {
     private Date uploadDate;
     @ApiModelProperty(value = "图片标识")
     private Long uid;
+    @ApiModelProperty(value = "图片路径")
+    private String url;
 }

+ 3 - 0
src/main/java/com/poteviohealth/cgp/statistics/model/outdto/DistinctionDTO.java

@@ -18,4 +18,7 @@ public class DistinctionDTO {
 
     @ApiModelProperty(value="url")
     private String url;
+
+    @ApiModelProperty(value="重复的url")
+    private String rurl;
 }

+ 3 - 1
src/main/java/com/poteviohealth/cgp/statistics/service/impl/DistinctionServiceImpl.java

@@ -63,7 +63,9 @@ public class DistinctionServiceImpl extends BaseServiceImpl<DistinctionMapper, D
         if(isCheck){
             dto.setOrderId(orderId);
         }else{
-            dto.setOrderId(baseMapper.checkDis(TokenContext.cureOperatorId(),dbName,uid,count, DateFormatUtils.format(DateUtils.caculDays(new Date(), -day),"yyyy-MM-dd HH:mm:ss")));
+            DistinctionDTO dis = baseMapper.checkDis(TokenContext.cureOperatorId(),dbName,uid,count, DateFormatUtils.format(DateUtils.caculDays(new Date(), -day),"yyyy-MM-dd HH:mm:ss"));
+            dto.setOrderId(dis.getOrderId());
+            dto.setRurl(dis.getRurl());
         }
        return dto;
     }

+ 2 - 2
src/main/resources/mapper/statistics/DistinctionMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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">
-    <select id="checkDis" resultType="java.lang.Long">
-        select order_id from ${dbName}_face.f_distinction_img
+    <select id="checkDis" resultType="com.poteviohealth.cgp.statistics.model.outdto.DistinctionDTO">
+        select order_id,url as rurl from ${dbName}_face.f_distinction_img
         where
         operator_id = #{operatorId}
         and upload_date >= #{date}