From 31e366b49fa0fcc978ce7ef0f851da1467c4c81a Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 4 Jul 2023 14:49:50 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E8=BF=90=E8=90=A5=E5=95=86?= =?UTF-8?q?=E4=BB=85=E5=8F=AF=E6=9F=A5=E7=9C=8B=E6=9C=AC=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=95=86=E4=B8=8B=E6=89=80=E6=9C=89=E7=AB=99=E7=82=B9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/vo/AuthorizedDeptVO.java | 6 +++++ .../jsowell/common/util/SecurityUtils.java | 6 +++-- .../jsowell/pile/domain/OrderBasicInfo.java | 6 +++++ .../com/jsowell/pile/dto/QueryOrderDTO.java | 5 ++++ .../pile/mapper/PileMerchantInfoMapper.java | 7 +++++ .../service/IPileMerchantInfoService.java | 2 +- .../impl/OrderBasicInfoServiceImpl.java | 7 ++++- .../impl/PileMerchantInfoServiceImpl.java | 5 ++++ .../mapper/pile/OrderBasicInfoMapper.xml | 26 ++++++++++++++----- .../mapper/pile/PileMerchantInfoMapper.xml | 8 ++++++ jsowell-ui/src/views/order/order/index.vue | 1 + 11 files changed, 69 insertions(+), 10 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/domain/vo/AuthorizedDeptVO.java b/jsowell-common/src/main/java/com/jsowell/common/core/domain/vo/AuthorizedDeptVO.java index 9463efad0..f8803095c 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/domain/vo/AuthorizedDeptVO.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/vo/AuthorizedDeptVO.java @@ -17,4 +17,10 @@ public class AuthorizedDeptVO { private List merchantDeptIds; // 有权限的站点 private List stationDeptIds; + + // 部门id + private String deptId; + + // 运营商id + private List merchantIds; } diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java index 73408d064..a5514c056 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java @@ -126,6 +126,8 @@ public class SecurityUtils { log.info("用户id:{}, 获取不到所属部门信息", user.getUserId()); return null; } + String deptId = String.valueOf(dept.getDeptId()); + resultVO.setDeptId(deptId); log.info("用户id:{}, 所属部门信息:{}", user.getUserId(), JSONObject.toJSONString(dept)); // 登录用户角色 List roles = user.getRoles(); @@ -136,11 +138,11 @@ public class SecurityUtils { // 父级id是0，表明是该账号挂在平台下面，是系统管理员 } else if (parentId == 100L) { // 父级id是100，表明是该账号挂在运营商下面，是运营商管理员 - merchantDeptIds.add(String.valueOf(dept.getDeptId())); + merchantDeptIds.add(deptId); resultVO.setMerchantDeptIds(merchantDeptIds); } else { // 其他情况，表明是站点管理员 - stationDeptIds.add(String.valueOf(dept.getDeptId())); + stationDeptIds.add(deptId); resultVO.setStationDeptIds(stationDeptIds); } return resultVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java index 2b4f93e7e..c9b86b8da 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java @@ -61,6 +61,12 @@ public class OrderBasicInfo extends BaseEntity { @Excel(name = "站点id") private String stationId; + /** + * 运营商id + */ + @Excel(name = "运营商id") + private String merchantId; + /** * 充电桩sn号 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java index 1a296acbf..8e41fa315 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java @@ -49,6 +49,11 @@ public class QueryOrderDTO extends BaseEntity { */ private String stationId; + /** + * 运营商Id + */ + private String merchantId; + /** * 开始时间 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java index dc13d30b2..59de9f945 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java @@ -70,4 +70,11 @@ public interface PileMerchantInfoMapper { public int deletePileMerchantInfoByIds(Long[] ids); List queryByMerchantDeptIds(@Param("merchantDeptIds") List merchantDeptIds); + + /** + * 根据部门id查询基本信息 + * @param deptId + * @return + */ + PileMerchantInfo queryInfoByDeptId(@Param("deptId") String deptId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java index 91e0b0c82..ea6c74b36 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java @@ -72,5 +72,5 @@ public interface IPileMerchantInfoService { */ List queryByMerchantDeptIds(List merchantDeptIds); - + PileMerchantInfo queryInfoByDeptId(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 f4b41086e..f2c5d4b2d 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 @@ -176,7 +176,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } dto.setStationDeptIds(authorizedMap.getStationDeptIds()); dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds()); - + String deptId = authorizedMap.getDeptId(); + // 根据部门id查询merchantId + PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId); + if (pileMerchantInfo != null) { + dto.setMerchantId(String.valueOf(pileMerchantInfo.getId())); + } List orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); if (CollectionUtils.isNotEmpty(orderListVOS)) { for (OrderListVO orderListVO : orderListVOS) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index e119d2c71..c7b07219f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -245,4 +245,9 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { public List queryByMerchantDeptIds(List merchantDeptIds) { return pileMerchantInfoMapper.queryByMerchantDeptIds(merchantDeptIds); } + + @Override + public PileMerchantInfo queryInfoByDeptId(String deptId) { + return pileMerchantInfoMapper.queryInfoByDeptId(deptId); + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index ff1f198c6..7b67d1283 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -10,6 +10,7 @@ + @@ -91,6 +92,7 @@ order_status, member_id, station_id, + merchant_id, pile_sn, connector_code, pile_connector_code, @@ -223,13 +225,16 @@ and t1.create_time #{endTime,jdbcType=VARCHAR} + + and t1.merchant_id = #{merchantId,jdbcType=VARCHAR} + - + + + + + + and t3.dept_id in @@ -305,6 +310,9 @@ station_id, + + merchant_id, + pile_sn, @@ -403,6 +411,9 @@ #{stationId}, + + #{merchantId}, + #{pileSn,jdbcType=VARCHAR}, @@ -502,6 +513,9 @@ station_id = #{stationId}, + + merchant_id = #{merchantId}, + pile_sn = #{pileSn}, diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index fd263857e..5ca8b844a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml @@ -278,4 +278,12 @@ #{item,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue index 43f0c380e..036597d26 100644 --- a/jsowell-ui/src/views/order/order/index.vue +++ b/jsowell-ui/src/views/order/order/index.vue @@ -349,6 +349,7 @@ export default { mobileNumber: null, orderStatus: null, stationId: null, + merchantId: null, startTime: null, endTime: null, },