添加车辆模块

src/main/java/com/esv/freight/app/feign/VehicleInterface.java

+package com.esv.freight.app.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @description:
+ * @project: Freight
+ * @name: com.esv.freight.app.feign.VehicleInterface
+ * @author: 张志臣
+ * @email: zhangzhichen@esvtek.com
+ * @createTime: 2020/04/28 17:00
+ * @version:1.0
+ */
+@FeignClient(value = "freight-customer-service")
+public interface VehicleInterface {
+
+    /**
+     * 新增车辆
+     * @param bodyJson
+     * @return
+     */
+    @PostMapping(value = "customer/carrier/vehicle/add")
+    JSONObject add(JSONObject bodyJson);
+
+    /**
+     * 更新车辆
+     * @param bodyJson
+     * @return
+     */
+    @PostMapping(value = "customer/carrier/vehicle/edit")
+    JSONObject edit(JSONObject bodyJson);
+
+    /**
+     * 获取车辆详情
+     * @param bodyJson
+     * @return
+     */
+    @PostMapping(value = "customer/carrier/vehicle/detail")
+    JSONObject detail(JSONObject bodyJson);
+
+    /**
+     * 分页查询车辆列表
+     * @param bodyJson
+     * @return
+     */
+    @PostMapping(value = "customer/carrier/vehicle/list")
+    JSONObject list(JSONObject bodyJson);
+}

src/main/java/com/esv/freight/app/module/order/form/OrderForm.java

 package com.esv.freight.app.module.order.form;
 
-import com.esv.freight.app.common.util.DateUtils;
 import com.esv.freight.app.common.validator.groups.ValidatorDelete;
 import com.esv.freight.app.common.validator.groups.ValidatorInsert;
 import com.esv.freight.app.common.validator.groups.ValidatorList;
 import com.esv.freight.app.common.validator.groups.ValidatorUpdate;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-
-import javax.validation.constraints.*;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;
 
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Positive;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @description:

src/main/java/com/esv/freight/app/module/vehicle/form/VehicleQueryForm.java

+package com.esv.freight.app.module.vehicle.form;
+
+import com.esv.freight.app.common.validator.groups.ValidatorDetail;
+import com.esv.freight.app.common.validator.groups.ValidatorList;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+/**
+ * @description:
+ * @project: Freight
+ * @name: com.esv.freight.app.module.vehicle.form.VehicleQueryForm
+ * @author: 张志臣
+ * @email: zhangzhichen@esvtek.com
+ * @createTime: 2020/04/28 16:00
+ * @version:1.0
+ */
+@Data
+public class VehicleQueryForm {
+
+    /**
+     *
+     */
+    @NotNull(message = "参数id不能为空", groups = {ValidatorDetail.class})
+    private Long id;
+    /**
+     * 承运商帐号ID
+     */
+    private Long carrierId;
+    /**
+     * 车辆状态：1-正常、2-停用
+     */
+    @Pattern(regexp = "[12]", message = "参数vehicleStatus不合法", groups = {ValidatorList.class})
+    private String vehicleStatus;
+    /**
+     * 审核状态(字典表)：0-待审核、1-审核成功，2-审核失败
+     */
+    @Range(min = 0, max = 2, message = "参数auditStatus不合法", groups = {ValidatorList.class})
+    private Integer auditStatus;
+    /**
+     * 车牌号
+     */
+    @Length(max = 8, message = "参数licenseNumber长度不合法", groups = {ValidatorList.class})
+    private String licenseNumber;
+    /**
+     * 行驶证档案编号
+     */
+    @Length(max = 20, message = "参数vehicleLicenseNumber长度不合法", groups = {ValidatorList.class})
+    private String vehicleLicenseNumber;
+    /**
+     * 道路运输证号
+     */
+    @Length(max = 50, message = "参数ownerName长度不合法", groups = {ValidatorList.class})
+    private String roadCertificateNumber;
+    /**
+     * 车辆类型(字典表)
+     */
+    private Integer vehicleType;
+    /**
+     * 二级车辆类型(字典表)
+     */
+    private Integer vehicleType2;
+    /**
+     * 页码
+     **/
+    @Range(min = 1, max = 65535, message = "无效的pageNum", groups = {ValidatorList.class})
+    @NotNull(message = "参数pageNum不能为空", groups = {ValidatorList.class})
+    private Integer pageNum;
+    /**
+     * 每页记录条数
+     **/
+    @Range(min = 1, max = 100, message = "pageSize", groups = {ValidatorList.class})
+    @NotNull(message = "参数pageSize不能为空", groups = {ValidatorList.class})
+    private Integer pageSize;
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
+    }
+}

