Merge branch 'm33' into 'master'

完善添加黑名单接口

See merge request !31

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

@@ -6,7 +6,9 @@ import iot.sixiang.license.consts.ResultCode;
 import iot.sixiang.license.entity.DeviceBlack;
 import iot.sixiang.license.handler.IotLicenseException;
 import iot.sixiang.license.mapper.DeviceBlackMapper;
+import iot.sixiang.license.mapper.DeviceMapper;
 import iot.sixiang.license.model.PageInfoModel;
+import iot.sixiang.license.model.vo.DeviceVo;
 import iot.sixiang.license.service.DeviceBlackService;
 import iot.sixiang.license.util.SpringUtil;
 import org.springframework.stereotype.Service;
@@ -15,6 +17,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -30,6 +33,8 @@ public class DeviceBlackServiceImpl extends ServiceImpl<DeviceBlackMapper, Devic
 
     @Resource
     private DeviceBlackMapper deviceBlackMapper;
+    @Resource
+    private DeviceMapper deviceMapper;
 
     @Override
     public boolean addDeviceBlack(int deviceId) {
@@ -37,7 +42,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);
-        if (authManager.getDeviceBlack().containsKey(deviceId)) {
+        Map<String, DeviceBlack> deviceBlack = authManager.getDeviceBlack();
+        if (deviceBlack.containsKey(deviceId)) {
+            throw new IotLicenseException(ResultCode.FAILED.getCode(),ResultCode.FAILED.getMsg());
+        }
+        List<DeviceVo> deviceList = deviceMapper.getDeviceList("", "");
+        int count = 0;
+        for (DeviceVo deviceVo : deviceList) {
+            if (deviceVo.getDeviceId() == deviceId){
+                break;
+            }
+            count++;
+        }
+        if (count == deviceList.size()) {
             throw new IotLicenseException(ResultCode.FAILED.getCode(),ResultCode.FAILED.getMsg());
         }
         boolean res = deviceBlackMapper.addDeviceBlack(deviceId);