初始化代码

src/main/java/com/aoyang/tms/controller/AppVersionController.java

@@ -1,49 +0,0 @@
-package com.aoyang.tms.controller;
-
-
-import com.alibaba.fastjson.JSON;
-import com.aoyang.tms.controller.param.AppVersionParam;
-import com.aoyang.tms.util.ErrCodeEnum;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import org.springframework.web.bind.annotation.RestController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.*;
-import lombok.extern.slf4j.Slf4j;
-
-import javax.annotation.Resource;
-
-import com.aoyang.tms.entity.AppVersion;
-import com.aoyang.common.result.Result;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.aoyang.common.param.PageParam;
-
-
-/**
- * <p>
- * APP版本管理 控制器
- * </p>
- *
- * @author guoyong
- * @since 2021-04-12
- */
-@RestController
-@Slf4j
-@Api(value = "app_versionCRUD接口")
-@RequestMapping("/tms/app_version")
-public class AppVersionController {
-
-    @ApiOperation(value = "检查版本", notes = "获取最新一条版本信息，客户端进行对比，判断强制更新以及提示更新")
-    @PostMapping("/check_version")
-    public Result check(@RequestBody AppVersionParam appVersionParam) {
-        log.info("获取最新APP版本,/tms/app_version/check_version，参数:{}", JSON.toJSONString(appVersionParam));
-        if (appVersionParam == null || appVersionParam.getOsType() == null) {
-            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
-        }
-        return new Result<>(true);
-    }
-
-}

src/main/java/com/aoyang/tms/entity/AppVersion.java

@@ -1,73 +0,0 @@
-package com.aoyang.tms.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * APP版本管理
- * </p>
- *
- * @author guoyong
- * @since 2021-04-12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("app_version")
-@ApiModel(value = "AppVersion对象", description = "APP版本管理")
-public class AppVersion implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "1.andriod、2.ios")
-    @TableField("os_type")
-    private Integer osType;
-
-    @ApiModelProperty(value = "版本名")
-    @TableField("version_name")
-    private String versionName;
-
-    @ApiModelProperty(value = "支持最小版本号")
-    @TableField("min_version")
-    private Integer minVersion;
-
-    @ApiModelProperty(value = "APK下载地址")
-    @TableField("apk_url")
-    private String apkUrl;
-
-    @ApiModelProperty(value = "文件大小（单位KB）")
-    @TableField("apk_size")
-    private String apkSize;
-
-    @ApiModelProperty(value = "版本更新提示内容")
-    @TableField("updateDescription")
-    private String updateDescription;
-
-    @ApiModelProperty(value = "当前版本备注（运维用）")
-    @TableField("note")
-    private String note;
-
-    @ApiModelProperty(value = "发布时间")
-    @TableField("publish_time")
-    private LocalDateTime publishTime;
-
-
-}

src/main/java/com/aoyang/tms/entity/feignEntity/Org.java

@@ -1,18 +0,0 @@
-package com.aoyang.tms.entity.feignEntity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-/**
- * @author xumingrui
- * @date 2020/7/13 10:07 上午
- * @Description:<描述> TODO
- */
-@Data
-public class Org {
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-    private Integer status;
-    private Integer tradeType;
-    private String orgName;
-}

src/main/java/com/aoyang/tms/entity/feignEntity/OrgAccount.java

@@ -1,96 +0,0 @@
-package com.aoyang.tms.entity.feignEntity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author panenming
- * @since 2020-02-12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("org_account")
-@ApiModel(value = "OrgAccount对象", description = "")
-public class OrgAccount implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    @TableField("org_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-
-    @ApiModelProperty(value = "组织名称(user.org.org_name)")
-    @TableField("org_name")
-    private String orgName;
-
-    @ApiModelProperty(value = "组织简称(user.org.org_short_name)")
-    @TableField("org_short_name")
-    private String orgShortName;
-
-    @ApiModelProperty(value = "账户id（调用API生成）")
-    @TableId(value = "account_id", type = IdType.INPUT)
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long accountId;
-
-    @ApiModelProperty(value = "账户密码")
-    @TableField("account_password")
-    private String accountPassword;
-
-    @ApiModelProperty(value = "账户金额")
-    @TableField("balance")
-    private BigDecimal balance;
-
-    @ApiModelProperty(value = "组织类型（0:奥扬 1:加气企业 2:物流公司 3:卡车经销商）")
-    @TableField("org_type")
-    private Integer orgType;
-
-    @ApiModelProperty(value = "账户类型（0:现金账户）")
-    @TableField("account_type")
-    private Integer accountType;
-
-    @ApiModelProperty(value = "是否可自动划账(1:自动划账)(只对org_type=2有效)")
-    @TableField("auto_account")
-    private Integer autoAccount;
-
-    @ApiModelProperty(value = "创建人id")
-    @TableField("creater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creater;
-
-    @ApiModelProperty(value = "创建人名称")
-    @TableField("creater_name")
-    private String createrName;
-
-    @ApiModelProperty(value = "创建日期时间")
-    @TableField("create_date")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "状态（0：启用 1：停用）")
-    @TableField("status")
-    private Integer status;
-
-    @ApiModelProperty(value = "银行余额")
-    @TableField("bank_balance")
-    private BigDecimal bankBalance;
-
-
-}

src/main/java/com/aoyang/tms/entity/feignEntity/SmsSendLog.java

