优化

admin-web/src/views/admin/investor/index.vue

@@ -42,7 +42,7 @@
         </el-input>
         <el-input
             v-model="state.formQuery.stationId"
-            placeholder="站点id"
+            placeholder="站点ID"
             clearable
             @blur="loadData(true)"
             class="wd150 mr10">

admin-web/src/views/admin/station/list/dialog.vue

@@ -26,7 +26,7 @@
             <el-form-item label="站点ID：" prop="stationId" class="wd350">
               <el-input
                   v-model="state.ruleForm.stationId"
-                  placeholder="站点id"
+                  placeholder="站点ID"
                   clearable
                   class="wd100">
               </el-input>
@@ -260,7 +260,7 @@ const formRef = ref();
 //定义初始变量，重置使用
 const initState = () => ({
   ruleForm: {
-    id: 0,
+    id: null,
     location: {}
   },
   feeForm: {

car-wash-admin/src/main/java/com/kym/admin/controller/WashStationController.java

@@ -7,6 +7,7 @@ import com.kym.entity.WashStation;
 import com.kym.entity.queryParams.StationQueryParams;
 import com.kym.service.WashStationService;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -61,7 +62,7 @@ public class WashStationController {
     @SaCheckPermission("washStation.add")
     @SysLog("新建")
     @PostMapping("add")
-    R<?> add(@RequestBody WashStation station) {
+    R<?> add(@RequestBody @Validated WashStation station) {
         washStationService.add(station);
         return R.success();
     }

car-wash-common/src/main/java/com/kym/common/handler/GlobalExceptionHandler.java

@@ -14,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.BindException;
+import org.springframework.validation.FieldError;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -102,12 +103,16 @@ public class GlobalExceptionHandler {
      * @return
      */
     @ExceptionHandler(value = {BindException.class, ValidationException.class})
-    public R handleValidatedException(Exception e) {
+    public R<?> handleValidatedException(Exception e) {
         String message = "";
         if (e instanceof MethodArgumentNotValidException) {
-            message = ((MethodArgumentNotValidException) e).getBindingResult().getAllErrors().stream()
-                    .map(ObjectError::getDefaultMessage)
-                    .collect(Collectors.joining("; "));
+//            message = ((MethodArgumentNotValidException) e).getBindingResult().getAllErrors().stream()
+//                    .map(ObjectError::getDefaultMessage)
+//                    .collect(Collectors.joining("; "));
+
+                FieldError firstError = ((MethodArgumentNotValidException) e).getBindingResult().getFieldErrors().get(0);
+                return R.failed(HttpStatus.BAD_REQUEST.value(),firstError.getDefaultMessage());
+
         } else if (e instanceof ConstraintViolationException) {
             message = ((ConstraintViolationException) e).getConstraintViolations().stream()
                     .map(ConstraintViolation::getMessage)

car-wash-entity/src/main/java/com/kym/entity/StationFeeRate.java

@@ -3,6 +3,9 @@ package com.kym.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;
 import java.io.Serializable;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -24,11 +27,13 @@ public class StationFeeRate extends BaseEntity {
     /**
      * 站点id
      */
+    @NotEmpty(message = "站点ID不能为空")
     private String stationId;
 
     /**
      * 平台费率表id
      */
+    @NotNull(message = "费率模版不能为空")
     private Long feeRateId;
 
     /**

car-wash-entity/src/main/java/com/kym/entity/WashStation.java

@@ -3,6 +3,9 @@ package com.kym.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.kym.entity.BaseEntity;
 import java.io.Serializable;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -24,11 +27,13 @@ public class WashStation extends BaseEntity {
     /**
      * 站点id
      */
+    @NotEmpty(message = "站点ID不能为空")
     private String stationId;
 
     /**
      * 站点名称
      */
+    @NotEmpty(message = "站点名称不能为空")
     private String stationName;
 
     /**
@@ -59,6 +64,7 @@ public class WashStation extends BaseEntity {
     /**
      * 工位数量
      */
+    @NotNull(message = "工位数量不能为空")
     private Integer parkingNum;
 
     /**

car-wash-service/src/main/java/com/kym/service/impl/WashStationServiceImpl.java

@@ -47,8 +47,7 @@ public class WashStationServiceImpl extends MyBaseServiceImpl<WashStationMapper,
 
     @Override
     public void add(WashStation station) {
-        CommUtil.assertsNonNulls(List.of(station.getStationName(), station.getStationId(), station.getStationType()), "参数异常");
-        Long count = lambdaQuery().eq(WashStation::getStationName, station.getStationName()).count();
+        Long count = lambdaQuery().eq(WashStation::getStationId, station.getStationId()).count();
         CommUtil.asserts(count == 0, "站点已存在");
         save(station);