From ed65fe734ee16d28b9cf451052078fa25b846ff0 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 12 Jan 2024 11:37:13 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E6=96=B0=E7=94=B5=E9=80=94?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/huawei/HuaWeiService.java | 4 ++++ .../service/impl/LianLianServiceImpl.java | 10 +++++----- .../lianlian/util/HttpRequestUtil.java | 17 +++++++++++------ 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaWeiService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaWeiService.java index d4bebdb35..4a8d1cbc2 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaWeiService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaWeiService.java @@ -34,4 +34,8 @@ public interface HuaWeiService { * @param dto */ Map checkoutSign(CommonParamsDTO dto); + + + + } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index dc1d84d8e..50c412737 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -255,8 +255,8 @@ public class LianLianServiceImpl implements LianLianService { String dataSecret = "KnGhAb88GtUEPb0j"; // SPBNJ1Z5EQNmpK08 VTAEKDPVN9CUS7WO String dataSecretIV = "XZ4wURhuo2y8s4ZS"; // peRoTcb2C7zqKeII 83UZFFRRZDYNF5CR String signSecret = "sRjCDeokckFGpYpA"; // sRjCDeokckFGpYpA - String dataString = "pZLkdIJdqGhgVcTEhSQXv7VBj9jRQ+Cjy49RPHeuFkHPOx+D8XLNGFhB/6ZdNDx3D3NEjNx3ua0sTLGv3bC5PkRw2FMiAEA8uM4N6RzDLvoU4C7DnH+gAvpfTocaU1FudrWo2AYme\n" + - "16T37pVsoN5Ztq5RflzYR2utOY2lwFKAHcTqS6Mk1wMW3FZiIB2SbBL+ANRANfmqwVXN8qdJ0MwifuEZZHhZlcdQf7KoQnuMYf4MS1fjGvg3l6R7a8DxvE7WC0WskINuIyq0m9sBPPww4BidRzJdCBSaamiFlzuKzY18p1eFfyjU9mZoe5R3sQze9gBCs1Uj0/dPDXeQOOscmEWs8Fd2mIxaoatUNbhrxekISxpIVhf3bC/nSGWU+F5Qo4x9alm1UcTr6xGZOHr2PejOLxYJKYgt2rNpbQUh+c="; + String dataString = "pZLkdIJdqGhgVcTEhSQXv7VBj9jRQ+Cjy49RPHeuFkE4vtwhn2Klzpy/2UjUNWnAZWZwTTllk6ZuUKWfkmMR0N4XtgtN566HyNHvPM37xRBfdqpBg/SVePoVuD3gdI/HaYcXs4TjTcEHqYYr\n" + + "NeE8FLFw32mz8diZEfR25VldCsQEBHYkpZmcKuRm1CP1lV2f"; // 解密data byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); @@ -770,8 +770,8 @@ public class LianLianServiceImpl implements LianLianService { .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderInfo.getChargeStartTime())) // 开始时间 .endTime(DateUtils.getDateTime()) // 本次采样时间 .totalPower(new BigDecimal(data.getChargingDegree()).setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计充电量 - .elecMoney(totalElectricityAmount.setScale(4, BigDecimal.ROUND_HALF_UP)) // 累计电费 - .seviceMoney(totalServiceAmount.setScale(4, BigDecimal.ROUND_HALF_UP)) // 累计服务费 + .elecMoney(totalElectricityAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计电费 + .seviceMoney(totalServiceAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计服务费 .totalMoney(new BigDecimal(data.getChargingAmount())) // 已充金额 .build(); @@ -1145,7 +1145,7 @@ public class LianLianServiceImpl implements LianLianService { json.put("StartChargeSeq", orderCode); json.put("ConnectorID", orderInfo.getPileConnectorCode()); json.put("StartChargeSeqStat", 2); // 一定要给 2-充电中 - json.put("StartTime", orderInfo.getChargeStartTime()); + json.put("StartTime", DateUtils.getDateTime()); String jsonString = JSONObject.toJSONString(json); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java index daba3ff8c..169e3ea69 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java @@ -3,6 +3,8 @@ package com.jsowell.thirdparty.lianlian.util; import cn.hutool.http.HttpRequest; import com.alibaba.fastjson2.JSON; import com.google.common.collect.Maps; +import com.jsowell.common.enums.thirdparty.ThirdPartyOperatorIdEnum; +import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import lombok.extern.slf4j.Slf4j; @@ -91,7 +93,7 @@ public class HttpRequestUtil { } /** - * 联联平台发送请求 + * 发送请求 * * @param token 联联平台令牌 * @param data 要传输的JsonString格式数据 @@ -104,12 +106,15 @@ public class HttpRequestUtil { */ public static String sendPost(String token, String data, String url, String dataSecret, String dataSecretIV, String operatorId, String sigSecret){ - log.info("联联平台发送请求 data:{}", data); + String type = ThirdPartyOperatorIdEnum.getTypeByOperatorId(operatorId); + String label = ThirdPlatformTypeEnum.getLabelByCode(type); + + log.info(label + "发送请求 data:{}", data); //加密 byte[] encryptText = Cryptos.aesEncrypt(data.getBytes(), dataSecret.getBytes(), dataSecretIV.getBytes()); String encryptData = Encodes.encodeBase64(encryptText); - log.info("联联平台发送请求 加密数据:" + encryptData); + log.info(label + "发送请求 加密数据:" + encryptData); Map params = Maps.newLinkedHashMap(); params.put("OperatorID", operatorId); @@ -120,7 +125,7 @@ public class HttpRequestUtil { params.put("Sig", sign); String postData = JSON.toJSONString(params); - log.info("联联平台发送请求 最终提交数据:{}, 加密数据:{}", params, postData); + log.info(label + "发送请求 最终提交数据:{}, 加密数据:{}", params, postData); // System.out.println("最终提交数据:" + postData); String hutoolRequest = HttpRequest.post(url).header("Authorization", "Bearer " + token).body(postData).execute().body(); @@ -138,7 +143,7 @@ public class HttpRequestUtil { String resultMsg = (String) map.get("Msg"); if (ret != 0) { // 表示请求有异常 - log.error("联联平台发送请求 error:{}, 源数据:{}", resultMsg, data); + log.error(label + "发送请求 error:{}, 源数据:{}", resultMsg, data); return resultMsg; } String rData = (String) map.get("Data"); @@ -151,7 +156,7 @@ public class HttpRequestUtil { } catch (Exception e) { e.printStackTrace(); } - log.info("联联平台发送请求 返回数据map:{}, 解密数据:{}", JSON.toJSONString(map), plainData); + log.info(label + "发送请求 返回数据map:{}, 解密数据:{}", JSON.toJSONString(map), plainData); return resultMsg; }