1、请求参数为集合时校验

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/ValidateList.java → sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/model/ValiList.java

@@ -1,4 +1,4 @@
-package com.sckw.excel.utils;
+package com.sckw.core.web.model;
 
 import jakarta.validation.Valid;
 import lombok.Data;
@@ -8,12 +8,12 @@ import java.util.*;
 /**
  * @author JiangPan
  * @version 1.0.0
- * @ClassName ValidateList.java
+ * @ClassName ValiList.java
  * @Description List集合验证工具类
  * @createTime 2021年10月20日 15:29:00
  */
 @Data
-public class ValidateList<E> implements List<E> {
+public class ValiList<E> implements List<E> {
 
     @Valid
     private List<E> list = new ArrayList<>();

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/ValidUtil.java

@@ -1,13 +1,13 @@
 package com.sckw.excel.utils;
 
 import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.core.web.model.ValiList;
 import com.sckw.core.web.response.HttpResult;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.HibernateValidator;
-
 import java.util.List;
 import java.util.Set;
 
@@ -41,7 +41,7 @@ public class ValidUtil {
      */
     public static HttpResult serviceValid(Object object) {
         if (object instanceof List) {
-            ValidateList<Object> validateObj = new ValidateList<>();
+            ValiList<Object> validateObj = new ValiList<>();
             validateObj.addAll((List) object);
             object = validateObj;
         }
@@ -73,7 +73,7 @@ public class ValidUtil {
      */
     public static HttpResult serviceValid(Object object, Class... validateGroup) {
         if (object instanceof List) {
-            ValidateList<Object> validateObj = new ValidateList<>();
+            ValiList<Object> validateObj = new ValiList<>();
             validateObj.addAll((List) object);
             object = validateObj;
         }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtWaybillOrderController.java

@@ -3,10 +3,10 @@ package com.sckw.transport.controller;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
+import com.sckw.core.web.model.ValiList;
 import com.sckw.transport.model.dto.SendCarDto1;
 import com.sckw.transport.service.DriverService;
 import com.sckw.transport.service.KwtWaybillOrderService;
-import com.sckw.transport.model.dto.ValidList;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +67,7 @@ public class KwtWaybillOrderController {
      * @date 2023/5/30
      **/
     @PostMapping("/sendCar")
-    public HttpResult commitSendCar(@RequestBody @Valid ValidList<SendCarDto1> params){
+    public HttpResult commitSendCar(@RequestBody @Valid ValiList<SendCarDto1> params){
         if (CollectionUtils.isEmpty(params)) {
             return HttpResult.error("请选择委派车辆信息！");
         }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/SendCarDto1.java

@@ -2,10 +2,7 @@ package com.sckw.transport.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.*;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
@@ -43,13 +40,13 @@ public class SendCarDto1 {
      * 车牌号
      */
     @JsonProperty("truckNo")
-    @NotNull(message = "车牌号不能为空")
+    @NotBlank(message = "车牌号不能为空")
     private String truckNo;
 
     /**
      * 上游给运单委派量
      */
-    @JsonProperty("loadAmount")
+    @JsonProperty("entrustAmount")
     @NotNull(message = "核定载量不能为空")
     @DecimalMin(value= "0", inclusive=false, message = "核定载量必须等于或大于0")
     private Double entrustAmount;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/ValidList.java

@@ -1,138 +0,0 @@
-package com.sckw.transport.model.dto;
-
-import jakarta.validation.Valid;
-import java.util.*;
-
-/**
- * @author zk
- * @desc TODO
- * @date 2023/7/19 0019
- */
-public class ValidList<E> implements List<E> {
-
-    @Valid
-    private List<E> list = new ArrayList<>();
-
-    public List<E> getList() {
-        return list;
-    }
-
-    public void setList(List<E> list) {
-        this.list = list;
-    }
-
-    @Override
-    public int size() {
-        return list.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return list.isEmpty();
-    }
-
-    @Override
-    public boolean contains(Object o) {
-        return list.contains(o);
-    }
-
-    @Override
-    public Iterator<E> iterator() {
-        return list.iterator();
-    }
-
-    @Override
-    public Object[] toArray() {
-        return list.toArray();
-    }
-
-    @Override
-    public <T> T[] toArray(T[] a) {
-        return list.toArray(a);
-    }
-
-    @Override
-    public boolean add(E e) {
-        return list.add(e);
-    }
-
-    @Override
-    public boolean remove(Object o) {
-        return list.remove(o);
-    }
-
-    @Override
-    public boolean containsAll(Collection<?> c) {
-        return list.contains(c);
-    }
-
-    @Override
-    public boolean addAll(Collection<? extends E> c) {
-        return list.addAll(c);
-    }
-
-    @Override
-    public boolean addAll(int index, Collection<? extends E> c) {
-        return list.addAll(index, c);
-    }
-
-    @Override
-    public boolean removeAll(Collection<?> c) {
-        return list.removeAll(c);
-    }
-
-    @Override
-    public boolean retainAll(Collection<?> c) {
-        return list.retainAll(c);
-    }
-
-    @Override
-    public void clear() {
-        list.clear();
-    }
-
-    @Override
-    public E get(int index) {
-        return list.get(index);
-    }
-
-    @Override
-    public E set(int index, E element) {
-        return list.set(index, element);
-    }
-
-    @Override
-    public void add(int index, E element) {
-        list.add(index, element);
-    }
-
-    @Override
-    public E remove(int index) {
-        return list.remove(index);
-    }
-
-    @Override
-    public int indexOf(Object o) {
-        return list.indexOf(o);
-    }
-
-    @Override
-    public int lastIndexOf(Object o) {
-        return list.lastIndexOf(o);
-    }
-
-    @Override
-    public ListIterator<E> listIterator() {
-        return list.listIterator();
-    }
-
-    @Override
-    public ListIterator<E> listIterator(int index) {
-        return list.listIterator(index);
-    }
-
-    @Override
-    public List<E> subList(int fromIndex, int toIndex) {
-        return list.subList(fromIndex, toIndex);
-    }
-}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -5,12 +5,12 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.dao.KwtLogisticsOrderMapper;
 import com.sckw.transport.model.KwtLogisticsOrder;
 import com.sckw.transport.model.dto.SendCarDto1;
-import com.sckw.transport.model.dto.ValidList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author zk
@@ -30,7 +30,7 @@ public class KwtWaybillOrderService {
      * @date 2023/7/19
      **/
     @Transactional(rollbackFor = Exception.class)
-    public HttpResult commitSendCar(ValidList<SendCarDto1> params) {
+    public HttpResult commitSendCar(List<SendCarDto1> params) {
         /**校验是车辆委托量否超过物流订单剩余量**/
         //承运单信息
         KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(params.get(0).getLOrderId());