浏览代码

添加开始,结束时间,添加日志,判断

guoyong 4 年之前
父节点
当前提交
9591bb4497

+ 35 - 6
src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -61,26 +61,37 @@ public class WorkerController {
         return new Result<>(workerInfo1);
     }
 
-    @ApiOperation(value = "待执行运单列表", notes = "移动端获取司机或押运员的待执行或执行中的运单列表")
+    @ApiOperation(value = "待执行运单列表", notes = "卡车id必传,移动端获取司机或押运员的待执行或执行中的运单列表")
     @PostMapping("/find_work_order_list")
     public Result<List<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
                                                        @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
-        List<WorkOrderVO> records = new ArrayList<WorkOrderVO>();
-        return new Result<>(records);
+        log.info("待执行运单列表,/tms/worker/find_work_order_list,参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        List<WorkOrderVO> list = workOrderService.findWorkOrderList(workOrder);
+        return new Result<>(list);
     }
 
     @ApiOperation(value = "点击待执行运单", notes = "必传参数:truckId,orderId")
     @PostMapping("/add_work_order_readinfo")
     public Result work_cycle_page(@RequestHeader(value = "orgId") Long orgId,
-                                  @RequestHeader(value = "userId") Long userId,@RequestBody WorkOrderReadinfo workOrderReadinfo) {
+                                  @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrderReadinfo workOrderReadinfo) {
+        log.info("点击待执行运单,/tms/worker/add_work_order_readinfo,参数:{}", JSON.toJSONString(workOrderReadinfo));
+        if (workOrderReadinfo == null || workOrderReadinfo.getTruckId() == null || workOrderReadinfo.getOrderId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         boolean flag = workOrderReadinfoService.save(workOrderReadinfo);
         return new Result<>(flag);
     }
 
-
     @ApiOperation(value = "历史行车列表", notes = "必传参数:truckId")
     @PostMapping("/work_cycle_page")
     public Result work_cycle_page(@RequestBody PageParam<WorkCycle> pageParam) {
+        log.info("历史行车列表,/tms/worker/add_work_order_readinfo,参数:{}", JSON.toJSONString(pageParam));
+        if (pageParam == null || pageParam.getParam() == null || pageParam.getParam().getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         Page<WorkCycle> page = new Page<>(pageParam.getPage(), pageParam.getSize());
         IPage<WorkCycle> records = workCycleService.page(page, Wrappers.query(pageParam.getParam()));
         return new Result<>(records);
@@ -89,6 +100,10 @@ public class WorkerController {
     @ApiOperation(value = "上报途中休息信息", notes = "必传参数:开始时间、结束时间必传")
     @PostMapping("/add_rest_info")
     public Result add_rest_info(@RequestBody RestInfo restInfo) {
+        log.info("上报途中休息信息,/tms/worker/add_rest_info,参数:{}", JSON.toJSONString(restInfo));
+        if (restInfo == null || restInfo.getTruckId() == null || restInfo.getStartTime() == null || restInfo.getEndTime() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         Boolean flag = restInfoService.save(restInfo);
         return new Result<>(flag);
     }
@@ -96,6 +111,10 @@ public class WorkerController {
     @ApiOperation(value = "上报车辆途中维修信息", notes = "新增或修改都用同一个接口,新增后返回带主键id的实体")
     @PostMapping("/add_truck_repair_info")
     public Result<TruckRepairInfo> add_truck_repair_info(@RequestBody TruckRepairInfo truckRepairInfo) {
+        log.info("上报车辆途中维修信息,/tms/worker/add_rest_info,参数:{}", JSON.toJSONString(truckRepairInfo));
+        if (truckRepairInfo == null || truckRepairInfo.getTruckId() == null || truckRepairInfo.getStartTime() == null || truckRepairInfo.getEndTime() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         //TODO SAVE OR UPDATE
         //TODO 信息全了,则需要更改车辆状态,待执行到出车作业中
         return new Result<>(new TruckRepairInfo());
@@ -104,6 +123,10 @@ public class WorkerController {
     @ApiOperation(value = "上报车辆检查信息", notes = "新增或修改车辆检车信息")
     @PostMapping("/add_truck_check_info")
     public Result add_truck_check_info(@RequestBody TruckCheckInfo truckCheckInfo) {
+        log.info("上报车辆检查信息,/tms/worker/add_truck_check_info,参数:{}", JSON.toJSONString(truckCheckInfo));
+        if (truckCheckInfo == null || truckCheckInfo.getTruckId() == null || truckCheckInfo.getStartTime() == null || truckCheckInfo.getEndTime() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         //TODO SAVE OR UPDATE
         //TODO 信息全了,则需要更改车辆状态,待执行到出车作业中
         //不同类型,验证信息不一样
@@ -114,6 +137,8 @@ public class WorkerController {
     @ApiOperation(value = "获取行车日志列表", notes = "卡车id必传")
     @PostMapping("/work_log_list")
     public Result work_log_list(@RequestBody PageParam<WorkLog> pageParam) {
+        log.info("获取行车日志列表,/tms/worker/work_log_list,参数:{}", JSON.toJSONString(pageParam));
+
         Page<WorkLog> page = new Page<>(pageParam.getPage(), pageParam.getSize());
         IPage<WorkLog> records = workLogService.page(page, Wrappers.query(pageParam.getParam()));
         return new Result<>(records);
@@ -122,6 +147,7 @@ public class WorkerController {
     @ApiOperation(value = "装车等待上报", notes = "")
     @PostMapping("/add_zhuangche_wait")
     public Result add_zhuangche_wait(@RequestBody WorkOrder workOrder) {
+        log.info("装车等待上报,/tms/worker/add_zhuangche_wait,参数:{}", JSON.toJSONString(workOrder));
         Boolean flag = workOrderService.save(workOrder);
         return new Result<>(flag);
     }
@@ -129,14 +155,16 @@ public class WorkerController {
     @ApiOperation(value = "卸车等待上报", notes = "")
     @PostMapping("/add_xieche_wait")
     public Result add_xieche_wait(@RequestBody WorkOrder workOrder) {
+        log.info("卸车等待上报,/tms/worker/add_xieche_wait,参数:{}", JSON.toJSONString(workOrder));
         Boolean flag = workOrderService.save(workOrder);
         return new Result<>(flag);
     }
 
-
     @ApiOperation(value = "装车成果上报", notes = "")
     @PostMapping("/add_zhuangche_result")
     public Result add_zhuangche_result(@RequestBody WorkOrder workOrder) {
+        log.info("装车成果上报,/tms/worker/add_zhuangche_result,参数:{}", JSON.toJSONString(workOrder));
+
         Boolean flag = workOrderService.save(workOrder);
         return new Result<>(flag);
     }
@@ -144,6 +172,7 @@ public class WorkerController {
     @ApiOperation(value = "卸车成果上报", notes = "")
     @PostMapping("/add_xieche_result")
     public Result add_xieche_result(@RequestBody WorkOrder workOrder) {
+        log.info("卸车成果上报,/tms/worker/add_xieche_result,参数:{}", JSON.toJSONString(workOrder));
         Boolean flag = workOrderService.save(workOrder);
         return new Result<>(flag);
     }

+ 8 - 0
src/main/java/com/aoyang/tms/entity/TruckCheckInfo.java

@@ -86,6 +86,14 @@ public class TruckCheckInfo implements Serializable {
     @TableField("note")
     private String note;
 
+    @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)

+ 3 - 1
src/main/resources/mapper/TruckCheckInfoMapper.xml

@@ -17,6 +17,8 @@
         <result column="trip" property="trip" />
         <result column="trip_url" property="tripUrl" />
         <result column="note" property="note" />
+        <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" />
@@ -24,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        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
+        id, cycle_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, type, check_url, trip, trip_url, note, start_time, end_time, creater, creater_name, create_date
     </sql>
 
 </mapper>