autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-22 03:55:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix 新电途平台 queryStationStatus接口数据重复异常

Browse Source
This commit is contained in:
Lemon
2024-01-09 09:09:31 +08:00
parent 0a94305d66
commit c6223f96f2
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatusInfo.java vendored
View File

@@ -31,7 +31,7 @@ public class ConnectorStatusInfo {
* 255：故障
*/
@JSONField(name = "Status")
private String status;
private Integer status;
/**
* 车位状态(0-未知；10-空闲；50-占用) N

7
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatusInfo.java vendored
View File

@@ -1,5 +1,6 @@
package com.jsowell.thirdparty.lianlian.domain;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -19,11 +20,13 @@ public class StationStatusInfo {
* 充电站ID Y
* 对接平台自定义的唯一编码，不足长度在前方补0
*/
private String StationID;
@JsonProperty(value = "StationID")
private String stationId;
/**
* 充电设备接口状态列表 Y
* 所有充电设备接口的状态
*/
private List<?> ConnectorStatusInfos;
@JsonProperty(value = "ConnectorStatusInfos")
private List<?> connectorStatusInfos;
}

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

@@ -252,11 +252,10 @@ public class LianLianServiceImpl implements LianLianService {
}
public static void main(String[] args) throws UnsupportedEncodingException {
String dataSecret = "SPBNJ1Z5EQNmpK08"; // SPBNJ1Z5EQNmpK08 VTAEKDPVN9CUS7WO
String dataSecretIV = "peRoTcb2C7zqKeII"; // peRoTcb2C7zqKeII 83UZFFRRZDYNF5CR
String dataSecret = "KnGhAb88GtUEPb0j"; // SPBNJ1Z5EQNmpK08 VTAEKDPVN9CUS7WO
String dataSecretIV = "XZ4wURhuo2y8s4ZS"; // peRoTcb2C7zqKeII 83UZFFRRZDYNF5CR
String signSecret = "sRjCDeokckFGpYpA"; // sRjCDeokckFGpYpA
String dataString = "jLVyZbrFkAVN1LuTZqjxBwvvUo2Du8fT5im8x0Uqvq/7Mo82+pAhpcWqVS//NZKPrxPJvfsjBMHdg4JzUeBGSa0i4Cbkh1mDl4b5mNJDuhAlhEI4fMYj36HIS\n" +
"HHpUsMfpWNpCoPQ6rrUbffqlRZ8q1tJSpYex3lftc1o1zQwHjy1QbELD1MYbReDccS1gItv0sG8FtHaUshT4044dzGo0MAdHbLkDlWguSK70WOfgzc=";
String dataString = "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";
// 解密data
byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes());
@@ -394,7 +393,10 @@ public class LianLianServiceImpl implements LianLianService {
if (configInfo == null) {
return null;
}
ConnectorStatusInfo connectorStatusInfo;
for (String stationId : stationIds) {
StationStatusInfo stationStatusInfo= new StationStatusInfo();
stationStatusInfo.setStationId(stationId);
// 根据站点id查询
List<ConnectorInfoVO> list = pileConnectorInfoService.getConnectorListForLianLian(Long.parseLong(stationId));
for (ConnectorInfoVO connectorInfoVO : list) {
@@ -428,18 +430,15 @@ public class LianLianServiceImpl implements LianLianService {
}
} else {
// 其他
ConnectorStatusInfo info = new ConnectorStatusInfo();
info.setConnectorID(connectorInfoVO.getPileConnectorCode());
info.setStatus(connectorInfoVO.getConnectorStatus());
connectorStatusInfo = new ConnectorStatusInfo();
connectorStatusInfo.setConnectorID(connectorInfoVO.getPileConnectorCode());
connectorStatusInfo.setStatus(Integer.parseInt(connectorInfoVO.getConnectorStatus()));
ConnectorStatusInfos.add(info);
ConnectorStatusInfos.add(connectorStatusInfo);
}
StationStatusInfo stationStatusInfo = new StationStatusInfo();
stationStatusInfo.setStationID(connectorInfoVO.getStationId());
stationStatusInfo.setConnectorStatusInfos(ConnectorStatusInfos);
StationStatusInfos.add(stationStatusInfo);
}
stationStatusInfo.setConnectorStatusInfos(ConnectorStatusInfos);
StationStatusInfos.add(stationStatusInfo);
}
// 将 StationStatusInfos 分页
int pageNum = 1;
@@ -929,7 +928,7 @@ public class LianLianServiceImpl implements LianLianService {
String url = urlAddress + "notification_stationStatus";
ConnectorStatusInfo info = ConnectorStatusInfo.builder()
.connectorID(pileConnectorCode)
.status(status)
.status(Integer.parseInt(status))
.build();
// 调用联联平台接口
JSONObject json = new JSONObject();