|
@@ -9,6 +9,8 @@ import com.charging.chargingparking.modules.common.dto.Sort;
|
|
|
import com.charging.chargingparking.service.ParkingFeeService;
|
|
|
import com.charging.chargingparking.service.ParkingInfoService;
|
|
|
import com.charging.chargingparking.service.ParkingMerchantService;
|
|
|
+import com.charging.chargingparking.service.ParkingUserRelationService;
|
|
|
+import com.charging.chargingparking.sys.service.UserService;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -17,6 +19,7 @@ import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @author 墨鱼_mo
|
|
@@ -38,6 +41,12 @@ public class ParkingInfoController {
|
|
|
@Autowired
|
|
|
private ParkingMerchantService parkingMerchantService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private UserService userService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ParkingUserRelationService parkingUserRelationService;
|
|
|
+
|
|
|
@ApiOperation(value="创建空记录")
|
|
|
@GetMapping("create")
|
|
|
public MessageResult<ParkingInfo> create(){
|
|
@@ -227,6 +236,11 @@ public class ParkingInfoController {
|
|
|
if (StringUtils.isNotEmpty(parkingName)) {
|
|
|
searchParams.put("parkingName","%" + parkingName + "%");
|
|
|
}
|
|
|
+
|
|
|
+ if(!userService.hasRole(subject,"SYSADMIN")) {
|
|
|
+ searchParams.put("filterParkingList", parkingUserRelationService.findByUserId(subject));
|
|
|
+ }
|
|
|
+
|
|
|
searchParams.put("oilCarEnable", oilCarEnable);
|
|
|
searchParams.put("newEnergyCarEnable", newEnergyCarEnable);
|
|
|
|