diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java index 3f242b0c8..24ae59647 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java @@ -224,7 +224,7 @@ public class PileStationInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('pile:station:query')") @PostMapping(value = "/selectStationListByMerchantId") public AjaxResult selectStationListByMerchantId(@RequestBody QueryStationDTO dto) { - return AjaxResult.success(pileStationInfoService.selectStationListByMerchantId(Long.valueOf(dto.getMerchantId()))); + return AjaxResult.success(pileStationInfoService.selectStationListByMerchantIdWithAuth(Long.valueOf(dto.getMerchantId()))); } /** diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java index 50bb4a328..da71753e6 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java @@ -68,7 +68,7 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter { */ @Override public void channelRead(ChannelHandlerContext ctx, Object message) throws Exception { - log.info("加载客户端报文channelRead=== channelId:" + ctx.channel().id() + ", msg:" + message); + // log.info("加载客户端报文channelRead=== channelId:" + ctx.channel().id() + ", msg:" + message); // 下面可以解析数据,保存数据,生成返回报文,将需要返回报文写入write函数 byte[] msg = (byte[]) message; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java index 1e2d1d05b..214495812 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java @@ -45,6 +45,14 @@ public interface PileStationInfoService { */ public List selectStationListByMerchantId(Long merchantId); + /** + * 通过运营商id查询站点信息(带权限校验) + * + * @param merchantId 运营商id + * @return 站点信息列表 + */ + public List selectStationListByMerchantIdWithAuth(Long merchantId); + /** * 新增充电站信息 * 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 c562be474..e149ef420 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 @@ -270,6 +270,30 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { return pileStationInfoMapper.selectStationListByMerchantId(merchantId); } + /** + * 通过运营商id查询站点信息(带权限校验) + * + * @param merchantId 运营商id + * @return 站点信息列表 + */ + @Override + public List selectStationListByMerchantIdWithAuth(Long merchantId) { + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); + if (authorizedMap == null) { + return null; + } + List pileStationInfos = pileStationInfoMapper.selectStationListByMerchantId(merchantId); + // 站点管理员 + if (CollectionUtils.isNotEmpty(authorizedMap.getStationDeptIds())) { + List stationDeptIds = authorizedMap.getStationDeptIds(); + // 筛选出来符合deptIds的数据 + pileStationInfos = pileStationInfos.stream() + .filter(pileStationInfo -> stationDeptIds.contains(pileStationInfo.getDeptId())) + .collect(Collectors.toList()); + } + return pileStationInfos; + } + /** * 新增充电站信息 *