调整

src/main/resources/mapper/DeviceMapper.xml

@@ -82,9 +82,10 @@
                  left join scenic s on d.scenic_id = s.id
         where d.id = #{id}
     </select>
-    <select id="listByScenicId" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO">
-        select d.id, d.name, no, d.status, create_at, d.update_at
+    <select id="listByScenicIdWithWVP" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO">
+        select d.id, d.name, no, d.status, create_at, d.update_at, p.wvp_device_no as device_no, p.wvp_channel_no channel_no
         from device d
+        left join device_preview_config p on d.id = p.device_id and p.status = 1
         where d.scenic_id = #{scenicId}
     </select>
     <select id="deviceCountByScenicId" resultType="com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO">
@@ -108,4 +109,9 @@
         from device
         where no = #{deviceNo}
     </select>
+    <select id="listAll" resultType="com.ycwl.basic.model.pc.device.entity.DeviceEntity">
+        select *
+        from device
+        where status = 1
+    </select>
 </mapper>

src/main/resources/mapper/ScenicMapper.xml

@@ -99,7 +99,7 @@
         delete from scenic_config where scenic_id = #{scenicId}
     </delete>
     <select id="list" resultMap="scenic">
-        select s.id, `name`, `phone`, introduction,logo_url,cover_url, longitude, latitude, radius, province, city, area, address, `status`, s.create_time, update_time,
+        select s.id, `name`, `phone`, introduction,logo_url,cover_url, longitude, latitude, radius, province, city, area, address, `status`, s.create_time, update_time, kf_code_url, kf_phone,
         (select scenic_account.account from scenic_account where scenic_account.scenic_id = s.id and scenic_account.is_super = 1 limit 1) as account,
         s.price
             from scenic s

src/main/resources/mapper/TaskMapper.xml

@@ -59,6 +59,7 @@
         <where>
             <if test="workerId!= null">and worker_id = #{workerId} </if>
             <if test="memberId!= null">and member_id = #{memberId} </if>
+            <if test="taskParams!= null">and task_params = #{taskParams} </if>
             <if test="faceId!= null">and face_id = #{faceId} </if>
             <if test="templateId!= null">and template_id = #{templateId} </if>
             <if test="scenicId!= null">and scenic_id = #{scenicId} </if>

src/main/resources/mapper/VideoMapper.xml

@@ -106,7 +106,7 @@
         order by v.create_time desc
     </select>
     <select id="userFaceTemplateVideo" resultType="com.ycwl.basic.model.pc.video.entity.MemberVideoEntity">
-        select * from member_video where member_id = #{userId} and face_id = #{faceId} and template_id = #{templateId} order by id desc
+        select * from member_video where member_id = #{userId} and face_id = #{faceId} and template_id = #{templateId} order by create_time desc
     </select>
     <select id="listRelationByFace" resultType="com.ycwl.basic.model.pc.video.entity.MemberVideoEntity">
         select mv.*
@@ -141,4 +141,9 @@
         where member_id = #{userId} and task_id = #{taskId}
         limit 1
     </select>
+    <select id="listRelationByCreateTime" resultType="com.ycwl.basic.model.pc.video.entity.MemberVideoEntity">
+        select *
+        from member_video
+        where create_time &gt;= #{startTime} and create_time &lt;= #{endTime}
+    </select>
 </mapper>