autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-07 15:38:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix 新电途平台接口

Browse Source
This commit is contained in:
Lemon
2024-01-12 11:37:13 +08:00
parent ed47e1e1e0
commit ed65fe734e
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaWeiService.java vendored
View File

@@ -34,4 +34,8 @@ public interface HuaWeiService {
* @param dto * @param dto
*/ */
Map<String, String> checkoutSign(CommonParamsDTO dto); Map<String, String> checkoutSign(CommonParamsDTO dto);
} }

10
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java vendored
View File

@@ -255,8 +255,8 @@ public class LianLianServiceImpl implements LianLianService {
String dataSecret = "KnGhAb88GtUEPb0j"; // SPBNJ1Z5EQNmpK08 VTAEKDPVN9CUS7WO String dataSecret = "KnGhAb88GtUEPb0j"; // SPBNJ1Z5EQNmpK08 VTAEKDPVN9CUS7WO
String dataSecretIV = "XZ4wURhuo2y8s4ZS"; // peRoTcb2C7zqKeII 83UZFFRRZDYNF5CR String dataSecretIV = "XZ4wURhuo2y8s4ZS"; // peRoTcb2C7zqKeII 83UZFFRRZDYNF5CR
String signSecret = "sRjCDeokckFGpYpA"; // sRjCDeokckFGpYpA String signSecret = "sRjCDeokckFGpYpA"; // sRjCDeokckFGpYpA
String dataString = "pZLkdIJdqGhgVcTEhSQXv7VBj9jRQ+Cjy49RPHeuFkHPOx+D8XLNGFhB/6ZdNDx3D3NEjNx3ua0sTLGv3bC5PkRw2FMiAEA8uM4N6RzDLvoU4C7DnH+gAvpfTocaU1FudrWo2AYme\n" + String dataString = "pZLkdIJdqGhgVcTEhSQXv7VBj9jRQ+Cjy49RPHeuFkE4vtwhn2Klzpy/2UjUNWnAZWZwTTllk6ZuUKWfkmMR0N4XtgtN566HyNHvPM37xRBfdqpBg/SVePoVuD3gdI/HaYcXs4TjTcEHqYYr\n" +
"16T37pVsoN5Ztq5RflzYR2utOY2lwFKAHcTqS6Mk1wMW3FZiIB2SbBL+ANRANfmqwVXN8qdJ0MwifuEZZHhZlcdQf7KoQnuMYf4MS1fjGvg3l6R7a8DxvE7WC0WskINuIyq0m9sBPPww4BidRzJdCBSaamiFlzuKzY18p1eFfyjU9mZoe5R3sQze9gBCs1Uj0/dPDXeQOOscmEWs8Fd2mIxaoatUNbhrxekISxpIVhf3bC/nSGWU+F5Qo4x9alm1UcTr6xGZOHr2PejOLxYJKYgt2rNpbQUh+c="; "NeE8FLFw32mz8diZEfR25VldCsQEBHYkpZmcKuRm1CP1lV2f";
// 解密data // 解密data
byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); 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())) // 开始时间 .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderInfo.getChargeStartTime())) // 开始时间
.endTime(DateUtils.getDateTime()) // 本次采样时间 .endTime(DateUtils.getDateTime()) // 本次采样时间
.totalPower(new BigDecimal(data.getChargingDegree()).setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计充电量 .totalPower(new BigDecimal(data.getChargingDegree()).setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计充电量
.elecMoney(totalElectricityAmount.setScale(4, BigDecimal.ROUND_HALF_UP)) // 累计电费 .elecMoney(totalElectricityAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计电费
.seviceMoney(totalServiceAmount.setScale(4, BigDecimal.ROUND_HALF_UP)) // 累计服务费 .seviceMoney(totalServiceAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计服务费
.totalMoney(new BigDecimal(data.getChargingAmount())) // 已充金额 .totalMoney(new BigDecimal(data.getChargingAmount())) // 已充金额
.build(); .build();
@@ -1145,7 +1145,7 @@ public class LianLianServiceImpl implements LianLianService {
json.put("StartChargeSeq", orderCode); json.put("StartChargeSeq", orderCode);
json.put("ConnectorID", orderInfo.getPileConnectorCode()); json.put("ConnectorID", orderInfo.getPileConnectorCode());
json.put("StartChargeSeqStat", 2); // 一定要给 2-充电中 json.put("StartChargeSeqStat", 2); // 一定要给 2-充电中
json.put("StartTime", orderInfo.getChargeStartTime()); json.put("StartTime", DateUtils.getDateTime());
String jsonString = JSONObject.toJSONString(json); String jsonString = JSONObject.toJSONString(json);

17
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/HttpRequestUtil.java vendored
View File

@@ -3,6 +3,8 @@ package com.jsowell.thirdparty.lianlian.util;
import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.google.common.collect.Maps; 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.DateUtils;
import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.StringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -91,7 +93,7 @@ public class HttpRequestUtil {
} }
/** /**
* 联联平台发送请求 * 发送请求
* *
* @param token 联联平台令牌 * @param token 联联平台令牌
* @param data 要传输的JsonString格式数据 * @param data 要传输的JsonString格式数据
@@ -104,12 +106,15 @@ public class HttpRequestUtil {
*/ */
public static String sendPost(String token, String data, String url, String dataSecret, public static String sendPost(String token, String data, String url, String dataSecret,
String dataSecretIV, String operatorId, String sigSecret){ 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(), byte[] encryptText = Cryptos.aesEncrypt(data.getBytes(),
dataSecret.getBytes(), dataSecretIV.getBytes()); dataSecret.getBytes(), dataSecretIV.getBytes());
String encryptData = Encodes.encodeBase64(encryptText); String encryptData = Encodes.encodeBase64(encryptText);
log.info("联联平台发送请求 加密数据:" + encryptData); log.info(label + "发送请求 加密数据:" + encryptData);
Map<String, String> params = Maps.newLinkedHashMap(); Map<String, String> params = Maps.newLinkedHashMap();
params.put("OperatorID", operatorId); params.put("OperatorID", operatorId);
@@ -120,7 +125,7 @@ public class HttpRequestUtil {
params.put("Sig", sign); params.put("Sig", sign);
String postData = JSON.toJSONString(params); String postData = JSON.toJSONString(params);
log.info("联联平台发送请求 最终提交数据:{}, 加密数据:{}", params, postData); log.info(label + "发送请求 最终提交数据:{}, 加密数据:{}", params, postData);
// System.out.println("最终提交数据:" + postData); // System.out.println("最终提交数据:" + postData);
String hutoolRequest = HttpRequest.post(url).header("Authorization", "Bearer " + token).body(postData).execute().body(); 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"); String resultMsg = (String) map.get("Msg");
if (ret != 0) { if (ret != 0) {
// 表示请求有异常 // 表示请求有异常
log.error("联联平台发送请求 error:{}, 源数据:{}", resultMsg, data); log.error(label + "发送请求 error:{}, 源数据:{}", resultMsg, data);
return resultMsg; return resultMsg;
} }
String rData = (String) map.get("Data"); String rData = (String) map.get("Data");
@@ -151,7 +156,7 @@ public class HttpRequestUtil {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
log.info("联联平台发送请求 返回数据map:{}, 解密数据:{}", JSON.toJSONString(map), plainData); log.info(label + "发送请求 返回数据map:{}, 解密数据:{}", JSON.toJSONString(map), plainData);
return resultMsg; return resultMsg;
} }