Merge branch 'master' of http://8.138.18.76:3000/qmrb/parking-server

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

@@ -89,7 +89,7 @@ public class MyCarPlateNumberController{
         }
         List<MyCarPlateNumber> list = myCarPlateNumberService.list(new LambdaQueryWrapper<MyCarPlateNumber>().eq(MyCarPlateNumber::getUserId, form.getUserId()));
         if(CollectionUtil.isNotEmpty(list)){
-            return Result.failed("用户已存在车牌");
+            myCarPlateNumberService.removeByIds(list);
         }
         MyCarPlateNumberForm result = myCarPlateNumberService.saveForm(form);
         return Result.success(result);

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

@@ -56,6 +56,7 @@ public class BarnRecordForm {
      * 计费开始时间
      */
     @Schema(description = "计费开始时间",type="Date")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date billingStartTime;
 
     /**

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

@@ -88,7 +88,11 @@ public class BarnRecordVO {
      */
     @Schema(description = "应急取车标识",type="String")
     private String emergencyFlag;
-    
+    /**
+     * 停车时间
+     */
+    @Schema(description = "停车时间",type="String")
+    private String parkingTime;
 	@Schema(description = "子分类")
     private List<BarnRecordVO> children;
 

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

@@ -99,6 +99,11 @@ public class BarnRecordServiceImpl extends ServiceImpl<BarnRecordMapper, BarnRec
 			if(record.getCarParkId() != null && map.keySet().contains(record.getCarParkId())){
 				record.setCarParkName(map.get(record.getCarParkId()));
 			}
+			if(record.getOutTime() != null){
+				record.setParkingTime(calculateTimeDifference(record.getInTime(),record.getOutTime()));
+			}else{
+				record.setParkingTime(calculateTimeDifference(record.getInTime(),new Date()));
+			}
 			barnRecords.add(record);
 		}
 		pageResult.setRecords(barnRecords);