truck_driver

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

@@ -1,17 +1,13 @@
 package com.aoyang.tms.feign;
 
 import com.aoyang.common.result.Result;
+import com.aoyang.tms.entity.Truck;
 import com.aoyang.tms.feign.result.SystemConfig;
 import com.aoyang.tms.feign.fallback.StrategyFeignClientFallback;
-import com.aoyang.tms.feign.result.Truck;
-import com.aoyang.tms.feign.result.TruckDriver;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
  * @Description: strategy
  * @Author: panenming
@@ -31,26 +27,6 @@ public interface StrategyFeignClient {
     Result<SystemConfig> getSystemConfigByName(@RequestBody SystemConfig systemConfigParam);
 
     /**
-     * 根据卡车id获取卡车信息
-     *
-     * @param truck
-     * @return
-     */
-
-    @PostMapping("/strategy/truck/find_truck")
-    Result<Truck> findTruck(@RequestBody Truck truck);
-
-    /**
-     * 根据卡车id获取卡车司机列表信息
-     *
-     * @param truckDriver
-     * @return
-     */
-
-    @PostMapping("/strategy/truck_driver/find_truck_drivers")
-    Result<List<TruckDriver>> findTruckDrivers(@RequestBody TruckDriver truckDriver);
-
-    /**
      * 获取物流公司下卡车数量或者物流公司下部门卡车数量
      *
      * @param truck
@@ -60,16 +36,4 @@ public interface StrategyFeignClient {
     @PostMapping("/strategy/truck/find_org_truck_number")
     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/feign/fallback/StrategyFeignClientFallback.java

@@ -1,18 +1,13 @@
 package com.aoyang.tms.feign.fallback;
 
 import com.aoyang.common.result.Result;
+import com.aoyang.tms.entity.Truck;
 import com.aoyang.tms.feign.result.SystemConfig;
 import com.aoyang.tms.feign.StrategyFeignClient;
-import com.aoyang.tms.feign.result.Truck;
-import com.aoyang.tms.feign.result.TruckDriver;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * @Description: strategy 请求回滚
@@ -36,26 +31,12 @@ public class StrategyFeignClientFallback implements FallbackFactory<StrategyFeig
                 return new Result<>(4000, "Strategy熔断", null);
             }
 
-            @Override
-            public Result<Truck> findTruck(Truck truck) {
-                return new Result<>(4000, "Strategy熔断", null);
-            }
-
-            @Override
-            public Result<List<TruckDriver>> findTruckDrivers(TruckDriver truckDriver) {
-                return new Result<>(4000, "Strategy熔断", null);
-            }
 
             @Override
             public  Result<Integer> findOrgTruckNumber(Truck truck) {
                 return new Result<>(4000, "Strategy熔断", null);
             }
 
-            @Override
-            public Result<Boolean> updateTruckTmsStatus(Truck truck) {
-                return new Result<>(4000, "Strategy熔断", null);
-            }
-
         };
     }
 }

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

@@ -1,45 +0,0 @@
-package com.aoyang.tms.feign.result;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-/**
- * @Description: 车辆基本信息
- * @Author: guoyong
- * @CreateDate: 2022/4/21 下午4:58
- */
-@Data
-@ToString
-public class Truck {
-
-    @ApiModelProperty(value = "卡车id")
-    private Long truckId;
-
-    @ApiModelProperty(value = "运力系统车辆状态，已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
-    private Integer tmsStatus;
-
-    @ApiModelProperty(value = "物流公司id")
-    private Long orgId;
-
-    @ApiModelProperty(value = "物流公司名")
-    private String orgName;
-
-    @ApiModelProperty(value = "物流公司名简称")
-    private String orgShortName;
-
-    @ApiModelProperty(value = "车牌号")
-    private String carNumber;
-
-    @ApiModelProperty(value = "挂车牌号")
-    private String trailerNumber;
-
-    @ApiModelProperty(value = "车辆所属部门id")
-    private Long deptId;
-
-    @ApiModelProperty(value = "车辆所属部门名称")
-    private String deptName;
-}

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

@@ -1,53 +0,0 @@
-package com.aoyang.tms.feign.result;
-
-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;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="TruckDriver对象", description="")
-public class TruckDriver implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id主键")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long id;
-
-    @ApiModelProperty(value = "组织id（user.org.org_id）")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "卡车id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "司机id（user.user.user_id）")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverId;
-
-    @ApiModelProperty(value = "司机名称（user.user.user_name）")
-    private String driverName;
-
-    @ApiModelProperty(value = "创建人id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creater;
-
-    @ApiModelProperty(value = "创建人姓名")
-    private String createrName;
-
-    @ApiModelProperty(value = "创建日期时间")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "绑定标识：未绑定， 默认：1：绑定")
-    private  Integer flag = 1;
-
-}

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

@@ -3,13 +3,8 @@ package com.aoyang.tms.service;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.vo.LocationVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
-import com.aoyang.tms.feign.result.Truck;
-import com.aoyang.tms.feign.result.TruckDriver;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
 
 /**
  * @Description: 常用工具类，如获取组织信息、用户信息、卡车信息、验证Result、验证通联返回值
@@ -29,22 +24,6 @@ public interface CommonService {
     WorkerInfo findTruckInfo(Long truckId);
 
     /**
-     * 获取卡车司机列表
-     *
-     * @param truckId
-     * @return
-     */
-    List<TruckDriver> findTruckDrivers(Long truckId);
-
-    /**
-     * 获取卡车信息
-     *
-     * @param truckId
-     * @return
-     */
-    Truck findTruck(Long truckId);
-
-    /**
      * 获取物流公司下卡车数或者物流公司部门下卡车数
      *
      * @param

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

@@ -3,6 +3,8 @@ package com.aoyang.tms.service;
 import com.aoyang.tms.entity.TruckDriver;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface TruckDriverService extends IService<TruckDriver> {
 
+    /**
+     * @Author guoyong
+     * @Description 获取卡车下绑定的司机列表
+     * @Date  2022/4/21
+     * @Param
+     * @return
+     **/
+    List<TruckDriver> findTruckDrivers(Long truckId);
 }

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

