添加行程周期对象

src/main/java/com/aoyang/tms/controller/WorkCycleController.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.WorkCycleService;
+import  com.aoyang.tms.entity.WorkCycle;
+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-21
+ */
+@RestController
+@Slf4j
+@Api(value = "work_cycleCRUD接口")
+@RequestMapping("/tms/work_cycle")
+public class WorkCycleController {
+
+    @Resource
+    private WorkCycleService workCycleService;
+
+    @ApiOperation(value = "获取work_cycle列表",notes="")
+    @PostMapping("/list")
+    public Result list(@RequestBody PageParam<WorkCycle> pageParam) {
+        Page<WorkCycle> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        IPage<WorkCycle> records = workCycleService.page(page, Wrappers.query(pageParam.getParam()));
+        return new Result<>(records);
+    }
+
+    @ApiOperation(value = "修改work_cycle",notes="根据id修改work_cycle")
+    @PostMapping("/update")
+    public Result update(@RequestBody WorkCycle workCycle) {
+        Boolean flag = workCycleService.updateById(workCycle);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "添加work_cycle",notes="新增一条work_cycle")
+    @PostMapping("/add")
+    public Result add(@RequestBody WorkCycle workCycle) {
+        Boolean flag = workCycleService.save(workCycle);
+        return new Result<>(flag);
+    }
+}

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

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
     * </p>
  *
  * @author guoyong
