|
|
@@ -1,16 +1,25 @@
|
|
|
package com.aoyang.tms.controller;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.aoyang.common.param.PageParam;
|
|
|
import com.aoyang.common.result.Result;
|
|
|
+import com.aoyang.tms.common.ErrCodeEnum;
|
|
|
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.RestInfo;
|
|
|
+import com.aoyang.tms.entity.TruckCheckInfo;
|
|
|
+import com.aoyang.tms.entity.TruckRepairInfo;
|
|
|
import com.aoyang.tms.entity.WorkOrder;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import io.swagger.annotations.Api;
|
|
|
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;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
+
|
|
|
+import java.io.UnsupportedEncodingException;
|
|
|
+import java.net.URLDecoder;
|
|
|
+import java.time.LocalDateTime;
|
|
|
|
|
|
/**
|
|
|
* @Description: 作业人员相关接口
|
|
|
@@ -18,43 +27,82 @@ import org.springframework.web.bind.annotation.RequestHeader;
|
|
|
* @Date 2022/4/20 16:50
|
|
|
* @Version 1.0
|
|
|
*/
|
|
|
+@RestController
|
|
|
+@Slf4j
|
|
|
+@Api(value = "circleCRUD接口")
|
|
|
+@RequestMapping("/tms/worker")
|
|
|
public class WorkerController1 {
|
|
|
|
|
|
- @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 = "")
|
|
|
+ @PostMapping("/get_worker_order_info")
|
|
|
+ public Result<WorkOrder> getWorkerOrderInfo(@RequestBody WorkOrder param) {
|
|
|
+ return new Result<>(new WorkOrder());
|
|
|
}
|
|
|
|
|
|
- @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) {
|
|
|
+ @ApiOperation(value = "获取运单分页列表", notes = "根据司机id获取运单分页列表")
|
|
|
+ @PostMapping("/worker_order_page_list")
|
|
|
+ public Result<Page<WorkOrder>> workerOrderPageList(@RequestHeader(value = "userId") Long userId,
|
|
|
+ @RequestBody PageParam<WorkOrder> pageParam) {
|
|
|
+ log.info("获取圈子分页列表,调用/tms/worker/worker_order_page_list,参数:{}", JSON.toJSONString(pageParam));
|
|
|
+ if (pageParam == null || pageParam.getParam() == null) {
|
|
|
+ return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
+ }
|
|
|
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 = "根据司机id获取运单分页列表")
|
|
|
+ @PostMapping("/add_rest_info")
|
|
|
+ public Result<RestInfo> addRestInfo(@RequestHeader(value = "userId") Long userId,
|
|
|
+ @RequestHeader(value = "userName") String userName,
|
|
|
+ @RequestBody RestInfo param) {
|
|
|
+ if (param.getOrgId() == null || param.getOrgName() == null || param.getTruckId() == null
|
|
|
+ || param.getCarNumber() == null || param.getStartTime() == null || param.getEndTime() == null) {
|
|
|
+ return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
+ }
|
|
|
+ String utf8Name = userName;
|
|
|
+ try {
|
|
|
+ utf8Name = URLDecoder.decode(userName, "UTF-8");
|
|
|
+ } catch (UnsupportedEncodingException ignored) {
|
|
|
+ }
|
|
|
+ param.setCreater(userId);
|
|
|
+ param.setCreaterName(utf8Name);
|
|
|
+ param.setCreateDate(LocalDateTime.now());
|
|
|
|
|
|
- @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());
|
|
|
+ return new Result<>(new RestInfo());
|
|
|
}
|
|
|
|
|
|
- //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());
|
|
|
+ @ApiOperation(value = "途中上报-途中检查", notes = "根据司机id获取运单分页列表")
|
|
|
+ @PostMapping("/add_truck_check_info")
|
|
|
+ public Result<TruckCheckInfo> addTruckCheckInfo(@RequestHeader(value = "userId") Long userId,
|
|
|
+ @RequestHeader(value = "userName") String userName,
|
|
|
+ @RequestBody TruckCheckInfo param) {
|
|
|
+ String utf8Name = userName;
|
|
|
+ try {
|
|
|
+ utf8Name = URLDecoder.decode(userName, "UTF-8");
|
|
|
+ } catch (UnsupportedEncodingException ignored) {
|
|
|
+ }
|
|
|
+ param.setCreater(userId);
|
|
|
+ param.setCreaterName(utf8Name);
|
|
|
+ param.setCreateDate(LocalDateTime.now());
|
|
|
+
|
|
|
+ return new Result<>(new TruckCheckInfo());
|
|
|
}
|
|
|
|
|
|
+ @ApiOperation(value = "途中上报-途中维修", notes = "根据司机id获取运单分页列表")
|
|
|
+ @PostMapping("/add_truck_repair_info")
|
|
|
+ public Result<TruckRepairInfo> addTruckRepairInfo(@RequestHeader(value = "userId") Long userId,
|
|
|
+ @RequestHeader(value = "userName") String userName,
|
|
|
+ @RequestBody TruckRepairInfo param) {
|
|
|
+ String utf8Name = userName;
|
|
|
+ try {
|
|
|
+ utf8Name = URLDecoder.decode(userName, "UTF-8");
|
|
|
+ } catch (UnsupportedEncodingException ignored) {
|
|
|
+ }
|
|
|
+ param.setCreater(userId);
|
|
|
+ param.setCreaterName(utf8Name);
|
|
|
+ param.setCreateDate(LocalDateTime.now());
|
|
|
+
|
|
|
+ return new Result<>(new TruckRepairInfo());
|
|
|
+ }
|
|
|
|
|
|
}
|