From 929b36d1e3da6662ec8ea926256ad6e9d6897c4b Mon Sep 17 00:00:00 2001 From: xydkj Date: Thu, 21 May 2026 11:48:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E6=BF=80=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MasterKeyActivateServiceImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cisd/tms/modules/mk/service/impl/MasterKeyActivateServiceImpl.java b/src/main/java/com/cisd/tms/modules/mk/service/impl/MasterKeyActivateServiceImpl.java index 6b764ab..16925d2 100644 --- a/src/main/java/com/cisd/tms/modules/mk/service/impl/MasterKeyActivateServiceImpl.java +++ b/src/main/java/com/cisd/tms/modules/mk/service/impl/MasterKeyActivateServiceImpl.java @@ -111,10 +111,22 @@ public class MasterKeyActivateServiceImpl implements MasterKeyActivateService { MasterKeyActivateEntity masterKeyActivateEntity = masterKeyActivateRepository.find().orElseThrow(() -> new BizException(ErrorCode.VALIDATE_FAILED.getCode(), "激活记录不存在")); Boolean everInitialized = masterKeyActivateEntity.getEverInitialized(); + Boolean activationStatus = masterKeyActivateEntity.getActivationStatus(); if (everInitialized) { - throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "从未进行初始化密钥, 无需激活"); + throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "从未进行初始化主密钥, 无需激活"); } + + DeviceInfoResponse deviceInfoResponse = deviceService.info(); + if (deviceInfoResponse.getMasterKeyStatus()){ + throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "设备存在主密钥, 无需激活"); + } + + if (activationStatus) { + throw new BizException(ErrorCode.BIZ_ERROR.getCode(), "设备已激活, 无需激活"); + } + + if (masterKeyActivateRequest.getUserId() == null){ throw new IllegalArgumentException("使用者ID不能为空"); }