修改挂车牌号

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

@@ -58,8 +58,8 @@ public class RestInfo implements Serializable {
     private String carNumber;
 
     @ApiModelProperty(value = "挂车车牌号")
-    @TableField("trailer_car_number")
-    private String trailerCarNumber;
+    @TableField("trailer_number")
+    private String trailerNumber;
 
     @ApiModelProperty(value = "开始时间")
     @TableField("start_time")

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

@@ -58,8 +58,8 @@ public class TruckCheckInfo implements Serializable {
     private String carNumber;
 
     @ApiModelProperty(value = "挂车车牌号")
-    @TableField("trailer_car_number")
-    private String trailerCarNumber;
+    @TableField("trailer_number")
+    private String trailerNumber;
 
     @ApiModelProperty(value = "类型： 1-出车检查 2-收车检查 3-途中检查")
     @TableField("type")

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

@@ -58,8 +58,8 @@ public class TruckRepairInfo implements Serializable {
     private String carNumber;
 
     @ApiModelProperty(value = "挂车车牌号")
-    @TableField("trailer_car_number")
-    private String trailerCarNumber;
+    @TableField("trailer_number")
+    private String trailerNumber;
 
     @ApiModelProperty(value = "开始时间")
     @TableField("start_time")

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

@@ -70,8 +70,8 @@ public class WorkLog implements Serializable {
     private String carNumber;
 
     @ApiModelProperty(value = "挂车车牌号")
-    @TableField("trailer_car_number")
-    private String trailerCarNumber;
+    @TableField("trailer_number")
+    private String trailerNumber;
 
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")

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

@@ -89,8 +89,8 @@ public class WorkOrder implements Serializable {
     private String carNumber;
 
     @ApiModelProperty(value = "挂车车牌号")
-    @TableField("trailer_car_number")
-    private String trailerCarNumber;
+    @TableField("trailer_number")
+    private String trailerNumber;
 
     @ApiModelProperty(value = "托运方id")
     @TableField("shipper_id")

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

@@ -57,8 +57,8 @@ public class WorkOrderReadinfo implements Serializable {
     private String carNumber;
 
     @ApiModelProperty(value = "挂车车牌号")
-    @TableField("trailer_car_number")
-    private String trailerCarNumber;
+    @TableField("trailer_number")
+    private String trailerNumber;
 
     @ApiModelProperty(value = "分配卡车id")
     @TableField("truck_id")

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

@@ -4,11 +4,13 @@ import com.aoyang.common.result.Result;
 import com.aoyang.tms.feign.result.SystemConfig;
 import com.aoyang.tms.feign.fallback.StrategyFeignClientFallback;
 import com.aoyang.tms.feign.result.Truck;
+import com.aoyang.tms.feign.result.TruckDriver;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Description: strategy
@@ -36,6 +38,16 @@ public interface StrategyFeignClient {
      */
 
     @PostMapping("/strategy/truck/find_truck")
-    Result<Truck> find(@RequestBody Truck truck);
+    Result<Truck> findTruck(@RequestBody Truck truck);
+
+    /**
+     * 根据卡车id获取卡车司机列表信息
+     *
+     * @param truckDriver
+     * @return
+     */
+
+    @PostMapping("/strategy/truck_driver/find_truck_drivers")
+    Result<List<TruckDriver>> findTruckDrivers(@RequestBody TruckDriver truckDriver);
 
 }

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

@@ -4,12 +4,14 @@ import com.aoyang.common.result.Result;
 import com.aoyang.tms.feign.result.SystemConfig;
 import com.aoyang.tms.feign.StrategyFeignClient;
 import com.aoyang.tms.feign.result.Truck;
+import com.aoyang.tms.feign.result.TruckDriver;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Description: strategy 请求回滚
@@ -30,12 +32,17 @@ public class StrategyFeignClientFallback implements FallbackFactory<StrategyFeig
 
             @Override
             public Result<SystemConfig> getSystemConfigByName(SystemConfig systemConfigParam) {
-                return new Result<>(4000, "fallBack", null);
+                return new Result<>(4000, "Strategy熔断", null);
             }
 
             @Override
-            public Result<Truck> find(Truck truck) {
-                return new Result<>(4000, "fallBack");
+            public Result<Truck> findTruck(Truck truck) {
+                return new Result<>(4000, "Strategy熔断", null);
+            }
+
+            @Override
+            public Result<List<TruckDriver>> findTruckDrivers(TruckDriver truckDriver) {
+                return new Result<>(4000, "Strategy熔断", null);
             }
 
         };

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

@@ -1,25 +1,42 @@
 package com.aoyang.tms.feign.result;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
 /**
- * @Description: java类作用描述
- * @Author: panenming
- * @CreateDate: 2020/2/13 下午4:58
+ * @Description: 车辆基本信息
+ * @Author: guoyong
+ * @CreateDate: 2022/4/21 下午4:58
  */
-@Getter
-@Setter
+@Data
 @ToString
 public class Truck {
+
+    @ApiModelProperty(value = "卡车id")
     private Long truckId;
-    private Integer tradeType;
+
+    @ApiModelProperty(value = "运力系统车辆状态，状态：1出车检查；2.作业中；3.收车中；4.收车后检查；5.已收车")
+    private Integer tmsStatus;
+
+    @ApiModelProperty(value = "物流公司id")
     private Long orgId;
-    private String truckName;
+
+    @ApiModelProperty(value = "物流公司名")
     private String orgName;
+
+    @ApiModelProperty(value = "车牌号")
     private String carNumber;
-    private Integer status;
-    private Integer linked;
-    private Integer autoAccount;
+
+    @ApiModelProperty(value = "挂车牌号")
+    private String trailerNumber;
+
+    @ApiModelProperty(value = "车辆所属部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "车辆所属部门名称")
+    private Long deptName;
 }

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

@@ -0,0 +1,53 @@
+package com.aoyang.tms.feign.result;
+
+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;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TruckDriver对象", description="")
+public class TruckDriver implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id主键")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    @ApiModelProperty(value = "组织id（user.org.org_id）")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orgId;
+
+    @ApiModelProperty(value = "卡车id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "司机id（user.user.user_id）")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long driverId;
+
+    @ApiModelProperty(value = "司机名称（user.user.user_name）")
+    private String driverName;
+
+    @ApiModelProperty(value = "创建人id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long creater;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String createrName;
+
+    @ApiModelProperty(value = "创建日期时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "绑定标识：未绑定， 默认：1：绑定")
+    private  Integer flag = 1;
+
+}

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

@@ -0,0 +1,43 @@
+package com.aoyang.tms.service;
+
+import com.aoyang.common.result.Result;
+import com.aoyang.tms.feign.result.Truck;
+import com.aoyang.tms.feign.result.TruckDriver;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Description: 常用工具类，如获取组织信息、用户信息、卡车信息、验证Result、验证通联返回值
+ * @Author guoyong
+ * @Date 2021/8/26 17:16
+ * @Version 1.0
+ */
+public interface CommonService {
+
+    /**
+     * 获取卡车司机列表
+     *
+     * @param truckId
+     * @return
+     */
+    List<TruckDriver> getTruckDriver(Long truckId);
+
+    /**
+     * 获取卡车信息
+     *
+     * @param truckId
+     * @return
+     */
+    Truck getTruck(Long truckId);
+
+
+    /**
+     * 判断操作是否成功，如获取、保存、更新等操作
+     *
+     * @param result
+     * @return 成功返回true, 失败返回false
+     */
+    boolean verifyResult(Result result);
+
+}

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

@@ -0,0 +1,53 @@
+package com.aoyang.tms.service.impl;
+
+import com.aoyang.common.result.Result;
+import com.aoyang.tms.feign.StrategyFeignClient;
+import com.aoyang.tms.feign.result.Truck;
+import com.aoyang.tms.feign.result.TruckDriver;
+import com.aoyang.tms.service.CommonService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description: 公共类，方便服务间调用
+ * @Author guoyong
+ * @Date 2022/4/21 13:58
+ * @Version 1.0
+ */
+@Service
+@Slf4j
+public class CommonServiceImpl implements CommonService {
+
+    @Resource
+    private StrategyFeignClient strategyFeignClient;
+
+    @Override
+    public List<TruckDriver> getTruckDriver(Long truckId) {
+        TruckDriver truckDriver = new TruckDriver();
+        truckDriver.setTruckId(truckId);
+        Result<List<TruckDriver>> result = strategyFeignClient.findTruckDrivers(truckDriver);
+        if (verifyResult(result)) {
+            return result.getData();
+        }
+        return null;
+    }
+
+    @Override
+    public Truck getTruck(Long truckId) {
+        Truck truck = new Truck();
+        truck.setTruckId(truckId);
+        Result<Truck> result = strategyFeignClient.findTruck(truck);
+        if (verifyResult(result)) {
+            return result.getData();
+        }
+        return null;
+    }
+
+    @Override
+    public boolean verifyResult(Result result) {
+        return false;
+    }
+}

src/main/resources/mapper/RestInfoMapper.xml

@@ -10,7 +10,7 @@
         <result column="org_short_name" property="orgShortName" />
         <result column="truck_id" property="truckId" />
         <result column="car_number" property="carNumber" />
-        <result column="trailer_car_number" property="trailerCarNumber" />
+        <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 +21,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, org_id, org_name, org_short_name, truck_id, car_number, trailer_car_number, start_time, end_time, note, creater, creater_name, create_date
+        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

@@ -10,7 +10,7 @@
         <result column="org_short_name" property="orgShortName" />
         <result column="truck_id" property="truckId" />
         <result column="car_number" property="carNumber" />
-        <result column="trailer_car_number" property="trailerCarNumber" />
+        <result column="trailer_number" property="trailerNumber"/>
         <result column="type" property="type" />
         <result column="check_url" property="checkUrl" />
         <result column="trip" property="trip" />
@@ -23,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, org_id, org_name, org_short_name, truck_id, car_number, trailer_car_number, type, check_url, trip, trip_url, note, creater, creater_name, create_date
+        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

@@ -10,7 +10,7 @@
         <result column="org_short_name" property="orgShortName" />
         <result column="truck_id" property="truckId" />
         <result column="car_number" property="carNumber" />
-        <result column="trailer_car_number" property="trailerCarNumber" />
+        <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 +21,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, org_id, org_name, org_short_name, truck_id, car_number, trailer_car_number, start_time, end_time, note, creater, creater_name, create_date
+        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/WorkLogMapper.xml

@@ -13,7 +13,7 @@
         <result column="org_short_name" property="orgShortName" />
         <result column="truck_id" property="truckId" />
         <result column="car_number" property="carNumber" />
-        <result column="trailer_car_number" property="trailerCarNumber" />
+        <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 +21,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, title, note, order_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_car_number, creater, creater_name, create_date
+        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>

src/main/resources/mapper/WorkOrderReadinfoMapper.xml

@@ -10,7 +10,7 @@
         <result column="org_name" property="orgName" />
         <result column="org_short_name" property="orgShortName" />
         <result column="car_number" property="carNumber" />
-        <result column="trailer_car_number" property="trailerCarNumber" />
+        <result column="trailer_number" property="trailerNumber"/>
         <result column="truck_id" property="truckId" />
         <result column="user_id" property="userId" />
         <result column="user_name" property="userName" />
@@ -22,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, order_id, org_id, org_name, org_short_name, car_number, trailer_car_number, truck_id, user_id, user_name, note, creater, creater_name, create_date
+        id, order_id, org_id, org_name, org_short_name, car_number, trailer_number, truck_id, user_id, user_name, note, creater, creater_name, create_date
     </sql>
 
 </mapper>