update 修改逻辑卡号功能、占桩订单区分运营商和站点

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java

@@ -49,7 +49,7 @@ public interface OrderPileOccupyService{
      * @param orderPileOccupy 占桩订单
      * @return 占桩订单集合
      */
-    List<OccupyOrderVO> getOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
+    // List<OccupyOrderVO> getOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
 
     List<OrderPileOccupy> queryOccupyOrderList(QueryOccupyOrderDTO dto);
 
@@ -120,4 +120,11 @@ public interface OrderPileOccupyService{
     int updateOrderInfoForWeb(MakeOrderFreeDTO dto);
 
     void closeOccupyPileOrder(String pileSn, String connectorCode);
+
+    /**
+     * 查询占桩订单列表(带权限校验)
+     * @param dto
+     * @return
+     */
+    List<OccupyOrderVO> getOrderPileOccupyListWithAuth(OrderPileOccupyDTO dto);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java

@@ -2,10 +2,12 @@ package com.jsowell.pile.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.github.pagehelper.PageInfo;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jsowell.adapay.service.AdapayService;
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.constant.Constants;
+import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
 import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.DelFlagEnum;
@@ -26,6 +28,7 @@ import com.jsowell.pile.domain.ykcCommond.RemoteControlGroundLockCommand;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.mapper.OrderPileOccupyMapper;
 import com.jsowell.pile.service.*;
+import com.jsowell.pile.util.UserUtils;
 import com.jsowell.pile.vo.base.PileInfoVO;
 import com.jsowell.pile.vo.uniapp.MemberVO;
 import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO;
@@ -152,9 +155,20 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
         return orderPileOccupyMapper.selectOrderPileOccupyList(orderPileOccupy);
     }
 
-    @Override
-    public List<OccupyOrderVO> getOrderPileOccupyList(OrderPileOccupy orderPileOccupy) {
-        return orderPileOccupyMapper.getOrderPileOccupyList(orderPileOccupy);
+    /**
+     * 获取占桩订单列表
+     * @param dto 占桩订单
+     * @return
+     */
+    public List<OccupyOrderVO> getOrderPileOccupyListWithAuth(OrderPileOccupyDTO dto) {
+        AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap();
+        if (authorizedMap == null) {
+            // 为空表示没有权限，返回空数组
+            return Lists.newArrayList();
+        }
+        dto.setStationDeptIds(authorizedMap.getStationDeptIds());
+        dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
+        return orderPileOccupyMapper.getOrderPileOccupyList(dto);
     }
 
     /**