From 541246a7323e6b17dee16095133e5d18aaef93c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com>
Date: Tue, 1 Aug 2017 11:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=A0=E9=99=A4=E6=91=84?=
 =?UTF-8?q?=E5=83=8F=E5=A4=B4=E6=B8=85=E7=90=86=E7=BC=93=E5=AD=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E7=94=A8=E6=88=B7=E7=99=BB=E9=99=86=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=91=84=E5=83=8F=E5=A4=B4ID=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ifish/helper/RedisKeyHelper.java | 9 ++++++---
 src/main/java/com/ifish/helper/UserHelper.java     | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ifish/helper/RedisKeyHelper.java b/src/main/java/com/ifish/helper/RedisKeyHelper.java
index a452e88..cd5d5b0 100644
--- a/src/main/java/com/ifish/helper/RedisKeyHelper.java
+++ b/src/main/java/com/ifish/helper/RedisKeyHelper.java
@@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class RedisKeyHelper implements RedisKeyHelperI {
-
+    
     @Autowired
     private RedisHelperI redisHelperI;
 
@@ -306,7 +306,7 @@ public class RedisKeyHelper implements RedisKeyHelperI {
      * @return
      */
     @Override
-
+    
     public String getTbl_Live_Room_CountRedisKey() {
         return RedisKey.LIVEROOM_COUNT;
     }
@@ -413,6 +413,9 @@ public class RedisKeyHelper implements RedisKeyHelperI {
         if (tbl_Device_User.getDeviceId() != null && tbl_Device_User.getDeviceId() > 0) {
             redisHelperI.deleteRedis(getListTbl_Device_UserKeyByDeviceId(tbl_Device_User.getDeviceId()));
         }
+        if (tbl_Device_User.getUserId() != null) {
+            redisHelperI.delRedisByTagKey(getListTbl_Device_UserKeyByUserId(tbl_Device_User.getUserId()));
+        }
     }
 
     /**
@@ -477,5 +480,5 @@ public class RedisKeyHelper implements RedisKeyHelperI {
         redisHelperI.delRedisByTagKey(RedisKey.LIVEMESSAGE_ROOMID + tbl_Live_Message.getRoomId());
         redisHelperI.deleteRedis(RedisKey.LIVEMESSAGE_COUNT + tbl_Live_Message.getRoomId());
     }
-
+    
 }
diff --git a/src/main/java/com/ifish/helper/UserHelper.java b/src/main/java/com/ifish/helper/UserHelper.java
index e3820e7..54f831f 100644
--- a/src/main/java/com/ifish/helper/UserHelper.java
+++ b/src/main/java/com/ifish/helper/UserHelper.java
@@ -845,11 +845,11 @@ public class UserHelper implements UserHelperI {
         //获取用户拥有设备
         List<Tbl_Device_User> deviceUserList = deviceHelperI.getDeviceUsersByUserId(tmpUser.getUserId());
         List<Integer> deviceIds = new ArrayList<Integer>();
-        List<Integer> cameraIds = new ArrayList<Integer>();
+        List<String> cameraIds = new ArrayList<String>();
         for (Tbl_Device_User deviceUser : deviceUserList) {
             Tbl_Device device = deviceHelperI.getDeviceById(deviceUser.getDeviceId());
             if (device.getIsCamera().equals("1")) {
-                cameraIds.add(device.getDeviceId());
+                cameraIds.add(device.getCameraId());
                 list2.add(getCameraInfo(device, deviceUser));
             } else {
                 deviceIds.add(device.getDeviceId());
@@ -948,7 +948,7 @@ public class UserHelper implements UserHelperI {
      */
     public Map<String, Object> getCameraInfo(Tbl_Device camera, Tbl_Device_User cameraUser) {
         Map<String, Object> cameraMap = new HashMap<String, Object>();
-        cameraMap.put("cameraId", camera.getDeviceId());
+        cameraMap.put("cameraId", camera.getCameraId());
         cameraMap.put("isMaster", cameraUser.getIsMaster());
         cameraMap.put("isLook", cameraUser.getIsLook());
         cameraMap.put("isActive", StringUtils.isNotBlank(camera.getActiveCode()) ? "1" : "0");