From 0dadf5d3b4f2ffa90a08dee06810ccb680e68545 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 29 Jul 2022 11:04:39 +0800
Subject: [PATCH] weizhitiaozheng

---
 .../com/epmet/plugin/power/dto/visit/DhTokenDTO.java}    | 5 ++---
 .../plugin/power/modules/visit/utils/DhDeviceUtil.java   | 9 +++++----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename epmet-plugins-module/pli-power-base/{pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhToken.java => pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/DhTokenDTO.java} (75%)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhToken.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/DhTokenDTO.java
similarity index 75%
rename from epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhToken.java
rename to epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/DhTokenDTO.java
index 8878bb4..bd9732d 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhToken.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/DhTokenDTO.java
@@ -1,8 +1,7 @@
-package com.epmet.plugin.power.modules.visit.utils;
+package com.epmet.plugin.power.dto.visit;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 
@@ -13,7 +12,7 @@ import java.io.Serializable;
  * @since v1.0.0 2022-04-22
  */
 @Data
-public class DhToken implements Serializable {
+public class DhTokenDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java
index d12936f..ba5dbdd 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java
@@ -11,6 +11,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.plugin.commons.redis.RedisKeys;
 import com.epmet.plugin.power.config.DhCloudProperties;
+import com.epmet.plugin.power.dto.visit.DhTokenDTO;
 import com.epmet.plugin.power.dto.visit.form.DhAuthFormDTO;
 import com.epmet.plugin.power.dto.visit.form.DhPersonCardFormDTO;
 import com.epmet.plugin.power.dto.visit.form.DhPersonFormDTO;
@@ -101,11 +102,11 @@ public class DhDeviceUtil {
      * @author zhy
      * @date 2022/5/20 16:40
      */
-    public DhToken getLoginPass(String publicKey) {
+    public DhTokenDTO getLoginPass(String publicKey) {
         String key = RedisKeys.getDhToken();
         Object obj = redisUtils.get(key);
         if (null != obj) {
-            return (DhToken) obj;
+            return (DhTokenDTO) obj;
         }
 
         String url = dhCloudProperties.getUrl().concat(GET_LOGIN_PASS);
@@ -122,7 +123,7 @@ public class DhDeviceUtil {
         if (!toResult.containsKey("token")) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "loginPass获取失败");
         }
-        DhToken token = new DhToken();
+        DhTokenDTO token = new DhTokenDTO();
         token.setId(toResult.get("id").toString());
         token.setLoginName(toResult.get("loginName").toString());
         token.setPublicKey(toResult.get("publicKey").toString());
@@ -503,7 +504,7 @@ public class DhDeviceUtil {
      * @date 2022/7/28 16:09
      */
     private String getDhUrlParams() {
-        DhToken token = getLoginPass(getPublicKey());
+        DhTokenDTO token = getLoginPass(getPublicKey());
         return "?userId=" + token.getId() + "&username=" + token.getLoginName() + "&token=" + token.getToken();
     }