@@ -1,70 +0,0 @@
-package com.aoyang.tms.entity.feignEntity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
-    * 
-    * </p>
- *
- * @author panenming
- * @since 2020-03-05
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("sms_send_log")
-@ApiModel(value="SmsSendLog对象", description="")
-public class SmsSendLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long id;
-
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    @TableField("org_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "用户id(user.user.user_id)")
-    @TableField("user_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long userId;
-
-    @ApiModelProperty(value = "哪一端")
-    @TableField("client_id")
-    private String clientId;
-
-    @ApiModelProperty(value = "0.身份验证1.登录确认2.注册用户3.修改密码 ")
-    @TableField("type")
-    private Integer type;
-
-    @ApiModelProperty(value = "手机号")
-    @TableField("mobile")
-    private String mobile;
-
-    @ApiModelProperty(value = "发送内容")
-    @TableField("content")
-    private String content;
-
-    @ApiModelProperty(value = "发送日期")
-    @TableField("send_time")
-    private LocalDateTime sendTime;
-
-
-}

src/main/java/com/aoyang/tms/entity/feignEntity/TransferOrder.java

@@ -1,45 +0,0 @@
-package com.aoyang.tms.entity.feignEntity;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Setter
-@Getter
-@ToString
-public class TransferOrder {
-
-    private Long orgId;
-
-    private String orgName;
-
-    private Long truckId;
-
-    private String carNumber;
-
-    private BigDecimal amount;
-
-    private Long creater;
-
-    private String createrName;
-
-    private LocalDateTime createDate;
-
-    private String note;
-
-    // 支付渠道
-    private String payChannelId;
-
-    // 不需要填写的参数
-    private Long accountId;
-
-    private BigDecimal balance;
-
-    private Integer type;
-
-    private Long orderId;
-
-}

src/main/java/com/aoyang/tms/entity/feignEntity/TruckAccount.java

@@ -1,114 +0,0 @@
-package com.aoyang.tms.entity.feignEntity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author panenming
- * @since 2020-02-12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("truck_account")
-@ApiModel(value = "TruckAccount对象", description = "")
-public class TruckAccount implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    @TableField("org_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-
-    @ApiModelProperty(value = "交易模式(1经销模式;2直销模式，默认经销模式1)")
-    @TableField("trade_type")
-    private Integer tradeType;
-
-    @ApiModelProperty(value = "组织名称(user.org.org_name)")
-    @TableField("org_name")
-    private String orgName;
-
-    @ApiModelProperty(value = "组织简称")
-    @TableField("org_short_name")
-    private String orgShortName;
-
-    @ApiModelProperty(value = "卡车id")
-    @TableField("truck_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "账户id（调用API生成）")
-    @TableId(value = "account_id", type = IdType.INPUT)
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long accountId;
-
-    @ApiModelProperty(value = "账户密码")
-    @TableField("account_password")
-    private String accountPassword;
-
-    @ApiModelProperty(value = "账户金额")
-    @TableField("balance")
-    private BigDecimal balance;
-
-    @ApiModelProperty(value = "车牌号")
-    @TableField("car_number")
-    private String carNumber;
-
-    @ApiModelProperty(value = "账户类型（0:现金账户）")
-    @TableField("account_type")
-    private Integer accountType;
-
-    @ApiModelProperty(value = "创建人id")
-    @TableField("creater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creater;
-
-    @ApiModelProperty(value = "创建日期时间")
-    @TableField("create_date")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "修改人id")
-    @TableField("updater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long updater;
-
-    @ApiModelProperty(value = "修改日期时间")
-    @TableField("update_date")
-    private LocalDateTime updateDate;
-
-    @ApiModelProperty(value = "创建人姓名")
-    @TableField("creater_name")
-    private String createrName;
-
-
-    @ApiModelProperty(value = "0=自有车辆 1=挂靠车辆")
-    @TableField("linked")
-    private Integer linked;
-
-    @ApiModelProperty(value = "0=账户消费 1=自动圈存")
-    @TableField("auto_account")
-    private Integer autoAccount;
-
-    @ApiModelProperty(value = "状态（0：启用 1：停用）")
-    @TableField("status")
-    private Integer status;
-
-}

src/main/java/com/aoyang/tms/entity/feignEntity/TruckDriverNoteVO.java

@@ -1,75 +0,0 @@
-package com.aoyang.tms.entity.feignEntity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author xumingrui
- * @since 2020-02-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="TruckDriverNote对象", description="")
-public class TruckDriverNoteVO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long id;
-
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    @TableField("org_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "卡车id")
-    @TableField("truck_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "司机id（user.user.user_id）")
-    @TableField("driver_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverId;
-
-    @ApiModelProperty(value = "司机名称（user.user.user_name）")
-    @TableField("driver_name")
-    private String driverName;
-
-    @ApiModelProperty(value = "创建人id")
-    @TableField("creater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creater;
-
-    @ApiModelProperty(value = "创建人姓名")
-    @TableField("creater_name")
-    private String createrName;
-
-    @ApiModelProperty(value = "创建日期时间")
-    @TableField("create_date")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "绑定标识：未绑定， 默认：1：绑定")
-    @TableField(exist = false)
-    private  Integer flag = 1;
-
-    @ApiModelProperty(value = "备注信息")
-    private String note;
-
-}

src/main/java/com/aoyang/tms/entity/feignEntity/User.java

@@ -1,138 +0,0 @@
-package com.aoyang.tms.entity.feignEntity;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author panenming
- * @since 2020-02-12
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "User对象", description = "")
-public class User implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    @TableField("org_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "用户id（调用API生成）")
-    @TableId(value = "user_id", type = IdType.INPUT)
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long userId;
-
-    @ApiModelProperty(value = "登录用户")
-    @TableField("user_code")
-    private String userCode;
-
-    @ApiModelProperty(value = "用户名")
-    @TableField("user_name")
-    private String userName;
-
-    @ApiModelProperty(value = "密码")
-    @TableField("password")
-    private String password;
-
-    @ApiModelProperty(value = "手机号")
-    @TableField("mobile")
-    private String mobile;
-
-    @ApiModelProperty(value = "身份证编号")
-    @TableField("id_card_no")
-    private String idCardNo;
-
-    @ApiModelProperty(value = "微信绑定信息（openid）")
-    @TableField("open_id")
-    private String openId;
-
-    @ApiModelProperty(value = "状态（0：启用 1：停用）")
-    @TableField("status")
-    private Integer status;
-
-    @ApiModelProperty(value = "用户类型（0 平台用户 1加气企业用户 2物流公司 用户 3卡车经销商用户 4司机 5收银员")
-    @TableField("user_type")
-    private Integer userType;
-
-    @ApiModelProperty(value = "1-平台管理员 2-平台运营人员  3 物流公司管理者 4 司机  5 加气站企业管理者 6 收银员")
-    @TableField("base_role")
-    private String baseRole;
-
-    @ApiModelProperty(value = "创建人id")
-    @TableField("creater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creater;
-
-    @ApiModelProperty(value = "创建日期时间")
-    @TableField("create_date")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "修改人id")
-    @TableField("updater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long updater;
-
-    @ApiModelProperty(value = "修改日期时间")
-    @TableField("update_date")
-    private LocalDateTime updateDate;
-
-    @ApiModelProperty(value = "组织name（user.org.org_name）")
-    @TableField("org_name")
-    private String orgName;
-
-    @ApiModelProperty(value = "创建人Name")
-    @TableField("creater_name")
-    private String createrName;
-
-    @ApiModelProperty(value = "修改人Name")
-    @TableField("updater_name")
-    private String updaterName;
-
-    @ApiModelProperty(value = "绑定标识 0未绑定 1已绑定")
-    @TableField(exist = false)
-    private int flag;
-
-    @ApiModelProperty(value = "车牌号")
-    private String carNumber;
-
-    @ApiModelProperty(value = "卡车id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "关键字")
-    private String keyWord;
-
-    @ApiModelProperty(value = "最后登陆时间")
-    private String lastLoginDate;
-
-    public User() {
-        super();
-    }
-
-    public User(Long userId) {
-        this.userId = userId;
-    }
-
-    public User(String mobile) {
-        this.mobile = mobile;
-    }
-
-}

src/main/java/com/aoyang/tms/entity/feignEntity/UserRole.java

@@ -1,46 +0,0 @@
-package com.aoyang.tms.entity.feignEntity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author panenming
- * @since 2020-02-12
- */
-@Data
-public class UserRole implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id主键")
-    private Long id;
-
-    @ApiModelProperty(value = "客户端id,司机端，默认为mwxservice")
-    private String clientId="mwxservice";
-
-    @ApiModelProperty(value = "组织id（如果user_id是收银员，则org_id是加气站id，如果user_id是驾驶员，则org_id是org_id）")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "组织名称")
-    private String orgName;
-
-    @ApiModelProperty(value = "操作员id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long userId;
-
-    @ApiModelProperty(value = "角色id")
-    private String roleId="driver";
-
-    @ApiModelProperty(value = "角色名称")
-    private String roleName="司机";
-
-
-}

src/main/java/com/aoyang/tms/entity/feignEntity/WrapperUser.java

@@ -1,57 +0,0 @@
-package com.aoyang.tms.entity.feignEntity;
-
-import java.io.Serializable;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author panenming
- * @since 2020-02-12
- */
-@Data
-@ApiModel(value = "User对象")
-public class WrapperUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    private Long orgId;
-
-    @ApiModelProperty(value = "用户id（调用API生成）")
-    private Long userId;
-
-    @ApiModelProperty(value = "用户名")
-    private String userName;
-
-    @ApiModelProperty(value = "手机号")
-    private String mobile;
-
-    @ApiModelProperty(value = "关键字查询")
-    private String keyWord;
-
-    @ApiModelProperty(value = "用户类型（0 平台用户 1加气企业用户 2物流公司 用户 3卡车经销商用户 4司机 5收银员")
-    private Integer userType;
-
-    @ApiModelProperty(value = "1-平台管理员 2-平台运营人员  3 物流公司管理者 4 司机  5 加气站企业管理者 6 收银员")
-    private String baseRole;
-
-    @ApiModelProperty(value = "组织name（user.org.org_name）")
-    @TableField("org_name")
-    private String orgName;
-
-    @ApiModelProperty(value = "排除掉的用户id")
-    private List<Long> excludeList;
-
-    @ApiModelProperty(value = "已选标识")
-    private Integer flag;
-
-}

src/main/java/com/aoyang/tms/entity/vo/TruckDriverTransferVO.java

@@ -1,64 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import com.aoyang.tms.util.validUtil.Insert;
-import com.aoyang.tms.util.validUtil.Query;
-import com.aoyang.tms.util.validUtil.Update;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
-/**
- * @author mahuan
- * @since
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="TruckDriver转移对象", description="")
-public class TruckDriverTransferVO {
-    private static final long serialVersionUID = 1024L;
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "组织名称(user.org.org_name)")
-    private String orgName;
-    @ApiModelProperty(value = "卡车id（调用API生成）")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "车牌号")
-    @NotBlank(message = "卡车牌号不允许为空")
-    @Size(max = 10, message = "卡车车牌号长度不能超过10个字符", groups = {Insert.class, Query.class})
-    @Pattern(regexp = "^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(?:(?![A-Z]{4})[A-Z0-9]){4}[A-Z0-9挂学警港澳]{1}$",
-            message = "卡车车牌号格式错误", groups = {Insert.class})
-    private String carNumber;
-
-    @ApiModelProperty(value = "0=自有车辆 1=挂靠车辆")
-
-    @NotNull(message = "卡车类型不允许空", groups = {Insert.class, Update.class})
-    private Integer linked;
-
-    @ApiModelProperty(value = "0=账户消费 1=自动圈存")
-    private Integer autoAccount;
-
-    @ApiModelProperty(value = "司机id（user.user.user_id）")
-    @NotNull(message = "司机id 不能为空")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverId;
-
-    @ApiModelProperty(value = "司机名称（user.user.user_name）")
-    private String driverName;
-
-    @ApiModelProperty(value = "手机号")
-    private String mobile;
-}

src/main/java/com/aoyang/tms/entity/vo/TruckDriverVO.java

@@ -1,83 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Map;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author xumingrui
- * @since 2020-02-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("truck_driver")
-@ApiModel(value="TruckDriver对象", description="")
-public class TruckDriverVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id主键")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    @TableField("org_id")
-    @NotNull(message = "组织id 不能为空")
-    @JsonFormat(shape = Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "卡车id")
-    @TableField("truck_id")
-    @NotNull(message = "卡车id 不能为空")
-    @JsonFormat(shape = Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "司机id（user.user.user_id）")
-    @TableField("driver_id")
-    @NotNull(message = "司机id 不能为空")
-    @JsonFormat(shape = Shape.STRING)
-    private Long driverId;
-
-    @ApiModelProperty(value = "司机名称（user.user.user_name）")
-    @TableField("driver_name")
-    private String driverName;
-
-    @ApiModelProperty(value = "创建人id")
-    @TableField("creater")
-    @JsonFormat(shape = Shape.STRING)
-    @NotNull(message = "创建人id 不能为空")
-    private Long creater;
-
-    @ApiModelProperty(value = "创建日期时间")
-    @TableField("create_date")
-    private LocalDateTime createDate;
-
-
-    @ApiModelProperty(value = "卡车信息")
-    @TableField(exist = false)
-    private Map<String,Object> truck;
-
-    @ApiModelProperty(value = "司机信息")
-    @TableField(exist = false)
-    private Map<String,Object>  driver;
-
-
-}

src/main/java/com/aoyang/tms/entity/vo/TruckVO.java

@@ -1,216 +0,0 @@
-package com.aoyang.tms.entity.vo;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import javax.validation.constraints.NotNull;
-
-import com.aoyang.tms.entity.feignEntity.User;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author xumingrui
- * @since 2020-02-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("truck")
-@ApiModel(value = "Truck对象", description = "")
-public class TruckVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "卡车id（调用API生成）")
-    @TableId(value = "truck_id", type = IdType.INPUT)
-    @JsonFormat(shape = Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "交易模式(1经销模式;2直销模式，默认经销模式1)")
-    @TableField("trade_type")
-    private Integer tradeType;
-
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    @TableField("org_id")
-    @NotNull(message = "组织id不能为空")
-    @JsonFormat(shape = Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "组织名称(user.org.org_name)")
-    @TableField("org_name")
-    @NotNull(message = "组织名称不能为空")
-    private String orgName;
-
-    @ApiModelProperty(value = "卡车名称")
-    @TableField("truck_name")
-    private String truckName;
-
-    @ApiModelProperty(value = "车牌号")
-    @TableField("car_number")
-    private String carNumber;
-
-    @ApiModelProperty(value = "购车日期")
-    @TableField("purchase_date")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime purchaseDate;
-
-    @ApiModelProperty(value = "颜色")
-    @TableField("color")
-    private String color;
-
-    @ApiModelProperty(value = "载重量（吨）")
-    @TableField("dead_weight")
-    private BigDecimal deadWeight;
-
-    @ApiModelProperty(value = "储气罐容量（升）")
-    @TableField("capacity")
-    private BigDecimal capacity;
-
-    @ApiModelProperty(value = "生产厂家")
-    @TableField("manufacturer")
-    private String manufacturer;
-
-    @ApiModelProperty(value = "状态（0：启用 1：停用）")
-    @TableField("status")
-    private Integer status;
-
-    @ApiModelProperty(value = "创建人id")
-    @TableField("creater")
-    @JsonFormat(shape = Shape.STRING)
-    private Long creater;
-
-    @ApiModelProperty(value = "创建日期时间")
-    @TableField("create_date")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "修改人id")
-    @JsonFormat(shape = Shape.STRING)
-    @TableField("updater")
-    private Long updater;
-
-    @ApiModelProperty(value = "修改日期时间")
-    @TableField("update_date")
-    private LocalDateTime updateDate;
-
-    @ApiModelProperty(value = "司机列表")
-    @TableField(exist = false)
-    private List<User> driverList;
-
-    @ApiModelProperty(value = "车辆账户余额")
-    @TableField(exist = false)
-    private BigDecimal balance;
-
-    @ApiModelProperty(value = "组织账户余额")
-    @TableField(exist = false)
-    private BigDecimal orgBalance;
-
-    @ApiModelProperty(value = "车架号")
-    @TableField("frame_number")
-    private String frameNumber;
-
-    @ApiModelProperty(value = "挂车牌号")
-    @TableField("trailer_number")
-    private String trailerNumber;
-
-    @ApiModelProperty(value = "创建者姓名")
-    @TableField("creater_name")
-    private String createrName;
-
-    @ApiModelProperty(value = "修改者姓名")
-    @TableField("updater_name")
-    private String updaterName;
-
-    @ApiModelProperty(value = "0=自有车辆 1=挂靠车辆")
-    @TableField("linked")
-    private Integer linked;
-
-    @ApiModelProperty(value = "0=账户消费 1=自动圈存")
-    @TableField("auto_account")
-    private Integer autoAccount;
-
-    @ApiModelProperty(value = "车辆类型[行驶证上的车辆类型]")
-    @TableField("type_name")
-    private String typeName;
-
-    @ApiModelProperty(value = "车辆所有人")
-    @TableField("owner")
-    private String owner;
-
-    @ApiModelProperty(value = "住址")
-    @TableField("address")
-    private String address;
-
-    @ApiModelProperty(value = "使用性质")
-    @TableField("use_nature")
-    private String useNature;
-
-    @ApiModelProperty(value = "车辆识别码")
-    @TableField("vehicle_id_code")
-    private String vehicleIdCode;
-
-    @ApiModelProperty(value = "注册日期:yyyy-MM-dd")
-    @TableField("register_date")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    private LocalDate registerDate;
-
-    @ApiModelProperty(value = "发证日期:yyyy-MM-dd")
-    @TableField("issue_date")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    private LocalDate issueDate;
-
-    @ApiModelProperty(value = "档案编号")
-    @TableField("file_no")
-    private String fileNo;
-
-    @ApiModelProperty(value = "能源类型")
-    @TableField("energy_type")
-    private String energyType;
-
-    @ApiModelProperty(value = "行驶证正面图片地址")
-    @TableField("face_url")
-    private String faceUrl;
-
-    @ApiModelProperty(value = "行驶证副页图片地址")
-    @TableField("back_url")
-    private String backUrl;
-
-    @ApiModelProperty(value = "行驶证认证状态：1 待证中 2 已认证 3认证失败")
-    @TableField("auth_status")
-    private Integer authStatus;
-
-    @ApiModelProperty(value = "认证时间")
-    @TableField("auth_date")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime authDate;
-
-    @ApiModelProperty(value = "车辆等级")
-    @TableField("level")
-    private Integer level;
-
-    @ApiModelProperty(value = "车辆组合支付状态（0=启用 1=停用）,默认1")
-    @TableField("com_status")
-    private Integer comStatus;
-
-    @ApiModelProperty(value = "组合支付协议上传状态（0=未上传 1=已上传），默认0")
-    @TableField("com_contract_status")
-    private Integer comContractStatus;
-
-}

src/main/java/com/aoyang/tms/exception/GeneralException.java

@@ -1,49 +0,0 @@
-package com.aoyang.tms.exception;
-
-import lombok.Data;
-
-/**
- * @author zhuangxl
- * @description
- * @since 2021-08-07 15:22
- */
-@Data
-public class GeneralException extends Exception{
-
-    private int code;
-    private String message;
-
-    /**
-     * Constructs a new exception with the specified detail message.  The
-     * cause is not initialized, and may subsequently be initialized by
-     * a call to {@link #initCause}.
-     *
-     * @param message the detail message. The detail message is saved for
-     *                later retrieval by the {@link #getMessage()} method.
-     */
-    public GeneralException(int code, String message) {
-        super(code+":"+message);
-        this.code = code;
-        this.message = message;
-    }
-
-    /**
-     * Constructs a new exception with the specified detail message and
-     * cause.  <p>Note that the detail message associated with
-     * {@code cause} is <i>not</i> automatically incorporated in
-     * this exception's detail message.
-     *
-     * @param message the detail message (which is saved for later retrieval
-     *                by the {@link #getMessage()} method).
-     * @param cause   the cause (which is saved for later retrieval by the
-     *                {@link #getCause()} method).  (A <tt>null</tt> value is
-     *                permitted, and indicates that the cause is nonexistent or
-     *                unknown.)
-     * @since 1.4
-     */
-    public GeneralException(int code, String message, Throwable cause) {
-        super(code+":"+message, cause);
-        this.code = code;
-        this.message = message;
-    }
-}

src/main/java/com/aoyang/tms/feign/MessageFeign.java

@@ -1,26 +0,0 @@
-package com.aoyang.tms.feign;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.entity.feignEntity.SmsSendLog;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-
-/**
- * @author liujiren
- */
-@FeignClient(name = "message")
-public interface MessageFeign {
-    /**
-     * 发送短信通知
-     *
-     * @param smsSendLog 发送内容
-     * @return 成功或失败信息
-     */
-    @PostMapping(value = "/message/notify/send")
-    Result<Boolean> send(@RequestBody SmsSendLog smsSendLog,
-                         @RequestHeader(value = "orgId", required = false) String orgId,
-                         @RequestHeader(value = "userId", required = false) String userId,
-                         @RequestHeader(value = "clientId", required = false) String clientId);
-}

src/main/java/com/aoyang/tms/feign/UserFeign.java

@@ -1,182 +0,0 @@
-package com.aoyang.tms.feign;
-
-import com.alibaba.fastjson.JSONObject;
-import com.aoyang.common.param.PageParam;
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.controller.param.IdParam;
-import com.aoyang.tms.entity.feignEntity.Org;
-import com.aoyang.tms.entity.feignEntity.User;
-import com.aoyang.tms.entity.feignEntity.UserRole;
-import com.aoyang.tms.entity.feignEntity.WrapperUser;
-import com.aoyang.tms.feign.param.AuthLog;
-import com.aoyang.tms.feign.result.DriverApply;
-import com.aoyang.tms.feign.result.DriverWhiteList;
-import com.aoyang.tms.feign.result.GasstationCardVO;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @author: liujiren
- */
-
-@FeignClient(name = "user")
-public interface UserFeign {
-
-    /**
-     * 添加加气站同时，创建加气站默认收银员
-     * @param c_userId
-     * @param user
-     * @return
-     */
-    @PostMapping("/user/user/add_default_cashier")
-    public Result<User> addDefaultCashier(@RequestHeader("userId") String c_userId, @RequestBody User user);
-    /**
-     * 新增用户
-     */
-    @PostMapping(value = "/user/user/add")
-    Result<User> add(@RequestHeader("userId") String userId, @RequestBody User user);
-
-
-    @PostMapping(value = "/user/user/delete")
-    Result<Boolean> delete(@RequestParam("userId") Long userId);
-
-    @PostMapping("/user/user/list_by_user_ids")
-    Result<List<User>> listByUserIds(@RequestBody List<Long> ids);
-
-
-    @PostMapping("/user/user/binding_list")
-    Result<Page<User>> bindingList(@RequestBody PageParam<WrapperUser> pageParam);
-
-
-    /**
-     * 根据userId 查询用户信息
-     * @param
-     * @return
-     */
-    @PostMapping("/user/user/find")
-    Result<JSONObject> find(@RequestBody User user);
-
-    @PostMapping("/user/org/find")
-    Result<Org> find(@RequestBody Org org);
-
-    /**
-     * 根据orgId，查询用户列表
-     */
-    @PostMapping("/user/user/list_org")
-    Result<Page<User>> listOrg(@RequestBody PageParam<User> pageParam);
-
-    //add userRole
-    @PostMapping("/user/user_role/add")
-    public Result<Boolean> add(@RequestBody UserRole userRole);
-
-
-    /**
-     * @description: 查询司机发起的最新的未完成的车辆单独加入物流公司申请【待审核、已驳回】
-     * @author: zhuangxl
-     * @since: 2021/3/31 14:48
-     **/
-    @PostMapping("/user/driver_apply/last_unfinished_truck_apply")
-    Result<DriverApply> lastUnfinishedTruckApply(@RequestHeader("userId")Long userId);
-
-    /**
-     * @description: 查询司机发起的最新的未完成的司机加入或退出物流公司申请【待审核、已驳回】
-     * @author: zhuangxl
-     * @since: 2021/3/31 14:48
-     **/
-    @PostMapping("/user/driver_apply/last_unfinished_driver_apply")
-    Result<DriverApply> lastUnfinishedDriverApply(@RequestHeader("userId")Long userId);
-
-    /**
-     * @description: 行驶证认证日志保存接口
-     * @author: zhuangxl
-     * @since: 2021/3/31 16:29
-     * @param authLog: 认证日志
-     * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-     **/
-    @PostMapping("/user/auth_log/add")
-    Result<Boolean> addAuthLog(@RequestBody AuthLog authLog);
-
-    /**
-     * @description: 司机发起申请（车辆加入退出、司机加入退出、司机和车辆同时加入退出申请）
-     * @author: zhuangxl
-     * @since: 2021/4/1 13:06
-     * @param driverApply: 司机发起的申请信息
-     * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-     **/
-    @PostMapping("/user/driver_apply/add")
-    Result<Boolean> add(@RequestBody DriverApply driverApply);
-
-
-    /**
-     * @description: 用户组织转移（司机转移，车辆转移）
-     * @author: mahuan
-     * @since: 2021/4/12 13:38
-     * @param
-     * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-     **/
-    @PostMapping("/user/user/transfer")
-    Result<Boolean> transfer(@RequestHeader("userId") String userId, @RequestHeader("userName") String userName,
-                             @RequestBody User user);
-
-
-    /**
-     * 查询redis获取加气站和物流客户
-     * @param userId
-     * @param type 0 加气站  1物流客户
-     * @return
-     */
-    @GetMapping("/user/district/redis/org")
-    List<Long> getOrgList(@RequestParam("userId") Long userId, @RequestParam("type") Integer type);
-
-    /**
-     * 根据gasstationId 查询加气站名片信息
-     * @param
-     * @return
-     */
-    @PostMapping("/user/gasstation_card/find_for_app")
-    Result<GasstationCardVO> findForApp(@RequestBody Long gasstationID);
-
-    /**
-     * @param param: 用户id
-     * @description: 根据id查询用户
-     * @author: zhuangxl
-     * @since: 2021/4/29 13:14
-     * @return: com.aoyang.common.result.Result<com.aoyang.user.entity.User>
-     **/
-    @PostMapping("/user/user/find_by_id")
-    Result<User> findUserById(@RequestBody IdParam param);
-
-    /**
-     * @description: 查询指定的手机号是否有预添加信息
-     * @author: zhuangxl
-     * @since: 2021/5/27 11:02
-     * @param driverWhiteList: 司机手机号
-     * @return: com.aoyang.common.result.Result<com.aoyang.user.entity.DriverWhiteList>
-     **/
-    @PostMapping("/user/driver_white_list/add_check")
-    Result<DriverWhiteList> driverWhiteListAddCheck(@RequestBody DriverWhiteList driverWhiteList);
-
-
-    /**
-     * @description: 撤销司机加入或退出物流公司的申请（包含带车）
-     * @author: zhuangxl
-     * @since: 2021/8/6 18:41
-     * @param param: 司机id
-     * @return: void
-     **/
-    @PostMapping("/user/driver_apply/cancle_driver_apply")
-    Result<String> cancleDriverApply(@RequestBody IdParam param);
-
-
-    /** @description: 撤销车辆加入物流公司的申请
-     * @author: zhuangxl
-     * @since: 2021/8/6 18:41
-     * @param param: 车辆id
-     * @return: void
-     **/
-    @PostMapping("/user/driver_apply/cancle_truck_apply")
-    Result<String> cancleTruckApply(@RequestBody IdParam param);
-}

src/main/java/com/aoyang/tms/feign/fallback/MessageFeignFallBack.java

@@ -1,34 +0,0 @@
-package com.aoyang.tms.feign.fallback;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.entity.feignEntity.SmsSendLog;
-import com.aoyang.tms.feign.MessageFeign;
-import com.aoyang.tms.util.ErrCodeEnum;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-/**
- * @author liujiren
- */
-@Component
-@Slf4j
-public class MessageFeignFallBack implements FallbackFactory<MessageFeign> {
-
-    @Override
-    public MessageFeign create(Throwable cause) {
-        String msg = cause == null ? "" : cause.getMessage();
-        if (!StringUtils.isEmpty(msg)) {
-            log.error("AccountFeign error : {}", msg);
-        }
-        return new MessageFeign() {
-            @Override
-            public Result<Boolean> send(SmsSendLog smsSendLog, String orgId, String userId, String clientId) {
-                return new Result(ErrCodeEnum.MESSAGESERVER_ERROR.getCode(),
-                        ErrCodeEnum.MESSAGESERVER_ERROR.getMessage());
-
-            }
-        };
-    }
-}

src/main/java/com/aoyang/tms/feign/fallback/UserFeignFallBack.java

@@ -1,217 +0,0 @@
-package com.aoyang.tms.feign.fallback;
-
-import com.alibaba.fastjson.JSONObject;
-import com.aoyang.common.param.PageParam;
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.controller.param.IdParam;
-import com.aoyang.tms.entity.feignEntity.Org;
-import com.aoyang.tms.entity.feignEntity.User;
-import com.aoyang.tms.entity.feignEntity.UserRole;
-import com.aoyang.tms.entity.feignEntity.WrapperUser;
-import com.aoyang.tms.feign.UserFeign;
-import com.aoyang.tms.feign.param.AuthLog;
-import com.aoyang.tms.feign.result.DriverApply;
-import com.aoyang.tms.feign.result.DriverWhiteList;
-import com.aoyang.tms.feign.result.GasstationCardVO;
-import com.aoyang.tms.util.ErrCodeEnum;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author liujiren
- */
-@Component
-@Slf4j
-public class UserFeignFallBack implements FallbackFactory<UserFeign> {
-
-    @Override
-    public UserFeign create(Throwable cause) {
-        String msg = cause == null ? "" : cause.getMessage();
-        if (!StringUtils.isEmpty(msg)) {
-            log.error("AccountFeign error : {}", msg);
-        }
-        return new UserFeign() {
-
-            @Override
-            public Result<User> addDefaultCashier(String c_userId, User user) {
-                return new Result(ErrCodeEnum.USER_SERVER_ERROR.getCode(), ErrCodeEnum.USER_SERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result<User> add(String userId, User user) {
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage(), null);
-            }
-
-            @Override
-            public Result<Boolean> delete(Long userId) {
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage(), false);
-
-            }
-
-            @Override
-            public Result<List<User>> listByUserIds(List<Long> ids) {
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result<Page<User>> bindingList(@RequestBody PageParam<WrapperUser> pageParam) {
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result<JSONObject> find(User user) {
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-
-            }
-
-            @Override
-            public Result<Org> find(Org org) {
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-
-            @Override
-            public Result<Page<User>> listOrg(PageParam<User> pageParam) {
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result<Boolean> add(UserRole userRole) {
-                return new Result<Boolean>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage(), false);
-            }
-
-
-            /**
-             * @param userId
-             * @description: 查询司机发起的最新的未完成的车辆加入或退出物流公司申请【待审核、已驳回】
-             * @author: zhuangxl
-             * @since: 2021/3/31 14:48
-             */
-            @Override
-            public Result<DriverApply> lastUnfinishedTruckApply(Long userId) {
-                log.error("策略中心微服务：查询司机发起的最新的未完成的车辆加入或退出物流公司申请【待审核、已驳回】，进入熔断");
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-            /**
-             * @param userId
-             * @description: 查询司机发起的最新的未完成的司机加入或退出物流公司申请【待审核、已驳回】
-             * @author: zhuangxl
-             * @since: 2021/3/31 14:48
-             */
-            @Override
-            public Result<DriverApply> lastUnfinishedDriverApply(Long userId) {
-                log.error("策略中心微服务：查询司机发起的最新的未完成的司机加入或退出物流公司申请【待审核、已驳回】，进入熔断");
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-            /**
-             * @param authLog : 认证日志
-             * @description: 行驶证认证日志保存接口
-             * @author: zhuangxl
-             * @since: 2021/3/31 16:29
-             * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-             **/
-            @Override
-            public Result<Boolean> addAuthLog(AuthLog authLog) {
-                log.error("策略中心微服务：feign调用行驶证认证日志保存，进入熔断");
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-            /**
-             * @param driverApply : 司机发起的申请信息
-             * @description: 司机发起申请（车辆加入退出、司机加入退出、司机和车辆同时加入退出申请）
-             * @author: zhuangxl
-             * @since: 2021/4/1 13:06
-             * @return: com.aoyang.common.result.Result<java.lang.Boolean>
-             **/
-            @Override
-            public Result<Boolean> add(DriverApply driverApply) {
-                log.error("策略中心微服务：feign调用 添加司机发起的申请信息，进入熔断");
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public Result<Boolean> transfer(String userId, String userName,
-                                            User user) {
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-            @Override
-            public List<Long> getOrgList(Long userId, Integer type) {
-                List<Long> result = new ArrayList<>(5);
-                result.add(0L);
-                return result;
-            }
-
-            @Override
-            public Result<GasstationCardVO> findForApp(Long gasstationID) {
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-            /**
-             * @param param : 用户id
-             * @description: 根据id查询用户
-             * @author: zhuangxl
-             * @since: 2021/4/29 13:14
-             * @return: com.aoyang.common.result.Result<com.aoyang.user.entity.User>
-             **/
-            @Override
-            public Result<User> findUserById(IdParam param) {
-                log.error("策略中心微服务：feign调用 添加司机发起的申请信息，进入熔断");
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-
-            }
-
-            /**
-             * @param driverWhiteList : 司机手机号
-             * @description: 查询指定的手机号是否有预添加信息
-             * @author: zhuangxl
-             * @since: 2021/5/27 11:02
-             * @return: com.aoyang.common.result.Result<com.aoyang.user.entity.DriverWhiteList>
-             **/
-            @Override
-            public Result<DriverWhiteList> driverWhiteListAddCheck(DriverWhiteList driverWhiteList) {
-                log.error("策略中心微服务：feign调用 查询指定的手机号是否有预添加信息，进入熔断");
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-
-            }
-
-            /**
-             * @param param : 司机id
-             * @description: 撤销司机加入或退出物流公司的申请（包含带车）
-             * @author: zhuangxl
-             * @since: 2021/8/6 18:41
-             * @return: void
-             **/
-            @Override
-            public Result<String> cancleDriverApply(IdParam param) {
-                log.error("策略中心微服务：feign调用 撤销司机加入或退出物流公司的申请（包含带车），进入熔断");
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-
-            /**
-             * @param param : 车辆id
-             * @description: 撤销车辆加入物流公司的申请
-             * @author: zhuangxl
-             * @since: 2021/8/6 18:41
-             * @return: void
-             **/
-            @Override
-            public Result<String> cancleTruckApply(IdParam param) {
-                log.error("策略中心微服务：feign调用 撤销指定车辆相关的的申请，进入熔断");
-                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
-            }
-        };
-
-    }
-
-
-}

src/main/java/com/aoyang/tms/feign/param/AuthLog.java

@@ -1,52 +0,0 @@
-package com.aoyang.tms.feign.param;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
-    * 个人身份证、驾驶证、行驶证认证记录表
-    * </p>
- *
- * @author zhuangxl
- * @since 2021-03-22
- */
-@Data
-public class AuthLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long id;
-
-    //认证时的目标对象id（身份证用户的id、驾驶证对应司机的id，行驶证对应车辆id)
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long targetId;
-
-    //类型：1=身份证认证 2=驾驶证认证 3=行驶证认证
-    private Integer type;
-
-    //认证状态：1=认证成功 0=认证失败
-    private Integer status;
-
-    //请求内容
-    private String requestContent;
-
-    //响应内容
-    private String responseContent;
-
-    //创建人
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creater;
-
-    //创建人姓名
-    private String createrName;
-
-    //创建时间
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createDate;
-
-}

src/main/java/com/aoyang/tms/feign/result/DriverApply.java

@@ -1,98 +0,0 @@
-package com.aoyang.tms.feign.result;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
-    * 司机各种申请信息表
-    * </p>
- *
- * @author zhuangxl
- * @since 2021-03-31
- */
-@Data
-@TableName("driver_apply")
-@ApiModel(value="DriverApply对象", description="司机各种申请信息表")
-public class DriverApply implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id,自增")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long id;
-
-    @ApiModelProperty(value = "组织id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "组织名称")
-    private String orgName;
-
-    @ApiModelProperty(value = "车辆id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "车牌号")
-    private String carNumber;
-
-    @ApiModelProperty(value = "司机id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverId;
-
-    @ApiModelProperty(value = "司机姓名")
-    private String driverName;
-
-    @ApiModelProperty(value = "司机手机号")
-    private String driverMobile;
-
-    @ApiModelProperty(value = "申请理由")
-    private String reqMsg;
-
-    @ApiModelProperty(value = "创建人id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creater;
-
-    @ApiModelProperty(value = "创建人姓名")
-    private String createrName;
-
-    @ApiModelProperty(value = "创建日期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "类型： 1 司机加入申请 2 车辆加入申请 3 司机和车辆同时加入申请 4 司机退出申请 5 车辆退出申请 6 司机和车辆同时退出申请 ")
-    @TableField("type")
-    private Integer type;
-
-    @ApiModelProperty(value = "审核状态： 1 待审核，2 已审核， 3 驳回 ")
-    private Integer auditStatus;
-
-    @ApiModelProperty(value = "驳回原因")
-    private String resMsg;
-
-    @ApiModelProperty(value = "审核人id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long auditor;
-
-    @ApiModelProperty(value = "审核人姓名")
-    private String auditorName;
-
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime auditDate;
-
-    @ApiModelProperty(value = "0=自有车辆 1=其他 ")
-    private Integer linked;
-
-    @ApiModelProperty(value = "0=账户消费 1=自动圈存")
-    @TableField("auto_account")
-    private Integer autoAccount;
-
-}

src/main/java/com/aoyang/tms/feign/result/DriverWhiteList.java

@@ -1,86 +0,0 @@
-package com.aoyang.tms.feign.result;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
-    * 物流公司-预添加司机信息表
-    * </p>
- *
- * @author zhuangxl
- * @since 2021-04-01
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("driver_white_list")
-@ApiModel(value="DriverWhiteList对象", description="物流公司-预添加司机信息表")
-public class DriverWhiteList implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id,自增")
-    @TableId(value = "id", type = IdType.AUTO)
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long id;
-
-    @ApiModelProperty(value = "组织id")
-    @TableField("org_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "组织名称")
-    @TableField("org_name")
-    private String orgName;
-
-    @ApiModelProperty(value = "组织简称")
-    @TableField("org_short_name")
-    private String orgShortName;
-
-    @ApiModelProperty(value = "司机手机号")
-    @TableField("driver_mobile")
-    private String driverMobile;
-
-    @ApiModelProperty(value = "司机姓名")
-    @TableField("driver_name")
-    private String driverName;
-
-    @ApiModelProperty(value = "创建人id")
-    @TableField("creater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creater;
-
-    @ApiModelProperty(value = "创建人姓名")
-    @TableField("creater_name")
-    private String createrName;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_date")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "司机接受状态： 1=待接受，2=已同意，3=已拒绝")
-    @TableField("accept_status")
-    private Integer acceptStatus;
-
-    @ApiModelProperty(value = "司机是否已注册（是否已激活): 0 未注册 1 已注册")
-    @TableField("register_status")
-    private Integer registerStatus;
-
-    @ApiModelProperty(value = "删除状态：0=显示，1=不显示")
-    @TableField("remove_status")
-    private Integer removeStatus;
-
-
-}

src/main/java/com/aoyang/tms/feign/result/GasstationCardVO.java

@@ -1,66 +0,0 @@
-package com.aoyang.tms.feign.result;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @Description: ${DESCRIPTION}
- * @Author guoyong
- * @Date 2020/12/7 13:28
- * @Version 1.0
- */
-@Data
-public class GasstationCardVO {
-
-    @ApiModelProperty(value = "加气站名称")
-    private String gasstationName;
-
-    @ApiModelProperty(value = "加气站简称")
-    private String nickName;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "今日挂牌价-加气站输入的价格")
-    private BigDecimal listPrice;
-
-    @ApiModelProperty(value = "平台挂牌价")
-    private BigDecimal platformPrice;
-
-    @ApiModelProperty(value = "手机号")
-    private String mobile;
-
-    @ApiModelProperty(value = "省份")
-    private String province;
-
-    @ApiModelProperty(value = "城市")
-    private String city;
-
-    @ApiModelProperty(value = "地区")
-    private String region;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "加气站logo图片")
-    private String url;
-
-    @ApiModelProperty(value = "加气站形象图列表")
-    private List orgPics;
-
-    @ApiModelProperty(value = "加气站宣传文案")
-    private String introduce;
-
-    @ApiModelProperty(value = "加注机数量")
-    private Integer fillingMachineNum;
-
-    @ApiModelProperty(value = "收银员数量")
-    private Integer cashierNum;
-
-}

src/main/java/com/aoyang/tms/feign/result/GasstationTradeSum.java

@@ -1,58 +0,0 @@
-package com.aoyang.tms.feign.result;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @Description: 加气站单日汇总数据
- * @Author guoyong
- * @Date 2021/2/25 17:08
- * @Version 1.0
- */
-@Data
-public class GasstationTradeSum {
-
-    @ApiModelProperty(value = "加气站id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long gasstationId;
-
-    @ApiModelProperty(value = "加气站名称")
-    private String gasstationName;
-
-    @ApiModelProperty(value = "当日结算价")
-    private BigDecimal actualPrice;
-
-    @ApiModelProperty(value = "进气量汇总(采购量)")
-    private BigDecimal gasQtyTotal;
-
-    @ApiModelProperty(value = "加气量汇总(销售量)")
-    private BigDecimal storeTotal;
-
-    @ApiModelProperty(value = "存量")
-    private BigDecimal stockTotal;
-
-    @ApiModelProperty(value = "在途量")
-    private BigDecimal wayTotal;
-
-    @ApiModelProperty(value = "日活卡车数量汇总")
-    private Integer liveTruckTotal;
-
-    @ApiModelProperty(value = "区域名")
-    private String districtName;
-
-    @ApiModelProperty(value = "区域id")
-    private Integer districtId;
-
-    @ApiModelProperty(value = "区域排名")
-    private String districtRank;
-
-    @ApiModelProperty(value = "全平台排名")
-    private String allDistrictRank;
-
-    @ApiModelProperty(value = "日期")
-    private String date;
-
-}