Merge branch 'm33' into 'master'

进一步完善添加设备黑名单功能

See merge request !33

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

@@ -48,14 +48,13 @@ public class DeviceBlackServiceImpl extends ServiceImpl<DeviceBlackMapper, Devic
             throw new IotLicenseException(ResultCode.FAILED.getCode(),ResultCode.FAILED.getMsg());
         }
         Map<String, DeviceVo> allDevice = deviceManager.getAllDevice();
-        int count = 0;
+        boolean flag = false;
         for (DeviceVo deviceVo : allDevice.values()) {
             if (deviceVo.getDeviceId() == deviceId){
-                break;
+                flag = true;
             }
-            count++;
         }
-        if (count == allDevice.size()) {
+        if (!flag) {
             throw new IotLicenseException(ResultCode.FAILED.getCode(),ResultCode.FAILED.getMsg());
         }
         boolean res = deviceBlackMapper.addDeviceBlack(deviceId);