|
@@ -91,10 +91,16 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
|
|
HashMap<String,AuthorizeCameraDetail> detailHashMap = new HashMap<>();
|
|
HashMap<String,AuthorizeCameraDetail> detailHashMap = new HashMap<>();
|
|
if(param.getId() == null){
|
|
if(param.getId() == null){
|
|
//获取机器UUID,机器名称
|
|
//获取机器UUID,机器名称
|
|
- MachineRegDto machineRegDto = RegCodeUtil.ParseMachineCode(param.getMachineCode());
|
|
|
|
|
|
+ MachineRegDto machineRegDto = null;
|
|
|
|
+ try {
|
|
|
|
+ machineRegDto = RegCodeUtil.ParseMachineCode(param.getMachineCode());
|
|
|
|
+ }catch (Exception e){
|
|
|
|
+ throw new BusinessException(ResultCode.MACHINE_CODE_ERROR);
|
|
|
|
+ }
|
|
if(machineRegDto == null){
|
|
if(machineRegDto == null){
|
|
throw new BusinessException(ResultCode.READ_MACHINE_CODE_ERROR);
|
|
throw new BusinessException(ResultCode.READ_MACHINE_CODE_ERROR);
|
|
}
|
|
}
|
|
|
|
+
|
|
param.setMachineUuid( machineRegDto.getUuid());
|
|
param.setMachineUuid( machineRegDto.getUuid());
|
|
param.setMachineName( machineRegDto.getComputerName());
|
|
param.setMachineName( machineRegDto.getComputerName());
|
|
try {
|
|
try {
|