车辆对接

src/app/shared/services/business/shipper-base.service.ts

@@ -1,14 +1,8 @@
-/*
- * @Author: your name
- * @Date: 2021-12-29 17:20:03
- * @LastEditTime: 2021-12-29 20:43:13
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\shared\services\business\shipper-base.service.ts
- */
 import { Injectable, Injector } from '@angular/core';
 import { BaseService } from '../core/base.service';
 import { map } from 'rxjs/operators';
+import { cacheConf } from '@conf/cache.conf';
+import { EACacheService } from '..';
 
 @Injectable({
   providedIn: 'root'
@@ -17,10 +11,13 @@ export class ShipperBaseService extends BaseService {
   $api_get_carless_carrier = ``; // 获取承运人
   $api_get_enterprise_project = `/api/mdc/cuc/enterpriseProject/getEnterpriseProjectList `; // 所属项目列表
   $api_get_staff_list = `/api/mdc/cuc/userApp/getStaffList`; //查询企业项目员工列表(录单员)
-  $api_get_network_freight_forwarder = `/api/mdc/cuc/networkTransporter/findAll`; // 获取网络货运人
+  $api_get_network_freight_forwarder_list = `/api/mdc/cuc/networkTransporter/findAll`; // 获取网络货运人
+  $api_get_network_freight_forwarder_one = `/api/mdc/cuc/networkTransporter/get`; // 获取网络货运人
 
-  constructor(public injector: Injector) {
+  envCache: any;
+  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
     super(injector);
+    this.envCache = this.eaCacheSrv.get(cacheConf.env);
   }
 
   /**
@@ -28,19 +25,20 @@ export class ShipperBaseService extends BaseService {
    * @returns
    */
   getCarlessCarrier() {
-    return;
-    const params = {};
+    const params = {
+    };
     return this.request(this.$api_get_carless_carrier, params, 'POST').pipe(
-      map(res => {
+      map((res) => {
         if (res) {
           res.map((m: any) => {
             return { label: m.platformName, value: m.operationId };
           });
         }
-      })
+      }),
     );
   }
 
+
   /**
    * 获取所属项目
    * @returns
@@ -51,51 +49,95 @@ export class ShipperBaseService extends BaseService {
         if (!res) {
           return [];
         }
-        const list = res.map((item: any) => ({
-          label: item.projectName,
-          value: item.enterpriseId
-        }));
-        return [{ value: '', label: '全部' }, ...list];
+        const list = res.map(((item: any) => {
+          return {
+            label: item.projectName,
+            value: item.enterpriseId
+          }
+        }))
+        const obj = [{ value: '', label: '全部' }];
+        return [...obj, ...list];
       })
-    );
+    )
   }
 
   /**
    * 获取录单员
    * @returns
    */
-  getStaffList(params = {}) {
+  getStaffList(params = {},containerAll = true) {
     return this.request(this.$api_get_staff_list, params).pipe(
       map((res: any) => {
         if (!res) {
           return [];
         }
-        const list = res.map((item: any) => ({
-          label: item.name,
-          value: item.userId
-        }));
-        return [{ value: '', label: '全部' }, ...list];
+        const list = res.map(((item: any) => {
+          return {
+            label: item.name,
+            value: item.userId
+          }
+        }))
+        const obj = [];
+        if (containerAll) {
+          obj.push({ label: '全部', value: '' })
+        }
+        return [...obj, ...list];
       })
-    );
+    )
   }
 
-  /**
-   * 获取网络货运人
+    /**
+   * 获取调度员
    * @returns
    */
-  getNetworkFreightForwarder(params = {}) {
-    return this.request(this.$api_get_network_freight_forwarder, params).pipe(
+     getStaffList2(params = {}) {
+      return this.request(this.$api_get_staff_list, params).pipe(
+        map((res: any) => {
+          if (!res) {
+            return [];
+          }
+          const list = res.map(((item: any) => {
+            return {
+              label: `${item.name}/${item.telephone}`,
+              value: item.userId
+            }
+          }))
+          return [...list];
+        })
+      )
+    }
+
+  /**
+ * 获取网络货运人
+ * @returns
+ */
+  getNetworkFreightForwarder(params = {}, containerAll = false) {
+    return this.request(this.$api_get_network_freight_forwarder_list, params).pipe(
       map((res: any) => {
         if (!res) {
           return [];
         }
-        const list = res.map((item: any) => ({
-          label: item.enterpriseName,
-          value: item.id
-        }));
-        return [{ value: '', label: '全部' }, ...list];
+        const list = res.map(((item: any) => {
+          return {
+            label: item.enterpriseName,
+            value: item.id
+          }
+        }))
+        const obj = [];
+        if (containerAll) {
+          obj.push({ label: '全部', value: '' })
+        }
+        return [...obj, ...list];
       })
-    );
+    )
+  }
+
+  /**
+ * 根据ID获取网络货运人
+ * @returns
+ */
+  getNetworkTransporterById(id: string) {
+    return this.request(this.$api_get_network_freight_forwarder_one, { id });
   }
 
 }