作者 钟来

修改bug

@@ -143,13 +143,14 @@ public class DeviceService { @@ -143,13 +143,14 @@ public class DeviceService {
143 Set<String> keys = cacheServiceImpl.getRedicTerminalFromClientId(clientId); 143 Set<String> keys = cacheServiceImpl.getRedicTerminalFromClientId(clientId);
144 if(null != keys && keys.size() != 0) 144 if(null != keys && keys.size() != 0)
145 { 145 {
146 - terminalOffLine(keys.toArray(new String[keys.size()])); 146 + baseDao.updateBySql("update iot_terminal set online=4 where device_id='"+clientId+"'");
  147 + cacheServiceImpl.deletRedisTerminal(keys.toArray(new String[keys.size()]));
147 } 148 }
148 } 149 }
149 150
150 public void terminalOffLine(String... terminalIds) 151 public void terminalOffLine(String... terminalIds)
151 { 152 {
152 - baseDao.updateBySql("update iot_terminal set online=0 where id in(?)",Arrays.asList(terminalIds)); 153 + baseDao.updateBySql("update iot_terminal set online=4 where id in(?)",Arrays.asList(terminalIds));
153 cacheServiceImpl.deletRedisTerminal(terminalIds); 154 cacheServiceImpl.deletRedisTerminal(terminalIds);
154 } 155 }
155 156
@@ -289,6 +290,8 @@ public class DeviceService { @@ -289,6 +290,8 @@ public class DeviceService {
289 cacheServiceImpl.deletRedisDevice(client_id); 290 cacheServiceImpl.deletRedisDevice(client_id);
290 baseDao.updateBySql("delete from iot_device where client_id='"+client_id+"'"); 291 baseDao.updateBySql("delete from iot_device where client_id='"+client_id+"'");
291 baseDao.updateBySql("delete from iot_terminal where device_id='"+client_id+"'"); 292 baseDao.updateBySql("delete from iot_terminal where device_id='"+client_id+"'");
  293 + baseDao.updateBySql("DELETE FROM `user_terminal_group_relation` WHERE iot_terminal_id LIKE '"+client_id+"%'");
  294 +
292 List<LogDeviceOperation> list = new ArrayList<>(); 295 List<LogDeviceOperation> list = new ArrayList<>();
293 list.add(dviceLogService.newLogDeviceOperation(client_id,null,null,"远程操作删除主机","delIotDevice?")); 296 list.add(dviceLogService.newLogDeviceOperation(client_id,null,null,"远程操作删除主机","delIotDevice?"));
294 dviceLogService.saveOperationLog(list); 297 dviceLogService.saveOperationLog(list);
@@ -307,6 +310,8 @@ public class DeviceService { @@ -307,6 +310,8 @@ public class DeviceService {
307 closeSession(client_id); //强制下线 310 closeSession(client_id); //强制下线
308 cacheServiceImpl.deletRedisTerminal(client_id+"_"+number); 311 cacheServiceImpl.deletRedisTerminal(client_id+"_"+number);
309 baseDao.updateBySql("delete from iot_terminal where id='"+client_id+"_"+number+"'"); 312 baseDao.updateBySql("delete from iot_terminal where id='"+client_id+"_"+number+"'");
  313 + baseDao.updateBySql("DELETE FROM `user_terminal_group_relation` WHERE iot_terminal_id = '"+client_id+"_"+number+"'");
  314 +
310 List<LogDeviceOperation> list = new ArrayList<>(); 315 List<LogDeviceOperation> list = new ArrayList<>();
311 list.add(dviceLogService.newLogDeviceOperation(client_id,null,null,"远程操作删除终端","delIotTerminal?")); 316 list.add(dviceLogService.newLogDeviceOperation(client_id,null,null,"远程操作删除终端","delIotTerminal?"));
312 dviceLogService.saveOperationLog(list); 317 dviceLogService.saveOperationLog(list);