diff --git a/src/main/java/com/dispose/controller/DisposeInfoController.java b/src/main/java/com/dispose/controller/DisposeInfoController.java index ac351087..8c9b37eb 100644 --- a/src/main/java/com/dispose/controller/DisposeInfoController.java +++ b/src/main/java/com/dispose/controller/DisposeInfoController.java @@ -122,7 +122,7 @@ public class DisposeInfoController { @ApiOperation("获取平台版本信息") public ProtocolRespDTO getPlatformVersionInfo() { GetPlatformVerInfoRsp rspInfo = GetPlatformVerInfoRsp.builder() - .platformVersion(projectGitVersionInfo) + .platVer(projectGitVersionInfo) .build(); rspInfo.setStatus(ErrorCode.ERR_OK.getCode()); rspInfo.setMessage(new String[]{ErrorCode.ERR_OK.getMsg()}); @@ -137,7 +137,7 @@ public class DisposeInfoController { @RequestBody ProtocolReqDTO mr ) { GetDeviceVerInfoRsp rspInfo = GetDeviceVerInfoRsp.builder() - .deviceVersion(new ArrayList<>()) + .items(new ArrayList<>()) .build(); List reqIds = Arrays.stream(mr.getMsgContent().getId()).map(Long::parseLong).collect(Collectors.toList()); @@ -174,7 +174,7 @@ public class DisposeInfoController { dv.setMessage(new String[]{ErrorCode.ERR_NOSUCHDEVICE.getMsg()}); } - rspInfo.getDeviceVersion().add(dv); + rspInfo.getItems().add(dv); })); return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspInfo); diff --git a/src/main/java/com/dispose/pojo/dto/protocol/device/info/DeviceVersionDetail.java b/src/main/java/com/dispose/pojo/dto/protocol/device/info/DeviceVersionDetail.java index cb503ebd..d60a767e 100644 --- a/src/main/java/com/dispose/pojo/dto/protocol/device/info/DeviceVersionDetail.java +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/info/DeviceVersionDetail.java @@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor -@JsonPropertyOrder({"ipAddr", "ipPort", "version", "status", "message"}) +@JsonPropertyOrder({"id", "ipAddr", "ipPort", "version", "status", "message"}) @JsonInclude(JsonInclude.Include.NON_NULL) public class DeviceVersionDetail extends BaseIdResp { /** diff --git a/src/main/java/com/dispose/pojo/dto/protocol/device/info/GetDeviceVerInfoRsp.java b/src/main/java/com/dispose/pojo/dto/protocol/device/info/GetDeviceVerInfoRsp.java index 97207fa7..6c4b5b60 100644 --- a/src/main/java/com/dispose/pojo/dto/protocol/device/info/GetDeviceVerInfoRsp.java +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/info/GetDeviceVerInfoRsp.java @@ -15,10 +15,10 @@ import java.util.List; @Data @Builder @AllArgsConstructor -@JsonPropertyOrder({"deviceVersion", "status", "message"}) +@JsonPropertyOrder({"items", "status", "message"}) public class GetDeviceVerInfoRsp { /** * The Device version. */ - private List deviceVersion; + private List items; } diff --git a/src/main/java/com/dispose/pojo/dto/protocol/device/info/GetPlatformVerInfoRsp.java b/src/main/java/com/dispose/pojo/dto/protocol/device/info/GetPlatformVerInfoRsp.java index 8b971d76..bd840bf5 100644 --- a/src/main/java/com/dispose/pojo/dto/protocol/device/info/GetPlatformVerInfoRsp.java +++ b/src/main/java/com/dispose/pojo/dto/protocol/device/info/GetPlatformVerInfoRsp.java @@ -17,10 +17,10 @@ import lombok.EqualsAndHashCode; @Data @Builder @AllArgsConstructor -@JsonPropertyOrder({"platformVersion", "status", "message"}) +@JsonPropertyOrder({"platVer", "status", "message"}) public class GetPlatformVerInfoRsp extends BaseRespStatus { /** * The Platform version. */ - private ProjectGitVersionInfo platformVersion; + private ProjectGitVersionInfo platVer; }