refactor : 删除车辆标签状态

app/src/main/java/com/yiring/app/domain/car/Car.java

@@ -57,9 +57,6 @@ public class Car implements Serializable {
     @Comment("标签卡")
     String labelCard;
 
-    @Comment("标签卡状态")
-    String labelCardStatus;
-
     @Comment("所属单位id")
     String orgId;
 

app/src/main/java/com/yiring/app/excel/car/CarExportExcel.java

@@ -3,6 +3,7 @@ package com.yiring.app.excel.car;
 
 import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
 import com.github.liaochong.myexcel.core.annotation.ExcelModel;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import lombok.*;
@@ -20,6 +21,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class CarExportExcel implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -4019303809667111441L;
 
     @ExcelColumn(title = "车牌")
@@ -49,9 +51,6 @@ public class CarExportExcel implements Serializable {
     @ExcelColumn(title = "标签卡")
     String labelCard;
 
-    @ExcelColumn(title = "标签卡状态", mapping = "1:未发卡,2:使用中,3:已收卡")
-    String labelCardStatus;
-
     @ExcelColumn(title = "收卡时间", format = "yyyy-MM-dd HH:mm:ss", width = 15)
     LocalDateTime cardRecTime;
 }

app/src/main/java/com/yiring/app/param/car/CarParam.java

@@ -4,6 +4,7 @@ package com.yiring.app.param.car;
 import com.yiring.common.constant.RegEx;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
@@ -23,6 +24,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class CarParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 521351582969232371L;
 
     @ApiModelProperty(value = "车牌号码", example = "湘A99999", required = true)
@@ -42,12 +44,6 @@ public class CarParam implements Serializable {
     @Pattern(regexp = RegEx.MOBILE, message = "手机号码格式不正确")
     String driverMobile;
 
-    //    @ApiModelProperty(value = "标签卡", example = "DW24515512")
-    //    String labelCard;
-    //
-    //    @ApiModelProperty(value = "标签卡状态", example = "使用中")
-    //    String labelCardStatus;
-
     @ApiModelProperty(value = "所属单位id", example = "1", required = true)
     @NotEmpty(message = "所属单位id不能为空")
     String orgId;
@@ -60,11 +56,4 @@ public class CarParam implements Serializable {
     @NotEmpty(message = "来访原因不能为空")
     @Size(min = 1, max = 20, message = "来访原因超出范围")
     String reason;
-    //    @ApiModelProperty(value = "收卡时间", example = "2022-04-11 17:25:33")
-    //    LocalDateTime cardRecTime;
-    //
-    //    @ApiModelProperty(value = "发卡时间", example = "2022-04-11 17:25:33")
-    //    LocalDateTime cardSendTime;
-    //    @ApiModelProperty(value = "创建时间", example = "")
-    //    LocalDateTime createTime;
 }

app/src/main/java/com/yiring/app/param/car/CarQueryParam.java

@@ -3,6 +3,7 @@ package com.yiring.app.param.car;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import lombok.*;
@@ -20,6 +21,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class CarQueryParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -2107446950936463302L;
 
     @ApiModelProperty(value = "每页记录数", example = "10")
@@ -43,9 +45,6 @@ public class CarQueryParam implements Serializable {
     @ApiModelProperty(value = "标签卡", example = "DW24515512")
     String labelCard;
 
-    @ApiModelProperty(value = "标签卡状态", example = "2")
-    String labelCardStatus;
-
     @ApiModelProperty(value = "所属单位id", example = "1")
     String orgId;
 

app/src/main/java/com/yiring/app/service/car/impl/CarServiceImpl.java

@@ -52,15 +52,14 @@ public class CarServiceImpl implements CarService {
     public Result<Long> saveCarInfo(CarParam carParam) {
         // 检查车牌号是否已存在
         if (hasCarInfoByCarNum(carParam.getCarNum())) {
-            return Result.no(Status.BAD_REQUEST, "您的车牌号已预约登记");
+            return Result.no(Status.BAD_REQUEST, "您的车牌号已存在");
         }
         // 检查司机手机号码号是否已存在
         if (hasCarInfoByMobile(carParam.getDriverMobile())) {
-            return Result.no(Status.BAD_REQUEST, "您的联系方式已预约登记");
+            return Result.no(Status.BAD_REQUEST, "您的联系方式已存在");
         }
         Car car = Car
             .builder()
-            .labelCardStatus("1")
             .carNum(carParam.getCarNum())
             .carType(carParam.getCarType())
             .driverMobile(carParam.getDriverMobile())
@@ -81,20 +80,16 @@ public class CarServiceImpl implements CarService {
             return Result.no(Status.NOT_FOUND);
         }
         Car car = optional.get();
-        //如果标签卡在使用中无法修改
-        if (StrUtil.isNotBlank(car.getLabelCardStatus()) && "2".equals(car.getLabelCardStatus())) {
-            return Result.no(Status.BAD_REQUEST, "标签卡使用中,信息无法修改");
-        }
         if (!car.getCarNum().equals(carParam.getCarNum())) {
             // 当修改车牌号时才检查重复
             if (hasCarInfoByCarNum(carParam.getCarNum())) {
-                return Result.no(Status.BAD_REQUEST, "您的车牌号已预约登记");
+                return Result.no(Status.BAD_REQUEST, "您的车牌号信息已存在");
             }
         }
         if (!car.getDriverMobile().equals(carParam.getDriverMobile())) {
             // 当修改联系方式时才检查重复
             if (hasCarInfoByMobile(carParam.getDriverMobile())) {
-                return Result.no(Status.BAD_REQUEST, "您的联系方式已预约登记");
+                return Result.no(Status.BAD_REQUEST, "您的联系方式已存在");
             }
         }
         BeanUtils.copyProperties(carParam, car);
@@ -109,7 +104,6 @@ public class CarServiceImpl implements CarService {
             return Result.no(Status.NOT_FOUND);
         }
         Car car = optional.get();
-        car.setLabelCardStatus("3");
         car.setCardRecTime(LocalDateTime.now());
         Car carReuslt = carRepository.saveAndFlush(car);
         return Result.ok(carReuslt.getId());
@@ -122,7 +116,6 @@ public class CarServiceImpl implements CarService {
             return Result.no(Status.NOT_FOUND);
         }
         Car car = optional.get();
-        car.setLabelCardStatus("2");
         car.setCardSendTime(LocalDateTime.now());
         car.setLabelCard(labelCard);
         Car carReuslt = carRepository.saveAndFlush(car);
@@ -135,12 +128,7 @@ public class CarServiceImpl implements CarService {
         if (optional.isEmpty()) {
             return Result.no(Status.NOT_FOUND);
         }
-
-        //正在使用中的信息无法删除
         Car entity = optional.get();
-        if ("2".equals(entity.getLabelCardStatus())) {
-            return Result.no(Status.BAD_REQUEST, "标签卡使用中,信息无法删除");
-        }
         carRepository.delete(entity);
         return Result.ok();
     }
@@ -220,6 +208,7 @@ public class CarServiceImpl implements CarService {
 
             String fileName = URLEncoder.encode("车辆来访信息.xlsx", StandardCharsets.UTF_8);
             response.setContentType("application/octet-stream");
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
             response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
             OutputStream out = response.getOutputStream();
 
@@ -236,20 +225,16 @@ public class CarServiceImpl implements CarService {
 
     @Override
     public boolean hasCarInfoByCarNum(String param) {
-        Car entity = Car.builder().carNum(param).labelCardStatus("1").build();
+        Car entity = Car.builder().carNum(param).build();
         long count = carRepository.count(Example.of(entity));
-        entity = Car.builder().carNum(param).labelCardStatus("2").build();
-        long count1 = carRepository.count(Example.of(entity));
-        return count + count1 > 0;
+        return count > 0;
     }
 
     @Override
     public boolean hasCarInfoByMobile(String param) {
-        Car entity = Car.builder().driverMobile(param).labelCardStatus("1").build();
+        Car entity = Car.builder().driverMobile(param).build();
         long count = carRepository.count(Example.of(entity));
-        entity = Car.builder().driverMobile(param).labelCardStatus("2").build();
-        long count1 = carRepository.count(Example.of(entity));
-        return count + count1 > 0;
+        return count > 0;
     }
 
     @Override
@@ -312,12 +297,12 @@ public class CarServiceImpl implements CarService {
                 );
             }
 
-            if (StrUtil.isNotBlank(carParam.getLabelCardStatus())) {
-                //标签卡状态查询
-                list.add(
-                    criteriaBuilder.equal(root.get("labelCardStatus").as(String.class), carParam.getLabelCardStatus())
-                );
-            }
+            //            if (StrUtil.isNotBlank(carParam.getLabelCardStatus())) {
+            //                //标签卡状态查询
+            //                list.add(
+            //                    criteriaBuilder.equal(root.get("labelCardStatus").as(String.class), carParam.getLabelCardStatus())
+            //                );
+            //            }
 
             if (Objects.nonNull(carParam.getCardRecTimeStart()) && Objects.nonNull(carParam.getCardRecTimeEnd())) {
                 //收卡时间区间段查询

app/src/main/java/com/yiring/app/vo/car/CarVo.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.vo.car;
 
-import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.yiring.common.util.DictUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serial;
@@ -45,12 +43,12 @@ public class CarVo implements Serializable {
     @ApiModelProperty(value = "车辆类型(字典翻译)", example = "货车")
     String carTypeName;
 
-    public String getCarTypeName() {
-        if (StrUtil.isNotBlank(carType)) {
-            return DictUtils.getDictLabel("car_type", carType);
-        }
-        return null;
-    }
+    //    public String getCarTypeName() {
+    //        if (StrUtil.isNotBlank(carType)) {
+    //            return DictUtils.getDictLabel("car_type", carType);
+    //        }
+    //        return null;
+    //    }
 
     @ApiModelProperty(value = "司机名称", example = "张三")
     String driverName;
@@ -70,12 +68,12 @@ public class CarVo implements Serializable {
     @ApiModelProperty(value = "标签卡状态", example = "未发卡")
     String labelCardStatusName;
 
-    public String getLabelCardStatusName() {
-        if (StrUtil.isNotBlank(carType)) {
-            return DictUtils.getDictLabel("car_label_status", labelCardStatus);
-        }
-        return null;
-    }
+    //    public String getLabelCardStatusName() {
+    //        if (StrUtil.isNotBlank(carType)) {
+    //            return DictUtils.getDictLabel("car_label_status", labelCardStatus);
+    //        }
+    //        return null;
+    //    }
 
     @ApiModelProperty(value = "单位id", example = "湖南壹润科技")
     String orgId;