diff --git a/src/main/java/com/cisd/tms/modules/mk/dto/MasterKeyActivateInfoResponse.java b/src/main/java/com/cisd/tms/modules/mk/dto/MasterKeyActivateInfoResponse.java index 2896b27..45ca0a7 100644 --- a/src/main/java/com/cisd/tms/modules/mk/dto/MasterKeyActivateInfoResponse.java +++ b/src/main/java/com/cisd/tms/modules/mk/dto/MasterKeyActivateInfoResponse.java @@ -15,7 +15,9 @@ public class MasterKeyActivateInfoResponse { private String version; @Schema(description = "设备序列号", example = "1234567890ABCDEF") private String serialNumber; - @Schema(description = "设备状态:normal/abnormal", example = "normal") + @Schema(description = "管理密钥状态:初始状态/就绪状态", example = "初始状态") + private String masterKeyStatus; + @Schema(description = "设备状态:正常/异常", example = "正常") private String deviceStatus; @Schema(description = "异常原因") private String exceptionMessage; 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 755aa26..8cad805 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 @@ -73,6 +73,14 @@ public class MasterKeyActivateServiceImpl implements MasterKeyActivateService { MasterKeyActivateInfoResponse masterKeyActivateInfo = new MasterKeyActivateInfoResponse(); if (deviceInfoResponse.getMasterKeyStatus()) { + masterKeyActivateInfo.setMasterKeyStatus("就绪状态"); + } else { + masterKeyActivateInfo.setMasterKeyStatus("初始状态"); + } + + MasterKeyActivateEntity masterKeyActivateEntity = masterKeyActivateRepository.find().orElseThrow(() -> new BizException(ErrorCode.VALIDATE_FAILED.getCode(), "激活记录不存在")); + + if (masterKeyActivateEntity.getActivationStatus() || deviceInfoResponse.getMasterKeyStatus()){ masterKeyActivateInfo.setDeviceStatus("正常"); } else { masterKeyActivateInfo.setDeviceStatus("异常"); diff --git a/src/main/resources/db/migration/V1__tms_schema_full.sql b/src/main/resources/db/migration/V1__tms_schema_full.sql index 51a31a5..8d1a83b 100644 --- a/src/main/resources/db/migration/V1__tms_schema_full.sql +++ b/src/main/resources/db/migration/V1__tms_schema_full.sql @@ -730,4 +730,4 @@ CREATE TABLE tms_master_key_activate ( INSERT INTO tms_master_key_activate ( ever_initialized, activation_status -) VALUES (true,false); +) VALUES (true,true);