OCT

REM:
1. 更正获取版本信息接口字段名称
2. 更新获取版本信息接口字段JSON排序

src/main/java/com/dispose/controller/DisposeInfoController.java

@@ -122,7 +122,7 @@ public class DisposeInfoController {
     @ApiOperation("获取平台版本信息")
     public ProtocolRespDTO<GetPlatformVerInfoRsp> 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<IdArraysReq> mr
     ) {
         GetDeviceVerInfoRsp rspInfo = GetDeviceVerInfoRsp.builder()
-                                                         .deviceVersion(new ArrayList<>())
+                                                         .items(new ArrayList<>())
                                                          .build();
         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()});
                   }
 
-                  rspInfo.getDeviceVersion().add(dv);
+                  rspInfo.getItems().add(dv);
               }));
 
         return ProtocolRespDTO.result(ErrorCode.ERR_OK, rspInfo);

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 {
     /**

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<DeviceVersionDetail> deviceVersion;
+    private List<DeviceVersionDetail> items;
 }

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