src/main/java/com/esv/freight/app/module/vehicle/vo/VehicleDetailVO.java

+package com.esv.freight.app.module.vehicle.vo;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * @description: 车辆详情VO
+ * @project: Freight
+ * @name: com.esv.freight.app.module.vehicle.vo.VehicleDetailVO
+ * @author: 张志臣
+ * @email: zhangzhichen@esvtek.com
+ * @createTime: 2020/04/28 16:00
+ * @version:1.0
+ */
+@Data
+public class VehicleDetailVO {
+    /**
+     *
+     */
+    private Long id;
+    /**
+     * 承运商帐号ID
+     */
+    private Long carrierId;
+    /**
+     * 承运商名称
+     */
+    private String carrierName;
+    /**
+     * 车牌号
+     */
+    private String licenseNumber;
+    /**
+     * 车辆状态：1-正常、2-停用
+     */
+    private String vehicleStatus;
+    /**
+     * 审核状态(字典表)：0-待审核、1-审核成功，2-审核失败
+     */
+    private Integer auditStatus;
+    /**
+     * 牌照类型(字典表)：1-大型汽车号牌、2-小型汽车号牌、3-其他号牌
+     */
+    private Integer licenseType;
+    /**
+     * 车牌颜色(字典表)：1-蓝色、2-黄色、3-黑色、4-白色、5-绿色、6-农黄色、7-农绿色、8-黄绿色、9-渐变绿、0-其他
+     */
+    private Integer licenseColor;
+    /**
+     * 车辆类型(字典表)
+     */
+    private Integer vehicleType;
+    /**
+     * 二级车辆类型(字典表)
+     */
+    private Integer vehicleType2;
+    /**
+     * 车辆长度(单位毫米)
+     */
+    private Integer vehicleLength;
+    /**
+     * 车辆宽度(单位毫米)
+     */
+    private Integer vehicleWidth;
+    /**
+     * 车辆高度(单位毫米)
+     */
+    private Integer vehicleHeight;
+    /**
+     * 车辆所属(字典表)：1-自有车、2-外协车
+     */
+    private Integer vehicleBelong;
+    /**
+     * 年审日期
+     */
+    private String yearAuditDate;
+    /**
+     * 能源类型(字典表)：1-汽油、2-柴油、3-电、4-混合油、5-天然气、6-液化石油气、7-甲醇、8-乙醇、9-太阳能、10-混合动力、99-其他
+     */
+    private Integer energyType;
+    /**
+     * 行驶证档案编号
+     */
+    private String vehicleLicenseNumber;
+    /**
+     * 核定载质量(吨)
+     */
+    private BigDecimal loadCapacity;
+    /**
+     * 总质量(吨)
+     */
+    private BigDecimal totalMass;
+    /**
+     * 整备质量(吨)
+     */
+    private BigDecimal unladenMass;
+    /**
+     * 车辆所有人
+     */
+    private String vehicleOwner;
+    /**
+     * 车辆所有人代码：企业-统一社会信用代码，个人-身份证号码
+     */
+    private String vehicleOwnerCode;
+    /**
+     * 使用性质
+     */
+    private String useNature;
+    /**
+     * 注册日期
+     */
+    private String registerDate;
+    /**
+     * 车辆识别代码
+     */
+    private String vin;
+    /**
+     * 品牌型号
+     */
+    private String brandModel;
+    /**
+     * 发动机号
+     */
+    private String engineNumber;
+    /**
+     * 发证日期
+     */
+    private String vehicleLicenseIssuedDate;
+    /**
+     * 检验有效期至
+     */
+    private String vehicleLicenseExpireDate;
+    /**
+     * 发证机关
+     */
+    private String vehicleLicenseIssueDepartment;
+    /**
+     * 道路运输证号
+     */
+    private String roadCertificateNumber;
+    /**
+     * 经营许可证号
+     */
+    private String businessLicenseNumber;
+    /**
+     * 经营许可证有效期至
+     */
+    private String businessLicenseExpireDate;
+    /**
+     * 车籍地-省份代码
+     */
+    private String vehicleProvinceCode;
+    /**
+     * 车籍地-市代码
+     */
+    private String vehicleCityCode;
+    /**
+     * 车籍地-区县代码
+     */
+    private String vehicleDistrictCode;
+    /**
+     * 是否开通ETC：1-已开通、2-未开通、3-未知
+     */
+    private String etc;
+    /**
+     * 上报状态(字典表)：0-未上报、1-上报成功、2-上报失败
+     */
+    private Integer uploadState;
+    /**
+     * 上报时间
+     */
+    private String uploadTime;
+    /**
+     * 车头照片URL
+     */
+    private String vehicleHeadUrl;
+    /**
+     * 人车合照URL
+     */
+    private String vehicleHeadPersonUrl;
+    /**
+     * 行驶证正面URL
+     */
+    private String vehicleLicenseFrontUrl;
+    /**
+     * 行驶证背面URL
+     */
+    private String vehicleLicenseBackUrl;
+    /**
+     * 道路运输证正面URL
+     */
+    private String roadCertificateFrontUrl;
+    /**
+     * 挂靠声明URL
+     */
+    private String attachedStatementUrl;
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
+    }
+}

