取消tms库

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

@@ -1,5 +1,6 @@
 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;
@@ -17,6 +18,13 @@ public class WorkerInfo {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long truckId;
 
+
+    @ApiModelProperty(value = "所属部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "所属部门名称")
+    private String deptName;
+
     @ApiModelProperty(value = "司机1id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long driverIdOne;

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

@@ -41,5 +41,5 @@ public class Truck {
     private Long deptId;
 
     @ApiModelProperty(value = "车辆所属部门名称")
-    private Long deptName;
+    private String deptName;
 }

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

@@ -1,5 +1,6 @@
 package com.aoyang.tms.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.vo.LocationVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
@@ -51,13 +52,19 @@ public class CommonServiceImpl implements CommonService {
     public WorkerInfo findTruckInfo(Long truckId) {
         WorkerInfo workerInfo = new WorkerInfo();
         workerInfo.setTruckId(truckId);
+        log.info("findTruckInfo findTruck 参数:{}", JSON.toJSONString(truckId));
         Truck truck = findTruck(truckId);
+        log.info("findTruckInfo findTruck 结果:{}", JSON.toJSONString(truck));
         if (truck != null) {
             workerInfo.setTruckStatus(truck.getTmsStatus());
             workerInfo.setCarNumber(truck.getCarNumber());
             workerInfo.setTrailerNumber(truck.getTrailerNumber());
+            workerInfo.setDeptId(truck.getDeptId());
+            workerInfo.setDeptName(truck.getDeptName());
         }
+        log.info("findTruckInfo findTruckDrivers 参数:{}", JSON.toJSONString(truckId));
         List<TruckDriver> truckDrivers = findTruckDrivers(truckId);
+        log.info("findTruckInfo findTruckDrivers 结果:{}", JSON.toJSONString(truckDrivers));
         if (truckDrivers != null && truckDrivers.size() > 0) {
             workerInfo.setDriverIdOne(truckDrivers.get(0).getDriverId());
             workerInfo.setDriverNameOne(truckDrivers.get(0).getDriverName());
@@ -67,7 +74,10 @@ public class CommonServiceImpl implements CommonService {
             }
         }
 
+        log.info("findTruckInfo getById 参数:{}", JSON.toJSONString(truckId));
         TruckEscort truckEscort = truckEscortService.getById(truckId);
+        log.info("findTruckInfo getById:{}", JSON.toJSONString(truckEscort));
+
         if (truckEscort != null) {
             workerInfo.setEscortId(truckEscort.getTruckId());
             workerInfo.setEscortName(truckEscort.getEscortName());