Change service provider list api to dawn api.

https://dev.wormwood.com.sg/zentao/task-view-486.html

Strides-Admin/src/http/api/provider.js

@@ -1,5 +1,6 @@
 import {get, post} from '../http'
 import {uploadImage, uploadImageOld} from './upload'
+import setting from "../../settings.js"
 
 const provider = {
   addServiceProvider: (params) => {
@@ -18,7 +19,11 @@ const provider = {
     return get('serviceProvider/delServiceProviderInfo', params)
   },
   getAllServiceProvider: (params) => {
-    return get('serviceProvider/getAllServiceProviderList', params)
+    if (setting.projectName == "LUMI") {
+      return get('dawn/api/v1/service-provider-select', params)
+    } else {
+      return get('serviceProvider/getAllServiceProviderList', params)
+    }
   },
   uploadLogo: (data) => {
     return uploadImageOld(data, "SERVICE_LOGO")

Strides-Admin/src/utils/index.js

@@ -1,4 +1,5 @@
 import api from '../http/api/settings'
+import provider from '../http/api/provider'
 
 /**
  * 格式化时间为指定的格式
@@ -375,4 +376,33 @@ export function getCountryList(back) {
   }).catch(err => {
     
   })
+}
+
+export function getServiceProviderOptions(back) {
+  if (!back) return;
+  provider.getAllServiceProvider().then(res => {
+    if (res.data && res.data.length > 0) {
+      const list = []
+      res.data.forEach(item => {
+        if (item.providerName) {
+          list.push({
+            providerPk: item.providerPk,
+            providerName: item.providerName
+          })
+        } else if (item.key) {
+          list.push({
+            tenantId: item.tenantId,
+            providerPk: item.value,
+            providerName: item.key
+          })
+        }
+      });
+      back(list);
+    } else {
+      back([]);
+    }
+  }).catch(err => {
+    this.$message.error(err);
+    back([]);
+  })
 }

Strides-Admin/src/views/access/DialogDetail.vue

@@ -173,9 +173,9 @@
 import api from '@/http/api/access'
 import site from '@/http/api/site'
 import group from '@/http/api/group'
-import provider from '@/http/api/provider'
 import settings from '../../settings.js'
 import {getCountryList} from '../../utils/index.js'
+import {getServiceProviderOptions} from '../../utils'
 export default {
   name: "DialogDetail",
   props: {
@@ -362,15 +362,8 @@ export default {
           message: err
         })
       })
-      provider.getAllServiceProvider().then(res => {
-        if (res.data) {
-          this.providerOptions = res.data
-        }
-      }).catch(err => {
-        this.$message({
-          type: 'error',
-          message: err
-        })
+      getServiceProviderOptions(list => {
+        this.providerOptions = list;
       });
       group.getAllUserGroups().then(res => {
         if (res.data) {

Strides-Admin/src/views/charge/AddCharge.vue

@@ -233,7 +233,7 @@
 <script>
   import site from '../../http/api/site'
   import station from '../../http/api/charge'
-  import provider from '../../http/api/provider'
+  import {getServiceProviderOptions} from '../../utils'
   export default {
     data() {
       return {
@@ -369,10 +369,10 @@
         });
       },
       getAllProvider() {
-        provider.getAllServiceProvider().then(res => {
-          if (res.data && res.data.length > 0) {
-            this.providerOptions = res.data
-            this.addForm.providerPk = res.data[0].providerPk
+        getServiceProviderOptions(list => {
+          this.providerOptions = list;
+          if (list.length > 0) {
+            this.addForm.providerPk = list[0].providerPk;
           }
         });
       },

Strides-Admin/src/views/charge/AddStation.vue

@@ -362,9 +362,9 @@
   //import { mapState } from 'vuex'
   import site from '../../http/api/site'
   import station from '../../http/api/charge'
-  import provider from '../../http/api/provider'
   import handleClipboard from '@/utils/clipboard'
   import settings from '../../settings'
+  import {getServiceProviderOptions} from '../../utils'
   export default {
     data() {
       return {
@@ -554,14 +554,11 @@
         })
       },
       getAllProvider() {
-        provider.getAllServiceProvider().then(res => {
-          if (res.data && res.data.length > 0) {
-            this.providerOptions = res.data
-            if (!this.isEdit) {
-              this.addForm.providerPk = res.data[0].providerPk
-            }
+        getServiceProviderOptions(list => {
+          this.providerOptions = list;
+          if (!this.isEdit && list.length > 0) {
+            this.addForm.providerPk = list[0].providerPk
           }
-        }).finally(() => {
           this.loading = false;
         });
       },

Strides-Admin/src/views/charge/EditCharge.vue

@@ -328,7 +328,7 @@
   import { mapState } from 'vuex'
   import site from '../../http/api/site'
   import station from '../../http/api/charge'
-  import provider from '../../http/api/provider'
+  import {getServiceProviderOptions} from '../../utils'
   export default {
     data() {
       return {
@@ -416,12 +416,11 @@
         }
         this.getAllProvider();
       },
-      async getAllProvider() {
-        const res = await provider.getAllServiceProvider();
-        if (res.data && res.data.length > 0) {
-          this.providerOptions = res.data
-        }
-        this.loading = false;
+      getAllProvider() {
+        getServiceProviderOptions(list => {
+          this.providerOptions = list;
+          this.loading = false;
+        });
       },
       getStationInfo() {
         station.getStationInfo({chargeBoxPk: this.stationId}).then(res => {

Strides-Admin/src/views/charge/RegisteredChargeStations.vue

@@ -190,7 +190,7 @@ import Pagination from '@/components/Pagination'
 import TableAction from '@/components/TableAction.vue'
 import api from '../../http/api/charge'
 import ocpp from '../../http/api/ocpp'
-import provider from '../../http/api/provider'
+import {getServiceProviderOptions} from '../../utils'
 export default {
   components: { Pagination, TableAction },
   data() {
@@ -256,12 +256,8 @@ export default {
       });
     },
     getAllProvider() {
-      provider.getAllServiceProvider().then(res => {
-        if (res.data && res.data.length > 0) {
-          this.providerOptions = res.data
-        }
-      }).catch(err => {
-        this.$message.error(err);
+      getServiceProviderOptions(list => {
+        this.providerOptions = list;
       });
     },
     getList() {

Strides-Admin/src/views/charging/ChargingProfiles.vue

@@ -73,7 +73,7 @@
   import Pagination from '@/components/Pagination'
   import TableAction from '@/components/TableAction.vue'
   import api from '../../http/api/chargingProfile.js'
-  import provider from '../../http/api/provider'
+  import {getServiceProviderOptions} from '../../utils'
   export default {
     data() {
       return {
@@ -146,10 +146,8 @@
       },
       getAllProvider() {
         this.listLoading = true;
-        provider.getAllServiceProvider().then(res => {
-          if (res.data && res.data.length > 0) {
-            this.providerOptions = res.data
-          }
+        getServiceProviderOptions(list => {
+          this.providerOptions = list;
         });
       },
       getList() {

Strides-Admin/src/views/charging/ConfigureStations.vue

@@ -134,10 +134,10 @@
 <script>
 import api from '../../http/api/chargingProfile.js'
 import ocpp from '../../http/api/ocpp'
-import provider from '../../http/api/provider'
 import Pagination from '@/components/Pagination'
 import DialogSetProfiles from './components/DialogSetProfiles.vue'
 import DialogClearProfiles from './components/DialogClearProfiles.vue'
+import {getServiceProviderOptions} from '../../utils'
 export default {
   data() {
     return {
@@ -175,10 +175,8 @@ export default {
     },
     getAllProvider() {
       this.listLoading = true;
-      provider.getAllServiceProvider().then(res => {
-        if (res.data && res.data.length > 0) {
-          this.providerOptions = res.data
-        }
+      getServiceProviderOptions(list => {
+        this.providerOptions = list;
       });
     },
     getTableData() {

Strides-Admin/src/views/limit/Add.vue

@@ -177,8 +177,8 @@
 </template>
 
 <script>
+  import {getServiceProviderOptions} from '../../utils'
   import limit from '../../http/api/limit.js'
-  import provider from '../../http/api/provider'
   import group from '@/http/api/group'
   export default {
     data() {
@@ -312,13 +312,11 @@
         });
       },
       getAllProvider() {
-        provider.getAllServiceProvider().then(res => {
-          if (res.data && res.data.length > 0) {
-            this.providerOptions = res.data
-            if (!this.addForm.providerPk)
-              this.addForm.providerPk = res.data[0].providerPk + ""
+        getServiceProviderOptions(list => {
+          this.providerOptions = list;
+          if (!this.addForm.providerPk && list.length > 0) {
+            this.addForm.providerPk = list[0].providerPk + ""
           }
-        }).finally(() => {
           this.loading = false;
         });
       },

Strides-Admin/src/views/limit/CreditLimit.vue

@@ -140,7 +140,7 @@
   import Pagination from '@/components/Pagination'
   import TableAction from '@/components/TableAction.vue'
   import limit from '../../http/api/limit.js'
-  import provider from '../../http/api/provider'
+  import {getServiceProviderOptions} from '../../utils'
   export default {
     components: { Pagination, TableAction },
     data() {
@@ -169,12 +169,8 @@
         this.getList();
       },
       getAllProvider() {
-        provider.getAllServiceProvider().then(res => {
-          if (res.data && res.data.length > 0) {
-            this.providerOptions = res.data
-          }
-        }).catch(err => {
-          this.$message.error(err);
+        getServiceProviderOptions(list => {
+          this.providerOptions = list;
         });
       },
       getList() {

Strides-Admin/src/views/limit/Detail.vue

@@ -171,8 +171,8 @@
 </template>
 
 <script>
+  import {getServiceProviderOptions} from '../../utils'
   import limit from '../../http/api/limit.js'
-  import provider from '../../http/api/provider'
   import group from '@/http/api/group'
   export default {
     data() {
@@ -261,13 +261,11 @@
         });
       },
       getAllProvider() {
-        provider.getAllServiceProvider().then(res => {
-          if (res.data && res.data.length > 0) {
-            this.providerOptions = res.data
-            if (!this.addForm.providerPk)
-              this.addForm.providerPk = res.data[0].providerPk + ""
+        getServiceProviderOptions(list => {
+          this.providerOptions = list;
+          if (list.length > 0 && !this.addForm.providerPk) {
+            this.addForm.providerPk = res.data[0].providerPk + "";
           }
-        }).finally(() => {
           this.loading = false;
         });
       },

Strides-Admin/src/views/ocpp/OCPPOperations.vue

@@ -340,11 +340,11 @@
 </template>
 
 <script>
+  import {getServiceProviderOptions} from '../../utils'
   import Pagination from '@/components/Pagination'
   import site from '../../http/api/site'
   import ocpp from '../../http/api/ocpp'
   import util from './operationUtil'
-  import provider from '../../http/api/provider'
   const NOT_SPECIFIC = 'Not for a specific connector'
   export default {
     data() {
@@ -539,10 +539,8 @@
         });
       },
       getAllProvider() {
-        provider.getAllServiceProvider().then(res => {
-          if (res.data && res.data.length > 0) {
-            this.providerOptions = res.data
-          }
+        getServiceProviderOptions(list => {
+          this.providerOptions = list;
         });
       },
       changeSite() {

Strides-Admin/src/views/posDevice/detail.vue

@@ -121,7 +121,7 @@
 
 <script>
 import api from '../../http/api/posDevices.js'
-import sp from '../../http/api/provider.js'
+import {getServiceProviderOptions} from '../../utils'
 export default {
   data() {
     return {
@@ -206,15 +206,10 @@ export default {
         })
       });
     },
-    async getProviderOptions() {
-      try {
-        const res = await sp.getAllServiceProvider();
-        if (res.data && res.data.length > 0) {
-          this.providerList = res.data
-        }
-      } catch(e) {
-        this.providerList = []
-      }
+    getProviderOptions() {
+      getServiceProviderOptions(list => {
+        this.providerList = list;
+      });
     },
     getSiteOptions() {
       api.getSiteList().then(res => {

Strides-Admin/src/views/report/ReportV2.vue

@@ -235,9 +235,9 @@
 <script>
 import site from '@/http/api/site'
 import api from '@/http/api/apiReport'
-import provider from '@/http/api/provider'
 import Pagination from '@/components/Pagination'
 import TableAction from '@/components/TableAction.vue'
+import {getServiceProviderOptions} from '../../utils'
 
 export default {
   components: { Pagination, TableAction },
@@ -383,11 +383,9 @@ export default {
       })
     },
     getServiceProviderList() {
-      return provider.getAllServiceProvider().then(res => {
-        if (res.data) {
-          this.options.serviceProvider = res.data;
-        }
-      })
+      getServiceProviderOptions(list => {
+        this.options.serviceProvider = list;
+      });
     },
     getMonthOptions() {
       return api.getMonthList().then(res => {

Strides-Admin/src/views/site/SiteManagement.vue

@@ -199,9 +199,9 @@ import waves from '@/directive/waves'
 import Pagination from '@/components/Pagination'
 import TableAction from '@/components/TableAction.vue'
 import site from '../../http/api/site'
-import provider from '../../http/api/provider'
 import { getRoleName } from '@/utils/auth'
 import historyRate from './historyRate.vue'
+import {getServiceProviderOptions} from '../../utils'
 
 export default {
   name: 'SiteManagement',
@@ -250,10 +250,8 @@ export default {
       }
     },
     getAllProvider() {
-      provider.getAllServiceProvider().then(res => {
-        if (res.data && res.data.length > 0) {
-          this.providerOptions = res.data
-        }
+      getServiceProviderOptions(list => {
+        this.providerOptions = list;
       });
     },
     getList() {

Strides-Admin/src/views/site2/index.vue

@@ -200,8 +200,8 @@ import Pagination from '@/components/Pagination'
 import TableAction from '@/components/TableAction.vue'
 import HistoryRate from '../site/historyRate.vue'
 import site from '../../http/api/site'
-import provider from '../../http/api/provider'
 import { getRoleName } from '@/utils/auth'
+import {getServiceProviderOptions} from '../../utils'
 
 export default {
   name: 'SiteManagement',
@@ -249,10 +249,8 @@ export default {
       }
     },
     getAllProvider() {
-      provider.getAllServiceProvider().then(res => {
-        if (res.data && res.data.length > 0) {
-          this.providerOptions = res.data
-        }
+      getServiceProviderOptions(list => {
+        this.providerOptions = list;
       });
     },
     getList() {

Strides-Admin/src/views/transaction/transactions_v2.vue

@@ -189,11 +189,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="Carpark Code"
-        prop="carParkCode"
-        align="center"
-        min-width="90"/>
       <el-table-column
         min-width="90"
         label="Connector"
@@ -202,6 +197,11 @@
           <span>{{ row.connectorId }}</span>
         </template>
       </el-table-column>
+      <el-table-column
+        label="Carpark Code"
+        prop="carParkCode"
+        align="center"
+        min-width="90"/>
       <el-table-column
         label="Start Date/Time"
         align="center"