From 31265036f03d9131c100d3dee81e4d2605ef09cd Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Sat, 9 Oct 2021 10:47:48 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E5=A4=84=E4=BB=A3=E7=A0=81=E6=A3=80=E6=B5=8B=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ability/impl/PengXinAbilityImpl.java      | 55 ++++++++++---------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
index 65175e3f..1a555458 100644
--- a/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
+++ b/src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
@@ -172,12 +172,12 @@ public class PengXinAbilityImpl implements DisposeAbility {
             }
 
             reqItems.add(PengXinStartTaskItem.builder()
-                    .type(getPengXinTaskType(capType))
-                    .disposeObject(disposeObject)
-                    .objectType(getPengXinObjectType(objectType))
-                    .disposeTime(duration)
-                    .taskReqId(String.valueOf(taskReqId++))
-                    .build());
+                                 .type(getPengXinTaskType(capType))
+                                 .disposeObject(disposeObject)
+                                 .objectType(getPengXinObjectType(objectType))
+                                 .disposeTime(duration)
+                                 .taskReqId(String.valueOf(taskReqId++))
+                                 .build());
 
             ProtocolRespDTO<PengXinStartTaskRsp> rspInfo = restfulInterface.startDisposeTask(url, token, reqItems);
 
@@ -245,7 +245,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
             }
 
             ProtocolRespDTO<PengXinStopTaskRsp> rspInfo = restfulInterface.stopDisposeTask(url, token,
-                    new String[]{taskId});
+                                                                                           new String[]{taskId});
 
             // 判断是否token过期
             if (rspInfo != null && reLogin(rspInfo, rspInfo.getMsgContent().getItems().get(0).getStatus())) {
@@ -285,18 +285,18 @@ public class PengXinAbilityImpl implements DisposeAbility {
     @Override
     public MulReturnType<ErrorCode, DeviceFirewareInfo> getAbilityDeviceFireware() {
         return new MulReturnType<>(ErrorCode.ERR_OK,
-                DeviceFirewareInfo.builder()
-                        .vendor("PengXin")
-                        .model("Unknown")
-                        .firmware("Unknown")
-                        .os("Linux Server")
-                        .kernel("Linux")
-                        .arch("x86_64")
-                        .version("Unknown")
-                        .memory(-1)
-                        .freeMemory(-1)
-                        .cpuUsed(-1)
-                        .build());
+                                   DeviceFirewareInfo.builder()
+                                           .vendor("PengXin")
+                                           .model("Unknown")
+                                           .firmware("Unknown")
+                                           .os("Linux Server")
+                                           .kernel("Linux")
+                                           .arch("x86_64")
+                                           .version("Unknown")
+                                           .memory(-1)
+                                           .freeMemory(-1)
+                                           .cpuUsed(-1)
+                                           .build());
     }
 
     /**
@@ -459,7 +459,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
             String url = urlRootPath + "dispose_device/task/get";
 
             ProtocolRespDTO<PengXinTaskStatusRsp> rspInfo = restfulInterface.getDeviceTaskStatus(url, token,
-                    new String[]{taskId});
+                                                                                                 new String[]{taskId});
 
             // 判断是否token过期
             if (rspInfo != null && reLogin(rspInfo, rspInfo.getMsgContent().getItems().get(0).getStatus())) {
@@ -474,7 +474,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
                 }
 
                 return new MulReturnType<>(ErrorCode.ERR_OK,
-                        rspInfo.getMsgContent().getItems().get(0).getTaskStatus());
+                                           rspInfo.getMsgContent().getItems().get(0).getTaskStatus());
             } else {
                 return new MulReturnType<>(ErrorCode.ERR_CALLDEVICE, -1L);
             }
@@ -510,12 +510,15 @@ public class PengXinAbilityImpl implements DisposeAbility {
                 return true;
             }
 
-            if (rspInfo.getCode() == HttpServletResponse.SC_OK &&
-                    (status == ErrorCode.ERR_LOGOUT.getCode() || status == ErrorCode.ERR_TOKENTIMEOUT.getCode() ||
-                            status == ErrorCode.ERR_TOKENNOTFOUND.getCode())) {
-                upgradeToken();
-                return true;
+            if (rspInfo.getCode() == HttpServletResponse.SC_OK) {
+                if (status == ErrorCode.ERR_LOGOUT.getCode() ||
+                        status == ErrorCode.ERR_TOKENTIMEOUT.getCode() ||
+                        status == ErrorCode.ERR_TOKENNOTFOUND.getCode()) {
+                    upgradeToken();
+                    return true;
+                }
             }
+
             return false;
         } catch (Exception ignored) {
             return false;