root
/
ifish_english
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户删除摄像头清理缓存修改，用户登陆返回摄像头ID错误修改

This commit is contained in:
谢洪龙 2017-08-01 11:36:40 +08:00
parent 5e9296aa49
commit 541246a732
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/ifish/helper/RedisKeyHelper.java
View File

@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
*/ */
@Component @Component
public class RedisKeyHelper implements RedisKeyHelperI { public class RedisKeyHelper implements RedisKeyHelperI {
@Autowired @Autowired
private RedisHelperI redisHelperI; private RedisHelperI redisHelperI;
@ -306,7 +306,7 @@ public class RedisKeyHelper implements RedisKeyHelperI {
* @return * @return
*/ */
@Override @Override
public String getTbl_Live_Room_CountRedisKey() { public String getTbl_Live_Room_CountRedisKey() {
return RedisKey.LIVEROOM_COUNT; return RedisKey.LIVEROOM_COUNT;
} }
@ -413,6 +413,9 @@ public class RedisKeyHelper implements RedisKeyHelperI {
if (tbl_Device_User.getDeviceId() != null && tbl_Device_User.getDeviceId() > 0) { if (tbl_Device_User.getDeviceId() != null && tbl_Device_User.getDeviceId() > 0) {
redisHelperI.deleteRedis(getListTbl_Device_UserKeyByDeviceId(tbl_Device_User.getDeviceId())); 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.delRedisByTagKey(RedisKey.LIVEMESSAGE_ROOMID + tbl_Live_Message.getRoomId());
redisHelperI.deleteRedis(RedisKey.LIVEMESSAGE_COUNT + tbl_Live_Message.getRoomId()); redisHelperI.deleteRedis(RedisKey.LIVEMESSAGE_COUNT + tbl_Live_Message.getRoomId());
} }
} }

6
src/main/java/com/ifish/helper/UserHelper.java
View File

@ -845,11 +845,11 @@ public class UserHelper implements UserHelperI {
//获取用户拥有设备 //获取用户拥有设备
List<Tbl_Device_User> deviceUserList = deviceHelperI.getDeviceUsersByUserId(tmpUser.getUserId()); List<Tbl_Device_User> deviceUserList = deviceHelperI.getDeviceUsersByUserId(tmpUser.getUserId());
List<Integer> deviceIds = new ArrayList<Integer>(); List<Integer> deviceIds = new ArrayList<Integer>();
List<Integer> cameraIds = new ArrayList<Integer>(); List<String> cameraIds = new ArrayList<String>();
for (Tbl_Device_User deviceUser : deviceUserList) { for (Tbl_Device_User deviceUser : deviceUserList) {
Tbl_Device device = deviceHelperI.getDeviceById(deviceUser.getDeviceId()); Tbl_Device device = deviceHelperI.getDeviceById(deviceUser.getDeviceId());
if (device.getIsCamera().equals("1")) { if (device.getIsCamera().equals("1")) {
cameraIds.add(device.getDeviceId()); cameraIds.add(device.getCameraId());
list2.add(getCameraInfo(device, deviceUser)); list2.add(getCameraInfo(device, deviceUser));
} else { } else {
deviceIds.add(device.getDeviceId()); 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) { public Map<String, Object> getCameraInfo(Tbl_Device camera, Tbl_Device_User cameraUser) {
Map<String, Object> cameraMap = new HashMap<String, Object>(); 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("isMaster", cameraUser.getIsMaster());
cameraMap.put("isLook", cameraUser.getIsLook()); cameraMap.put("isLook", cameraUser.getIsLook());
cameraMap.put("isActive", StringUtils.isNotBlank(camera.getActiveCode()) ? "1" : "0"); cameraMap.put("isActive", StringUtils.isNotBlank(camera.getActiveCode()) ? "1" : "0");