移动端控制器梳理

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

@@ -35,6 +35,19 @@ public class TruckRepairInfoController {
     @Resource
     private TruckRepairInfoService truckRepairInfoService;
 
+    @ApiOperation(value = "查找车辆检查信息",notes="")
+    @PostMapping("/find")
+    public Result<TruckRepairInfo> find(@RequestBody TruckRepairInfo truckRepairInfo) {
+        return new Result<>(new TruckRepairInfo());
+    }
+
+    @ApiOperation(value = "上报车辆检车信息",notes="新增或修改都用同一个接口,新增后返回带主键id的实体")
+    @PostMapping("/submit")
+    public Result<TruckRepairInfo> submit(@RequestBody TruckRepairInfo truckRepairInfo) {
+        //TODO SAVE OR UPDATE
+        return new Result<>(new TruckRepairInfo());
+    }
+
     @ApiOperation(value = "获取truck_repair_info列表",notes="")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<TruckRepairInfo> pageParam) {
@@ -43,17 +56,5 @@ public class TruckRepairInfoController {
         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/WorkerController.java

@@ -0,0 +1,63 @@
+package com.aoyang.tms.controller;
+
+import com.aoyang.common.param.PageParam;
+import com.aoyang.common.result.Result;
+import com.aoyang.tms.controller.param.Truck;
+import com.aoyang.tms.controller.vo.WorkOrderVO;
+import com.aoyang.tms.controller.vo.WorkerInfo;
+import com.aoyang.tms.entity.TruckSimCard;
+import com.aoyang.tms.entity.WorkOrder;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+/**
+ * @Description: 作业人员相关接口
+ * @Author guoyong
+ * @Date 2022/4/20 16:50
+ * @Version 1.0
+ */
+public class WorkerController {
+
+    @ApiOperation(value = "获取作业人员信息", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态")
+    @PostMapping("/find_worker_info")
+    public Result<WorkerInfo> find_worker_info(@RequestHeader(value = "orgId") Long orgId,
+                                               @RequestHeader(value = "userId") Long userId) {
+        return new Result<>(new WorkerInfo());
+    }
+
+    @ApiOperation(value = "获取作业列表信息", notes = "卡车id、必传")
+    @PostMapping("/find_work_order_list")
+    public Result<Page<WorkOrderVO>> find_work_order_list(@RequestHeader(value = "orgId") Long orgId,
+                                                          @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
+        return new Result<>(null);
+    }
+
+    @ApiOperation(value = "获取运力详情信息", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
+    @PostMapping("/find_transport_info")
+    public Result<WorkerInfo> find_transport_info(@RequestHeader(value = "orgId") Long orgId,
+                                                  @RequestHeader(value = "userId") Long userId) {
+        return new Result<>(new WorkerInfo());
+    }
+
+    @ApiOperation(value = "获取行车详情信息", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
+    @PostMapping("/find_work_truck_info")
+    public Result<WorkerInfo> find_work_truck_info(@RequestHeader(value = "orgId") Long orgId,
+                                                   @RequestHeader(value = "userId") Long userId, @RequestBody Truck truck) {
+        return new Result<>(new WorkerInfo());
+    }
+
+    //TODO 有异议
+    @ApiOperation(value = "历史行车列表", notes = "")
+    @PostMapping("/history_work_list")
+    public Result<WorkerInfo> history_work_list(@RequestHeader(value = "orgId") Long orgId,
+                                                @RequestHeader(value = "userId") Long userId) {
+        return new Result<>(new WorkerInfo());
+    }
+
+
+}

src/main/java/com/aoyang/tms/controller/param/Truck.java

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

src/main/java/com/aoyang/tms/controller/vo/WorkOrderVO.java

@@ -0,0 +1,224 @@
+package com.aoyang.tms.controller.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 运单运单表
+    * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("work_order")
+@ApiModel(value="WorkOrder对象", description="运单运单表")
+public class WorkOrderVO 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;
+
+    @ApiModelProperty(value = "已读未读状态,0未读，1已读")
+    private Integer readFlag;
+
+
+}

src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -0,0 +1,60 @@
+package com.aoyang.tms.controller.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: 作业人员实体信息
+ * @Author guoyong
+ * @Date 2022/4/20 16:52
+ * @Version 1.0
+ */
+@Data
+public class WorkerInfo {
+
+    @ApiModelProperty(value = "司机1id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long driverIdOne;
+
+    @ApiModelProperty(value = "司机1姓名")
+    private String driverNameOne;
+
+    @ApiModelProperty(value = "司机2id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long driverIdTwo;
+
+    @ApiModelProperty(value = "司机2姓名")
+    private String driverNameTwo;
+
+    @ApiModelProperty(value = "押运员id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long escortId;
+
+    @ApiModelProperty(value = "押运员姓名")
+    private String escortName;
+
+    @ApiModelProperty(value = "卡车id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    private String trailerCarNumber;
+
+    @ApiModelProperty(value = "车辆状态")
+    private Integer truckStatus;
+
+    @ApiModelProperty(value = "位置经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "位置纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "位置时间")
+    private String localTime;
+
+}