autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-12 19:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 扫描二维码充电时判断是否为个人桩

Browse Source
This commit is contained in:
Lemon
2026-06-09 09:03:13 +08:00
parent 45b7908ae6
commit d569f70315
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java
View File

@@ -76,7 +76,7 @@ public class JumpController extends BaseController {
try { try {
// 进入充电桩详情做一下鉴权 // 进入充电桩详情做一下鉴权
String memberId = getMemberIdByAuthorization(request); String memberId = getMemberIdByAuthorization(request);
AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn); AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn, memberId);
addMember2MemberGroup(memberId, vo); addMember2MemberGroup(memberId, vo);
response = new RestApiResponse<>(vo); response = new RestApiResponse<>(vo);
} catch (BusinessException e) { } catch (BusinessException e) {
@@ -114,7 +114,7 @@ public class JumpController extends BaseController {
try { try {
// 进入充电桩详情做一下鉴权 // 进入充电桩详情做一下鉴权
String memberId = getMemberIdByAuthorization(request); String memberId = getMemberIdByAuthorization(request);
AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn); AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn, memberId);
addMember2MemberGroup(memberId, vo); addMember2MemberGroup(memberId, vo);
response = new RestApiResponse<>(vo); response = new RestApiResponse<>(vo);
} catch (BusinessException e) { } catch (BusinessException e) {

4
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java
View File

@@ -42,7 +42,7 @@ public class JumpXixiaoController extends BaseController {
logger.info("User-Agent:{}", request.getHeader("user-agent")); logger.info("User-Agent:{}", request.getHeader("user-agent"));
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
try { try {
AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn); AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn, null);
response = new RestApiResponse<>(vo); response = new RestApiResponse<>(vo);
} catch (BusinessException e) { } catch (BusinessException e) {
logger.warn("app-xcx-h5查询充电桩详情 warn", e); logger.warn("app-xcx-h5查询充电桩详情 warn", e);
@@ -65,7 +65,7 @@ public class JumpXixiaoController extends BaseController {
logger.info("User-Agent:{}", request.getHeader("user-agent")); logger.info("User-Agent:{}", request.getHeader("user-agent"));
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
try { try {
AppletPileDetailVO vo = pileService.getConnectorDetail(pileConnectorCode); AppletPileDetailVO vo = pileService.getConnectorDetail(pileConnectorCode, null);
response = new RestApiResponse<>(vo); response = new RestApiResponse<>(vo);
} catch (BusinessException e) { } catch (BusinessException e) {
logger.warn("app-xcx-h5查询充电枪口详情 warn param:{}", pileConnectorCode, e); logger.warn("app-xcx-h5查询充电枪口详情 warn param:{}", pileConnectorCode, e);

7
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -254,6 +254,7 @@ public class PileService {
} }
// 判断该桩是否为个人桩 // 判断该桩是否为个人桩
if (StringUtils.isNotBlank(memberId)) {
List<MemberVO> memberVOS = pileMemberRelationService.selectMemberList(pileSn); List<MemberVO> memberVOS = pileMemberRelationService.selectMemberList(pileSn);
if (CollectionUtils.isNotEmpty(memberVOS)) { if (CollectionUtils.isNotEmpty(memberVOS)) {
// 说明为个人桩, 判断会员信息 // 说明为个人桩, 判断会员信息
@@ -265,6 +266,8 @@ public class PileService {
if (!memberIdList.contains(memberId)) { if (!memberIdList.contains(memberId)) {
throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_HAVE_PILE_PERMISSION); throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_HAVE_PILE_PERMISSION);
} }
}
}
// 查询充电桩下枪口信息 // 查询充电桩下枪口信息
CompletableFuture<List<ConnectorInfoVO>> connectorInfoListFuture = CompletableFuture.supplyAsync(() -> pileConnectorInfoService.selectConnectorInfoList(pileSn), executor); CompletableFuture<List<ConnectorInfoVO>> connectorInfoListFuture = CompletableFuture.supplyAsync(() -> pileConnectorInfoService.selectConnectorInfoList(pileSn), executor);
@@ -345,7 +348,7 @@ public class PileService {
return resultVO; return resultVO;
} }
public AppletPileDetailVO getConnectorDetailV2(String pileConnectorCode) throws Exception { public AppletPileDetailVO getConnectorDetailV2(String pileConnectorCode, String memberId) throws Exception {
log.info("查询充电枪口详情, pileConnectorCode:{}", pileConnectorCode); log.info("查询充电枪口详情, pileConnectorCode:{}", pileConnectorCode);
PileConnectorDetailVO pileConnectorDetailVO = queryPileConnectorDetail(pileConnectorCode); PileConnectorDetailVO pileConnectorDetailVO = queryPileConnectorDetail(pileConnectorCode);
log.info("查询充电枪口详情, pileConnectorDetailVO:{}", JSON.toJSONString(pileConnectorDetailVO)); log.info("查询充电枪口详情, pileConnectorDetailVO:{}", JSON.toJSONString(pileConnectorDetailVO));
@@ -360,7 +363,7 @@ public class PileService {
} }
} }
String pileSn = pileConnectorDetailVO.getPileSn(); String pileSn = pileConnectorDetailVO.getPileSn();
AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn); AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn, memberId);
log.info("查询充电枪口详情getConnectorDetail, pileSn:{}, pileConnectorDetailVO:{}, resultVO:{}", pileSn, JSON.toJSONString(pileConnectorDetailVO), JSON.toJSONString(resultVO)); log.info("查询充电枪口详情getConnectorDetail, pileSn:{}, pileConnectorDetailVO:{}, resultVO:{}", pileSn, JSON.toJSONString(pileConnectorDetailVO), JSON.toJSONString(resultVO));
List<ConnectorInfoVO> connectorInfoList = resultVO.getConnectorInfoList(); List<ConnectorInfoVO> connectorInfoList = resultVO.getConnectorInfoList();
if (connectorInfoList.size() > 1 && !StringUtils.equals(pileConnectorDetailVO.getChargePortType(), "3")) { if (connectorInfoList.size() > 1 && !StringUtils.equals(pileConnectorDetailVO.getChargePortType(), "3")) {

2
jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java
View File

@@ -233,7 +233,7 @@ public enum ReturnCodeEnum {
CODE_THIS_VIN_HAS_BEEN_BINDING("00700002", "该vin已被绑定，请检查!"), CODE_THIS_VIN_HAS_BEEN_BINDING("00700002", "该vin已被绑定，请检查!"),
CODE_THIS_VIN_INFO_IS_NULL("007000003", "未查到该vin信息！"), CODE_THIS_VIN_INFO_IS_NULL("007000003", "未查到该vin信息！");
private String value; private String value;