From dac28e2ccfbc2af9c38c387820ace301a2aaee84 Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Fri, 4 Sep 2020 21:21:55 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E6=9B=B4=E6=AD=A3=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=202.=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AD=97=E6=AE=B5JSON=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dispose/controller/DisposeInfoController.java  | 6 +++---
 .../pojo/dto/protocol/device/info/DeviceVersionDetail.java  | 2 +-
 .../pojo/dto/protocol/device/info/GetDeviceVerInfoRsp.java  | 4 ++--
 .../dto/protocol/device/info/GetPlatformVerInfoRsp.java     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

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