guoyong 4 роки тому
батько
коміт
44b85df945

+ 0 - 1
src/main/java/com/aoyang/tms/controller/vo/WorkOrderVO.java

@@ -39,7 +39,6 @@ public class WorkOrderVO extends WorkOrder implements Serializable {
     @ApiModelProperty(value = "已用时,单位分钟")
     private int time;
 
-
     @ApiModelProperty(value = "装卸车点经度")
     @TableField("longitude")
     private String longitude;

+ 12 - 0
src/main/java/com/aoyang/tms/service/CommonService.java

@@ -4,6 +4,7 @@ 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.User;
+import com.aoyang.tms.feign.result.Org;
 
 import java.time.LocalDateTime;
 
@@ -15,6 +16,17 @@ import java.time.LocalDateTime;
  */
 public interface CommonService {
 
+
+    /**
+     * @return
+     * @Author guoyong
+     * @Description 获取组织信息
+     * @Date 2022/4/22
+     * @Param
+     **/
+    Org findOrg(Long orgId);
+
+
     /**
      * @return
      * @Author guoyong

+ 12 - 1
src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -7,6 +7,7 @@ import com.aoyang.tms.controller.vo.WorkerInfo;
 import com.aoyang.tms.entity.*;
 import com.aoyang.tms.feign.StrategyFeignClient;
 import com.aoyang.tms.feign.UserFeignClient;
+import com.aoyang.tms.feign.result.Org;
 import com.aoyang.tms.feign.result.TmsMongoDoc;
 import com.aoyang.tms.service.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -37,7 +38,6 @@ public class CommonServiceImpl implements CommonService {
     @Resource
     private UserFeignClient userFeignClient;
 
-
     @Resource
     private MongoTemplate mongoTemplate;
 
@@ -54,6 +54,17 @@ public class CommonServiceImpl implements CommonService {
     private TruckEscortService truckEscortService;
 
     @Override
+    public Org findOrg(Long orgId) {
+        Org orgParam = new Org();
+        orgParam.setOrgId(orgId);
+        Result<Org> result = userFeignClient.findOrg(orgParam);
+        if (verifyResult(result)) {
+            return result.getData();
+        }
+        return null;
+    }
+
+    @Override
     public WorkerInfo findTruckInfo(Long truckId) {
         WorkerInfo workerInfo = new WorkerInfo();
         workerInfo.setTruckId(truckId);