Commit 5c80e391 authored by zengtianlai3's avatar zengtianlai3

Merge branch 'm33' into 'master'

完善添加设备黑名单功能

See merge request !32
parents 9964064f f8c19c8f
...@@ -68,6 +68,10 @@ public class DeviceManager { ...@@ -68,6 +68,10 @@ public class DeviceManager {
return true; return true;
} }
public synchronized Map<String, DeviceVo> getAllDevice() {
return allDevice;
}
public synchronized void putSession(String appId, SessionContext session) { public synchronized void putSession(String appId, SessionContext session) {
sessionContexts.put(appId, session); sessionContexts.put(appId, session);
} }
......
...@@ -3,6 +3,7 @@ package iot.sixiang.license.service.impl; ...@@ -3,6 +3,7 @@ package iot.sixiang.license.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import iot.sixiang.license.auth.AuthManager; import iot.sixiang.license.auth.AuthManager;
import iot.sixiang.license.consts.ResultCode; import iot.sixiang.license.consts.ResultCode;
import iot.sixiang.license.device.DeviceManager;
import iot.sixiang.license.entity.DeviceBlack; import iot.sixiang.license.entity.DeviceBlack;
import iot.sixiang.license.handler.IotLicenseException; import iot.sixiang.license.handler.IotLicenseException;
import iot.sixiang.license.mapper.DeviceBlackMapper; import iot.sixiang.license.mapper.DeviceBlackMapper;
...@@ -42,19 +43,19 @@ public class DeviceBlackServiceImpl extends ServiceImpl<DeviceBlackMapper, Devic ...@@ -42,19 +43,19 @@ public class DeviceBlackServiceImpl extends ServiceImpl<DeviceBlackMapper, Devic
throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(),ResultCode.VALIDATE_FAILED.getMsg()); throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(),ResultCode.VALIDATE_FAILED.getMsg());
} }
AuthManager authManager = SpringUtil.getBean(AuthManager.class); AuthManager authManager = SpringUtil.getBean(AuthManager.class);
Map<String, DeviceBlack> deviceBlack = authManager.getDeviceBlack(); DeviceManager deviceManager = SpringUtil.getBean(DeviceManager.class);
if (deviceBlack.containsKey(deviceId)) { if (authManager.getDeviceBlack().containsKey(deviceId)) {
throw new IotLicenseException(ResultCode.FAILED.getCode(),ResultCode.FAILED.getMsg()); throw new IotLicenseException(ResultCode.FAILED.getCode(),ResultCode.FAILED.getMsg());
} }
List<DeviceVo> deviceList = deviceMapper.getDeviceList("", ""); Map<String, DeviceVo> allDevice = deviceManager.getAllDevice();
int count = 0; int count = 0;
for (DeviceVo deviceVo : deviceList) { for (DeviceVo deviceVo : allDevice.values()) {
if (deviceVo.getDeviceId() == deviceId){ if (deviceVo.getDeviceId() == deviceId){
break; break;
} }
count++; count++;
} }
if (count == deviceList.size()) { if (count == allDevice.size()) {
throw new IotLicenseException(ResultCode.FAILED.getCode(),ResultCode.FAILED.getMsg()); throw new IotLicenseException(ResultCode.FAILED.getCode(),ResultCode.FAILED.getMsg());
} }
boolean res = deviceBlackMapper.addDeviceBlack(deviceId); boolean res = deviceBlackMapper.addDeviceBlack(deviceId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment