GA/T 1400协议支持

src/main/resources/mapper/pc/DeviceMapper.xml

@@ -8,6 +8,10 @@
         insert into device_config(id, device_id, create_time)
         values (#{id}, #{deviceId}, now())
     </insert>
+    <insert id="addEntity">
+        insert into device(id, name, no, status, online, ip_addr, keepalive_at, create_at, update_at)
+        values (#{id}, #{name}, #{no}, 0, #{online}, #{ipAddr}, #{keepaliveAt}, now(), now())
+    </insert>
     <update id="update">
         update device set scenic_id = #{scenicId}, name = #{name}, no = #{no}, longitude = #{longitude}, latitude = #{latitude}, update_at = now() where id = #{id}
     </update>
@@ -34,11 +38,21 @@
             cut_post = #{cutPost}
         where id = #{id}
     </update>
+    <update id="updateEntity">
+        update device
+        set name = #{name},
+            no = #{no},
+            online = #{online},
+            ip_addr = #{ipAddr},
+            keepalive_at = #{keepaliveAt},
+            update_at = now()
+        where id = #{id}
+    </update>
     <delete id="deleteById">
         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.status, create_at, d.update_at, s.name scenic_name
+        select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name
         from device d
         left join scenic s on d.scenic_id = s.id
         <where>
@@ -63,7 +77,7 @@
         </where>
     </select>
     <select id="getById" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO">
-        select d.id, scenic_id, d.name, no, d.status, create_at, d.update_at, s.name scenic_name
+        select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name
         from device d
                  left join scenic s on d.scenic_id = s.id
         where d.id = #{id}
@@ -97,4 +111,9 @@
         from device
         where id = #{deviceId}
     </select>
+    <select id="getByDeviceNo" resultType="com.ycwl.basic.model.pc.device.entity.DeviceEntity">
+        select *
+        from device
+        where no = #{deviceNo}
+    </select>
 </mapper>

src/main/resources/mapper/pc/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.pc.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`)
-        values (#{id}, #{scenicId}, #{deviceId}, #{sourceId}, #{faceUrl}, #{matchSampleIds}, #{firstMatchRate}, #{matchResult},#{status})
+        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>
     <update id="update">
         update face_sample
@@ -32,6 +32,10 @@
             <if test="status!= null ">
                 `status` = #{status},
             </if>
+            <if test="score!= null ">
+                `score` = #{score},
+            </if>
+            update_at = now(),
         </set>
         where id = #{id}
     </update>
@@ -81,7 +85,7 @@
         </where>
     </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`
+        select id, scenic_id, device_id, face_url, match_sample_ids, first_match_rate, source_id, match_result,`status`, create_at
         from face_sample
         where id = #{id}
     </select>

src/main/resources/mapper/pc/SourceMapper.xml

@@ -2,7 +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.pc.SourceMapper">
     <insert id="add">
-        insert into source(id, scenic_id, device_id, member_id, url) values (#{id}, #{scenicId}, #{deviceId}, #{memberId}, #{url})
+        insert into source(id, scenic_id, device_id, member_id, url, video_url, `type`, face_sample_id)
+        values (#{id}, #{scenicId}, #{deviceId}, #{memberId}, #{url}, #{videoUrl}, #{type}, #{faceSampleId})
     </insert>
     <update id="update">
         update source
@@ -11,7 +12,10 @@
             <if test="deviceId!= null">device_id = #{deviceId}, </if>
             <if test="memberId!= null">member_id = #{memberId}, </if>
             <if test="url!= null">url = #{url}, </if>
+            <if test="videoUrl!= null">video_url = #{videoUrl}, </if>
             <if test="isBuy!=null">is_buy = #{isBuy}, </if>
+            <if test="type!=null">`type` = #{type}, </if>
+            <if test="faceSampleId!= null">face_sample_id = #{faceSampleId}, </if>
         </set>
             where id = #{id}
     </update>
@@ -20,7 +24,7 @@
     </delete>
 
     <select id="list" resultType="com.ycwl.basic.model.pc.source.resp.SourceRespVO">
-        select so.id, scenic_id, device_id, member_id, url, so.create_time, so.update_time,sc.`name` as scenicName
+        select so.id, scenic_id, device_id, member_id, url, so.create_time, so.update_time,sc.`name` as scenicName, so.video_url, so.`type`, so.face_sample_id
             from source so
             left join scenic sc on sc.id = so.scenic_id
         <where>