1:新增校验

2:运输服务vo-dto增加

sckw-common/sckw-common-core/pom.xml

@@ -88,12 +88,6 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
 
-        <!-- validation -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-http</artifactId>
@@ -119,6 +113,12 @@
             <artifactId>tomcat-embed-core</artifactId>
         </dependency>
 
+        <!-- validation -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>

sckw-common/sckw-common-excel/pom.xml

@@ -41,17 +41,6 @@
             </exclusions>
         </dependency>
 
-        <!-- validation -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>

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

@@ -0,0 +1,97 @@
+package com.sckw.excel.utils;
+
+import com.sckw.core.web.constant.HttpStatus;
+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;
+
+/**
+ * @author JiangPan
+ * @version 1.0.0
+ * @ClassName ValidUtil.java
+ * @Description 参数校验工具类
+ * @createTime 2021年10月20日 13:35:00
+ */
+public class ValidUtil {
+
+    private static Validator validator;
+
+    static {
+        //初始化检查器
+        validator = Validation.byProvider(HibernateValidator.class)
+                .configure()
+                .failFast(false)
+                .buildValidatorFactory()
+                .getValidator();
+    }
+    /**
+     * 功能详细描述: service 层参数校验工具类
+     *
+     * @param object 待校验参数
+     * @methodName: serviceValid
+     * @return: com.alibaba.fastjson.JSONObject
+     * @Author: JiangPan
+     * @date: 2021/10/20 14:51
+     */
+    public static HttpResult serviceValid(Object object) {
+        if (object instanceof List) {
+            ValidateList<Object> validateObj = new ValidateList<>();
+            validateObj.addAll((List) object);
+            object = validateObj;
+        }
+        StringBuilder validMsg = new StringBuilder();
+        //校验
+        Set<ConstraintViolation<Object>> set = validator.validate(object);
+        //获取检查结果
+        for (ConstraintViolation<Object> voset : set) {
+            validMsg.append(voset.getPropertyPath())
+                    .append(":")
+                    .append(voset.getMessage())
+                    .append(";");
+        }
+        if (StringUtils.isNotBlank(validMsg)) {
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE,validMsg.toString());
+        }
+        return HttpResult.ok();
+    }
+
+    /**
+     * 功能详细描述: service 层参数校验工具类
+     *
+     * @param object        待校验参数
+     * @param validateGroup 校验规则分组
+     * @methodName: serviceValid
+     * @return: com.owinfo.config.result.Result
+     * @Author: JiangPan
+     * @date: 2021/12/22 10:47
+     */
+    public static HttpResult serviceValid(Object object, Class... validateGroup) {
+        if (object instanceof List) {
+            ValidateList<Object> validateObj = new ValidateList<>();
+            validateObj.addAll((List) object);
+            object = validateObj;
+        }
+        StringBuilder validMsg = new StringBuilder();
+        //校验
+        Set<ConstraintViolation<Object>> set = validator.validate(object, validateGroup);
+        //获取检查结果
+        for (ConstraintViolation<Object> voset : set) {
+            validMsg.append(voset.getPropertyPath())
+                    .append(":")
+                    .append(voset.getMessage())
+                    .append(";");
+        }
+        if (StringUtils.isNotBlank(validMsg)) {
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE,validMsg.toString());
+        }
+        return HttpResult.ok();
+    }
+
+
+}

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

