停车记录

src/main/java/com/qmrb/system/controller/BarnRecordController.java

@@ -4,6 +4,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qmrb.system.pojo.entity.BarnRecord;
+import org.apache.commons.lang3.StringUtils;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -61,9 +65,19 @@ public class BarnRecordController{
         return PageResult.success(result);
     }
     
+    
+    @Operation(summary = "岗亭端停车记录列表", security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/listByPlateNumber")
+    public PageResult<BarnRecordVO> listByPlateNumber(
+            @ParameterObject BarnRecordQuery queryParams
+    ) {
+        // Assert.isTrue(StringUtils.isNotBlank(queryParams.getCarNumber()), "请输入车牌号");
+        Page<BarnRecordVO> result = barnRecordService.getPage(queryParams);        
+        return PageResult.success(result);
+    }
+    
     @Operation(summary = "新增岗亭端停车记录", security = {@SecurityRequirement(name = "Authorization")})
     @PostMapping
-    @PreAuthorize("@ss.hasPerm('record:add')")
     @Resubmit
     public Result<BarnRecordForm> saveForm(
             @RequestBody @Valid BarnRecordForm form
@@ -80,10 +94,18 @@ public class BarnRecordController{
     	BarnRecordForm formData = barnRecordService.getFormData(id);
         return Result.success(formData);
     }
+    
+    @Operation(summary = "岗亭端停车记录金额数据", security = {@SecurityRequirement(name = "Authorization")})
+    @GetMapping("/{id}/getCarParkUseLogOrder")
+    public Result<BarnRecordForm> getCarParkUseLogOrder(
+            @Parameter(description = "岗亭端停车记录ID") @PathVariable Long id
+    ) {
+    	BarnRecordForm formData = barnRecordService.getCarParkUseLogOrder(id);
+        return Result.success(formData);
+    }
 
     @Operation(summary = "修改岗亭端停车记录", security = {@SecurityRequirement(name = "Authorization")})
     @PutMapping(value = "/{id}")
-    @PreAuthorize("@ss.hasPerm('record:edit')")
     public Result<?> updateForm(
             @Parameter(description = "岗亭端停车记录ID") @PathVariable Long id,
             @RequestBody @Validated BarnRecordForm form) {
@@ -94,7 +116,6 @@ public class BarnRecordController{
 
     @Operation(summary = "删除岗亭端停车记录", security = {@SecurityRequirement(name = "Authorization")})
     @DeleteMapping("/{ids}")
-    @PreAuthorize("@ss.hasPerm('record:delete')")
     public Result<?> deleteUsers(
             @Parameter(description = "岗亭端停车记录ID，多个以英文逗号(,)分割") @PathVariable String ids
     ) {

src/main/java/com/qmrb/system/pojo/entity/BarnRecord.java

@@ -2,10 +2,14 @@ package com.qmrb.system.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.qmrb.system.common.base.BaseEntity;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,6 +33,9 @@ public class BarnRecord extends BaseEntity {
 
     @TableField("barn_id")
     private Long barnId;
+    
+    @TableField("car_park_id")
+    private Long carParkId;
 
     @TableField("place_no")
     private String placeNo;
@@ -67,4 +74,37 @@ public class BarnRecord extends BaseEntity {
     private Integer outChannelId;
 
 
+    /**
+     * 计费开始时间
+     */
+    @TableField("billing_start_time")    
+    private Date billingStartTime;
+
+    /**
+     * 计费时长(单位分钟)
+     */
+    @TableField("billing_time")
+    private Integer billingTime;
+    /**
+     * 计费金额
+     */
+    @TableField("billing_amount")
+    private BigDecimal billingAmount;
+
+    /**
+     * 已收金额
+     */
+    @TableField("received_amount")
+    private BigDecimal receivedAmount;
+    /**
+     * 进场图片
+     */
+    @TableField("pending_amount")
+    private BigDecimal pendingAmount;
+    /**
+     * 应急取车标识
+     */
+    @TableField("emergency_flag")
+    private String emergencyFlag;
+
 }

src/main/java/com/qmrb/system/pojo/form/BarnRecordForm.java

@@ -1,8 +1,10 @@
 package com.qmrb.system.pojo.form;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -20,10 +22,13 @@ public class BarnRecordForm {
     private Long barnId;
     private String placeNo;
     private String carNumber;
+    private Long carParkId;
+    private String carParkName;
     /**
      * 车辆进入时间
      */
 	@Schema(description = "车辆进入时间",type="Date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date inTime;
     /**
      * 进场图片
@@ -39,6 +44,7 @@ public class BarnRecordForm {
      * 车辆出场时间
      */
 	@Schema(description = "车辆出场时间",type="Date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date outTime;
     /**
      * 出口ID
@@ -46,5 +52,42 @@ public class BarnRecordForm {
 	@Schema(description = "出口ID",type="Integer")
     private Integer outChannelId;
 
+    /**
+     * 计费开始时间
+     */
+    @Schema(description = "计费开始时间",type="Date")
+    private Date billingStartTime;
+
+    /**
+     * 计费时长(单位分钟)
+     */
+    @Schema(description = "计费时长(单位分钟)",type="Integer")
+    private Integer billingTime;
+    /**
+     * 计费金额
+     */
+    @Schema(description = "计费金额",type="BigDecimal")
+    private BigDecimal billingAmount;
 
+    /**
+     * 已收金额
+     */
+    @Schema(description = "已收金额",type="String")
+    private BigDecimal receivedAmount;
+    /**
+     * 进场图片
+     */
+    @Schema(description = "进场图片",type="BigDecimal")
+    private BigDecimal pendingAmount;
+    /**
+     * 应急取车标识
+     */
+    @Schema(description = "应急取车标识",type="String")
+    private String emergencyFlag;
+    
+    /**
+     * 停车时间
+     */
+    @Schema(description = "停车时间",type="String")
+    private String parkingTime;
 }

src/main/java/com/qmrb/system/pojo/query/BarnRecordQuery.java

@@ -5,6 +5,7 @@ import com.qmrb.system.common.base.BasePageQuery;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -27,6 +28,7 @@ public class BarnRecordQuery extends BasePageQuery{
     private Long userId;
     private String placeNo;
     private String carNumber;
+    private Long carParkId;
     /**
      * 车辆进入时间
      */
@@ -53,5 +55,36 @@ public class BarnRecordQuery extends BasePageQuery{
 	@Schema(description = "出口ID",type="Integer")
     private Integer outChannelId;
 
+    /**
+     * 计费开始时间
+     */
+    @Schema(description = "计费开始时间",type="Date")
+    private Date billingStartTime;
 
+    /**
+     * 计费时长(单位分钟)
+     */
+    @Schema(description = "计费时长(单位分钟)",type="Integer")
+    private Integer billingTime;
+    /**
+     * 计费金额
+     */
+    @Schema(description = "计费金额",type="BigDecimal")
+    private BigDecimal billingAmount;    
+    
+    /**
+     * 已收金额
+     */
+    @Schema(description = "已收金额",type="String")
+    private BigDecimal receivedAmount;    
+    /**
+     * 进场图片
+     */
+    @Schema(description = "进场图片",type="BigDecimal")
+    private BigDecimal pendingAmount;   
+    /**
+     * 应急取车标识
+     */
+    @Schema(description = "应急取车标识",type="String")
+    private String emergencyFlag;
 }

src/main/java/com/qmrb/system/pojo/vo/BarnRecordVO.java

@@ -1,8 +1,10 @@
 package com.qmrb.system.pojo.vo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -22,6 +24,9 @@ public class BarnRecordVO {
     private Long barnId;
     private String placeNo;
     private String carNumber;
+    
+    private Long carParkId;
+    private String carParkName;
     /**
      * 车辆进入时间
      */
@@ -50,6 +55,40 @@ public class BarnRecordVO {
 	@Schema(description = "出口ID",type="Integer")
     private Integer outChannelId;
 
+    /**
+     * 计费开始时间
+     */
+    @Schema(description = "计费开始时间",type="Date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date billingStartTime;
+
+    /**
+     * 计费时长(单位分钟)
+     */
+    @Schema(description = "计费时长(单位分钟)",type="Integer")
+    private Integer billingTime;
+    /**
+     * 计费金额
+     */
+    @Schema(description = "计费金额",type="BigDecimal")
+    private BigDecimal billingAmount;
+
+    /**
+     * 已收金额
+     */
+    @Schema(description = "已收金额",type="String")
+    private BigDecimal receivedAmount;
+    /**
+     * 进场图片
+     */
+    @Schema(description = "进场图片",type="BigDecimal")
+    private BigDecimal pendingAmount;
+    /**
+     * 应急取车标识
+     */
+    @Schema(description = "应急取车标识",type="String")
+    private String emergencyFlag;
+    
 	@Schema(description = "子分类")
     private List<BarnRecordVO> children;
 

src/main/java/com/qmrb/system/service/IBarnRecordService.java

@@ -37,5 +37,6 @@ public interface IBarnRecordService extends IService<BarnRecord> {
 	/**获取表单数据
 	 * */
 	public BarnRecordForm getFormData(Long id);
-	
+
+	BarnRecordForm getCarParkUseLogOrder(Long id);
 }

src/main/java/com/qmrb/system/service/impl/BarnRecordServiceImpl.java

@@ -1,12 +1,17 @@
 package com.qmrb.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import com.qmrb.system.pojo.entity.CarPark;
 import com.qmrb.system.pojo.entity.MyCarPlateNumber;
+import com.qmrb.system.service.ICarParkService;
 import com.qmrb.system.service.IMyCarPlateNumberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -44,6 +49,10 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
 	
 	@Autowired
 	private IMyCarPlateNumberService myCarPlateNumberService;
+	
+	@Autowired
+	private ICarParkService carParkService;
+	
 
 	/**分页查询
 	 * */
@@ -63,6 +72,9 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
 			}
 			
 		}
+		if (StrUtil.isNotBlank(queryParams.getCarNumber())) {
+			queryWrapper.eq(BarnRecord::getCarNumber,queryParams.getCarNumber());
+		}
 		queryWrapper.orderByDesc(BarnRecord::getCreateTime);
         // 查询数据
         Page<BarnRecord> dictItemPage = this.page(
@@ -70,9 +82,26 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
 				queryWrapper
 				
         );
+		List<CarPark> list = carParkService.list();
+		HashMap<Long, String> map = new HashMap<>();
+		if(CollectionUtil.isNotEmpty(list)){
+			list.stream().forEach(item->{
+				map.put(item.getId(),item.getName());
+			});
+		}
+		
 
         // 实体转换
         Page<BarnRecordVO> pageResult = converter.entity2Page(dictItemPage);
+
+		ArrayList<BarnRecordVO> barnRecords = new ArrayList<>();
+		for (BarnRecordVO record : pageResult.getRecords()) {
+			if(record.getCarParkId() != null && map.keySet().contains(record.getCarParkId())){
+				record.setCarParkName(map.get(record.getCarParkId()));
+			}
+			barnRecords.add(record);
+		}
+		pageResult.setRecords(barnRecords);
         return pageResult;
 	}
 
@@ -111,4 +140,84 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
         BarnRecordForm form = converter.entity2Form(entity);
         return form;
 	}
+
+	/**
+	 * 计算停车缴纳金额
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public BarnRecordForm getCarParkUseLogOrder(Long id) {
+		// 获取entity
+		BarnRecord entity = this.getById(id);
+		Assert.isTrue(entity != null, "岗亭端停车记录不存在");
+
+		// 实体转换
+		BarnRecordForm form = converter.entity2Form(entity);
+
+		if(form.getOutTime() != null){
+			form.setParkingTime(calculateTimeDifference(form.getInTime(),form.getOutTime()));
+		}else{
+			form.setParkingTime(calculateTimeDifference(form.getInTime(),new Date()));
+		}
+		
+
+		List<CarPark> list = carParkService.list();
+		HashMap<Long, String> map = new HashMap<>();
+		if(CollectionUtil.isNotEmpty(list)){
+			list.stream().forEach(item->{
+				map.put(item.getId(),item.getName());
+			});
+		}
+		if(form.getCarParkId() != null && map.keySet().contains(form.getCarParkId())){
+			form.setCarParkName(map.get(form.getCarParkId()));
+		}
+		form.setPendingAmount(new BigDecimal(15));
+		form.setBillingAmount(new BigDecimal(15));
+		form.setReceivedAmount(BigDecimal.ZERO);
+		return form;
+	}
+
+
+	/**
+	 * 计算两个时间差（年，月，星期，日，时，分，秒）
+	 *
+	 * @param startDate
+	 * @param endDate
+	 * @return
+	 */
+	public static String calculateTimeDifference(Date startDate, Date endDate) {
+		if (null == startDate || null == endDate) {
+			return "";
+		}
+		ZoneId zoneId = ZoneId.systemDefault();
+		LocalDateTime fromDateTime = LocalDateTime.ofInstant(startDate.toInstant(), zoneId);
+		LocalDateTime toDateTime = LocalDateTime.ofInstant(endDate.toInstant(), zoneId);
+
+		LocalDateTime tempDateTime = LocalDateTime.from(fromDateTime);
+
+		long years = tempDateTime.until(toDateTime, ChronoUnit.YEARS);
+		tempDateTime = tempDateTime.plusYears(years);
+
+		long months = tempDateTime.until(toDateTime, ChronoUnit.MONTHS);
+		tempDateTime = tempDateTime.plusMonths(months);
+
+		long days = tempDateTime.until(toDateTime, ChronoUnit.DAYS);
+		tempDateTime = tempDateTime.plusDays(days);
+
+		long hours = tempDateTime.until(toDateTime, ChronoUnit.HOURS);
+		tempDateTime = tempDateTime.plusHours(hours);
+
+		long minutes = tempDateTime.until(toDateTime, ChronoUnit.MINUTES);
+		tempDateTime = tempDateTime.plusMinutes(minutes);
+
+		long seconds = tempDateTime.until(toDateTime, ChronoUnit.SECONDS);
+
+
+		return (DateUtil.between(endDate, startDate, DateUnit.HOUR) + ":")
+				+ (minutes + ":")
+				+ (seconds + "");
+
+	}
+
 }