Merge branch 'm33' into 'master'

完善添加设备黑名单功能

See merge request !32

license/src/main/java/iot/sixiang/license/device/DeviceManager.java

@@ -68,6 +68,10 @@ public class DeviceManager {
         return true;
     }
 
+    public synchronized Map<String, DeviceVo> getAllDevice() {
+        return allDevice;
+    }
+
     public synchronized void putSession(String appId, SessionContext session) {
         sessionContexts.put(appId, session);
     }

license/src/main/java/iot/sixiang/license/service/impl/DeviceBlackServiceImpl.java

@@ -3,6 +3,7 @@ package iot.sixiang.license.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import iot.sixiang.license.auth.AuthManager;
 import iot.sixiang.license.consts.ResultCode;
+import iot.sixiang.license.device.DeviceManager;
 import iot.sixiang.license.entity.DeviceBlack;
 import iot.sixiang.license.handler.IotLicenseException;
 import iot.sixiang.license.mapper.DeviceBlackMapper;
@@ -42,19 +43,19 @@ public class DeviceBlackServiceImpl extends ServiceImpl<DeviceBlackMapper, Devic
             throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(),ResultCode.VALIDATE_FAILED.getMsg());
         }
         AuthManager authManager = SpringUtil.getBean(AuthManager.class);
-        Map<String, DeviceBlack> deviceBlack = authManager.getDeviceBlack();
-        if (deviceBlack.containsKey(deviceId)) {
+        DeviceManager deviceManager = SpringUtil.getBean(DeviceManager.class);
+        if (authManager.getDeviceBlack().containsKey(deviceId)) {
             throw new IotLicenseException(ResultCode.FAILED.getCode(),ResultCode.FAILED.getMsg());
         }
-        List<DeviceVo> deviceList = deviceMapper.getDeviceList("", "");
+        Map<String, DeviceVo> allDevice = deviceManager.getAllDevice();
         int count = 0;
-        for (DeviceVo deviceVo : deviceList) {
+        for (DeviceVo deviceVo : allDevice.values()) {
             if (deviceVo.getDeviceId() == deviceId){
                 break;
             }
             count++;
         }
-        if (count == deviceList.size()) {
+        if (count == allDevice.size()) {
             throw new IotLicenseException(ResultCode.FAILED.getCode(),ResultCode.FAILED.getMsg());
         }
         boolean res = deviceBlackMapper.addDeviceBlack(deviceId);