@@ -0,0 +1,137 @@
+package com.sckw.excel.utils;
+
+import jakarta.validation.Valid;
+import lombok.Data;
+
+import java.util.*;
+
+/**
+ * @author JiangPan
+ * @version 1.0.0
+ * @ClassName ValidateList.java
+ * @Description List集合验证工具类
+ * @createTime 2021年10月20日 15:29:00
+ */
+@Data
+public class ValidateList<E> implements List<E> {
+
+    @Valid
+    private List<E> list = new ArrayList<>();
+
+    @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.containsAll(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-example/src/main/resources/bootstrap-dev.yml

@@ -1,3 +1,9 @@
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
 spring:
   cloud:
     nacos:
@@ -17,12 +23,6 @@ spring:
         namespace: sckw_zk
         # 共享配置
         group: sckw-service-platform
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
   data:
     # sentinel降级配置
     sentinel:

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -5,6 +5,7 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.file.service.FileService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,8 +67,8 @@ public class FileApiController {
      * OSS下载文件/获取文件地址
      * @return
      */
-    @GetMapping("/fileDownload")
-    public HttpResult fileDownload(String fileName) {
+    @RequestMapping(value = "/fileDownload",method = RequestMethod.GET)
+    public HttpResult fileDownload(@NotBlank @RequestParam("fileName") String fileName) {
         try {
             fileService.fileDownload(fileName);
             return HttpResult.ok();
@@ -82,7 +83,7 @@ public class FileApiController {
      * @param fileName  kll/uploads/20230621/07ccbec381a011d121a215719199ac49.html
      * @return
      */
-    @GetMapping("/remove")
+    @RequestMapping(value = "/remove",method = RequestMethod.GET)
     public HttpResult remove(String fileName) {
         //获取上传文件
         fileService.remove(fileName);

sckw-modules/sckw-file/src/main/java/com/sckw/file/utils/FileUtils.java

@@ -387,7 +387,7 @@ public class FileUtils {
 //        System.out.println("contentType:" + contentType);
 //        System.out.println("contentType1:" + contentType1);
         //设置响应内容类型，当设置了ContentType为“image/jpg”时，浏览器可以直接显示图片；
-        response.setContentType(contentType);
+//        response.setContentType(contentType);
         BufferedInputStream in = new BufferedInputStream(ossObject.getObjectContent());
         try {
             BufferedOutputStream out = new BufferedOutputStream(response.getOutputStream());

sckw-modules/sckw-file/src/main/resources/bootstrap-dev.yml

@@ -1,3 +1,9 @@
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
 spring:
   cloud:
     nacos:
@@ -17,12 +23,6 @@ spring:
         namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
   data:
     # sentinel降级配置
     sentinel:

sckw-modules/sckw-message/src/main/resources/bootstrap-dev.yml

@@ -1,3 +1,9 @@
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
 spring:
   cloud:
     nacos:
@@ -17,14 +23,6 @@ spring:
         namespace: sckw_zk
         # 共享配置
         group: sckw-service-platform
-
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
-
   data:
     # sentinel降级配置
     sentinel:

sckw-modules/sckw-order/src/main/resources/bootstrap-dev.yml

@@ -1,3 +1,9 @@
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
 spring:
   cloud:
     nacos:
@@ -17,14 +23,6 @@ spring:
         namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
-
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
-
   data:
     # sentinel降级配置
     sentinel:

sckw-modules/sckw-product/src/main/resources/bootstrap-dev.yml

@@ -1,3 +1,9 @@
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
 spring:
   cloud:
     nacos:
@@ -17,14 +23,6 @@ spring:
         namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
-
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
-
   data:
     # sentinel降级配置
     sentinel:

sckw-modules/sckw-system/src/main/resources/bootstrap-dev.yml

@@ -1,3 +1,9 @@
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
 spring:
   cloud:
     nacos:
@@ -17,14 +23,6 @@ spring:
         namespace: sckw_zk
         # 共享配置
         group: sckw-service-platform
-
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
-
   data:
     # sentinel降级配置
     sentinel:

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/AcceptCarriageOrderQuery.java

@@ -1,14 +1,17 @@
 package com.sckw.transport.model.param;
 
+import com.sckw.core.model.page.PageRequest;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author lfdc
  * @description 承运订单条件查询
  * @date 2023-06-26 17:06:25
  */
 @Data
-public class AcceptCarriageOrderQuery {
+public class AcceptCarriageOrderQuery extends PageRequest implements Serializable {
     /**
      * 订单id
      */
@@ -21,14 +24,24 @@ public class AcceptCarriageOrderQuery {
      * 货物名称
      */
     private String goodsName;
+
+    /**
+     *装载地点
+     */
+    private String stowageAddress;
+
+    /**
+     * 卸载地点
+     */
+    private String unloadAddress;
     /**
      * 开始时间
      */
-    private String dataStart;
+    private String startDate;
     /**
      * 结束时间
      */
-    private String dataEnd;
+    private String endDate;
     /**
      * 计费方式
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/AcceptCarriageOrderVo.java

@@ -0,0 +1,126 @@
+package com.sckw.transport.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lfdc
+ * @description 承运订单VO
+ * @date 2023-06-27 10:06:30
+ */
+@Data
+public class AcceptCarriageOrderVo {
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 承运订单号
+     */
+    private String orderId;
+    /**
+     * 托运单位
+     */
+    private String companyName;
+    /**
+     * 货物名称
+     */
+    private String goodsName;
+    /**
+     * 分配承运量
+     */
+    private String carryingCapacity;
+    /**
+     * 装货地点
+     */
+    private String stowageAddress;
+    /**
+     * 卸货地点
+     */
+    private String unloadAddress;
+    /**
+     * 运价
+     */
+    private String freightRate;
+    /**
+     * 结算周期
+     */
+    private String accountsCycle;
+    /**
+     * 计费方式
+     */
+    private String billingMode;
+    /**
+     * 合理损耗
+     */
+    private String wastage;
+    /**
+     * 扣亏货值/元/吨
+     */
+    private String defectiveValue;
+    /**
+     * 承运联系人
+     */
+    private String acceptCarriagePerson;
+    /**
+     * 承运联系电话
+     */
+    private String acceptCarriageTel;
+    /**
+     * 托运单位
+     */
+    private String consignCompany;
+    /**
+     * 托运联系人
+     */
+    private String consignPerson;
+    /**
+     * 托运联系电话
+     */
+    private String consignTel;
+    /**
+     * 发货联系人
+     */
+    private String shipmentsPerson;
+    /**
+     * 发货电话
+     */
+    private String shipmentsTel;
+    /**
+     * 收货联系人
+     */
+    private String receiveGoodsPerson;
+    /**
+     * 收货电话
+     */
+    private String receiveGoodsTel;
+    /**
+     * 计划发货时间
+     */
+    private String shipmentsDate;
+    /**
+     * 计划收货时间
+     */
+    private String ReceiveGoodsDate;
+    /**
+     * 合同
+     */
+    private String contract;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 发起人
+     */
+    private String appointor;
+    /**
+     * 计划时间
+     */
+    private String plannedDate;
+
+    private List<CarWaybillVo> carWaybillList;
+    private List<ConsignmentVo> consignmentList;
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarWaybillVo.java

@@ -0,0 +1,74 @@
+package com.sckw.transport.model.vo;
+
+import lombok.Data;
+
+/**
+ * @author lfdc
+ * @description 车辆运单
+ * @date 2023-06-27 11:06:08
+ */
+@Data
+public class CarWaybillVo {
+
+    /**
+     * 运单编号
+     */
+    private String waybillNumber;
+    /**
+     * 车辆
+     */
+    private String carNumber;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 运单类型
+     */
+    private String waybillType;
+    /**
+     * 司机
+     */
+    private String driver;
+    /**
+     * 承运车队
+     */
+    private String consignMotorcade;
+    /**
+     * 派车量/吨
+     */
+    private String sendCarWeigh;
+    /**
+     * 派车时间
+     */
+    private String sendCarDate;
+    /**
+     * 实装量/吨
+     */
+    private String stowageWeigh;
+    /**
+     * 装货时间
+     */
+    private String stowageDate;
+    /**
+     * 实卸量/吨
+     */
+    private String unloadWeigh;
+    /**
+     * 卸货时间
+     */
+    private String unloadDate;
+    /**
+     * 亏吨量/吨
+     */
+    private String defectiveWeigh;
+    /**
+     * 扣亏量/吨
+     */
+    private String deduct;
+    /**
+     * 派车人
+     */
+    private String appointor;
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ConsignmentVo.java

@@ -0,0 +1,13 @@
+package com.sckw.transport.model.vo;
+
+import lombok.Data;
+
+/**
+ * @author lfdc
+ * @description 分包托运vo
+ * @date 2023-06-27 11:06:08
+ */
+@Data
+public class ConsignmentVo {
+
+}

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

@@ -1,10 +1,20 @@
 package com.sckw.transport.service;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.model.page.PageHelperUtil;
+import com.sckw.core.model.page.PageResult;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
+import com.sckw.transport.model.vo.AcceptCarriageOrderVo;
+import com.sckw.transport.model.vo.CarWaybillVo;
+import com.sckw.transport.model.vo.ConsignmentVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author lfdc
  * @description 承运订单service
@@ -15,10 +25,23 @@ import org.springframework.stereotype.Service;
 public class AcceptCarriageOrderService {
 
     public HttpResult list(AcceptCarriageOrderQuery query) {
-        return null;
+        List<AcceptCarriageOrderVo> list=new ArrayList<>();
+        AcceptCarriageOrderVo acceptCarriageOrderVo = new AcceptCarriageOrderVo();
+        List<CarWaybillVo> carWaybillVoList = new ArrayList<>();
+        List<ConsignmentVo> consignmentVos = new ArrayList<>();
+        acceptCarriageOrderVo.setCarWaybillList(carWaybillVoList);
+        acceptCarriageOrderVo.setConsignmentList(consignmentVos);
+        list.add(acceptCarriageOrderVo);
+        PageHelper.startPage(query.getPageNum(), query.getPageSize());
+        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
+        return HttpResult.ok(pageResult);
     }
 
     public HttpResult count(AcceptCarriageOrderQuery query) {
         return null;
     }
+
+    public HttpResult subcontractConsignment(AcceptCarriageOrderQuery query) {
+        return null;
+    }
 }

sckw-modules/sckw-transport/src/main/resources/bootstrap-dev.yml

@@ -1,3 +1,9 @@
+# seata-sentinel读取的nacos配置
+lfdc:
+  nacos:
+    server-addr: 10.10.10.230:8848
+    namespace: sckw-service-platform-dev
+    group: sckw-service-platform
 spring:
   cloud:
     nacos:
@@ -17,12 +23,6 @@ spring:
         namespace: sckw-service-platform-dev
         # 共享配置
         group: sckw-service-platform
-# seata-sentinel读取的nacos配置
-lfdc:
-  nacos:
-    server-addr: 10.10.10.230:8848
-    namespace: sckw-service-platform-dev
-    group: sckw-service-platform
   data:
     # sentinel降级配置
     sentinel: