From 94b8e9c320b44140945c154c80bad2ef80a082b5 Mon Sep 17 00:00:00 2001
From: limqhz <l>
Date: Thu, 23 Jul 2020 17:03:45 +0800
Subject: [PATCH] =?UTF-8?q?api-=E8=AE=BE=E5=A4=87=E5=94=AF=E4=B8=80Id=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=20=E8=AE=BE=E5=A4=87=E5=8F=B7=20+?=
 =?UTF-8?q?=20=E5=9C=BA=E9=A6=86=E5=8F=B7=20+=20=E8=BF=9B=E5=9C=BAOR?=
 =?UTF-8?q?=E5=87=BA=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AppMessageHandlerAdapter.java |  2 +-
 .../com/test/netty/client/ClientHandler.java   |  5 ++++-
 .../mybatis/mapper/sv/DeviceMapper.xml         | 18 +++++++++---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/api/src/main/java/com/sv/netty/netty/service/impl/AppMessageHandlerAdapter.java b/api/src/main/java/com/sv/netty/netty/service/impl/AppMessageHandlerAdapter.java
index 856abc0..2a0b73b 100644
--- a/api/src/main/java/com/sv/netty/netty/service/impl/AppMessageHandlerAdapter.java
+++ b/api/src/main/java/com/sv/netty/netty/service/impl/AppMessageHandlerAdapter.java
@@ -76,8 +76,8 @@ public class AppMessageHandlerAdapter implements MessageService {
             if (thisVenue == null ){
                 logger.error("this client choose venue Error! venueId == " + heartBeat.getVenueId());
             } else {
-                ClientChannelCache.putChannelType(heartBeat.getDeviceName(),heartBeat.getVenueId(),heartBeat.getEnterOrOut(),channel);
                 deviceService.online(heartBeat.getDeviceName(),heartBeat.getVenueId(),heartBeat.getEnterOrOut(),thisVenue.getType(),clientId);
+                ClientChannelCache.putChannelType(heartBeat.getDeviceName(),heartBeat.getVenueId(),heartBeat.getEnterOrOut(),channel);
             }
         }
     }
diff --git a/api/src/test/java/com/test/netty/client/ClientHandler.java b/api/src/test/java/com/test/netty/client/ClientHandler.java
index 8cbb022..1a513e7 100644
--- a/api/src/test/java/com/test/netty/client/ClientHandler.java
+++ b/api/src/test/java/com/test/netty/client/ClientHandler.java
@@ -1,6 +1,7 @@
 package com.test.netty.client;
 
 import com.sv.netty.utils.JsonUtils;
+import com.test.netty.client.message.DeviceType;
 import com.test.netty.client.message.HeartBeat;
 import com.test.netty.client.message.MessageDTO;
 import io.netty.channel.Channel;
@@ -88,8 +89,10 @@ public class ClientHandler extends SimpleChannelInboundHandler<String> {
      */
     private HeartBeat getHbMessage() {
         HeartBeat hb = new HeartBeat();
-        hb.setDeviceName("DeviceIdUtil.generateDeviceId(mContext)");
+//        hb.setDeviceName("DeviceIdUtil.generateDeviceId(mContext)");
+        hb.setDeviceName("shebeiweiyishibiehao");
         hb.setVenueId(32); // TODO
+        hb.setEnterOrOut(DeviceType.ENTER);
         return hb;
     }
 
diff --git a/service/src/main/resources/mybatis/mapper/sv/DeviceMapper.xml b/service/src/main/resources/mybatis/mapper/sv/DeviceMapper.xml
index 5c50b13..c607aba 100644
--- a/service/src/main/resources/mybatis/mapper/sv/DeviceMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/DeviceMapper.xml
@@ -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>