修改

src/main/resources/mapper/FaceSampleMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ycwl.basic.mapper.FaceSampleMapper">
     <insert id="add">
-        insert into face_sample(id, scenic_id, device_id, source_id, face_url, match_sample_ids, first_match_rate, match_result,`status`, create_at)
-        values (#{id}, #{scenicId}, #{deviceId}, #{sourceId}, #{faceUrl}, #{matchSampleIds}, #{firstMatchRate}, #{matchResult},#{status},#{createAt})
+        insert into face_sample(id, scenic_id, device_id, face_url, match_sample_ids, first_match_rate, match_result,`status`, create_at)
+        values (#{id}, #{scenicId}, #{deviceId}, #{faceUrl}, #{matchSampleIds}, #{firstMatchRate}, #{matchResult},#{status},#{createAt})
     </insert>
     <update id="update">
         update face_sample
@@ -14,9 +14,6 @@
             <if test="deviceId!= null ">
                 device_id = #{deviceId},
             </if>
-            <if test="sourceId!= null ">
-                source_id = #{sourceId},
-            </if>
             <if test="faceUrl!= null and faceUrl!= ''">
                 face_url = #{faceUrl},
             </if>
@@ -52,7 +49,7 @@
         </if>
     </delete>
     <select id="list" resultType="com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO">
-        select f.id, f.scenic_id, s.name scenicName, device_id, d.name deviceName, face_url, source_id, f.score, match_sample_ids, first_match_rate, match_result, f.`status`, f.create_at
+        select f.id, f.scenic_id, s.name scenicName, device_id, d.name deviceName, face_url, f.score, match_sample_ids, first_match_rate, match_result, f.`status`, f.create_at
         from face_sample f
         left join scenic s on s.id = f.scenic_id
         left join device d on d.id = f.device_id
@@ -63,9 +60,6 @@
             <if test="deviceId!= null and deviceId!= ''">
                 and device_id = #{deviceId}
             </if>
-            <if test="sourceId!= null and sourceId!= ''">
-                and source_id = #{sourceId}
-            </if>
             <if test="matchSampleIds!= null and matchSampleIds!= ''">
                 and match_sample_ids like concat('%', #{matchSampleIds}, '%')
             </if>
@@ -82,7 +76,7 @@
         ORDER BY f.create_at desc
     </select>
     <select id="getById" resultType="com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO">
-        select id, scenic_id, device_id, face_url, match_sample_ids, first_match_rate, source_id, match_result,`status`, create_at
+        select id, scenic_id, device_id, face_url, match_sample_ids, first_match_rate, match_result,`status`, create_at
         from face_sample
         where id = #{id}
     </select>

src/main/resources/mapper/ScenicMapper.xml

@@ -111,7 +111,9 @@
             broker_direct_rate=#{brokerDirectRate},
             watermark_type=#{watermarkType},
             watermark_scenic_text=#{watermarkScenicText},
-            watermark_dt_format=#{watermarkDtFormat}
+            watermark_dt_format=#{watermarkDtFormat},
+            face_type=#{faceType},
+            face_config_json=#{faceConfigJson}
         </set>
         where id = #{id}
     </update>

src/main/resources/mapper/StatisticsMapper.xml

@@ -31,6 +31,13 @@
             <if test="endTime!= null">
                 and create_time &lt;= #{endTime}
             </if>
+            and member_id in (select member_id from statistics where type = 1
+        <if test="startTime!= null">
+            and create_time >= #{startTime}
+        </if>
+        <if test="endTime!= null">
+            and create_time &lt;= #{endTime}
+        </if>)
             group by member_id
         )a
     </select>