|
@@ -2,6 +2,7 @@ package cn.com.qmth.scancentral.service.impl;
|
|
|
|
|
|
import cn.com.qmth.scancentral.bean.ScannerLoginInfo;
|
|
import cn.com.qmth.scancentral.bean.ScannerLoginInfo;
|
|
import cn.com.qmth.scancentral.bean.User;
|
|
import cn.com.qmth.scancentral.bean.User;
|
|
|
|
+import cn.com.qmth.scancentral.entity.ScannerEntity;
|
|
import cn.com.qmth.scancentral.entity.SystemConfigEntity;
|
|
import cn.com.qmth.scancentral.entity.SystemConfigEntity;
|
|
import cn.com.qmth.scancentral.entity.UserEntity;
|
|
import cn.com.qmth.scancentral.entity.UserEntity;
|
|
import cn.com.qmth.scancentral.enums.Role;
|
|
import cn.com.qmth.scancentral.enums.Role;
|
|
@@ -92,7 +93,10 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
|
|
if (StringUtils.isBlank(loginInfo.getDeviceName())) {
|
|
if (StringUtils.isBlank(loginInfo.getDeviceName())) {
|
|
throw new ParameterException("deviceName不能为空");
|
|
throw new ParameterException("deviceName不能为空");
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ ScannerEntity scanner = scannerService.findByDeviceName(loginInfo.getDeviceName());
|
|
|
|
+ if(scanner!=null){
|
|
|
|
+ throw new ParameterException("deviceName已存在");
|
|
|
|
+ }
|
|
SystemConfigEntity config = systemConfigService.find();
|
|
SystemConfigEntity config = systemConfigService.find();
|
|
if (config != null) {
|
|
if (config != null) {
|
|
if (config.getScannerEnableLogin() != null && !config.getScannerEnableLogin()) {
|
|
if (config.getScannerEnableLogin() != null && !config.getScannerEnableLogin()) {
|