From 544319bf9595a693c3a5e90ec0b7120356f9bc03 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 23 Aug 2023 10:23:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=20=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/PileConnectorInfoServiceImpl.java | 9 ++++++++- .../common/LTYTCommonParams.java | 2 +- .../common/LTYTCommonResult.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{lutongyun => lutongyunting}/common/LTYTCommonParams.java (93%) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/{lutongyun => lutongyunting}/common/LTYTCommonResult.java (82%) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 09a79d041..cfcddeed4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -277,7 +277,14 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { // 查询枪口当前订单 for (PileConnectorInfoVO pileConnectorInfoVO : pileConnectorInfoList) { String pileConnectorCode = pileConnectorInfoVO.getPileConnectorCode(); - pileConnectorInfoVO.setConnectorQrCodeUrl(getPileConnectorQrCodeUrl(pileConnectorCode)); // 枪口号二维码 + // 通过stationId查询充电站信息（缓存方法） + PileStationVO stationInfo = pileStationInfoService.getStationInfo(pileConnectorInfoVO.getStationId()); + if (stationInfo != null && StringUtils.isNotBlank(stationInfo.getQrcodePrefix())) { + String connectorQrCodeUrl = stationInfo.getQrcodePrefix() + pileConnectorCode; + pileConnectorInfoVO.setConnectorQrCodeUrl(connectorQrCodeUrl); + }else { + pileConnectorInfoVO.setConnectorQrCodeUrl(getPileConnectorQrCodeUrl(pileConnectorCode)); // 枪口号二维码 + } OrderBasicInfo order = orderBasicInfoService.queryChargingByPileConnectorCode(pileConnectorCode); if (order != null) { pileConnectorInfoVO.setOrderCode(order.getOrderCode()); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonParams.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonParams.java similarity index 93% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonParams.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonParams.java index fa74ecfc4..8f3563db8 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonParams.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonParams.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.lutongyun.common; +package com.jsowell.thirdparty.lutongyunting.common; import lombok.Data; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonResult.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonResult.java similarity index 82% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonResult.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonResult.java index 31d0f54e3..d21570b0f 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyun/common/LTYTCommonResult.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/common/LTYTCommonResult.java @@ -1,4 +1,4 @@ -package com.jsowell.thirdparty.lutongyun.common; +package com.jsowell.thirdparty.lutongyunting.common; import lombok.Data; From 791fee3e2403ec5ada2b653f6832adf2cf0f3411 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 23 Aug 2023 10:59:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=20=20=E8=AE=A2=E5=8D=95=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E4=BF=A1=E6=81=AF=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/OrderBasicInfoController.java | 21 +++++++++++++++---- .../pile/mapper/PileStationInfoMapper.java | 7 +++++++ .../pile/service/IPileStationInfoService.java | 7 +++++++ .../impl/OrderBasicInfoServiceImpl.java | 3 +++ .../impl/PileStationInfoServiceImpl.java | 10 +++++++++ .../mapper/pile/PileStationInfoMapper.xml | 9 ++++++++ 6 files changed, 53 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 0e3e235ad..12af5d7ca 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -9,6 +9,7 @@ import com.jsowell.common.enums.BusinessType; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.SecurityUtils; +import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileMerchantInfo; @@ -18,8 +19,10 @@ import com.jsowell.pile.dto.QueryMerchantOrderDTO; import com.jsowell.pile.dto.QueryOrderDTO; import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileMerchantInfoService; +import com.jsowell.pile.service.IPileStationInfoService; import com.jsowell.pile.vo.web.OrderListVO; import com.jsowell.service.OrderService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -45,6 +48,9 @@ public class OrderBasicInfoController extends BaseController { @Autowired private IPileMerchantInfoService pileMerchantInfoService; + @Autowired + private IPileStationInfoService pileStationInfoService; + /** * 查询订单列表 * 订单列表页，带数据权限校验 @@ -82,10 +88,17 @@ public class OrderBasicInfoController extends BaseController { return new AjaxResult(); } String deptId = authorizedMap.getDeptId(); - // 根据部门id查询merchantId - PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId); - if (pileMerchantInfo != null) { - dto.setMerchantId(String.valueOf(pileMerchantInfo.getId())); + if (CollectionUtils.isNotEmpty(authorizedMap.getStationDeptIds())) { + // 为站点管理员 + List stationIds = pileStationInfoService.getIdsByDeptId(deptId); + dto.setStationIdList(stationIds); + }else { + // 平台管理员或运营商管理员 + // 根据部门id查询merchantId + PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId); + if (pileMerchantInfo != null) { + dto.setMerchantId(String.valueOf(pileMerchantInfo.getId())); + } } return AjaxResult.success(orderBasicInfoService.getOrderTotalDataV2(dto)); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java index 130eb7158..bbb537107 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java @@ -81,4 +81,11 @@ public interface PileStationInfoMapper { List queryByStationDeptIds(@Param("stationDeptIds") List stationDeptIds); int updateAmapFlag(@Param("stationId") String stationId, @Param("amapFlag") String amapFlag); + + /** + * 通过站点部门id 查询站点id + * @param deptId + * @return + */ + List getIdsByDeptId(String deptId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java index e712f2acb..e494dad74 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java @@ -98,4 +98,11 @@ public interface IPileStationInfoService { String selectAdapayMemberId(String stationId); int updateAmapFlag(String stationId, String amapFlag); + + /** + * 通过站点部门id查询站点id + * @param deptId + * @return + */ + List getIdsByDeptId(String deptId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 69daa54cb..265ac0964 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -372,6 +372,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { public OrderTotalDataVO getOrderTotalDataV2(QueryOrderDTO dto) { // 确定查询的站点 List stationIdList = Lists.newArrayList(); + if (CollectionUtils.isNotEmpty(dto.getStationIdList())) { + stationIdList.addAll(dto.getStationIdList()); + } if (StringUtils.isNotBlank(dto.getStationId())) { stationIdList.add(dto.getStationId()); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index cf5477286..fb1fc7b5a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -476,5 +476,15 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { return pileStationInfoMapper.updateAmapFlag(stationId, amapFlag); } + /** + * 通过站点部门id查询站点id + * @param deptId + * @return + */ + @Override + public List getIdsByDeptId(String deptId) { + return pileStationInfoMapper.getIdsByDeptId(deptId); + } + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml index 9b859cdf8..1056a5730 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml @@ -407,4 +407,13 @@ where id = #{stationId,jdbcType=VARCHAR} + + \ No newline at end of file