- * @since 2022-04-20
+ * @since 2022-04-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -35,6 +35,11 @@ public class RestInfo implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
+    @ApiModelProperty(value = "行程周期id")
+    @TableField("cycle_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cycleId;
+
     @ApiModelProperty(value = "组织id")
     @TableField("org_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)

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

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
     * </p>
  *
  * @author guoyong
- * @since 2022-04-20
+ * @since 2022-04-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -35,16 +35,21 @@ public class TruckCheckInfo implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
-    @ApiModelProperty(value = "组织id")
+    @ApiModelProperty(value = "行程周期id")
+    @TableField("cycle_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cycleId;
+
+    @ApiModelProperty(value = "物流公司id")
     @TableField("org_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long orgId;
 
-    @ApiModelProperty(value = "组织名称")
+    @ApiModelProperty(value = "物流公司名称")
     @TableField("org_name")
     private String orgName;
 
-    @ApiModelProperty(value = "组织简称")
+    @ApiModelProperty(value = "物流公司简称")
     @TableField("org_short_name")
     private String orgShortName;
 

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

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
     * </p>
  *
  * @author guoyong
- * @since 2022-04-20
+ * @since 2022-04-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -35,16 +35,21 @@ public class TruckRepairInfo implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
-    @ApiModelProperty(value = "组织id")
+    @ApiModelProperty(value = "行程周期id")
+    @TableField("cycle_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cycleId;
+
+    @ApiModelProperty(value = "物流公司id")
     @TableField("org_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long orgId;
 
-    @ApiModelProperty(value = "组织名称")
+    @ApiModelProperty(value = "物流公司名称")
     @TableField("org_name")
     private String orgName;
 
-    @ApiModelProperty(value = "组织简称")
+    @ApiModelProperty(value = "物流公司简称")
     @TableField("org_short_name")
     private String orgShortName;
 

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

@@ -0,0 +1,126 @@
+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-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("work_cycle")
+@ApiModel(value="WorkCycle对象", description="行程周期表，行程开始到行程结束，包含一装多卸周期")
+public class WorkCycle 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 = "行程状态：1执行中2已完成3取消")
+    @TableField("status")
+    private Integer status;
+
+    @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_number")
+    private String trailerNumber;
+
+    @ApiModelProperty(value = "托运方id")
+    @TableField("shipper_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long shipperId;
+
+    @ApiModelProperty(value = "托运方名称")
+    @TableField("shipper_name")
+    private String shipperName;
+
+    @ApiModelProperty(value = "周期开始时间")
+    @TableField("start_time")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(value = "周期结束或取消时间")
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
+    @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/WorkLog.java

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
     * </p>
  *
  * @author guoyong
- * @since 2022-04-20
+ * @since 2022-04-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -35,6 +35,11 @@ public class WorkLog implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
+    @ApiModelProperty(value = "行程周期id")
+    @TableField("cycle_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cycleId;
+
     @ApiModelProperty(value = "标题")
     @TableField("title")
     private String title;
@@ -47,16 +52,16 @@ public class WorkLog implements Serializable {
     @TableField("order_id")
     private String orderId;
 
-    @ApiModelProperty(value = "组织id")
+    @ApiModelProperty(value = "物流公司id")
     @TableField("org_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long orgId;
 
-    @ApiModelProperty(value = "组织名称")
+    @ApiModelProperty(value = "物流公司名称")
     @TableField("org_name")
     private String orgName;
 
-    @ApiModelProperty(value = "组织简称")
+    @ApiModelProperty(value = "物流公司简称")
     @TableField("org_short_name")
     private String orgShortName;
 

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

@@ -19,7 +19,7 @@ import lombok.experimental.Accessors;
     * </p>
  *
  * @author guoyong
- * @since 2022-04-20
+ * @since 2022-04-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -35,20 +35,29 @@ public class WorkOrder implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
+    @ApiModelProperty(value = "行程周期id")
+    @TableField("cycle_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long cycleId;
+
+    @ApiModelProperty(value = "运单状态：0-待执行 1-前往 2-等待 3-成果报备 4-已完成 5-已关闭")
+    @TableField("order_status")
+    private Integer orderStatus;
+
     @ApiModelProperty(value = "运单号")
     @TableField("order_no")
     private String orderNo;
 
-    @ApiModelProperty(value = "组织id")
+    @ApiModelProperty(value = "物流公司id")
     @TableField("org_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long orgId;
 
-    @ApiModelProperty(value = "组织名称")
+    @ApiModelProperty(value = "物流公司名称")
     @TableField("org_name")
     private String orgName;
 
-    @ApiModelProperty(value = "组织简称")
+    @ApiModelProperty(value = "物流公司简称")
     @TableField("org_short_name")
     private String orgShortName;
 
@@ -105,10 +114,6 @@ public class WorkOrder implements Serializable {
     @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)
@@ -158,7 +163,7 @@ public class WorkOrder implements Serializable {
     @TableField("trip_url")
     private String tripUrl;
 
-    @ApiModelProperty(value = "排队号")
+    @ApiModelProperty(value = "装车排队号")
     @TableField("queue_no")
     private String queueNo;
 

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

@@ -28,6 +28,9 @@ public class Truck {
     @ApiModelProperty(value = "物流公司名")
     private String orgName;
 
+    @ApiModelProperty(value = "物流公司名简称")
+    private String orgShortName;
+
     @ApiModelProperty(value = "车牌号")
     private String carNumber;
 

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

@@ -0,0 +1,16 @@
+package com.aoyang.tms.mapper;
+
+import com.aoyang.tms.entity.WorkCycle;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 行程周期表，行程开始到行程结束，包含一装多卸周期 Mapper 接口
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-21
+ */
+public interface WorkCycleMapper extends BaseMapper<WorkCycle> {
+
+}

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

@@ -21,7 +21,7 @@ public interface CommonService {
      * @param truckId
      * @return
      */
-    List<TruckDriver> getTruckDriver(Long truckId);
+    List<TruckDriver> findTruckDrivers(Long truckId);
 
     /**
      * 获取卡车信息
@@ -29,7 +29,7 @@ public interface CommonService {
      * @param truckId
      * @return
      */
-    Truck getTruck(Long truckId);
+    Truck findTruck(Long truckId);
 
 
     /**

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

@@ -0,0 +1,16 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.tms.entity.WorkCycle;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 行程周期表，行程开始到行程结束，包含一装多卸周期 服务类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-21
+ */
+public interface WorkCycleService extends IService<WorkCycle> {
+
+}

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

@@ -25,7 +25,7 @@ public class CommonServiceImpl implements CommonService {
     private StrategyFeignClient strategyFeignClient;
 
     @Override
-    public List<TruckDriver> getTruckDriver(Long truckId) {
+    public List<TruckDriver> findTruckDrivers(Long truckId) {
         TruckDriver truckDriver = new TruckDriver();
         truckDriver.setTruckId(truckId);
         Result<List<TruckDriver>> result = strategyFeignClient.findTruckDrivers(truckDriver);
@@ -36,7 +36,7 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public Truck getTruck(Long truckId) {
+    public Truck findTruck(Long truckId) {
         Truck truck = new Truck();
         truck.setTruckId(truckId);
         Result<Truck> result = strategyFeignClient.findTruck(truck);

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

@@ -0,0 +1,20 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.tms.entity.WorkCycle;
+import com.aoyang.tms.mapper.WorkCycleMapper;
+import com.aoyang.tms.service.WorkCycleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 行程周期表，行程开始到行程结束，包含一装多卸周期 服务实现类
+ * </p>
+ *
+ * @author guoyong
+ * @since 2022-04-21
+ */
+@Service
+public class WorkCycleServiceImpl extends ServiceImpl<WorkCycleMapper, WorkCycle> implements WorkCycleService {
+
+}

src/main/resources/mapper/RestInfoMapper.xml

@@ -5,12 +5,13 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.RestInfo">
         <id column="id" property="id" />
+        <result column="cycle_id" property="cycleId" />
         <result column="org_id" property="orgId" />
         <result column="org_name" property="orgName" />
         <result column="org_short_name" property="orgShortName" />
         <result column="truck_id" property="truckId" />
         <result column="car_number" property="carNumber" />
-        <result column="trailer_number" property="trailerNumber"/>
+        <result column="trailer_number" property="trailerNumber" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="note" property="note" />
@@ -21,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, start_time, end_time, note, creater, creater_name, create_date
+        id, cycle_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, start_time, end_time, note, creater, creater_name, create_date
     </sql>
 
 </mapper>

src/main/resources/mapper/TruckCheckInfoMapper.xml

@@ -5,12 +5,13 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckCheckInfo">
         <id column="id" property="id" />
+        <result column="cycle_id" property="cycleId" />
         <result column="org_id" property="orgId" />
         <result column="org_name" property="orgName" />
         <result column="org_short_name" property="orgShortName" />
         <result column="truck_id" property="truckId" />
         <result column="car_number" property="carNumber" />
-        <result column="trailer_number" property="trailerNumber"/>
+        <result column="trailer_number" property="trailerNumber" />
         <result column="type" property="type" />
         <result column="check_url" property="checkUrl" />
         <result column="trip" property="trip" />
@@ -23,7 +24,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, type, check_url, trip, trip_url, note, creater, creater_name, create_date
+        id, cycle_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, type, check_url, trip, trip_url, note, creater, creater_name, create_date
     </sql>
 
 </mapper>

src/main/resources/mapper/TruckRepairInfoMapper.xml

@@ -5,12 +5,13 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckRepairInfo">
         <id column="id" property="id" />
+        <result column="cycle_id" property="cycleId" />
         <result column="org_id" property="orgId" />
         <result column="org_name" property="orgName" />
         <result column="org_short_name" property="orgShortName" />
         <result column="truck_id" property="truckId" />
         <result column="car_number" property="carNumber" />
-        <result column="trailer_number" property="trailerNumber"/>
+        <result column="trailer_number" property="trailerNumber" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="note" property="note" />
@@ -21,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, start_time, end_time, note, creater, creater_name, create_date
+        id, cycle_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, start_time, end_time, note, creater, creater_name, create_date
     </sql>
 
 </mapper>

src/main/resources/mapper/WorkCycleMapper.xml

@@ -0,0 +1,35 @@
+<?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.WorkCycleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.WorkCycle">
+        <id column="id" property="id" />
+        <result column="status" property="status" />
+        <result column="org_id" property="orgId" />
+        <result column="org_name" property="orgName" />
+        <result column="org_short_name" property="orgShortName" />
+        <result column="driver_id_one" property="driverIdOne" />
+        <result column="driver_name_one" property="driverNameOne" />
+        <result column="driver_id_two" property="driverIdTwo" />
+        <result column="driver_name_two" property="driverNameTwo" />
+        <result column="escort_id" property="escortId" />
+        <result column="escort_name" property="escortName" />
+        <result column="truck_id" property="truckId" />
+        <result column="car_number" property="carNumber" />
+        <result column="trailer_number" property="trailerNumber" />
+        <result column="shipper_id" property="shipperId" />
+        <result column="shipper_name" property="shipperName" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="creater" property="creater" />
+        <result column="creater_name" property="createrName" />
+        <result column="create_date" property="createDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, status, org_id, org_name, org_short_name, driver_id_one, driver_name_one, driver_id_two, driver_name_two, escort_id, escort_name, truck_id, car_number, trailer_number, shipper_id, shipper_name, start_time, end_time, creater, creater_name, create_date
+    </sql>
+
+</mapper>

src/main/resources/mapper/WorkLogMapper.xml

@@ -5,6 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.WorkLog">
         <id column="id" property="id" />
+        <result column="cycle_id" property="cycleId" />
         <result column="title" property="title" />
         <result column="note" property="note" />
         <result column="order_id" property="orderId" />
@@ -13,7 +14,7 @@
         <result column="org_short_name" property="orgShortName" />
         <result column="truck_id" property="truckId" />
         <result column="car_number" property="carNumber" />
-        <result column="trailer_number" property="trailerNumber"/>
+        <result column="trailer_number" property="trailerNumber" />
         <result column="creater" property="creater" />
         <result column="creater_name" property="createrName" />
         <result column="create_date" property="createDate" />
@@ -21,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, title, note, order_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, creater, creater_name, create_date
+        id, cycle_id, title, note, order_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, creater, creater_name, create_date
     </sql>
 
 </mapper>