Merge branch 'master' of D:\ayzl\tms with conflicts.

src/main/java/com/aoyang/tms/common/ErrCodeEnum.java

@@ -0,0 +1,362 @@
+package com.aoyang.tms.common;
+
+import lombok.Getter;
+
+/**
+ * @Description: 错误枚举
+ * @Author: panenming
+ * @CreateDate: 2020/2/9 下午3:24
+ */
+@Getter
+public enum ErrCodeEnum {
+    /**
+     * 参数错误
+     */
+    BAD_PARAM(2000, "参数错误！"),
+    /**
+     * token无效
+     */
+    TOKEN_ERROR(2001, "token无效"),
+    /**
+     * 系统配置错误
+     */
+    BAD_SYSTEM_CONFIG(2003, "系统配置错误，请联系客服人员"),
+    /**
+     * orgId
+     */
+    BAD_ORG_ID_PARAM(2002, "找不到对应的企业信息！"),
+    /**
+     * 参数错误
+     */
+    ORG_UPDATE_ERROR(2003, "操作成功，更新组织信息错误！"),
+    /**
+     * 获取openid失败
+     */
+    OPENID_ERROR(2010, "获取openid失败"),
+    /**
+     * 微信统一下单失败
+     */
+    UNIFIEDORDER_ERROR(2011, "微信统一下单失败"),
+    /**
+     * 微信统一下单失败返回信息
+     */
+    WX_ORDER_ERROR(2012, "下单失败"),
+    /**
+     * 加气订单支付中
+     */
+    GAS_ORDER_PAYING(2013, "订单支付中"),
+    /**
+     * 调用通商云失败
+     */
+    TSY_METHOD_ERROR(3000, "调用通商云失败"),
+    /**
+     * 通商云失败返回信息
+     */
+    TSY_ERROR(3001, "实名认证失败"),
+    /**
+     * 通商云认证中返回信息
+     */
+    TSY_AUTH_WAITING(0, "认证信息提交成功，正在认证中"),
+    /**
+     * 获取企业账号失败
+     */
+    USER_ACCOUNT_ERROR(3003, "获取账号失败"),
+    /**
+     * 通商云绑定电话
+     */
+    TSY_PHONE_BIND_ERROR(3004, "绑定电话失败"),
+    /**
+     * 获取企业账号失败
+     */
+    USER_NOT_CREATE_ERROR(3005, "尚未创建账号"),
+    /**
+     * 尚未实名认证
+     */
+    USER_NOT_AUTH_ERROR(3006, "尚未实名认证"),
+    /**
+     * 实名认证通过
+     */
+    USER_AUTH_PASSED(0, "实名认证成功"),
+    /**
+     * 已签协议
+     */
+    USER_CONTRACT_DONE(0, "已签协议"),
+    /**
+     * 会员账号信息不存在
+     */
+    TSY_NOT_EXIST_ERROR(3009, "信息不存在"),
+
+    /**
+     * 消费余额不足提示
+     */
+    BALANCE_NOT_ENOUGH(3010, "账户余额不足"),
+
+    /**
+     * 提现限额不足提示
+     */
+    WITHDRAW_QUOTA_NOT_ENOUGH(3017, "为保证业务正常进行，请确保提现后账户余额大于"),
+
+    /**
+     * 绑定openid失败
+     */
+    BIND_OPENID_FAIL(3011, "绑定openid失败"),
+
+    /**
+     * 注册用户失败
+     */
+    CREATE_MEMBER_FAIL(3016, "注册用户失败"),
+    /**
+     * 校验码错误
+     */
+    BAD_VERIFY_CODE(3012, "校验码错误"),
+
+    /**
+     * 获取签约协议失败
+     */
+    GET_SIGN_CONTRACT_CODE(3013, "获取签约协议失败"),
+
+    /**
+     * 调用通联出错
+     */
+    ALLINPAY_RESPONSE_NULL(3014, "调用通联返回空"),
+
+    /**
+     * 调用通联出错
+     */
+    ALLINPAY_ERROR(3015, "调用通联出错"),
+
+    /**
+     * 支付成功判断
+     */
+    GASORDER_PAY_SUCCESS(3018, "订单已支付，请不要重复支付"),
+
+    /**
+     * 大象平台支付失败
+     */
+    GASORDER_PAY_FAIL(3019, "大象平台支付失败，请联系客服人员"),
+
+    /**
+     * 下载电子回单失败
+     */
+    DOWNLOAD_WITHDRAW_RECEIPT_ERROR(3016, "下载电子回单失败"),
+
+    /**
+     * 下载电子回单失败
+     */
+    COM_PAY_TRANSFER_ERROR(3020, "组合支付，物流公司余额不足"),
+    /**
+     * 数据库错误
+     */
+    DB_PARAM(2201, "数据库错误！"),
+    /**
+     * 远程请求错误
+     */
+    REMOTE_PARAM(2202, "远程请求错误"),
+    /**
+     * 非法服务费率
+     */
+    INVALID_FREE(2210, "非法服务费率"),
+    /**
+     * 非法气价
+     */
+    INVALID_PRICE(2211, "非法气价"),
+    /**
+     * 非法卡车
+     */
+    INVALID_TRUCK(2212, "非法卡车"),
+    /**
+     * 非法加气站
+     */
+    INVALID_GASSTATION(2213, "非法加气站"),
+    /**
+     * 非法订单
+     */
+    INVALID_ORDER(2214, "非法订单"),
+    /**
+     * 司机和订单不匹配
+     */
+    NO_RELATION(2215, "司机和订单不匹配"),
+    /**
+     * 账户余额不足
+     */
+    NO_ENOUGH_MONEY(2216, "账户余额不足"),
+    /**
+     * 自动划账失败
+     */
+    AUTO_TRANSFER_FAIL(2217, "自动划账失败"),
+    /**
+     * 支付失败
+     */
+    PAY_FAIL(2218, "支付失败"),
+    /**
+     * 订单状态不对
+     */
+    ORDER_STATUS_ERROR(2219, "订单状态不对"),
+    /**
+     * 审批人不对
+     */
+    ORDER_AUDIT_ERROR(2220, "审批人不对"),
+    /**
+     * 非法金额
+     */
+    INVALID_AMOUNT(2221, "非法金额"),
+    /**
+     * 卡车有未支付订单
+     */
+    UNPAY_ORDER(2222, "卡车有未支付订单"),
+    /**
+     * 订单已取消
+     */
+    CANCEL_ORDER(2223, "订单已取消"),
+    /**
+     * 订单已支付
+     */
+    PAY_ORDER(2224, "订单已支付"),
+    /**
+     * 卡车不属于该企业
+     */
+    INVALID_TRUCK_ORG(2225, "卡车不属于该企业"),
+
+    /**
+     * 收银员与加气站绑定关系异常
+     */
+    CASHIER_GASSTATION_ERROR(2226, "收银员与加气站绑定关系异常"),
+
+    /**
+     * 卡车与司机绑定关系异常
+     */
+    DRIVER_TRUCK_ERROR(2227, "卡车与司机绑定关系异常"),
+    /**
+     * 平台结算价格异常，小于等于0
+     */
+    PLATFORM_PRICE_ERROR(2228, "平台结算价格异常，小于等于0"),
+
+    /**
+     * 实际结算价格异常，小于等于0
+     */
+    ACTUAL_PRICE_ERROR(2229, "实际结算价格异常，小于等于0"),
+
+    /**
+     * 圈存金额需大于0
+     */
+    TRANSFER_AMOUNT_ERROR(2230, "圈存金额需大于0"),
+
+    /**
+     * 卡车已停用
+     */
+    TRUCK_IS_STOP(2231, "卡车已停用"),
+
+    /**
+     * 用户已停用
+     */
+    CASHIER_IS_STOP(2232, "收银员已停用"),
+    /**
+     * 司机已停用
+     */
+    DRIVER_IS_STOP(2233, "司机已停用"),
+    /**
+     * 订单价格计算错误
+     */
+    ORDER_SUM_ERROR(2234, "订单金额计算出错"),
+
+    /**
+     * 加气站没有通过认证
+     */
+    GASSTATION_UNAUTH(2235, "加气站没有认证"),
+    /**
+     * 物流公司没有通过认证
+     */
+    CARRIER_UNAUTH(2236, "物流公司没有认证"),
+
+    /**
+     * 用户不存在
+     */
+    USER_IS_NOT_EXIST(2237, "用户不存在"),
+
+    /**
+     * 用户组织id错误
+     */
+    USER_ORG_ID_IS_WRONG(2238, "组织id与登录用户组织id不一致"),
+
+    /**
+     * 获取用户信息失败
+     */
+    GET_USER_FAIL(2239, "获取用户信息失败"),
+
+    /**
+     * 企业账户不匹配
+     */
+    ORG_ACCOUNT_ID_IS_WRONG(2239, "企业账户不匹配"),
+
+    /**
+     * 银行卡错误，查无此卡
+     */
+    BANK_CAR_NUMBER_IS_ERROR(2240, "银行卡错误，查无此卡"),
+
+    /**
+     * 申请绑卡失败，请联系运营人员
+     */
+    APPYL_BINK_CARD_FAIL_ERROR(2241, "申请绑卡失败，请联系运营人员"),
+    /**
+     * 确认绑卡失败，请联系运营人员
+     */
+    BINK_CARD_FAIL_ERROR(2242, "确认绑卡失败，请联系运营人员"),
+
+    /**
+     * 解绑银行卡失败，请联系运营人员
+     */
+    UNBINK_CARD_FAIL_ERROR(2243, "解绑银行卡失败，请联系管理员"),
+
+    /**
+     * 查询绑定银行卡失败，请联系运营人员
+     */
+    QUERY_BINK_CARD_FAIL_ERROR(2244, "解绑银行卡失败，请联系管理员"),
+
+    /**
+     * 查询订单是否已经完成返现失败, 请稍后再试
+     */
+    GAS_ORDER_CASHBACK_CHECK_ERROR(2301, "查询订单是否已经完成失败, 请稍后再试"),
+
+    /**
+     * 此订单已完成返现，不能再次返现了
+     */
+    GAS_ORDER_HAS_CASHBACK(2302, "此订单已完成返现，不能再次返现了"),
+
+    /**
+     * 查询营销组织信息失败
+     */
+    QUERY_MARKETING_ORG_ERROR(2303, "查询营销组织信息失败"),
+
+    /**
+     * 查询默认组织信息失败
+     */
+    QUERY_DEFAULT_ORG_ERROR(2304, "查询默认组织信息失败"),
+
+    /**
+     * 返现转账失败
+     */
+    CASHBACK_TRANSFER_ACCOUNT_ERROR(2305, "返现转账失败"),
+
+    /**
+     * 严重错误：散户首次消费返现，通联账户已划账完成，大象加气本地划账失败
+     */
+    CASHBACK_TRANSFER_ACCOUNT_ERROR_2(2306, "本地资金账户返现失败，请联系运营处理"),
+
+    /**
+     * 直销模式的卡车不能在经销模式加气站加气
+     */
+    DIRECT_TRUCK_CAN_NOT_GAS_IN_NODIRECTGASSTATION(2307, "该车辆已参加‘直销加气’，请在 直销加气站 加气 ！"),
+
+    /**
+     * 直销模式充值限额
+     */
+    DIRECT_RECHARGE_LIMIT(2308, "低于直销模式最小充值限额");
+
+    private int code;
+    private String message;
+
+    ErrCodeEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.RestInfoService;
+import  com.aoyang.tms.entity.RestInfo;
+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>
+    * 车辆休息详情表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "rest_infoCRUD接口")
+@RequestMapping("/tms/rest_info")
+public class RestInfoController {
+
+    @Resource
+    private RestInfoService restInfoService;
+
+    @ApiOperation(value = "获取rest_info列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<RestInfo> pageParam) {
+        Page<RestInfo> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<RestInfo> records = restInfoService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改rest_info",notes="根据id修改rest_info")
+    @PostMapping("/update")
+    public Result update(@RequestBody RestInfo restInfo) {
+        Boolean flag = restInfoService.updateById(restInfo);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加rest_info",notes="新增一条rest_info")
+    @PostMapping("/add")
+    public Result add(@RequestBody RestInfo restInfo) {
+        Boolean flag = restInfoService.save(restInfo);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.ShipperService;
+import  com.aoyang.tms.entity.Shipper;
+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>
+    * 运力托运方管理表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "shipperCRUD接口")
+@RequestMapping("/tms/shipper")
+public class ShipperController {
+
+    @Resource
+    private ShipperService shipperService;
+
+    @ApiOperation(value = "获取shipper列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<Shipper> pageParam) {
+        Page<Shipper> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<Shipper> records = shipperService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改shipper",notes="根据id修改shipper")
+    @PostMapping("/update")
+    public Result update(@RequestBody Shipper shipper) {
+        Boolean flag = shipperService.updateById(shipper);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加shipper",notes="新增一条shipper")
+    @PostMapping("/add")
+    public Result add(@RequestBody Shipper shipper) {
+        Boolean flag = shipperService.save(shipper);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.TruckCheckInfoService;
+import  com.aoyang.tms.entity.TruckCheckInfo;
+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>
+    * 车辆检查详情表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "truck_check_infoCRUD接口")
+@RequestMapping("/tms/truck_check_info")
+public class TruckCheckInfoController {
+
+    @Resource
+    private TruckCheckInfoService truckCheckInfoService;
+
+    @ApiOperation(value = "获取truck_check_info列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<TruckCheckInfo> pageParam) {
+        Page<TruckCheckInfo> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<TruckCheckInfo> records = truckCheckInfoService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改truck_check_info",notes="根据id修改truck_check_info")
+    @PostMapping("/update")
+    public Result update(@RequestBody TruckCheckInfo truckCheckInfo) {
+        Boolean flag = truckCheckInfoService.updateById(truckCheckInfo);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加truck_check_info",notes="新增一条truck_check_info")
+    @PostMapping("/add")
+    public Result add(@RequestBody TruckCheckInfo truckCheckInfo) {
+        Boolean flag = truckCheckInfoService.save(truckCheckInfo);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.TruckDeptService;
+import  com.aoyang.tms.entity.TruckDept;
+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>
+    * 运力部门管理表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "truck_deptCRUD接口")
+@RequestMapping("/tms/truck_dept")
+public class TruckDeptController {
+
+    @Resource
+    private TruckDeptService truckDeptService;
+
+    @ApiOperation(value = "获取truck_dept列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<TruckDept> pageParam) {
+        Page<TruckDept> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<TruckDept> records = truckDeptService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改truck_dept",notes="根据id修改truck_dept")
+    @PostMapping("/update")
+    public Result update(@RequestBody TruckDept truckDept) {
+        Boolean flag = truckDeptService.updateById(truckDept);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加truck_dept",notes="新增一条truck_dept")
+    @PostMapping("/add")
+    public Result add(@RequestBody TruckDept truckDept) {
+        Boolean flag = truckDeptService.save(truckDept);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.TruckEscortService;
+import  com.aoyang.tms.entity.TruckEscort;
+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>
+    * 车辆押运员表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "truck_escortCRUD接口")
+@RequestMapping("/tms/truck_escort")
+public class TruckEscortController {
+
+    @Resource
+    private TruckEscortService truckEscortService;
+
+    @ApiOperation(value = "获取truck_escort列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<TruckEscort> pageParam) {
+        Page<TruckEscort> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<TruckEscort> records = truckEscortService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改truck_escort",notes="根据id修改truck_escort")
+    @PostMapping("/update")
+    public Result update(@RequestBody TruckEscort truckEscort) {
+        Boolean flag = truckEscortService.updateById(truckEscort);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加truck_escort",notes="新增一条truck_escort")
+    @PostMapping("/add")
+    public Result add(@RequestBody TruckEscort truckEscort) {
+        Boolean flag = truckEscortService.save(truckEscort);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.TruckRepairInfoService;
+import  com.aoyang.tms.entity.TruckRepairInfo;
+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>
+    * 车辆维修详情表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "truck_repair_infoCRUD接口")
+@RequestMapping("/tms/truck_repair_info")
+public class TruckRepairInfoController {
+
+    @Resource
+    private TruckRepairInfoService truckRepairInfoService;
+
+    @ApiOperation(value = "获取truck_repair_info列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<TruckRepairInfo> pageParam) {
+        Page<TruckRepairInfo> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<TruckRepairInfo> records = truckRepairInfoService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改truck_repair_info",notes="根据id修改truck_repair_info")
+    @PostMapping("/update")
+    public Result update(@RequestBody TruckRepairInfo truckRepairInfo) {
+        Boolean flag = truckRepairInfoService.updateById(truckRepairInfo);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加truck_repair_info",notes="新增一条truck_repair_info")
+    @PostMapping("/add")
+    public Result add(@RequestBody TruckRepairInfo truckRepairInfo) {
+        Boolean flag = truckRepairInfoService.save(truckRepairInfo);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.TruckSimCardService;
+import  com.aoyang.tms.entity.TruckSimCard;
+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>
+    * 卡车SIM卡关联表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "truck_sim_cardCRUD接口")
+@RequestMapping("/tms/truck_sim_card")
+public class TruckSimCardController {
+
+    @Resource
+    private TruckSimCardService truckSimCardService;
+
+    @ApiOperation(value = "获取truck_sim_card列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<TruckSimCard> pageParam) {
+        Page<TruckSimCard> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<TruckSimCard> records = truckSimCardService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改truck_sim_card",notes="根据id修改truck_sim_card")
+    @PostMapping("/update")
+    public Result update(@RequestBody TruckSimCard truckSimCard) {
+        Boolean flag = truckSimCardService.updateById(truckSimCard);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加truck_sim_card",notes="新增一条truck_sim_card")
+    @PostMapping("/add")
+    public Result add(@RequestBody TruckSimCard truckSimCard) {
+        Boolean flag = truckSimCardService.save(truckSimCard);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.WorkLogService;
+import  com.aoyang.tms.entity.WorkLog;
+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>
+    * 车辆行车日志表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "work_logCRUD接口")
+@RequestMapping("/tms/work_log")
+public class WorkLogController {
+
+    @Resource
+    private WorkLogService workLogService;
+
+    @ApiOperation(value = "获取work_log列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<WorkLog> pageParam) {
+        Page<WorkLog> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<WorkLog> records = workLogService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改work_log",notes="根据id修改work_log")
+    @PostMapping("/update")
+    public Result update(@RequestBody WorkLog workLog) {
+        Boolean flag = workLogService.updateById(workLog);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加work_log",notes="新增一条work_log")
+    @PostMapping("/add")
+    public Result add(@RequestBody WorkLog workLog) {
+        Boolean flag = workLogService.save(workLog);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.WorkOrderService;
+import  com.aoyang.tms.entity.WorkOrder;
+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>
+    * 运单运单表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "work_orderCRUD接口")
+@RequestMapping("/tms/work_order")
+public class WorkOrderController {
+
+    @Resource
+    private WorkOrderService workOrderService;
+
+    @ApiOperation(value = "获取work_order列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<WorkOrder> pageParam) {
+        Page<WorkOrder> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<WorkOrder> records = workOrderService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改work_order",notes="根据id修改work_order")
+    @PostMapping("/update")
+    public Result update(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.updateById(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加work_order",notes="新增一条work_order")
+    @PostMapping("/add")
+    public Result add(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.WorkOrderReadinfoService;
+import  com.aoyang.tms.entity.WorkOrderReadinfo;
+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>
+    * 运单已读信息表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "work_order_readinfoCRUD接口")
+@RequestMapping("/tms/work_order_readinfo")
+public class WorkOrderReadinfoController {
+
+    @Resource
+    private WorkOrderReadinfoService workOrderReadinfoService;
+
+    @ApiOperation(value = "获取work_order_readinfo列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<WorkOrderReadinfo> pageParam) {
+        Page<WorkOrderReadinfo> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<WorkOrderReadinfo> records = workOrderReadinfoService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改work_order_readinfo",notes="根据id修改work_order_readinfo")
+    @PostMapping("/update")
+    public Result update(@RequestBody WorkOrderReadinfo workOrderReadinfo) {
+        Boolean flag = workOrderReadinfoService.updateById(workOrderReadinfo);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加work_order_readinfo",notes="新增一条work_order_readinfo")
+    @PostMapping("/add")
+    public Result add(@RequestBody WorkOrderReadinfo workOrderReadinfo) {
+        Boolean flag = workOrderReadinfoService.save(workOrderReadinfo);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.aoyang.tms.controller;
+
+
+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 java.util.*;
+import javax.annotation.Resource;
+import  com.aoyang.tms.service.WorkSpotService;
+import  com.aoyang.tms.entity.WorkSpot;
+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>
+    * 运单地点管理表 控制器
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@RestController
+@Slf4j
+@Api(value = "work_spotCRUD接口")
+@RequestMapping("/tms/work_spot")
+public class WorkSpotController {
+
+    @Resource
+    private WorkSpotService workSpotService;
+
+    @ApiOperation(value = "获取work_spot列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<WorkSpot> pageParam) {
+        Page<WorkSpot> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<WorkSpot> records = workSpotService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改work_spot",notes="根据id修改work_spot")
+    @PostMapping("/update")
+    public Result update(@RequestBody WorkSpot workSpot) {
+        Boolean flag = workSpotService.updateById(workSpot);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加work_spot",notes="新增一条work_spot")
+    @PostMapping("/add")
+    public Result add(@RequestBody WorkSpot workSpot) {
+        Boolean flag = workSpotService.save(workSpot);
+        return new Result<>(flag);
+    }
+}

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

@@ -0,0 +1,90 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 车辆休息详情表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("rest_info")
+@ApiModel(value="RestInfo对象", description="车辆休息详情表")
+public class RestInfo 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 = "卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_car_number")
+    private String trailerCarNumber;
+
+    @ApiModelProperty(value = "开始时间")
+    @TableField("start_time")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("note")
+    private String note;
+
+    @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;
+
+
+}

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

@@ -0,0 +1,63 @@
+package com.aoyang.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 运力托运方管理表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("shipper")
+@ApiModel(value="Shipper对象", description="运力托运方管理表")
+public class Shipper implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id,自增")
+    @TableId("shipper_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long shipperId;
+
+    @ApiModelProperty(value = "组织名称")
+    @TableField("shipper_name")
+    private String shipperName;
+
+    @ApiModelProperty(value = "组织简称")
+    @TableField("short_name")
+    private String shortName;
+
+    @ApiModelProperty(value = "托运方营业执照url")
+    @TableField("url")
+    private String url;
+
+    @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;
+
+
+}

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

@@ -0,0 +1,98 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 车辆检查详情表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("truck_check_info")
+@ApiModel(value="TruckCheckInfo对象", description="车辆检查详情表")
+public class TruckCheckInfo 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 = "卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_car_number")
+    private String trailerCarNumber;
+
+    @ApiModelProperty(value = "类型： 1-出车检查 2-收车检查 3-途中检查")
+    @TableField("type")
+    private Integer type;
+
+    @ApiModelProperty(value = "检查表照片url")
+    @TableField("check_url")
+    private String checkUrl;
+
+    @ApiModelProperty(value = "车辆里程数")
+    @TableField("trip")
+    private String trip;
+
+    @ApiModelProperty(value = "车辆里程数照片url")
+    @TableField("trip_url")
+    private String tripUrl;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("note")
+    private String note;
+
+    @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;
+
+
+}

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

@@ -0,0 +1,82 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 运力部门管理表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("truck_dept")
+@ApiModel(value="TruckDept对象", description="运力部门管理表")
+public class TruckDept 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 = "部门名称")
+    @TableField("name")
+    private String name;
+
+    @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 = "创建人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 = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -0,0 +1,89 @@
+package com.aoyang.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 车辆押运员表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("truck_escort")
+@ApiModel(value="TruckEscort对象", description="车辆押运员表")
+public class TruckEscort implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @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 = "用户id（tms.driver.user_id）")
+    @TableField("user_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long userId;
+
+    @ApiModelProperty(value = "用户姓名")
+    @TableField("escort_name")
+    private String escortName;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("note")
+    private String note;
+
+    @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 = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -0,0 +1,90 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 车辆维修详情表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("truck_repair_info")
+@ApiModel(value="TruckRepairInfo对象", description="车辆维修详情表")
+public class TruckRepairInfo 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 = "卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_car_number")
+    private String trailerCarNumber;
+
+    @ApiModelProperty(value = "开始时间")
+    @TableField("start_time")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("note")
+    private String note;
+
+    @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;
+
+
+}

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

@@ -0,0 +1,93 @@
+package com.aoyang.tms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 卡车SIM卡关联表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("truck_sim_card")
+@ApiModel(value="TruckSimCard对象", description="卡车SIM卡关联表")
+public class TruckSimCard implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "卡车id")
+    @TableId("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @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("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "终端号")
+    @TableField("client_id")
+    private String clientId;
+
+    @ApiModelProperty(value = "SIM卡号")
+    @TableField("sim_card")
+    private String simCard;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("note")
+    private String note;
+
+    @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 = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -0,0 +1,90 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 车辆行车日志表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("work_log")
+@ApiModel(value="WorkLog对象", description="车辆行车日志表")
+public class WorkLog 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 = "标题")
+    @TableField("title")
+    private String title;
+
+    @ApiModelProperty(value = "内容")
+    @TableField("note")
+    private String note;
+
+    @ApiModelProperty(value = "运单id（load_order.id）")
+    @TableField("order_id")
+    private String orderId;
+
+    @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 = "卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_car_number")
+    private String trailerCarNumber;
+
+    @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;
+
+
+}

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

@@ -0,0 +1,220 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 运单运单表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("work_order")
+@ApiModel(value="WorkOrder对象", description="运单运单表")
+public class WorkOrder 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 = "运单号")
+    @TableField("order_no")
+    private String orderNo;
+
+    @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 = "司机1id")
+    @TableField("driver_id_one")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long driverIdOne;
+
+    @ApiModelProperty(value = "司机1姓名")
+    @TableField("driver_name_one")
+    private String driverNameOne;
+
+    @ApiModelProperty(value = "司机2id")
+    @TableField("driver_id_two")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long driverIdTwo;
+
+    @ApiModelProperty(value = "司机2姓名")
+    @TableField("driver_name_two")
+    private String driverNameTwo;
+
+    @ApiModelProperty(value = "押运员id")
+    @TableField("escort_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long escortId;
+
+    @ApiModelProperty(value = "押运员姓名")
+    @TableField("escort_name")
+    private String escortName;
+
+    @ApiModelProperty(value = "分配卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_car_number")
+    private String trailerCarNumber;
+
+    @ApiModelProperty(value = "托运方id")
+    @TableField("shipper_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long shipperId;
+
+    @ApiModelProperty(value = "托运方名称")
+    @TableField("shipper_name")
+    private String shipperName;
+
+    @ApiModelProperty(value = "1装车、2卸车")
+    @TableField("type")
+    private Integer type;
+
+    @ApiModelProperty(value = "运单状态：0-待执行 1-前往 2-等待 3-成果报备 4-已完成 5-已关闭")
+    @TableField("order_status")
+    private Integer orderStatus;
+
+    @ApiModelProperty(value = "作业地点id")
+    @TableField("spot_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long spotId;
+
+    @ApiModelProperty(value = "作业地点名")
+    @TableField("spot_name")
+    private String spotName;
+
+    @ApiModelProperty(value = "计划到达时间")
+    @TableField("plan_reach_time")
+    private LocalDateTime planReachTime;
+
+    @ApiModelProperty(value = "计划离开时间")
+    @TableField("plan_leave_time")
+    private LocalDateTime planLeaveTime;
+
+    @ApiModelProperty(value = "实际到达时间")
+    @TableField("actual_reach_time")
+    private LocalDateTime actualReachTime;
+
+    @ApiModelProperty(value = "实际离开时间")
+    @TableField("actual_leave_time")
+    private LocalDateTime actualLeaveTime;
+
+    @ApiModelProperty(value = "计划重量")
+    @TableField("plan_weight")
+    private Integer planWeight;
+
+    @ApiModelProperty(value = "装车实际净重")
+    @TableField("actual_weight")
+    private String actualWeight;
+
+    @ApiModelProperty(value = "作业人员备注")
+    @TableField("worker_note")
+    private String workerNote;
+
+    @ApiModelProperty(value = "调度人员备注")
+    @TableField("note")
+    private String note;
+
+    @ApiModelProperty(value = "车辆里程数")
+    @TableField("trip")
+    private String trip;
+
+    @ApiModelProperty(value = "车辆里程数照片url")
+    @TableField("trip_url")
+    private String tripUrl;
+
+    @ApiModelProperty(value = "排队号")
+    @TableField("queue_no")
+    private String queueNo;
+
+    @ApiModelProperty(value = "装卸车开始时间")
+    @TableField("work_start_time")
+    private LocalDateTime workStartTime;
+
+    @ApiModelProperty(value = "装卸车结束时间")
+    @TableField("work_end_time")
+    private LocalDateTime workEndTime;
+
+    @ApiModelProperty(value = "成果报备磅单号")
+    @TableField("weighting_list_no")
+    private String weightingListNo;
+
+    @ApiModelProperty(value = "成果报备磅单url")
+    @TableField("weighting_list_url")
+    private String weightingListUrl;
+
+    @ApiModelProperty(value = "成果报备皮重")
+    @TableField("pi_weight")
+    private String piWeight;
+
+    @ApiModelProperty(value = "成果报备毛重")
+    @TableField("mao_weight")
+    private String maoWeight;
+
+    @ApiModelProperty(value = "成果报备净重")
+    @TableField("jing_weight")
+    private String jingWeight;
+
+    @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 = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -0,0 +1,95 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 运单已读信息表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("work_order_readinfo")
+@ApiModel(value="WorkOrderReadinfo对象", description="运单已读信息表")
+public class WorkOrderReadinfo 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（tms.load_order.id）")
+    @TableField("order_id")
+    private String orderId;
+
+    @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("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_car_number")
+    private String trailerCarNumber;
+
+    @ApiModelProperty(value = "分配卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "用户id（tms.driver.user_id）")
+    @TableField("user_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long userId;
+
+    @ApiModelProperty(value = "用户姓名")
+    @TableField("user_name")
+    private String userName;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("worker_note")
+    private String workerNote;
+
+    @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;
+
+
+}

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

@@ -0,0 +1,93 @@
+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 com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+    * 运单地点管理表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("work_spot")
+@ApiModel(value="WorkSpot对象", description="运单地点管理表")
+public class WorkSpot implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id,自增")
+    @TableId(value = "spot_id", type = IdType.AUTO)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long spotId;
+
+    @ApiModelProperty(value = "地点名")
+    @TableField("spot_name")
+    private String spotName;
+
+    @ApiModelProperty(value = "具体地址")
+    @TableField("adress")
+    private String adress;
+
+    @ApiModelProperty(value = "1装车点、2卸车点、3检修点，不能为空")
+    @TableField("type")
+    private Integer type;
+
+    @ApiModelProperty(value = "围栏经度")
+    @TableField("longitude")
+    private String longitude;
+
+    @ApiModelProperty(value = "围栏纬度")
+    @TableField("latitude")
+    private String latitude;
+
+    @ApiModelProperty(value = "有效距离,单位米")
+    @TableField("valid_distance")
+    private Integer validDistance;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("note")
+    private String note;
+
+    @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 = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -1,32 +0,0 @@
-package com.aoyang.tms.exception;
-
-import com.aoyang.common.result.Result;
-import com.aoyang.tms.util.ErrCodeEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Objects;
-
-/**
- * @description:
- * @author: xumingrui
- * @create: 2020 -01 -28 -20:17
- */
-@Slf4j
-@ControllerAdvice
-public class GlobalExceptionHandler {
-
-    private final static String EXCEPTION_MSG_KEY = "Exception message : ";
-
-    @ResponseBody
-    @ExceptionHandler({MethodArgumentNotValidException.class })
-    public Result handleValidException(MethodArgumentNotValidException e){
-        //日志记录错误信息
-        log.error( Objects.requireNonNull(e.getBindingResult().getFieldError()).getDefaultMessage());
-        //将错误信息返回给前台
-        return new Result (ErrCodeEnum.PARAM_VALID_ERROR.getCode (), Objects.requireNonNull(e.getBindingResult().getFieldError()).getDefaultMessage());
-    }
-}

src/main/java/com/aoyang/tms/mapper/RestInfoMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.RestInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 车辆休息详情表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface RestInfoMapper extends BaseMapper<RestInfo> {
+
+}

src/main/java/com/aoyang/tms/mapper/ShipperMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.Shipper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 运力托运方管理表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface ShipperMapper extends BaseMapper<Shipper> {
+
+}

src/main/java/com/aoyang/tms/mapper/TruckCheckInfoMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.TruckCheckInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 车辆检查详情表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface TruckCheckInfoMapper extends BaseMapper<TruckCheckInfo> {
+
+}

src/main/java/com/aoyang/tms/mapper/TruckDeptMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.TruckDept;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 运力部门管理表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface TruckDeptMapper extends BaseMapper<TruckDept> {
+
+}

src/main/java/com/aoyang/tms/mapper/TruckEscortMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.TruckEscort;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 车辆押运员表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface TruckEscortMapper extends BaseMapper<TruckEscort> {
+
+}

src/main/java/com/aoyang/tms/mapper/TruckRepairInfoMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.TruckRepairInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 车辆维修详情表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface TruckRepairInfoMapper extends BaseMapper<TruckRepairInfo> {
+
+}

src/main/java/com/aoyang/tms/mapper/TruckSimCardMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.TruckSimCard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 卡车SIM卡关联表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface TruckSimCardMapper extends BaseMapper<TruckSimCard> {
+
+}

src/main/java/com/aoyang/tms/mapper/WorkLogMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.WorkLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 车辆行车日志表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface WorkLogMapper extends BaseMapper<WorkLog> {
+
+}

src/main/java/com/aoyang/tms/mapper/WorkOrderMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.WorkOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 运单运单表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
+
+}

src/main/java/com/aoyang/tms/mapper/WorkOrderReadinfoMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.WorkOrderReadinfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 运单已读信息表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface WorkOrderReadinfoMapper extends BaseMapper<WorkOrderReadinfo> {
+
+}

src/main/java/com/aoyang/tms/mapper/WorkSpotMapper.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.WorkSpot;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 运单地点管理表 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface WorkSpotMapper extends BaseMapper<WorkSpot> {
+
+}

src/main/java/com/aoyang/tms/service/RestInfoService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.RestInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 车辆休息详情表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface RestInfoService extends IService<RestInfo> {
+
+}

src/main/java/com/aoyang/tms/service/ShipperService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.Shipper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 运力托运方管理表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface ShipperService extends IService<Shipper> {
+
+}

src/main/java/com/aoyang/tms/service/TruckCheckInfoService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.TruckCheckInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 车辆检查详情表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface TruckCheckInfoService extends IService<TruckCheckInfo> {
+
+}

src/main/java/com/aoyang/tms/service/TruckDeptService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.TruckDept;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 运力部门管理表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface TruckDeptService extends IService<TruckDept> {
+
+}

src/main/java/com/aoyang/tms/service/TruckEscortService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.TruckEscort;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 车辆押运员表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface TruckEscortService extends IService<TruckEscort> {
+
+}

src/main/java/com/aoyang/tms/service/TruckRepairInfoService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.TruckRepairInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 车辆维修详情表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface TruckRepairInfoService extends IService<TruckRepairInfo> {
+
+}

src/main/java/com/aoyang/tms/service/TruckSimCardService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.TruckSimCard;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 卡车SIM卡关联表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface TruckSimCardService extends IService<TruckSimCard> {
+
+}

src/main/java/com/aoyang/tms/service/WorkLogService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.WorkLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 车辆行车日志表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface WorkLogService extends IService<WorkLog> {
+
+}

src/main/java/com/aoyang/tms/service/WorkOrderReadinfoService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.WorkOrderReadinfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 运单已读信息表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface WorkOrderReadinfoService extends IService<WorkOrderReadinfo> {
+
+}

src/main/java/com/aoyang/tms/service/WorkOrderService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.WorkOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 运单运单表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface WorkOrderService extends IService<WorkOrder> {
+
+}

src/main/java/com/aoyang/tms/service/WorkSpotService.java

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.WorkSpot;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 运单地点管理表 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+public interface WorkSpotService extends IService<WorkSpot> {
+
+}

src/main/java/com/aoyang/tms/service/impl/RestInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.RestInfo;
+import com.aoyang.tms.mapper.RestInfoMapper;
+import com.aoyang.tms.service.RestInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆休息详情表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class RestInfoServiceImpl extends ServiceImpl<RestInfoMapper, RestInfo> implements RestInfoService {
+
+}

src/main/java/com/aoyang/tms/service/impl/ShipperServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.Shipper;
+import com.aoyang.tms.mapper.ShipperMapper;
+import com.aoyang.tms.service.ShipperService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 运力托运方管理表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class ShipperServiceImpl extends ServiceImpl<ShipperMapper, Shipper> implements ShipperService {
+
+}

src/main/java/com/aoyang/tms/service/impl/TruckCheckInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.TruckCheckInfo;
+import com.aoyang.tms.mapper.TruckCheckInfoMapper;
+import com.aoyang.tms.service.TruckCheckInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆检查详情表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class TruckCheckInfoServiceImpl extends ServiceImpl<TruckCheckInfoMapper, TruckCheckInfo> implements TruckCheckInfoService {
+
+}

src/main/java/com/aoyang/tms/service/impl/TruckDeptServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.TruckDept;
+import com.aoyang.tms.mapper.TruckDeptMapper;
+import com.aoyang.tms.service.TruckDeptService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 运力部门管理表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class TruckDeptServiceImpl extends ServiceImpl<TruckDeptMapper, TruckDept> implements TruckDeptService {
+
+}

src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.TruckEscort;
+import com.aoyang.tms.mapper.TruckEscortMapper;
+import com.aoyang.tms.service.TruckEscortService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆押运员表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, TruckEscort> implements TruckEscortService {
+
+}

src/main/java/com/aoyang/tms/service/impl/TruckRepairInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.TruckRepairInfo;
+import com.aoyang.tms.mapper.TruckRepairInfoMapper;
+import com.aoyang.tms.service.TruckRepairInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆维修详情表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class TruckRepairInfoServiceImpl extends ServiceImpl<TruckRepairInfoMapper, TruckRepairInfo> implements TruckRepairInfoService {
+
+}

src/main/java/com/aoyang/tms/service/impl/TruckSimCardServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.TruckSimCard;
+import com.aoyang.tms.mapper.TruckSimCardMapper;
+import com.aoyang.tms.service.TruckSimCardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 卡车SIM卡关联表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class TruckSimCardServiceImpl extends ServiceImpl<TruckSimCardMapper, TruckSimCard> implements TruckSimCardService {
+
+}

src/main/java/com/aoyang/tms/service/impl/WorkLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.WorkLog;
+import com.aoyang.tms.mapper.WorkLogMapper;
+import com.aoyang.tms.service.WorkLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆行车日志表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> implements WorkLogService {
+
+}

src/main/java/com/aoyang/tms/service/impl/WorkOrderReadinfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.WorkOrderReadinfo;
+import com.aoyang.tms.mapper.WorkOrderReadinfoMapper;
+import com.aoyang.tms.service.WorkOrderReadinfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 运单已读信息表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class WorkOrderReadinfoServiceImpl extends ServiceImpl<WorkOrderReadinfoMapper, WorkOrderReadinfo> implements WorkOrderReadinfoService {
+
+}

src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.WorkOrder;
+import com.aoyang.tms.mapper.WorkOrderMapper;
+import com.aoyang.tms.service.WorkOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 运单运单表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
+
+}

src/main/java/com/aoyang/tms/service/impl/WorkSpotServiceImpl.java

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.WorkSpot;
+import com.aoyang.tms.mapper.WorkSpotMapper;
+import com.aoyang.tms.service.WorkSpotService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 运单地点管理表 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Service
+public class WorkSpotServiceImpl extends ServiceImpl<WorkSpotMapper, WorkSpot> implements WorkSpotService {
+
+}

src/main/java/com/aoyang/tms/util/BadRequestExceptionHandler.java

@@ -1,62 +0,0 @@
-package com.aoyang.tms.util;
-
-import java.util.List;
-
-import org.springframework.http.converter.HttpMessageConversionException;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.FieldError;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@RestControllerAdvice
-public class BadRequestExceptionHandler {
-
-    /**
-     * 校验错误拦截处理
-     *
-     * @param exception
-     *            错误信息集合
-     * @return 错误信息
-     */
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public Result validationBodyException(MethodArgumentNotValidException exception) {
-
-        BindingResult result = exception.getBindingResult();
-        StringBuffer message = new StringBuffer();
-        if (result.hasErrors()) {
-
-            List<ObjectError> errors = result.getAllErrors();
-
-            errors.forEach(p -> {
-
-                FieldError fieldError = (FieldError)p;
-                log.error("Data check failure : object{" + fieldError.getObjectName() + "},field{"
-                    + fieldError.getField() + "},errorMessage{" + fieldError.getDefaultMessage() + "}");
-                message.append(fieldError.getDefaultMessage()).append(";");
-            });
-
-        }
-        return new Result<>(20000, message.toString());
-    }
-
-    /**
-     * 参数
-     *
-     * @param exception
-     *            错误
-     * @return 错误信息
-     */
-    @ExceptionHandler(HttpMessageConversionException.class)
-    public Result parameterTypeException(HttpMessageConversionException exception) {
-
-        log.error(exception.getCause().getLocalizedMessage());
-        return new Result(20000, "类型转换错误");
-
-    }
-
-}

src/main/java/com/aoyang/tms/util/BaseLocalDateFormatUtils.java

@@ -1,55 +0,0 @@
-package com.aoyang.tms.util;
-
-/**
- * @Description: ${DESCRIPTION}
- * @Author guoyong
- * @Date 2021/1/27 16:52
- * @Version 1.0
- */
-
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Date;
-
-/**
- * @author wsq
- * @version BaseLocalDateFormatUtils.java  2020/8/27  上午9:32 下午
- */
-public class BaseLocalDateFormatUtils {
-
-    /**
-     * Date转LocalDateTime
-     *
-     * @param date Date
-     * @return LocalDateTime
-     */
-    public static LocalDateTime dateToLocalDateTime(Date date) {
-        try {
-            Instant instant = date.toInstant();
-            ZoneId zoneId = ZoneId.systemDefault();
-            return instant.atZone(zoneId).toLocalDateTime();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * LocalDateTime转Date
-     *
-     * @param localDateTime LocalDateTime
-     * @return Date
-     */
-    public static Date localDateTimeToDate(LocalDateTime localDateTime) {
-        try {
-            ZoneId zoneId = ZoneId.systemDefault();
-            ZonedDateTime zdt = localDateTime.atZone(zoneId);
-            return Date.from(zdt.toInstant());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}

src/main/java/com/aoyang/tms/util/BigDecimalUtils.java

@@ -1,37 +0,0 @@
-package com.aoyang.tms.util;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-/**
- * @Description: ${DESCRIPTION}
- * @Author guoyong
- * @Date 2020/12/17 15:12
- * @Version 1.0
- */
-public class BigDecimalUtils {
-
-    /**
-     * Object转BigDecimal类
-     *
-     * @param value 要转的object类型
-     * @return 转成的BigDecimal类型数据
-     */
-    public static BigDecimal getBigDecimal(Object value) {
-        BigDecimal ret = null;
-        if (value != null) {
-            if (value instanceof BigDecimal) {
-                ret = (BigDecimal) value;
-            } else if (value instanceof String) {
-                ret = new BigDecimal((String) value);
-            } else if (value instanceof BigInteger) {
-                ret = new BigDecimal((BigInteger) value);
-            } else if (value instanceof Number) {
-                ret = new BigDecimal(((Number) value).doubleValue());
-            } else {
-                throw new ClassCastException("Not possible to coerce [" + value + "] from class " + value.getClass() + " into a BigDecimal.");
-            }
-        }
-        return ret;
-    }
-}

src/main/java/com/aoyang/tms/util/DateUtils.java

@@ -1,433 +0,0 @@
-package com.aoyang.tms.util;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Calendar;
-
-/**
- * @Description: 日期时间工具类
- * @Author guoyong
- * @Date 2020/12/16 15:10
- * @Version 1.0
- */
-public class DateUtils {
-
-    public static void main(String[] args) {
-
-//        System.out.println(getCurrentYear());
-//        System.out.println(getCurrentMonth());
-//
-//
-//        int lastMonth = getLastMonth();
-//        System.out.println(lastMonth);
-//        int currentMonth = getCurrentMonth();
-//        System.out.println(currentMonth);
-//        int lastMonthYear = getLastMonthYear();
-//        System.out.println(lastMonthYear);
-//
-//        String start = getLastMonthPeriodInitialTime();
-//        System.out.println(start);
-//        String end = getLastPeriodMonthEndTime();
-//        System.out.println(end);
-//
-//        int lastPyear = getLastPeriodYear();
-//        int latPmonth = getLastPeriodMonth();
-//
-//        System.out.println(lastPyear);
-//        System.out.println(latPmonth);
-//
-//        String aaa = DateUtils.getPeriodStartTime(2020, 10);
-//        String bbb = DateUtils.getPeriodEndTime(2020, 10);
-//        System.out.println(aaa);
-//        System.out.println(bbb);
-//
-//        String ccc = DateUtils.getAfterDays(2);
-//        LocalDateTime date = LocalDateTime.now();
-//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-//        String now = formatter.format(LocalDateTime.now());
-//        int hour = hours(now, ccc);
-//        System.out.println("ccc:" + ccc);
-//        System.out.println(hour);
-//
-//        int hours = hours("2021-03-08 00:00:00", "2021-03-09 23:59:59");
-//        System.out.println(hours);
-//
-//        System.out.println(getLastMonthStr());
-//
-//        int month = 2;
-//        String vo1 = getFirstDayOfMonth(month);
-//        String vo2 = getFirstDayOfMonth(month + 1);
-//        System.out.println(vo1);
-//        System.out.println(vo2);
-//
-//        long time = 30 * 60 * 1000;
-//        String time2 = "2020-06-26 19:00:00";
-//        String time1 = "2020-06-26 19:30:30";
-//        DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-//        LocalDateTime ends = LocalDateTime.parse(time1, dtf2);
-//        LocalDateTime nows = LocalDateTime.parse(time2, dtf2);
-//        Duration duration = Duration.between(nows, ends);
-//        long millis = duration.toMillis();
-//        if (millis < time) {
-//            System.out.println("不能保存！！！");
-//        }else{
-//            System.out.println("可以保存！！！");
-//        }
-
-        LocalDateTime nowS = LocalDateTime.now();
-        String operateTime = DateUtils.localDateTimeToString(nowS);
-
-
-        System.out.println(nowS);
-        System.out.println(operateTime);
-
-    }
-
-    /**
-     * 时间格式字符串转LocalDateTime
-     *
-     * @param time
-     * @return
-     */
-    public static LocalDateTime parseStringToDateTime(String time) {
-        String format = "yyyy-MMM-dd HH:mm:ss";
-        DateTimeFormatter df = DateTimeFormatter.ofPattern(format);
-        return LocalDateTime.parse(time, df);
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取当前时间的上个月
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static int getLastMonth() {
-        LocalDate date = LocalDate.now();
-        int lastMonth = date.minusMonths(1).getMonth().getValue();
-        return lastMonth;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取上个月，格式如yyyy-MM
-     * @Date 2021/4/13
-     * @Param
-     **/
-    public static String getLastMonthStr() {
-        LocalDate date = LocalDate.now();
-        date = date.minusMonths(1);
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
-        return formatter.format(date);
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取当前时间的当前月
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static int getCurrentMonth() {
-        LocalDate date = LocalDate.now();
-        int lastMonth = date.getMonth().getValue();
-        return lastMonth;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取当前日期
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static int getCurrentDay() {
-        LocalDate date = LocalDate.now();
-        int day = date.getDayOfMonth();
-        return day;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取今天日期，年月日格式
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static String getCurday() {
-        LocalDate date = LocalDate.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        return formatter.format(date);
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取当前时间的上个月的所在年份
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static int getLastMonthYear() {
-        LocalDate date = LocalDate.now();
-        int lastMonthYear = date.minusMonths(1).getYear();
-        return lastMonthYear;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取当前时间的上个月的所在年份
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static int getCurrentYear() {
-        LocalDate date = LocalDate.now();
-        int currentYear = date.getYear();
-        return currentYear;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 上期账单的期初时间点, 上个月的25号00：00：00，注，在筛选数据时大于等于此时间点
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static String getLastMonthPeriodInitialTime() {
-        int currentDay = getCurrentDay();
-        int year = getLastMonthYear();
-        int month = getLastMonth() - 1;
-        if (currentDay >= 25) {
-            month = getLastMonth();
-        }
-        String monthString = month < 10 ? "0" + month : month + "";
-        String lastMonthInitialPeriodTime = year + "-" + monthString + "-" + "25 00:00:00";
-        return lastMonthInitialPeriodTime;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 上期账单的期末时间点，当前月份的25号00：00：00，注，在筛选数据时，小于此时间点，不能等于
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static String getLastPeriodMonthEndTime() {
-        int currentDay = getCurrentDay();
-        int month = getCurrentMonth();
-        if (currentDay < 25) {
-            month = getLastMonth();
-        }
-        int year = getLastMonthYear();
-
-        if (month == 1) {
-            year = getCurrentYear();
-        }
-        String monthString = month < 10 ? "0" + month : month + "";
-        String lastMonthInitialPeriodTime = year + "-" + monthString + "-" + "25 00:00:00";
-        return lastMonthInitialPeriodTime;
-    }
-
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 上个账期的年份
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static int getLastPeriodYear() {
-        int currentDay = getCurrentDay();
-        int month = getCurrentMonth();
-        if (currentDay < 25) {
-            month = getLastMonth();
-        }
-        int year = getLastMonthYear();
-
-        if (month == 1) {
-            year = getCurrentYear();
-        }
-        return year;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 上个账期的月份
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static int getLastPeriodMonth() {
-        int currentDay = getCurrentDay();
-        int month = getCurrentMonth();
-        if (currentDay < 25) {
-            month = getLastMonth();
-        }
-        return month;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 账单的期初时间点, 某年某月的25号00：00：00，注，在筛选数据时大于等于此时间点
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static String getPeriodStartTime(int year, int month) {
-        if (month == 1) {
-            month = 12;
-            year = year - 1;
-        } else {
-            month = month - 1;
-        }
-        String monthString = month < 10 ? "0" + month : month + "";
-        String periodStartTime = year + "-" + monthString + "-" + "25 00:00:00";
-        return periodStartTime;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 账单的期末时间点，某年某月份的25号00:00:00，注，在筛选数据时，小于此时间点，不能等于
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static String getPeriodEndTime(int year, int month) {
-
-        String monthString = month < 10 ? "0" + month : month + "";
-        String periodEndTime = year + "-" + monthString + "-" + "25 00:00:00";
-        return periodEndTime;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取上个账期的年
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static int getLastPeriodYear(int year, int month) {
-        if (month == 1) {
-            year = year - 1;
-        }
-        int lastPeriodYear = year;
-        return lastPeriodYear;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取上个账期的月
-     * @Date 2020/12/16
-     * @Param
-     **/
-
-    public static int getLastPeriodMonth(int year, int month) {
-        if (month == 1) {
-            month = 12;
-        } else {
-            month = month - 1;
-        }
-        int lastPeriodMonth = month;
-        return lastPeriodMonth;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取某天的几天后的日期，年月日格式
-     * @Date 2020/12/16
-     * @Param
-     **/
-    public static String getAfterDays(int days) {
-        LocalDateTime date = LocalDateTime.now();
-        LocalDateTime afterDay = date.plusDays(days);
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        return formatter.format(afterDay);
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取两个时间段的小时差
-     * @Date 2021/03/08
-     * @Param
-     **/
-    public static int hours(String fromDate, String toDate) {
-        SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            long from = simpleFormat.parse(fromDate).getTime();
-            long to = simpleFormat.parse(toDate).getTime();
-            int hours = (int) ((to - from) / (1000 * 60 * 60));
-            return hours;
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return 0;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description LocalDateTime转String
-     * @Date 2021/03/08
-     * @Param
-     **/
-    public static String localDateTimeToString(LocalDateTime date) {
-        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        String localTimeStr = df.format(date);
-        return localTimeStr;
-    }
-
-    /**
-     * 获取当前月第一天
-     *
-     * @param month
-     * @return
-     */
-    public static String getFirstDayOfMonth(int month) {
-        Calendar calendar = Calendar.getInstance();
-        // 设置月份
-        calendar.set(Calendar.MONTH, month - 1);
-        // 获取某月最小天数
-        int firstDay = calendar.getActualMinimum(Calendar.DAY_OF_MONTH);
-        // 设置日历中月份的最小天数
-        calendar.set(Calendar.DAY_OF_MONTH, firstDay);
-        // 格式化日期
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        String vo = sdf.format(calendar.getTime()) + " 00:00:00";
-        return vo;
-    }
-
-    /**
-     * 时间格式字符串转LocalDate
-     *
-     * @param day
-     * @return
-     */
-    public static LocalDate parseStringToDate(String day) {
-        String format = "yyyy-MM-dd";
-        DateTimeFormatter df = DateTimeFormatter.ofPattern(format);
-        return LocalDate.parse(day, df);
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取指定日期的昨天，年月日格式
-     * @Date 2021/03/12
-     * @Param
-     **/
-    public static String getYesterday(String date) {
-        LocalDate localDate =
-                LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        LocalDate yesterday = localDate.plusDays(-1);
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        return formatter.format(yesterday);
-    }
-
-}

src/main/java/com/aoyang/tms/util/ErrCodeEnum.java

@@ -1,159 +0,0 @@
-package com.aoyang.tms.util;
-
-/**
- * @description:
- * @author: xumingrui
- * @create: 2020 -01 -21 -14:47
- */
-
-public enum ErrCodeEnum {
-    OK(0, "成功"), BAD_PARAM(8901, "参数错误"), PLAT_FORM_PRICE_EXITS(8902, "该组织已维护平台价，请进入修改!"),
-    CARRIER_NOT_EXITS(8903, "物流公司不存在"), GASSTATION_NOT_EXITS(8904, "加气站不存在"), UPLOAD_WEIGHT_ERROR(8905, "出港重量录入错误"),
-    UPLOAD_URL_ERROR(8906, "请上传磅单"), LNG_FROM_ERROR(8907, "请选择液源地"), ORDER_STATUS_ERROR(8908, "订单状态异常"),
-    ORDER_NOT_EXITS(8909, "订单不存在"), DOWNLOAD_WEIGHT_ERROR(8910, "到港重量需大于0"),
-    GASSTATION_STATUS_ERROR(8911, "加气站不存在或状态异常"), OPERATION_ERROR(8912, "操作失败"), LNG_FROM_EMPTY(8913, "液源地不存在"),
-    UN_ABLE_MODIFY_ERROR(8914, "该订单状态下不允许再做修改"),
-    UN_ABLE_CANCEL_ERROR(8915, "此订单不能做取消操作（已提报、已锁定、已确认、变更待处理、已出港状态下可以取消）"),
-    UN_ABLE_MODIFY_HANDLE_ERROR(8916, "此订单不需要进行处理"), UN_ABLE_CONFIRM_ERROR(8917, "此订单不需要进行确认"),
-    UN_ABLE_LEAVE_ERROR(8918, "此订单不能做出港操作"), UN_ABLE_REACH_ERROR(8919, "此订单不能做签收操作"), LEAVE_TIME_ERROR(8920, "请录入出港时间"),
-    DRIVER_NAME_ERROR(8921, "请录入驾驶员姓名"), DRIVER_CELLPHONE_ERROR(8922, "请录入驾驶员联系方式"), CAR_NUMBER_ERROR(8923, "请录入车牌号"),
-    DOWNLOAD_URL_ERROR(8924, "请上传到站磅单"), UN_ABLE_EXCEPTION_APPLY_ERROR(8925, "只有出港状态下的计划可以进行异常申请"),
-    UN_ABLE_EXCEPTION_HANDLE_ERROR(8926, "只有异常待处理下的计划可以进行异常处理"), UN_ABLE_COMPLETE_ERROR(8927, "此订单不能做完成操作"),
-    CHECK_WEIGHT_ERROR(8928, "出港重量录入错误"), OPERATE_TIME_ERROR(8929, "请输入操作开始时间和结束时间"),
-    CAR_NUMBER_CANNOT_UPDATE(8930, "车牌号不允许进行修改!"),
-    UN_ABLE_UPLOAD_URL(8931, "此状态下不能上传到站磅单!"),
-    REACHED_STATUS(8932, "此订单已签收!"),
-
-    ACCOUNTSERVER_ERROR(2418, "进入ACCOUNT熔断"), MESSAGESERVER_ERROR(2419, "进入MESSAGE熔断"),
-    ADD_CARRIAGE_PRICE_ERROR(2500, "运费设置失败"), SET_HARBOUR_PRICE_ERROR(2501, "设置出港价失败"),
-    SET_AREA_BENEFIT_ERROR(2502, "设置区域优惠失败"), DELETE_AREA_BENEFIT_ERROR(2503, "删除区域优惠失败"),
-    SET_CARRIAGE_FEE_BEFORE(2504, "请先设置运费单价"), SET_DEFAULT_PORT_FIRST(2505, "先设置默认港口"),
-    SET_PRICE_CONFIG_ERROR(2506, "设置平台挂牌价失败"), RELEASE_DATA_EMPTY(2507, "无可发布数据"), APPLY_RELEASE_FAIL(2508, "申请发布失败"),
-    AUDIT_RELEASE_FAIL(2509, "审核发布失败"), RELEASE_FAIL(2510, "发布失败"), RELEASE_SATUS_ERROR(2511, "申请单状态异常"),
-    REBATE_PRICE_ERROR(2512, "优惠返利设置失败"), AOYANG_PRICE_ERROR(2513, "奥扬优惠设置失败"), PRICE_CONFIG_ERROR(2514, "请先完善未配置的数据"),
-    USER_SERVER_ERROR(2515, "进入用户服务熔断"), RELEASE_TIME_ERROR(2516, "发布时间应大于当前日期"),
-    ADD_STOCK_LOG_ERROR(2517, "增加库存变动日志失败"), GASSTATION_ID_EMPTY(2401, "加气站id不能为空"),
-    SERVICE_FEE_EMPTY_ERROR(2413, "服务费不能为空"), SET_PLANT_PRICE(2420, "请先设置平台价格"),
-    GASSTATION_SERVIE_FEE_LT_PLANT_PRICE(2421, "不能高于平台服务费"), UPDATE_FEE_ERROR(2425, "修改服务费失败"),
-    UPDATE_SERVICE_FEE_FAIL(2415, "修改服务费失败"), LIST_PRICE_MODIFY_FAIL(2411, "维护气价失败"),
-    LIST_PRICE_MODIFY_LOG_FAIL(2412, "维护气价日志失败"), NO_SYSTEM_CASHIER_ERROR(2426, "加气站默认收银员不存在"),
-    ITUDE_ERROR(2405, "坐标错误"), USER_NOT_EXIT_ERROR(2406, "用户不存在"), DATABASE_ERROR(2301, "数据库操作失败"),
-    DRIVER_ID_EMPTY(2302, "司机id不能为空"), CARRIER_ID_EMPTY(2303, "物流公司id不能为空"), TRUCK_ID_EMPTY(2304, "卡车id不能为空"),
-    TRUCK_NOT_BINDING(2320, "卡车未绑定"), PARAM_VALID_ERROR(2321, "参数错误"), REDISS_CONNECTION_ERROR(3330, "rediss 连接失败"),
-    USERSERVER_ERROR(3301, "进入USER熔断"), USER_ADD_ERROR(2323, "新增司机失败"), DRIVER_MODIFY_FAIL(2323, "修改司机信息失败"),
-    TRUCK_ADD_FAIL(2324, "新增卡车失败"), TRUCK_DRIVER_REF_FAIL(2325, "卡车-司机 失败"), ORG_NAME_EMPTY_ERROR(2326, "组织名称为空"),
-    ORG_ID_EMPTY_ERROR(2327, "组织ID为空"), MOBILE_EMPTY_ERROR(2328, "手机号为空"), TRUCK_EMPTY_ERROR(2329, "该卡车不存在或已停用"),
-    DRIVER_BINDING_ERROR(2330, "司机已绑定"), CAR_NUMBER_EXITS_ERROR(2331, "该车牌号已存在"), NOT_BINDING_ERROR(2332, "未绑定车辆"),
-    CHECK_DRIVER_FIRST(2333, "请选择要绑定的司机"), START_COMPANY_FIRST(2334, "请先启动所属企业"), TRUCK_IS_STOP(2335, "卡车已停用"),
-    FILE_FORMAT_ERROR(2336, "文件格式错误"), FILE_NOT_BELONG_ORG_ERROR(2337, "卡车所属物流公司错误"), FILE_IS_NULL_ERROR(2338, "文件不存在"),
-    IMPORT_ERROR(2339, "导入失败"), SAVE_ERROR(2340, "保存失败"), PRICE_CONFIG_SAVE_ERROR(2341, "同步优惠气价 price_config 失败"),
-    GWAY_SAVE_ERROR(2342, "保存修改日志错误"), ALDEY_PUBLISH_ERROR(2343, "状态异常"), PUBLISH_DATE_ERROR(2344, "发布日期错误"),
-    TRUCK_ACCOUNT_NONZERO_ERROR(2345, "司机账户余额不为空"),
-    SETTLESERVER_ERROR(4301, "进入SETTLE熔断"),
-    /**
-     * 会员账号信息不存在
-     */
-    TSY_NOT_EXIST_ERROR(3009, "信息不存在"),
-    /**
-     * 存在加气站使用该标签,不允许删除
-     */
-    HAVE_GASSTATION(3010, "存在加气站使用该标签,不允许删除"),
-
-    /**
-     * 计划签收中
-     */
-    PURCHASE_IS_REACHING(3011, "计划签收中"),
-
-    /**
-     * 车辆已绑定其他司机
-     */
-    TRUCK_HAS_BINDING_DRIVRER(3022, "车辆已绑定其他司机"),
-
-    /**
-     * 司机有加入物流公司申请
-     */
-    DRIVER_HAS_ENTRY_APPLY(3023, "您有加入物流公司的申请未完成，请结束申请后再添加车辆"),
-
-    /**
-     * 司机有退出物流公司申请
-     */
-    DRIVER_HAS_QUIT_APPLY(3024, "您有退出物流公司的申请未完成，请结束申请后再添加车辆"),
-
-    /**
-     * 车辆已经在您所在的物流公司
-     */
-    TRUCK_HAS_BEEN_IN_YOUR_CARRIER(3025, "车辆已在您所在的物流公司，请联系管理员绑定"),
-
-    /**
-     * 车辆已经在其他物流公司
-     */
-    TRUCK_HAS_BEEN_IN_OTHER_CARRIER(3026, "车辆已在其他物流公司，请联系运营找回"),
-
-    /**
-     * 车辆已经申请加入物流公司
-     */
-    TRUCK_HAS_BEEN_IN_APPLY(3027, "车辆已经申请加入物流公司，请联系管理员审批"),
-
-    /**
-     * 司机更换车辆失败
-     */
-    CHANGE_TRUCK_BY_DRIVER_FAIL(3028, "司机更换车辆失败"),
-
-    /**
-     * 车牌号不一致
-     */
-    CAR_NUMBER_NOT_SAME(3029, "当前行驶证车牌号与保存的车牌号不一致，请更换行驶证再试"),
-
-    /**
-     * 天然气类型
-     */
-    NOT_TYPE_OF_NATURAL_GAS(3030, "行驶证识别的车辆类型不是天然气类型"),
-
-    /**
-     * 车辆有待支付订单
-     */
-    TRUCK_HAS_UNPAY_ORDER(3031, "车辆有待支付订单, 请先处理完成"),
-
-    /**
-     * 车辆账户余额不为0
-     */
-    TRUCK_ACCOUNT_NOT_ZERO(3032, "车辆账户余额不为0，请先处理完成"),
-
-    /**
-     * 车辆加入物流公司申请未处理完成
-     */
-    TRUCK_SELF_ENTRY_UNFINISH(3033, "您有车辆加入物流公司的申请未处理完，请到车辆管理页面查询申请状态"),
-
-    /**
-     * 司机未绑定车辆，不能添加气瓶编号
-     */
-    DRIVER_HAVE_NO_TRUCK_UN_GAS_CYLINDER(3034, "司机未绑定车辆，不能添加气瓶编号"),
-
-    /**
-     * 此车已配置直销模式
-     */
-    DIRECT_SALES_HAVE_CONFIG_TRUCK(3037, "此车已配置直销模式"),
-
-    /**
-     * 经销模式物流公司不能添加直销车辆
-     */
-    DISTRIBUTE_SALES_CAN_NOT_TRUCK(3039, "经销模式物流公司不能添加直销车辆"),
-
-    ;
-
-    private Integer code;
-    private String message;
-
-    ErrCodeEnum(Integer code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}

src/main/java/com/aoyang/tms/util/FileUtil.java

@@ -1,151 +0,0 @@
-package com.aoyang.tms.util;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.io.ClassPathResource;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * @Description: ${DESCRIPTION}
- * @Author guoyong
- * @Date 2020/12/24 10:32
- * @Version 1.0
- */
-public class FileUtil {
-
-    private static final boolean isWin = System.getProperty("os.name").toLowerCase().contains("win");
-
-    private static final boolean isLinux = System.getProperty("os.name").toLowerCase().indexOf("linux") >= 0;
-
-    /**
-     * @Author guoyong
-     * @Description /获取临时文件路径
-     * @Date  2020/12/25
-     * @Param
-     * @return
-    **/
-    public static String getTempDirectoryPath() {
-        if (isWin) {
-            return FileUtils.getTempDirectoryPath();
-        }
-        if (isLinux) {
-            return "/tmp/";
-        }
-        return "";
-    }
-
-    public static void main(String[] args) {
-
-        File aaa = FileUtils.getTempDirectory();
-        System.out.println(aaa.getName());
-        System.out.println(aaa.length());
-
-        System.out.println("----");
-        String path = FileUtils.getTempDirectoryPath();
-        String tplfileName = "carrier_list_tpl.xlsx";
-        String prefix = FileUtil.getFilePrefix(tplfileName);
-        String tmpFileName = FileUtil.getTmpFileName(prefix);
-
-        File srcFile = FileUtil.getFileTpl(tplfileName);
-        File destFile = new File(path + tmpFileName);
-        try {
-            FileUtils.copyFile(srcFile, destFile);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        System.out.println(destFile.length());
-        System.out.println(destFile.getName());
-
-
-        String aaaaaa = "aaaa.aaa.jpg";
-        System.out.println(getFileSuffix(aaaaaa));
-
-
-
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取文件名前缀
-     * @Date 2020/12/24
-     * @Param
-     **/
-    public static String getFilePrefix(String fileName) {
-        if (StringUtils.isBlank(fileName)) {
-            return "";
-        }
-        String prefix = fileName.substring(0, fileName.lastIndexOf("."));
-        return prefix;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取文件名后缀
-     * @Date 2020/12/24
-     * @Param
-     **/
-    public static String getFileSuffix(String fileName) {
-        if (StringUtils.isBlank(fileName)) {
-            return "";
-        }
-        String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
-        return suffix;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 根据获取临时文件名
-     * @Date 2020/12/24
-     * @Param
-     **/
-    public static String getTmpFileName(String tplfileName) {
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmssS");
-        String tmpFileName = tplfileName + "_" + formatter.format(new Date()) + ".xlsx";
-        return tmpFileName;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取模板文件的File
-     * @Date 2020/12/24
-     * @Param
-     **/
-    public static File getFileTpl(String tplfileName) {
-        File tplFile = null;
-        ClassPathResource classPathResource = new ClassPathResource("exceltpl/" + tplfileName);
-        try {
-            tplFile = classPathResource.getFile();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return tplFile;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description 获取模板文件的InputStream
-     * @Date 2020/12/24
-     * @Param
-     **/
-    public static InputStream getFileTplInputStream(String tplfileName) {
-        InputStream tplInputStream = null;
-        ClassPathResource classPathResource = new ClassPathResource("exceltpl/" + tplfileName);
-        try {
-            tplInputStream = classPathResource.getInputStream();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return tplInputStream;
-    }
-}

src/main/java/com/aoyang/tms/util/Hanzi2Pinyin.java

@@ -1,78 +0,0 @@
-package com.aoyang.tms.util;
-import net.sourceforge.pinyin4j.PinyinHelper;
-import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
-import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
- 
-public class Hanzi2Pinyin {
- 
-	public static String convertHanzi2Pinyin(String hanzi, boolean full) {
-		/***
-		 * ^[\u2E80-\u9FFF]+$ 匹配所有东亚区的语言 ^[\u4E00-\u9FFF]+$ 匹配简体和繁体
-		 * ^[\u4E00-\u9FA5]+$ 匹配简体
-		 */
-		String regExp = "^[\u4E00-\u9FFF]+$";
-		StringBuffer sb = new StringBuffer();
-		if (hanzi == null || "".equals(hanzi.trim())) {
-			return "";
-		}
-		String pinyin = "";
-		for (int i = 0; i < hanzi.length(); i++) {
-			char unit = hanzi.charAt(i);
-			if (match(String.valueOf(unit), regExp))// 是汉字，则转拼音
-			{
-				pinyin = convertSingleHanzi2Pinyin(unit);
-				if (full) {
-					sb.append(pinyin);
-				} else {
-					sb.append(pinyin.charAt(0));
-				}
-			} else {
-				sb.append(unit);
-			}
-		}
-		return sb.toString();
-	}
- 
-	/***
-	 * 将单个汉字转成拼音
-	 * 
-	 * @param hanzi
-	 * @return
-	 */
-	private static String convertSingleHanzi2Pinyin(char hanzi) {
-		HanyuPinyinOutputFormat outputFormat = new HanyuPinyinOutputFormat();
-		outputFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
-		String[] res;
-		StringBuffer sb = new StringBuffer();
-		try {
-			res = PinyinHelper.toHanyuPinyinStringArray(hanzi, outputFormat);
-			sb.append(res[0]);// 对于多音字，只用第一个拼音
-		} catch (Exception e) {
-			e.printStackTrace();
-			return "";
-		}
-		return sb.toString();
-	}
- 
-	/***
-	 * @param str
-	 * 源字符串
-	 * @param regex
-	 * 正则表达式
-	 * @return 是否匹配
-	 */
-	public static boolean match(String str, String regex) {
-		Pattern pattern = Pattern.compile(regex);
-		Matcher matcher = pattern.matcher(str);
-		return matcher.find();
-	}
- 
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		System.out.println(convertHanzi2Pinyin("天津被", true));
-	}
- 
-}

src/main/java/com/aoyang/tms/util/InputCheckUtils.java

@@ -1,55 +0,0 @@
-package com.aoyang.tms.util;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.compile;
-
-/**
- * @Description: 输入项校验
- * @Author guoyong
- * @Date 2020/10/21 14:37
- * @Version 1.0
- */
-public class InputCheckUtils {
-
-    /**
-     * @Author guoyong
-     * @Description 判断是否数字和字符组合
-     * @Date  2020/10/21
-     * @Param
-     * @return
-    **/
-    public static boolean isLetterDigit(String str) {
-        String regex = "^[a-z0-9A-Z]+$";
-        return str.matches(regex);
-    }
-
-
-    /**
-     * 是否是数字或小数
-     * @tags @return
-     * @exception
-     * @author wanghc
-     * @date 2015-9-16 下午5:50:15
-     * @return boolean
-     */
-    public static boolean isNumber(String str){
-        if(StringUtils.isBlank(str)){
-            return false;
-        }
-        String reg = "\\d+(\\.\\d+)?";
-        return str.matches(reg);
-    }
-
-    public static boolean isCarNo(String carNo){
-        Pattern p = compile("^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(?:(?![A-Z]{4})[A-Z0-9]){4}[A-Z0-9挂学警港澳]{1}$");
-        Matcher m = p.matcher(carNo);
-        if (!m.matches()){
-            return false;
-        }
-        return true;
-    }
-}

src/main/java/com/aoyang/tms/util/JxlsUtils.java

@@ -1,181 +0,0 @@
-package com.aoyang.tms.util;
-
-import org.jxls.common.Context;
-import org.jxls.expression.JexlExpressionEvaluator;
-import org.jxls.transform.Transformer;
-import org.jxls.transform.poi.PoiTransformer;
-import org.jxls.util.JxlsHelper;
-
-import java.io.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.Map;
-
-public class JxlsUtils {
-
-    public static void exportExcel(InputStream is, OutputStream os, Map<String, Object> model) throws IOException {
-        Context context = PoiTransformer.createInitialContext();
-        if (model != null) {
-            for (String key : model.keySet()) {
-                context.putVar(key, model.get(key));
-            }
-        }
-        JxlsHelper jxlsHelper = JxlsHelper.getInstance();
-        Transformer transformer = jxlsHelper.createTransformer(is, os);
-        //获得配置
-        JexlExpressionEvaluator evaluator = (JexlExpressionEvaluator) transformer.getTransformationConfig().getExpressionEvaluator();
-        //设置静默模式，不报警告
-        //evaluator.getJexlEngine().setSilent(true);
-        //函数强制，自定义功能
-        Map<String, Object> funcs = new HashMap<String, Object>();
-        funcs.put("utils", new JxlsUtils());    //添加自定义功能
-        evaluator.getJexlEngine().setFunctions(funcs);
-        //必须要这个，否则表格函数统计会错乱
-        jxlsHelper.setUseFastFormulaProcessor(false).processTemplate(context, transformer);
-    }
-
-    public static void exportExcel(File xls, File out, Map<String, Object> model) throws FileNotFoundException, IOException {
-        exportExcel(new FileInputStream(xls), new FileOutputStream(out), model);
-    }
-
-    public static void exportExcel(String templatePath, OutputStream os, Map<String, Object> model) throws Exception {
-        File template = getTemplate(templatePath);
-        if (template != null) {
-            exportExcel(new FileInputStream(template), os, model);
-        } else {
-            throw new Exception("Excel 模板未找到。");
-        }
-    }
-
-    //获取jxls模版文件
-    public static File getTemplate(String path) {
-        File template = new File(path);
-        if (template.exists()) {
-            return template;
-        }
-        return null;
-    }
-
-    /**
-     * @return
-     * @Author
-     * @Description 计算 单位利润额
-     * @Date 2021/1/5
-     * @Param
-     **/
-    public static BigDecimal caculateGwayPrice(BigDecimal gwayprice) {
-        try {
-            BigDecimal bignum2 = new BigDecimal("1000");
-            BigDecimal price = null;
-            price = gwayprice.divide(bignum2);
-            return price;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description Long 2 String
-     * @Date 2020/12/31
-     * @Param
-     **/
-    public static String longToStr(Long value) {
-        if (value == null) {
-            return "";
-        }
-        return String.valueOf(value);
-    }
-
-    // 日期格式化
-    public String dateFmt(LocalDateTime localDateTime, String format) {
-        if (localDateTime == null) {
-            return "";
-        }
-        try {
-            DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern(format);
-            String strDate2 = dtf2.format(localDateTime);
-            return strDate2;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-
-
-    // if判断
-    public Object ifelse(boolean b, Object o1, Object o2) {
-        return b ? o1 : o2;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description stock_type to String 库存操作类型 1=入库 2=出库 3=库存调整
-     * @Date 2020/12/31
-     * @Param
-     **/
-    public static String stockTypeToStr(Integer value) {
-        String str = "";
-        if (value == 1) {
-            str = "入库气量";
-        }
-        if (value == 2) {
-            str = "销售气量";
-        }
-        if (value == 3) {
-            str = "库存调整";
-        }
-        if (value == 4) {
-            str = "核对驳回";
-        }
-        if (value == 5) {
-            str = "退单库存退回";
-        }
-        return str;
-    }
-
-    /**
-     * @return
-     * @Author guoyong
-     * @Description status to String 0:已取消;1:已下单;2:已确认;3:已出港;4:已签收;5:已完成;6已锁定;7变更待处理;8异常待处理
-     * @Date 2020/12/31
-     * @Param
-     **/
-    public static String statusToStr(String value) {
-        String str = "";
-        if (value.equals("0")) {
-            str = "已取消";
-        }
-        if (value.equals("1")) {
-            str = "已提报";
-        }
-        if (value.equals("2")) {
-            str = "已确认";
-        }
-        if (value.equals("3")) {
-            str = "已出港";
-        }
-        if (value.equals("4")) {
-            str = "已签收";
-        }
-        if (value.equals("5")) {
-            str = "已完成";
-        }
-        if (value.equals("6")) {
-            str = "已锁定";
-        }
-        if (value.equals("7")) {
-            str = "变更待处理";
-        }
-        if (value.equals("8")) {
-            str = "异常待处理";
-        }
-        return str;
-    }
-}

src/main/java/com/aoyang/tms/util/LocalDateTimeFormatUtil.java

@@ -1,147 +0,0 @@
-package com.aoyang.tms.util;
-
-/**
- * @Description: 时间格式化工具类
- * @Author guoyong
- * @Date 2021/1/27 16:53
- * @Version 1.0
- */
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-
-public class LocalDateTimeFormatUtil extends BaseLocalDateFormatUtils {
-
-    private static final String FULL_FORMAT = "yyyy-MM-dd HH:mm:ss";
-    private static final String YEAR_ONLY_FORMAT = "yyyy";
-    private static final String MONTH_ONLY_FORMAT = "yyyy-MM";
-    private static final String DATE_ONLY_FORMAT = "yyyy-MM-dd";
-    private static final String COMPACT_DATE_ONLY_FORMAT = "yyyyMMdd";
-    private static final String MINUTES_ONLY_FORMAT = "yyyy-MM-dd HH:mm";
-
-    private static final String DATE_COMPACTION_FULL_FORMAT = "yyyyMMddHHmmss";
-    private static final String CHINESE_DATE_ONLY_FORMAT = "yyyy年MM月dd日";
-    private static final String CHINESE_FULL_FORMAT = "yyyy年MM月dd日 HH时mm分ss秒";
-
-    private LocalDateTimeFormatUtil() {
-
-    }
-
-    /**
-     * 格式化成yyyy
-     *
-     * @param date
-     * @return
-     */
-    public static String getYearOnlyString(LocalDateTime date) {
-        return safeFormat(date, YEAR_ONLY_FORMAT);
-    }
-
-    /**
-     * 格式化成yyyy-MM
-     *
-     * @param date
-     * @return
-     */
-    public static String getMonthOnlyString(LocalDateTime date) {
-        return safeFormat(date, MONTH_ONLY_FORMAT);
-    }
-
-    /**
-     * 格式化成yyyy-MM-dd
-     *
-     * @param date
-     * @return
-     */
-    public static String getDateOnlyString(LocalDateTime date) {
-        return safeFormat(date, DATE_ONLY_FORMAT);
-    }
-
-    /**
-     * 格式化成yyyyMMdd
-     *
-     * @param date
-     * @return
-     */
-    public static String getCompactDateOnlyString(LocalDateTime date) {
-        return safeFormat(date, COMPACT_DATE_ONLY_FORMAT);
-    }
-
-    /**
-     * 格式化成yyyy-MM-dd HH:mm
-     *
-     * @param date
-     * @return
-     */
-    public static String getMinutesOnlyString(LocalDateTime date) {
-        return safeFormat(date, MINUTES_ONLY_FORMAT);
-    }
-
-    /**
-     * 格式化成yyyy-MM-dd HH:mm:ss
-     *
-     * @param date
-     * @return
-     */
-    public static String getFullString(LocalDateTime date) {
-        return safeFormat(date, FULL_FORMAT);
-    }
-
-
-    /**
-     * 格式化成yyyyMMddHHmmss
-     *
-     * @param date
-     * @return
-     */
-    public static String getCompactionFullString(LocalDateTime date) {
-        return safeFormat(date, DATE_COMPACTION_FULL_FORMAT);
-    }
-
-    /**
-     * 格式化成yyyy年MM月dd日
-     *
-     * @param date
-     * @return
-     */
-    public static String getChineseDateOnlyString(LocalDateTime date) {
-        return safeFormat(date, CHINESE_DATE_ONLY_FORMAT);
-    }
-
-    /**
-     * 格式化成yyyy年MM月dd日 HH时mm分ss秒
-     *
-     * @param date
-     * @return
-     */
-    public static String getChineseFullString(LocalDateTime date) {
-        return safeFormat(date, CHINESE_FULL_FORMAT);
-    }
-
-    private static String safeFormat(LocalDateTime localDateTime, String pattern) {
-        if (null != localDateTime) {
-            return localDateTime.format(DateTimeFormatter.ofPattern(pattern));
-        }
-        return null;
-    }
-
-    /**
-     * 格式化
-     *
-     * @param date    日期
-     * @param pattern 格式
-     * @return
-     */
-    private static String safeFormat(Date date, String pattern) {
-        if (date == null || pattern == null) {
-            return null;
-        }
-        LocalDateTime localDateTime = dateToLocalDateTime(date);
-        if (null != localDateTime) {
-            return localDateTime.format(DateTimeFormatter.ofPattern(pattern));
-        }
-        return null;
-    }
-
-}

src/main/java/com/aoyang/tms/util/LocalDateTimeUtils.java

@@ -1,171 +0,0 @@
-package com.aoyang.tms.util;
-
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.TemporalAdjusters;
-import java.util.Date;
-
-/**
- * @Description: ${DESCRIPTION}
- * @Author guoyong
- * @Date 2021/1/25 15:57
- * @Version 1.0
- */
-public final class LocalDateTimeUtils {
-
-    /**
-     * 日期格式yyyy-MM-dd
-     */
-    public static String DATE_PATTERN = "yyyy-MM-dd";
-
-    /**
-     * 日期时间格式yyyy-MM-dd HH:mm:ss
-     */
-    public static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
-
-    /**
-     * 构造函数
-     */
-    private LocalDateTimeUtils() {
-        super();
-    }
-
-    /**
-     * Date转LocalDateTime
-     *
-     * @param date Date对象
-     * @return
-     */
-    public static LocalDateTime dateToLocalDateTime(Date date) {
-        return LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault());
-    }
-
-    /**
-     * LocalDateTime转换为Date
-     *
-     * @param dateTime LocalDateTime对象
-     * @return
-     */
-    public static Date localDateTimeToDate(LocalDateTime dateTime) {
-        return Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant());
-    }
-
-    /**
-     * 格式化时间-默认yyyy-MM-dd HH:mm:ss格式
-     *
-     * @param dateTime LocalDateTime对象
-     * @return
-     */
-    public static String formatDateTime(LocalDateTime dateTime) {
-        return formatDateTime(dateTime, DATE_TIME_PATTERN);
-    }
-
-    /**
-     * 按pattern格式化时间-默认yyyy-MM-dd HH:mm:ss格式
-     *
-     * @param dateTime LocalDateTime对象
-     * @param pattern  要格式化的字符串
-     * @return
-     */
-    public static String formatDateTime(LocalDateTime dateTime, String pattern) {
-        if (dateTime == null) {
-            return null;
-        }
-        if (pattern == null || pattern.isEmpty()) {
-            pattern = DATE_TIME_PATTERN;
-        }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
-        return dateTime.format(formatter);
-    }
-
-    /**
-     * 获取今天的00:00:00
-     *
-     * @return
-     */
-    public static String getDayStart() {
-        return getDayStart(LocalDateTime.now());
-    }
-
-    /**
-     * 获取今天的23:59:59
-     *
-     * @return
-     */
-    public static String getDayEnd() {
-        return getDayEnd(LocalDateTime.now());
-    }
-
-    /**
-     * 获取某天的00:00:00
-     *
-     * @param dateTime
-     * @return
-     */
-    public static String getDayStart(LocalDateTime dateTime) {
-        return formatDateTime(dateTime.with(LocalTime.MIN));
-    }
-
-    /**
-     * 获取某天的23:59:59
-     *
-     * @param dateTime
-     * @return
-     */
-    public static String getDayEnd(LocalDateTime dateTime) {
-        return formatDateTime(dateTime.with(LocalTime.MAX));
-    }
-
-    /**
-     * 获取本月第一天的00:00:00
-     *
-     * @return
-     */
-    public static String getFirstDayOfMonth() {
-        return getFirstDayOfMonth(LocalDateTime.now());
-    }
-
-    /**
-     * 获取本月最后一天的23:59:59
-     *
-     * @return
-     */
-    public static String getLastDayOfMonth() {
-        return getLastDayOfMonth(LocalDateTime.now());
-    }
-
-    /**
-     * 获取某月第一天的00:00:00
-     *
-     * @param dateTime LocalDateTime对象
-     * @return
-     */
-    public static String getFirstDayOfMonth(LocalDateTime dateTime) {
-        return formatDateTime(dateTime.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN));
-    }
-
-    /**
-     * 获取某月最后一天的23:59:59
-     *
-     * @param dateTime LocalDateTime对象
-     * @return
-     */
-    public static String getLastDayOfMonth(LocalDateTime dateTime) {
-        return formatDateTime(dateTime.with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX));
-    }
-
-    /**
-     * 测试
-     *
-     * @param args
-     */
-    public static void main(String[] args) {
-        System.out.println(getDayStart());
-        System.out.println(getDayEnd());
-        System.out.println(getFirstDayOfMonth());
-        System.out.println(getLastDayOfMonth());
-    }
-
-}

src/main/java/com/aoyang/tms/util/Md5SaltPassword.java

@@ -1,128 +0,0 @@
-package com.aoyang.tms.util;
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang3.StringUtils;
-
-import java.security.MessageDigest;
-import java.util.Random;
-
-/**
- * MD5加盐算法   每个用户随机不同盐值，生成48位密码
- * <p>
- * 加盐，是为了防止，因数据库泄露而导致密码被破解
- * 一般讲用户的password和salt都存在数据库中，先通
- * 过username查询出密文，然后对md5(明文+salt)与密文对比
- *
- * @author Jimmy Liu
- * @since 2020-01-27
- */
-
-public class Md5SaltPassword {
-
-
-        public static String getPassword(String password) {
-            if (StringUtils.isNotBlank(password)) {
-                password = password.toLowerCase();
-            }
-            return Md5SaltPassword.md5Hex("JimmyLiu" + Md5SaltPassword
-                    .md5Hex(Md5SaltPassword.md5Hex(password)) + password);
-        }
-
-        /**
-         * 生成含有随机盐的密码
-         */
-        public static String generate(String password) {
-            String salt = getSalt(16);
-
-//		return md5Hex(password+salt);
-            password = md5Hex(password + salt);
-            char[] cs = new char[48];
-            for (int i = 0; i < 48; i += 3) {
-                cs[i] = password.charAt(i / 3 * 2);
-                char c = salt.charAt(i / 3);
-                cs[i + 1] = c;
-                cs[i + 2] = password.charAt(i / 3 * 2 + 1);
-            }
-            return new String(cs);
-        }
-
-        /**
-         * 生成随机盐（一般大于等于16位）
-         */
-        public static String getSalt(int len) {
-            Random r = new Random();
-            StringBuilder sb = new StringBuilder(len);
-            sb.append(r.nextInt(99999999)).append(r.nextInt(99999999));
-            int length = sb.length();
-            if (length < len) {
-                for (int i = 0; i < len - length; i++) {
-                    sb.append("0");
-                }
-            }
-            String salt = sb.toString();
-            return salt;
-        }
-
-        /**
-         * 校验密码是否正确
-         */
-        public static boolean verify(String password, String md5) {
-            char[] cs1 = new char[32];
-            char[] cs2 = new char[16];
-            for (int i = 0; i < 48; i += 3) {
-                cs1[i / 3 * 2] = md5.charAt(i);
-                cs1[i / 3 * 2 + 1] = md5.charAt(i + 2);
-                cs2[i / 3] = md5.charAt(i + 1);
-            }
-            String salt = new String(cs2);
-            return md5Hex(password + salt).equals(new String(cs1));
-        }
-
-        /**
-         * 获取十六进制字符串形式的MD5
-         */
-        public static String md5Hex(String src) {
-            try {
-                MessageDigest md5 = MessageDigest.getInstance("MD5");
-                byte[] bs = md5.digest(src.getBytes());
-                return new String(new Hex().encode(bs));
-            } catch (Exception e) {
-                return null;
-            }
-        }
-
-        public static String md5Small36(String str) {
-            String result = "";
-            try {
-                MessageDigest md5 = MessageDigest.getInstance("MD5");
-                md5.update((str).getBytes("UTF-8"));
-                byte b[] = md5.digest();
-
-                int i;
-                StringBuffer buf = new StringBuffer("");
-
-                for (int offset = 0; offset < b.length; offset++) {
-                    i = b[offset];
-                    if (i < 0) {
-                        i += 256;
-                    }
-                    if (i < 16) {
-                        buf.append("0");
-                    }
-                    buf.append(Integer.toHexString(i));
-                }
-                result = buf.toString();
-            } catch (Exception e) {
-                // TODO: handle exception
-            }
-            return result;
-        }
-
-        public static void main(String[] args) {
-
-           // System.out.println(getPassword("123456"));
-            String a = "12345678901";
-            String b = a.substring ( 5,11 );
-            System.out.println ( b );
-        }
-}

src/main/java/com/aoyang/tms/util/NumberUtils.java

@@ -1,33 +0,0 @@
-package com.aoyang.tms.util;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * @Description: 数字验证工具类
- * @Author guoyong
- * @Date 2021/2/8 13:44
- * @Version 1.0
- */
-public class NumberUtils {
-
-    /**
-     * 是否是数字或小数
-     *
-     * @return boolean
-     * @throws
-     * @tags @return
-     * @author wanghc
-     * @date 2015-9-16 下午5:50:15
-     */
-    public static boolean isNumber(String str) {
-        if (StringUtils.isBlank(str)) {
-            return false;
-        }
-        String reg = "\\d+(\\.\\d+)?";
-        return str.matches(reg);
-    }
-
-    public static void main(String[] args) {
-        System.out.println(isNumber("200"));
-    }
-}

src/main/java/com/aoyang/tms/util/QRCodeUtils.java

@@ -1,303 +0,0 @@
-package com.aoyang.tms.util;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.MultiFormatWriter;
-import com.google.zxing.WriterException;
-import com.google.zxing.client.j2se.MatrixToImageConfig;
-import com.google.zxing.client.j2se.MatrixToImageWriter;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import org.apache.commons.lang.StringUtils;
-import sun.font.FontDesignMetrics;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.geom.RoundRectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Random;
-
-/**
- * @description:
- * @author: xumingrui
- * @create: 2020 -01 -21 -15:02
- */
-public class QRCodeUtils {
-    private String CHARSET = "utf-8";
-    private String FORMAT_NAME = "JPG";
-    // 二维码尺寸
-    private int QRCODE_WIDTH = 648;
-    // 二维码尺寸
-    private int QRCODE_HEIGHT = 648;
-    // LOGO宽度
-    private int WIDTH = 60;
-    // LOGO高度
-    private int HEIGHT = 60;
-
-    /**
-     * 司机端调用，返回bufferedImage
-     *
-     * @param content
-     * @return
-     * @throws WriterException
-     */
-    public BufferedImage qrCode(String content) throws WriterException {
-        //1. 生成二维码
-        BitMatrix bitMatrix = encode(content);
-        //2.将BitMatrix 转换为BufferedImage
-        BufferedImage bufferedImage = MatrixToImageWriter.toBufferedImage(bitMatrix, new MatrixToImageConfig(Color.BLACK.getRGB(), Color.WHITE.getRGB()));
-        return bufferedImage;
-    }
-
-    /**
-     * 生成二维码
-     *
-     * @param contents 二维码内容
-     * @return 二维码的描述对象 BitMatrix
-     * @throws WriterException 编码时出错
-     */
-    private BitMatrix encode(String contents) throws WriterException {
-        final Map<EncodeHintType, Object> hints = new HashMap<>();
-        hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
-        hints.put(EncodeHintType.CHARACTER_SET, "utf-8");
-        return new QRCodeWriter().encode(contents, BarcodeFormat.QR_CODE, QRCODE_WIDTH, QRCODE_HEIGHT, hints);
-    }
-
-
-    private BufferedImage createImage(String content, String imgPath,
-                                      boolean needCompress) throws Exception {
-        Hashtable<EncodeHintType, Object> hints = new Hashtable<EncodeHintType, Object>();
-        hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
-        hints.put(EncodeHintType.CHARACTER_SET, CHARSET);
-        hints.put(EncodeHintType.MARGIN, 1);
-        BitMatrix bitMatrix = new MultiFormatWriter().encode(content,
-                BarcodeFormat.QR_CODE, QRCODE_WIDTH, QRCODE_HEIGHT, hints);
-        int width = bitMatrix.getWidth();
-        int height = bitMatrix.getHeight();
-        BufferedImage image = new BufferedImage(width, height,
-                BufferedImage.TYPE_INT_RGB);
-        for (int x = 0; x < width; x++) {
-            for (int y = 0; y < height; y++) {
-                image.setRGB(x, y, bitMatrix.get(x, y) ? 0xFF000000
-                        : 0xFFFFFFFF);
-            }
-        }
-        if (imgPath == null || "".equals(imgPath)) {
-            return image;
-        }
-        // 插入图片
-        insertImage(image, imgPath, needCompress);
-        return image;
-    }
-
-    /**
-     * 插入LOGO
-     *
-     * @param source       二维码图片
-     * @param imgPath      LOGO图片地址
-     * @param needCompress 是否压缩
-     * @throws Exception
-     */
-    private void insertImage(BufferedImage source, String imgPath,
-                             boolean needCompress) throws Exception {
-        File file = new File(imgPath);
-        if (!file.exists()) {
-            System.err.println("" + imgPath + "   该文件不存在！");
-            return;
-        }
-        Image src = ImageIO.read(new File(imgPath));
-        int width = src.getWidth(null);
-        int height = src.getHeight(null);
-        if (needCompress) { // 压缩LOGO
-            if (width > WIDTH) {
-                width = WIDTH;
-            }
-            if (height > HEIGHT) {
-                height = HEIGHT;
-            }
-            Image image = src.getScaledInstance(width, height,
-                    Image.SCALE_SMOOTH);
-            BufferedImage tag = new BufferedImage(width, height,
-                    BufferedImage.TYPE_INT_RGB);
-            Graphics g = tag.getGraphics();
-            g.drawImage(image, 0, 0, null); // 绘制缩小后的图
-            g.dispose();
-            src = image;
-        }
-        // 插入LOGO
-        Graphics2D graph = source.createGraphics();
-        int x = (QRCODE_WIDTH - width) / 2;
-        int y = (QRCODE_HEIGHT - height) / 2;
-        graph.drawImage(src, x, y, width, height, null);
-        Shape shape = new RoundRectangle2D.Float(x, y, width, width, 6, 6);
-        graph.setStroke(new BasicStroke(3f));
-        graph.draw(shape);
-        graph.dispose();
-    }
-
-    /**
-     * 生成二维码(内嵌LOGO)
-     *
-     * @param content      内容
-     * @param imgPath      LOGO地址
-     * @param destPath     存放目录
-     * @param needCompress 是否压缩LOGO
-     * @throws Exception
-     */
-    public String encode(String content, String imgPath, String destPath,
-                         boolean needCompress) throws Exception {
-        BufferedImage image = createImage(content, imgPath,
-                needCompress);
-        mkdirs(destPath);
-        String file = new Random().nextInt(99999999) + ".jpg";
-        ImageIO.write(image, FORMAT_NAME, new File(destPath + "/" + file));
-        return file;
-    }
-
-    /**
-     * 当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常)
-     *
-     * @param destPath 存放目录
-     * @date 2013-12-11 上午10:16:36
-     */
-    public void mkdirs(String destPath) {
-        File file = new File(destPath);
-        //当文件夹不存在时，mkdirs会自动创建多层目录，区别于mkdir．(mkdir如果父目录不存在则会抛出异常)
-        if (!file.exists() && !file.isDirectory()) {
-            file.mkdirs();
-        }
-    }
-
-    /**
-     * 生成二维码(内嵌LOGO)
-     *
-     * @param content  内容
-     * @param imgPath  LOGO地址
-     * @param destPath 存储地址
-     * @throws Exception
-     */
-    public void encode(String content, String imgPath, String destPath)
-            throws Exception {
-        encode(content, imgPath, destPath, false);
-    }
-
-    /**
-     * 生成二维码
-     *
-     * @param content      内容
-     * @param destPath     存储地址
-     * @param needCompress 是否压缩LOGO
-     * @throws Exception
-     */
-    public void encode(String content, String destPath,
-                       boolean needCompress) throws Exception {
-        encode(content, null, destPath, needCompress);
-    }
-
-    /**
-     * 生成二维码
-     *
-     * @param content  内容
-     * @param destPath 存储地址
-     * @throws Exception
-     */
-    public void encode(String content, String destPath) throws Exception {
-        encode(content, null, destPath, false);
-    }
-
-    /**
-     * 生成二维码(内嵌LOGO)
-     *
-     * @param content      内容
-     * @param imgPath      LOGO地址
-     * @param output       输出流
-     * @param needCompress 是否压缩LOGO
-     * @throws Exception
-     */
-    public void encode(String content, String imgPath,
-                       OutputStream output, boolean needCompress) throws Exception {
-        BufferedImage image = createImage(content, imgPath,
-                needCompress);
-        ImageIO.write(image, FORMAT_NAME, output);
-    }
-
-    /**
-     * 生成二维码
-     *
-     * @param content 内容
-     * @param output  输出流
-     * @throws Exception
-     */
-    public void encode(String content, OutputStream output)
-            throws Exception {
-        encode(content, null, output, false);
-    }
-
-
-    /**
-     * 在背景图上插入二维码图片 -- 收银员二维码使用
-     */
-    public BufferedImage backAddQr(BufferedImage backBufferedImage, BufferedImage qrImage, String content) throws IOException {
-        // BufferedImage backBufferedImage = ImageIO.read ( backImage );
-        int width = backBufferedImage.getWidth(null);
-        int height = backBufferedImage.getHeight(null);
-        // 插入LOGO
-        Graphics2D graph = backBufferedImage.createGraphics();
-        int x = (width - QRCODE_WIDTH) / 2;
-        int y = 540;
-        graph.drawImage(qrImage, x, y, QRCODE_WIDTH, QRCODE_WIDTH, null);
-
-        if (StringUtils.isNotBlank(content)) {
-            int contentSize = content.length();
-            Font font = new Font("微软雅黑", Font.PLAIN, 65);
-            graph.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);//设置抗锯齿
-            graph.setPaint(new Color(0, 0, 0, 0));//阴影颜色
-            graph.setFont(font);
-            graph.setColor(Color.white);
-            //加气站名字大于15个字，二维码上换行显示
-            if (contentSize > 15) {
-                int contentLength = getWordWidth(font, content.substring(0, 15));
-                graph.drawString(content.substring(0, 15), (width - contentLength) / 2, 1300);
-                contentLength = getWordWidth(font, content.substring(15, contentSize));
-                graph.drawString(content.substring(15, contentSize), (width - contentLength) / 2, 1400);
-            } else {
-                int contentLength = getWordWidth(font, content);
-                graph.drawString(content, (width - contentLength) / 2, 1300);
-            }
-        }
-
-        Shape shape = new RoundRectangle2D.Float(x, y, QRCODE_WIDTH, QRCODE_WIDTH, 6, 6);
-        graph.setStroke(new BasicStroke(3f));
-        graph.draw(shape);
-        graph.dispose();
-        return backBufferedImage;
-    }
-
-
-    public static int getWordWidth(Font font, String content) {
-        FontDesignMetrics metrics = FontDesignMetrics.getMetrics(font);
-        int width = 0;
-        for (int i = 0; i < content.length(); i++) {
-            width += metrics.charWidth(content.charAt(i));
-        }
-        return width;
-    }
-
-    public static void main(String[] args) throws Exception {
-        QRCodeUtils utils = new QRCodeUtils();
-        BufferedImage qrBuffered = utils.qrCode("内容");
-        System.out.println(qrBuffered.getWidth() + "," + qrBuffered.getHeight());
-        // BufferedImage finalImage = utils.backAddQr("/Users/xumingrui/Desktop/sback.png",qrBuffered,"");
-        File file = new File("/Users/xumingrui/Desktop/1.jpg");
-        //ImageIO.write(finalImage, "jpg", file);
-    }
-
-
-}

src/main/java/com/aoyang/tms/util/ReadExcelTools.java

@@ -1,159 +0,0 @@
-package com.aoyang.tms.util;
-
-
-import com.alibaba.fastjson.JSON;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * @Description: 读取excel工具栏
- * @Author guoyong
- * @Date 2020/10/17 9:03
- * @Version 1.0
- */
-@Slf4j
-public class ReadExcelTools {
-    private final static String xls = "xls";
-    private final static String xlsx = "xlsx";
-
-    /**
-     * 读入excel文件，解析后返回
-     *
-     * @param file
-     * @throws IOException
-     */
-    public static List<String[]> readExcel(MultipartFile file) throws IOException {
-        //检查文件
-        checkFile(file);
-        //获得Workbook工作薄对象
-        Workbook workbook = getWorkBook(file);
-        //创建返回对象，把每行中的值作为一个数组，所有行作为一个集合返回
-        List<String[]> list = new ArrayList<String[]>();
-        if (workbook != null) {
-            for (int sheetNum = 0; sheetNum < workbook.getNumberOfSheets(); sheetNum++) {
-                //获得当前sheet工作表
-                Sheet sheet = workbook.getSheetAt(sheetNum);
-                if (sheet == null) {
-                    continue;
-                }
-                //获得当前sheet的开始行
-                int firstRowNum = sheet.getFirstRowNum();
-                //获得当前sheet的结束行
-                int lastRowNum = sheet.getLastRowNum();
-                //循环除了第一行的所有行
-                for (int rowNum = firstRowNum + 1; rowNum <= lastRowNum; rowNum++) { //为了过滤到第一行因为我的第一行是数据库的列
-                    //获得当前行
-                    Row row = sheet.getRow(rowNum);
-                    if (row == null) {
-                        continue;
-                    }
-                    //获得当前行的开始列
-                    int firstCellNum = row.getFirstCellNum();
-                    //获得当前行的列数
-                    int lastCellNum = row.getLastCellNum();//为空列获取
-//                    int lastCellNum = row.getPhysicalNumberOfCells();//为空列不获取
-//                    String[] cells = new String[row.getPhysicalNumberOfCells()];
-                    String[] cells = new String[row.getLastCellNum()];
-                    //循环当前行
-                    for (int cellNum = firstCellNum; cellNum < lastCellNum; cellNum++) {
-                        Cell cell = row.getCell(cellNum);
-                        cells[cellNum] = getCellValue(cell);
-                    }
-                    list.add(cells);
-                }
-            }
-        }
-        log.info(JSON.toJSONString(file));
-        return list;
-    }
-
-    public static void checkFile(MultipartFile file) throws IOException {
-        //判断文件是否存在
-        if (null == file) {
-            throw new FileNotFoundException("文件不存在！");
-        }
-        //获得文件名
-        String fileName = file.getOriginalFilename();
-        //判断文件是否是excel文件
-        if (!fileName.endsWith(xls) && !fileName.endsWith(xlsx)) {
-            throw new IOException(fileName + "不是excel文件");
-        }
-    }
-
-    public static Workbook getWorkBook(MultipartFile file) {
-        //获得文件名
-        String fileName = file.getOriginalFilename();
-        //创建Workbook工作薄对象，表示整个excel
-        Workbook workbook = null;
-        try {
-            //获取excel文件的io流
-            InputStream is = file.getInputStream();
-            //根据文件后缀名不同(xls和xlsx)获得不同的Workbook实现类对象
-            if (fileName.endsWith(xls)) {
-                //2003
-                workbook = new HSSFWorkbook(is);
-            } else if (fileName.endsWith(xlsx)) {
-                //2007
-                workbook = new XSSFWorkbook(is);
-            }
-        } catch (IOException e) {
-            log.error("getWorkBook " + e.getMessage() + ":{}", e);
-        }
-        return workbook;
-    }
-
-    public static String getCellValue(Cell cell) {
-        if (cell == null) {
-            return "";
-        }
-        if (cell.getCellType() == Cell.CELL_TYPE_STRING) {
-            return cell.getStringCellValue();
-        } else if (cell.getCellType() == Cell.CELL_TYPE_BOOLEAN) {
-            return String.valueOf(cell.getBooleanCellValue());
-        } else if (cell.getCellType() == Cell.CELL_TYPE_FORMULA) {
-            return cell.getCellFormula();
-        } else if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) {
-            short format = cell.getCellStyle().getDataFormat();
-            System.out.println("format:"+format+";;;;;value:"+cell.getNumericCellValue());
-            SimpleDateFormat sdf = null;
-            if (format == 14 || format == 31 || format == 57 || format == 58
-                    || (176<=format && format<=178) || (182<=format && format<=196)
-                    || (210<=format && format<=213) || (208==format ) ) { // 日期
-                sdf = new SimpleDateFormat("yyyy-MM-dd");
-            } else if (format == 20 || format == 32 || format==183 || (200<=format && format<=209) ) { // 时间
-                sdf = new SimpleDateFormat("HH:mm");
-            } else { // 不是日期格式
-                return String.valueOf(cell.getNumericCellValue());
-            }
-            double value = cell.getNumericCellValue();
-            Date date = org.apache.poi.ss.usermodel.DateUtil.getJavaDate(value);
-            if(date==null || "".equals(date)){
-                return "";
-            }
-            String result="";
-            try {
-                result = sdf.format(date);
-            } catch (Exception e) {
-                e.printStackTrace();
-                return "";
-            }
-            return result;
-        }
-        return "";
-    }
-}

src/main/java/com/aoyang/tms/util/RequestInfoUtil.java

@@ -1,41 +0,0 @@
-package com.aoyang.tms.util;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.aoyang.tms.entity.RequestInfo;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @author xumingrui
- * @since 2021/4/28 9:46
- * @comment <接收从geteway 传过来的header值>
- */
-@Slf4j
-public class RequestInfoUtil {
-    public RequestInfo getRequestInfo() {
-        HttpServletRequest request =
-            ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
-        Enumeration paramNames = request.getHeaderNames();
-        Map<String, String> map = new HashMap<String, String>();
-        while (paramNames.hasMoreElements()) {
-            String key = (String)paramNames.nextElement();
-            String value = request.getHeader(key);
-            map.put(key, value);
-        }
-        JSONObject jsonObject = JSON.parseObject(JSONObject.toJSONString(map));
-        // log.info("map->json:{}", jsonObject);
-        RequestInfo requestInfo = JSONObject.toJavaObject(jsonObject, RequestInfo.class);
-        // log.info("json->requestInfo:{}", requestInfo);
-        return requestInfo;
-    }
-}

src/main/java/com/aoyang/tms/util/Result.java

@@ -5,6 +5,7 @@
 
 package com.aoyang.tms.util;
 
+import com.aoyang.tms.common.ErrCodeEnum;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import io.swagger.annotations.ApiModel;

src/main/profiles/dev/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8806
+  port: 8888
 nacos:
   server-addr: 172.31.58.54:8848
   username: auyen
@@ -35,25 +35,4 @@ spring:
     host: 172.31.58.45
     port: 5672
     username: admin
-    password: xqkj@ayzl
-xxl:
-  job:
-    accessToken:
-    admin:
-      addresses: http://172.31.58.54:8080/xxl-job-admin
-    executor:
-      appname: price-release-executor
-      address:
-      ip:
-      port: 9999
-      logpath: ./logs
-      logretentiondays: 7
-combination:
-  org:
-    limit:
-      balance: 2000
-      bottom: 1.0
-      top: 10.0
-auyen:
-  default-org-id: 720211180626919424
-  marketing-org-id: 700214075283881984
+    password: xqkj@ayzl

src/main/profiles/prod/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8806
+  port: 8888
 nacos:
   server-addr: 172.31.58.48:8848
   username: auyen
@@ -35,25 +35,4 @@ spring:
     host: 172.31.58.56
     port: 5672
     username: admin
-    password: xqkj@ayzl
-xxl:
-  job:
-    accessToken:
-    admin:
-      addresses: http://172.31.58.51:8080/xxl-job-admin
-    executor:
-      appname: price-release-executor
-      address:
-      ip:
-      port: 9999
-      logpath: ./logs
-      logretentiondays: 7
-combination:
-  org:
-    limit:
-      balance: 2000
-      bottom: 1.0
-      top: 10.0
-auyen:
-  default-org-id: 720211450832371712
-  marketing-org-id: 700214080073809920
+    password: xqkj@ayzl

src/main/profiles/test/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8806
+  port: 8888
 nacos:
   server-addr: 172.31.58.42:8848
   username: auyen
@@ -35,26 +35,4 @@ spring:
     host: 172.31.58.46
     port: 5672
     username: admin
-    password: xqkj@ayzl
-
-xxl:
-  job:
-    accessToken:
-    admin:
-      addresses: http://172.31.58.42:8080/xxl-job-admin
-    executor:
-      appname: price-release-executor
-      address:
-      ip:
-      port: 9999
-      logpath: ./logs
-      logretentiondays: 7
-combination:
-  org:
-    limit:
-      balance: 2000
-      bottom: 1.0
-      top: 10.0
-auyen:
-  default-org-id: 720211478929997824
-  marketing-org-id: 700214071680958464
+    password: xqkj@ayzl

src/main/resources/mapper/AppVersionMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.aoyang.tms.mapper.AppVersionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.AppVersion">
-        <id column="id" property="id" />
-        <result column="os_type" property="osType" />
-        <result column="version_name" property="versionName" />
-        <result column="min_version" property="minVersion" />
-        <result column="apk_url" property="apkUrl" />
-        <result column="apk_size" property="apkSize" />
-        <result column="updateDescription" property="updateDescription" />
-        <result column="note" property="note" />
-        <result column="publish_time" property="publishTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, os_type, version_name, min_version, apk_url, apk_size, updateDescription, note, publish_time
-    </sql>
-
-</mapper>

src/main/resources/mapper/WorkSpotMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aoyang.tms.mapper.WorkSpotMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.WorkSpot">
+        <id column="spot_id" property="spotId" />
+        <result column="spot_name" property="spotName" />
+        <result column="adress" property="adress" />
+        <result column="type" property="type" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
+        <result column="valid_distance" property="validDistance" />
+        <result column="note" property="note" />
+        <result column="creater" property="creater" />
+        <result column="creater_name" property="createrName" />
+        <result column="create_date" property="createDate" />
+        <result column="updater" property="updater" />
+        <result column="updater_name" property="updaterName" />
+        <result column="update_date" property="updateDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        spot_id, spot_name, adress, type, longitude, latitude, valid_distance, note, creater, creater_name, create_date, updater, updater_name, update_date
+    </sql>
+
+</mapper>