Sunyard/cisd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:设备激活

Browse Source
This commit is contained in:
xydkj 2026-05-14 17:42:18 +08:00
parent 655c9ea558
commit 9e4ba759e4
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/cisd/tms/modules/mk/dto/MasterKeyActivateInfoResponse.java
View File

@ -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;

8
src/main/java/com/cisd/tms/modules/mk/service/impl/MasterKeyActivateServiceImpl.java
View File

@ -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("异常");

2
src/main/resources/db/migration/V1__tms_schema_full.sql
View File

@ -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);