cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. 更正获取版本信息接口字段名称
2. 更新获取版本信息接口字段JSON排序
This commit is contained in:
HuangXin 2020-09-04 21:21:55 +08:00
parent c125e5fa43
commit dac28e2ccf
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/dispose/controller/DisposeInfoController.java
View File

@ -122,7 +122,7 @@ public class DisposeInfoController {
@ApiOperation("获取平台版本信息") @ApiOperation("获取平台版本信息")
public ProtocolRespDTO<GetPlatformVerInfoRsp> getPlatformVersionInfo() { public ProtocolRespDTO<GetPlatformVerInfoRsp> getPlatformVersionInfo() {
GetPlatformVerInfoRsp rspInfo = GetPlatformVerInfoRsp.builder() GetPlatformVerInfoRsp rspInfo = GetPlatformVerInfoRsp.builder()
.platformVersion(projectGitVersionInfo) .platVer(projectGitVersionInfo)
.build(); .build();
rspInfo.setStatus(ErrorCode.ERR_OK.getCode()); rspInfo.setStatus(ErrorCode.ERR_OK.getCode());
rspInfo.setMessage(new String[]{ErrorCode.ERR_OK.getMsg()}); rspInfo.setMessage(new String[]{ErrorCode.ERR_OK.getMsg()});
@ -137,7 +137,7 @@ public class DisposeInfoController {
@RequestBody ProtocolReqDTO<IdArraysReq> mr @RequestBody ProtocolReqDTO<IdArraysReq> mr
) { ) {
GetDeviceVerInfoRsp rspInfo = GetDeviceVerInfoRsp.builder() GetDeviceVerInfoRsp rspInfo = GetDeviceVerInfoRsp.builder()
.deviceVersion(new ArrayList<>()) .items(new ArrayList<>())
.build(); .build();
List<Long> reqIds = Arrays.stream(mr.getMsgContent().getId()).map(Long::parseLong).collect(Collectors.toList()); List<Long> 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()}); dv.setMessage(new String[]{ErrorCode.ERR_NOSUCHDEVICE.getMsg()});
} }
rspInfo.getDeviceVersion().add(dv); rspInfo.getItems().add(dv);
})); }));
return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspInfo); return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspInfo);

2
src/main/java/com/dispose/pojo/dto/protocol/device/info/DeviceVersionDetail.java
View File

@ -19,7 +19,7 @@ import lombok.NoArgsConstructor;
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@JsonPropertyOrder({"ipAddr", "ipPort", "version", "status", "message"}) @JsonPropertyOrder({"id", "ipAddr", "ipPort", "version", "status", "message"})
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
public class DeviceVersionDetail extends BaseIdResp { public class DeviceVersionDetail extends BaseIdResp {
/** /**

4
src/main/java/com/dispose/pojo/dto/protocol/device/info/GetDeviceVerInfoRsp.java
View File

@ -15,10 +15,10 @@ import java.util.List;
@Data @Data
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
@JsonPropertyOrder({"deviceVersion", "status", "message"}) @JsonPropertyOrder({"items", "status", "message"})
public class GetDeviceVerInfoRsp { public class GetDeviceVerInfoRsp {
/** /**
* The Device version. * The Device version.
*/ */
private List<DeviceVersionDetail> deviceVersion; private List<DeviceVersionDetail> items;
} }

4
src/main/java/com/dispose/pojo/dto/protocol/device/info/GetPlatformVerInfoRsp.java
View File

@ -17,10 +17,10 @@ import lombok.EqualsAndHashCode;
@Data @Data
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
@JsonPropertyOrder({"platformVersion", "status", "message"}) @JsonPropertyOrder({"platVer", "status", "message"})
public class GetPlatformVerInfoRsp extends BaseRespStatus { public class GetPlatformVerInfoRsp extends BaseRespStatus {
/** /**
* The Platform version. * The Platform version.
*/ */
private ProjectGitVersionInfo platformVersion; private ProjectGitVersionInfo platVer;
} }