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

update 对接lianlian平台

Browse Source
This commit is contained in:
Guoqs
2024-04-11 16:49:28 +08:00
parent f122208415
commit 5f779eee1f
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java vendored
View File

@@ -379,8 +379,6 @@ public class LianLianController extends BaseController {
// 查询配置信息 // 查询配置信息
ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID());
String operatorSecret = platformConfig.getOperatorSecret();
String dataString = dto.getData();
String dataSecret = platformConfig.getDataSecret(); String dataSecret = platformConfig.getDataSecret();
String dataSecretIV = platformConfig.getDataSecretIv(); String dataSecretIV = platformConfig.getDataSecretIv();
@@ -393,7 +391,6 @@ public class LianLianController extends BaseController {
queryEquipmentDTO.setOperatorID(dto.getOperatorID()); queryEquipmentDTO.setOperatorID(dto.getOperatorID());
// Map<String, String> map = lianLianService.query_equip_auth(queryEquipmentDTO); // Map<String, String> map = lianLianService.query_equip_auth(queryEquipmentDTO);
Map<String, String> map = lianLianService.queryEquipAuth(queryEquipmentDTO); Map<String, String> map = lianLianService.queryEquipAuth(queryEquipmentDTO);
return CommonResult.success(0, "请求设备认证成功！", map.get("Data"), map.get("Sig")); return CommonResult.success(0, "请求设备认证成功！", map.get("Data"), map.get("Sig"));
} catch (Exception e) { } catch (Exception e) {
logger.error("联联平台请求设备认证 error:", e); logger.error("联联平台请求设备认证 error:", e);

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
View File

@@ -464,9 +464,6 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation(); MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation();
memberPlateNumberRelation.setMemberId(memberId); memberPlateNumberRelation.setMemberId(memberId);
List<MemberPlateNumberRelation> list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation); List<MemberPlateNumberRelation> list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation);
// List<String> plateNumberList = list.stream()
// .map(MemberPlateNumberRelation::getLicensePlateNumber)
// .collect(Collectors.toList());
List<String> plateNumberList = new ArrayList<>(); List<String> plateNumberList = new ArrayList<>();
List<String> vinCodeList = new ArrayList<>(); List<String> vinCodeList = new ArrayList<>();
for (MemberPlateNumberRelation relation : list) { for (MemberPlateNumberRelation relation : list) {

23
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java vendored
View File

@@ -922,7 +922,10 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
// 根据桩编号查询数据 // 根据桩编号查询数据
// String merchantId = StringUtils.substring(equipAuthSeq, 0, 9); // String merchantId = StringUtils.substring(equipAuthSeq, 0, 9);
String pileSn = StringUtils.substring(pileConnectorCode, 0, 14); String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);
vo.setSuccStat(1); // 1-失败 0-成功 默认失败 // vo.setSuccStat(1); // 1-失败 0-成功 默认失败
int succStat = 1;
int failReason = 0;
String failReasonMsg = "";
PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn); PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn);
if (pileBasicInfo != null) { if (pileBasicInfo != null) {
// 查询当前枪口数据 // 查询当前枪口数据
@@ -931,19 +934,23 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
|| StringUtils.equals(PileConnectorDataBaseStatusEnum.OCCUPIED_CHARGING.getValue(), String.valueOf(connectorInfo.getStatus())) || StringUtils.equals(PileConnectorDataBaseStatusEnum.OCCUPIED_CHARGING.getValue(), String.valueOf(connectorInfo.getStatus()))
|| StringUtils.equals(PileConnectorDataBaseStatusEnum.OCCUPIED_APPOINTMENT_LOCK.getValue(), String.valueOf(connectorInfo.getStatus())) || StringUtils.equals(PileConnectorDataBaseStatusEnum.OCCUPIED_APPOINTMENT_LOCK.getValue(), String.valueOf(connectorInfo.getStatus()))
) { ) {
vo.setSuccStat(0); succStat = 0;
vo.setFailReason(0); failReason = 0;
} else { } else {
vo.setSuccStat(1); succStat = 1;
vo.setFailReason(1); // 1- 此设备尚未插枪； // 1- 此设备尚未插枪；
failReason = 1;
} }
vo.setFailReasonMsg("");
vo.setEquipAuthSeq(equipAuthSeq); vo.setEquipAuthSeq(equipAuthSeq);
vo.setConnectorID(pileConnectorCode); vo.setConnectorID(pileConnectorCode);
} else { } else {
vo.setFailReason(2); // 设备检测失败 // 设备检测失败
vo.setFailReasonMsg("未查到该桩的数据"); failReason = 2;
failReasonMsg = "未查到该桩的数据";
} }
vo.setSuccStat(succStat);
vo.setFailReason(failReason); // 设备检测失败
vo.setFailReasonMsg(failReasonMsg);
// 加密数据 // 加密数据
byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(), byte[] encryptText = Cryptos.aesEncrypt(JSON.toJSONString(vo).getBytes(),
configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes()); configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes());