删除无用控制器

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

@@ -45,6 +45,8 @@ public class WorkerController {
     private TruckCheckInfoService truckCheckInfoService;
     @Resource
     private WorkLogService workLogService;
+    @Resource
+    private WorkOrderReadinfoService workOrderReadinfoService;
 
 
     @ApiOperation(value = "运力详情", notes = "卡车id必传，包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
@@ -59,14 +61,23 @@ public class WorkerController {
         return new Result<>(workerInfo1);
     }
 
-    @ApiOperation(value = "运单列表", notes = "移动端获取司机或押运员的待执行或执行中的运单列表")
+    @ApiOperation(value = "待执行运单列表", notes = "移动端获取司机或押运员的待执行或执行中的运单列表")
     @PostMapping("/find_work_order_list")
     public Result<List<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
-                                                       @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
+                                                       @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
         List<WorkOrderVO> records = new ArrayList<WorkOrderVO>();
         return new Result<>(records);
     }
 
+    @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) {
+        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) {
@@ -75,14 +86,14 @@ public class WorkerController {
         return new Result<>(records);
     }
 
-    @ApiOperation(value = "上报途中休息信息",notes="开始时间、结束时间必传")
+    @ApiOperation(value = "上报途中休息信息", notes = "必传参数:开始时间、结束时间必传")
     @PostMapping("/add_rest_info")
     public Result add_rest_info(@RequestBody RestInfo restInfo) {
         Boolean flag = restInfoService.save(restInfo);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "上报车辆途中维修信息",notes="新增或修改都用同一个接口,新增后返回带主键id的实体")
+    @ApiOperation(value = "上报车辆途中维修信息", notes = "新增或修改都用同一个接口,新增后返回带主键id的实体")
     @PostMapping("/add_truck_repair_info")
     public Result<TruckRepairInfo> add_truck_repair_info(@RequestBody TruckRepairInfo truckRepairInfo) {
         //TODO SAVE OR UPDATE
@@ -90,7 +101,7 @@ public class WorkerController {
         return new Result<>(new TruckRepairInfo());
     }
 
-    @ApiOperation(value = "上报车辆检查信息",notes="新增或修改车辆检车信息")
+    @ApiOperation(value = "上报车辆检查信息", notes = "新增或修改车辆检车信息")
     @PostMapping("/add_truck_check_info")
     public Result add_truck_check_info(@RequestBody TruckCheckInfo truckCheckInfo) {
         //TODO SAVE OR UPDATE
@@ -100,7 +111,7 @@ public class WorkerController {
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "获取行车日志列表",notes="卡车id必传")
+    @ApiOperation(value = "获取行车日志列表", notes = "卡车id必传")
     @PostMapping("/work_log_list")
     public Result work_log_list(@RequestBody PageParam<WorkLog> pageParam) {
         Page<WorkLog> page = new Page<>(pageParam.getPage(), pageParam.getSize());

src/main/java/com/aoyang/tms/entity/TruckEscort.java

@@ -3,9 +3,13 @@ package com.aoyang.tms.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.io.Serializable;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -15,8 +19,8 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
-    * 车辆押运员表
-    * </p>
+ * 车辆押运员表
+ * </p>
  *
  * @author guoyong
  * @since 2022-04-20
@@ -25,13 +29,13 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("tms_truck_escort")
-@ApiModel(value="TruckEscort对象", description="车辆押运员表")
+@ApiModel(value = "TruckEscort对象", description = "车辆押运员表")
 public class TruckEscort implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "用户id（tms.driver.user_id）")
-    @TableId("escort_id")
+    @TableId(value = "escort_id", type = IdType.INPUT)
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long escortId;
 

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

@@ -2,6 +2,7 @@ package com.aoyang.tms.feign;
 
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.entity.User;
+import com.aoyang.tms.feign.result.Org;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,4 +25,8 @@ public interface UserFeignClient {
     @PostMapping("/user/user/find_by_id")
     Result<User> find(@RequestBody User user);
 
+    @PostMapping("/user/user/org/find")
+    Result<Org> findOrg(@RequestBody Org org);
+
+
 }

src/main/java/com/aoyang/tms/feign/fallback/UserFeignFallBack.java

@@ -4,6 +4,7 @@ import com.aoyang.common.result.Result;
 import com.aoyang.tms.common.ErrCodeEnum;
 import com.aoyang.tms.entity.User;
 import com.aoyang.tms.feign.UserFeignClient;
+import com.aoyang.tms.feign.result.Org;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -44,6 +45,11 @@ public class UserFeignFallBack implements FallbackFactory<UserFeignClient> {
                 return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
             }
 
+            @Override
+            public Result<Org> findOrg(Org org) {
+                return new Result<>(ErrCodeEnum.USERSERVER_ERROR.getCode(), ErrCodeEnum.USERSERVER_ERROR.getMessage());
+            }
+
         };
 
     }

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

@@ -0,0 +1,197 @@
+package com.aoyang.tms.feign.result;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 
+    * </p>
+ *
+ * @author guoyong
+ * @since 2021-08-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="Org对象", description="")
+public class Org implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "组织id（调用API生成）")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orgId;
+
+
+    @ApiModelProperty(value = "交易模式(1经销模式;2直销模式，默认经销模式1)")
+    private Integer tradeType;
+
+    @ApiModelProperty(value = "父id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orgParentId;
+
+    @ApiModelProperty(value = "组织名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "组织简称")
+    private String orgShortName;
+
+    @ApiModelProperty(value = "21=物流公司  22=个人车主 ")
+    private Integer orgSubType;
+
+    @ApiModelProperty(value = "组织类型：0=平台方企业 1=加气站  2=物流客户 3=卡车经销商")
+    private Integer orgType;
+
+    @ApiModelProperty(value = "状态（0：启用 1：停用）")
+    private Integer status;
+
+    @ApiModelProperty(value = "企业认证信息0=未认证 1=认证中 2=已认证 3=认证失败")
+    private Integer authStatus;
+
+    @ApiModelProperty(value = "通联认证时间")
+    private LocalDateTime authDate;
+
+    @ApiModelProperty(value = "法人")
+    private String legalperson;
+
+    @ApiModelProperty(value = "认证类型  1:三证  2:一证  默认1-三证")
+    private Integer authType;
+
+    @ApiModelProperty(value = "营业执照号（三证）认证类型为1 时必传")
+    private String businessLicense;
+
+    @ApiModelProperty(value = "企业营业执照证件有效起始日期")
+    private String businessLicenseValidStartDate;
+
+    @ApiModelProperty(value = "企业营业执照有效截止日期,长期 传99999999 ")
+    @TableField("business_license_valid_end_date")
+    private String businessLicenseValidEndDate;
+
+    @ApiModelProperty(value = "组织机构代码（三证）认证类型为1 时必传")
+    private String organizationCode;
+
+    @ApiModelProperty(value = "税务登记证（三证）认证类型为1 时必传")
+    private String taxRegister;
+
+    @ApiModelProperty(value = "纳税人识别号 统一社会信用（一证）认证类型为2 时必传")
+    private String taxpayer;
+
+    @ApiModelProperty(value = "法人证件类型：1身份证 2护照 3军官证 4回乡证 5台胞证 6警官证 7士兵证 8户口簿 9港澳居民来往/内地通行证 10临时身份证 11外国人居留证 99其它证件")
+    private Integer identityType;
+
+    @ApiModelProperty(value = "法人证件号码, AES 加密")
+    @TableField("legal_ids")
+    private String legalIds;
+
+    @ApiModelProperty(value = "企业法人身份证证件有效起始日期 yyyyMMdd")
+    private String idCardValidStartDate;
+
+    @ApiModelProperty(value = "企业法人身份证有效截止日期 yyyyMMdd，长期 传99999999")
+    private String idCardValidEndDate;
+
+    @ApiModelProperty(value = "开户行==通联parentBankName")
+    private String bank;
+
+    @ApiModelProperty(value = "企业对公账户，提现用")
+    private String account;
+
+    @ApiModelProperty(value = "支付行号，12位数字")
+    private String unionBank;
+
+    @ApiModelProperty(value = "绑定的手机号")
+    private String bindPhone;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+
+    @ApiModelProperty(value = "所在省")
+    private String provinceName;
+
+    @ApiModelProperty(value = "所在市")
+    private String cityName;
+
+    @ApiModelProperty(value = "所在区县")
+    private String districtName;
+
+    @ApiModelProperty(value = "法人手机号")
+    private String legalPhone;
+
+    @ApiModelProperty(value = "开户行支行名称 如：“中国工商银行股份有限公司北京樱桃园支行”")
+    private String bankName;
+
+    @ApiModelProperty(value = "法人银行卡号")
+    private String legalBankno;
+
+    @ApiModelProperty(value = "0=未绑定 1=已绑定")
+    private Integer legalBankBind;
+
+    @ApiModelProperty(value = "合同签订状态[物流公司-象群科技、加气站->象群科技和长城奥扬]1=未签约 2=已签约 3=已取消")
+    private Integer contractStatus;
+
+    @ApiModelProperty(value = "合同签订状态修改时间[签约完成时间]")
+    private LocalDateTime contractDate;
+
+    @ApiModelProperty(value = "道路运输经营许可证认证状态： 1=待认证 2=已认证 3=已驳回")
+    private Integer roadTransportStatus;
+
+    @ApiModelProperty(value = "燃气经营许可证认证状态： 1=待认证 2=已认证 3=已驳回")
+    private Integer gasBusinessStatus;
+
+    @ApiModelProperty(value = "气瓶充装许可证认证状态： 1=待认证 2=已认证 3=已驳回")
+    private Integer gasFillingStatus;
+
+    @ApiModelProperty(value = "消防验收报告：1=待认证 2=已认证 3=已驳回")
+    private Integer fireControlStatus;
+
+    @ApiModelProperty(value = "环评报告：1=待认证 2=已认证 3=已驳回")
+    private Integer envImpactStatus;
+
+    @ApiModelProperty(value = "加气站执照：1=待认证 2=已认证 3=已驳回，跟公司营业执照不同")
+    private Integer gasLicenseStatus;
+
+    @ApiModelProperty(value = "车辆租赁或挂靠协议：1=待认证 2=已认证 3=已驳回")
+    private Integer cooperationStatus;
+
+    @ApiModelProperty(value = "创建人id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long creater;
+
+    @ApiModelProperty(value = "创建人")
+    private String createrName;
+
+    @ApiModelProperty(value = "创建日期时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "修改人id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -8,12 +8,15 @@ import com.aoyang.tms.controller.vo.TruckOrderStatisticsVO;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.controller.param.WorkOrderPageParam;
 import com.aoyang.tms.controller.vo.WorkOrderPageListVO;
+import com.aoyang.tms.controller.vo.WorkOrderVO;
 import com.aoyang.tms.entity.Shipper;
 import com.aoyang.tms.entity.Truck;
 import com.aoyang.tms.entity.WorkOrder;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 运单运单表 服务类
@@ -25,6 +28,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface WorkOrderService extends IService<WorkOrder> {
 
     /**
+     * @Author guoyong
+     * @Description 根据卡车id获取待执行运单
+     * @Date  2022/4/22
+     * @Param  
+     * @return 
+    **/
+    List<WorkOrderVO> findWorkOrderList(WorkOrder workOrder);
+
+    /**
      * 根据组织id查询运力调度统计汇总信息
      * @param orgId
      * @return

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

@@ -55,6 +55,11 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     private WorkOrderReadinfoService workOrderReadinfoService;
 
     @Override
+    public List<WorkOrderVO> findWorkOrderList(WorkOrder workOrder) {
+        return null;
+    }
+
+    @Override
     public TruckOrderStatisticsVO getTruckOrderStatistics(Long orgId) {
         TruckOrderStatisticsVO vo = new TruckOrderStatisticsVO();
         vo.setTotal(commonService.findOrgTruckNumber(orgId, null));