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

update 电单车协议

Browse Source
This commit is contained in:
Guoqs
2024-08-30 16:17:57 +08:00
parent 5920cf0e18
commit 07f4f4f76e
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ import com.jsowell.pile.service.MemberGroupService;
import com.jsowell.pile.service.PileBasicInfoService;
import com.jsowell.pile.vo.base.PileInfoVO;
import com.jsowell.pile.vo.uniapp.customer.GroundLockInfoVO;
import com.jsowell.pile.vo.uniapp.customer.PileConnectorVO;
import com.jsowell.pile.vo.uniapp.customer.AppletPileDetailVO;
import com.jsowell.pile.vo.web.ThirdPartySnRelationVO;
import com.jsowell.service.PileService;
import com.jsowell.thirdparty.common.CommonService;
@@ -70,7 +70,7 @@ public class JumpController extends BaseController {
try {
// 进入充电桩详情做一下鉴权
String memberId = getMemberIdByAuthorization(request);
PileConnectorVO vo = pileService.getPileDetailByPileSn(pileSn);
AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn);
addMember2MemberGroup(memberId, vo);
response = new RestApiResponse<>(vo);
} catch (BusinessException e) {
@@ -85,7 +85,7 @@ public class JumpController extends BaseController {
}
// 针对汇鑫大厦的用户，自动加入集团中
private void addMember2MemberGroup(String memberId, PileConnectorVO vo) {
private void addMember2MemberGroup(String memberId, AppletPileDetailVO vo) {
if (vo == null || StringUtils.isBlank(memberId)) {
return;
}
@@ -131,7 +131,7 @@ public class JumpController extends BaseController {
memberId = getMemberIdByAuthorization(request);
}
PileConnectorVO vo = pileService.getConnectorDetail(pileConnectorCode);
AppletPileDetailVO vo = pileService.getConnectorDetail(pileConnectorCode);
if (StringUtils.isNotBlank(memberId)) {
addMember2MemberGroup(memberId, vo);
}

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

@@ -11,7 +11,7 @@ import com.jsowell.common.util.file.AliyunOssUploadUtils;
import com.jsowell.common.util.file.FileUtils;
import com.jsowell.pile.service.PileBasicInfoService;
import com.jsowell.pile.vo.uniapp.customer.GroundLockInfoVO;
import com.jsowell.pile.vo.uniapp.customer.PileConnectorVO;
import com.jsowell.pile.vo.uniapp.customer.AppletPileDetailVO;
import com.jsowell.service.PileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -42,7 +42,7 @@ public class JumpXixiaoController extends BaseController {
logger.info("User-Agent:{}", request.getHeader("user-agent"));
RestApiResponse<?> response = null;
try {
PileConnectorVO vo = pileService.getPileDetailByPileSn(pileSn);
AppletPileDetailVO vo = pileService.getPileDetailByPileSn(pileSn);
response = new RestApiResponse<>(vo);
} catch (BusinessException 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"));
RestApiResponse<?> response = null;
try {
PileConnectorVO vo = pileService.getConnectorDetail(pileConnectorCode);
AppletPileDetailVO vo = pileService.getConnectorDetail(pileConnectorCode);
response = new RestApiResponse<>(vo);
} catch (BusinessException e) {
logger.warn("app-xcx-h5查询充电枪口详情 warn param:{}", pileConnectorCode, e);

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

@@ -23,7 +23,7 @@ import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
import com.jsowell.pile.vo.uniapp.customer.PersonPileConnectorSumInfoVO;
import com.jsowell.pile.vo.uniapp.customer.PersonPileRealTimeVO;
import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO;
import com.jsowell.pile.vo.uniapp.customer.PileConnectorVO;
import com.jsowell.pile.vo.uniapp.customer.AppletPileDetailVO;
import com.jsowell.pile.vo.web.PileDetailVO;
import com.jsowell.pile.vo.web.PileStationVO;
import org.apache.commons.collections4.CollectionUtils;
@@ -159,7 +159,7 @@ public class PileService {
/**
* 前端扫码跳转接口
*/
public PileConnectorVO getPileDetailByPileSn(String param) throws ExecutionException, InterruptedException {
public AppletPileDetailVO getPileDetailByPileSn(String param) throws ExecutionException, InterruptedException {
if (StringUtils.isBlank(param)) {
throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
}
@@ -207,7 +207,7 @@ public class PileService {
MerchantInfoVO merchantInfoVO = merchantInfoVOFuture.get();
List<BillingPriceVO> billingPriceVOS = billingPriceFuture.get();
PileConnectorVO vo = PileConnectorVO.builder()
AppletPileDetailVO vo = AppletPileDetailVO.builder()
.pileInfo(pileInfoVO)
.connectorInfoList(connectorInfoList)
.merchantInfo(merchantInfoVO)
@@ -225,7 +225,7 @@ public class PileService {
* @throws ExecutionException
* @throws InterruptedException
*/
public PileConnectorVO getConnectorDetail(String pileConnectorCode) throws ExecutionException, InterruptedException {
public AppletPileDetailVO getConnectorDetail(String pileConnectorCode) throws ExecutionException, InterruptedException {
PileConnectorDetailVO pileConnectorDetailVO = queryPileConnectorDetail(pileConnectorCode);
if (pileConnectorDetailVO == null) {
return null;
@@ -235,7 +235,7 @@ public class PileService {
throw new BusinessException(ReturnCodeEnum.CODE_PILE_CONNECTOR_STATUS_ERROR);
}
String pileSn = pileConnectorDetailVO.getPileSn();
PileConnectorVO resultVO = getPileDetailByPileSn(pileSn);
AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn);
List<ConnectorInfoVO> connectorInfoList = resultVO.getConnectorInfoList();
if (connectorInfoList.size() > 1) {
List<ConnectorInfoVO> list = Lists.newArrayList();