更新卡车状态

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

@@ -28,14 +28,14 @@ import com.aoyang.common.param.PageParam;
  */
 @RestController
 @Slf4j
-@Api(value = "work_cycleCRUD接口")
+@Api(value = "历史行车相关接口")
 @RequestMapping("/tms/work_cycle")
 public class WorkCycleController {
 
     @Resource
     private WorkCycleService workCycleService;
 
-    @ApiOperation(value = "获取work_cycle列表",notes="")
+    @ApiOperation(value = "获取历史行车列表",notes="")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<WorkCycle> pageParam) {
         Page<WorkCycle> page = new Page<>(pageParam.getPage(), pageParam.getSize());
@@ -43,17 +43,4 @@ public class WorkCycleController {
         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/controller/WorkerController.java

@@ -3,12 +3,10 @@ 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.TruckInfo;
 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;
@@ -30,34 +28,26 @@ public class WorkerController {
         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,
+    @ApiOperation(value = "获取行车详情信息", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
+    @PostMapping("/find_work_truck_info")
+    public Result<TruckInfo> find_work_truck_info(@RequestHeader(value = "orgId") Long orgId,
+                                                  @RequestHeader(value = "userId") Long userId, @RequestBody Truck truck) {
+        return new Result<>(new TruckInfo());
+    }
+
+    @ApiOperation(value = "获取待执行作业列表信息", notes = "卡车id、必传")
+    @PostMapping("/find_todo_work_list")
+    public Result<Page<WorkOrderVO>> find_todo_work_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,
+    @PostMapping("/find_truck_info")
+    public Result<WorkerInfo> find_truck_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/vo/TruckInfo.java

@@ -0,0 +1,68 @@
+package com.aoyang.tms.controller.vo;
+
+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 TruckInfo {
+
+    @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;
+
+    @ApiModelProperty(value = "订单状态")
+    private int orderStatus;
+
+    @ApiModelProperty(value = "装车订单数量")
+    private int zhuagncheOrderNum;
+
+    @ApiModelProperty(value = "卸车订单数量")
+    private int xiecheOrderNum;
+
+}

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

@@ -61,4 +61,15 @@ public interface StrategyFeignClient {
     Result<Integer> findOrgTruckNumber(@RequestBody Truck truck);
 
 
+    /**
+     * 修改卡车运力状态
+     *
+     * @param truck
+     * @return
+     */
+
+    @PostMapping("/strategy/truck/update_tms_status")
+    Result<Boolean> updateTruckTmsStatus(@RequestBody Truck truck);
+
+
 }

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

@@ -40,6 +40,14 @@ public interface CommonService {
      */
     Integer findOrgTruckNumber(Long orgId, Long deptId);
 
+    /**
+     * 修改卡车运力状态
+     *
+     * @param
+     * @return
+     */
+    Boolean updateTruckTmsStatus(Long truckId, Integer tmsStatus);
+
 
     /**
      * 判断操作是否成功，如获取、保存、更新等操作

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

@@ -76,6 +76,18 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
+    public Boolean updateTruckTmsStatus(Long truckId, Integer tmsStatus) {
+        Truck truck = new Truck();
+        truck.setTruckId(truckId);
+        truck.setTmsStatus(tmsStatus);
+        Result<Boolean> result = strategyFeignClient.updateTruckTmsStatus(truck);
+        if (verifyResult(result)) {
+            return result.getData();
+        }
+        return null;
+    }
+
+    @Override
     public boolean verifyResult(Result result) {
         return false;
     }