diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java index fbde44880..5287ee555 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java @@ -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); } diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java index 7106f6435..246bbfdad 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java @@ -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); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index f97f92646..ae1601239 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -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 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 connectorInfoList = resultVO.getConnectorInfoList(); if (connectorInfoList.size() > 1) { List list = Lists.newArrayList(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileConnectorVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/AppletPileDetailVO.java similarity index 87% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileConnectorVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/AppletPileDetailVO.java index 1111aba55..ae0dcd49d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileConnectorVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/AppletPileDetailVO.java @@ -11,21 +11,25 @@ import lombok.NoArgsConstructor; import java.util.List; +/** + * 小程序充电桩详情页VO + * 小程序 + */ @Data @NoArgsConstructor @AllArgsConstructor @Builder -public class PileConnectorVO { +public class AppletPileDetailVO { - // 充电枪信息列表 + // 充电桩信息 + private PileInfoVO pileInfo; + + // 充电枪口信息列表 private List connectorInfoList; // 计费模板信息 // private BillingTemplateVO billingTemplate; - // 充电桩信息 - private PileInfoVO pileInfo; - // 运营商信息 private MerchantInfoVO merchantInfo;