@@ -4,15 +4,13 @@ import com.alibaba.fastjson.JSON;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.vo.LocationVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
+import com.aoyang.tms.entity.Truck;
+import com.aoyang.tms.entity.TruckDriver;
 import com.aoyang.tms.entity.TruckEscort;
 import com.aoyang.tms.entity.TruckSimCard;
 import com.aoyang.tms.feign.StrategyFeignClient;
 import com.aoyang.tms.feign.result.TmsMongoDoc;
-import com.aoyang.tms.feign.result.Truck;
-import com.aoyang.tms.feign.result.TruckDriver;
-import com.aoyang.tms.service.CommonService;
-import com.aoyang.tms.service.TruckEscortService;
-import com.aoyang.tms.service.TruckSimCardService;
+import com.aoyang.tms.service.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Sort;
@@ -23,7 +21,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,6 +40,12 @@ public class CommonServiceImpl implements CommonService {
     private MongoTemplate mongoTemplate;
 
     @Resource
+    private TruckService truckService;
+
+    @Resource
+    private TruckDriverService truckDriverService;
+
+    @Resource
     private TruckSimCardService truckSimCardService;
 
     @Resource
@@ -53,7 +56,9 @@ public class CommonServiceImpl implements CommonService {
         WorkerInfo workerInfo = new WorkerInfo();
         workerInfo.setTruckId(truckId);
         log.info("findTruckInfo findTruck 参数:{}", JSON.toJSONString(truckId));
-        Truck truck = findTruck(truckId);
+        Truck truckParam = new Truck();
+        truckParam.setTruckId(truckId);
+        Truck truck = truckService.getById(truckParam);
         log.info("findTruckInfo findTruck 结果:{}", JSON.toJSONString(truck));
         if (truck != null) {
             workerInfo.setTruckStatus(truck.getTmsStatus());
@@ -63,7 +68,7 @@ public class CommonServiceImpl implements CommonService {
             workerInfo.setDeptName(truck.getDeptName());
         }
         log.info("findTruckInfo findTruckDrivers 参数:{}", JSON.toJSONString(truckId));
-        List<TruckDriver> truckDrivers = findTruckDrivers(truckId);
+        List<TruckDriver> truckDrivers = truckDriverService.findTruckDrivers(truckId);
         log.info("findTruckInfo findTruckDrivers 结果:{}", JSON.toJSONString(truckDrivers));
         if (truckDrivers != null && truckDrivers.size() > 0) {
             workerInfo.setDriverIdOne(truckDrivers.get(0).getDriverId());
@@ -87,28 +92,6 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public List<TruckDriver> findTruckDrivers(Long truckId) {
-        TruckDriver truckDriver = new TruckDriver();
-        truckDriver.setTruckId(truckId);
-        Result<List<TruckDriver>> result = strategyFeignClient.findTruckDrivers(truckDriver);
-        if (verifyResult(result)) {
-            return result.getData();
-        }
-        return null;
-    }
-
-    @Override
-    public Truck findTruck(Long truckId) {
-        Truck truck = new Truck();
-        truck.setTruckId(truckId);
-        Result<Truck> result = strategyFeignClient.findTruck(truck);
-        if (verifyResult(result)) {
-            return result.getData();
-        }
-        return null;
-    }
-
-    @Override
     public Integer findOrgTruckNumber(Long orgId, Long deptId) {
         Truck truck = new Truck();
         truck.setOrgId(orgId);
@@ -124,14 +107,14 @@ 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;
+        //先通过主键拿出来，然后更新其状态
+        Truck truckParam = new Truck();
+        truckParam.setTruckId(truckId);
+        Truck truck4Update = truckService.getById(truckParam);
+        truck4Update.setTruckId(truckParam.getTruckId());
+        truck4Update.setTmsStatus(truckParam.getTmsStatus());
+        Boolean flag = truckService.updateById(truck4Update);
+        return flag;
     }
 
     @Override

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

@@ -3,9 +3,14 @@ package com.aoyang.tms.service.impl;
 import com.aoyang.tms.entity.TruckDriver;
 import com.aoyang.tms.mapper.TruckDriverMapper;
 import com.aoyang.tms.service.TruckDriverService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +22,14 @@ import org.springframework.stereotype.Service;
 @Service
 public class TruckDriverServiceImpl extends ServiceImpl<TruckDriverMapper, TruckDriver> implements TruckDriverService {
 
+    @Resource
+    TruckDriverMapper truckDriverMapper;
+
+    @Override
+    public List<TruckDriver> findTruckDrivers(Long truckId) {
+        QueryWrapper<TruckDriver> queryWrapper = Wrappers.query();
+        queryWrapper.eq("truck_id",truckId);
+        List<TruckDriver> list = truckDriverMapper.selectList(queryWrapper);
+        return list;
+    }
 }