diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java index 84206e93d..3e41bcdb0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java @@ -379,8 +379,6 @@ public class LianLianController extends BaseController { // 查询配置信息 ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); - String operatorSecret = platformConfig.getOperatorSecret(); - String dataString = dto.getData(); String dataSecret = platformConfig.getDataSecret(); String dataSecretIV = platformConfig.getDataSecretIv(); @@ -393,7 +391,6 @@ public class LianLianController extends BaseController { queryEquipmentDTO.setOperatorID(dto.getOperatorID()); // Map map = lianLianService.query_equip_auth(queryEquipmentDTO); Map map = lianLianService.queryEquipAuth(queryEquipmentDTO); - return CommonResult.success(0, "请求设备认证成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { logger.error("联联平台请求设备认证 error:", e); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 134c5085a..ec244f800 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -464,9 +464,6 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService { MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation(); memberPlateNumberRelation.setMemberId(memberId); List list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation); - // List plateNumberList = list.stream() - // .map(MemberPlateNumberRelation::getLicensePlateNumber) - // .collect(Collectors.toList()); List plateNumberList = new ArrayList<>(); List vinCodeList = new ArrayList<>(); for (MemberPlateNumberRelation relation : list) { diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java index 71cfaec3a..a8dbd4af8 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/lianlian/service/LianLianPlatformServiceImpl.java @@ -922,7 +922,10 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // 根据桩编号查询数据 // String merchantId = StringUtils.substring(equipAuthSeq, 0, 9); 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); 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_APPOINTMENT_LOCK.getValue(), String.valueOf(connectorInfo.getStatus())) ) { - vo.setSuccStat(0); - vo.setFailReason(0); + succStat = 0; + failReason = 0; } else { - vo.setSuccStat(1); - vo.setFailReason(1); // 1- 此设备尚未插枪; + succStat = 1; + // 1- 此设备尚未插枪; + failReason = 1; } - vo.setFailReasonMsg(""); vo.setEquipAuthSeq(equipAuthSeq); vo.setConnectorID(pileConnectorCode); } 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(), configInfo.getDataSecret().getBytes(), configInfo.getDataSecretIv().getBytes());