first commit
This commit is contained in:
@@ -0,0 +1,185 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<groupId>com.mhd</groupId>
|
||||
<artifactId>mhd-common</artifactId>
|
||||
<version>3.6.0</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>mhd-common-core</artifactId>
|
||||
|
||||
<description>
|
||||
mhd-common-core核心模块
|
||||
</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.json</groupId>
|
||||
<artifactId>json</artifactId>
|
||||
<version>20180130</version>
|
||||
</dependency>
|
||||
<!-- SpringCloud Openfeign -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-openfeign</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- SpringCloud Loadbalancer -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring Context Support -->
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context-support</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring Web -->
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-web</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- OSS云存储图片 start-->
|
||||
<!-- https://mvnrepository.com/artifact/com.aliyun.oss/aliyun-sdk-oss -->
|
||||
<dependency>
|
||||
<groupId>com.aliyun.oss</groupId>
|
||||
<artifactId>aliyun-sdk-oss</artifactId>
|
||||
<version>3.7.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/net.coobird/thumbnailator图片压缩工具包 -->
|
||||
<dependency>
|
||||
<groupId>net.coobird</groupId>
|
||||
<artifactId>thumbnailator</artifactId>
|
||||
<version>0.4.8</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Transmittable ThreadLocal -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>transmittable-thread-local</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Pagehelper -->
|
||||
<dependency>
|
||||
<groupId>com.github.pagehelper</groupId>
|
||||
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Hibernate Validator -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Jackson -->
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Alibaba Fastjson -->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.fastjson2</groupId>
|
||||
<artifactId>fastjson2</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Jwt -->
|
||||
<dependency>
|
||||
<groupId>io.jsonwebtoken</groupId>
|
||||
<artifactId>jjwt</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Jaxb -->
|
||||
<dependency>
|
||||
<groupId>javax.xml.bind</groupId>
|
||||
<artifactId>jaxb-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Apache Lang3 -->
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Commons Io -->
|
||||
<dependency>
|
||||
<groupId>commons-io</groupId>
|
||||
<artifactId>commons-io</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Commons Fileupload -->
|
||||
<dependency>
|
||||
<groupId>commons-fileupload</groupId>
|
||||
<artifactId>commons-fileupload</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 离线IP地址定位库 -->
|
||||
<dependency>
|
||||
<groupId>org.lionsoul</groupId>
|
||||
<artifactId>ip2region</artifactId>
|
||||
<version>2.7.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- excel工具 -->
|
||||
<dependency>
|
||||
<groupId>org.apache.poi</groupId>
|
||||
<artifactId>poi-ooxml</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>easyexcel</artifactId>
|
||||
<version>3.2.1</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- Java Servlet -->
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Swagger -->
|
||||
<dependency>
|
||||
<groupId>io.swagger</groupId>
|
||||
<artifactId>swagger-annotations</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!--lombok工具-->
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.18.4</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>5.8.16</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>29.0-jre</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-test</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.baomidou</groupId>
|
||||
<artifactId>mybatis-plus-annotation</artifactId>
|
||||
<version>3.3.2</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
package com.mhd.common.core.annotation;
|
||||
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator;
|
||||
import com.fasterxml.jackson.databind.JsonSerializer;
|
||||
import com.fasterxml.jackson.databind.SerializerProvider;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description
|
||||
* @Author zg
|
||||
* @Version 1.0
|
||||
* @Date 2023/10/30 17:31
|
||||
*/
|
||||
public class DateNullToStringSerializer extends JsonSerializer<Date> {
|
||||
|
||||
|
||||
@Override
|
||||
public void serialize(Date value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
|
||||
gen.writeString("");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,178 @@
|
||||
package com.mhd.common.core.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import com.mhd.common.core.utils.poi.ExcelHandlerAdapter;
|
||||
import org.apache.poi.ss.usermodel.HorizontalAlignment;
|
||||
import org.apache.poi.ss.usermodel.IndexedColors;
|
||||
|
||||
/**
|
||||
* 自定义导出Excel数据注解
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target(ElementType.FIELD)
|
||||
public @interface Excel
|
||||
{
|
||||
/**
|
||||
* 导出时在excel中排序
|
||||
*/
|
||||
public int sort() default Integer.MAX_VALUE;
|
||||
|
||||
/**
|
||||
* 导出到Excel中的名字.
|
||||
*/
|
||||
public String name() default "";
|
||||
|
||||
/**
|
||||
* 日期格式, 如: yyyy-MM-dd
|
||||
*/
|
||||
public String dateFormat() default "";
|
||||
|
||||
/**
|
||||
* 读取内容转表达式 (如: 0=男,1=女,2=未知)
|
||||
*/
|
||||
public String readConverterExp() default "";
|
||||
|
||||
/**
|
||||
* 分隔符,读取字符串组内容
|
||||
*/
|
||||
public String separator() default ",";
|
||||
|
||||
/**
|
||||
* BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
|
||||
*/
|
||||
public int scale() default -1;
|
||||
|
||||
/**
|
||||
* BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
|
||||
*/
|
||||
public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
|
||||
|
||||
/**
|
||||
* 导出时在excel中每个列的高度 单位为字符
|
||||
*/
|
||||
public double height() default 14;
|
||||
|
||||
/**
|
||||
* 导出时在excel中每个列的宽 单位为字符
|
||||
*/
|
||||
public double width() default 16;
|
||||
|
||||
/**
|
||||
* 文字后缀,如% 90 变成90%
|
||||
*/
|
||||
public String suffix() default "";
|
||||
|
||||
/**
|
||||
* 当值为空时,字段的默认值
|
||||
*/
|
||||
public String defaultValue() default "";
|
||||
|
||||
/**
|
||||
* 提示信息
|
||||
*/
|
||||
public String prompt() default "";
|
||||
|
||||
/**
|
||||
* 设置只能选择不能输入的列内容.
|
||||
*/
|
||||
public String[] combo() default {};
|
||||
|
||||
/**
|
||||
* 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
|
||||
*/
|
||||
public boolean isExport() default true;
|
||||
|
||||
/**
|
||||
* 另一个类中的属性名称,支持多级获取,以小数点隔开
|
||||
*/
|
||||
public String targetAttr() default "";
|
||||
|
||||
/**
|
||||
* 是否自动统计数据,在最后追加一行统计数据总和
|
||||
*/
|
||||
public boolean isStatistics() default false;
|
||||
|
||||
/**
|
||||
* 导出类型(0数字 1字符串)
|
||||
*/
|
||||
public ColumnType cellType() default ColumnType.STRING;
|
||||
|
||||
/**
|
||||
* 导出列头背景色
|
||||
*/
|
||||
public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
|
||||
|
||||
/**
|
||||
* 导出列头字体颜色
|
||||
*/
|
||||
public IndexedColors headerColor() default IndexedColors.WHITE;
|
||||
|
||||
/**
|
||||
* 导出单元格背景色
|
||||
*/
|
||||
public IndexedColors backgroundColor() default IndexedColors.WHITE;
|
||||
|
||||
/**
|
||||
* 导出单元格字体颜色
|
||||
*/
|
||||
public IndexedColors color() default IndexedColors.BLACK;
|
||||
|
||||
/**
|
||||
* 导出字段对齐方式
|
||||
*/
|
||||
public HorizontalAlignment align() default HorizontalAlignment.CENTER;
|
||||
|
||||
/**
|
||||
* 自定义数据处理器
|
||||
*/
|
||||
public Class<?> handler() default ExcelHandlerAdapter.class;
|
||||
|
||||
/**
|
||||
* 自定义数据处理器参数
|
||||
*/
|
||||
public String[] args() default {};
|
||||
|
||||
/**
|
||||
* 字段类型(0:导出导入;1:仅导出;2:仅导入)
|
||||
*/
|
||||
Type type() default Type.ALL;
|
||||
|
||||
public enum Type
|
||||
{
|
||||
ALL(0), EXPORT(1), IMPORT(2);
|
||||
private final int value;
|
||||
|
||||
Type(int value)
|
||||
{
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public int value()
|
||||
{
|
||||
return this.value;
|
||||
}
|
||||
}
|
||||
|
||||
public enum ColumnType
|
||||
{
|
||||
NUMERIC(0), STRING(1), IMAGE(2);
|
||||
private final int value;
|
||||
|
||||
ColumnType(int value)
|
||||
{
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public int value()
|
||||
{
|
||||
return this.value;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.mhd.common.core.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* Excel注解集
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
@Target(ElementType.FIELD)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface Excels
|
||||
{
|
||||
Excel[] value();
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package com.mhd.common.core.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title ValidateJob
|
||||
* @description: Job请求校验注解
|
||||
* @date 2024/3/25 18:18
|
||||
**/
|
||||
@Target({ElementType.METHOD})
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Documented
|
||||
public @interface ValidateJob {
|
||||
}
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
package com.mhd.common.core.annotation.fieldsetvalue;
|
||||
|
||||
import com.mhd.common.core.domain.po.thirdparty.SysDepartInterfaceInfoPo;
|
||||
import com.mhd.common.core.domain.thirdparty.SysDepartInterfaceInfoDTO;
|
||||
import com.mhd.common.core.oss.configure.OSSClientPrivateUtil;
|
||||
import com.mhd.common.core.feign.ThirdPartyServiceFeign;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 公共 应用服务层
|
||||
* <p>
|
||||
* 本层可以综合应用各种业务间的组合
|
||||
* <p>
|
||||
* 2023-02-20
|
||||
*
|
||||
* @author 王子豪
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class CommonService {
|
||||
@Resource
|
||||
private ThirdPartyServiceFeign thirdPartyServiceFeign;
|
||||
|
||||
/**
|
||||
* @Description Object对象获取解密图片信息
|
||||
* @Author Alex
|
||||
* @Date 2023/5/4 10:26
|
||||
*/
|
||||
public Object getObjectSignPrivateURL(Object obj) {
|
||||
//查询三方接口信息
|
||||
SysDepartInterfaceInfoDTO sysDepartInterfaceInfoDTO = new SysDepartInterfaceInfoDTO();
|
||||
sysDepartInterfaceInfoDTO.setInterfaceType("oss_upload");
|
||||
List<SysDepartInterfaceInfoPo> sysDepartInterfaceInfoPoList = thirdPartyServiceFeign.querylist(sysDepartInterfaceInfoDTO);
|
||||
if(obj != null){
|
||||
if (obj instanceof List){
|
||||
((List<?>) obj).forEach(e->{
|
||||
OSSClientPrivateUtil.preObjectSignPrivateURL(e, sysDepartInterfaceInfoPoList);
|
||||
});
|
||||
}else {
|
||||
obj = OSSClientPrivateUtil.preObjectSignPrivateURL(obj, sysDepartInterfaceInfoPoList);
|
||||
}
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package com.mhd.common.core.annotation.fieldsetvalue;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* 标识此字段需要修改图片地址
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target(ElementType.FIELD)
|
||||
public @interface NeedSetValue {
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package com.mhd.common.core.annotation.fieldsetvalue;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* 标识此方法需要修改图片地址
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target(ElementType.METHOD)
|
||||
public @interface NeedSetValueField {
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package com.mhd.common.core.annotation.fieldsetvalue;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/**
|
||||
* 标识此方法解析图片地址使用
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Target(ElementType.METHOD)
|
||||
public @interface NeedSetValueMethod {
|
||||
}
|
||||
+64
@@ -0,0 +1,64 @@
|
||||
package com.mhd.common.core.annotation.fieldsetvalue;
|
||||
|
||||
import com.mhd.common.core.oss.configure.OSSClientPrivateUtil;
|
||||
import com.mhd.common.core.utils.StringUtils;
|
||||
import org.aspectj.lang.JoinPoint;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.aspectj.lang.annotation.Before;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
|
||||
@Component
|
||||
@Aspect
|
||||
public class SetFeildValueAspect {
|
||||
@Autowired
|
||||
private CommonService commonService;
|
||||
@Before("@annotation(com.mhd.common.core.annotation.fieldsetvalue.NeedSetValueField)")
|
||||
public void dosetFeildValue(JoinPoint pjp) throws Throwable {
|
||||
Object[] args = pjp.getArgs();
|
||||
// getFliedAnnos(args);
|
||||
}
|
||||
@Around("@annotation(com.mhd.common.core.annotation.fieldsetvalue.NeedSetValueMethod)")
|
||||
public Object afterFeildValue(ProceedingJoinPoint pjp) throws Throwable {
|
||||
Object ret=pjp.proceed();
|
||||
// commonService.getObjectSignPrivateURL(ret);
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
|
||||
private static void getFliedAnnos(Object[] args) throws IllegalAccessException {
|
||||
for (Object arg : args) {
|
||||
Field[] fields = arg.getClass().getDeclaredFields();
|
||||
for (Field field : fields) {
|
||||
// 是否引用ApiModelProperty注解
|
||||
boolean bool = field.isAnnotationPresent(NeedSetValue.class);
|
||||
if (bool){
|
||||
field.setAccessible(true);
|
||||
Object o = field.get(arg);
|
||||
if (o != null){
|
||||
String string = o.toString();
|
||||
if (StringUtils.isNotBlank(string)){
|
||||
String[] split = string.split(",");
|
||||
StringBuilder urls = new StringBuilder();
|
||||
for (String s : split) {
|
||||
String url = OSSClientPrivateUtil.getOssSubstringUrl(s);
|
||||
if (StringUtils.isBlank(urls.toString())){
|
||||
urls.append(url);
|
||||
}else {
|
||||
urls.append(","+url);
|
||||
}
|
||||
}
|
||||
field.set(arg,urls.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+83
@@ -0,0 +1,83 @@
|
||||
package com.mhd.common.core.annotation.fieldsetvalue;
|
||||
|
||||
import cn.hutool.crypto.SecureUtil;
|
||||
import com.mhd.common.core.annotation.ValidateJob;
|
||||
import com.mhd.common.core.constant.SecurityConstants;
|
||||
import com.mhd.common.core.exception.ServiceException;
|
||||
import com.mhd.common.core.utils.ServletUtils;
|
||||
import com.mhd.common.core.utils.StringUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.aspectj.lang.JoinPoint;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.aspectj.lang.annotation.Before;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title ValidateJobAspect
|
||||
* @description: job请求校验
|
||||
* @date 2024/3/25 18:19
|
||||
**/
|
||||
@Slf4j
|
||||
@Aspect
|
||||
@Component
|
||||
public class ValidateJobAspect {
|
||||
|
||||
/**
|
||||
* @description 请求之前执行
|
||||
* @author ZhouGY
|
||||
* @date 2024/3/25 18:41
|
||||
* @param joinPoint 切面对象
|
||||
* @param validateJob 注解
|
||||
*/
|
||||
@Before("@annotation(validateJob)")
|
||||
public void doBefore(JoinPoint joinPoint, ValidateJob validateJob) {
|
||||
String contentCiphertext = Objects.requireNonNull(ServletUtils.getRequest()).getHeader(SecurityConstants.CONTENT_CIPHERTEXT);
|
||||
if (!xxlJobValid(contentCiphertext)){
|
||||
throw new ServiceException("job请求非法");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 校验xxx-job请求安全性
|
||||
* @author ZhouGY
|
||||
* @date 2024/3/25 16:17
|
||||
* @param contentCiphertext 请求密文
|
||||
* @return boolean
|
||||
*/
|
||||
private boolean xxlJobValid(String contentCiphertext) {
|
||||
try {
|
||||
if (StringUtils.isBlank(contentCiphertext)){
|
||||
log.error("ValidateJobAspect xxlJobValid job请求时间非法 请求参数为空");
|
||||
return false;
|
||||
}
|
||||
//dateTime 请求时间
|
||||
String dateTime = contentCiphertext.split("_")[0];
|
||||
//ciphertext 密文
|
||||
String ciphertext = contentCiphertext.split("_")[1];
|
||||
//当前服务器的前后15分钟
|
||||
LocalDateTime qian15 = LocalDateTime.now().minusMinutes(15);
|
||||
LocalDateTime hou15 = LocalDateTime.now().plusMinutes(15);
|
||||
LocalDateTime jobTime = LocalDateTime.parse(dateTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
||||
//jobNow和当前服务器相差15分钟以外则认定非法
|
||||
if(jobTime.isBefore(qian15) || jobTime.isAfter(hou15) ){
|
||||
log.error("ValidateJobAspect xxlJobValid job请求时间非法 请求参数:{}", contentCiphertext);
|
||||
return false;
|
||||
}
|
||||
//验证密文是否有误
|
||||
String ciphertextNow = SecureUtil.md5(dateTime);
|
||||
if(!ciphertextNow.equals(ciphertext)){
|
||||
log.error("ValidateJobAspect xxlJobValid 密文信息有误 请求参数:{}", contentCiphertext);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
log.error("ValidateJobAspect xxlJobValid 校验xxl-job请求安全性 Exception",e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
+111
@@ -0,0 +1,111 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 缓存的key 常量
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class CacheConstants
|
||||
{
|
||||
/**
|
||||
* 缓存有效期,默认720(分钟)
|
||||
* 分钟:1*60*24*30=43200
|
||||
* 分钟:1*60*24*7=10080
|
||||
*
|
||||
*/
|
||||
public final static long EXPIRATION = 10080;
|
||||
|
||||
/**
|
||||
* 缓存刷新时间,默认120(分钟)
|
||||
*/
|
||||
public final static long REFRESH_TIME = 120;
|
||||
|
||||
/**
|
||||
* 权限缓存前缀
|
||||
*/
|
||||
public final static String LOGIN_TOKEN_KEY = "login_tokens:";
|
||||
|
||||
/**
|
||||
* token过期时间(分)
|
||||
*/
|
||||
public final static String TOKEN_EXPIRE_TIME = "token_expire_time:";
|
||||
|
||||
/**
|
||||
* 用户token缓存前缀
|
||||
*/
|
||||
public final static String USER_LOGIN_TOKENS = "user_login_tokens:";
|
||||
|
||||
/**
|
||||
* 租户开关配置缓存前缀
|
||||
*/
|
||||
public final static String USER_COMFIG_SWITCH_KEY = "user_config_switch:";
|
||||
|
||||
/**
|
||||
* 短信操作缓存前缀 : 登录
|
||||
*/
|
||||
public final static String SMS_LOGIN = "sms_login:";
|
||||
|
||||
/**
|
||||
* 短信操作缓存前缀 : 注册
|
||||
*/
|
||||
public final static String SMS_REGISTER = "sms_register:";
|
||||
|
||||
/**
|
||||
* 短信操作缓存前缀 : 忘记密码
|
||||
*/
|
||||
public final static String SMS_FORGET = "sms_forget:";
|
||||
|
||||
/**
|
||||
* 短信操作缓存前缀 : 修改密码
|
||||
*/
|
||||
public final static String SMS_CHANGE = "sms_change:";
|
||||
|
||||
/**
|
||||
* 短信操作缓存前缀 : 修改支付密码
|
||||
*/
|
||||
public final static String SMS_PAY_CHANGE = "sms_pay_change:";
|
||||
|
||||
/**
|
||||
* 短信操作缓存前缀:修改手机号
|
||||
*/
|
||||
public static final String SMS_EDIT_PHONE = "sms_edit_phone:";
|
||||
|
||||
/**
|
||||
* 订单取消计时前缀
|
||||
*/
|
||||
public final static String order_cancel = "order:cancel";
|
||||
|
||||
/**
|
||||
* 调度单超时承运
|
||||
*/
|
||||
public final static String DISPATCH_ACCEPT = "dispatch:accept";
|
||||
|
||||
/**
|
||||
* 数字开放平台客户信息 key
|
||||
*/
|
||||
public static final String DIGITAL_OPEN_PLATFORM_CUSTOM_PUBLIC_KEY = "digital_open_platform:custom_public_key:";
|
||||
|
||||
|
||||
/**
|
||||
* 数字开放平台客户信息 key
|
||||
*/
|
||||
public static final String TICKET_ENTERPRISE_PUBLIC_KEY = "ticket:Enterprise_public_key:";
|
||||
|
||||
/**
|
||||
* 一级组织配置产品信息 key
|
||||
*/
|
||||
public final static String ORG_PRODUCT_KEY = "product:org_product_key:";
|
||||
|
||||
/**
|
||||
* 登录账户密码错误次数 redis key
|
||||
*/
|
||||
public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
|
||||
|
||||
/**
|
||||
* 百度自然语言NLP redis key
|
||||
*/
|
||||
public static final String BAIDU_NLP = "baidu:nlp:";
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,174 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 通用常量信息
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class Constants
|
||||
{
|
||||
/**
|
||||
* UTF-8 字符集
|
||||
*/
|
||||
public static final String UTF8 = "UTF-8";
|
||||
|
||||
/**
|
||||
* GBK 字符集
|
||||
*/
|
||||
public static final String GBK = "GBK";
|
||||
|
||||
/**
|
||||
* RMI 远程方法调用
|
||||
*/
|
||||
public static final String LOOKUP_RMI = "rmi:";
|
||||
|
||||
/**
|
||||
* LDAP 远程方法调用
|
||||
*/
|
||||
public static final String LOOKUP_LDAP = "ldap:";
|
||||
|
||||
/**
|
||||
* LDAPS 远程方法调用
|
||||
*/
|
||||
public static final String LOOKUP_LDAPS = "ldaps:";
|
||||
|
||||
/**
|
||||
* http请求
|
||||
*/
|
||||
public static final String HTTP = "http://";
|
||||
|
||||
/**
|
||||
* https请求
|
||||
*/
|
||||
public static final String HTTPS = "https://";
|
||||
|
||||
/**
|
||||
* 成功标记
|
||||
*/
|
||||
public static final Integer SUCCESS = 200;
|
||||
|
||||
/**
|
||||
* 成功消息
|
||||
*/
|
||||
public static final String SUCCESS_MSG = "操作成功";
|
||||
|
||||
/**
|
||||
* 失败标记
|
||||
*/
|
||||
public static final Integer FAIL = 500;
|
||||
|
||||
/**
|
||||
* 失败消息
|
||||
*/
|
||||
public static final String FAIL_MSG = "操作失败";
|
||||
|
||||
/**
|
||||
* 登录成功状态
|
||||
*/
|
||||
public static final String LOGIN_SUCCESS_STATUS = "0";
|
||||
|
||||
/**
|
||||
* 登录失败状态
|
||||
*/
|
||||
public static final String LOGIN_FAIL_STATUS = "1";
|
||||
|
||||
/**
|
||||
* 登录成功
|
||||
*/
|
||||
public static final String LOGIN_SUCCESS = "Success";
|
||||
|
||||
/**
|
||||
* 注销
|
||||
*/
|
||||
public static final String LOGOUT = "Logout";
|
||||
|
||||
/**
|
||||
* 注册
|
||||
*/
|
||||
public static final String REGISTER = "Register";
|
||||
|
||||
/**
|
||||
* 登录失败
|
||||
*/
|
||||
public static final String LOGIN_FAIL = "Error";
|
||||
|
||||
/**
|
||||
* 当前记录起始索引
|
||||
*/
|
||||
public static final String PAGE_NUM = "pageNum";
|
||||
|
||||
/**
|
||||
* 每页显示记录数
|
||||
*/
|
||||
public static final String PAGE_SIZE = "pageSize";
|
||||
|
||||
/**
|
||||
* 排序列
|
||||
*/
|
||||
public static final String ORDER_BY_COLUMN = "orderByColumn";
|
||||
|
||||
/**
|
||||
* 排序的方向 "desc" 或者 "asc".
|
||||
*/
|
||||
public static final String IS_ASC = "isAsc";
|
||||
|
||||
/**
|
||||
* 验证码 redis key
|
||||
*/
|
||||
public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
|
||||
|
||||
/**
|
||||
* 验证码有效期(分钟)
|
||||
*/
|
||||
public static final long CAPTCHA_EXPIRATION = 2;
|
||||
|
||||
|
||||
/**
|
||||
* 参数管理 cache key
|
||||
*/
|
||||
public static final String SYS_CONFIG_KEY = "sys_config:";
|
||||
|
||||
/**
|
||||
* 字典管理 cache key
|
||||
*/
|
||||
public static final String SYS_DICT_KEY = "sys_dict:";
|
||||
|
||||
/**
|
||||
* 资源映射路径 前缀
|
||||
*/
|
||||
public static final String RESOURCE_PREFIX = "/profile";
|
||||
|
||||
/**
|
||||
* 定时任务白名单配置(仅允许访问的包名,如其他需要可以自行添加)
|
||||
*/
|
||||
public static final String[] JOB_WHITELIST_STR = { "com.mhd" };
|
||||
|
||||
/**
|
||||
* 定时任务违规的字符
|
||||
*/
|
||||
public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
|
||||
"org.springframework", "org.apache", "com.mhd.common.core.utils.file" };
|
||||
|
||||
/**
|
||||
* 防止重复提交 key
|
||||
*/
|
||||
public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
|
||||
|
||||
/**
|
||||
* app打点使用
|
||||
*/
|
||||
public static final String APP_LOCATION_WAYBILL_NO = "app_location_waybill_no:";
|
||||
|
||||
public static final String APP_LOCATION_LICENSE_PLATE_NUMBER = "app_location_license_plate_number:";
|
||||
/**
|
||||
* app离线司机
|
||||
*/
|
||||
public static final String APP_OFFLINE = "app_offline:";
|
||||
|
||||
/**
|
||||
* wms 用户当前关联仓库 cache key
|
||||
*/
|
||||
public static final String WMS_ASSOCIATION_WAREHOUSE_KEY = "wms_association_warehouse:";
|
||||
|
||||
public static final String LICENSE_PLATE_REGEX = "([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Y](([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Y][A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳使领])|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})";
|
||||
}
|
||||
+117
@@ -0,0 +1,117 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 代码生成通用常量
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class GenConstants
|
||||
{
|
||||
/** 单表(增删改查) */
|
||||
public static final String TPL_CRUD = "crud";
|
||||
|
||||
/** 树表(增删改查) */
|
||||
public static final String TPL_TREE = "tree";
|
||||
|
||||
/** 主子表(增删改查) */
|
||||
public static final String TPL_SUB = "sub";
|
||||
|
||||
/** 树编码字段 */
|
||||
public static final String TREE_CODE = "treeCode";
|
||||
|
||||
/** 树父编码字段 */
|
||||
public static final String TREE_PARENT_CODE = "treeParentCode";
|
||||
|
||||
/** 树名称字段 */
|
||||
public static final String TREE_NAME = "treeName";
|
||||
|
||||
/** 上级菜单ID字段 */
|
||||
public static final String PARENT_MENU_ID = "parentMenuId";
|
||||
|
||||
/** 上级菜单名称字段 */
|
||||
public static final String PARENT_MENU_NAME = "parentMenuName";
|
||||
|
||||
/** 数据库字符串类型 */
|
||||
public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
|
||||
|
||||
/** 数据库文本类型 */
|
||||
public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" };
|
||||
|
||||
/** 数据库时间类型 */
|
||||
public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" };
|
||||
|
||||
/** 数据库数字类型 */
|
||||
public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
|
||||
"bigint", "float", "double", "decimal" ,"bigint unsigned"};
|
||||
|
||||
/** 页面不需要编辑字段 */
|
||||
public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
|
||||
|
||||
/** 页面不需要显示的列表字段 */
|
||||
public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by",
|
||||
"update_time" };
|
||||
|
||||
/** 页面不需要查询字段 */
|
||||
public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
|
||||
"update_time", "remark" };
|
||||
|
||||
/** Entity基类字段 */
|
||||
public static final String[] BASE_ENTITY = { "createBy", "createByName", "createTime", "updateBy","updateByName", "updateTime", "delFlag" };
|
||||
|
||||
/** Tree基类字段 */
|
||||
public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors" };
|
||||
|
||||
/** 文本框 */
|
||||
public static final String HTML_INPUT = "input";
|
||||
|
||||
/** 文本域 */
|
||||
public static final String HTML_TEXTAREA = "textarea";
|
||||
|
||||
/** 下拉框 */
|
||||
public static final String HTML_SELECT = "select";
|
||||
|
||||
/** 单选框 */
|
||||
public static final String HTML_RADIO = "radio";
|
||||
|
||||
/** 复选框 */
|
||||
public static final String HTML_CHECKBOX = "checkbox";
|
||||
|
||||
/** 日期控件 */
|
||||
public static final String HTML_DATETIME = "datetime";
|
||||
|
||||
/** 图片上传控件 */
|
||||
public static final String HTML_IMAGE_UPLOAD = "imageUpload";
|
||||
|
||||
/** 文件上传控件 */
|
||||
public static final String HTML_FILE_UPLOAD = "fileUpload";
|
||||
|
||||
/** 富文本控件 */
|
||||
public static final String HTML_EDITOR = "editor";
|
||||
|
||||
/** 字符串类型 */
|
||||
public static final String TYPE_STRING = "String";
|
||||
|
||||
/** 整型 */
|
||||
public static final String TYPE_INTEGER = "Integer";
|
||||
|
||||
/** 长整型 */
|
||||
public static final String TYPE_LONG = "Long";
|
||||
|
||||
/** 浮点型 */
|
||||
public static final String TYPE_DOUBLE = "Double";
|
||||
|
||||
/** 高精度计算类型 */
|
||||
public static final String TYPE_BIGDECIMAL = "BigDecimal";
|
||||
|
||||
/** 时间类型 */
|
||||
public static final String TYPE_DATE = "Date";
|
||||
|
||||
/** 模糊查询 */
|
||||
public static final String QUERY_LIKE = "LIKE";
|
||||
|
||||
/** 相等查询 */
|
||||
public static final String QUERY_EQ = "EQ";
|
||||
|
||||
/** 需要 */
|
||||
public static final String REQUIRE = "1";
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 返回状态码
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class HttpStatus
|
||||
{
|
||||
/**
|
||||
* 操作成功
|
||||
*/
|
||||
public static final int SUCCESS = 200;
|
||||
|
||||
/**
|
||||
* 对象创建成功
|
||||
*/
|
||||
public static final int CREATED = 201;
|
||||
|
||||
/**
|
||||
* 请求已经被接受
|
||||
*/
|
||||
public static final int ACCEPTED = 202;
|
||||
|
||||
/**
|
||||
* 操作已经执行成功,但是没有返回数据
|
||||
*/
|
||||
public static final int NO_CONTENT = 204;
|
||||
|
||||
/**
|
||||
* 资源已被移除
|
||||
*/
|
||||
public static final int MOVED_PERM = 301;
|
||||
|
||||
/**
|
||||
* 重定向
|
||||
*/
|
||||
public static final int SEE_OTHER = 303;
|
||||
|
||||
/**
|
||||
* 资源没有被修改
|
||||
*/
|
||||
public static final int NOT_MODIFIED = 304;
|
||||
|
||||
/**
|
||||
* 参数列表错误(缺少,格式不匹配)
|
||||
*/
|
||||
public static final int BAD_REQUEST = 400;
|
||||
|
||||
/**
|
||||
* 未授权
|
||||
*/
|
||||
public static final int UNAUTHORIZED = 401;
|
||||
|
||||
/**
|
||||
* 访问受限,授权过期
|
||||
*/
|
||||
public static final int FORBIDDEN = 403;
|
||||
|
||||
/**
|
||||
* 资源,服务未找到
|
||||
*/
|
||||
public static final int NOT_FOUND = 404;
|
||||
|
||||
/**
|
||||
* 不允许的http方法
|
||||
*/
|
||||
public static final int BAD_METHOD = 405;
|
||||
|
||||
/**
|
||||
* 资源冲突,或者资源被锁
|
||||
*/
|
||||
public static final int CONFLICT = 409;
|
||||
|
||||
/**
|
||||
* 不支持的数据,媒体类型
|
||||
*/
|
||||
public static final int UNSUPPORTED_TYPE = 415;
|
||||
|
||||
/**
|
||||
* 系统内部错误
|
||||
*/
|
||||
public static final int ERROR = 500;
|
||||
|
||||
/**
|
||||
* 接口未实现
|
||||
*/
|
||||
public static final int NOT_IMPLEMENTED = 501;
|
||||
|
||||
/**
|
||||
* 批量操作报错,且需要导出
|
||||
*/
|
||||
public static final int ERROR_NEEDEXPORT = 550;
|
||||
}
|
||||
+133
@@ -0,0 +1,133 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 消息通知模板常量
|
||||
*
|
||||
*/
|
||||
public class NoticeConstants
|
||||
{
|
||||
|
||||
//==================================物流助手start================================
|
||||
|
||||
/**
|
||||
* 发货节点:APP客户下单;PC收件开单
|
||||
* 接收方:运营端,发货网点
|
||||
*/
|
||||
public static final String send_goods_title = "客户下单通知";
|
||||
public static final String send_goods_text = "用户下单成功,请等待揽收";
|
||||
|
||||
/**
|
||||
* 接单节点:PC客户下单接单
|
||||
* 接收方:客户端,发货人
|
||||
* 模板:货物被{公司名称}【{网点名称}】接单,请等待上门提货
|
||||
*/
|
||||
public static final String receiving_orders_title = "订单提货通知";
|
||||
public static final String receiving_orders_text = "货物被{}【{}】接单,请等待上门提货";
|
||||
|
||||
/**
|
||||
* 提货派车节点:PC提货派车
|
||||
* 接收方:客户端,发货人
|
||||
* 模板:货物准备提货,{司机名称}(联系电话{司机手机号}) 将在{客户预约的提货时间}前往取件
|
||||
*/
|
||||
public static final String dispatch_car_title = "订单提货通知";
|
||||
public static final String dispatch_car_text = "货物准备提货,{}(联系电话{}) 将在{}前往取件";
|
||||
|
||||
/**
|
||||
* 提货取件节点:APP/PC装货
|
||||
* 接收方:客户端,发货人
|
||||
* 模板:{司机名称}取到货物,准备送往【网点名称】
|
||||
*/
|
||||
public static final String pick_up_title = "订单提货通知";
|
||||
public static final String pick_up_text = "{}取到货物,准备送往【{}】";
|
||||
|
||||
/**
|
||||
* 提货卸货节点:APP/PC卸货
|
||||
* 接收方:客户端,发货人
|
||||
* 模板:货物到达[{网点名称}],提货完成
|
||||
*/
|
||||
public static final String unload_title = "订单入库通知";
|
||||
public static final String unload_text = "货物到达【{}】,提货完成";
|
||||
|
||||
/**
|
||||
* 入库节点:PC收件开单、PC客户下单收件(入库)、PC提货记录入库
|
||||
* 接收方:客户端,发货人
|
||||
* 模板:{公司名称}【网点名称】已揽收,准备运输
|
||||
*/
|
||||
public static final String warehousing_title = "订单入库通知";
|
||||
public static final String warehousing_text = "{}【{}】已揽收,准备运输";
|
||||
|
||||
/**
|
||||
* 发车节点:PC发车
|
||||
* 接收方:客户端,发货人
|
||||
* 模板:货物在[网点名称] 完成分拣,发往[网点名称]
|
||||
*/
|
||||
public static final String start_transport_title = "订单运输通知";
|
||||
public static final String start_transport_text = "货物在【{}】完成分拣,发往【{}】";
|
||||
/**
|
||||
* 接车节点:PC接车
|
||||
* 接收方:客户端,发货人
|
||||
* 模板:货物到达[{网点名称}]
|
||||
*/
|
||||
public static final String pick_up_car_text = "货物到达【{}】";
|
||||
|
||||
/**
|
||||
* 送货派车节点:PC送货派车
|
||||
* 接收方:客户端,发货人
|
||||
* 模板:货物准备派送,预计{派车时选择的送货时间}送达
|
||||
*/
|
||||
public static final String delivery_vehicles_title = "订单派送通知";
|
||||
public static final String delivery_vehicles_text = "货物准备派送,预计{}送达";
|
||||
|
||||
/**
|
||||
* 送货装货节点:APP/PC装货
|
||||
* 接收方:客户端,发货人
|
||||
* 模板:货物交给{司机名称(联系电话:司机手机号)),正在派送中
|
||||
*/
|
||||
public static final String deliver_goods_title = "订单派送通知";
|
||||
public static final String deliver_goods_text = "货物交给{}(联系电话:{}),正在派送中";
|
||||
|
||||
/**
|
||||
* 送货签收/签收节点:APP/PC卸货、PC自提签收、PC送货签收、PC中转签收
|
||||
* 接收方:客户端,发货人
|
||||
* 模板:您的货物已被{签收人)签收,期待再次为您服务
|
||||
*/
|
||||
public static final String sign_goods_title = "订单签收通知";
|
||||
public static final String sign_goods_text = "您的货物已被{}签收,期待再次为您服务";
|
||||
|
||||
/**
|
||||
* 退货节点:PC退货
|
||||
* 接收方:客户端,发货人 ;运营端,发货网点
|
||||
* 模板:货物退货,退货订单{YD20201125003}
|
||||
*/
|
||||
public static final String return_goods_title = "订单签收通知";
|
||||
public static final String return_goods_text = "货物退货,退货订单{}";
|
||||
|
||||
/**
|
||||
* 取消节点:APP客户取消、PC网点取消
|
||||
* 接收方:客户端,发货人 ;运营端,发货网点
|
||||
* 模板:运单被[{客户名称/网点名称}] 取消,取消原因:消原因)。
|
||||
*/
|
||||
public static final String cancel_goods_title = "订单取消通知";
|
||||
public static final String cancel_goods_text_one = "运单{}被取消,取消原因:{}。";
|
||||
// 节点:超时未支付自动取消
|
||||
public static final String cancel_goods_text_two = "订单{}被取消,取消原因:超时未支付运费";
|
||||
|
||||
public static final String pay_audit_title = "支付审核通知";
|
||||
public static final String pay_auth_success = "您的运单{}【{}】审核通过";
|
||||
public static final String pay_auth_fail = "您的运单{}【{}】审核失败,拒绝原因:{}";
|
||||
|
||||
//==================================物流助手end================================
|
||||
public static final String exception_offline = "GPS定位异常提醒";
|
||||
public static final String app_location_exception = "APP手机定位出现异常,请尝试重启定位";
|
||||
|
||||
//=================================系统消息====================================
|
||||
public static final String audit_title = "审核通知";
|
||||
public static final String auth_success = "您的{}审核通过";
|
||||
public static final String auth_fail = "您的{}审核失败,拒绝原因:{}";
|
||||
//=================================验证码消息====================================
|
||||
public static final String verify_code_title = "验证码通知";
|
||||
public static final String verify_code_success = "用户【{}】用于{}已发送验证码【{}】";
|
||||
//=================================车队邀请消息====================================
|
||||
public static final String motorcade_invite_title = "车队邀请通知";
|
||||
public static final String motorcade_invite = "您已被【{}】邀请加入车队【{}】";
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 支付通道数据字典常量
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class PaymentChannelConstants
|
||||
{
|
||||
/**
|
||||
* 钱包支付
|
||||
*/
|
||||
public static final String wallet_pay = "wallet_pay";
|
||||
|
||||
/**
|
||||
* 线下支付
|
||||
*/
|
||||
public static final String offline_pay = "offline_pay";
|
||||
|
||||
/**
|
||||
* 微信支付
|
||||
*/
|
||||
public final static String wechat_pay = "wechat_pay";
|
||||
|
||||
/**
|
||||
* 支付宝
|
||||
*/
|
||||
public final static String alipay_pay = "alipay_pay";
|
||||
|
||||
/**
|
||||
* 通联支付
|
||||
*/
|
||||
public final static String union_pay = "union_pay";
|
||||
|
||||
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
|
||||
/**
|
||||
* rabbitmq缓存的key 常量
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class RabbitMqConstants
|
||||
{
|
||||
|
||||
public final static String TEST_ONE_QUEUE = "test001";
|
||||
|
||||
|
||||
public final static String TEST_ONE_EXCHANGE = "test_exchange";
|
||||
|
||||
|
||||
|
||||
}
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 任务调度通用常量
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class ScheduleConstants
|
||||
{
|
||||
public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
|
||||
|
||||
/** 执行目标key */
|
||||
public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
|
||||
|
||||
/** 默认 */
|
||||
public static final String MISFIRE_DEFAULT = "0";
|
||||
|
||||
/** 立即触发执行 */
|
||||
public static final String MISFIRE_IGNORE_MISFIRES = "1";
|
||||
|
||||
/** 触发一次执行 */
|
||||
public static final String MISFIRE_FIRE_AND_PROCEED = "2";
|
||||
|
||||
/** 不触发立即执行 */
|
||||
public static final String MISFIRE_DO_NOTHING = "3";
|
||||
|
||||
public enum Status
|
||||
{
|
||||
/**
|
||||
* 正常
|
||||
*/
|
||||
NORMAL("0"),
|
||||
/**
|
||||
* 暂停
|
||||
*/
|
||||
PAUSE("1");
|
||||
|
||||
private String value;
|
||||
|
||||
private Status(String value)
|
||||
{
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public String getValue()
|
||||
{
|
||||
return value;
|
||||
}
|
||||
}
|
||||
}
|
||||
+54
@@ -0,0 +1,54 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 权限相关通用常量
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class SecurityConstants
|
||||
{
|
||||
/**
|
||||
* 用户ID字段
|
||||
*/
|
||||
public static final String DETAILS_USER_ID = "user_id";
|
||||
|
||||
/**
|
||||
* 一级组织
|
||||
*/
|
||||
public static final String TOP_ORGANIZATION_ID = "topOrganizationId";
|
||||
|
||||
/**
|
||||
* 用户名字段
|
||||
*/
|
||||
public static final String DETAILS_USERNAME = "username";
|
||||
|
||||
/**
|
||||
* 授权信息字段
|
||||
*/
|
||||
public static final String AUTHORIZATION_HEADER = "authorization";
|
||||
|
||||
/**
|
||||
* 请求来源
|
||||
*/
|
||||
public static final String FROM_SOURCE = "from-source";
|
||||
|
||||
/**
|
||||
* 内部请求
|
||||
*/
|
||||
public static final String INNER = "inner";
|
||||
|
||||
/**
|
||||
* 用户标识
|
||||
*/
|
||||
public static final String USER_KEY = "user_key";
|
||||
|
||||
/**
|
||||
* 登录用户
|
||||
*/
|
||||
public static final String LOGIN_USER = "login_user";
|
||||
|
||||
/**
|
||||
* job安全性校验
|
||||
*/
|
||||
public static final String CONTENT_CIPHERTEXT = "Content-ciphertext";
|
||||
}
|
||||
+63
@@ -0,0 +1,63 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 服务名称
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class ServiceNameConstants
|
||||
{
|
||||
/**
|
||||
* 认证服务的serviceid
|
||||
*/
|
||||
public static final String AUTH_SERVICE = "mhd-auth";
|
||||
|
||||
/**
|
||||
* 系统模块的serviceid
|
||||
*/
|
||||
public static final String SYSTEM_SERVICE = "mhd-system";
|
||||
|
||||
/**
|
||||
* 文件服务的serviceid
|
||||
*/
|
||||
public static final String FILE_SERVICE = "mhd-file";
|
||||
|
||||
public static final String USER_CENTER = "mhd-userCenter-service";
|
||||
|
||||
public static final String TRANSPORT_CENTER = "mhd-transport-service";
|
||||
|
||||
public static final String PRODUCT_CENTER = "mhd-product-service";
|
||||
|
||||
public static final String FINANCE_SERVICE = "mhd-finance-service";
|
||||
|
||||
public static final String THIRDPARTY_CENTER = "mhd-third-party-service";
|
||||
|
||||
//票务系统
|
||||
public static final String TICKET_CENTER = "mhd-ticket-service";
|
||||
|
||||
//网货系统
|
||||
public static final String WLHY_SERVICE = "mhd-wlhy-service";
|
||||
//上报系统
|
||||
public static final String REPORT_SERVICE = "mhd-report-service";
|
||||
|
||||
//商城后台系统
|
||||
public static final String UPMS_SERVICE = "mhd-upms-service";
|
||||
|
||||
//商城系统
|
||||
public static final String MALL_SERVICE = "mhd-mall-service";
|
||||
|
||||
//商城认证授权中心
|
||||
public static final String MALL_AUTH_SERVICE = "mhd-auth-service";
|
||||
|
||||
//商城API系统
|
||||
public static final String MALL_API_SERVICE = "mhd-mall-api-service";
|
||||
|
||||
//wms系统
|
||||
public static final String WMS_SERVICE = "mhd-wms-service";
|
||||
|
||||
//BMS结算系统
|
||||
public static final String BMS_SERVICE = "mhd-bms-service";
|
||||
|
||||
|
||||
|
||||
}
|
||||
+54
@@ -0,0 +1,54 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 短信模板常量
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class SmsConstants
|
||||
{
|
||||
/**
|
||||
* 登录模板
|
||||
*/
|
||||
public static final String loginText = "【{}】,您的短信验证码为{},本次验证码用于用户登录,5分钟内有效,请妥善保管,切勿泄露,如有疑问请联系客服。";
|
||||
|
||||
/**
|
||||
* 注册模板
|
||||
*/
|
||||
public static final String registerText = "【{}】,您的短信验证码为{},本次验证码用于用户注册,5分钟内有效,请妥善保管,切勿泄露,如有疑问请联系客服。";
|
||||
|
||||
/**
|
||||
* 忘记密码模板
|
||||
*/
|
||||
public static final String forgotPasswordText = "【{}】,您的短信验证码为{},本次验证码用于忘记密码操作验证,5分钟内有效,请妥善保管,切勿泄露,如有疑问请联系客服。";
|
||||
|
||||
/**
|
||||
* 修改密码
|
||||
*/
|
||||
public static final String changePasswordText = "【{}】,您的短信验证码为{},本次验证码用于修改密码操作验证,5分钟内有效,请妥善保管,切勿泄露,如有疑问请联系客服。";
|
||||
|
||||
/**
|
||||
* 修改手机号
|
||||
*/
|
||||
public static final String changePhoneText = "【{}】,您的短信验证码为{},本次验证码用于修改手机号操作验证,5分钟内有效,请妥善保管,切勿泄露,如有疑问请联系客服。";
|
||||
|
||||
/**
|
||||
* 修改支付密码
|
||||
*/
|
||||
public static final String changePayPasswordText = "【{}】,您的短信验证码为{},本次验证码用于修改支付密码操作验证,5分钟内有效,请妥善保管,切勿泄露,如有疑问请联系客服。";
|
||||
|
||||
/**
|
||||
* 自提签收
|
||||
*/
|
||||
public static final String signrReceiptText = "【{}】 {}";
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 神奇的万能验证码
|
||||
*/
|
||||
public static final String universalCode = "246810";
|
||||
|
||||
|
||||
|
||||
}
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title SnowFlakeConstants
|
||||
* @description: TODO
|
||||
* @date 2023/11/24 15:43
|
||||
**/
|
||||
public class SnowFlakeConstants {
|
||||
/**
|
||||
* 数据中心ID(0~31),2进制5位 32位减掉1位 31个
|
||||
*/
|
||||
|
||||
//数字开放平台
|
||||
public final static long digitalDatacenterId = 1;
|
||||
|
||||
/**
|
||||
* 仓储ID(0~31),2进制5位 32位减掉1位 31个
|
||||
*/
|
||||
public final static long wmsId = 2;
|
||||
}
|
||||
+76
@@ -0,0 +1,76 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 订单来源枚举
|
||||
*
|
||||
* @author zihao
|
||||
*/
|
||||
public enum SourceConstants
|
||||
{
|
||||
/**
|
||||
* 订单来源:1.专线物流
|
||||
*/
|
||||
ZHUANXIAN("专线物流", "zhuanxianwuliu"),
|
||||
|
||||
/**
|
||||
* 订单来源:2.财务中台
|
||||
*/
|
||||
CAIWUZHONGTAI("财务中台", "caiwuzhongtai"),
|
||||
|
||||
/**
|
||||
* 订单来源:3.网货中台
|
||||
*/
|
||||
WNGHUOZHONGTAI("网货中台", "wanghuozhongtai"),
|
||||
|
||||
/**
|
||||
* 订单来源:3.用户中台
|
||||
*/
|
||||
YONGHUZHONGTAI("用户中台", "yonghuzhongtai"),
|
||||
/**
|
||||
* 订单来源:4.运力中台
|
||||
*/
|
||||
YUNLIZHONGTAI("运力中台", "yunlizhongtai");
|
||||
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
SourceConstants(String name, String code) {
|
||||
this.name = name;
|
||||
this.code = code;
|
||||
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public String getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public void setCode(String code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public static String getName(String code) {
|
||||
for (SourceConstants roleEnum : SourceConstants.values()) {
|
||||
if (code.equals(roleEnum.getCode())) {
|
||||
return roleEnum.getName();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static String getCode(String name) {
|
||||
for (SourceConstants roleEnum : SourceConstants.values()) {
|
||||
if (name.equals(roleEnum.getName())) {
|
||||
return roleEnum.getCode();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
+238
@@ -0,0 +1,238 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 一二级科目----------2025.06.11新项目弃用,使用新逻辑SubjectCodeEnum
|
||||
*
|
||||
* @author zihao
|
||||
*/
|
||||
public enum SubjectConstants
|
||||
{
|
||||
/**
|
||||
* 一级科目:1.托运运费
|
||||
*/
|
||||
FIRST_SUBJECT_ONE("托运运费", "consignment_freight"),
|
||||
/**
|
||||
* 二级科目:1.到付
|
||||
*/
|
||||
SECOND_SUBJECT_ONE_ONE("到付", "freight_collect_payment"),
|
||||
/**
|
||||
* 二级科目:2.现付
|
||||
*/
|
||||
SECOND_SUBJECT_ONE_TWO("现付", "spot_payment"),
|
||||
/**
|
||||
* 二级科目:3.回单付
|
||||
*/
|
||||
SECOND_SUBJECT_ONE_THREE("回单付", "payment_against_documents"),
|
||||
/**
|
||||
* 二级科目:4.月结
|
||||
*/
|
||||
SECOND_SUBJECT_ONE_FOUR("月结", "monthly_statement"),
|
||||
/**
|
||||
* 二级科目:5.扣付
|
||||
*/
|
||||
SECOND_SUBJECT_ONE_FIVE("扣付", "withhold_payment"),
|
||||
/**
|
||||
* 二级科目:6.网点运费
|
||||
*/
|
||||
BRANCH_FREIGHT_ONE_SIX("网点运费", "branch_freight"),
|
||||
/**
|
||||
* 二级科目:7.回扣
|
||||
*/
|
||||
BRANCH_FREIGHT_ONE_SEVEN("回扣", "kickback"),
|
||||
/**
|
||||
* 一级科目:2.代收货款
|
||||
*/
|
||||
FIRST_SUBJECT_TWO("代收货款", "collection_delivery"),
|
||||
/**
|
||||
* 二级科目:1.手续费
|
||||
*/
|
||||
SECOND_SUBJECT_TWO_ONE("手续费", "service_charge"),
|
||||
/**
|
||||
* 二级科目:2.货款收回
|
||||
*/
|
||||
SECOND_SUBJECT_TWO_TWO("货款收回", "collection_payment"),
|
||||
/**
|
||||
* 二级科目:3.货款发放
|
||||
*/
|
||||
SECOND_SUBJECT_TWO_THREE("货款发放", "loan_origination"),
|
||||
/**
|
||||
* 一级科目:3.承运运费
|
||||
*/
|
||||
FIRST_SUBJECT_THREE("承运运费", "freight_carried"),
|
||||
/**
|
||||
* 二级科目:1.现付
|
||||
*/
|
||||
SECOND_SUBJECT_THREE_ONE("现付", "spot_payment"),
|
||||
/**
|
||||
* 二级科目:2.到付
|
||||
*/
|
||||
SECOND_SUBJECT_THREE_TWO("到付", "freight_collect_payment"),
|
||||
/**
|
||||
* 二级科目:3.回单付
|
||||
*/
|
||||
SECOND_SUBJECT_THREE_THREE("回单付", "payment_against_documents"),
|
||||
/**
|
||||
* 二级科目:4.月结
|
||||
*/
|
||||
SECOND_SUBJECT_THREE_FOUR("月结", "monthly_statement"),
|
||||
/**
|
||||
* 二级科目:5.油卡
|
||||
*/
|
||||
SECOND_SUBJECT_THREE_FIVE("油卡", "fuel_card"),
|
||||
/**
|
||||
* 一级科目:4.异动费
|
||||
*/
|
||||
FIRST_SUBJECT_FOUR("异动费", "variance_cost"),
|
||||
|
||||
/**
|
||||
* 二级科目:1.异动收入
|
||||
*/
|
||||
SECOND_SUBJECT_FOUR_ONE("异动收入", "variable_income"),
|
||||
/**
|
||||
* 二级科目:2.异动支出
|
||||
*/
|
||||
SECOND_SUBJECT_FOUR_TWO("异动支出", "abnormal_expenditure"),
|
||||
/**
|
||||
* 一级科目:5.异常费
|
||||
*/
|
||||
FIRST_SUBJECT_FIVE("异常费", "anomaly_fee"),
|
||||
/**
|
||||
* 二级科目:1.异常罚款
|
||||
*/
|
||||
SECOND_SUBJECT_FIVE_ONE("异常罚款", "abnormal_penalty"),
|
||||
/**
|
||||
* 二级科目:2.SECOND_SUBJECT_FIVE_TWO
|
||||
*/
|
||||
SECOND_SUBJECT_FIVE_TWO("异常赔偿", "abnormal_compensation"),
|
||||
/**
|
||||
* 一级科目:6.派车费
|
||||
*/
|
||||
FIRST_SUBJECT_SIX("派车费", "dispatch_fare"),
|
||||
/**
|
||||
* 二级科目:1.现付
|
||||
*/
|
||||
SECOND_SUBJECT_SIX_ONE("现付", "spot_payment"),
|
||||
/**
|
||||
* 二级科目:2.到付
|
||||
*/
|
||||
SECOND_SUBJECT_SIX_TWO("到付", "freight_collect_payment"),
|
||||
/**
|
||||
* 二级科目:3.回单付
|
||||
*/
|
||||
SECOND_SUBJECT_SIX_THREE("回单付", "payment_against_documents"),
|
||||
/**
|
||||
* 二级科目:4.月结
|
||||
*/
|
||||
SECOND_SUBJECT_SIX_FOUR("月结", "monthly_statement"),
|
||||
/**
|
||||
* 二级科目:5.油卡
|
||||
*/
|
||||
SECOND_SUBJECT_SIX_FIVE("油卡", "fuel_card"),
|
||||
/**
|
||||
* 一级科目:7.中转费
|
||||
*/
|
||||
FIRST_SUBJECT_SEVEN("中转费", "transhipment_charges"),
|
||||
/**
|
||||
* 二级科目:1.到货中转
|
||||
*/
|
||||
SECOND_SUBJECT_SEVEN_ONE("到货中转", "transfer_goods"),
|
||||
|
||||
/**
|
||||
* 二级科目:2.内部中转
|
||||
*/
|
||||
INTERNAL_TRANSFER_TWO("内部中转", "internal_transfer"),
|
||||
|
||||
/**
|
||||
* 二级科目:3.外部中转
|
||||
*/
|
||||
EXTERNAL_TRANSFER_THREE("外部中转", "external_transfer"),
|
||||
/**
|
||||
* 一级科目:8.保险费
|
||||
*/
|
||||
FIRST_SUBJECT_EIGHT("保险费", "premium"),
|
||||
/**
|
||||
* 二级科目:货物保险
|
||||
*/
|
||||
FIRST_SUBJECT_EIGHT_ONE("货物保险", "cargo_insurance"),
|
||||
/**
|
||||
* 二级科目:车辆保险
|
||||
*/
|
||||
FIRST_SUBJECT_EIGHT_TWO("车辆保险", "car_insurance"),
|
||||
/**
|
||||
* 一级科目:运营费
|
||||
*/
|
||||
OPERATING_EXPENSES("运营费", "operating_expenses"),
|
||||
|
||||
/**
|
||||
* 二级科目:运营收入
|
||||
*/
|
||||
OPERATING_INCOME_ONE("运营收入", "operating_income"),
|
||||
|
||||
/**
|
||||
* 二级科目:服务费收入
|
||||
*/
|
||||
SERVICE_FEE_INCOME_TWO("服务费", "service_fee_income"),
|
||||
|
||||
/**
|
||||
* 网货
|
||||
*/
|
||||
FIRST_SUBJECT_WH_ONE("网货运费", "wanghuo_freight"),
|
||||
SECOND_SUBJECT_WH_ONE_ONE("预付", "advance_charge"),
|
||||
SECOND_SUBJECT_WH_ONE_TWO("运费", "wanghuo_freight"),
|
||||
SECOND_SUBJECT_WH_ONE_THREE("加油宝", "refueling_treasure"),
|
||||
SECOND_SUBJECT_WH_ONE_FOUR("线下油卡", "offline_oil_card"),
|
||||
SECOND_SUBJECT_WH_ONE_FIVE("线下加油", "offline_refueling"),
|
||||
SECOND_SUBJECT_WH_ONE_SIX("回单付", "receipt_payment"),
|
||||
SERVICE_FEE_INCOME_SEVEN("服务费", "service_fee_income"),
|
||||
|
||||
|
||||
FIRST_SUBJECT_WH_TWO("提现", "withdrawal"),
|
||||
SECOND_SUBJECT_WH_TWO_ONE("提现", "withdrawal"),
|
||||
|
||||
FIRST_SUBJECT_DZ_ONE("用户账单", "reconciliation"),
|
||||
FIRST_SUBJECT_DZ_ONE_SECOUND("应收", "reconciliation_secound"),
|
||||
;
|
||||
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
private SubjectConstants(String name, String code) {
|
||||
this.name = name;
|
||||
this.code = code;
|
||||
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public String getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public void setCode(String code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
public static String getName(String code) {
|
||||
for (SubjectConstants roleEnum : SubjectConstants.values()) {
|
||||
if (code.equals(roleEnum.getCode())) {
|
||||
return roleEnum.getName();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static String getCode(String name) {
|
||||
for (SubjectConstants roleEnum : SubjectConstants.values()) {
|
||||
if (name.equals(roleEnum.getName())) {
|
||||
return roleEnum.getCode();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* Token的Key常量
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class TokenConstants
|
||||
{
|
||||
/**
|
||||
* 令牌自定义标识
|
||||
*/
|
||||
public static final String AUTHENTICATION = "Authorization";
|
||||
|
||||
/**
|
||||
* 令牌前缀
|
||||
*/
|
||||
public static final String PREFIX = "Bearer ";
|
||||
|
||||
/**
|
||||
* 令牌秘钥
|
||||
*/
|
||||
public final static String SECRET = "abcdefghijklmnopqrstuvwxyz";
|
||||
|
||||
}
|
||||
+81
@@ -0,0 +1,81 @@
|
||||
package com.mhd.common.core.constant;
|
||||
|
||||
/**
|
||||
* 用户常量信息
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class UserConstants
|
||||
{
|
||||
/**
|
||||
* 平台内系统用户的唯一标志
|
||||
*/
|
||||
public static final String SYS_USER = "SYS_USER";
|
||||
|
||||
/** 正常状态 */
|
||||
public static final String NORMAL = "0";
|
||||
|
||||
/** 异常状态 */
|
||||
public static final String EXCEPTION = "1";
|
||||
|
||||
/** 用户封禁状态 */
|
||||
public static final String USER_DISABLE = "1";
|
||||
|
||||
/** 角色封禁状态 */
|
||||
public static final String ROLE_DISABLE = "1";
|
||||
|
||||
/** 部门正常状态 */
|
||||
public static final String DEPT_NORMAL = "0";
|
||||
|
||||
/** 部门停用状态 */
|
||||
public static final String DEPT_DISABLE = "1";
|
||||
|
||||
/** 字典正常状态 */
|
||||
public static final String DICT_NORMAL = "0";
|
||||
|
||||
/** 是否为系统默认(是) */
|
||||
public static final String YES = "Y";
|
||||
|
||||
/** 是否菜单外链(是) */
|
||||
public static final String YES_FRAME = "0";
|
||||
|
||||
/** 是否菜单外链(否) */
|
||||
public static final String NO_FRAME = "1";
|
||||
|
||||
/** 菜单类型(目录) */
|
||||
public static final String TYPE_DIR = "M";
|
||||
|
||||
/** 菜单类型(菜单) */
|
||||
public static final String TYPE_MENU = "C";
|
||||
|
||||
/** 菜单类型(按钮) */
|
||||
public static final String TYPE_BUTTON = "F";
|
||||
|
||||
/** Layout组件标识 */
|
||||
public final static String LAYOUT = "Layout";
|
||||
|
||||
/** ParentView组件标识 */
|
||||
public final static String PARENT_VIEW = "ParentView";
|
||||
|
||||
/** InnerLink组件标识 */
|
||||
public final static String INNER_LINK = "InnerLink";
|
||||
|
||||
/** 校验返回结果码 */
|
||||
public final static String UNIQUE = "0";
|
||||
|
||||
public final static String NOT_UNIQUE = "1";
|
||||
|
||||
/**
|
||||
* 用户名长度限制
|
||||
*/
|
||||
public static final int USERNAME_MIN_LENGTH = 2;
|
||||
|
||||
public static final int USERNAME_MAX_LENGTH = 20;
|
||||
|
||||
/**
|
||||
* 密码长度限制
|
||||
*/
|
||||
public static final int PASSWORD_MIN_LENGTH = 5;
|
||||
|
||||
public static final int PASSWORD_MAX_LENGTH = 20;
|
||||
}
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
package com.mhd.common.core.context;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import com.alibaba.ttl.TransmittableThreadLocal;
|
||||
import com.mhd.common.core.text.Convert;
|
||||
import com.mhd.common.core.utils.StringUtils;
|
||||
import com.mhd.common.core.constant.SecurityConstants;
|
||||
|
||||
/**
|
||||
* 获取当前线程变量中的 用户id、用户名称、Token等信息
|
||||
* 注意: 必须在网关通过请求头的方法传入,同时在HeaderInterceptor拦截器设置值。 否则这里无法获取
|
||||
*
|
||||
* @author mhd
|
||||
*/
|
||||
public class SecurityContextHolder
|
||||
{
|
||||
private static final TransmittableThreadLocal<Map<String, Object>> THREAD_LOCAL = new TransmittableThreadLocal<>();
|
||||
|
||||
public static void set(String key, Object value)
|
||||
{
|
||||
Map<String, Object> map = getLocalMap();
|
||||
map.put(key, value == null ? StringUtils.EMPTY : value);
|
||||
}
|
||||
|
||||
public static String get(String key)
|
||||
{
|
||||
Map<String, Object> map = getLocalMap();
|
||||
return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY));
|
||||
}
|
||||
|
||||
public static <T> T get(String key, Class<T> clazz)
|
||||
{
|
||||
Map<String, Object> map = getLocalMap();
|
||||
return StringUtils.cast(map.getOrDefault(key, null));
|
||||
}
|
||||
|
||||
public static Map<String, Object> getLocalMap()
|
||||
{
|
||||
Map<String, Object> map = THREAD_LOCAL.get();
|
||||
if (map == null)
|
||||
{
|
||||
map = new ConcurrentHashMap<String, Object>();
|
||||
THREAD_LOCAL.set(map);
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
public static void setLocalMap(Map<String, Object> threadLocalMap)
|
||||
{
|
||||
THREAD_LOCAL.set(threadLocalMap);
|
||||
}
|
||||
|
||||
public static Long getUserId()
|
||||
{
|
||||
return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
|
||||
}
|
||||
|
||||
public static void setUserId(String account)
|
||||
{
|
||||
set(SecurityConstants.DETAILS_USER_ID, account);
|
||||
}
|
||||
|
||||
public static String getUserName()
|
||||
{
|
||||
return get(SecurityConstants.DETAILS_USERNAME);
|
||||
}
|
||||
|
||||
public static void setUserName(String username)
|
||||
{
|
||||
set(SecurityConstants.DETAILS_USERNAME, username);
|
||||
}
|
||||
|
||||
public static String getUserKey()
|
||||
{
|
||||
return get(SecurityConstants.USER_KEY);
|
||||
}
|
||||
|
||||
public static void setUserKey(String userKey)
|
||||
{
|
||||
set(SecurityConstants.USER_KEY, userKey);
|
||||
}
|
||||
|
||||
public static void remove()
|
||||
{
|
||||
THREAD_LOCAL.remove();
|
||||
}
|
||||
}
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
package com.mhd.common.core.domain;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.math.BigDecimal;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
|
||||
|
||||
/**
|
||||
* 司机当前位置信息对象 driver_current_position
|
||||
*
|
||||
* @author gen
|
||||
* @date 2024-01-04
|
||||
*/
|
||||
|
||||
@Data
|
||||
@ApiModel(value = "司机当前位置信息对象", description = "司机当前位置信息响应对象")
|
||||
public class DriverCurrentPositionPO extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("司机位置id")
|
||||
private Long driverCurrentPositionId;
|
||||
|
||||
@ApiModelProperty("用户表ID")
|
||||
@Excel(name = "用户表ID")
|
||||
private Long userId;
|
||||
|
||||
@ApiModelProperty("经度")
|
||||
@Excel(name = "经度")
|
||||
private String longitude;
|
||||
|
||||
@ApiModelProperty("纬度")
|
||||
@Excel(name = "纬度")
|
||||
private String latitude;
|
||||
|
||||
@ApiModelProperty("位置信息")
|
||||
@Excel(name = "位置信息")
|
||||
private String address;
|
||||
|
||||
@ApiModelProperty("车牌号")
|
||||
@Excel(name = "车牌号")
|
||||
private String licensePlate;
|
||||
@ApiModelProperty("行进方向")
|
||||
@Excel(name = "行进方向")
|
||||
private String drivingDirection;
|
||||
|
||||
@ApiModelProperty(name = "在线状态")
|
||||
private String driverStatus = "";
|
||||
@ApiModelProperty(name = "手机号码")
|
||||
private String userPhone = "";
|
||||
@ApiModelProperty(name = "用户姓名(真实姓名)")
|
||||
private String userName = "";
|
||||
|
||||
private String[] position;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.mhd.common.core.domain;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 分布式调度任务表实体
|
||||
*
|
||||
* 2023-02-10
|
||||
*
|
||||
* @author 王子豪
|
||||
*/
|
||||
@Data
|
||||
public class ElasticJob {
|
||||
|
||||
@ApiModelProperty(value = "分布式任务表id")
|
||||
private Long elasticJobId;
|
||||
@ApiModelProperty(value = "项目实例名称")
|
||||
private String applicationName;
|
||||
@ApiModelProperty(value = "zk的nodetree名称(每个项目实例的名称都要不一样)")
|
||||
private String jobName;
|
||||
@ApiModelProperty(value = "时间表达式")
|
||||
private String cron;
|
||||
@ApiModelProperty(value = "分片数(默认为1时不进行任务分片)")
|
||||
private Integer totalCount;
|
||||
@ApiModelProperty(value = "分片说明(默认为空时不进行任务分片)")
|
||||
private String itemParam;
|
||||
@ApiModelProperty(value = "执行逻辑类全限定类名")
|
||||
private String className;
|
||||
}
|
||||
+137
@@ -0,0 +1,137 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 用户钱包账户对象 account_cash_wallet
|
||||
*
|
||||
* @author mhd
|
||||
* @date 2023-03-18
|
||||
*/
|
||||
@Data
|
||||
public class AccountCashWalletDto extends BaseVOEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 用户钱包账户id */
|
||||
@ApiModelProperty(name = "用户钱包账户id")
|
||||
private Long accountCashWalletId;
|
||||
|
||||
@ApiModelProperty(name = "用户钱包账户ids")
|
||||
private Long[] accountCashWalletIds;
|
||||
|
||||
/** 钱包id */
|
||||
@ApiModelProperty(name = "钱包id")
|
||||
private Long accountWalletId;
|
||||
|
||||
/** 用户id */
|
||||
@ApiModelProperty(name = "用户id")
|
||||
private Long userId;
|
||||
|
||||
/** 姓名 */
|
||||
@ApiModelProperty(name = "姓名")
|
||||
private String userName;
|
||||
|
||||
/** 账号 */
|
||||
@ApiModelProperty(name = "账号")
|
||||
private String userAccount;
|
||||
|
||||
/** 身份证号 */
|
||||
@ApiModelProperty(name = "身份证号")
|
||||
private String userIdcardNumber;
|
||||
|
||||
/** 手机号 */
|
||||
@ApiModelProperty(name = "手机号")
|
||||
private String userPhone;
|
||||
|
||||
/** 公司名称 */
|
||||
@ApiModelProperty(name = "公司名称")
|
||||
private String enterpriseName;
|
||||
|
||||
/** 组织id */
|
||||
@ApiModelProperty(name = "组织id")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
|
||||
/** 组织名称 */
|
||||
@ApiModelProperty(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
/** 钱包余额 */
|
||||
@ApiModelProperty(name = "钱包余额")
|
||||
private BigDecimal walletBalance;
|
||||
|
||||
/** 可用金额 */
|
||||
@ApiModelProperty(name = "可用金额")
|
||||
private BigDecimal walletAvailableBalance;
|
||||
|
||||
/** 冻结金额 */
|
||||
@ApiModelProperty(name = "冻结金额")
|
||||
private BigDecimal walletFreezeBalance;
|
||||
|
||||
/** 账户状态(1-正常,2-锁定) */
|
||||
@ApiModelProperty(name = "账户状态(1-正常,2-锁定)")
|
||||
private Integer accountWalletStatus;
|
||||
|
||||
@ApiModelProperty(name = "变动日期查询条件开始日期")
|
||||
private String updateTimeStart;
|
||||
@ApiModelProperty(name = "变动日期查询条件结束日期")
|
||||
private String updateTimeEnd;
|
||||
|
||||
@ApiModelProperty(name = "钱包余额开始")
|
||||
private BigDecimal walletBalanceBegin;
|
||||
@ApiModelProperty(name = "钱包余额结束")
|
||||
private BigDecimal walletBalanceEnd;
|
||||
|
||||
@ApiModelProperty(name = "可用金额开始")
|
||||
private BigDecimal walletAvailableBalanceBegin;
|
||||
@ApiModelProperty(name = "可用金额结束")
|
||||
private BigDecimal walletAvailableBalanceEnd;
|
||||
|
||||
@ApiModelProperty(name = "冻结金额开始")
|
||||
private BigDecimal walletFreezeBalanceBegin;
|
||||
@ApiModelProperty(name = "冻结金额结束")
|
||||
private BigDecimal walletFreezeBalanceEnd;
|
||||
|
||||
@ApiModelProperty(name = "操作类型(1-充值,2-回收,3-退回,4-冻结,5-解冻)")
|
||||
private Integer operationType;
|
||||
|
||||
@ApiModelProperty(name = "支付密码")
|
||||
private String payPassword;
|
||||
|
||||
@ApiModelProperty(name = "消费备注")
|
||||
private String accountRecordsRemark;
|
||||
|
||||
@ApiModelProperty(name = "银行卡管理表id")
|
||||
private Long accountBankCardId;
|
||||
|
||||
@ApiModelProperty(name = "银行卡号")
|
||||
private String bankCardNumber;
|
||||
|
||||
@ApiModelProperty(name = "开户银行code")
|
||||
private String bankNameCode;
|
||||
|
||||
@ApiModelProperty(name = "银行卡预留姓名")
|
||||
private String bankBindingName;
|
||||
|
||||
@ApiModelProperty(name = "账户类型(1-个人,2-组织)")
|
||||
private Integer accountType;
|
||||
|
||||
@ApiModelProperty(name = "授信额度")
|
||||
private BigDecimal creditLimit;
|
||||
@ApiModelProperty(name = "总授信额度")
|
||||
private BigDecimal totalLimit;
|
||||
@ApiModelProperty(name = "支付宝账户")
|
||||
private String alipayAccount;
|
||||
@ApiModelProperty(name = "支付宝账户名称")
|
||||
private String alipayAccountName;
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import com.mhd.common.core.domain.entity.Verification;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* app feign调用公共参数类 dto
|
||||
*/
|
||||
@Data
|
||||
public class AppCommonFeignParamDto extends BaseVOEntity implements Serializable
|
||||
{
|
||||
|
||||
@ApiModelProperty(name = "货款管理对象")
|
||||
List<LoanManageDto> loanManageDtoList;
|
||||
|
||||
@ApiModelProperty(name = "收入核销对象")
|
||||
List<Verification> verificationList;
|
||||
|
||||
@ApiModelProperty(name = "服务费对象")
|
||||
List<ServiceBillDO> serviceBillDOList;
|
||||
|
||||
}
|
||||
+106
@@ -0,0 +1,106 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 产品中台-app配置对象 app_config
|
||||
*
|
||||
* @author gen
|
||||
* @date 2023-10-07
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class AppConfigDTO extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("APP配置表ID")
|
||||
@NotBlank(message = "APP配置表ID 不能为空", groups = {update.class})
|
||||
private Long appId;
|
||||
|
||||
@ApiModelProperty("APP名称")
|
||||
@Excel(name = "APP名称")
|
||||
@NotBlank(message = "APP名称 不能为空", groups = {save.class, update.class})
|
||||
private String appName;
|
||||
|
||||
@ApiModelProperty("APP包名")
|
||||
@Excel(name = "APP包名")
|
||||
@NotBlank(message = "APP包名 不能为空", groups = {save.class, update.class})
|
||||
private String appPackage;
|
||||
|
||||
@ApiModelProperty("APP范围编码,多个,号隔开(数据字典)")
|
||||
@Excel(name = "APP范围编码,多个,号隔开")
|
||||
@NotBlank(message = "APP范围编码 不能为空", groups = {save.class, update.class})
|
||||
private String appRangeCode;
|
||||
|
||||
@ApiModelProperty("APP范围名称,多个、号区分")
|
||||
@Excel(name = "APP范围名称,多个、号区分")
|
||||
private String appRangeName;
|
||||
|
||||
@ApiModelProperty("APP角色Id,多个,号隔开(数据字典)")
|
||||
@Excel(name = "APP角色Id,多个,号隔开")
|
||||
private String appRoleId;
|
||||
|
||||
@ApiModelProperty("APP角色code,多个,号隔开(数据字典)")
|
||||
@Excel(name = "APP角色code,多个,号隔开")
|
||||
@NotBlank(message = "APP角色code 不能为空", groups = {save.class, update.class})
|
||||
private String appRoleCode;
|
||||
|
||||
@ApiModelProperty("APP角色名称,多个、号区分")
|
||||
@Excel(name = "APP角色名称,多个、号区分")
|
||||
private String appRoleName;
|
||||
|
||||
@ApiModelProperty("APP图标")
|
||||
@Excel(name = "APP图标")
|
||||
private String appIcon;
|
||||
|
||||
@ApiModelProperty("APP描述")
|
||||
@Excel(name = "APP描述")
|
||||
private String appRemark;
|
||||
|
||||
@ApiModelProperty(name = "级联组织ID")
|
||||
@Excel(name = "级联组织ID")
|
||||
@NotNull(message = "级联组织ID 不能为空", groups = {save.class, update.class})
|
||||
private String organizationLinkage;
|
||||
|
||||
@ApiModelProperty("组织表ID")
|
||||
@Excel(name = "组织表ID")
|
||||
@NotNull(message = "组织表ID 不能为空", groups = {save.class, update.class})
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("组织名称")
|
||||
@Excel(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("一级组织id")
|
||||
@Excel(name = "一级组织id")
|
||||
private Long topOrganizationId;
|
||||
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
|
||||
@ApiModelProperty("app二维码")
|
||||
private String appQrcode;
|
||||
|
||||
@ApiModelProperty("app使用帮助")
|
||||
private String appUsingHelp;
|
||||
|
||||
@ApiModelProperty("APP配置id集合")
|
||||
private Long[] appIds;
|
||||
|
||||
|
||||
|
||||
public interface save {}
|
||||
|
||||
public interface update {}
|
||||
}
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class BasicAgreementDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "系统协议表ID")
|
||||
private Long basicAgreementId;
|
||||
@ApiModelProperty(name = "系统协议内容")
|
||||
private String basicAgreementContent;
|
||||
@ApiModelProperty(name = "系统协议类型数据字典ID")
|
||||
private String basicAgreementTypeId;
|
||||
@ApiModelProperty(name = "系统协议类型名称")
|
||||
private String basicAgreementTypeName;
|
||||
@ApiModelProperty(name = "系统协议类型编码")
|
||||
private String basicAgreementTypeCode;
|
||||
@ApiModelProperty(name = "系统协议状态:0-无状态,1-正常,2-停用")
|
||||
private Integer basicAgreementStatus;
|
||||
|
||||
@ApiModelProperty(name = "一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty("组织表ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty("显示名称")
|
||||
private String displayName;
|
||||
|
||||
@ApiModelProperty("域名")
|
||||
private String path;
|
||||
|
||||
@ApiModelProperty("协议编码code")
|
||||
private String agreementCode;
|
||||
|
||||
}
|
||||
+79
@@ -0,0 +1,79 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 网点账单其他费用对象 branch_bill_other_fee
|
||||
*
|
||||
* @author gen
|
||||
* @date 2023-11-09
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class BranchBillOtherFeeDO extends BaseVOEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("网点账单其他费用id")
|
||||
private Long branchBillOtherFeeId;
|
||||
|
||||
@ApiModelProperty("最高组织id")
|
||||
@Excel(name = "最高组织id")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty("组织表id")
|
||||
@Excel(name = "组织表id")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("组织名称")
|
||||
@Excel(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("网点费用账单编码")
|
||||
@Excel(name = "网点费用账单编码")
|
||||
private String billCode;
|
||||
|
||||
@ApiModelProperty("关联订单id")
|
||||
@Excel(name = "关联订单id")
|
||||
private Long associationOrderId;
|
||||
|
||||
@ApiModelProperty("关联订单编码")
|
||||
@Excel(name = "关联订单编码")
|
||||
private String associationOrderCode;
|
||||
|
||||
@ApiModelProperty("一级科目code")
|
||||
@Excel(name = "一级科目code")
|
||||
private String firstSubject;
|
||||
|
||||
@ApiModelProperty("一级科目名称")
|
||||
@Excel(name = "一级科目名称")
|
||||
private String firstSubjectName;
|
||||
|
||||
@ApiModelProperty("二级科目code")
|
||||
@Excel(name = "二级科目code")
|
||||
private String secondSubject;
|
||||
|
||||
@ApiModelProperty("二级科目名称")
|
||||
@Excel(name = "二级科目名称")
|
||||
private String secondSubjectName;
|
||||
|
||||
@ApiModelProperty("收入支出类型1.收入2.支出")
|
||||
@Excel(name = "收入支出类型1.收入2.支出")
|
||||
private Integer revenueExpensesType;
|
||||
|
||||
@ApiModelProperty("金额")
|
||||
@Excel(name = "金额")
|
||||
private BigDecimal money;
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
+128
@@ -0,0 +1,128 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 网点费用账单对象 branch_freight_bill
|
||||
*
|
||||
* @author gen
|
||||
* @date 2023-11-08
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class BranchFreightBillDO extends BaseVOEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("网点账单id")
|
||||
private Long branchFreightId;
|
||||
|
||||
@ApiModelProperty("最高组织id")
|
||||
@Excel(name = "最高组织id")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty("组织表id")
|
||||
@Excel(name = "组织表id")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("组织名称")
|
||||
@Excel(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("收账网点id")
|
||||
@Excel(name = "收账网点id")
|
||||
private Long branchInId;
|
||||
|
||||
@ApiModelProperty("收账网点名称")
|
||||
@Excel(name = "收账网点名称")
|
||||
private String branchInName;
|
||||
|
||||
@ApiModelProperty("交账网点id")
|
||||
@Excel(name = "交账网点id")
|
||||
private Long branchOutId;
|
||||
|
||||
@ApiModelProperty("交账网点名称")
|
||||
@Excel(name = "交账网点名称")
|
||||
private String branchOutName;
|
||||
|
||||
@ApiModelProperty("网点费用账单编码")
|
||||
@Excel(name = "网点费用账单编码")
|
||||
private String billCode;
|
||||
|
||||
@ApiModelProperty("确认状态:1-未确认 2-已确认")
|
||||
@Excel(name = "确认状态:1-未确认 2-已确认")
|
||||
private Integer authStatus;
|
||||
|
||||
@ApiModelProperty("关联订单id")
|
||||
@Excel(name = "关联订单id")
|
||||
private Long associationOrderId;
|
||||
|
||||
@ApiModelProperty("关联订单编码")
|
||||
@Excel(name = "关联订单编码")
|
||||
private String associationOrderCode;
|
||||
|
||||
@ApiModelProperty("运单状态:1-未签收 2-已签收 3-已作废")
|
||||
@Excel(name = "运单状态:1-未签收 2-已签收 3-已作废")
|
||||
private Integer associationOrderStatus;
|
||||
|
||||
@ApiModelProperty("客户总运费:取运单中合计运费")
|
||||
@Excel(name = "客户总运费:取运单中合计运费")
|
||||
private BigDecimal customFreight;
|
||||
|
||||
@ApiModelProperty("运费:通过计价体系算出来的运费")
|
||||
@Excel(name = "运费:通过计价体系算出来的运费")
|
||||
private BigDecimal freight;
|
||||
|
||||
@ApiModelProperty("送货费:通过计价体系算出来的送货费")
|
||||
@Excel(name = "送货费:通过计价体系算出来的送货费")
|
||||
private BigDecimal deliveryExpense;
|
||||
|
||||
@ApiModelProperty("网点总运费:运费+送货费")
|
||||
@Excel(name = "网点总运费:运费+送货费")
|
||||
private BigDecimal totalFreight;
|
||||
|
||||
@ApiModelProperty("其他费用")
|
||||
@Excel(name = "其他费用")
|
||||
private BigDecimal otherExpenses;
|
||||
|
||||
@ApiModelProperty("留存金额:客户总运费-网点总运费")
|
||||
@Excel(name = "留存金额:客户总运费-网点总运费")
|
||||
private BigDecimal retainedAmount;
|
||||
|
||||
@ApiModelProperty("开单时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date billingTime;
|
||||
|
||||
@ApiModelProperty("签收时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date signTime;
|
||||
|
||||
@ApiModelProperty("确认时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date authTime;
|
||||
|
||||
@ApiModelProperty("确认人id")
|
||||
@Excel(name = "确认人id")
|
||||
private String authId;
|
||||
|
||||
@ApiModelProperty("确认人姓名")
|
||||
@Excel(name = "确认人姓名")
|
||||
private String authName;
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 业务推送BMS数据实体
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class BusinessDataPushDTO{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
@ApiModelProperty("组织表ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("来源模块code")
|
||||
@NotBlank(message = "来源模块不能为空")
|
||||
private String belongModuleCode;
|
||||
|
||||
@ApiModelProperty("单据类型code")
|
||||
@NotBlank(message = "单据类型不能为空")
|
||||
private String documentTypeCode;
|
||||
|
||||
@ApiModelProperty("原始业务单号")
|
||||
@NotBlank(message = "原始业务单号不能为空")
|
||||
private String originalBusinessNum;
|
||||
|
||||
@ApiModelProperty("项目编码")
|
||||
private String projectCode;
|
||||
|
||||
@ApiModelProperty("合同编号")
|
||||
private String contractNumber;
|
||||
|
||||
@ApiModelProperty("账单金额")
|
||||
private BigDecimal billAmount;
|
||||
|
||||
@ApiModelProperty("费用科目")
|
||||
@NotBlank(message = "费用科目不能为空")
|
||||
private String secondSubjectCode;
|
||||
|
||||
@ApiModelProperty("结算对象code")
|
||||
private String settlementCustomersCode;
|
||||
|
||||
@ApiModelProperty("单据表单json数据")
|
||||
@NotBlank(message = "单据表单数据不能为空")
|
||||
private String documentFormJson;
|
||||
|
||||
@ApiModelProperty("原始流水号")
|
||||
private String originalSerialNumber;
|
||||
|
||||
@ApiModelProperty("单据备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty("结算主体id")
|
||||
@NotNull(message = "结算主体不能为空")
|
||||
private Long settlementEntityId;
|
||||
}
|
||||
+225
@@ -0,0 +1,225 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import java.math.BigDecimal;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 业务单据对象 business_document
|
||||
*
|
||||
* @author gen
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class BusinessDocumentDTO extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("业务单据详情表id")
|
||||
private Long businessDocumentId;
|
||||
|
||||
@ApiModelProperty("对账单表id")
|
||||
@Excel(name = "对账单表id")
|
||||
private Long reconciliationId;
|
||||
|
||||
@ApiModelProperty("金额")
|
||||
@Excel(name = "金额")
|
||||
private BigDecimal verificationMoney;
|
||||
|
||||
@ApiModelProperty("托运人id")
|
||||
@Excel(name = "托运人id")
|
||||
private Long userId;
|
||||
|
||||
@ApiModelProperty("手机号")
|
||||
@Excel(name = "手机号")
|
||||
private String phone;
|
||||
|
||||
@ApiModelProperty("运单/订单号")
|
||||
@Excel(name = "运单/订单号")
|
||||
private String waybillNumber;
|
||||
|
||||
@ApiModelProperty("运单/订单来源")
|
||||
@Excel(name = "运单/订单来源")
|
||||
private String waybillSource;
|
||||
|
||||
@ApiModelProperty("运单/订单来源name")
|
||||
@Excel(name = "运单/订单来源name")
|
||||
private String waybillSourceName;
|
||||
|
||||
@ApiModelProperty("应收结算类型:1-月结,2-现结")
|
||||
@Excel(name = "应收结算类型:1-月结,2-现结")
|
||||
private Integer receivableType;
|
||||
|
||||
@ApiModelProperty("装货地址")
|
||||
@Excel(name = "装货地址")
|
||||
private String loadingAdress;
|
||||
|
||||
@ApiModelProperty("装货地址")
|
||||
@Excel(name = "装货地址")
|
||||
private String unloadAdress;
|
||||
|
||||
@ApiModelProperty("应付金额")
|
||||
@Excel(name = "应付金额")
|
||||
private BigDecimal payableAmount;
|
||||
|
||||
@ApiModelProperty("应收金额")
|
||||
@Excel(name = "应收金额")
|
||||
private BigDecimal receivableAmount;
|
||||
|
||||
@ApiModelProperty("承运人ID")
|
||||
@Excel(name = "承运人ID")
|
||||
private Long carrierId;
|
||||
|
||||
@ApiModelProperty("承运人姓名")
|
||||
@Excel(name = "承运人姓名")
|
||||
private String carrierName;
|
||||
|
||||
@ApiModelProperty("司机ID")
|
||||
@Excel(name = "司机ID")
|
||||
private Long driverId;
|
||||
|
||||
@ApiModelProperty("司机姓名")
|
||||
@Excel(name = "司机姓名")
|
||||
private String driverName;
|
||||
|
||||
@ApiModelProperty("托运人姓名")
|
||||
@Excel(name = "托运人姓名")
|
||||
private String shipperName;
|
||||
|
||||
@ApiModelProperty("托运人信息")
|
||||
@Excel(name = "托运人信息")
|
||||
private String shipperInfo;
|
||||
|
||||
@ApiModelProperty("车牌号")
|
||||
@Excel(name = "车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
|
||||
@ApiModelProperty("接收时间")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "接收时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date receptionTime;
|
||||
|
||||
@ApiModelProperty("组织ID")
|
||||
@Excel(name = "组织ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("一级组织ID")
|
||||
@Excel(name = "一级组织ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
|
||||
@ApiModelProperty(name = "对账详情")
|
||||
private List<BusinessDocumentDetaliDTO> businessDocumentDetalis;
|
||||
|
||||
@ApiModelProperty(name = "付款状态(1-已支付,2-未支付)")
|
||||
private Integer payStatus;
|
||||
|
||||
@ApiModelProperty("付款时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date payTime;
|
||||
|
||||
@ApiModelProperty(name = "订单核实状态(1-未核实,2-已核实)")
|
||||
private Integer waybillVerifyFlag;
|
||||
|
||||
@ApiModelProperty("标记核实时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date waybillVerifyTime;
|
||||
|
||||
@ApiModelProperty("已开票金额")
|
||||
@Excel(name = "已开票金额")
|
||||
private BigDecimal invoiceCostHas;
|
||||
|
||||
@ApiModelProperty(name = "订单申请发票状态(1-已申请,2-未申请)")
|
||||
private Integer invoiceApplyStatus;
|
||||
|
||||
/** 货物类型 */
|
||||
@ApiModelProperty(name = "货物类型")
|
||||
private String freightName;
|
||||
|
||||
/** 开票记录表id */
|
||||
@ApiModelProperty(name = "开票记录表id")
|
||||
private Long invoiceInfoId;
|
||||
|
||||
@ApiModelProperty(name = "开单时间查询条件开始日期")
|
||||
private String createTimeStart;
|
||||
|
||||
@ApiModelProperty(name = "开单时间查询条件结束日期")
|
||||
private String createTimeEnd;
|
||||
|
||||
@ApiModelProperty(name = "付款时间查询条件开始日期")
|
||||
private String payTimeStart;
|
||||
|
||||
@ApiModelProperty(name = "付款时间查询条件结束日期")
|
||||
private String payTimeEnd;
|
||||
|
||||
@ApiModelProperty("审核状态(1-审核中,2-审核通过,3-审核拒绝)")
|
||||
@Excel(name = "审核状态(1-审核中,2-审核通过,3-审核拒绝)")
|
||||
private Integer auditStatus;
|
||||
|
||||
@ApiModelProperty("业务明细id集合")
|
||||
private List<Long> businessDocumentDetailIds;
|
||||
|
||||
@ApiModelProperty(name = "APP收支明细查询条件(1-全部,2-今天,3-本周,4-本月,5-自定义)")
|
||||
private Integer queryDateFlag;
|
||||
|
||||
@ApiModelProperty(name = "接收时间查询条件开始日期")
|
||||
private String receptionTimeStart;
|
||||
|
||||
@ApiModelProperty(name = "接收时间查询条件结束日期")
|
||||
private String receptionTimeEnd;
|
||||
|
||||
@ApiModelProperty(name = "运单id")
|
||||
private String waybillId;
|
||||
|
||||
@ApiModelProperty(name = "收货市区名称简写")
|
||||
private String addresseeAreaName;
|
||||
|
||||
@ApiModelProperty(name = "发货市区名称简写")
|
||||
private String mailAreaName;
|
||||
|
||||
@ApiModelProperty(name = "付款状态(1-已支付,2-未支付)")
|
||||
private Integer payStatusShipper;
|
||||
|
||||
@ApiModelProperty("业务单据详情表ids")
|
||||
private String businessDocumentIds;
|
||||
|
||||
@ApiModelProperty(name = "查询类型(1-货主,2-司机)")
|
||||
private Integer queryType;
|
||||
|
||||
@ApiModelProperty(name = "司机提成费率")
|
||||
private BigDecimal commissionRate;
|
||||
|
||||
@ApiModelProperty("货主付款时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "付款时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date payTimeShipper;
|
||||
|
||||
@ApiModelProperty(name = "付款时间查询条件开始日期")
|
||||
private String payTimeShipperStart;
|
||||
|
||||
@ApiModelProperty(name = "付款时间查询条件结束日期")
|
||||
private String payTimeShipperEnd;
|
||||
|
||||
@ApiModelProperty(name = "单据类型(1-普通单,2-合单(网货))")
|
||||
private Integer waybillType;
|
||||
|
||||
@ApiModelProperty(value = "合单主单单号(单据类型为2 不能为空)")
|
||||
private String mainOrderNumber;
|
||||
}
|
||||
+153
@@ -0,0 +1,153 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import java.math.BigDecimal;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 业务单据详情对象 business_document_detali
|
||||
*
|
||||
* @author gen
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class BusinessDocumentDetaliDTO extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("应付单据id")
|
||||
private Long businessDocumentDetaliId;
|
||||
|
||||
@ApiModelProperty("应付单据号")
|
||||
@Excel(name = "应付单据号")
|
||||
private String businessCocumentId;
|
||||
|
||||
@ApiModelProperty("应付单据号")
|
||||
@Excel(name = "应付单据号")
|
||||
private String businessDocumentDetaliNumber;
|
||||
|
||||
@ApiModelProperty("业务类型:1-运单,2-作业单,3-借款单,4-订单,5-维修单")
|
||||
@Excel(name = "业务类型:1-运单,2-作业单,3-借款单,4-订单,5-维修单")
|
||||
private Integer businessType;
|
||||
|
||||
@ApiModelProperty("费用类别")
|
||||
@Excel(name = "费用类别")
|
||||
private String expenseItem;
|
||||
|
||||
@ApiModelProperty("一级科目code")
|
||||
@Excel(name = "一级科目code")
|
||||
private String firstSubject;
|
||||
|
||||
@ApiModelProperty("一级科目名称")
|
||||
@Excel(name = "一级科目名称")
|
||||
private String firstSubjectName;
|
||||
|
||||
@ApiModelProperty("二级科目code")
|
||||
@Excel(name = "二级科目code")
|
||||
private String secondSubject;
|
||||
|
||||
@ApiModelProperty("二级科目名称")
|
||||
@Excel(name = "二级科目名称")
|
||||
private String secondSubjectName;
|
||||
|
||||
@ApiModelProperty("金额")
|
||||
@Excel(name = "金额")
|
||||
private BigDecimal amount;
|
||||
|
||||
// @ApiModelProperty("服务费")
|
||||
// @Excel(name = "服务费")
|
||||
// private BigDecimal service;
|
||||
//
|
||||
// @ApiModelProperty("托运人id")
|
||||
// @Excel(name = "托运人id")
|
||||
// private Long userId;
|
||||
|
||||
@ApiModelProperty("业务单据号:运单号/作业单号/借款单号/订单号/维修单号")
|
||||
@Excel(name = "业务单据号:运单号/作业单号/借款单号/订单号/维修单号")
|
||||
private String waybillNumber;
|
||||
|
||||
@ApiModelProperty("运单/订单号(批量查询使用)")
|
||||
@Excel(name = "运单/订单号(批量查询使用)")
|
||||
private String waybillNumbers;
|
||||
|
||||
@ApiModelProperty("业务单据详情表id集合")
|
||||
private List<Long> businessDocumentDetaliIds;
|
||||
|
||||
@ApiModelProperty("组织ID")
|
||||
@Excel(name = "组织ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("一级组织ID")
|
||||
@Excel(name = "一级组织ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty("审批单")
|
||||
private String auditNumber;
|
||||
@ApiModelProperty("审核状态(0-未审批,1-审批中,2-已同意,3-已拒绝,4-已撤销)")
|
||||
@Excel(name = "审核状态(0-未审批,1-审批中,2-已同意,3-已拒绝,4-已撤销)")
|
||||
private Integer auditStatus;
|
||||
|
||||
@ApiModelProperty("审批方式:1-钉钉审批,2-人工审批")
|
||||
private Integer auditType;
|
||||
@ApiModelProperty("审核说明")
|
||||
private String auditRemark;
|
||||
|
||||
@ApiModelProperty("支付状态(1-未付款,2-已付款)")
|
||||
@Excel(name = "支付状态(1-未付款,2-已付款)")
|
||||
private Integer paymentStatus;
|
||||
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
@ApiModelProperty("部门id")
|
||||
private String departmentId;
|
||||
@ApiModelProperty("部门名称")
|
||||
private String departmentName;
|
||||
@ApiModelProperty("付款对象(收款方)")
|
||||
private String payee;
|
||||
@ApiModelProperty("收款人id")
|
||||
private String payId;
|
||||
@ApiModelProperty("收款人姓名")
|
||||
private String payName;
|
||||
@ApiModelProperty("车牌号")
|
||||
private String licenseNumber;
|
||||
|
||||
//查询字段
|
||||
@ApiModelProperty("开始时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private Date starTime;
|
||||
@ApiModelProperty("结束时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private Date endTime;
|
||||
@ApiModelProperty("创建时间开始")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private Date createTimeStart;
|
||||
@ApiModelProperty("创建时间结束")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private Date createTimeEnd;
|
||||
|
||||
@ApiModelProperty(value = "订单子单目的地")
|
||||
private String orderDetailDestination;
|
||||
|
||||
@ApiModelProperty(value = "审批单号")
|
||||
private String approvalNumber;
|
||||
|
||||
@ApiModelProperty("支付方式 0-挂账 1-即时")
|
||||
private Integer paymentMethod;
|
||||
|
||||
@ApiModelProperty("油卡号")
|
||||
private String fuelCardNumber;
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class CustomAuthDTO extends BaseVOEntity implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(name = "菜单表ID")
|
||||
private Long menuId;
|
||||
@ApiModelProperty(name = "角色表ID")
|
||||
private Long roleId;
|
||||
@ApiModelProperty(name = "用户表ID")
|
||||
private Long userId;
|
||||
@ApiModelProperty(name = "表格json")
|
||||
private String tableJson;
|
||||
@ApiModelProperty(name = "表单json")
|
||||
private String formJson;
|
||||
@ApiModelProperty(name = "按钮json")
|
||||
private String buttonJson;
|
||||
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CustomDTO {
|
||||
@ApiModelProperty(name = "菜单表ID")
|
||||
private Long menuId;
|
||||
@ApiModelProperty(name = "角色表ID")
|
||||
private Long roleId;
|
||||
@ApiModelProperty(name = "用户表ID")
|
||||
private Long userId;
|
||||
@ApiModelProperty(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
@ApiModelProperty(name = "表格json")
|
||||
private String tableJson;
|
||||
@ApiModelProperty(name = "表单json")
|
||||
private String formJson;
|
||||
@ApiModelProperty(name = "按钮json")
|
||||
private String buttonJson;
|
||||
}
|
||||
+400
@@ -0,0 +1,400 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 调度单对象 dispatch
|
||||
*
|
||||
* @author ???
|
||||
* @date 2023-07-17
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class DispatchFeignDto extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 调度单id */
|
||||
@ApiModelProperty("调度单id")
|
||||
private Long dispatchId;
|
||||
/** 组织表id */
|
||||
@ApiModelProperty("组织表id")
|
||||
@Excel(name = "组织表id")
|
||||
private Long organizationId;
|
||||
/** 调度单号 */
|
||||
@ApiModelProperty("调度单号")
|
||||
@Excel(name = "调度单号")
|
||||
private String dispatchNumber;
|
||||
@ApiModelProperty("调度单运单关系表id")
|
||||
private Long dispatchWaybillId;
|
||||
/** 调度单类型,0-普通调度配车单,1-内部调度派车单,2-外部调度派车单 */
|
||||
@ApiModelProperty("调度单类型,0-普通调度配车单,1-内部调度派车单,2-外部调度派车单")
|
||||
@Excel(name = "调度单类型,0-普通调度配车单,1-内部调度派车单,2-外部调度派车单")
|
||||
private Long dispatchType;
|
||||
/** 调度配(派)车日期 */
|
||||
@ApiModelProperty("调度配(派)车日期")
|
||||
@Excel(name = "调度配", readConverterExp = "派=")
|
||||
private Date dispatchDate;
|
||||
/** 计划发车日期 */
|
||||
@ApiModelProperty("计划发车日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "计划发车日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date planDepartureDate;
|
||||
/** 计划送货时间/提货时间 */
|
||||
@ApiModelProperty("计划送货时间/提货时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "计划送货时间/提货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date deliveryDate;
|
||||
/** 最后装车时间 */
|
||||
@ApiModelProperty("最后装车时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "最后装车时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date loadDate;
|
||||
/** 发车日期 */
|
||||
@ApiModelProperty("发车日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "发车日期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date departureDate;
|
||||
/** 接车日期(入库时间) */
|
||||
@ApiModelProperty("接车日期(入库时间)")
|
||||
@Excel(name = "接车日期", readConverterExp = "入=库时间")
|
||||
private Date pickUpDate;
|
||||
/** 寄件(发站)网点 */
|
||||
@ApiModelProperty("寄件(发站)网点")
|
||||
@Excel(name = "寄件(发站)网点")
|
||||
private Long mailBranch;
|
||||
/** 寄件网点名称 */
|
||||
@ApiModelProperty("寄件网点名称")
|
||||
@Excel(name = "寄件网点名称")
|
||||
private String mailBranchName;
|
||||
/** 到站网点 */
|
||||
@ApiModelProperty("到站网点")
|
||||
@Excel(name = "到站网点")
|
||||
private Long arriveBranch;
|
||||
/** 到站网点名称 */
|
||||
@ApiModelProperty("到站网点名称")
|
||||
@Excel(name = "到站网点名称")
|
||||
private String arriveBranchName;
|
||||
/** 车辆id */
|
||||
@ApiModelProperty("车辆id")
|
||||
@Excel(name = "车辆id")
|
||||
private Long vehicleId;
|
||||
/** 车牌号 */
|
||||
@ApiModelProperty("车牌号")
|
||||
@Excel(name = "车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
/** 车辆类型(数据字典id) */
|
||||
@ApiModelProperty("车辆类型(数据字典id)")
|
||||
@Excel(name = "车辆类型(数据字典id)")
|
||||
private String vehicleTypeId;
|
||||
/** 车辆类型(数据字典name) */
|
||||
@ApiModelProperty("车辆类型(数据字典name)")
|
||||
@Excel(name = "车辆类型(数据字典name)")
|
||||
private String vehicleTypeName;
|
||||
/** 核定载质量 */
|
||||
@ApiModelProperty("核定载质量")
|
||||
@Excel(name = "核定载质量")
|
||||
private BigDecimal vehicleApprovedLoadQuantity;
|
||||
/** 车辆来源(数据字典id) */
|
||||
@ApiModelProperty("车辆来源(数据字典id)")
|
||||
@Excel(name = "车辆来源(数据字典id)")
|
||||
private String vehicleSourceId;
|
||||
/** 车辆来源(数据字典name) */
|
||||
@ApiModelProperty("车辆来源(数据字典name)")
|
||||
@Excel(name = "车辆来源(数据字典name)")
|
||||
private String vehicleSourceName;
|
||||
/** 司机对应用户id */
|
||||
@ApiModelProperty("司机对应用户id")
|
||||
@Excel(name = "司机对应用户id")
|
||||
private Long userId;
|
||||
@ApiModelProperty("司机id集合")
|
||||
private List<Long> driverIdList;
|
||||
/** 司机姓名 */
|
||||
@ApiModelProperty("司机姓名")
|
||||
@Excel(name = "司机姓名")
|
||||
private String driverName;
|
||||
/** 司机联系方式 */
|
||||
@ApiModelProperty("司机联系方式")
|
||||
@Excel(name = "司机联系方式")
|
||||
private String driverPhone;
|
||||
/** 保险费 */
|
||||
@ApiModelProperty("保险费")
|
||||
@Excel(name = "保险费")
|
||||
private BigDecimal premium;
|
||||
/** 预付 */
|
||||
@ApiModelProperty("预付")
|
||||
@Excel(name = "预付")
|
||||
private BigDecimal prepayment;
|
||||
/** 油卡 */
|
||||
@ApiModelProperty("油卡")
|
||||
@Excel(name = "油卡")
|
||||
private BigDecimal fuelCardFee;
|
||||
/** 到付 */
|
||||
@ApiModelProperty("到付")
|
||||
@Excel(name = "到付")
|
||||
private BigDecimal freightCollectPayment;
|
||||
/** 月结 */
|
||||
@ApiModelProperty("月结")
|
||||
@Excel(name = "月结")
|
||||
private BigDecimal monthlyStatement;
|
||||
/** 回单付 */
|
||||
@ApiModelProperty("回单付")
|
||||
@Excel(name = "回单付")
|
||||
private BigDecimal paymentAgainstDocuments;
|
||||
/** 车费合计 */
|
||||
@ApiModelProperty("车费合计")
|
||||
@Excel(name = "车费合计")
|
||||
private BigDecimal totalFare;
|
||||
/** 总单数 */
|
||||
@ApiModelProperty("总单数")
|
||||
@Excel(name = "总单数")
|
||||
private Long totalOrderNumber;
|
||||
/** 总件数 */
|
||||
@ApiModelProperty("总件数")
|
||||
@Excel(name = "总件数")
|
||||
private Long totalCaseNumber;
|
||||
/** 总重量 */
|
||||
@ApiModelProperty("总重量")
|
||||
@Excel(name = "总重量")
|
||||
private BigDecimal totalWeight;
|
||||
/** 总体积 */
|
||||
@ApiModelProperty("总体积")
|
||||
@Excel(name = "总体积")
|
||||
private BigDecimal totalVolume;
|
||||
/** 总运费 */
|
||||
@ApiModelProperty("总运费")
|
||||
@Excel(name = "总运费")
|
||||
private BigDecimal totalFreight;
|
||||
/** 总代收款 */
|
||||
@ApiModelProperty("总代收款")
|
||||
@Excel(name = "总代收款")
|
||||
private BigDecimal totalCollectionDelivery;
|
||||
@ApiModelProperty("配车单类型:0-非调度配车单 1-内部调度配车单 2-外部调度配车单")
|
||||
@Excel(name = "配车单类型:0-非调度配车单 1-内部调度配车单 2-外部调度配车单")
|
||||
private Integer allocationType;
|
||||
/** 配送方式,1-提货,2-送货,配载类型(1.干线2.分流) */
|
||||
@ApiModelProperty("配送方式,1-提货,2-送货,配载类型(1.干线2.分流)")
|
||||
@Excel(name = "配送方式,1-提货,2-送货,配载类型", readConverterExp = "1=.干线2.分流")
|
||||
private Long deliveryType;
|
||||
/** 运输状态(1.未调度(未装车)2.已调度配载 3.已发车 4已接车(入库) 5.已完成),运输状态(提货:1.未接单2.未提货3.未送货4.未入库5.已完成;送货:1.未接单2.未提货3.未送货4.已完成) */
|
||||
@ApiModelProperty("运输状态(1.未调度(未装车)2.已调度配载 3.已发车 4已接车(入库) 5.已完成),运输状态(提货:1.未接单2.未提货3.未送货4.未入库5.已完成;送货:1.未接单2.未提货3.未送货4.已完成)")
|
||||
@Excel(name = "运输状态", readConverterExp = "1=.未调度(未装车")
|
||||
private Long transportStatus;
|
||||
/** 到达时间 */
|
||||
@ApiModelProperty("到达时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "到达时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date arriveDate;
|
||||
/** 实际提货/送货时间 */
|
||||
@ApiModelProperty("实际提货/送货时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "实际提货/送货时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date actualDeliveryDate;
|
||||
@ApiModelProperty("是否接单(1-未接单,2-已接单,3-已拒绝)")
|
||||
@Excel(name = "是否接单(1-未接单,2-已接单,3-已拒绝)")
|
||||
private Long receivingStatus;
|
||||
@ApiModelProperty("接单时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date receivingDate;
|
||||
@ApiModelProperty("装货照片")
|
||||
private String loadImg;
|
||||
@ApiModelProperty("卸货照片")
|
||||
private String unloadImg;
|
||||
@ApiModelProperty("回单照片")
|
||||
private String receiptImg;
|
||||
@ApiModelProperty("装货备注")
|
||||
private String loadRemark;
|
||||
@ApiModelProperty("卸货备注")
|
||||
private String unloadRemark;
|
||||
@ApiModelProperty("回单备注")
|
||||
private String receiptRemark;
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
@ApiModelProperty("APP搜索条件")
|
||||
private String dispatchInfo;
|
||||
/** 运单id */
|
||||
@ApiModelProperty("运单id(多个用逗号隔开)")
|
||||
@Excel(name = "运单id")
|
||||
private String waybillId;
|
||||
@ApiModelProperty("装货类型(1-装货,2-一键装货)")
|
||||
private Integer loadType;
|
||||
|
||||
@ApiModelProperty("总支付状态(1-未支付,2-已支付)")
|
||||
private Integer paymentStatus;
|
||||
|
||||
@ApiModelProperty(name = "发货地址")
|
||||
private String sendAddress;
|
||||
@ApiModelProperty(name = "发货地址经度")
|
||||
private String sendLongitude;
|
||||
@ApiModelProperty(name = "发货地址纬度")
|
||||
private String sendLatitude;
|
||||
@ApiModelProperty("发货时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date sendTime;
|
||||
|
||||
@ApiModelProperty(name = "收货地址地址")
|
||||
private String receiveAddress;
|
||||
@ApiModelProperty(name = "收货地址经度")
|
||||
private String receiveLongitude;
|
||||
@ApiModelProperty(name = "收货地址纬度")
|
||||
private String receiveLatitude;
|
||||
@ApiModelProperty("收货时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date receiveTime;
|
||||
@ApiModelProperty(name = "派车运单id集合")
|
||||
private Long[] waybillIds;
|
||||
|
||||
|
||||
@ApiModelProperty(name = "实际提货时间查询条件开始时间")
|
||||
private String actualDeliveryTimeStart;
|
||||
@ApiModelProperty(name = "实际提货时间查询条件结束时间")
|
||||
private String actualDeliveryTimeEnd;
|
||||
|
||||
@ApiModelProperty(name = "计划提货时间查询条件开始时间")
|
||||
private String deliveryTimeStart;
|
||||
@ApiModelProperty(name = "计划提货时间查询条件结束时间")
|
||||
private String deliveryTimeEnd;
|
||||
@ApiModelProperty(name = "实际送货时间查询条件开始时间")
|
||||
private String actualSendCarTimeStart;
|
||||
@ApiModelProperty(name = "实际送货时间查询条件结束时间")
|
||||
private String actualSendCarTimeEnd;
|
||||
@ApiModelProperty(name = "创建时间查询条件开始日期")
|
||||
private String createTimeStart;
|
||||
@ApiModelProperty(name = "创建时间查询条件结束日期")
|
||||
private String createTimeEnd;
|
||||
@ApiModelProperty(name = "入库时间查询条件开始日期")
|
||||
private String warehousingTimeStart;
|
||||
@ApiModelProperty(name = "入库时间查询条件结束日期")
|
||||
private String warehousingTimeEnd;
|
||||
@ApiModelProperty(name = "接单时间查询条件开始日期")
|
||||
private String receiveOrderTimeStart;
|
||||
@ApiModelProperty(name = "接单时间查询条件结束日期")
|
||||
private String receiveOrderTimeEnd;
|
||||
@ApiModelProperty(name = "到达时间查询条件开始日期")
|
||||
private String arriveTimeStart;
|
||||
@ApiModelProperty(name = "到达时间查询条件结束日期")
|
||||
private String arriveTimeEnd;
|
||||
@ApiModelProperty(name = "查询条件司机姓名/联系方式")
|
||||
private String driverText;
|
||||
@ApiModelProperty("接车日期(入库时间)开始日期")
|
||||
private String pickUpDateStart;
|
||||
@ApiModelProperty("接车日期(入库时间)结束日期")
|
||||
private String pickUpDateEnd;
|
||||
@ApiModelProperty("发车日期开始日期")
|
||||
private String departureDateStart;
|
||||
@ApiModelProperty("发车日期结束日期")
|
||||
private String departureDateEnd;
|
||||
@ApiModelProperty("配载日期开始日期")
|
||||
private String dispatchDateStart;
|
||||
@ApiModelProperty("配载日期结束日期")
|
||||
private String dispatchDateEnd;
|
||||
|
||||
@ApiModelProperty("调度单类型:1-派车单,2-调度单")
|
||||
@Excel(name = "调度单类型:1-派车单,2-调度单")
|
||||
private Integer dispatchSelectType;
|
||||
|
||||
@ApiModelProperty(name = "状态1正常2作废")
|
||||
private Integer status;
|
||||
|
||||
/** 调度单id字符床以逗号拼接 例如(205,204) 用于批量操作*/
|
||||
@ApiModelProperty("调度单id")
|
||||
private String dispatchIds;
|
||||
@ApiModelProperty("接车状态(1-未接车,2-已接车)")
|
||||
private Long pickupState;
|
||||
|
||||
@ApiModelProperty("app运输任务列表状态(0-全部,1-待接单,2-未提货,3-未派送,4-已完成)")
|
||||
private Integer taskStatus;
|
||||
|
||||
@ApiModelProperty("是否开启议价:1-关闭 2-开启")
|
||||
private Integer bidding;
|
||||
|
||||
@ApiModelProperty("议价状态:1-未竞价 2-竞价中 3-竞价成功 4-竞价失败")
|
||||
private Integer biddingStatus;
|
||||
|
||||
@ApiModelProperty("预设竞标价 单位:元")
|
||||
private BigDecimal presetsBiddingPrice;
|
||||
|
||||
@ApiModelProperty("最高竞标价 单位:元")
|
||||
private BigDecimal maxBiddingPrice;
|
||||
|
||||
@ApiModelProperty("议价截止时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date biddingTime;
|
||||
|
||||
@ApiModelProperty("议价截止时间-开始")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date biddingTimeStart;
|
||||
|
||||
@ApiModelProperty("议价截止时间-结束")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date biddingTimeEnd;
|
||||
|
||||
@ApiModelProperty("查询是否来源于货源大厅:0-否 1-是")
|
||||
private Integer isSupplyHall;
|
||||
|
||||
@ApiModelProperty("司机id 来源于货源大厅")
|
||||
private Long userIdBySupplyHall;
|
||||
|
||||
|
||||
//=============APP货源大厅查询新增查询条件==========================
|
||||
|
||||
@ApiModelProperty(name = "装货时间(1-不限,2-今天,3-明天,4-明天以后)")
|
||||
private String loadDateQueryType;
|
||||
|
||||
@ApiModelProperty(name = "车型")
|
||||
private String allowDrivingTypeId;
|
||||
|
||||
@ApiModelProperty(name = "车长")
|
||||
private String motorcadeCaptainId;
|
||||
|
||||
@ApiModelProperty(name = "重量 小")
|
||||
private BigDecimal weightMin;
|
||||
|
||||
@ApiModelProperty(name = "重量 大")
|
||||
private BigDecimal weightMax;
|
||||
|
||||
@ApiModelProperty(name = "体积 小")
|
||||
private BigDecimal volumeMin;
|
||||
|
||||
@ApiModelProperty(name = "体积 大")
|
||||
private BigDecimal volumeMax;
|
||||
|
||||
@ApiModelProperty(name = "排序方式(1-推荐排序,2-距离排序,3-时间排序)")
|
||||
private Integer sortOrder;
|
||||
|
||||
@ApiModelProperty(name = "始发地编码")
|
||||
private String originCode;
|
||||
|
||||
@ApiModelProperty(name = "目的地编码")
|
||||
private String destinationCode;
|
||||
|
||||
@ApiModelProperty(name = "提货日期查询条件开始时间")
|
||||
private String sendCarTimeStart;
|
||||
@ApiModelProperty(name = "提货日期查询条件结束时间")
|
||||
private String sendCarTimeEnd;
|
||||
|
||||
@ApiModelProperty("核销时间")
|
||||
private Date transactionTime;
|
||||
|
||||
@ApiModelProperty("支付人")
|
||||
private String payName;
|
||||
|
||||
@ApiModelProperty("支付备注")
|
||||
private String payRemark;
|
||||
|
||||
@ApiModelProperty("支付凭证")
|
||||
private String payImages;
|
||||
}
|
||||
+167
@@ -0,0 +1,167 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* 调度单与运单关系对象 dispatch_waybill
|
||||
*
|
||||
* @author ???
|
||||
* @date 2023-07-17
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class DispatchWaybillDto extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** id */
|
||||
@ApiModelProperty("id")
|
||||
private Long dispatchWaybillId;
|
||||
/** 调度单id */
|
||||
@ApiModelProperty("调度单id")
|
||||
@Excel(name = "调度单id")
|
||||
private Long dispatchId;
|
||||
/** 运单id */
|
||||
@ApiModelProperty("运单id")
|
||||
@Excel(name = "运单id")
|
||||
private Long waybillId;
|
||||
|
||||
@ApiModelProperty("运单号")
|
||||
private String waybillNumber;
|
||||
/** 调度单类型,0-普通调度配车单,1-内部调度派车单,2-外部调度派车单 */
|
||||
@ApiModelProperty("调度单类型,0-普通调度配车单,1-内部调度派车单,2-外部调度派车单")
|
||||
@Excel(name = "调度单类型,0-普通调度配车单,1-内部调度派车单,2-外部调度派车单")
|
||||
private Long dispatchType;
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
|
||||
@ApiModelProperty("运单调度状态(1-未提货,2-未派送,3-已完成,4-需回单)")
|
||||
@Excel(name = "运单调度状态(1-未提货,2-未派送,3-已完成,4-需回单)")
|
||||
private Long dispatchStatus;
|
||||
@ApiModelProperty("APP搜索条件")
|
||||
private String dispatchWaybillInfo;
|
||||
@ApiModelProperty("装卸货标记(1-装货,2-卸货,)")
|
||||
private Integer loadStatus;
|
||||
/** 保险费 */
|
||||
@ApiModelProperty("保险费")
|
||||
@Excel(name = "保险费")
|
||||
private BigDecimal premium;
|
||||
/** 预付 */
|
||||
@ApiModelProperty("预付")
|
||||
@Excel(name = "预付")
|
||||
private BigDecimal prepayment;
|
||||
/** 油卡 */
|
||||
@ApiModelProperty("油卡")
|
||||
@Excel(name = "油卡")
|
||||
private BigDecimal fuelCardFee;
|
||||
/** 到付 */
|
||||
@ApiModelProperty("到付")
|
||||
@Excel(name = "到付")
|
||||
private BigDecimal freightCollectPayment;
|
||||
/** 月结 */
|
||||
@ApiModelProperty("月结")
|
||||
@Excel(name = "月结")
|
||||
private BigDecimal monthlyStatement;
|
||||
/** 回单付 */
|
||||
@ApiModelProperty("回单付")
|
||||
@Excel(name = "回单付")
|
||||
private BigDecimal paymentAgainstDocuments;
|
||||
/** 车费合计 */
|
||||
@ApiModelProperty("车费合计")
|
||||
@Excel(name = "车费合计")
|
||||
private BigDecimal totalFare;
|
||||
/** 总单数 */
|
||||
@ApiModelProperty("总单数")
|
||||
@Excel(name = "总单数")
|
||||
private Long totalOrderNumber;
|
||||
/** 总件数 */
|
||||
@ApiModelProperty("总件数")
|
||||
@Excel(name = "总件数")
|
||||
private Long totalCaseNumber;
|
||||
/** 总重量 */
|
||||
@ApiModelProperty("总重量")
|
||||
@Excel(name = "总重量")
|
||||
private BigDecimal totalWeight;
|
||||
/** 总体积 */
|
||||
@ApiModelProperty("总体积")
|
||||
@Excel(name = "总体积")
|
||||
private BigDecimal totalVolume;
|
||||
/** 总运费 */
|
||||
@ApiModelProperty("总运费")
|
||||
@Excel(name = "总运费")
|
||||
private BigDecimal totalFreight;
|
||||
/** 总代收款 */
|
||||
@ApiModelProperty("总代收款")
|
||||
@Excel(name = "总代收款")
|
||||
private BigDecimal totalCollectionDelivery;
|
||||
@ApiModelProperty("装货照片")
|
||||
private String loadImg;
|
||||
@ApiModelProperty("卸货照片")
|
||||
private String unloadImg;
|
||||
@ApiModelProperty("回单照片")
|
||||
private String receiptImg;
|
||||
@ApiModelProperty("装货备注")
|
||||
private String loadRemark;
|
||||
@ApiModelProperty("卸货备注")
|
||||
private String unloadRemark;
|
||||
@ApiModelProperty("回单备注")
|
||||
private String receiptRemark;
|
||||
|
||||
@ApiModelProperty("收款凭证图片地址")
|
||||
private String receiptVoucherImg;
|
||||
|
||||
@ApiModelProperty(name = "发货地址")
|
||||
private String sendAddress;
|
||||
@ApiModelProperty(name = "发货地址经度")
|
||||
private String sendLongitude;
|
||||
@ApiModelProperty(name = "发货地址纬度")
|
||||
private String sendLatitude;
|
||||
@ApiModelProperty("发货时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date sendTime;
|
||||
|
||||
@ApiModelProperty(name = "收货地址经度")
|
||||
private String receiveAddress;
|
||||
@ApiModelProperty(name = "收货地址经度")
|
||||
private String receiveLongitude;
|
||||
@ApiModelProperty(name = "收货地址纬度")
|
||||
private String receiveLatitude;
|
||||
@ApiModelProperty("收货时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date receiveTime;
|
||||
|
||||
/**
|
||||
* 回单号
|
||||
*/
|
||||
private String receiptNumber;
|
||||
|
||||
/**
|
||||
* 货损货差图片
|
||||
*/
|
||||
private String goodImage;
|
||||
|
||||
/**
|
||||
* 车辆图片
|
||||
*/
|
||||
private String vehicleImage;
|
||||
|
||||
@ApiModelProperty("核销时间")
|
||||
private Date transactionTime;
|
||||
|
||||
@ApiModelProperty("支付人")
|
||||
private String payName;
|
||||
|
||||
@ApiModelProperty("支付备注")
|
||||
private String payRemark;
|
||||
|
||||
@ApiModelProperty("支付凭证")
|
||||
private String payImages;
|
||||
|
||||
}
|
||||
+97
@@ -0,0 +1,97 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 司机车辆绑定关系对象 driver_vehicle_bind
|
||||
*
|
||||
* @author ???
|
||||
* @date 2023-05-18
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class DriverVehicleBindDto extends BaseVOEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 司机车辆绑定表id */
|
||||
@ApiModelProperty("司机车辆绑定表id")
|
||||
private Long driverVehicleBindId;
|
||||
/** 用户主表ID */
|
||||
@ApiModelProperty("用户主表ID")
|
||||
@Excel(name = "用户主表ID")
|
||||
private Long userId;
|
||||
/** 车辆id */
|
||||
@ApiModelProperty("车辆id")
|
||||
@Excel(name = "车辆id")
|
||||
private Long vehicleId;
|
||||
@ApiModelProperty("车辆id集合")
|
||||
private List<Long> vehicleIdList;
|
||||
/** 车辆关联司机userid */
|
||||
@ApiModelProperty("车辆关联司机userid")
|
||||
@Excel(name = "车辆关联司机userid")
|
||||
private Long driverBindId;
|
||||
/** 绑定司机姓名 */
|
||||
@ApiModelProperty("绑定司机姓名")
|
||||
@Excel(name = "绑定司机姓名")
|
||||
private String bindDriverName;
|
||||
/** 绑定司机手机号 */
|
||||
@ApiModelProperty("绑定司机手机号")
|
||||
@Excel(name = "绑定司机手机号")
|
||||
private String bindDriverPhone;
|
||||
/** 一级组织表ID */
|
||||
@ApiModelProperty("一级组织表ID")
|
||||
@Excel(name = "一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
/** 归属组织id */
|
||||
@ApiModelProperty("归属组织id")
|
||||
@Excel(name = "归属组织id")
|
||||
private Long organizationId;
|
||||
/** 默认状态(1-是,2-否) */
|
||||
@ApiModelProperty("默认状态(1-是,2-否)")
|
||||
@Excel(name = "默认状态", readConverterExp = "1=-是,2-否")
|
||||
private Integer defaultFlag;
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
@ApiModelProperty("车牌号")
|
||||
@Excel(name = "车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
|
||||
@ApiModelProperty("查询信息")
|
||||
private String queryInfo;
|
||||
|
||||
@ApiModelProperty(name = "车辆类型(数据字典id)")
|
||||
private String vehicleTypeId;
|
||||
|
||||
@ApiModelProperty(name = "车辆类型(数据字典name)")
|
||||
private String vehicleTypeName;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "行驶证检验有效期")
|
||||
private Date vehicleCheckoutPeriodValidity;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "经营许可证件有效期(结束)")
|
||||
private Date businessLicenseExpireEndDate;
|
||||
|
||||
@ApiModelProperty(name = "经营许可证件是否长期(0-无状态,1-长期,2-不长期)")
|
||||
private Integer businessLicenseLongStatus;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "道路运输证有效期")
|
||||
private Date roadTransportCertificateExpireDate;
|
||||
|
||||
@ApiModelProperty(name = "道路运输证是否长期(0-无状态,1-长期,2-不长期)")
|
||||
private Integer roadTransportCertificateLongStatus;
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class EditPaymentMethodDTO {
|
||||
|
||||
@ApiModelProperty("应付单据号")
|
||||
@Excel(name = "应付单据号")
|
||||
private String businessDocumentDetaliNumber;
|
||||
|
||||
@ApiModelProperty("支付方式 0-挂账 1-即时")
|
||||
private Integer paymentMethod;
|
||||
}
|
||||
+139
@@ -0,0 +1,139 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 开票订单对象 invoice_order
|
||||
*
|
||||
* @author mhd
|
||||
* @date 2023-03-15
|
||||
*/
|
||||
@Data
|
||||
public class InvoiceOrderDto extends BaseVOEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 开票订单信息id */
|
||||
@ApiModelProperty(name = "开票订单信息id")
|
||||
private Long invoiceOrderId;
|
||||
|
||||
/** 开票记录表id */
|
||||
@ApiModelProperty(name = "开票记录表id")
|
||||
private Long invoiceInfoId;
|
||||
|
||||
/** 运单id */
|
||||
@ApiModelProperty(name = "运单id")
|
||||
private Long waybillId;
|
||||
|
||||
/** 运单号 */
|
||||
@ApiModelProperty(name = "运单号")
|
||||
private String waybillNumber;
|
||||
|
||||
/** 订单核实状态(1-未核实,2-已核实) */
|
||||
@ApiModelProperty(name = "订单核实状态(1-未核实,2-已核实)")
|
||||
private Integer waybillVerifyFlag;
|
||||
|
||||
/** 标记核实时间 */
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "标记核实时间")
|
||||
private Date waybillVerifyTime;
|
||||
|
||||
/** 付款时间 */
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "付款时间")
|
||||
private Date waybillPayTime;
|
||||
|
||||
/** 订单实付金额 */
|
||||
@ApiModelProperty(name = "订单实付金额")
|
||||
private BigDecimal freight;
|
||||
|
||||
/** 可开票金额 */
|
||||
@ApiModelProperty(name = "可开票金额")
|
||||
private BigDecimal invoiceCostCan;
|
||||
|
||||
/** 可开票金额(不含服务费) */
|
||||
@ApiModelProperty(name = "可开票金额")
|
||||
private BigDecimal invoiceCostCanService;
|
||||
|
||||
/** 已开票金额 */
|
||||
@ApiModelProperty(name = "已开票金额")
|
||||
private BigDecimal invoiceCostHas;
|
||||
|
||||
/** 承运人姓名 */
|
||||
@ApiModelProperty(name = "承运人姓名")
|
||||
private String driverName;
|
||||
|
||||
/** 承运人电话 */
|
||||
@ApiModelProperty(name = "承运人电话")
|
||||
private String driverPhone;
|
||||
|
||||
/** 车牌号 */
|
||||
@ApiModelProperty(name = "车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
|
||||
/** 装货地 */
|
||||
@ApiModelProperty(name = "装货地")
|
||||
private String loadAddress;
|
||||
|
||||
/** 卸货地 */
|
||||
@ApiModelProperty(name = "卸货地")
|
||||
private String unloadAddress;
|
||||
|
||||
/** 货物类型 */
|
||||
@ApiModelProperty(name = "货物类型")
|
||||
private String freightName;
|
||||
|
||||
/** 重量 */
|
||||
@ApiModelProperty(name = "重量")
|
||||
private BigDecimal totalWeight;
|
||||
|
||||
/** 申请单位 */
|
||||
@ApiModelProperty(name = "申请单位")
|
||||
private String applicant;
|
||||
|
||||
/** 货主姓名 */
|
||||
@ApiModelProperty(name = "货主姓名")
|
||||
private String shipperName;
|
||||
|
||||
/** 货主手机号 */
|
||||
@ApiModelProperty(name = "货主手机号")
|
||||
private String shipperPhone;
|
||||
|
||||
/** 货主公司名称 */
|
||||
@ApiModelProperty(name = "货主公司名称")
|
||||
private String shipperCompany;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
|
||||
@ApiModelProperty(name = "开单时间查询条件开始日期")
|
||||
private String createTimeStart;
|
||||
|
||||
@ApiModelProperty(name = "开单时间查询条件结束日期")
|
||||
private String createTimeEnd;
|
||||
|
||||
@ApiModelProperty(name = "付款时间查询条件开始日期")
|
||||
private String payTimeStart;
|
||||
|
||||
@ApiModelProperty(name = "付款时间查询条件结束日期")
|
||||
private String payTimeEnd;
|
||||
|
||||
@ApiModelProperty(name = "开票订单信息ids")
|
||||
private Long[] invoiceOrderIds;
|
||||
|
||||
/** 订单申请发票状态(1-已申请,2-未申请) */
|
||||
@ApiModelProperty(name = "订单申请发票状态")
|
||||
private Integer applyStatus;
|
||||
|
||||
@ApiModelProperty(name = "组织Id")
|
||||
private Long organizationId;
|
||||
}
|
||||
+171
@@ -0,0 +1,171 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 货款管理对象 dto
|
||||
*
|
||||
* 2023-03-16
|
||||
*
|
||||
* @author 王子豪
|
||||
*/
|
||||
@Data
|
||||
public class LoanManageDto extends BaseVOEntity implements Serializable
|
||||
{
|
||||
|
||||
@ApiModelProperty(name = "货款管理id")
|
||||
private Long loanManageId;
|
||||
@ApiModelProperty(name = "货款类型:1.货款收回2.货款发放")
|
||||
private Integer loanType;
|
||||
@ApiModelProperty(name = "网点id")
|
||||
private Long branchId;
|
||||
@ApiModelProperty(name = "贷款/货款记账号")
|
||||
private String loanNumber;
|
||||
@ApiModelProperty(name = "收款状态:1.未收款2.未核销3.已核销")
|
||||
private Integer collectionStatus;
|
||||
@ApiModelProperty(name = "发放状态:1.未放款2.已放款3.已取消")
|
||||
private Integer grantStatus;
|
||||
@ApiModelProperty(name = "一级科目code")
|
||||
private String firstSubject;
|
||||
@ApiModelProperty(name = "二级科目code")
|
||||
private String secondSubject;
|
||||
@ApiModelProperty(name = "一级科目")
|
||||
private String firstSubjectName;
|
||||
@ApiModelProperty(name = "二级科目名称")
|
||||
private String secondSubjectName;
|
||||
@ApiModelProperty(name = "金额")
|
||||
private BigDecimal loanMoney;
|
||||
@ApiModelProperty(name = "支付人/单位")
|
||||
private String payPerson;
|
||||
@ApiModelProperty(name = "放款内部流水号")
|
||||
private String innerNumber;
|
||||
@ApiModelProperty(name = "收款内部流水号")
|
||||
private String collectionInnerNumber;
|
||||
@ApiModelProperty(name = "支付通道code(字典)")
|
||||
private String payChannel;
|
||||
@ApiModelProperty(name = "支付通道名称(字典)")
|
||||
private String payChannelName;
|
||||
@ApiModelProperty(name = "银企直联流水号")
|
||||
private String bankNumber;
|
||||
@ApiModelProperty(name = "收据单号")
|
||||
private String receiptNumber;
|
||||
@ApiModelProperty(name = "收款备注")
|
||||
private String collectionRemark;
|
||||
@ApiModelProperty(name = "运单/订单id")
|
||||
private Long waybillId;
|
||||
@ApiModelProperty(name = "运单/订单号")
|
||||
private String waybillNumber;
|
||||
@ApiModelProperty(name = "运单/订单号集合")
|
||||
private List<String> waybillNumberList;
|
||||
@ApiModelProperty(name = "运单/订单来源")
|
||||
private String waybillSource;
|
||||
@ApiModelProperty(name = "运单/订单来源name")
|
||||
private String waybillSourceName;
|
||||
@ApiModelProperty(name = "核销人id")
|
||||
private Long cancelAfterVerificationId;
|
||||
@ApiModelProperty(name = "核销人name")
|
||||
private String cancelAfterVerificationName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "核销时间")
|
||||
private Date cancelAfterVerificationTime;
|
||||
@ApiModelProperty(name = "核销方式:0.全部1.人工核销2.自动核销")
|
||||
private Integer cancelAfterVerificationType;
|
||||
@ApiModelProperty(name = "收款人id")
|
||||
private Long collectionId;
|
||||
@ApiModelProperty(name = "收款人name")
|
||||
private String collectionName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "收款时间")
|
||||
private Date collectionTime;
|
||||
@ApiModelProperty(name = "手续费")
|
||||
private BigDecimal serviceCharge;
|
||||
@ApiModelProperty(name = "放款要求(0.全部1.现金2.银行卡3.垫付)")
|
||||
private Integer loanRequest;
|
||||
@ApiModelProperty(name = "开户人姓名")
|
||||
private String accountHolderName;
|
||||
@ApiModelProperty(name = "开户银行(0.全部1.中国银行2.中国农业银行)")
|
||||
private Integer accountHolderBank;
|
||||
@ApiModelProperty(name = "银行账号")
|
||||
private String bankAccount;
|
||||
@ApiModelProperty(name = "签收状态:0.全部1.已签收2.未签收")
|
||||
private Integer signStatus;
|
||||
@ApiModelProperty(name = "订单/运单备注")
|
||||
private String waybillRemark;
|
||||
@ApiModelProperty(name = "放款人id")
|
||||
private Long loanId;
|
||||
@ApiModelProperty(name = "放款人name")
|
||||
private String loanName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "放款时间")
|
||||
private Date loanTime;
|
||||
@ApiModelProperty(name = "支付密码")
|
||||
private String payPassword;
|
||||
@ApiModelProperty(name = "电子回单状态:0.全部1.未上传2.已上传")
|
||||
private Integer digitalReceiptStatus;
|
||||
@ApiModelProperty(name = "loanRemark")
|
||||
private String cancelRemark;
|
||||
@ApiModelProperty(name = "核销备注")
|
||||
private String cancelAfterVerificationRemark;
|
||||
@ApiModelProperty(name = "取消核销备注")
|
||||
private String cancelCancelAfterVerificationRemark;
|
||||
@ApiModelProperty(name = "取消收款备注")
|
||||
private String cancelCollectionRemark;
|
||||
@ApiModelProperty(name = "放款备注")
|
||||
private String loanRemark;
|
||||
@ApiModelProperty(name = "扣付")
|
||||
private BigDecimal withholdPayment;
|
||||
@ApiModelProperty(name = "手续费")
|
||||
private BigDecimal commissionCharges;
|
||||
@ApiModelProperty(name = "手续费状态(1-未对账 2-未申请付款 3-未审核 4-未付款 5-已付款 6-已核销 7-已取消)")
|
||||
private Integer commissionChargesStatus;
|
||||
@ApiModelProperty(name = "挂失状态:1.未挂失3.已挂失")
|
||||
private Integer reportLossStatus;
|
||||
@ApiModelProperty(name = "挂失人id")
|
||||
private Long reportLossId;
|
||||
@ApiModelProperty(name = "挂失人name")
|
||||
private String reportLossName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "挂失时间")
|
||||
private Date reportLossTime;
|
||||
@ApiModelProperty(name = "挂失备注")
|
||||
private String reportLossRemark;
|
||||
@ApiModelProperty(name = "取消挂失备注")
|
||||
private String cancelReportLossRemark;
|
||||
@ApiModelProperty(name = "寄件网点")
|
||||
private Long mailBranch;
|
||||
@ApiModelProperty(name = "到站网点")
|
||||
private Long arriveBranch;
|
||||
@ApiModelProperty(name = "收款时间查询条件开始日期")
|
||||
private String collectionTimeStart;
|
||||
@ApiModelProperty(name = "收款时间查询条件结束日期")
|
||||
private String collectionTimeEnd;
|
||||
@ApiModelProperty(name = "核销时间查询条件开始日期")
|
||||
private String cancelAfterVerificationTimeStart;
|
||||
@ApiModelProperty(name = "核销时间查询条件结束日期")
|
||||
private String cancelAfterVerificationTimeEnd;
|
||||
@ApiModelProperty(name = "放款时间查询条件开始日期")
|
||||
private String loanTimeStart;
|
||||
@ApiModelProperty(name = "放款时间查询条件结束日期")
|
||||
private String loanTimeEnd;
|
||||
@ApiModelProperty(name = "图片地址集合")
|
||||
private List<String> images;
|
||||
@ApiModelProperty(name = "运单ids")
|
||||
private List<Long> loanManageIds;
|
||||
@ApiModelProperty(name = "挂失时间查询条件开始日期")
|
||||
private String reportLossTimeStart;
|
||||
@ApiModelProperty(name = "挂失时间查询条件结束日期")
|
||||
private String reportLossTimeEnd;
|
||||
}
|
||||
+117
@@ -0,0 +1,117 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 消息记录对象 notice_message_logging
|
||||
*
|
||||
* @author mhd
|
||||
* @date 2023-03-30
|
||||
*/
|
||||
@Data
|
||||
public class NoticeMessageLoggingDto extends BaseVOEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(name = "消息类型")
|
||||
private String noticeMessageType;
|
||||
|
||||
@ApiModelProperty(name = "消息类型name")
|
||||
private String noticeMessageName;
|
||||
|
||||
@ApiModelProperty(name = "消息标题")
|
||||
private String noticeMessageTitle;
|
||||
|
||||
@ApiModelProperty(name = "消息内容")
|
||||
private String noticeMessageContent;
|
||||
|
||||
@ApiModelProperty(value = "消息接收时间")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date messageReceivingTime;
|
||||
|
||||
@ApiModelProperty(name = "用户id")
|
||||
private Long userId;
|
||||
|
||||
@ApiModelProperty(value = "接收用户姓名")
|
||||
private String userName;
|
||||
|
||||
@ApiModelProperty(value = "用户账号")
|
||||
private String userAccount;
|
||||
|
||||
@ApiModelProperty(value = "用户电话")
|
||||
private String userPhone;
|
||||
|
||||
@ApiModelProperty(name = "已读状态(1-已读,2-未读,3-已回复)")
|
||||
private Integer messageReadStatus;
|
||||
|
||||
@ApiModelProperty(name = "已读时间")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date messageReadTime;
|
||||
|
||||
@ApiModelProperty(value = "消息推送时间")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date messagePushTime;
|
||||
|
||||
@ApiModelProperty(value = "消息来源(0-司机端,1-货主端,2-pc端)")
|
||||
private Integer messageSource;
|
||||
|
||||
@ApiModelProperty(name = "一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "消息链接主键")
|
||||
private String linkPrimaryKey;
|
||||
|
||||
@ApiModelProperty(name = "物流消息关联运单ID")
|
||||
private Long waybillId;
|
||||
|
||||
@ApiModelProperty(name = "物流消息关联运单号")
|
||||
private String waybillNumber;
|
||||
|
||||
@ApiModelProperty(value = "问题截图地址")
|
||||
private String problemScreenshotsAddress;
|
||||
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
|
||||
@ApiModelProperty(value = "回复内容")
|
||||
private String replyContent;
|
||||
|
||||
@ApiModelProperty(value = "回复人id")
|
||||
private String replyBy;
|
||||
|
||||
@ApiModelProperty(value = "回复人名称")
|
||||
private String replyByName;
|
||||
|
||||
@ApiModelProperty(value = "回复时间")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date replyTime;
|
||||
|
||||
@ApiModelProperty(value = "数据来源系统(1-数字物流 2-网络货运)")
|
||||
private Integer dataSourceSystem;
|
||||
|
||||
@ApiModelProperty(name = "消息列表")
|
||||
private List<NoticeMessageLoggingDto> noticeList;
|
||||
|
||||
@ApiModelProperty(value = "跳转页面:0-不跳转,1-个人中心,2-司机,3-车队长,4-承运企业,5-车队," +
|
||||
"6-车辆,7-货主,8-企业货主,9-支付审核成功,10-支付审核失败,11-邀请记录")
|
||||
private Integer jumpPage;
|
||||
@ApiModelProperty("所属业务id")
|
||||
private String businessId;
|
||||
}
|
||||
+122
@@ -0,0 +1,122 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 订单对象 dto
|
||||
*
|
||||
* 2023-04-04
|
||||
*
|
||||
* @author 王子豪
|
||||
*/
|
||||
@Data
|
||||
public class OrderDto extends BaseVOEntity implements Serializable
|
||||
{
|
||||
@ApiModelProperty(name = "订单id")
|
||||
private Long orderId;
|
||||
@ApiModelProperty(name = "订单号码")
|
||||
private String orderNumber;
|
||||
@ApiModelProperty("订单状态(1-待受理,2-待取件,3-待寄出,4-已装车,5-运输中,6-已到达,7-送货中,8-已签收,9-已退货,10-已取消,11-已作废,12-已拒绝,13-其他)")
|
||||
private Integer orderStatus;
|
||||
@ApiModelProperty(name = "运费")
|
||||
private BigDecimal freight;
|
||||
@ApiModelProperty(name = "提货费")
|
||||
private BigDecimal pickUpCharge;
|
||||
@ApiModelProperty(name = "现付")
|
||||
private BigDecimal spotPayment;
|
||||
@ApiModelProperty(name = "到付")
|
||||
private BigDecimal freightCollectPayment;
|
||||
@ApiModelProperty(name = "回单付")
|
||||
private BigDecimal paymentAgainstDocuments;
|
||||
@ApiModelProperty(name = "月结")
|
||||
private BigDecimal monthlyStatement;
|
||||
@ApiModelProperty(name = "支付金额")
|
||||
private BigDecimal payMoney;
|
||||
@ApiModelProperty(name = "预付")
|
||||
private BigDecimal prepayment;
|
||||
@ApiModelProperty(name = "送货费")
|
||||
private BigDecimal deliveryExpense;
|
||||
@ApiModelProperty(name = "加急费")
|
||||
private BigDecimal urgentExpense;
|
||||
@ApiModelProperty(name = "支付状态(1-待支付,2-支付中,3-支付完成)")
|
||||
private Integer payStatus;
|
||||
@ApiModelProperty(name = "代收货款(1-未收款,2-部分收款,3-已收款)")
|
||||
private Integer collectionStatus;
|
||||
@ApiModelProperty(name = "评价状态(1-未评价,2-已评价)")
|
||||
private Integer evaluateStatus;
|
||||
|
||||
@ApiModelProperty(name = "发货联系人")
|
||||
private String sendLinkMan;
|
||||
@ApiModelProperty(name = "发货联系方式")
|
||||
private String sendLinkPhone;
|
||||
@ApiModelProperty(name = "发货县区编码")
|
||||
private Long sendCountyCode;
|
||||
@ApiModelProperty(name = "发货县区名称")
|
||||
private String sendCountyName;
|
||||
@ApiModelProperty(name = "发货地址")
|
||||
private String sendAddress;
|
||||
@ApiModelProperty(name = "发货门牌信息")
|
||||
private String sendDoorplate;
|
||||
@ApiModelProperty(name = "收货联系人")
|
||||
private String receiveLinkMan;
|
||||
@ApiModelProperty(name = "收货联系方式")
|
||||
private String receiveLinkPhone;
|
||||
@ApiModelProperty(name = "收货县区编码")
|
||||
private Long receiveCountyCode;
|
||||
@ApiModelProperty(name = "收货县区名称")
|
||||
private String receiveCountyName;
|
||||
@ApiModelProperty(name = "收货地址")
|
||||
private String receiveAddress;
|
||||
@ApiModelProperty(name = "收货门牌信息")
|
||||
private String receiveDoorplate;
|
||||
@ApiModelProperty(name = "一级货物code(字典)")
|
||||
private String firstGoodsCode;
|
||||
@ApiModelProperty(name = "一级货物名称(字典)")
|
||||
private String firstGoodsName;
|
||||
@ApiModelProperty(name = "二级货物code(字典)")
|
||||
private String secondGoodsCode;
|
||||
@ApiModelProperty(name = "二级货物名称(字典)")
|
||||
private String secondGoodsName;
|
||||
@ApiModelProperty(name = "总件数")
|
||||
private BigDecimal totalCaseNumber;
|
||||
@ApiModelProperty(name = "总重量")
|
||||
private BigDecimal totalWeight;
|
||||
@ApiModelProperty(name = "总体积")
|
||||
private BigDecimal totalVolume;
|
||||
|
||||
@ApiModelProperty(name = "App订单状态(0-全部,1-待接单,2-进行中,3-待评价,4-待支付,5-代收货款)")
|
||||
private Integer queryOrderStatus;
|
||||
|
||||
@ApiModelProperty(name = "会员编号")
|
||||
private String memberCode;
|
||||
@ApiModelProperty(name = "会员名称")
|
||||
private String memberNickname;
|
||||
@ApiModelProperty(name = "会员姓名")
|
||||
private String memberName;
|
||||
|
||||
@ApiModelProperty(name = "订单货主议价状态(0-无状态,1-未开启,2-议价中,3-已提交待审核,4-议价完成,5-议价失败)")
|
||||
private Integer orderBargainingStatus;
|
||||
|
||||
@ApiModelProperty(name = "银行卡id")
|
||||
private Long accountBankCardId;
|
||||
|
||||
@ApiModelProperty(name = "货物图片")
|
||||
private String freightImages;
|
||||
|
||||
@ApiModelProperty(name = "回单地址小区")
|
||||
private String receiptAddressPlot;
|
||||
@ApiModelProperty("商户订单号(支付流水使用)")
|
||||
private String outTradeNo;
|
||||
@ApiModelProperty("支付类型(1-支付宝,2-微信,3-其他)")
|
||||
private Integer payType;
|
||||
@ApiModelProperty("三方支付状态(1-待支付,2-支付中,3-已支付, 4-支付失败)")
|
||||
private Integer thridPayStatus;
|
||||
|
||||
@ApiModelProperty("是否作废(1-是,2-否)")
|
||||
private Integer cancelFlag;
|
||||
}
|
||||
+115
@@ -0,0 +1,115 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 组织 Dto
|
||||
*
|
||||
* 2022-11-21
|
||||
*
|
||||
* @author 王子豪
|
||||
*/
|
||||
@Data
|
||||
public class OrganizationDto extends BaseVOEntity implements Serializable {
|
||||
|
||||
@ApiModelProperty(name = "组织id")
|
||||
private Long organizationId;
|
||||
@ApiModelProperty(name = "上级组织表ID")
|
||||
private Long parentOrganizationId;
|
||||
@ApiModelProperty(name = "组织名称")
|
||||
private String organizationName;
|
||||
@ApiModelProperty(name = "员工数量")
|
||||
private Integer employeeNum;
|
||||
@ApiModelProperty(name = "上级组织名称")
|
||||
private String parentOrganizationName;
|
||||
@ApiModelProperty(name = "租户表ID")
|
||||
private Long tenantsId;
|
||||
@ApiModelProperty(name = "负责人id")
|
||||
private Long principalId;
|
||||
@ApiModelProperty(name = "负责人姓名")
|
||||
private String principalName;
|
||||
@ApiModelProperty(name = "负责人账号")
|
||||
private String principalAccount;
|
||||
@ApiModelProperty(name = "是否一级组织:0-无状态,1-是,2-否")
|
||||
private Integer organizationState;
|
||||
@ApiModelProperty(name = "组织描述")
|
||||
private String organizationRemark;
|
||||
@ApiModelProperty(name = "组织用户ID")
|
||||
private Long userId;
|
||||
@ApiModelProperty(name = "组织用户账号")
|
||||
private String userAccount;
|
||||
@ApiModelProperty(name = "组织菜单权限")
|
||||
private Long[] organizationMenu;
|
||||
@ApiModelProperty(name = "级联字符")
|
||||
private String organizationLinkage;
|
||||
@ApiModelProperty(name = "组织自定义权限")
|
||||
private Long[] customAuthByOrganization;
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
@ApiModelProperty(name = "是否为网点集合,1表示是,其他不是")
|
||||
private Integer isBranch;
|
||||
@ApiModelProperty(name = "平台类型:0-无状态,1-票务服务平台,2-网络货运平台,3-专线物流TMS,4-其他")
|
||||
private Integer platefromType;
|
||||
@ApiModelProperty("菜单id集合")
|
||||
private List<Long> menuIdList;
|
||||
|
||||
//=================同步网货添加字段
|
||||
@ApiModelProperty("纳税人识别号")
|
||||
private String taxpayerNumber;
|
||||
@ApiModelProperty("法定代表人")
|
||||
private String legalPerson;
|
||||
@ApiModelProperty("法人身份证号")
|
||||
private String legalPersonIdNo;
|
||||
@ApiModelProperty("地址")
|
||||
private String companyAddress;
|
||||
@ApiModelProperty("公司编码")
|
||||
private String companyCode;
|
||||
@ApiModelProperty("公司简码")
|
||||
private String taxCompanyCode;
|
||||
@ApiModelProperty("E签宝账户类型:0-个人,1-企业")
|
||||
private String esignType;
|
||||
@ApiModelProperty("e签宝唯一标识")
|
||||
private String accountId;
|
||||
@ApiModelProperty("统一社会信用代码")
|
||||
private String socialCreditCode;
|
||||
@ApiModelProperty("电子签章图片地址(电子签章id)")
|
||||
private String electricSignature;
|
||||
@ApiModelProperty("电子签章")
|
||||
private String templateSeal;
|
||||
@ApiModelProperty("系统名称")
|
||||
private String systemName;
|
||||
@ApiModelProperty("系统描述")
|
||||
private String systemDescription;
|
||||
@ApiModelProperty("服务热线")
|
||||
private String serviceHotline;
|
||||
@ApiModelProperty("所在城市")
|
||||
private String city;
|
||||
@ApiModelProperty("平台地址")
|
||||
private String systemAddress;
|
||||
@ApiModelProperty("联系邮箱")
|
||||
private String mailbox;
|
||||
@ApiModelProperty("备案号")
|
||||
private String recordNumber;
|
||||
@ApiModelProperty("企业logo")
|
||||
private String companyLogo;
|
||||
@ApiModelProperty("网页图标")
|
||||
private String webIcon;
|
||||
@ApiModelProperty("关于我们")
|
||||
private String aboutUs;
|
||||
@ApiModelProperty("收款账户户名")
|
||||
private String receivingAccount;
|
||||
@ApiModelProperty("收款银行")
|
||||
private String receivingBank;
|
||||
@ApiModelProperty("收款编号")
|
||||
private String receivingNumber;
|
||||
@ApiModelProperty("联行号")
|
||||
private String interbankNumber;
|
||||
}
|
||||
|
||||
+61
@@ -0,0 +1,61 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 项目对象 project_management
|
||||
*
|
||||
* @author gen
|
||||
* @date 2024-02-02
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class ProjectManagementDTO extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("项目表ID")
|
||||
private Long projectManagementId;
|
||||
|
||||
@ApiModelProperty("项目名称")
|
||||
@Excel(name = "项目名称")
|
||||
private String projectManagementName;
|
||||
|
||||
@ApiModelProperty("关联平台公司")
|
||||
@Excel(name = "关联平台公司")
|
||||
private String affiliateCompanyName;
|
||||
|
||||
@ApiModelProperty("关联子账号")
|
||||
@Excel(name = "关联子账号")
|
||||
private String affiliateAccount;
|
||||
|
||||
@ApiModelProperty("关联参与企业:0-无状态,1-全部企业,2-部分企业")
|
||||
private Integer affiliateCompanyStatus;
|
||||
|
||||
@ApiModelProperty("项目启用状态:0-无状态,1-启用,2-不启用")
|
||||
@Excel(name = "项目启用状态:0-无状态,1-启用,2-不启用")
|
||||
private Integer productStatus;
|
||||
|
||||
@ApiModelProperty("项目描述")
|
||||
@Excel(name = "项目描述")
|
||||
private String projectManagementRemark;
|
||||
|
||||
@ApiModelProperty("组织ID")
|
||||
@Excel(name = "组织ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("一级组织ID")
|
||||
@Excel(name = "一级组织ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 项目-组织关联对象 project_organization
|
||||
*
|
||||
* @author gen
|
||||
* @date 2024-02-02
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class ProjectOrganizationDTO extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("项目组织关联表ID")
|
||||
private Long projectOrganizationId;
|
||||
|
||||
@ApiModelProperty("项目表ID")
|
||||
@Excel(name = "项目表ID")
|
||||
private Long projectManagementId;
|
||||
|
||||
@ApiModelProperty("组织表ID")
|
||||
@Excel(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("是否绑定 1-是,2-否")
|
||||
private Integer isBand;
|
||||
|
||||
@ApiModelProperty("组织表名称")
|
||||
@Excel(name = "组织表名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import java.math.BigDecimal;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 项目-用户关联对象 project_user
|
||||
*
|
||||
* @author gen
|
||||
* @date 2024-02-02
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class ProjectUserDTO extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("项目用户关联表ID")
|
||||
private Long projectUserId;
|
||||
|
||||
@ApiModelProperty("项目表ID")
|
||||
@Excel(name = "项目表ID")
|
||||
private Long projectManagementId;
|
||||
|
||||
@ApiModelProperty("用户表ID")
|
||||
@Excel(name = "用户表ID")
|
||||
private Long userId;
|
||||
|
||||
@ApiModelProperty("用户表名称")
|
||||
@Excel(name = "用户表名称")
|
||||
private String userName;
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "项目ID集合")
|
||||
private List<Long> projectManagementIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
|
||||
@ApiModelProperty("是否绑定 1-是,2-否")
|
||||
private Integer isBand;
|
||||
|
||||
@Excel(name = "用户表信息")
|
||||
private String userInfo;
|
||||
}
|
||||
+229
@@ -0,0 +1,229 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import java.math.BigDecimal;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 对账单对象 reconciliation
|
||||
*
|
||||
* @author gen
|
||||
* @date 2024-01-23
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class ReconciliationDTO extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("对账单表id")
|
||||
private Long reconciliationId;
|
||||
|
||||
@ApiModelProperty("对账金额")
|
||||
@Excel(name = "对账金额")
|
||||
private BigDecimal verificationMoney;
|
||||
|
||||
@ApiModelProperty("结算数量(业务单据数量)")
|
||||
@Excel(name = "结算数量", readConverterExp = "业=务单据数量")
|
||||
private Long settlementCount;
|
||||
|
||||
@ApiModelProperty("结算方")
|
||||
@com.mhd.common.core.annotation.Excel(name = "结算方")
|
||||
private String partyName;
|
||||
|
||||
@ApiModelProperty("结算方id")
|
||||
@com.mhd.common.core.annotation.Excel(name = "结算方id")
|
||||
private String settlementPartyId;
|
||||
|
||||
@ApiModelProperty("结算方类型:1-委托方,2-收货方")
|
||||
@com.mhd.common.core.annotation.Excel(name = "结算方类型:1-委托方,2-收货方")
|
||||
private String payerType;
|
||||
|
||||
@ApiModelProperty("账单备注")
|
||||
@com.mhd.common.core.annotation.Excel(name = "账单备注")
|
||||
private String billRemark;
|
||||
|
||||
@ApiModelProperty("结算备注")
|
||||
@com.mhd.common.core.annotation.Excel(name = "结算备注")
|
||||
private String settlementRemark;
|
||||
|
||||
@ApiModelProperty("订单类型")
|
||||
@com.mhd.common.core.annotation.Excel(name = "订单类型")
|
||||
private Integer orderShippingType;
|
||||
|
||||
|
||||
@ApiModelProperty("部门名称")
|
||||
@com.mhd.common.core.annotation.Excel(name = "部门名称")
|
||||
private String departmentName;
|
||||
|
||||
@ApiModelProperty("订单id集合")
|
||||
@com.mhd.common.core.annotation.Excel(name = "订单id集合")
|
||||
private List<String> tmsOrderIdList;
|
||||
|
||||
|
||||
@ApiModelProperty("托运人id")
|
||||
@Excel(name = "托运人id")
|
||||
private Long userId;
|
||||
|
||||
@ApiModelProperty("托运人姓名")
|
||||
@Excel(name = "托运人姓名")
|
||||
private String shipperName;
|
||||
|
||||
@ApiModelProperty("运单/订单来源")
|
||||
@Excel(name = "运单/订单来源")
|
||||
private String waybillSource;
|
||||
|
||||
@ApiModelProperty("运单/订单来源name")
|
||||
@Excel(name = "运单/订单来源name")
|
||||
private String waybillSourceName;
|
||||
|
||||
@ApiModelProperty("对账起始日")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "对账起始日", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date reconciliationStart;
|
||||
|
||||
@ApiModelProperty("对账结束日")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "对账结束日", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date reconciliationEnd;
|
||||
|
||||
@ApiModelProperty("账期名称")
|
||||
@Excel(name = "账期名称")
|
||||
private String billName;
|
||||
|
||||
@ApiModelProperty("已收款金额")
|
||||
@Excel(name = "已收款金额")
|
||||
private BigDecimal collectionAmount;
|
||||
|
||||
@ApiModelProperty("扣补金额")
|
||||
@Excel(name = "扣补金额")
|
||||
private BigDecimal changeAmount;
|
||||
|
||||
@ApiModelProperty("其他收入")
|
||||
@Excel(name = "其他收入")
|
||||
private BigDecimal otherAmount;
|
||||
|
||||
@ApiModelProperty("账期应收")
|
||||
@Excel(name = "账期应收")
|
||||
private BigDecimal receivable;
|
||||
|
||||
@ApiModelProperty("实际应收(账期应收+扣补金额+其他收入)")
|
||||
@Excel(name = "实际应收", readConverterExp = "账=期应收+扣补金额+其他收入")
|
||||
private BigDecimal actualReceivable;
|
||||
|
||||
@ApiModelProperty("未收金额(实际应收 - 收款金额)")
|
||||
@Excel(name = "未收金额(实际应收 - 收款金额)")
|
||||
private BigDecimal uncollectedReceivable;
|
||||
|
||||
@ApiModelProperty("收款状态(0-未收款,1-未结清,2-已结清)")
|
||||
@Excel(name = "收款状态(0-未收款,1-未结清,2-已结清)")
|
||||
private Long collectionState;
|
||||
|
||||
@ApiModelProperty(value = "核销时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date collectionTime;
|
||||
|
||||
@ApiModelProperty("审核状态(0-无状态 1-未申请 2-已申请 3-审核同意 4-审核拒绝)")
|
||||
@Excel(name = "审核状态(0-无状态 1-未申请 2-已申请 3-审核同意 4-审核拒绝)")
|
||||
private Long auditState;
|
||||
|
||||
@ApiModelProperty("组织ID")
|
||||
@Excel(name = "组织ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("组织名称")
|
||||
@Excel(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("一级组织ID")
|
||||
@Excel(name = "一级组织ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
@ApiModelProperty(value = "审核人")
|
||||
private Long auditor;
|
||||
|
||||
@ApiModelProperty(name = "审核人姓名")
|
||||
private String auditorName;
|
||||
|
||||
@ApiModelProperty(value = "审核时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date authTime;
|
||||
|
||||
@ApiModelProperty("对账单号")
|
||||
private String innerNumber;
|
||||
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty("审核说明")
|
||||
private String authRemark;
|
||||
|
||||
@ApiModelProperty("审核文件")
|
||||
private String authFile;
|
||||
|
||||
@ApiModelProperty("对账单表id集合")
|
||||
private List<Long> reconciliationIdList;
|
||||
|
||||
@ApiModelProperty(name = "订单核实状态(1-未核实,2-已核实)")
|
||||
private Integer waybillVerifyFlag;
|
||||
|
||||
@ApiModelProperty("标记核实时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "标记核实时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date waybillVerifyTime;
|
||||
|
||||
@ApiModelProperty("已申请开票金额")
|
||||
@Excel(name = "已申请开票金额")
|
||||
private BigDecimal invoiceCostHas;
|
||||
|
||||
@ApiModelProperty(name = "订单申请发票状态(1-已申请,2-未申请)")
|
||||
private Integer invoiceApplyStatus;
|
||||
|
||||
/** 开票记录表id */
|
||||
@ApiModelProperty(name = "开票记录表id")
|
||||
private Long invoiceInfoId;
|
||||
|
||||
@ApiModelProperty("核销时间开始")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "核销时间开始", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date collectionTimeStart;
|
||||
@ApiModelProperty("核销时间结束")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "核销时间结束", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date collectionTimeEnd;
|
||||
@ApiModelProperty("创建时间开始")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "创建时间开始", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date createTimeStart;
|
||||
@ApiModelProperty("创建时间结束")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "创建时间结束", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date createTimeEnd;
|
||||
@ApiModelProperty("审核时间开始")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "审核时间开始", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date authTimeStart;
|
||||
@ApiModelProperty("审核时间结束")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "审核时间结束", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date authTimeEnd;
|
||||
|
||||
@ApiModelProperty(value = "申请发票单号")
|
||||
private String applyNumber;
|
||||
|
||||
@ApiModelProperty(value = "运单发票开具状态(0-未索取,1-已索取,2-已开票,3-部分索取)")
|
||||
private Integer isInvoice;
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.domain.po.WaybillPo;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class RefuseWalletPayDTO {
|
||||
|
||||
@ApiModelProperty(name = "现付")
|
||||
private BigDecimal spotPayment;
|
||||
@ApiModelProperty(name = "用户ID")
|
||||
private Long userId;
|
||||
@ApiModelProperty(name = "业务单据号")
|
||||
private String orderNo;
|
||||
@ApiModelProperty("运单列表")
|
||||
private List<WaybillPo> waybillPoList;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class RoleDTO extends BaseVOEntity implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
@ApiModelProperty(name = "角色表ID")
|
||||
private Long roleId;
|
||||
@ApiModelProperty(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
@ApiModelProperty(name = "角色业务场景数据字典ID")
|
||||
private Long roleBusinessExampleId;
|
||||
@ApiModelProperty(name = "角色业务场景名称")
|
||||
private String roleBusinessExampleName;
|
||||
@ApiModelProperty(name = "角色分类:0-无状态,1-托运人,2-承运人")
|
||||
private Integer roleType;
|
||||
@ApiModelProperty(name = "角色分类名称")
|
||||
private String roleTypeName;
|
||||
@ApiModelProperty(name = "职务/角色权限字符,控制器中定义的权限字符,如:@PreAuthorize(`@ss.hasRole('admin')`)")
|
||||
private String roleCode;
|
||||
@ApiModelProperty(name = "职务/角色名称")
|
||||
private String roleName;
|
||||
@ApiModelProperty(name = "职务/角色描述")
|
||||
private String roleRemark;
|
||||
@ApiModelProperty(name = "数据权限范围:0-无状态,1-全公司,2-本部门,3-本部门及以下,4-自定义权限")
|
||||
private Integer roleDataScope;
|
||||
@ApiModelProperty(name = "职务/角色状态:0-无状态,1-开启,2-关闭")
|
||||
private Integer roleStatus;
|
||||
@ApiModelProperty(name = "职务/角色表ID集合")
|
||||
private List<Long> roleIds;
|
||||
@ApiModelProperty(name = "角色等级:0-无状态,1-内置角色,2-组织角色")
|
||||
private Integer roleGrade;
|
||||
@ApiModelProperty(name = "组织表ID集合")
|
||||
private List<Long> organizationIds;
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Data
|
||||
public class RoleMenuDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "职务/角色权限表ID")
|
||||
private Long roleMenuId;
|
||||
@ApiModelProperty(name = "职务/角色表ID")
|
||||
private Long roleId;
|
||||
@ApiModelProperty(name = "权限表ID")
|
||||
private Long menuId;
|
||||
@ApiModelProperty(name = "权限表ID")
|
||||
private List<Long> menuIds;
|
||||
@ApiModelProperty(name = "菜单来源ID集合")
|
||||
private List<Long> sourceIdList;
|
||||
@ApiModelProperty(name = "组织id")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "角色权限客户端:0-无状态,1-PC端,2-手机端")
|
||||
private Integer roleMenuClient;
|
||||
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
@Data
|
||||
public class RoleMenuListDTO extends BaseVOEntity {
|
||||
|
||||
|
||||
@ApiModelProperty(name = "职务/角色权限表ID")
|
||||
private Long roleMenuId;
|
||||
@ApiModelProperty(name = "职务/角色表ID")
|
||||
private Long roleId;
|
||||
@ApiModelProperty(name = "菜单表")
|
||||
private Long menuId;
|
||||
@ApiModelProperty(name = "角色列表")
|
||||
private Map<String , Long> roleList;
|
||||
}
|
||||
+111
@@ -0,0 +1,111 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 服务费账单对象 service_bill
|
||||
*
|
||||
* @author gen
|
||||
* @date 2023-11-06
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class ServiceBillDO extends BaseVOEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("网点账单id")
|
||||
private Long serviceBillId;
|
||||
|
||||
@ApiModelProperty("最高组织id")
|
||||
@Excel(name = "最高组织id")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty("组织表id")
|
||||
@Excel(name = "组织表id")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("组织名称")
|
||||
@Excel(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("收账网点id")
|
||||
@Excel(name = "收账网点id")
|
||||
private Long branchInId;
|
||||
|
||||
@ApiModelProperty("收账网点名称")
|
||||
@Excel(name = "收账网点名称")
|
||||
private String branchInName;
|
||||
|
||||
@ApiModelProperty("交账网点id")
|
||||
@Excel(name = "交账网点id")
|
||||
private Long branchOutId;
|
||||
|
||||
@ApiModelProperty("交账网点名称")
|
||||
@Excel(name = "交账网点名称")
|
||||
private String branchOutName;
|
||||
|
||||
@ApiModelProperty("交账状态:1-未确认 2-驳回 3-确认")
|
||||
@Excel(name = "交账状态:1-未确认 2-驳回 3-确认")
|
||||
private Integer billStatus;
|
||||
|
||||
@ApiModelProperty("账单编码")
|
||||
@Excel(name = "账单编码")
|
||||
private String billCode;
|
||||
|
||||
@ApiModelProperty("关联订单id")
|
||||
@Excel(name = "关联订单id")
|
||||
private Long associationOrderId;
|
||||
|
||||
@ApiModelProperty("关联订单编码")
|
||||
@Excel(name = "关联订单编码")
|
||||
private String associationOrderCode;
|
||||
|
||||
@ApiModelProperty("运单状态:1-未签收 2-已签收 3-已作废")
|
||||
@Excel(name = "运单状态:1-未签收 2-已签收 3-已作废")
|
||||
private Integer associationOrderStatus;
|
||||
|
||||
@ApiModelProperty("服务费规则:1-定额 2-比例")
|
||||
@Excel(name = "服务费规则:1-定额 2-比例")
|
||||
private Integer serviceFeeRules;
|
||||
|
||||
@ApiModelProperty(name = "每单服务费")
|
||||
private BigDecimal serviceFeeOrder;
|
||||
|
||||
@ApiModelProperty("服务费")
|
||||
@Excel(name = "服务费")
|
||||
private BigDecimal serviceFee;
|
||||
|
||||
@ApiModelProperty("运费")
|
||||
@Excel(name = "运费")
|
||||
private BigDecimal freight;
|
||||
|
||||
@ApiModelProperty("开单时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date billingTime;
|
||||
|
||||
@ApiModelProperty("签收时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date signTime;
|
||||
|
||||
@ApiModelProperty("交账时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "交账时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date reportTime;
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class StaffDataPermissionDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "用户表ID")
|
||||
private Long userId;
|
||||
@ApiModelProperty("用户表ID集合")
|
||||
private List<Long> userIdList;
|
||||
@ApiModelProperty("组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
@ApiModelProperty("操作权限 1-个人创建,2-关联公司创建")
|
||||
private Integer userDataPersonalStatus;
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class StatisticalMattersDTO {
|
||||
|
||||
@Excel(name = "组织id")
|
||||
@ApiModelProperty(name = "组织id")
|
||||
private Long organizationId;
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.domain.po.VehiclePo;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title SyncTmsVehicleDTO
|
||||
* @description: TODO
|
||||
* @date 2024/6/21 17:24
|
||||
**/
|
||||
@Data
|
||||
public class SyncTmsVehicleDTO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "承运商编码(TMS)用于区别是哪个承运商下的车辆")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@ApiModelProperty(value = "车辆信息")
|
||||
private List<VehiclePo> vehicleList;
|
||||
|
||||
@ApiModelProperty(name = "车队id")
|
||||
private Long motorcadeId = 0L;
|
||||
@ApiModelProperty(name = "车队名称")
|
||||
private String motorcadeName = "";
|
||||
}
|
||||
+82
@@ -0,0 +1,82 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 多级分类字典对象 sys_multistage_dict
|
||||
*
|
||||
* @author mhd
|
||||
* @date 2023-03-21
|
||||
*/
|
||||
@Data
|
||||
public class SysMultistageDictDto extends BaseVOEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 多级分类字典表id */
|
||||
@ApiModelProperty(name = "多级分类字典表id")
|
||||
private Long sysMultistageDictId;
|
||||
|
||||
@ApiModelProperty(name = "多级分类字典表ids")
|
||||
private Long[] sysMultistageDictIds;
|
||||
|
||||
/** 类型名称 */
|
||||
@ApiModelProperty(name = "类型名称")
|
||||
private String multistageDictName;
|
||||
|
||||
/** 类型编码 */
|
||||
@ApiModelProperty(name = "类型编码")
|
||||
private String multistageDictCode;
|
||||
|
||||
/** 字典等级(1-一级,2-二级,3-三级) */
|
||||
@ApiModelProperty(name = "字典等级")
|
||||
private Integer multistageDictGrade;
|
||||
|
||||
/** 父级字典id */
|
||||
@ApiModelProperty(name = "父级字典id")
|
||||
private Long parentDictId;
|
||||
|
||||
/** 父级字典类型编码 */
|
||||
@ApiModelProperty(name = "父级字典类型编码")
|
||||
private String parentDictCode;
|
||||
|
||||
/** 父级字典类型名称 */
|
||||
@ApiModelProperty(name = "父级字典类型名称")
|
||||
private String parentDictName;
|
||||
|
||||
/** 描述 */
|
||||
@ApiModelProperty(name = "描述")
|
||||
private String multistageDictDescribe;
|
||||
|
||||
/** 排序 */
|
||||
@ApiModelProperty(name = "排序")
|
||||
private Integer multistageDictSort;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
|
||||
@ApiModelProperty(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty(name = "字典状态(1-启用,2-停用)")
|
||||
private Integer multistageDictStatus;
|
||||
|
||||
@ApiModelProperty(name = "父级字典ids")
|
||||
private String parentDictList;
|
||||
|
||||
@ApiModelProperty(name = "最高父级字典类型编码")
|
||||
private String topParentDictCode;
|
||||
|
||||
@ApiModelProperty("一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty(name = "是否默认(1-是,2-否)")
|
||||
private Integer isDefault;
|
||||
|
||||
|
||||
}
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class SysProvinceCityCountyDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "省份表id")
|
||||
private Long provinceId;
|
||||
@ApiModelProperty(name = "省份编码")
|
||||
private Long provinceCode;
|
||||
@ApiModelProperty(name = "省份名称")
|
||||
private String provinceName;
|
||||
@ApiModelProperty(name = "省份备注信息")
|
||||
private String provinceRemark;
|
||||
|
||||
@ApiModelProperty(name = "城市表id")
|
||||
private Long cityId;
|
||||
@ApiModelProperty(name = "城市编码")
|
||||
private Long cityCode;
|
||||
@ApiModelProperty(name = "城市编码-最新")
|
||||
private Long cityCodeNew;
|
||||
@ApiModelProperty(name = "城市名称")
|
||||
private String cityName;
|
||||
@ApiModelProperty(name = "城市备注信息")
|
||||
private String cityRemark;
|
||||
|
||||
@ApiModelProperty(name = "区县表id")
|
||||
private Long countyId;
|
||||
@ApiModelProperty(name = "区县编码")
|
||||
private Long countyCode;
|
||||
@ApiModelProperty(name = "区县编码-最新")
|
||||
private Long countyCodeNew;
|
||||
@ApiModelProperty(name = "区县名称")
|
||||
private String countyName;
|
||||
@ApiModelProperty(name = "区县备注信息")
|
||||
private String countyRemark;
|
||||
|
||||
@ApiModelProperty(name = "区县编码集合")
|
||||
private List<Long> countyCodes;
|
||||
@ApiModelProperty(name = "查询条件名称")
|
||||
private String name;
|
||||
|
||||
}
|
||||
+64
@@ -0,0 +1,64 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* 租户 po
|
||||
*
|
||||
* 2022-12-2
|
||||
*
|
||||
* @author 王子豪
|
||||
*/
|
||||
@Data
|
||||
public class SysTenantsDTO implements Serializable
|
||||
{
|
||||
@ApiModelProperty(name = "租户表ID")
|
||||
private Long tenantsId;
|
||||
@ApiModelProperty(name = "租户名称(企业名称)")
|
||||
private String tenantsName;
|
||||
@ApiModelProperty(name = "平台简称")
|
||||
private String tenantsSimpleName;
|
||||
@ApiModelProperty(name = "租户域名")
|
||||
private String tenantsDomainName;
|
||||
@ApiModelProperty(name = "组织ID")
|
||||
private Long organizationId;
|
||||
@ApiModelProperty(name = "用户账号")
|
||||
private String userAccount;
|
||||
@ApiModelProperty(name = "产品集合")
|
||||
private String productName;
|
||||
@ApiModelProperty(name = "一级账号-用户主表ID")
|
||||
private Long userId;
|
||||
@ApiModelProperty(name = "账户余额")
|
||||
private Long tenantsBalance;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "服务到期时间")
|
||||
private Date tenantsDueDate;
|
||||
@ApiModelProperty(name = "服务状态:0-无状态,1-开启,2-关闭")
|
||||
private Integer tenantsStatus;
|
||||
@ApiModelProperty(name = "租户备注")
|
||||
private String remark;
|
||||
@ApiModelProperty(name = "平台类型:0-无状态,1-票务服务平台,2-网络货运平台,3-专线物流TMS,4-其他")
|
||||
private Integer platefromType;
|
||||
@ApiModelProperty(name = "logo地址-H5")
|
||||
private String logoUrl;
|
||||
@ApiModelProperty(name = "logo地址-PC")
|
||||
private String logoUrlPc;
|
||||
@ApiModelProperty("客服热线")
|
||||
private String hotline;
|
||||
@ApiModelProperty("系统主题色")
|
||||
private String themeColors;
|
||||
@ApiModelProperty("系统背景图")
|
||||
private String themeImage;
|
||||
@ApiModelProperty("租户网页icon")
|
||||
private String webIcon;
|
||||
@ApiModelProperty("租户网页标题")
|
||||
private String webTitle;
|
||||
}
|
||||
@@ -0,0 +1,152 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class UserDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "用户ID")
|
||||
private Long userId;
|
||||
@ApiModelProperty(name = "一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
@ApiModelProperty(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
private List<Long> organizationIdList;
|
||||
@ApiModelProperty(name = "组织名称")
|
||||
private String organizationName;
|
||||
@ApiModelProperty(name = "职务/角色表ID")
|
||||
private Long roleId;
|
||||
@ApiModelProperty(name = "职务/角色权限字符")
|
||||
private String roleCode;
|
||||
@ApiModelProperty(name = "用户角色名称")
|
||||
private String roleName;
|
||||
@ApiModelProperty(name = "手机号码")
|
||||
private String userPhone;
|
||||
@ApiModelProperty(name = "用户姓名(真实姓名)")
|
||||
private String userName;
|
||||
@ApiModelProperty(name = "登录账号(2-20位)")
|
||||
private String userAccount;
|
||||
@ApiModelProperty(name = "会员编号")
|
||||
private String userMemberCode;
|
||||
@ApiModelProperty(name = "登录密码")
|
||||
private String userPassword;
|
||||
@ApiModelProperty(name = "盐")
|
||||
private String userSalt;
|
||||
@ApiModelProperty(name = "支付密码")
|
||||
private String userPayPassword;
|
||||
@ApiModelProperty(name = "身份证号")
|
||||
private String userIdcardNumber;
|
||||
@ApiModelProperty(name = "身份证号加密")
|
||||
private String userIdcardNumberDes;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "身份证有效期自")
|
||||
private Date userIdcardDateFrom;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "身份证有效期至")
|
||||
private Date userIdcardDateTo;
|
||||
@ApiModelProperty(name = "身份证是否长期:0-无状态,1-是,2-否")
|
||||
private Integer userIdcardLong;
|
||||
@ApiModelProperty(name = "身份证正面照片")
|
||||
private String userIdcardFrontUrl;
|
||||
@ApiModelProperty(name = "身份证反面照片")
|
||||
private String userIdcardBackUrl;
|
||||
@ApiModelProperty(name = "手持身份证")
|
||||
private String userIdcardInhandUrl;
|
||||
@ApiModelProperty(name = "用户头像")
|
||||
private String avatar;
|
||||
@ApiModelProperty(name = "用户状态:0-无状态,1-正常,2-锁定,3-作废")
|
||||
private Integer userStatus;
|
||||
@ApiModelProperty(name = "邮箱")
|
||||
private String userEmail;
|
||||
@ApiModelProperty(name = "县区编码,6位")
|
||||
private Long userAreaCountyId;
|
||||
@ApiModelProperty(name = "县区名称")
|
||||
private String userAreaName;
|
||||
@ApiModelProperty(name = "详细地址")
|
||||
private String userAreaAddress;
|
||||
@ApiModelProperty(name = "微信账号")
|
||||
private String userWechatAccount;
|
||||
@ApiModelProperty(name = "微信登录openid")
|
||||
private String userWechatOpenid;
|
||||
@ApiModelProperty(name = "微信登录会话KEY")
|
||||
private String userWechatSessionKey;
|
||||
@ApiModelProperty(name = "密码登录错误次数")
|
||||
private Integer passwordWrongTimes;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "最近一次登录时间")
|
||||
private Date lastLoginTime;
|
||||
@ApiModelProperty(name = "最近一次登录IP")
|
||||
private String lastLoginIp;
|
||||
@ApiModelProperty(name = "app_openid")
|
||||
private String appOpenid;
|
||||
@ApiModelProperty(name = "备注")
|
||||
private String userRemark;
|
||||
@ApiModelProperty(name = "用户实名认证状态:0-无状态,1-已注册未认证,2-已认证待审核,3-审核通过,4-已驳回")
|
||||
private Integer userAuthStatus;
|
||||
@ApiModelProperty(name = "用户审核人用户姓名")
|
||||
private String userAuthByUsername;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "用户审核时间")
|
||||
private Date userAuthTime;
|
||||
@ApiModelProperty(name = "加入黑名单备注(解除时需要清空)")
|
||||
private String userStatusRemark;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "用户状态更新时间")
|
||||
private Date userStatusTime;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "用户生日")
|
||||
private Date userBirthday;
|
||||
@ApiModelProperty(name = "用户住址信息")
|
||||
private String userAreaAddressInfo;
|
||||
@ApiModelProperty(name = "用户身份证到期状态:0-无状态,1-正常,2-临期一个月,3-临期三个月,4-过期")
|
||||
private Integer userIdcardStatus;
|
||||
@ApiModelProperty(name = "用户电子签章状态:0-无状态,1-已创建,2-未创建")
|
||||
private Integer userTemplateSealStatus;
|
||||
@ApiModelProperty(name = "用户电子签章")
|
||||
private String userTemplateSeal;
|
||||
@ApiModelProperty(name = "用户三方支付账号状态:0-无状态,1-已创建,2-未创建")
|
||||
private Integer userPayAccountStatus;
|
||||
@ApiModelProperty(name = "用户三方支付账号")
|
||||
private String userPayAccount;
|
||||
@ApiModelProperty(name = "用户绑卡状态:0-无状态,1-已绑卡,2-未绑卡")
|
||||
private Integer userBankCardStatus;
|
||||
@ApiModelProperty(name = "用户评价小")
|
||||
private Integer userEvaluateFrom;
|
||||
@ApiModelProperty(name = "用户评价大")
|
||||
private Integer userEvaluateTo;
|
||||
|
||||
@ApiModelProperty(name = "请求域名")
|
||||
private String tenantsDomainName;
|
||||
|
||||
@ApiModelProperty(value = "创建时间起")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTimeFrom;
|
||||
@ApiModelProperty(value = "创建时间止")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTimeTo;
|
||||
@ApiModelProperty(value = "审核时间起")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date userAuthTimeFrom;
|
||||
@ApiModelProperty(value = "审核时间止")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date userAuthTimeTo;
|
||||
|
||||
@ApiModelProperty(name = "用户唯一标识")
|
||||
private String token;
|
||||
|
||||
@ApiModelProperty(name = "用户ID集合")
|
||||
private List<Long> userIds;
|
||||
@ApiModelProperty(name = "菜单表ID")
|
||||
public Long permissionMenuId;
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class UserDataPermissionQueryDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "用户数据权限表ID")
|
||||
private Long userDataPermissionId;
|
||||
@ApiModelProperty(name = "用户表ID")
|
||||
private Long userId;
|
||||
@ApiModelProperty(name = "菜单表ID")
|
||||
private Long menuId;
|
||||
@ApiModelProperty(name = "产品表ID")
|
||||
private Long productId;
|
||||
@ApiModelProperty(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
@ApiModelProperty(name = "操作个人创建数据:0-无状态,1-允许,2-不允许")
|
||||
private Integer userDataPersonalStatus;
|
||||
@ApiModelProperty(name = "操作组织所有数据:0-无状态,1-允许,2-不允许")
|
||||
private Integer userDataOrganizationStatus;
|
||||
|
||||
@ApiModelProperty(name = "用户表ID")
|
||||
private Long permissionUserId;
|
||||
@ApiModelProperty(name = "菜单表ID")
|
||||
private Long permissionMenuId;
|
||||
@ApiModelProperty(name = "组织表ID")
|
||||
private Long permissionOrganizationId;
|
||||
@ApiModelProperty(name = "组织表ID集合")
|
||||
public List<Long> permissionOrganizationIds;
|
||||
|
||||
|
||||
}
|
||||
+208
@@ -0,0 +1,208 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class UserDriverDTO {
|
||||
|
||||
@ApiModelProperty(name = "角色表ID集合")
|
||||
private List<Long> roleIds;
|
||||
@ApiModelProperty(name = "司机表ID")
|
||||
private Long driverId;
|
||||
@ApiModelProperty(name = "运输企业id")
|
||||
private Long userDriverEnterpriseId;
|
||||
|
||||
@ApiModelProperty(name = "用户主表ID")
|
||||
private Long userId;
|
||||
|
||||
@ApiModelProperty(name = "车辆ID")
|
||||
private Long vehicleId;
|
||||
|
||||
@ApiModelProperty(name = "车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
|
||||
@ApiModelProperty(name = "准驾车型id")
|
||||
private Long driverAllowDrivingTypeId;
|
||||
|
||||
@ApiModelProperty(name = "准驾车型名称")
|
||||
private String driverAllowDrivingTypeName;
|
||||
|
||||
@ApiModelProperty(name = "驾驶证发证机关")
|
||||
private String driverCertificationAuthority;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "初次领证日期")
|
||||
private Date driverLicenseFirstDate;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "驾驶证有效期开始日期")
|
||||
private Date driverLicenseDateFrom;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "驾驶证有效期到期日期")
|
||||
private Date driverLicenseDateTo;
|
||||
|
||||
@ApiModelProperty(name = "驾驶证主页图片地址")
|
||||
private String driverLicenseFrontUrl;
|
||||
|
||||
@ApiModelProperty(name = "驾驶证副页图片地址")
|
||||
private String driverLicenseBackUrl;
|
||||
|
||||
@ApiModelProperty(name = "驾驶证档案编号")
|
||||
private String driverLicenseNumber;
|
||||
|
||||
@ApiModelProperty(name = "驾驶证是否长期:0-无状态,1-是,2-否")
|
||||
private Integer driverLicenseLong;
|
||||
|
||||
@ApiModelProperty(name = "从业资格证发证省份编码")
|
||||
private Long driverWorkLicenseAuthorityCode;
|
||||
|
||||
@ApiModelProperty(name = "从业资格证发证省份名称")
|
||||
private String driverWorkLicenseAuthorityName;
|
||||
|
||||
@ApiModelProperty(name = "从业资格证号")
|
||||
private String driverWorkLicenseNumber;
|
||||
|
||||
@ApiModelProperty(name = "从业资格证类别数据字典ID")
|
||||
private String driverWorkLicenseTypeId;
|
||||
|
||||
@ApiModelProperty(name = "从业资格证类别名称")
|
||||
private String driverWorkLicenseTypeName;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "从业资格证初次领证日期")
|
||||
private Date driverWorkLicenseFirstDate;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "从业资格证有效期开始日期")
|
||||
private Date driverWorkLicenseDateFrom;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "从业资格证有效期到期日期")
|
||||
private Date driverWorkLicenseDateTo;
|
||||
|
||||
@ApiModelProperty(name = "从业资格证是否长期:0-无状态,1-是,2-否")
|
||||
private Integer driverWorkLicenseLong;
|
||||
|
||||
@ApiModelProperty(name = "从业资格证校验状态:0-无状态,1-未校验,2-校验通过,3-校验失败")
|
||||
private int driverWorkLicenseAuthStatus;
|
||||
|
||||
@ApiModelProperty(name = "从业资格证主页图片地址")
|
||||
private String driverWorkLicenseFrontUrl;
|
||||
|
||||
@ApiModelProperty(name = "经营许可证号")
|
||||
private String driverBusinessLicenseNumber;
|
||||
|
||||
@ApiModelProperty(name = "经营许可证业户名称")
|
||||
private String driverBusinessLicenseOwner;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "经营许可证有效期开始日期")
|
||||
private Date driverBusinessLicenseDateFrom;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "经营许可证有效期到期日期")
|
||||
private Date driverBusinessLicenseDateTo;
|
||||
|
||||
@ApiModelProperty(name = "经营许可证是否长期:0-无状态,1-是,2-否")
|
||||
private Integer driverBusinessLicenseLong;
|
||||
|
||||
@ApiModelProperty(name = "经营许可证校验状态:0-无状态,1-未校验,2-校验通过,3-校验失败")
|
||||
private int driverBusinessLicenseAuthStatus;
|
||||
|
||||
@ApiModelProperty(name = "经营许可证主页图片地址")
|
||||
private String driverBusinessLicenseFrontUrl;
|
||||
|
||||
@ApiModelProperty(name = "企业名称")
|
||||
private String driverEnterpriseName;
|
||||
|
||||
@ApiModelProperty(name = "企业统一社会信用代码")
|
||||
private String driverEnterpriseSocialCreditCode;
|
||||
|
||||
@ApiModelProperty(name = "企业注册电话")
|
||||
private String driverEnterprisePhone;
|
||||
|
||||
@ApiModelProperty(name = "企业注册地址")
|
||||
private String driverEnterpriseAddress;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "企业营业执照有效期开始日期")
|
||||
private Date driverEnterpriseLicenseDateFrom;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "企业营业执照有效期到期日期")
|
||||
private Date driverEnterpriseLicenseDateTo;
|
||||
|
||||
@ApiModelProperty(name = "企业营业执照是否长期:0-无状态,1-是,2-否")
|
||||
private Integer driverEnterpriseLicenseLong;
|
||||
|
||||
@ApiModelProperty(name = "企业纳税人资质")
|
||||
private String driverEnterpriseTaxpayer;
|
||||
|
||||
@ApiModelProperty(name = "是否企业法人:0-无状态,1-是,2-否")
|
||||
private Integer driverCorp;
|
||||
|
||||
@ApiModelProperty(name = "企业营业执照主页图片地址")
|
||||
private String driverEnterpriseLicenseFrontUrl;
|
||||
|
||||
@ApiModelProperty(name = "法人姓名")
|
||||
private String driverCorpName;
|
||||
|
||||
@ApiModelProperty(name = "法人身份证号")
|
||||
private String driverCorpIdcardNumber;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "法人身份证有效期开始日期")
|
||||
private Date driverCorpIdcardDateFrom;
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "法人身份证有效期结束日期")
|
||||
private Date driverCorpIdcardDateTo;
|
||||
|
||||
@ApiModelProperty(name = "法人身份证是否长期:0-无状态,1-是,2-否")
|
||||
private Integer driverCorpIdcardLong;
|
||||
|
||||
@ApiModelProperty(name = "法人身份证正面照片")
|
||||
private String driverCorpIdcardFrontUrl;
|
||||
|
||||
@ApiModelProperty(name = "法人身份证反面照片")
|
||||
private String driverCorpIdcardBackUrl;
|
||||
|
||||
@ApiModelProperty(name = "法人身份证手持照片")
|
||||
private String driverCorpIdcardInhandUrl;
|
||||
|
||||
@ApiModelProperty(name = "车队名称")
|
||||
private String driverTeamName;
|
||||
@ApiModelProperty(name = "车队介绍")
|
||||
private String driverTeamRemark;
|
||||
|
||||
@ApiModelProperty(name = "司机审核状态:0-无状态,1-未认证,2-待审核,3-已通过,4-已驳回")
|
||||
private int driverAuthStatus;
|
||||
@ApiModelProperty(name = "司机审核人用户姓名")
|
||||
private String driverAuthByUsername;
|
||||
@ApiModelProperty(name = "司机审核时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date driverAuthTime;
|
||||
@ApiModelProperty(name = "司机审核原因")
|
||||
private String driverStatusRemark;
|
||||
@ApiModelProperty(name = "准驾车型数据字典ID集合")
|
||||
private List<Long> driverAllowDrivingTypeIds;
|
||||
|
||||
@ApiModelProperty(name = "用户唯一标识")
|
||||
private String token;
|
||||
|
||||
//=============================此处字段用于查询责任司机信息
|
||||
@ApiModelProperty(name = "用户Ids")
|
||||
private String queryIds;
|
||||
@ApiModelProperty(value = "推广码")
|
||||
private String promoCode;
|
||||
|
||||
@ApiModelProperty(value = "绑定来源 1-新增,2-绑定接口")
|
||||
private Integer bindSource;
|
||||
}
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 用户自定义单配置对象 user_form_config
|
||||
*
|
||||
* @author ???
|
||||
* @date 2023-05-13
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class UserFormConfigDto extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 用户自定义表单配置id */
|
||||
@ApiModelProperty("用户自定义表单配置id")
|
||||
private Long userFormConfigId;
|
||||
/** 表单类型(1-用户实名认证,) */
|
||||
@ApiModelProperty("表单类型(1-用户实名认证,2-企业托运人,3-个体承运人,4-企业承运人,5-车辆认证)")
|
||||
@Excel(name = "表单类型", readConverterExp = "1-用户实名认证,2-企业托运人,3-个体承运人,4-企业承运人,5-车辆认证")
|
||||
private Integer formType;
|
||||
/** 表单json */
|
||||
@ApiModelProperty("表单json")
|
||||
@Excel(name = "表单json")
|
||||
private String formJson;
|
||||
/** 组织表ID */
|
||||
@ApiModelProperty("组织表ID")
|
||||
@Excel(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
/** 最高组织id */
|
||||
@ApiModelProperty("最高组织id")
|
||||
@Excel(name = "最高组织id")
|
||||
private Long topOrganizationId;
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@Data
|
||||
public class UserMenuDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "职务/角色权限表ID")
|
||||
private Long roleMenuId;
|
||||
@ApiModelProperty(name = "职务/角色表ID")
|
||||
private Long roleId;
|
||||
@ApiModelProperty(name = "权限表ID")
|
||||
private Long menuId;
|
||||
@ApiModelProperty(name = "当前用户ID/用来跨微服务传送")
|
||||
private Long currentUserId;
|
||||
@ApiModelProperty(name = "调取类型 1-PC,2-feign")
|
||||
private Integer type;
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Data
|
||||
public class UserRoleDTO extends BaseVOEntity {
|
||||
|
||||
@ApiModelProperty(name = "用户职务/角色表ID")
|
||||
private Long userRoleId;
|
||||
@ApiModelProperty(name = "职务/角色表ID")
|
||||
private Long roleId;
|
||||
@ApiModelProperty(name = "用户表ID")
|
||||
private Long userId;
|
||||
@ApiModelProperty(name = "当前用户ID/用来跨微服务传送")
|
||||
private Long currentUserId;
|
||||
@ApiModelProperty(name = "职务/角色表ID")
|
||||
private List<Long> roleIds;
|
||||
}
|
||||
+349
@@ -0,0 +1,349 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 车辆管理 dto
|
||||
*
|
||||
* 2022-12-9
|
||||
*
|
||||
* @author 王子豪
|
||||
*/
|
||||
@Data
|
||||
public class VehicleDto implements Serializable
|
||||
{
|
||||
@ApiModelProperty(name = "车辆id")
|
||||
private Long vehicleId;
|
||||
@ApiModelProperty(name = "车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
@ApiModelProperty(name = "车辆类别:1-个人车辆 2-企业车辆")
|
||||
private Integer vehicleCategory;
|
||||
@ApiModelProperty(name = "车辆类型(数据字典id)")
|
||||
private String vehicleTypeId;
|
||||
@ApiModelProperty(name = "车辆类型(数据字典name)")
|
||||
private String vehicleTypeName;
|
||||
@ApiModelProperty(name = "使用人")
|
||||
private String vehicleUsePerson;
|
||||
@ApiModelProperty(name = "住址")
|
||||
private String vehicleAddress;
|
||||
@ApiModelProperty(name = "使用性质")
|
||||
private String vehicleUseNature;
|
||||
@ApiModelProperty(name = "品牌类型")
|
||||
private String vehicleBrandType;
|
||||
@ApiModelProperty(name = "车辆识别代号")
|
||||
private String vehicleIdentificationNumber;
|
||||
@ApiModelProperty(name = "发动机号码")
|
||||
private String vehicleEngineNumber;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "注册日期")
|
||||
private Date vehicleRegistrationDate;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "发证日期")
|
||||
private Date vehicleIssueDate;
|
||||
@ApiModelProperty(name = "发证机关")
|
||||
private String vehicleLicenceIssuingAuthority;
|
||||
@ApiModelProperty(name = "档案编号")
|
||||
private String vehicleFileNumber;
|
||||
@ApiModelProperty(name = "总质量")
|
||||
private BigDecimal vehicleTotalMass;
|
||||
@ApiModelProperty(name = "核定载质量")
|
||||
private BigDecimal vehicleApprovedLoadQuantity;
|
||||
@ApiModelProperty(name = "外廓尺寸(长)")
|
||||
private Integer vehicleGabariteOne;
|
||||
@ApiModelProperty(name = "外廓尺寸(宽)")
|
||||
private Integer vehicleGabariteTwo;
|
||||
@ApiModelProperty(name = "外廓尺寸(高)")
|
||||
private Integer vehicleGabariteThree;
|
||||
@ApiModelProperty(name = "能源类型(字典id)")
|
||||
private String vehicleEnergyTypeId;
|
||||
@ApiModelProperty(name = "能源类型(字典name)")
|
||||
private String vehicleEnergyTypeName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "检验有效期")
|
||||
private Date vehicleCheckoutPeriodValidity;
|
||||
@ApiModelProperty(name = "备注")
|
||||
private String vehicleRemark;
|
||||
@ApiModelProperty(name = "行驶证主页")
|
||||
private String vehicleDrivingLicenseMain;
|
||||
@ApiModelProperty(name = "行驶证副页")
|
||||
private String vehicleDrivingLicenseDeputy;
|
||||
@ApiModelProperty(name = "行驶证副页反面")
|
||||
private String vehicleDrivingLicenseDeputyAgainst;
|
||||
@ApiModelProperty(name = "是否挂车(0-无状态,1-挂车,2-不挂车)")
|
||||
private Integer trailerStatus;
|
||||
@ApiModelProperty(name = "挂车车牌号")
|
||||
private String trailerLicensePlateNumber;
|
||||
@ApiModelProperty(name = "挂车车辆类型(数据字典id)")
|
||||
private String trailerVehicleTypeId;
|
||||
@ApiModelProperty(name = "挂车车辆类型(数据字典name)")
|
||||
private String trailerVehicleTypeName;
|
||||
@ApiModelProperty(name = "挂车车牌颜色(数据字典id)")
|
||||
private String trailerLicensePlateColorId;
|
||||
@ApiModelProperty(name = "挂车车牌颜色(数据字典name)")
|
||||
private String trailerLicensePlateColorName;
|
||||
@ApiModelProperty(name = "挂车总质量")
|
||||
private BigDecimal trailerTotalMass;
|
||||
@ApiModelProperty(name = "挂车核定载质量")
|
||||
private BigDecimal trailerApprovedLoadQuantity;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "挂车行驶证到期时间")
|
||||
private Date trailerDrivingLicenseExpireDate;
|
||||
@ApiModelProperty(name = "挂车行驶证是否长期(0-无状态,1-长期,2-不长期)")
|
||||
private Integer trailerDrivingLicenseLongStatus;
|
||||
@ApiModelProperty(name = "挂车道路运输证号")
|
||||
private String trailerRoadTransportCertificateNo;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "挂车道路运输证有效期")
|
||||
private Date trailerRoadTransportCertificateExpireDate;
|
||||
@ApiModelProperty(name = "挂车道路运输证是否长期(0-无状态,1-长期,2-不长期)")
|
||||
private Integer trailerRoadTransportCertificateLongStatus;
|
||||
@ApiModelProperty(name = "挂车行驶证主页")
|
||||
private String trailerDrivingLicenseMain;
|
||||
@ApiModelProperty(name = "挂车行驶证副页")
|
||||
private String trailerDrivingLicenseDeputy;
|
||||
@ApiModelProperty(name = "挂车道路运输证照片")
|
||||
private String trailerRoadTransportCertificateImage;
|
||||
@ApiModelProperty(name = "其他车辆车牌颜色(数据字典id)")
|
||||
private String otherLicensePlateColorId;
|
||||
@ApiModelProperty(name = "其他车辆车牌颜色(数据字典name)")
|
||||
private String otherLicensePlateColorName;
|
||||
@ApiModelProperty(name = "其他车辆能源类型(字典id)")
|
||||
private String otherEnergyTypeId;
|
||||
@ApiModelProperty(name = "其他车辆能源类型(字典name)")
|
||||
private String otherEnergyTypeName;
|
||||
@ApiModelProperty(name = "其他车辆车轴轴数(字典id)")
|
||||
private Long otherAxlesNumberId;
|
||||
@ApiModelProperty(name = "其他车辆车轴轴数(字典name)")
|
||||
private String otherAxlesNumberName;
|
||||
@ApiModelProperty(name = "其他车辆车辆长度(字典id)")
|
||||
private String otherCarLengthId;
|
||||
@ApiModelProperty(name = "其他车辆车辆长度(字典name)")
|
||||
private String otherCarLengthName;
|
||||
@ApiModelProperty(name = "其他车辆车辆容积(字典id)")
|
||||
private Long otherVehicleVolumeId;
|
||||
@ApiModelProperty(name = "其他车辆车辆容积(字典name)")
|
||||
private String otherVehicleVolumeName;
|
||||
@ApiModelProperty(name = "其他车辆车头照片")
|
||||
private String otherHeadstockImage;
|
||||
@ApiModelProperty(name = "其他车辆车身照片")
|
||||
private String otherBodyworkImage;
|
||||
@ApiModelProperty(name = "其他车辆人车合影照片")
|
||||
private String otherPersonCarImage;
|
||||
@ApiModelProperty(name = "道路运输证号")
|
||||
private String roadTransportCertificateNo;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "道路运输证有效期")
|
||||
private Date roadTransportCertificateExpireDate;
|
||||
@ApiModelProperty(name = "道路运输证是否长期(0-无状态,1-长期,2-不长期)")
|
||||
private Integer roadTransportCertificateLongStatus;
|
||||
@ApiModelProperty(name = "道路运输证照片")
|
||||
private String roadTransportCertificateImage;
|
||||
@ApiModelProperty(name = "经营许可证号")
|
||||
private String businessLicenseNumber;
|
||||
@ApiModelProperty(name = "业户名称")
|
||||
private String specializedHouseholdsName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "经营许可证件有效期(开始)")
|
||||
private Date businessLicenseExpireStartDate;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "经营许可证件有效期(结束)")
|
||||
private Date businessLicenseExpireEndDate;
|
||||
@ApiModelProperty(name = "经营许可证件是否长期(0-无状态,1-长期,2-不长期)")
|
||||
private Integer businessLicenseLongStatus;
|
||||
@ApiModelProperty(name = "经营许可证件照片")
|
||||
private String businessLicenseImage;
|
||||
@ApiModelProperty(name = "车辆审核状态(0-无状态,1-未认证,2-等待审核,3-已通过,4-已驳回)")
|
||||
private Integer authenticationStatus;
|
||||
@ApiModelProperty(name = "驳回原因")
|
||||
private String rejectReason;
|
||||
@ApiModelProperty(name = "承运人用户表id")
|
||||
private Long userId;
|
||||
@ApiModelProperty(name = "承运人用户表姓名")
|
||||
private String userName;
|
||||
@ApiModelProperty(name = "承运人手机号")
|
||||
private String userPhone;
|
||||
@ApiModelProperty(name = "车队id")
|
||||
private Long motorcadeId;
|
||||
@ApiModelProperty(name = "车队名称")
|
||||
private String motorcadeName;
|
||||
@ApiModelProperty(name = "运载状态(0-无状态,1-空载,2-负载)")
|
||||
private Integer carryStatus;
|
||||
@ApiModelProperty(name = "道路运输证校验状态(0-无状态,1-未核验,2-核验通过,3-核验失败)")
|
||||
private Integer roadTransportCertificateCheckoutStatus;
|
||||
@ApiModelProperty(name = "经营许可证件校验状态(0-无状态,1-未核验,2-核验通过,3-核验失败)")
|
||||
private Integer businessLicenseCheckoutStatus;
|
||||
@ApiModelProperty(name = "入网核验状态(0-无状态,1-未核验,2-已入网,3-未入网)")
|
||||
private Integer netInStatus;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "入网查询时间")
|
||||
private Date netInDate;
|
||||
@ApiModelProperty(name = "使用状态(0-无状态,1-正常,2-黑名单)")
|
||||
private Integer useStatus;
|
||||
@ApiModelProperty(name = "归属组织id")
|
||||
private Long organizationId;
|
||||
@ApiModelProperty(name = "审核人员id")
|
||||
private Long checkoutPersonId;
|
||||
@ApiModelProperty(name = "审核人员name")
|
||||
private String checkoutPersonName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "审核时间")
|
||||
private Date checkoutDate;
|
||||
@ApiModelProperty(name = "行驶证认证状态(0-无状态,1-未认证,2-已认证)")
|
||||
private Integer vehicleDrivingLicenseAuthStatus;
|
||||
@ApiModelProperty(name = "车辆认证状态(0-无状态,1-未认证,2-已认证)")
|
||||
private Integer vehicleAuthStatus;
|
||||
@ApiModelProperty(name = "挂车认证状态(0-无状态,1-未认证,2-已认证)")
|
||||
private Integer trailerLicensePlateAuthStatus;
|
||||
@ApiModelProperty(name = "道路运输证认证状态(0-无状态,1-未认证,2-已认证)")
|
||||
private Integer roadTransportCertificateAuthStatus;
|
||||
@ApiModelProperty(name = "经营许可证认证状态(0-无状态,1-未认证,2-已认证)")
|
||||
private Integer businessLicenseExpireAuthStatus;
|
||||
@ApiModelProperty(name = "车辆总认证状态(0-无状态,1-未认证,2-已认证)")
|
||||
private Integer authStatus;
|
||||
@ApiModelProperty(name = "道路运输证审核状态(0-无状态,1-未认证,2-等待审核,3-已通过,4-已驳回)")
|
||||
private Integer roadTransportCertificateCheckStatus;
|
||||
@ApiModelProperty(name = "经营许可证审核状态(0-无状态,1-未认证,2-等待审核,3-已通过,4-已驳回)")
|
||||
private Integer businessLicenseExpireCheckStatus;
|
||||
|
||||
@ApiModelProperty(name = "总质量起始")
|
||||
private BigDecimal vehicleTotalMassStart;
|
||||
@ApiModelProperty(name = "总质量结束")
|
||||
private BigDecimal vehicleTotalMassEnd;
|
||||
@ApiModelProperty(name = "核定载质量起始")
|
||||
private BigDecimal vehicleApprovedLoadQuantityStart;
|
||||
@ApiModelProperty(name = "核定载质量结束")
|
||||
private BigDecimal vehicleApprovedLoadQuantityEnd;
|
||||
@ApiModelProperty(name = "其他车辆车轴轴数起始")
|
||||
private Integer otherAxlesNumberNameStart;
|
||||
@ApiModelProperty(name = "其他车辆车轴轴数结束")
|
||||
private Integer otherAxlesNumberNameEnd;
|
||||
@ApiModelProperty(name = "其他车辆车辆长度起始")
|
||||
private Integer otherCarLengthNameStart;
|
||||
@ApiModelProperty(name = "其他车辆车辆长度结束")
|
||||
private Integer otherCarLengthNameEnd;
|
||||
@ApiModelProperty(name = "其他车辆车辆容积起始")
|
||||
private Integer otherVehicleVolumeNameStart;
|
||||
@ApiModelProperty(name = "其他车辆车辆容积结束")
|
||||
private Integer otherVehicleVolumeNameEnd;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "检验有效期开始")
|
||||
private Date vehicleCheckoutPeriodValidityStart;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "检验有效期结束")
|
||||
private Date vehicleCheckoutPeriodValidityEnd;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "道路运输证有效期")
|
||||
private Date roadTransportCertificateExpireDateStart;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "道路运输证有效期")
|
||||
private Date roadTransportCertificateExpireDateEnd;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "经营许可证件有效期(结束)起始")
|
||||
private Date businessLicenseExpireEndDateStart;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "经营许可证件有效期(结束)结束")
|
||||
private Date businessLicenseExpireEndDateEnd;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "入网查询时间起始")
|
||||
private Date netInDateStart;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "入网查询时间结束")
|
||||
private Date netInDateEnd;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "审核时间起始")
|
||||
private Date checkoutDateStart;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "审核时间结束")
|
||||
private Date checkoutDateEnd;
|
||||
@ApiModelProperty(name = "添加人员")
|
||||
private String createByName;
|
||||
@ApiModelProperty(value = "添加时间起始")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private Date createTimeStart;
|
||||
@ApiModelProperty(value = "添加时间结束")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private Date createTimeEnd;
|
||||
@ApiModelProperty(name = "车辆id集合")
|
||||
private List<Long> vehicleIdList;
|
||||
@ApiModelProperty(value = "校验记录")
|
||||
private java.lang.String checkRecord;
|
||||
@ApiModelProperty(value = "查询车辆是否入网时间(是平台查询时间,不是入网时间)")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date checkTruckExistDate;
|
||||
@ApiModelProperty(value = "查询车辆是否入网人员手机")
|
||||
private String checkTruckExistUser;
|
||||
@ApiModelProperty(value = "道路运输证字")
|
||||
private String roadTransportCertificateWord;
|
||||
@ApiModelProperty(value = "车辆道路运输证核验时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date checkRtcNoTime;
|
||||
@ApiModelProperty(value = "企业道路运输经营许可证校验V3:0-未核验,1-已核验通过,2-核验失败(证件号错误/所有人错误),3-已过期,4-经营状态异常")
|
||||
private Integer checkEnterpriseRoadLicense;
|
||||
@ApiModelProperty(value = "企业道路运输经营许可证校验时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date checkEnterpriseRoadLicenseTime;
|
||||
@ApiModelProperty(value = "实际承运人统一社会信用代码或证件号码")
|
||||
private String actualcarrierid;
|
||||
@ApiModelProperty(value = "道路运输许可证副页图片地址")
|
||||
private String transportPermitBackImgUrl;
|
||||
@ApiModelProperty(value = "车辆入网确认时间(最新定位时间)")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date checkTruckConfirmDate;
|
||||
@ApiModelProperty(value = "标记状态id")
|
||||
private String markerStateId;
|
||||
@ApiModelProperty(value = "标记状态名称")
|
||||
private String markerStateName;
|
||||
@ApiModelProperty(value = "行驶证号")
|
||||
private String drivingPermitNumber;
|
||||
/**黑名单操作人*/
|
||||
@ApiModelProperty(value = "黑名单操作人")
|
||||
private java.lang.String blacklistBy;
|
||||
@ApiModelProperty(value = "黑名单操作时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private java.util.Date blacklistDate;
|
||||
|
||||
@ApiModelProperty(value = "车辆来源 0-自有车辆 1-社会车辆")
|
||||
private Integer vehicleSource;
|
||||
|
||||
@ApiModelProperty(name = "部门Id")
|
||||
private String departmentId;
|
||||
|
||||
|
||||
@ApiModelProperty(name = "部门名称")
|
||||
private String departmentName;
|
||||
}
|
||||
+175
@@ -0,0 +1,175 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 收入核销对象 dto
|
||||
*
|
||||
* 2023-03-18
|
||||
*
|
||||
* @author 王子豪
|
||||
*/
|
||||
@Data
|
||||
public class VerificationDto extends BaseVOEntity implements Serializable
|
||||
{
|
||||
@ApiModelProperty("收入核销id")
|
||||
private Long verificationId;
|
||||
@ApiModelProperty("核销类型(1.收入核销2.支出核销)")
|
||||
private Integer verificationType;
|
||||
@ApiModelProperty("网点id")
|
||||
private Long branchId;
|
||||
@ApiModelProperty("寄件网点")
|
||||
private Long mailBranch;
|
||||
@ApiModelProperty("到站网点")
|
||||
private Long arriveBranch;
|
||||
@ApiModelProperty("核销状态(1-未对账 2-未申请 3-未审核 4-未支付 5-未核销 6-已核销 7-已取消,8-核销中,9-核销失败)")
|
||||
private Integer verificationStatus;
|
||||
@ApiModelProperty("结算状态查询(1-未对账 2-未申请 3-未审核 4-未支付 5-未核销 6-已核销 7-已取消)")
|
||||
private Integer verificationStatusOne;
|
||||
@ApiModelProperty("内部流水号")
|
||||
private String innerNumber;
|
||||
@ApiModelProperty("应付单据号")
|
||||
private String businessDocumentDetaliNumber;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty("入账时间")
|
||||
private Date enterAccountTime;
|
||||
@ApiModelProperty("一级科目code")
|
||||
private String firstSubject;
|
||||
@ApiModelProperty("二级科目code")
|
||||
private String secondSubject;
|
||||
@ApiModelProperty("一级科目")
|
||||
private String firstSubjectName;
|
||||
@ApiModelProperty("二级科目名称")
|
||||
private String secondSubjectName;
|
||||
@ApiModelProperty("金额")
|
||||
private BigDecimal verificationMoney;
|
||||
@ApiModelProperty("支付人/单位ID")
|
||||
private Long payId;
|
||||
@ApiModelProperty("支付人/单位")
|
||||
private String payPerson;
|
||||
@ApiModelProperty("收款渠道code(字典)")
|
||||
private String payChannel;
|
||||
@ApiModelProperty("收款渠道名称(字典)")
|
||||
private String payChannelName;
|
||||
@ApiModelProperty("支付通道code")
|
||||
private String payWay;
|
||||
@ApiModelProperty("支付通道name")
|
||||
private String payWayName;
|
||||
@ApiModelProperty("银企直联流水号")
|
||||
private String bankNumber;
|
||||
@ApiModelProperty("收据单号")
|
||||
private String receiptNumber;
|
||||
@ApiModelProperty("核销备注")
|
||||
private String collectionRemark;
|
||||
@ApiModelProperty("取消核销备注")
|
||||
private String cancelCollectionRemark;
|
||||
@ApiModelProperty("支付备注")
|
||||
private String payRemark;
|
||||
@ApiModelProperty("运单/订单id")
|
||||
private Long waybillId;
|
||||
@ApiModelProperty("运单/订单号")
|
||||
private String waybillNumber;
|
||||
@ApiModelProperty("运单/订单号集合")
|
||||
private List<String> waybillNumberList;
|
||||
@ApiModelProperty("运单/订单号")
|
||||
private String waybillNumbers;
|
||||
@ApiModelProperty("订单/运单备注")
|
||||
private String waybillRemark;
|
||||
@ApiModelProperty("运单/订单来源")
|
||||
private String waybillSource;
|
||||
@ApiModelProperty("运单/订单来源name")
|
||||
private String waybillSourceName;
|
||||
@ApiModelProperty("收支记账号")
|
||||
private String revenueExpensesNumber;
|
||||
@ApiModelProperty("入账人id")
|
||||
private Long enterAccountId;
|
||||
@ApiModelProperty("入账人name")
|
||||
private String enterAccountName;
|
||||
@ApiModelProperty("核销人id")
|
||||
private Long cancelAfterVerificationId;
|
||||
@ApiModelProperty("核销人name")
|
||||
private String cancelAfterVerificationName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty("核销时间")
|
||||
private Date cancelAfterVerificationTime;
|
||||
@ApiModelProperty("核销方式:1.人工核销2.自动核销")
|
||||
private Integer cancelAfterVerificationType;
|
||||
@ApiModelProperty("开户银行(1.中国银行2.中国农业银行)")
|
||||
private String accountHolderBank;
|
||||
@ApiModelProperty("开户人姓名")
|
||||
private String accountHolderName;
|
||||
@ApiModelProperty("银行账号")
|
||||
private String bankAccount;
|
||||
@ApiModelProperty("车辆id")
|
||||
private Long vehicleId;
|
||||
@ApiModelProperty("车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
@ApiModelProperty("司机姓名")
|
||||
private String driverName;
|
||||
@ApiModelProperty("收入核销ids")
|
||||
private List<Long> verificationIds;
|
||||
@ApiModelProperty("图片地址集合")
|
||||
private String images;
|
||||
@ApiModelProperty("入账时间查询条件开始日期")
|
||||
private String enterAccountTimeStart;
|
||||
@ApiModelProperty("入账时间查询条件结束日期")
|
||||
private String enterAccountTimeEnd;
|
||||
@ApiModelProperty("核销时间查询条件开始日期")
|
||||
private String cancelAfterVerificationTimeStart;
|
||||
@ApiModelProperty("核销时间查询条件结束日期")
|
||||
private String cancelAfterVerificationTimeEnd;
|
||||
@ApiModelProperty("核销条件查询(1未核销2.已核销)")
|
||||
private String cancelAfterVerificationStatus;
|
||||
@ApiModelProperty("业务单据号")
|
||||
private String businessDocumentNumber;
|
||||
@ApiModelProperty("支付密码")
|
||||
private String payPassword;
|
||||
@ApiModelProperty("一级组织ID")
|
||||
private Long topOrganizationId;
|
||||
@ApiModelProperty("组织表ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("核销失败原因")
|
||||
private String verificationFailReason;
|
||||
|
||||
@ApiModelProperty(value = "创建时间开始")
|
||||
private String createTimeStart;
|
||||
|
||||
@ApiModelProperty(value = "创建时间结束")
|
||||
private String createTimeEnd;
|
||||
|
||||
|
||||
@ApiModelProperty("记账人姓名")
|
||||
private String recordCreateByName;
|
||||
|
||||
@ApiModelProperty("付款方式:1-现金,2-油卡,3-公司加油,4-定点加油,5-油卡借款,6-现金借款")
|
||||
private String payType;
|
||||
|
||||
@ApiModelProperty("业务类型")
|
||||
private Integer businessType;
|
||||
|
||||
|
||||
@ApiModelProperty("支付方式 0-挂账 1-即时")
|
||||
private Integer paymentMethod;
|
||||
|
||||
@ApiModelProperty("油卡号")
|
||||
private String fuelCardNumber;
|
||||
|
||||
@ApiModelProperty("部门名称")
|
||||
private String departmentName;
|
||||
|
||||
@ApiModelProperty("付款人")
|
||||
private String payName;
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title VerificationTmsPushDTO
|
||||
* @description: TODO
|
||||
* @date 2024/11/29 16:30
|
||||
**/
|
||||
@Data
|
||||
public class VerificationTmsPushDTO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(name = "运输单号集合")
|
||||
private List<String> waybillNoList;
|
||||
|
||||
@ApiModelProperty(value = "是否运费推送TMS:0-否 1-是")
|
||||
private Integer isPushTmsByFreight;
|
||||
|
||||
}
|
||||
+381
@@ -0,0 +1,381 @@
|
||||
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.mhd.common.core.domain.entity.WaybillFreight;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 运单对象 dto
|
||||
*
|
||||
* 2023-01-07
|
||||
*
|
||||
* @author 王子豪
|
||||
*/
|
||||
@Data
|
||||
public class WaybillDto extends BaseVOEntity implements Serializable
|
||||
{
|
||||
@ApiModelProperty(name = "运单id")
|
||||
private Long waybillId;
|
||||
@ApiModelProperty(name = "网点id")
|
||||
private Long branchId;
|
||||
@ApiModelProperty(name = "网点名称")
|
||||
private String branchName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "寄件日期")
|
||||
private Date mailDate;
|
||||
@ApiModelProperty(name = "寄件网点")
|
||||
private Long mailBranch;
|
||||
@ApiModelProperty(name = "寄件网点名称")
|
||||
private String mailBranchName;
|
||||
@ApiModelProperty(name = "运单号码")
|
||||
private String waybillNumber;
|
||||
@ApiModelProperty(name = "到站网点")
|
||||
private Long arriveBranch;
|
||||
@ApiModelProperty(name = "到站网点名称")
|
||||
private String arriveBranchName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "接车日期")
|
||||
private Date pickUpDate;
|
||||
@ApiModelProperty(name = "会员编号")
|
||||
private String memberCode;
|
||||
@ApiModelProperty(name = "会员名称")
|
||||
private String memberNickname;
|
||||
@ApiModelProperty(name = "会员姓名")
|
||||
private String memberName;
|
||||
@ApiModelProperty(name = "会员身份证号")
|
||||
private String memberIdcardNumber;
|
||||
@ApiModelProperty(name = "寄件人姓名")
|
||||
private String mailName;
|
||||
@ApiModelProperty(name = "寄件人电话")
|
||||
private String mailPhone;
|
||||
@ApiModelProperty(name = "寄件人省份编码")
|
||||
private Long mailProvinceCode;
|
||||
@ApiModelProperty(name = "寄件人城市编码")
|
||||
private Long mailCityCode;
|
||||
@ApiModelProperty(name = "寄件人县区编码")
|
||||
private Long mailCountyCode;
|
||||
@ApiModelProperty(name = "寄件人省份名称")
|
||||
private String mailProvinceName;
|
||||
@ApiModelProperty(name = "寄件人城市名称")
|
||||
private String mailCityName;
|
||||
@ApiModelProperty(name = "寄件人县区名称")
|
||||
private String mailCountyName;
|
||||
@ApiModelProperty(name = "寄件人地址")
|
||||
private String mailAddress;
|
||||
@ApiModelProperty(name = "收件人姓名")
|
||||
private String addresseeName;
|
||||
@ApiModelProperty(name = "收件人电话")
|
||||
private String addresseePhone;
|
||||
@ApiModelProperty(name = "收件人省份编码")
|
||||
private Long addresseeProvinceCode;
|
||||
@ApiModelProperty(name = "收件人城市编码")
|
||||
private Long addresseeCityCode;
|
||||
@ApiModelProperty(name = "收件人县区编码")
|
||||
private Long addresseeCountyCode;
|
||||
@ApiModelProperty(name = "收件人省份名称")
|
||||
private String addresseeProvinceName;
|
||||
@ApiModelProperty(name = "收件人城市名称")
|
||||
private String addresseeCityName;
|
||||
@ApiModelProperty(name = "收件人县区名称")
|
||||
private String addresseeCountyName;
|
||||
@ApiModelProperty(name = "收件人地址")
|
||||
private String addresseeAddress;
|
||||
@ApiModelProperty(name = "交货方式(1.网点自提2.上门送货3.到站中转)")
|
||||
private Integer deliveryWayId;
|
||||
@ApiModelProperty(name = "接货方式(1.网点收货2.上门提货)")
|
||||
private Integer receiveGoodsWayId;
|
||||
@ApiModelProperty(name = "运费")
|
||||
private BigDecimal freight;
|
||||
@ApiModelProperty(name = "保险金额")
|
||||
private BigDecimal insuranceMoney;
|
||||
@ApiModelProperty(name = "保险费计算比例")
|
||||
private BigDecimal premiumCalculateScale;
|
||||
@ApiModelProperty(name = "保险费")
|
||||
private BigDecimal premium;
|
||||
@ApiModelProperty(name = "提货费")
|
||||
private BigDecimal pickUpCharge;
|
||||
@ApiModelProperty(name = "送货费")
|
||||
private BigDecimal deliveryExpense;
|
||||
@ApiModelProperty(name = "回扣")
|
||||
private BigDecimal kickback;
|
||||
@ApiModelProperty(name = "加急费")
|
||||
private BigDecimal urgentExpense;
|
||||
@ApiModelProperty(name = "其他费用")
|
||||
private BigDecimal otherExpenses;
|
||||
@ApiModelProperty(name = "运费合计")
|
||||
private BigDecimal freightTotal;
|
||||
@ApiModelProperty(name = "付款方式:1.现付2.到付3.回单付4.月结5.扣付6.拆分")
|
||||
private Integer paymentType;
|
||||
@ApiModelProperty(name = "现付")
|
||||
private BigDecimal spotPayment;
|
||||
@ApiModelProperty(name = "预付")
|
||||
private BigDecimal prepayment;
|
||||
@ApiModelProperty(name = "到付")
|
||||
private BigDecimal freightCollectPayment;
|
||||
@ApiModelProperty(name = "回单付")
|
||||
private BigDecimal paymentAgainstDocuments;
|
||||
@ApiModelProperty(name = "月结")
|
||||
private BigDecimal monthlyStatement;
|
||||
@ApiModelProperty(name = "扣付")
|
||||
private BigDecimal withholdPayment;
|
||||
@ApiModelProperty(name = "代收货款")
|
||||
private BigDecimal collectionDelivery;
|
||||
@ApiModelProperty(name = "手续费")
|
||||
private BigDecimal commissionCharges;
|
||||
@ApiModelProperty(name = "放款方式:1.现金2.银行卡3.垫付")
|
||||
private Integer loanType;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "放款时间")
|
||||
private Date loanTime;
|
||||
@ApiModelProperty(name = "开户人姓名")
|
||||
private String accountHolderName;
|
||||
@ApiModelProperty(name = "开户银行")
|
||||
private String accountHolderBank;
|
||||
@ApiModelProperty(name = "银行账号")
|
||||
private String bankAccount;
|
||||
@ApiModelProperty(name = "回单要求(其他要求)")
|
||||
private String receiptRequest;
|
||||
@ApiModelProperty(name = "回单要求状态:1-不需要,2-拍照回单(免费)3.纸质回单")
|
||||
private Integer receiptStatus;
|
||||
@ApiModelProperty(name = "其他备注")
|
||||
private String serviceRequestRemark;
|
||||
@ApiModelProperty(name = "打印内容(运单):1.未选中2.选中")
|
||||
private Integer printContentType;
|
||||
@ApiModelProperty(name = "打印内容(标签):1.未选中2.选中")
|
||||
private Integer printContentTag;
|
||||
@ApiModelProperty(name = "运单数量")
|
||||
private Integer waybillNum;
|
||||
@ApiModelProperty(name = "标签数量")
|
||||
private Integer tagNum;
|
||||
@ApiModelProperty(name = "业务人员id")
|
||||
private Long businessUserId;
|
||||
@ApiModelProperty(name = "业务人员name")
|
||||
private String businessUserName;
|
||||
@ApiModelProperty(name = "运单状态:1-正常,2-作废")
|
||||
private Integer waybillStatus;
|
||||
@ApiModelProperty(name = "提货派车运单状态:1-未派车,2-未装货,3-未卸货,4-已完成")
|
||||
private Integer sendCarWaybillStatus;
|
||||
@ApiModelProperty(name = "送货派车运单状态:1-未派车,2-未装货,3-未卸货,4-已完成")
|
||||
private Integer deliveryWaybillStatus;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "派车入库时间")
|
||||
private Date warehousingTime;
|
||||
@ApiModelProperty(name = "入库状态(1.未入库2.已入库)")
|
||||
private Integer warehousingStatus;
|
||||
@ApiModelProperty(name = "派车原因(1.提货2.送货)")
|
||||
private Integer sendCarReason;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "提货派车装货时间")
|
||||
private Date sendCarLoadingTime;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "提货派车卸货时间")
|
||||
private Date sendCarUnloadTime;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "送货派车装货时间")
|
||||
private Date deliveryLoadingTime;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "送货派车卸货时间")
|
||||
private Date deliveryUnloadTime;
|
||||
@ApiModelProperty(name = "运单状态:0-全部,1-未签收,2-已签收,3-已退货")
|
||||
private Integer waybillDistributionStatus;
|
||||
@ApiModelProperty(name = "签收人id")
|
||||
private Long signBy;
|
||||
@ApiModelProperty(name = "签收人name")
|
||||
private String signByName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(name = "签收日期")
|
||||
private Date signDate;
|
||||
@ApiModelProperty(name = "通知状态:1-未发送短信,2-已发送短信")
|
||||
private Integer informStatus;
|
||||
@ApiModelProperty(name = "异动费")
|
||||
private BigDecimal transactionCharges;
|
||||
@ApiModelProperty(name = "异动状态:1-收入,2-支出")
|
||||
private Integer transactionStatus;
|
||||
@ApiModelProperty(name = "异动原因")
|
||||
private String transactionReason;
|
||||
@ApiModelProperty(name = "异动合计")
|
||||
private BigDecimal transactionTotal;
|
||||
@ApiModelProperty(name = "签收人身份证号")
|
||||
private String signByIdCard;
|
||||
@ApiModelProperty(name = "签收人电话")
|
||||
private String signByPhone;
|
||||
@ApiModelProperty(name = "签收人补充信息")
|
||||
private String signBySupplement;
|
||||
@ApiModelProperty(name = "中转方式:1-内部中转,2-外部中转")
|
||||
private Integer transfer;
|
||||
@ApiModelProperty(name = "中转网点id")
|
||||
private Long transferBranchId;
|
||||
@ApiModelProperty(name = "中转网点名称")
|
||||
private String transferBranchName;
|
||||
@ApiModelProperty(name = "中转网点联系人")
|
||||
private String transferBranchContactName;
|
||||
@ApiModelProperty(name = "中转网点联系方式")
|
||||
private String transferBranchContactPhone;
|
||||
@ApiModelProperty(name = "中转公司三方物流信息id")
|
||||
private Long trilateralManageId;
|
||||
@ApiModelProperty(name = "中转公司三方物流名称")
|
||||
private String trilateralManageName;
|
||||
@ApiModelProperty(name = "中转公司联系人")
|
||||
private String trilateralContactName;
|
||||
@ApiModelProperty(name = "中转公司联系方式")
|
||||
private String trilateralContactPhone;
|
||||
@ApiModelProperty(name = "中转单号")
|
||||
private String transferNumber;
|
||||
@ApiModelProperty(name = "中转费")
|
||||
private BigDecimal transferCharges;
|
||||
@ApiModelProperty(name = "中转费状态:1-未支付,2-已支付")
|
||||
private Integer transferChargesStatus;
|
||||
@ApiModelProperty(name = "中转状态:1-未中转,2-已中转")
|
||||
private Integer transferStatus;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "中转时间")
|
||||
private Date transferTime;
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "派车时间")
|
||||
private Date sendCarTime;
|
||||
@ApiModelProperty(name = "运单/订单来源")
|
||||
private String waybillSource;
|
||||
@ApiModelProperty(name = "运单/订单来源name")
|
||||
private String waybillSourceName;
|
||||
@ApiModelProperty(name = "运单异常:1-否,2-是")
|
||||
private Integer waybillException;
|
||||
@ApiModelProperty(name = "原运单运单号码")
|
||||
private String oldWaybillNumber;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "退货时间")
|
||||
private Date returnTime;
|
||||
@ApiModelProperty(name = "运单总运输状态:1-已下单,2-提货中,3-已入库,4-已装车,5-运输中,6-已到达,7-送货中,8-已签收,9-已退货,10-已取消")
|
||||
private Integer waybillTotalTransportStatus;
|
||||
@ApiModelProperty(name = "运单货物集合")
|
||||
private List<WaybillFreight> waybillFreightList;
|
||||
@ApiModelProperty(name = "寄件日期查询条件开始日期")
|
||||
private String mailDateStart;
|
||||
@ApiModelProperty(name = "寄件日期查询条件结束日期")
|
||||
private String mailDateEnd;
|
||||
@ApiModelProperty(name = "开单时间查询条件开始日期")
|
||||
private String createTimeStart;
|
||||
@ApiModelProperty(name = "开单时间查询条件结束日期")
|
||||
private String createTimeEnd;
|
||||
@ApiModelProperty(name = "是否代收货款:1.有2.无")
|
||||
private String isCollectionDelivery;
|
||||
@ApiModelProperty(name = "货物名称")
|
||||
private String freightNameName;
|
||||
@ApiModelProperty(name = "包装类型")
|
||||
private String packagingTypeName;
|
||||
@ApiModelProperty(name = "总件数")
|
||||
private Long totalCaseNumber;
|
||||
@ApiModelProperty(name = "总重量")
|
||||
private BigDecimal totalWeight;
|
||||
@ApiModelProperty(name = "总体积")
|
||||
private BigDecimal totalVolume;
|
||||
@ApiModelProperty(name = "总单数")
|
||||
private Long totalOrderNumber;
|
||||
@ApiModelProperty(name = "配载id")
|
||||
private Long stowageId;
|
||||
@ApiModelProperty(name = "配载单号")
|
||||
private Long stowageNumber;
|
||||
@ApiModelProperty(name = "派车id")
|
||||
private Long sendCarId;
|
||||
@ApiModelProperty(name = "单笔扫描(1.选中2.未选中)")
|
||||
private Integer singleScan;
|
||||
@ApiModelProperty(name = "模糊查找(1.选中2.未选中)")
|
||||
private Integer blurSelect;
|
||||
@ApiModelProperty(name = "运单号码输入框内容")
|
||||
private String waybillNumberText;
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
@ApiModelProperty(name = "接车日期查询条件开始日期")
|
||||
private String pickUpDateStart;
|
||||
@ApiModelProperty(name = "接车日期查询条件结束日期")
|
||||
private String pickUpDateEnd;
|
||||
@ApiModelProperty(name = "库存类型0.全部1.发货库存2.分拣存库")
|
||||
private Integer stockType;
|
||||
@ApiModelProperty(name = "签收日期查询条件开始日期")
|
||||
private String signDateStart;
|
||||
@ApiModelProperty(name = "签收日期查询条件结束日期")
|
||||
private String signDateEnd;
|
||||
@ApiModelProperty(name = "中转时间查询条件开始日期")
|
||||
private String transferTimeStart;
|
||||
@ApiModelProperty(name = "中转时间查询条件结束日期")
|
||||
private String transferTimeEnd;
|
||||
@ApiModelProperty(name = "车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
@ApiModelProperty(name = "司机姓名")
|
||||
private String driverName;
|
||||
@ApiModelProperty(name = "货派车装货时间查询条件开始日期")
|
||||
private String deliveryLoadingTimeStart;
|
||||
@ApiModelProperty(name = "货派车装货时间查询条件结束日期")
|
||||
private String deliveryLoadingTimeEnd;
|
||||
@ApiModelProperty(name = "派车时间查询条件开始日期")
|
||||
private String sendCarTimeStart;
|
||||
@ApiModelProperty(name = "派车时间查询条件结束日期")
|
||||
private String sendCarTimeEnd;
|
||||
@ApiModelProperty(name = "运单运输状态:0-全部,1-未运输,2-运输中,3-未签收,4-已完成")
|
||||
private Integer transportShowStatus;
|
||||
@ApiModelProperty(name = "代收还款状态:1-未收款,2-未核销,3-已核销")
|
||||
private Integer collectionDeliveryStatus;
|
||||
@ApiModelProperty(name = "核销人id")
|
||||
private Long cancelAfterVerificationId;
|
||||
@ApiModelProperty(name = "核销人name")
|
||||
private String cancelAfterVerificationName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "核销时间")
|
||||
private Date cancelAfterVerificationTime;
|
||||
@ApiModelProperty(name = "收款人id")
|
||||
private Long collectionId;
|
||||
@ApiModelProperty(name = "收款人name")
|
||||
private String collectionName;
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(name = "收款时间")
|
||||
private Date collectionTime;
|
||||
@ApiModelProperty(name = "运单类型(1正常 2退货订单)")
|
||||
private Integer waybillType;
|
||||
@ApiModelProperty("货单类型:1.发货流2.拉货3.长途大车")
|
||||
private Integer orderType;
|
||||
@ApiModelProperty("发货地址小区")
|
||||
@Excel(name = "发货地址小区")
|
||||
private String mailAddressPlot;
|
||||
|
||||
@ApiModelProperty("发货门牌信息")
|
||||
@Excel(name = "发货门牌信息")
|
||||
private String mailDoorplate;
|
||||
|
||||
@ApiModelProperty(name = "收货地址小区")
|
||||
private String addresseeAddressPlot;
|
||||
|
||||
@ApiModelProperty("收货门牌信息")
|
||||
@Excel(name = "收货门牌信息")
|
||||
private String addresseeDoorplate;
|
||||
|
||||
@ApiModelProperty("经由地网点")
|
||||
private Long throughLocalBranch;
|
||||
|
||||
@ApiModelProperty(name = "来源设备0-未知1-APP2-PC")
|
||||
private Integer device;
|
||||
|
||||
@ApiModelProperty(value = "是否到到货库存(1-是,2-否)")
|
||||
private Integer arrivalInventoryFlag;
|
||||
}
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 运单财务 feign调用公共参数类 dto
|
||||
*
|
||||
* @author zg
|
||||
*/
|
||||
@Data
|
||||
public class WaybillFinanceFeignParamDTO extends BaseVOEntity implements Serializable {
|
||||
|
||||
@ApiModelProperty(name = "货款管理操作运单单号list")
|
||||
List<String> loanManages;
|
||||
|
||||
@ApiModelProperty(name = "收入核销操作运单单号list")
|
||||
List<String> verifications;
|
||||
|
||||
@ApiModelProperty(name = "收入核销IdList")
|
||||
List<Long> verificationIds;
|
||||
|
||||
@ApiModelProperty("服务费账单集合")
|
||||
private List<ServiceBillDO> serviceBillDOList;
|
||||
|
||||
@ApiModelProperty(name = "取消签收变更核销IdList")
|
||||
List<Long> cancelVerificationIds;
|
||||
|
||||
@ApiModelProperty(name = "取消签收删除核销IdList")
|
||||
List<Long> cancelDelVerificationIds;
|
||||
|
||||
@ApiModelProperty(name = "运单ids")
|
||||
List<Long> waybillIds;
|
||||
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.domain.entity.Verification;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title WaybillSignFinanceDTO
|
||||
* @description: TODO
|
||||
* @date 2023/11/9 13:12
|
||||
**/
|
||||
@Data
|
||||
public class WaybillSignFinanceDTO {
|
||||
@ApiModelProperty("服务费账单")
|
||||
private ServiceBillDO serviceBillDO;
|
||||
|
||||
@ApiModelProperty("网点费用账单")
|
||||
private BranchFreightBillDO branchFreightBillDO;
|
||||
|
||||
@ApiModelProperty(name = "收入核销对象")
|
||||
List<VerificationDto> verificationList;
|
||||
}
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package com.mhd.common.core.domain.dto;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* WebSocketDTO
|
||||
*/
|
||||
@Data
|
||||
public class WebSocketDTO {
|
||||
|
||||
@ApiModelProperty("通知人")
|
||||
private String userId;
|
||||
|
||||
@ApiModelProperty("通知人")
|
||||
private List<String> userIds;
|
||||
|
||||
@ApiModelProperty("消息类型")
|
||||
private String type;
|
||||
|
||||
@ApiModelProperty("消息内容")
|
||||
private Object data;
|
||||
|
||||
@ApiModelProperty("是否推送事项列表数据 1-推送")
|
||||
private String listFlag;
|
||||
|
||||
@Excel(name = "组织id")
|
||||
@ApiModelProperty(name = "组织id")
|
||||
private Long organizationId;
|
||||
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title TmsCancelSignDTO
|
||||
* @description: 取消签收
|
||||
* @date 2024/2/3 13:23
|
||||
**/
|
||||
@Data
|
||||
public class CancelSignDTO {
|
||||
|
||||
/**
|
||||
* 订单类别 0-网络货运 1- 零担城配
|
||||
*/
|
||||
private String category;
|
||||
|
||||
/**
|
||||
* 三方订单号
|
||||
*/
|
||||
private List<String> orderNumbers;
|
||||
|
||||
/**
|
||||
* 取消签收备注
|
||||
*/
|
||||
private String cancelRemark;
|
||||
}
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title DriverRobSingleDTO
|
||||
* @description: 司机抢单
|
||||
* @date 2024/2/3 11:39
|
||||
**/
|
||||
@Data
|
||||
public class DriverRobSingleDTO {
|
||||
|
||||
|
||||
/**
|
||||
* 运单号
|
||||
*/
|
||||
private String workCode;
|
||||
|
||||
/**
|
||||
* 承运商编码
|
||||
*/
|
||||
private String carrierCode;
|
||||
|
||||
/**
|
||||
* 司机手机号
|
||||
*/
|
||||
private String mainDriverPhone;
|
||||
|
||||
/**
|
||||
* 车牌号
|
||||
*/
|
||||
private String zCarCode;
|
||||
|
||||
/**
|
||||
* 抢单时间 格式:yyyy-MM-dd HH:mm:ss
|
||||
*/
|
||||
private String orderGrabbingTime;
|
||||
|
||||
/**
|
||||
* 运输方式类型
|
||||
*/
|
||||
private Integer transportType = 1;
|
||||
|
||||
/**
|
||||
* 运输方式编码 默认10汽运
|
||||
*/
|
||||
private String transportTypeCode = "10汽运";
|
||||
}
|
||||
+56
@@ -0,0 +1,56 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title FreightPaymentDTO
|
||||
* @description: 运费支付
|
||||
* @date 2024/2/3 13:25
|
||||
**/
|
||||
@Data
|
||||
public class FreightPaymentDTO {
|
||||
|
||||
/**
|
||||
* 派车单(DP单号)
|
||||
*/
|
||||
private String schedulingBillCode;
|
||||
|
||||
/**
|
||||
* 支付金额
|
||||
*/
|
||||
private BigDecimal payAmount;
|
||||
|
||||
/**
|
||||
* 应付金额
|
||||
*/
|
||||
private BigDecimal yfPayAmount;
|
||||
|
||||
/**
|
||||
* 单价
|
||||
*/
|
||||
private BigDecimal unitPrice;
|
||||
|
||||
/**
|
||||
* 支付时间,格式:yyyy-MM-dd HH:mm:ss
|
||||
*/
|
||||
private String payTime;
|
||||
|
||||
/**
|
||||
* 支付人姓名
|
||||
*/
|
||||
private String payName;
|
||||
|
||||
/**
|
||||
* 支付备注
|
||||
*/
|
||||
private String payRemark;
|
||||
|
||||
/**
|
||||
* 附件
|
||||
*/
|
||||
private List<String> operFiles;
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import com.mhd.common.core.utils.validate.AddGroup;
|
||||
import com.mhd.common.core.utils.validate.DelGroup;
|
||||
import com.mhd.common.core.utils.validate.EditGroup;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Pattern;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import static com.mhd.common.core.enums.OpenDataSourcesEnum.TMS;
|
||||
|
||||
/**
|
||||
* 对外开放接口-司机入参
|
||||
*/
|
||||
@Data
|
||||
public class OpenDriverDto {
|
||||
|
||||
@NotBlank(message = "承运商编码必填!", groups = {AddGroup.class, EditGroup.class, DelGroup.class})
|
||||
@ApiModelProperty(name = "承运商编码")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@NotBlank(message = "司机编码(司机手机号)", groups = {AddGroup.class, EditGroup.class, DelGroup.class})
|
||||
@Pattern(regexp = "^1[3456789]\\d{9}$", message = "司机编码(司机手机号)格式不正确", groups = {AddGroup.class, EditGroup.class})
|
||||
@ApiModelProperty(name = "司机编码(司机手机号)")
|
||||
private String driverCode;
|
||||
|
||||
@NotBlank(message = "司机名称", groups = {AddGroup.class, EditGroup.class})
|
||||
@ApiModelProperty(name = "司机名称")
|
||||
private String userName;
|
||||
|
||||
@NotBlank(message = "身份证号", groups = {AddGroup.class, EditGroup.class})
|
||||
@Pattern(regexp = "^[1-9]\\d{5}(\\d{4})(0[1-9]|1[0-2])([0-2][1-9]|[1-3]\\d|4[0-6]|5[0-2])(\\d{3})(\\d|[Xx])$", message = "身份证号格式不正确", groups = {AddGroup.class, EditGroup.class})
|
||||
@ApiModelProperty(name = "身份证号")
|
||||
private String userIdcardNumber;
|
||||
|
||||
//==========================以下字段为落库使用============================
|
||||
|
||||
@ApiModelProperty(value = "数据来源(1-数字物流 2-TMS)")
|
||||
private Integer dataSources = TMS.getCode();
|
||||
|
||||
@ApiModelProperty(name = "归属组织id")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "最高组织id")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty(name = "归属组织name")
|
||||
private String organizationName;
|
||||
}
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import com.mhd.common.core.utils.validate.AddGroup;
|
||||
import com.mhd.common.core.utils.validate.DelGroup;
|
||||
import com.mhd.common.core.utils.validate.EditGroup;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import static com.mhd.common.core.enums.OpenDataSourcesEnum.TMS;
|
||||
|
||||
/**
|
||||
* 对外开放接口-司机入参
|
||||
*/
|
||||
@Data
|
||||
public class OpenDriverEnterpriseDto {
|
||||
|
||||
@NotBlank(message = "承运商编码必填!", groups = {AddGroup.class, EditGroup.class})
|
||||
@ApiModelProperty(name = "承运商编码")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@NotBlank(message = "企业名称", groups = {AddGroup.class, EditGroup.class})
|
||||
@ApiModelProperty(name = "企业名称")
|
||||
private String driverEnterpriseName;
|
||||
|
||||
//==========================以下字段为落库使用============================
|
||||
|
||||
@ApiModelProperty(value = "数据来源(1-数字物流 2-TMS)")
|
||||
private Integer dataSources = TMS.getCode();
|
||||
|
||||
@ApiModelProperty(name = "归属组织id")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "最高组织id")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty(name = "归属组织name")
|
||||
private String organizationName;
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 对外开放接口-司机请求入参
|
||||
*/
|
||||
@Data
|
||||
public class OpenTmsDeleteUserDto {
|
||||
|
||||
@ApiModelProperty(name = "承运商编码")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@ApiModelProperty(name = "司机编码(司机手机号)")
|
||||
private String driveCode;
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 对外开放接口-车辆入参
|
||||
*/
|
||||
@Data
|
||||
public class OpenTmsDeleteVehicleDto {
|
||||
|
||||
@ApiModelProperty(name = "承运商编码")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@ApiModelProperty(name = "车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import com.mhd.common.core.utils.validate.AddGroup;
|
||||
import com.mhd.common.core.utils.validate.DelGroup;
|
||||
import com.mhd.common.core.utils.validate.EditGroup;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.Pattern;
|
||||
|
||||
import static com.mhd.common.core.enums.OpenDataSourcesEnum.TMS;
|
||||
|
||||
/**
|
||||
* 对外开放接口-司机请求入参
|
||||
*/
|
||||
@Data
|
||||
public class OpenTmsDriverDto {
|
||||
|
||||
@ApiModelProperty(name = "承运商编码")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@ApiModelProperty(name = "司机编码(司机手机号)")
|
||||
private String driverCode;
|
||||
|
||||
@ApiModelProperty(name = "司机名称")
|
||||
private String userName;
|
||||
|
||||
@ApiModelProperty(name = "身份证号")
|
||||
private String userIdcardNumber;
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import com.mhd.common.core.utils.validate.AddGroup;
|
||||
import com.mhd.common.core.utils.validate.EditGroup;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import static com.mhd.common.core.enums.OpenDataSourcesEnum.TMS;
|
||||
|
||||
/**
|
||||
* 对外开放接口-司机请求入参
|
||||
*/
|
||||
@Data
|
||||
public class OpenTmsDriverEnterpriseDto {
|
||||
|
||||
@ApiModelProperty(name = "承运商编码")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@ApiModelProperty(name = "企业名称")
|
||||
private String driverEnterpriseName;
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import com.mhd.common.core.utils.validate.AddGroup;
|
||||
import com.mhd.common.core.utils.validate.DelGroup;
|
||||
import com.mhd.common.core.utils.validate.EditGroup;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Pattern;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import static com.mhd.common.core.enums.OpenDataSourcesEnum.TMS;
|
||||
|
||||
/**
|
||||
* 对外开放接口-车辆入参
|
||||
*/
|
||||
@Data
|
||||
public class OpenTmsVehicleDto {
|
||||
|
||||
@ApiModelProperty(name = "承运商编码")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@ApiModelProperty(name = "车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
|
||||
@ApiModelProperty(name = "车辆系列 默认1")
|
||||
private Integer carSeries = 1;
|
||||
|
||||
@ApiModelProperty(name = "核定载质量(千克)")
|
||||
private BigDecimal vehicleApprovedLoadQuantity;
|
||||
|
||||
@ApiModelProperty(name = "发动机号码")
|
||||
private String vehicleEngineNumber;
|
||||
}
|
||||
+59
@@ -0,0 +1,59 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import com.mhd.common.core.utils.validate.AddGroup;
|
||||
import com.mhd.common.core.utils.validate.DelGroup;
|
||||
import com.mhd.common.core.utils.validate.EditGroup;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import javax.validation.constraints.DecimalMax;
|
||||
import javax.validation.constraints.Max;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Pattern;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import static com.mhd.common.core.enums.OpenDataSourcesEnum.TMS;
|
||||
|
||||
/**
|
||||
* 对外开放接口-车辆入参
|
||||
*/
|
||||
@Data
|
||||
public class OpenVehicleDto {
|
||||
|
||||
@NotBlank(message = "承运商编码必填!", groups = {AddGroup.class, EditGroup.class, DelGroup.class})
|
||||
@ApiModelProperty(name = "承运商编码")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@NotBlank(message = "车牌号必填!", groups = {AddGroup.class, EditGroup.class, DelGroup.class})
|
||||
// @Pattern(regexp = "^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{5}$|^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[DF]{1}[A-Z0-9]{5}$", message = "车牌号格式不正确", groups = {AddGroup.class, EditGroup.class, DelGroup.class})
|
||||
@Pattern(regexp = "^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$", message = "车牌号格式不正确", groups = {AddGroup.class, EditGroup.class, DelGroup.class})
|
||||
@ApiModelProperty(name = "车牌号")
|
||||
private String vehicleLicensePlateNumber;
|
||||
|
||||
@NotNull(message = "核定载质量必填!", groups = {AddGroup.class, EditGroup.class})
|
||||
@DecimalMax(value = "99000", message = "核定载质量不能超过99000千克", groups = {AddGroup.class, EditGroup.class})
|
||||
@ApiModelProperty(name = "核定载质量(千克)")
|
||||
private BigDecimal vehicleApprovedLoadQuantity;
|
||||
|
||||
@NotBlank(message = "发动机号码必填!", groups = {AddGroup.class, EditGroup.class})
|
||||
@ApiModelProperty(name = "发动机号码")
|
||||
private String vehicleEngineNumber;
|
||||
|
||||
//==========================以下字段为落库使用============================
|
||||
|
||||
@ApiModelProperty(value = "数据来源(1-数字物流 2-TMS)")
|
||||
private Integer dataSources = TMS.getCode();
|
||||
|
||||
@ApiModelProperty(name = "归属组织id")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "最高组织id")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty(name = "归属组织name")
|
||||
private String organizationName;
|
||||
}
|
||||
+83
@@ -0,0 +1,83 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title TmsReceiptSignDTO
|
||||
* @description: 回单签收
|
||||
* @date 2024/2/3 13:21
|
||||
**/
|
||||
@Data
|
||||
public class ReceiptSignDTO {
|
||||
|
||||
/**
|
||||
* 订单类别0-网络货运 1- 零担城配
|
||||
*/
|
||||
private String category;
|
||||
|
||||
/**
|
||||
* 三方订单号
|
||||
*/
|
||||
private String orderNumber;
|
||||
|
||||
/**
|
||||
* 签收时间
|
||||
*/
|
||||
private String signTime;
|
||||
|
||||
/**
|
||||
* 回单号
|
||||
*/
|
||||
private String receiptNumber;
|
||||
|
||||
/**
|
||||
* 回单备注
|
||||
*/
|
||||
private String receiptRemark;
|
||||
|
||||
/**
|
||||
* 回单附件
|
||||
*/
|
||||
private List<String> receiptImage;
|
||||
|
||||
/**
|
||||
* 货损货差图片
|
||||
*/
|
||||
private List<String> goodImage;
|
||||
|
||||
/**
|
||||
* 车辆图片
|
||||
*/
|
||||
private List<String> vehicleImage;
|
||||
|
||||
/**
|
||||
* 回单签收
|
||||
*/
|
||||
private List<IssueNoteList> WorkgoodsinfoList;
|
||||
|
||||
/**
|
||||
* 出库单信息
|
||||
*/
|
||||
@Data
|
||||
public static class IssueNoteList {
|
||||
|
||||
/**
|
||||
* 货物名称id
|
||||
*/
|
||||
private String goodsNameId;
|
||||
|
||||
/**
|
||||
* 货损数量
|
||||
*/
|
||||
private BigDecimal DamageNumber;
|
||||
/**
|
||||
* 货差数量
|
||||
*/
|
||||
private BigDecimal DifferenceNumber;
|
||||
|
||||
}
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import com.mhd.common.core.domain.entity.DecryptRequestDO;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title TmsBasicParamsDTO
|
||||
* @description: TODO
|
||||
* @date 2024/2/3 9:12
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class ReqParamsDTO extends DecryptRequestDO {
|
||||
|
||||
/**
|
||||
* 接口名称
|
||||
*/
|
||||
private String serverName;
|
||||
|
||||
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title TmsBasicParamsDTO
|
||||
* @description: TODO
|
||||
* @date 2024/2/3 9:12
|
||||
**/
|
||||
@Data
|
||||
public class RespParamsDTO {
|
||||
|
||||
/**
|
||||
* 状态码 200-成功 其他-失败
|
||||
*/
|
||||
private Integer code;
|
||||
|
||||
/**
|
||||
* 响应消息
|
||||
*/
|
||||
private String msg;
|
||||
|
||||
/**
|
||||
* 响应信息
|
||||
*/
|
||||
private Object data;
|
||||
|
||||
}
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author ZhouGY
|
||||
* @title StatusFeedbackDTO
|
||||
* @description: 派车单回传
|
||||
* @date 2024/2/3 13:17
|
||||
**/
|
||||
@Data
|
||||
public class StatusFeedbackDTO {
|
||||
|
||||
/**
|
||||
* 派车单(DP单号)
|
||||
*/
|
||||
private String schedulingBillCode;
|
||||
|
||||
/**
|
||||
* 操作类型 1发车 2到达
|
||||
*/
|
||||
private Integer operType;
|
||||
|
||||
/**
|
||||
* 操作时间,格式:yyyy-MM-dd HH:mm:ss
|
||||
*/
|
||||
private String operTime;
|
||||
|
||||
/**
|
||||
* 操作人姓名
|
||||
*/
|
||||
private String operName;
|
||||
|
||||
/**
|
||||
* 经度
|
||||
*/
|
||||
private String longitude;
|
||||
|
||||
/**
|
||||
* 纬度
|
||||
*/
|
||||
private String latitude;
|
||||
|
||||
/**
|
||||
* 操作地址
|
||||
*/
|
||||
private String operAddress;
|
||||
|
||||
/**
|
||||
* 操作附件 Base64字符串
|
||||
*/
|
||||
private List<String> operFiles;
|
||||
}
|
||||
+157
@@ -0,0 +1,157 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class StorageLocation {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("库位id")
|
||||
private Long storageLocationId;
|
||||
|
||||
@ApiModelProperty("组织表ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty("仓库id")
|
||||
private Long warehouseId;
|
||||
|
||||
@ApiModelProperty("仓库编码")
|
||||
@Excel(name = "仓库编码")
|
||||
private String warehouseCode;
|
||||
|
||||
@ApiModelProperty("仓库名称")
|
||||
@Excel(name = "仓库名称")
|
||||
private String warehouseName;
|
||||
|
||||
@ApiModelProperty("库区id")
|
||||
private Long storageSectionId;
|
||||
|
||||
@ApiModelProperty("库区编码")
|
||||
private String storageCode;
|
||||
|
||||
@ApiModelProperty("库区名称")
|
||||
private String storageName;
|
||||
|
||||
@ApiModelProperty("库位编码")
|
||||
private String storageLocationCode;
|
||||
|
||||
@ApiModelProperty("库位名称")
|
||||
private String storageLocationName;
|
||||
|
||||
@ApiModelProperty("库区分类编码 数据字典")
|
||||
private String storageLocationClassify;
|
||||
|
||||
@ApiModelProperty("库区分类名称 数据字典")
|
||||
private String storageLocationClassifyName;
|
||||
|
||||
@ApiModelProperty("库区种类编码 数据字典")
|
||||
private String storageLocationType;
|
||||
|
||||
@ApiModelProperty("库区种类名称 数据字典")
|
||||
private String storageLocationTypeName;
|
||||
|
||||
@ApiModelProperty("混放策略编码 数据字典")
|
||||
private String mixingStrategy;
|
||||
|
||||
@ApiModelProperty("混放策略名称 数据字典")
|
||||
private String mixingStrategyName;
|
||||
|
||||
@ApiModelProperty("库位组id")
|
||||
private Long storageLocationGroupId;
|
||||
|
||||
@ApiModelProperty("库位组编码")
|
||||
private String storageLocationGroupCode;
|
||||
|
||||
@ApiModelProperty("库位组名称 数据字典")
|
||||
private String storageLocationGroupName;
|
||||
|
||||
@ApiModelProperty("重量限制 单位:千克")
|
||||
private BigDecimal weightLimit;
|
||||
|
||||
@ApiModelProperty("体积限制 单位:立方米")
|
||||
private BigDecimal volumeLimit;
|
||||
|
||||
@ApiModelProperty("库位大小 长*宽*高 单位:米")
|
||||
private String locationSize;
|
||||
|
||||
@ApiModelProperty("库位大小-长 单位:米")
|
||||
private BigDecimal locationLength;
|
||||
|
||||
@ApiModelProperty("库位大小-宽 单位:米")
|
||||
private BigDecimal locationWidth;
|
||||
|
||||
@ApiModelProperty("库位大小-高 单位:米")
|
||||
private BigDecimal locationHeight;
|
||||
|
||||
@ApiModelProperty("坐标-区-列-排-层")
|
||||
private String coordinate;
|
||||
|
||||
@ApiModelProperty("坐标-区")
|
||||
private String coordinateArea;
|
||||
|
||||
@ApiModelProperty("坐标-列")
|
||||
private String coordinateColumn;
|
||||
|
||||
@ApiModelProperty("坐标-排")
|
||||
private String coordinateRow;
|
||||
|
||||
@ApiModelProperty("坐标-层")
|
||||
private String coordinateLayer;
|
||||
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
@ApiModelProperty("库位状态:1-空 2-半满 3-全满")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty("启用状态: 1-启用 2-停用")
|
||||
private Integer openingUp;
|
||||
|
||||
@ApiModelProperty("是否作废: 1-否 2-是")
|
||||
private Integer nullify;
|
||||
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
|
||||
@ApiModelProperty("坐标-区 起始")
|
||||
private String coordinateAreaStart;
|
||||
|
||||
@ApiModelProperty("坐标-列 起始")
|
||||
private String coordinateColumnStart;
|
||||
|
||||
@ApiModelProperty("坐标-排 起始")
|
||||
private String coordinateRowStart;
|
||||
|
||||
@ApiModelProperty("坐标-层 起始")
|
||||
private String coordinateLayerStart;
|
||||
|
||||
@ApiModelProperty("坐标-区 终止")
|
||||
private String coordinateAreaEnd;
|
||||
|
||||
@ApiModelProperty("坐标-列 终止")
|
||||
private String coordinateColumnEnd;
|
||||
|
||||
@ApiModelProperty("坐标-排 终止")
|
||||
private String coordinateRowEnd;
|
||||
|
||||
@ApiModelProperty("坐标-层 终止")
|
||||
private String coordinateLayerEnd;
|
||||
|
||||
}
|
||||
+81
@@ -0,0 +1,81 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* 开放接口日志记录对象 open_api_log
|
||||
*
|
||||
* @author gen
|
||||
* @date 2023-10-31
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class SystemOpenApiLogDTO extends BaseVOEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("开放接口日志主键")
|
||||
private Long openApiLogId;
|
||||
|
||||
@ApiModelProperty("一级组织表ID")
|
||||
@Excel(name = "一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty("组织表ID")
|
||||
@Excel(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("组织名称")
|
||||
@Excel(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("服务编码")
|
||||
@Excel(name = "服务编码")
|
||||
private String serviceCode;
|
||||
|
||||
@ApiModelProperty("服务名称")
|
||||
@Excel(name = "服务名称")
|
||||
private String serviceName;
|
||||
|
||||
@ApiModelProperty("模块标题")
|
||||
@Excel(name = "模块标题")
|
||||
private String title;
|
||||
|
||||
@ApiModelProperty("方法名称")
|
||||
@Excel(name = "方法名称")
|
||||
private String method;
|
||||
|
||||
@ApiModelProperty("请求方式")
|
||||
@Excel(name = "请求方式")
|
||||
private String requestMethod;
|
||||
|
||||
@ApiModelProperty("请求URL")
|
||||
@Excel(name = "请求URL")
|
||||
private String operUrl;
|
||||
|
||||
@ApiModelProperty("主机地址")
|
||||
@Excel(name = "主机地址")
|
||||
private String operIp;
|
||||
|
||||
@ApiModelProperty("请求参数")
|
||||
@Excel(name = "请求参数")
|
||||
private String operParam;
|
||||
|
||||
@ApiModelProperty("返回参数")
|
||||
@Excel(name = "返回参数")
|
||||
private String jsonResult;
|
||||
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 三方服务请求日志对象 third_party_service_req_log
|
||||
*
|
||||
* @author gen
|
||||
* @date 2024-02-16
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class ThirdPartyServiceReqLogDTO extends BaseVOEntity{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty("三方服务请求日志主键")
|
||||
private Long thiParSerReqLogId;
|
||||
|
||||
@ApiModelProperty("组织表ID")
|
||||
@Excel(name = "组织表ID")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty("组织名称")
|
||||
@Excel(name = "组织名称")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("一级组织表ID")
|
||||
@Excel(name = "一级组织表ID")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty("运单/订单来源")
|
||||
@Excel(name = "运单/订单来源")
|
||||
private String waybillSource;
|
||||
|
||||
@ApiModelProperty("运单/订单来源name")
|
||||
@Excel(name = "运单/订单来源name")
|
||||
private String waybillSourceName;
|
||||
|
||||
@ApiModelProperty("接口编码")
|
||||
@Excel(name = "接口编码")
|
||||
private String interfaceCode;
|
||||
|
||||
@ApiModelProperty("接口名称")
|
||||
@Excel(name = "接口名称")
|
||||
private String interfaceName;
|
||||
|
||||
@ApiModelProperty("请求URL")
|
||||
@Excel(name = "请求URL")
|
||||
private String operUrl;
|
||||
|
||||
@ApiModelProperty("请求参数")
|
||||
@Excel(name = "请求参数")
|
||||
private String operParam;
|
||||
|
||||
@ApiModelProperty("返回参数")
|
||||
@Excel(name = "返回参数")
|
||||
private String jsonResult;
|
||||
|
||||
@ApiModelProperty("执行结果:0-处理中 1-失败 2-成功")
|
||||
@Excel(name = "执行结果:0-处理中 1-失败 2-成功")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty("关联标识")
|
||||
@Excel(name = "关联标识")
|
||||
private String orderNumber;
|
||||
|
||||
@ApiModelProperty(name = "组织ID集合")
|
||||
private List<Long> organizationIdList;
|
||||
|
||||
@ApiModelProperty(name = "权限菜单ID")
|
||||
private Long permissionMenuId;
|
||||
}
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static com.mhd.common.core.enums.OpenDataSourcesEnum.TMS;
|
||||
|
||||
/**
|
||||
* 对外开放接口-司机入参
|
||||
*/
|
||||
@Data
|
||||
public class WlhyOpenDriverDto {
|
||||
|
||||
@NotBlank(message = "承运商编码必填!")
|
||||
@ApiModelProperty(name = "承运商编码")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@NotBlank(message = "司机编码(司机手机号)")
|
||||
@ApiModelProperty(name = "司机编码(司机手机号)")
|
||||
private String driverCode;
|
||||
|
||||
@NotBlank(message = "司机名称")
|
||||
@ApiModelProperty(name = "司机名称")
|
||||
private String userName;
|
||||
|
||||
@NotBlank(message = "身份证号")
|
||||
@ApiModelProperty(name = "身份证号")
|
||||
private String userIdcardNumber;
|
||||
|
||||
//==========================以下字段为落库使用============================
|
||||
|
||||
@ApiModelProperty(value = "数据来源(1-数字物流 2-TMS)")
|
||||
private Integer dataSources = TMS.getCode();
|
||||
|
||||
@ApiModelProperty(name = "归属组织id")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "最高组织id")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty(name = "归属组织name")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty(value = "操作人")
|
||||
private Long operator;
|
||||
|
||||
@ApiModelProperty(name = "操作人姓名")
|
||||
private String operatorName;
|
||||
|
||||
@ApiModelProperty("数字物流平台用户ID")
|
||||
private Long szwlUserId;
|
||||
|
||||
@ApiModelProperty(name = "角色id集合")
|
||||
private List<String> roleIds;
|
||||
|
||||
@ApiModelProperty(name = "角色code集合")
|
||||
private List<String> roleCodes;
|
||||
|
||||
@ApiModelProperty(name = "角色名称集合")
|
||||
private List<String> roleNames;
|
||||
}
|
||||
+57
@@ -0,0 +1,57 @@
|
||||
package com.mhd.common.core.domain.dto.open;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static com.mhd.common.core.enums.OpenDataSourcesEnum.TMS;
|
||||
|
||||
/**
|
||||
* 对外开放接口-司机入参
|
||||
*/
|
||||
@Data
|
||||
public class WlhyOpenDriverEnterpriseDto {
|
||||
|
||||
@NotBlank(message = "承运商编码必填!")
|
||||
@ApiModelProperty(name = "承运商编码")
|
||||
private String driverEnterpriseCode;
|
||||
|
||||
@NotBlank(message = "企业名称")
|
||||
@ApiModelProperty(name = "企业名称")
|
||||
private String driverEnterpriseName;
|
||||
|
||||
//==========================以下字段为落库使用============================
|
||||
|
||||
@ApiModelProperty(value = "数据来源(1-数字物流 2-TMS)")
|
||||
private Integer dataSources = TMS.getCode();
|
||||
|
||||
@ApiModelProperty(name = "归属组织id")
|
||||
private Long organizationId;
|
||||
|
||||
@ApiModelProperty(name = "最高组织id")
|
||||
private Long topOrganizationId;
|
||||
|
||||
@ApiModelProperty(name = "归属组织name")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty(value = "操作人")
|
||||
private Long operator;
|
||||
|
||||
@ApiModelProperty(name = "操作人姓名")
|
||||
private String operatorName;
|
||||
|
||||
@ApiModelProperty("数字物流平台用户ID")
|
||||
private Long szwlUserId;
|
||||
|
||||
@ApiModelProperty(name = "角色id集合")
|
||||
private List<String> roleIds;
|
||||
|
||||
@ApiModelProperty(name = "角色code集合")
|
||||
private List<String> roleCodes;
|
||||
|
||||
@ApiModelProperty(name = "角色名称集合")
|
||||
private List<String> roleNames;
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package com.mhd.common.core.domain.dto.wlhy;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 车辆维修 修改支付状态
|
||||
*/
|
||||
|
||||
@Data
|
||||
public class EditPaymentStatusDTO {
|
||||
|
||||
@TableId(type = IdType.ID_WORKER_STR)
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty(value = "支付状态 0- 未申请 1-已申请 2-已拒绝 3- 已同意 4-已付款 5-已撤销 ")
|
||||
private Integer paymentStatus;
|
||||
}
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
package com.mhd.common.core.domain.dto.wlhy;
|
||||
|
||||
import com.mhd.common.core.annotation.Excel;
|
||||
import com.mhd.common.core.web.domain.BaseVOEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 还款操作与TMS传递参数
|
||||
*/
|
||||
@Data
|
||||
public class RepaymentTransmitDTO implements Serializable
|
||||
{
|
||||
|
||||
@ApiModelProperty(name = "业务单据号id")
|
||||
private String businessDocumentId;
|
||||
|
||||
@ApiModelProperty(name = "业务单据号")
|
||||
private String businessDocumentNumber;
|
||||
@ApiModelProperty(name = "收入支出类型1.收入2.支出,3挂账")
|
||||
private Integer revenueExpensesType;
|
||||
@ApiModelProperty(name = "金额")
|
||||
private BigDecimal money;
|
||||
|
||||
@ApiModelProperty(value = "还款类型:1-现金,2-油卡")
|
||||
private Integer loanType;
|
||||
@ApiModelProperty("司机id")
|
||||
private String driverId;
|
||||
@ApiModelProperty("司机姓名")
|
||||
private String driverName;
|
||||
|
||||
@ApiModelProperty(value = "操作类型:repayment-还款,delete-作废")
|
||||
private String operationType;
|
||||
|
||||
@ApiModelProperty(value = "创建人id")
|
||||
@Excel(name = "创建人id", width = 15)
|
||||
private Long userId;
|
||||
@ApiModelProperty(value = "创建人")
|
||||
@Excel(name = "创建人", width = 15)
|
||||
private String userName;
|
||||
@ApiModelProperty("一级组织ID")
|
||||
private Long topOrganizationId;
|
||||
@ApiModelProperty("组织表ID")
|
||||
private Long organizationId;
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user