|
@@ -3,14 +3,23 @@ package com.charging.chargingparking.modules.backController;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.charging.chargingparking.dto.MessageResult;
|
|
|
+import com.charging.chargingparking.dto.PojoUtils;
|
|
|
+import com.charging.chargingparking.entity.ParkingInfo;
|
|
|
+import com.charging.chargingparking.entity.ParkingMember;
|
|
|
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.utils.StringUtils;
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
+
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -22,9 +31,30 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
@RequestMapping("/backParkingRecord")
|
|
|
public class BackParkingRecordController {
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ParkingInfoService parkingInfoService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private ParkingRecordService parkingRecordService;
|
|
|
|
|
|
+ @PostMapping("parkingInfoList")
|
|
|
+ public MessageResult<Object> parkingInfoList(){
|
|
|
+ MessageResult<Object> messageResult = new MessageResult<>();
|
|
|
+
|
|
|
+ try{
|
|
|
+ List<ParkingInfo> lst = parkingInfoService.list();
|
|
|
+
|
|
|
+ messageResult.setData(lst);
|
|
|
+ messageResult.setResult(true);
|
|
|
+
|
|
|
+ }catch (Exception ex){
|
|
|
+ log.error(ex.getMessage(),ex);
|
|
|
+ messageResult.setResult(false);
|
|
|
+ }
|
|
|
+
|
|
|
+ return messageResult;
|
|
|
+ }
|
|
|
+
|
|
|
@PostMapping("parkingRecordList")
|
|
|
public MessageResult<Object> parkingRecordList(String parkingName, @RequestParam Integer pageSize, @RequestParam Integer pageIndex) {
|
|
|
|
|
@@ -45,4 +75,86 @@ public class BackParkingRecordController {
|
|
|
|
|
|
return messageResult;
|
|
|
}
|
|
|
+
|
|
|
+ @ApiOperation(value = "列表")
|
|
|
+ @RequestMapping(value = "pageList", method = RequestMethod.POST)
|
|
|
+ public MessageResult<Map> pageList(
|
|
|
+ String carNum, String parkId, String inParkingTimeStart,String inParkingTimeEnd,
|
|
|
+ String outParkingTimeStart, String outParkingTimeEnd,
|
|
|
+ String status,
|
|
|
+ @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
|
|
|
+ @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
|
|
|
+ @RequestAttribute String subject) {
|
|
|
+
|
|
|
+
|
|
|
+ //当前用户ID
|
|
|
+ System.out.println(subject);
|
|
|
+
|
|
|
+ MessageResult<Map> msgResult = new MessageResult<>();
|
|
|
+
|
|
|
+ Map<String, Object> searchParams = new HashMap<>();
|
|
|
+
|
|
|
+ List<Sort> sortList = new ArrayList<>();
|
|
|
+ sortList.add(new Sort("a.create_time", "desc"));
|
|
|
+
|
|
|
+ if (StringUtils.isNotEmpty(carNum)) {
|
|
|
+ searchParams.put("carNum", "%" + carNum + "%");
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotEmpty(parkId)) {
|
|
|
+ searchParams.put("parkId", parkId );
|
|
|
+ }
|
|
|
+
|
|
|
+ if (StringUtils.isNotEmpty(status)) {
|
|
|
+ searchParams.put("status", status);
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotEmpty(inParkingTimeStart))
|
|
|
+ {
|
|
|
+ searchParams.put("inParkingTimeStart",inParkingTimeStart);
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotEmpty(inParkingTimeEnd))
|
|
|
+ {
|
|
|
+ searchParams.put("inParkingTimeEnd",inParkingTimeEnd);
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotEmpty(outParkingTimeStart))
|
|
|
+ {
|
|
|
+ searchParams.put("outParkingTimeStart",outParkingTimeStart);
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotEmpty(outParkingTimeEnd))
|
|
|
+ {
|
|
|
+ searchParams.put("outParkingTimeEnd",outParkingTimeEnd);
|
|
|
+ }
|
|
|
+/*
|
|
|
+ if (StringUtils.isNotEmpty(rangeDate)) {
|
|
|
+ String[] timeRangeArray = rangeDate.split(",");
|
|
|
+ String startTime = "";
|
|
|
+ String endTime = "";
|
|
|
+ if (timeRangeArray.length == 1) {
|
|
|
+ startTime = timeRangeArray[0];
|
|
|
+ startTime += " 00:00:00";
|
|
|
+ } else if (timeRangeArray.length == 2) {
|
|
|
+ startTime = timeRangeArray[0];
|
|
|
+ endTime = timeRangeArray[1];
|
|
|
+ startTime += " 00:00:00";
|
|
|
+ endTime += " 23:59:59";
|
|
|
+ }
|
|
|
+
|
|
|
+ searchParams.put("startTime", startTime);
|
|
|
+ searchParams.put("endTime", endTime);
|
|
|
+ }
|
|
|
+
|
|
|
+*/
|
|
|
+ com.github.pagehelper.Page<ParkingRecord> page = parkingRecordService.pageSearch(searchParams, pageIndex, pageSize, sortList);
|
|
|
+
|
|
|
+ for (ParkingRecord parkingMember : page) {
|
|
|
+ ParkingInfo parkingInfo = parkingInfoService.getById(parkingMember.getParkId());
|
|
|
+ if (parkingInfo != null) {
|
|
|
+ parkingMember.setParkName(parkingInfo.getParkingName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ msgResult.setResult(true);
|
|
|
+ msgResult.setData(PojoUtils.pageWrapper(page));
|
|
|
+
|
|
|
+ return msgResult;
|
|
|
+ }
|
|
|
}
|