From 1cf38cd8e480b537d89b00cc15604ed272c931e0 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Thu, 23 Nov 2023 11:46:11 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=94=AC=E5=9F=8E=E6=B3=8A=E8=BD=A6=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BB=A4=E7=89=8C=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yongchengboche/YCBCController.java        | 19 +++++++++++++++++++
 .../service/impl/YCBCServiceImpl.java         | 13 ++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java b/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java
index a26341a3a..6c36d01d6 100644
--- a/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/thirdparty/yongchengboche/YCBCController.java
@@ -14,6 +14,7 @@ import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.service.LianLianService;
 import com.jsowell.thirdparty.lianlian.util.Cryptos;
 import com.jsowell.thirdparty.lianlian.util.Encodes;
+import com.jsowell.thirdparty.yongchengboche.dto.YCBCGetTokenDTO;
 import com.jsowell.thirdparty.yongchengboche.service.YCBCService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,24 @@ public class YCBCController extends BaseController {
         }
     }
 
+    /**
+     * 获取token接口
+     * http://localhost:8080/ycbc/v1/query_token
+     */
+    @PostMapping("/v1/ycbcQuery_token")
+    public String ycbcQueryToken(@RequestBody YCBCGetTokenDTO dto) {
+        logger.info("请求甬城泊车平台令牌 params:{}", JSONObject.toJSONString(dto));
+        String token = "";
+        try {
+            token = ycbcService.YCBCGetToken(dto);
+            logger.info("请求甬城泊车平台令牌 result:{}", token);
+        } catch (Exception e) {
+            logger.error("请求甬城泊车平台令牌接口 异常");
+            return "";
+        }
+        return token;
+    }
+
 
     /**
      * 甬城泊车平台查询充电站信息
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java
index ec81e75bd..0e24482c5 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java
@@ -3,6 +3,7 @@ package com.jsowell.thirdparty.yongchengboche.service.impl;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
@@ -116,19 +117,21 @@ public class YCBCServiceImpl implements YCBCService {
                 byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64((String) result.getData()),
                         dataSecret.getBytes(), dataSecretIv.getBytes());
                 String dataStr = new String(plainText, "UTF-8");
-                Map<String, String> resultMap = (Map<String, String>) JSON.parse(dataStr);
-                int succStat = Integer.parseInt(resultMap.get("SuccStat"));
+                JSONObject resultJson = (JSONObject) JSON.parse(dataStr);
+                logger.info("获取甬城泊车平台令牌 resultJson:{}", resultJson);
+                int succStat = resultJson.getInteger("SuccStat");
                 if (succStat != 0) {
                     logger.error("获取甬城泊车平台令牌 error:{}", result.getMsg());
                     return token;
                 }
-                token = resultMap.get("AccessToken");
+                token = resultJson.getString("AccessToken");
                 logger.info("甬城泊车 token: {}", token);
                 // 存入缓存
-                int tokenAvailableTime = Integer.parseInt(resultMap.get("TokenAvailableTime"));
-                redisCache.setCacheObject(redisKey, token, tokenAvailableTime, TimeUnit.SECONDS);
+                long tokenAvailableTime = resultJson.getLong("TokenAvailableTime");
+                redisCache.setCacheObject(redisKey, token, (int) tokenAvailableTime, TimeUnit.SECONDS);
             }
         } catch (Exception e) {
+            logger.error("获取甬城泊车平台令牌 error:", e);
             return token;
         }
         return token;