From ff8c31c88bd3d81c85180071f31048b7d5c3c10d Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Mon, 27 Jul 2020 14:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0-=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=89=A9=E7=90=86=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/AuthorizationInfoDao.java  |  2 +-
 .../java/com/epmet/dao/ComponentAccessTokenDao.java    |  2 +-
 .../service/impl/ComponentVerifyTicketServiceImpl.java | 10 +++-------
 .../src/main/resources/mapper/AuthorizationInfoDao.xml |  6 +++---
 .../main/resources/mapper/ComponentAccessTokenDao.xml  |  9 +++++----
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java
index f4fde172f6..3d26bcffab 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java
@@ -81,7 +81,7 @@ public interface AuthorizationInfoDao extends BaseDao<AuthorizationInfoEntity> {
      * @param customerId
      * @author zxc
      */
-    void updateOldAuthorizerAccessToken(@Param("customerId")String customerId,@Param("clientType")String clientType);
+    void deleteOldAuthorizerAccessToken(@Param("customerId")String customerId,@Param("clientType")String clientType);
 
     /**
      * @Description  根据 authAppId 查询客户ID和客户端类型
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
index 67d38d540c..10a5710c6e 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
@@ -45,7 +45,7 @@ public interface ComponentAccessTokenDao extends BaseDao<ComponentAccessTokenEnt
      * @param
      * @author zxc
      */
-    void updateOldComponentAccessToken();
+    void deleteOldComponentAccessToken();
 
     /**
      * @Description  查询component_access_token 数量
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
index e46c134759..d00460d8a0 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
@@ -211,7 +211,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                 formDTO.setExpiresInTime(expiresInTime);
                 //先逻辑删，在插入
                 log.info(ThirdRunTimeInfoConstant.START_DELETE_COMPONENT_ACCESS_TOKEN);
-                componentAccessTokenDao.updateOldComponentAccessToken();
+                componentAccessTokenDao.deleteOldComponentAccessToken();
                 componentAccessTokenDao.insertComponentAccessToken(formDTO);
                 //存缓存
                 redisThird.setComponentAccessToken(componentAccessToken);
@@ -348,14 +348,10 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
                     formDTO.setAuthAppid(authAppId);
                     formDTO.setClientType(clientType);
                     AuthorizationInfoFormDTO authorizationInfo = new AuthorizationInfoFormDTO();
+                    BeanUtils.copyProperties(formDTO,authorizationInfo);
                     authorizationInfo.setAuthorizerAppid(authAppId);
-                    authorizationInfo.setClientType(clientType);
-                    authorizationInfo.setCustomerId(customerId);
-                    authorizationInfo.setAuthorizerRefreshToken(authorizerRefreshToken);
-                    authorizationInfo.setAuthorizerAccessToken(authorizerAccessToken);
-                    authorizationInfo.setExpiresInTime(expiresInTime);
                     //先逻辑删除，在插入
-                    authorizationInfoDao.updateOldAuthorizerAccessToken(customerId, clientType);
+                    authorizationInfoDao.deleteOldAuthorizerAccessToken(customerId, clientType);
                     authorizationInfoDao.insertAuthorizerAccessToken(formDTO);
                     //缓存 refreshAuthorizerAccessToken
                     redisThird.setAuthorizerRefreshToken(authorizationInfo);
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
index d8ab9821eb..ec104db583 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
@@ -65,9 +65,9 @@
     </insert>
 
     <!-- 逻辑删 authorizer_access_token -->
-    <update id="updateOldAuthorizerAccessToken">
-        update authorization_info set del_flag = 1 where customer_id = #{customerId} AND client_type = #{clientType}
-    </update>
+    <delete id="deleteOldAuthorizerAccessToken">
+        delete from authorization_info where customer_id = #{customerId} AND client_type = #{clientType}
+    </delete>
 
     <select id="getAuthInfoByCustomer" resultType="com.epmet.dto.AuthorizationInfoDTO">
         SELECT AUTHORIZER_APPID,
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml
index c48019c3a3..3642c1d768 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml
@@ -19,10 +19,11 @@
             )
     </insert>
 
-    <!-- 逻辑删除旧的 component_access_token信息 -->
-    <update id="updateOldComponentAccessToken">
-        update component_access_token set del_flag = 1
-    </update>
+    <!-- 删除旧的 component_access_token信息 -->
+    <delete id="deleteOldComponentAccessToken">
+        delete from component_access_token where del_flag = 0
+    </delete>
+
     <select id="getComponentAccessToken" resultType="java.lang.String">
         SELECT
             COMPONENT_ACCESS_TOKEN