2

src/main/resources/mapper/DeviceMapper.xml

@@ -67,7 +67,8 @@
         delete from device where id = #{id}
     </delete>
     <select id="list" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO">
-        select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name, d.keepalive_at, d.online, p.wvp_device_no as device_no, p.wvp_channel_no channel_no
+        select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name, d.keepalive_at, d.online, p.wvp_device_no as device_no, p.wvp_channel_no channel_no,
+        (select url from source s where s.device_id=d.id order by id desc limit 1) coverUrl
         from device d
         left join scenic s on d.scenic_id = s.id
         left join device_preview_config p on d.id = p.device_id and p.status = 1
@@ -91,7 +92,7 @@
                 and d.create_at &lt;= #{endTime}
             </if>
         </where>
-        order by sort
+        order by d.scenic_id desc, sort asc
     </select>
     <select id="getById" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO">
         select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name

src/main/resources/mapper/FaceMapper.xml

@@ -117,4 +117,7 @@
         order by update_at desc
         limit 1
     </select>
+    <select id="test" resultType="com.ycwl.basic.model.pc.face.resp.FaceRespVO">
+        SELECT * FROM `zt`.`face_sample` WHERE `scenic_id` = '3930324797233434624' AND `create_at` &lt; '2025-03-07 14:40:36' AND `device_id` = '3961959104355897344'
+    </select>
 </mapper>

src/main/resources/mapper/OrderMapper.xml

@@ -483,4 +483,8 @@
     <select id="getOrderItem" resultType="com.ycwl.basic.model.pc.order.entity.OrderItemEntity">
         select * from order_item where id = #{id}
     </select>
+    <select id="queryTypeOrder" resultType="com.ycwl.basic.model.pc.order.entity.OrderEntity">
+        select * from `order` where member_id = #{userId} and type = #{orderType} and price_config_id = #{priceConfigId}
+        limit 1
+    </select>
 </mapper>

src/main/resources/mapper/PriceConfigMapper.xml

@@ -52,7 +52,7 @@
         select * from price_config
         where scenic_id = #{scenicId}
         and type = #{type}
-        <if test="goodsId != null">
+        <if test="goodsId != null and goodsId != ''">
         and goods_ids like concat('%', #{goodsId}, '%')
         </if>
     </select>