根据停车场对数据进行过滤。

src/main/java/com/charging/chargingparking/modules/backController/BackParkingPayController.java

@@ -11,6 +11,8 @@ import com.charging.chargingparking.modules.common.dto.Sort;
 import com.charging.chargingparking.service.ParkingInfoService;
 import com.charging.chargingparking.service.ParkingPayService;
 import com.charging.chargingparking.service.ParkingRecordService;
+import com.charging.chargingparking.service.ParkingUserRelationService;
+import com.charging.chargingparking.sys.service.UserService;
 import com.charging.chargingparking.utils.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +44,12 @@ public class BackParkingPayController {
     @Autowired
     private ParkingPayService parkingPayService;
 
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private ParkingUserRelationService parkingUserRelationService;
+
     @PostMapping("parkingPayList")
     public MessageResult<Object> parkingPayList(String parkingName, @RequestParam Integer pageSize, @RequestParam Integer pageIndex) {
 
@@ -133,6 +141,9 @@ public class BackParkingPayController {
             searchParams.put("pay_time_end", endTime);
         }
 
+        if(!userService.hasRole(subject,"SYSADMIN")) {
+            searchParams.put("filterParkingList", parkingUserRelationService.findByUserId(subject));
+        }
 
         com.github.pagehelper.Page<ParkingPay> page = parkingPayService.pageSearch(searchParams, pageIndex, pageSize, sortList);
 

src/main/java/com/charging/chargingparking/modules/backController/BackParkingRecordController.java

@@ -11,6 +11,8 @@ import com.charging.chargingparking.entity.ParkingRecord;
 import com.charging.chargingparking.modules.common.dto.Sort;
 import com.charging.chargingparking.service.ParkingInfoService;
 import com.charging.chargingparking.service.ParkingRecordService;
+import com.charging.chargingparking.service.ParkingUserRelationService;
+import com.charging.chargingparking.sys.service.UserService;
 import com.charging.chargingparking.utils.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +44,12 @@ public class BackParkingRecordController {
     @Autowired
     private ParkingRecordService parkingRecordService;
 
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private ParkingUserRelationService parkingUserRelationService;
+
     @PostMapping("parkingInfoList")
     public MessageResult<Object> parkingInfoList(){
         MessageResult<Object> messageResult = new MessageResult<>();
@@ -178,6 +186,10 @@ public class BackParkingRecordController {
             searchParams.put("outParkingTimeEnd", endTime);
         }
 
+        if(!userService.hasRole(subject,"SYSADMIN")) {
+            searchParams.put("filterParkingList", parkingUserRelationService.findByUserId(subject));
+        }
+
         com.github.pagehelper.Page<ParkingRecord> page = parkingRecordService.pageSearch(searchParams, pageIndex, pageSize, sortList);
 /*
         for (ParkingRecord parkingMember : page) {

src/main/java/com/charging/chargingparking/modules/backController/ParkingChannelController.java

@@ -6,6 +6,8 @@ import com.charging.chargingparking.entity.ParkingChannel;
 import com.charging.chargingparking.entity.ParkingInfo;
 import com.charging.chargingparking.service.ParkingChannelService;
 import com.charging.chargingparking.service.ParkingInfoService;
+import com.charging.chargingparking.service.ParkingUserRelationService;
+import com.charging.chargingparking.sys.service.UserService;
 import com.charging.chargingparking.utils.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @Slf4j
@@ -30,6 +33,11 @@ public class ParkingChannelController {
     @Autowired
     private ParkingInfoService parkingInfoService;
 
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private ParkingUserRelationService parkingUserRelationService;
 
     @ApiOperation(value = "创建空记录")
     @GetMapping("create")
@@ -202,6 +210,17 @@ public class ParkingChannelController {
                 queryWrapper.like("channel_type",channelType);
             }
 
+            if(!userService.hasRole(subject,"SYSADMIN")) {
+                List<String> filterParkingList = parkingUserRelationService.findByUserId(subject)
+                        .stream().map(e->e.getParkingId()).collect(Collectors.toList());
+
+                if (filterParkingList.size()==0) {
+                    filterParkingList.add("-1");
+                }
+
+                queryWrapper.in("park_id", filterParkingList);
+            }
+
             Page<ParkingChannel> page = parkingChannelService.page(new Page<>(pageIndex,pageSize),queryWrapper);
 
             for (ParkingChannel parkingChannel : page.getRecords()) {

src/main/java/com/charging/chargingparking/modules/backController/ParkingMemberInfoController.java

@@ -11,6 +11,8 @@ import com.charging.chargingparking.modules.common.dto.Sort;
 import com.charging.chargingparking.service.ParkingInfoService;
 import com.charging.chargingparking.service.ParkingMemberLogService;
 import com.charging.chargingparking.service.ParkingMemberService;
+import com.charging.chargingparking.service.ParkingUserRelationService;
+import com.charging.chargingparking.sys.service.UserService;
 import com.charging.chargingparking.utils.StringUtils;
 import com.github.pagehelper.Page;
 import io.swagger.annotations.ApiOperation;
@@ -42,6 +44,12 @@ public class ParkingMemberInfoController {
     @Autowired
     private ParkingMemberLogService parkingMemberLogService;
 
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private ParkingUserRelationService parkingUserRelationService;
+
     @ApiOperation(value = "创建空记录")
     @GetMapping("create")
     public MessageResult<ParkingMember> create() {
@@ -178,8 +186,6 @@ public class ParkingMemberInfoController {
             @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
             @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
             @RequestAttribute String subject) {
-
-
         //当前用户ID
         System.out.println(subject);
 
@@ -222,6 +228,10 @@ public class ParkingMemberInfoController {
 
         searchParams.put("userId", subject);
 
+        if(!userService.hasRole(subject,"SYSADMIN")) {
+            searchParams.put("filterParkingList", parkingUserRelationService.findByUserId(subject));
+        }
+
         Page<ParkingMember> page = parkingMemberService.pageSearch(searchParams, pageIndex, pageSize, sortList);
 
         for (ParkingMember parkingMember : page) {

src/main/resources/mapper/ParkingMemberMapper.xml

@@ -55,6 +55,16 @@
                   and a.member_start_time <= #{searchParams.endTime}
             ]]>
         </if>
+        <if test="searchParams.filterParkingList!=null">
+            <if test="searchParams.filterParkingList.size>0">
+                <foreach item="item" collection="searchParams.filterParkingList"  open=" and park_id in(" separator="," close=")">
+                    #{item.parkingId}
+                </foreach>
+            </if>
+            <if test="searchParams.filterParkingList.size==0">
+                and park_id=''
+            </if>
+        </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}
         </foreach>

src/main/resources/mapper/ParkingPayMapper.xml

@@ -75,6 +75,16 @@
                   and a.pay_time <= #{searchParams.pay_time_end}
             ]]>
         </if>
+        <if test="searchParams.filterParkingList!=null">
+            <if test="searchParams.filterParkingList.size>0">
+                <foreach item="item" collection="searchParams.filterParkingList"  open=" and park_id in(" separator="," close=")">
+                    #{item.parkingId}
+                </foreach>
+            </if>
+            <if test="searchParams.filterParkingList.size==0">
+                and park_id=''
+            </if>
+        </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}
         </foreach>

src/main/resources/mapper/ParkingRecordMapper.xml

@@ -88,7 +88,16 @@
                   and a.out_parking_time <= #{searchParams.outParkingTimeEnd}
             ]]>
         </if>
-
+        <if test="searchParams.filterParkingList!=null">
+            <if test="searchParams.filterParkingList.size>0">
+                <foreach item="item" collection="searchParams.filterParkingList"  open=" and park_id in(" separator="," close=")">
+                    #{item.parkingId}
+                </foreach>
+            </if>
+            <if test="searchParams.filterParkingList.size==0">
+                and park_id=''
+            </if>
+        </if>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}
         </foreach>