src/main/java/com/esv/freight/app/module/vehicle/vo/VehicleListItemVO.java

+package com.esv.freight.app.module.vehicle.vo;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * @description: 车辆列表VO
+ * @project: Freight
+ * @name: com.esv.freight.app.module.vehicle.vo.VehicleListItemVO
+ * @author: 张志臣
+ * @email: zhangzhichen@esvtek.com
+ * @createTime: 2020/04/28 16:00
+ * @version:1.0
+ */
+@Data
+public class VehicleListItemVO {
+    /**
+     *
+     */
+    private Long id;
+    /**
+     * 车牌号
+     */
+    private String licenseNumber;
+    /**
+     * 车辆状态：1-正常、2-停用
+     */
+    private String vehicleStatus;
+    /**
+     * 审核状态(字典表)：0-待审核、1-审核成功，2-审核失败
+     */
+    private Integer auditStatus;
+    /**
+     * 车辆类型(字典表)
+     */
+    private Integer vehicleType;
+    /**
+     * 二级车辆类型(字典表)
+     */
+    private Integer vehicleType2;
+    /**
+     * 行驶证档案编号
+     */
+    private String vehicleLicenseNumber;
+    /**
+     * 道路运输证号
+     */
+    private String roadCertificateNumber;
+    /**
+     * 核定载质量(吨)
+     */
+    private BigDecimal loadCapacity;
+    /**
+     * 创建来源：1-平台创建、2-司机创建
+     */
+    private String sourceType;
+    /**
+     * 创建者
+     */
+    private String createUser;
+    /**
+     * 创建时间
+     */
+    private Long createTime;
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
+    }
+}

src/main/java/com/esv/freight/app/module/vehicle/vo/VehicleListVO.java

+package com.esv.freight.app.module.vehicle.vo;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.List;
+/**
+ * @description: 车辆列表VO
+ * @project: Freight
+ * @name: com.esv.freight.app.module.vehicle.vo.VehicleListVO
+ * @author: 张志臣
+ * @email: zhangzhichen@esvtek.com
+ * @createTime: 2020/04/28 16:00
+ * @version:1.0
+ */
+@Data
+public class VehicleListVO {
+
+    /**
+     * 每页记录条数
+     **/
+    private Long pageSize;
+
+    /**
+     * 当前页码
+     **/
+    private Long pageNum;
+
+    /**
+     * 总记录条数
+     **/
+    private Long total;
+
+    /**
+     * 当前页的记录条数
+     **/
+    private Long recordSize;
+
+    /**
+     * 数据
+     **/
+    private List<VehicleListItemVO> record;
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
+    }
+}