feature(电子围栏):前端接口定义

performance-api/src/main/java/com/clx/performance/enums/OrderChildEnum.java

@@ -185,4 +185,20 @@ public enum OrderChildEnum {
         }
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum OperateRecordType {
+        CANCEL_ORDER(1, "取消订单"),
+        REMOVE_LIMIT(2, "解除装车限制"),
+
+        ;
+
+        private final int code;
+        private final String msg;
+
+        public static Optional<OperateRecordType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
 }

performance-api/src/main/java/com/clx/performance/param/app/NeedAlertSuperviseInfoParam.java

+package com.clx.performance.param.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 装车范围校验检查参数
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class NeedAlertSuperviseInfoParam {
+
+    @ApiModelProperty(value = "货单编号", example = "100000000")
+    @NotBlank(message = "货单编号不能为空")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/OrderChildLoadRangeCheckParam.java

+package com.clx.performance.param.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * 装车范围校验检查参数
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildLoadRangeCheckParam {
+
+    @ApiModelProperty(value = "货单编号", example = "100000000")
+    @NotBlank(message = "货单编号不能为空")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "车辆id", example = "1")
+    @NotNull(message = "车辆id空")
+    private Integer truckId;
+
+    @ApiModelProperty(value = "车牌号", example = "1")
+    @NotNull(message = "车牌号不能为空")
+    private String truckNo;
+
+    @ApiModelProperty(value = "司机用户编号", example = "1")
+    @NotNull(message = "司机用户编号空")
+    private Long driverUserNo;
+
+    @ApiModelProperty("纬度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty("经度")
+    private BigDecimal longitude;
+
+}

performance-api/src/main/java/com/clx/performance/vo/app/NeedAlertSuperviseInfoResultVO.java

+package com.clx.performance.vo.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * 是否需要监装结果VO
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+public class NeedAlertSuperviseInfoResultVO {
+
+    @ApiModelProperty(value = "是否需要弹信息 0 不需要 1 需要", example = "0")
+    private Integer needAlert;
+    @ApiModelProperty(value = "监装人", example = "张三")
+    private String supervisor;
+    @ApiModelProperty(value = "联系方式", example = "12345678901")
+    private String mobile;
+    @ApiModelProperty(value = "监装位置", example = "北业亿林洗煤厂")
+    private String location;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/OrderChildOperateRecordVO.java

+package com.clx.performance.vo.pc;
+
+import com.clx.performance.enums.OrderChildEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class OrderChildOperateRecordVO {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    private String childNo;
+
+    @ApiModelProperty(value = "操作类型 1 取消运单 2 解除装车限制", example = "1")
+    private Integer type;
+
+    @ApiModelProperty(value = "主车牌照", example = "京A12345")
+    private String truckNo;
+
+    @ApiModelProperty(value = "司机名称", example = "张三")
+    private String driverName;
+
+    @ApiModelProperty(value = "联系方式", example = "130000000")
+    private String driverMobile;
+
+    @ApiModelProperty(value = "货源地", example = "朝阳")
+    private String sendAddress;
+
+    @ApiModelProperty(value = "目的地", example = "西城")
+    private String receiveAddress;
+
+    @ApiModelProperty(value = "货物类型名称", example = "面煤")
+    public String goodTypeName;
+
+    @ApiModelProperty(value = "备注", example = "备注xxxx")
+    public String remark;
+
+    @ApiModelProperty(value = "操作时间", example = "2020-01-01 10:10:10")
+    public String operateTime;
+
+    @ApiModelProperty(value = "操作人", example = "张三")
+    public String operator;
+
+    @ApiModelProperty(value = "操作类型  取消运单  解除装车限制", example = "取消运单")
+    public String getTypeMsg() {
+        return OrderChildEnum.OperateRecordType.getByCode(type).get().getMsg();
+    }
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverOrderChildController.java

@@ -195,4 +195,17 @@ public class AppDriverOrderChildController {
         return Result.ok(orderChildService.ocrRecognition(param));
     }
 
+    @ApiOperation(value = "司机端装货范围检查拦截", notes = "<br>By:姜武杰")
+    @PostMapping("/loadRangeCheck")
+    public Result<Integer> loadRangeCheck(@RequestBody @Validated OrderChildLoadRangeCheckParam param) {
+        // TODO 待实现
+        return Result.ok();
+    }
+    @ApiOperation(value = "是否需要弹出监装信息", notes = "<br>By:姜武杰")
+    @PostMapping("/needAlertSuperviseInfo")
+    public Result<NeedAlertSuperviseInfoResultVO> needAlertSuperviseInfo(@RequestBody @Validated NeedAlertSuperviseInfoParam param) {
+        // TODO 待实现
+        return Result.ok();
+    }
+
 }

performance-web/src/main/java/com/clx/performance/controller/pc/OrderCancelController.java

@@ -2,24 +2,18 @@ package com.clx.performance.controller.pc;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.dao.OrderChildDao;
-import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.dao.settle.SettlementDriverDetailDao;
-import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
-import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.param.pc.ArtificialCancelOrderParam;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.param.pc.OrderChildCancelRecordParam;
 import com.clx.performance.service.OrderCancelService;
-import com.clx.performance.service.TransportSyncService;
 import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.pc.OrderChildOperateRecordVO;
 import com.msl.common.base.PageData;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -70,5 +64,19 @@ public class OrderCancelController {
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
+    @ApiOperation(value = "运单处理记录", notes = "<br>By:姜武杰")
+    @PostMapping("/orderChildOperateRecord")
+    public Result<PageData<OrderChildOperateRecordVO>> orderChildOperateRecord(@RequestBody OrderChildCancelRecordParam param) {
+        // TODO 待实现
+        return null;
+    }
+
+    @ApiOperation(value = "客服解除装车限制", notes = "<br>By:姜武杰")
+    @PostMapping("/artificialRemoveLoadLimit")
+    public Result<Object> artificialRemoveLoadLimit(@RequestBody ArtificialCancelOrderParam param) {
+        // TODO 待实现
+        return Result.ok();
+    }
+
 
 }