venue/smart_venue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api-设备唯一Id 修改为 设备号 + 场馆号 + 进场OR出场

Browse Source
This commit is contained in:
limqhz
2020-07-23 17:03:45 +08:00
parent 16e2f04c38
commit 94b8e9c320
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
service/src/main/resources/mybatis/mapper/sv/DeviceMapper.xml
View File

@@ -126,7 +126,7 @@
<if test="venueType != null">
#{venueType},
</if>
<if test="venueType != null">
<if test="deviceType != null">
#{deviceType},
</if>
<if test="status != null">
@@ -247,24 +247,24 @@
<update id="offline">
UPDATE sv_device set status = 0,modified_time = now()
WHERE name = #{deviceName} and venue_id=#{venueId}
<if test="venueType != null">
and venue_type = #{venueType}
<if test="deviceType != null">
and device_type = #{deviceType}
</if>
</update>
<update id="online">
UPDATE sv_device set status = 2,modified_time = now()
WHERE name = #{deviceName} and venue_id=#{venueId}
<if test="venueType != null">
and venue_type = #{venueType}
<if test="deviceType != null">
and device_type = #{deviceType}
</if>
</update>
<select id="checkDevice" resultType="java.lang.Integer">
SELECT count(1) FROM sv_device
WHERE 1=1 AND name = #{deviceName} and venue_id=#{venueId} and deleted = 0
<if test="venueType != null">
and venue_type = #{venueType}
<if test="deviceType != null">
and device_type = #{deviceType}
</if>
</select>
@@ -272,8 +272,8 @@
SELECT
<include refid="Field"></include> FROM sv_device
WHERE 1=1 AND name = #{deviceName} and venue_id=#{venueId} and deleted = 0
<if test="venueType != null">
and venue_type = #{venueType}
<if test="deviceType != null">
and device_type = #{deviceType}
</if>
</select>