test(只影响油机sdk授权页面): 修改对应dto和对接API

修改了油机对应的DTO数据对象，尝试对接后端的API:发现分页查询时日期时空值时出现报错。

admin.ui.plus-master/src/api/admin/deviceAuthorization/oilSdkAuthor.ts

@@ -1,9 +1,8 @@
-import {HttpClient} from "/@/api/admin/http-client";
+import {ContentType, HttpClient, RequestParams} from "/@/api/admin/http-client";
+import {oilSdkAuthorDtoResult, oilSdkAuthorPostPageDto} from "/@/api/admin/deviceAuthorization/oilSdkAuthorDto";
 
 export class OilSdkAuthor<SecurityDataType = unknown> extends HttpClient<SecurityDataType>{
 
-  timer = 500
-
  /**
  * No description
  *
@@ -13,118 +12,14 @@ export class OilSdkAuthor<SecurityDataType = unknown> extends HttpClient<Securit
  * @request GET:
  * @secure
  */
- getPageData = () =>{
-   return new Promise((resolve) => {
-     setTimeout(() => {
-       resolve({
-         tableModel: [
-           {
-             /**日期 */
-             date: "2020-01-21",
-             /**油站名称 */
-             serviceStationName: "大观园站",
-             /**项目名称 */
-             entryName: "安徽中石化可视化项目",
-             /**设备SN */
-             SN: "123123422123",
-             /**有效时间 */
-             effectiveTime: "2123-08-24",
-             /**授权码 */
-             authorization: "gdtxllls1231231",
-             /**备注 */
-             remark: "授权备注"
-           },
-           {
-             /**日期 */
-             date: "2020-01-21",
-             /**油站名称 */
-             serviceStationName: "yidian",
-             /**项目名称 */
-             entryName: "Android",
-             /**设备SN */
-             SN: "终端商店",
-             /**有效时间 */
-             effectiveTime: "2123-08-24",
-             /**授权码 */
-             authorization: "gatxllis",
-             /**备注 */
-             remark: "授权备注"
-           },
-           {
-             /**日期 */
-             date: "2020-01-21",
-             /**油站名称 */
-             serviceStationName: "大观gatxllis园站",
-             /**项目名称 */
-             entryName: "gatxllis",
-             /**设备SN */
-             SN: "123123422123",
-             /**有效时间 */
-             effectiveTime: "212gatxllis3-08-24",
-             /**授权码 */
-             authorization: "gatxllis",
-             /**备注 */
-             remark: "gatxllis"
-           },
-           {
-             /**日期 */
-             date: "2020-01-21",
-             /**油站名称 */
-             serviceStationName: "大观园站",
-             /**项目名称 */
-             entryName: "安徽中石化可视化项目",
-             /**设备SN */
-             SN: "123123422123",
-             /**有效时间 */
-             effectiveTime: "2123-08-24",
-             /**授权码 */
-             authorization: "gdtxllls1231231",
-             /**备注 */
-             remark: "授权备注"
-           },
-           {
-             /**日期 */
-             date: "2020-01-21",
-             /**油站名称 */
-             serviceStationName: "yidian",
-             /**项目名称 */
-             entryName: "Android",
-             /**设备SN */
-             SN: "终端商店",
-             /**有效时间 */
-             effectiveTime: "2123-08-24",
-             /**授权码 */
-             authorization: "gatxllis",
-             /**备注 */
-             remark: "授权备注"
-           },
-           {
-             /**日期 */
-             date: "2020-01-21",
-             /**油站名称 */
-             serviceStationName: "大观gatxllis园站",
-             /**项目名称 */
-             entryName: "gatxllis",
-             /**设备SN */
-             SN: "123123422123",
-             /**有效时间 */
-             effectiveTime: "212gatxllis3-08-24",
-             /**授权码 */
-             authorization: "gatxllis",
-             /**备注 */
-             remark: "gatxllis"
-           },
-
-         ],
-         /**分页标识 */
-         pageInput:{
-           currentPage: 1,
-           pageSize: 20,
-         },
-         /**分页总数 */
-         total: 1000,
-       })
-     },this.timer)
+ getPageData = (data: oilSdkAuthorPostPageDto, params: RequestParams = {}) =>
+    this.request<oilSdkAuthorDtoResult, any>({
+     path:'/api/app/fueiling-sdk-auth/get-page',
+     method: 'POST',
+     body: data,
+     secure: true,
+     type: ContentType.Json,
+     format: 'json',
+     ...params,
    })
- }
 }

admin.ui.plus-master/src/api/admin/deviceAuthorization/oilSdkAuthorDto.ts

@@ -12,32 +12,46 @@ import {pageInput} from "/@/api/admin/shareDto/shareDto";
  * @date 2023-55-29 11:55:55
 */
 
+/**
+ * 条件查询模块
+ */
 export interface oilSdkFilterModel {
+  /**guid*/
+  guid?: number ,
   /**油站名称 */
-  serviceStationName: string | null,
+  oilStation?: string | null,
   /**项目名称 */
-  entryName: string | null,
+  project?: string | null,
   /**设备SN */
-  SN: string | null,
-  /**选择的时间 */
-  selectDate: string | null,
+  sn?: string | null,
+  /**授权码*/
+  key?: string,
+  /**开始的时间 */
+  beginTime?: string | null,
+  /**开始的时间 */
+  endTime?: string | null,
 }
 
+/**
+ * 表格信息
+ */
 export interface oilSdkTableModel {
-  /**日期 */
-  date: string | null,
-  /**油站名称 */
-  serviceStationName: string | null,
-  /**项目名称 */
-  entryName: string | null,
-  /**设备SN */
-  SN: string | null,
-  /**有效时间 */
-  effectiveTime: string | null,
-  /**授权码 */
-  authorization: string | null,
-  /**备注 */
-  remark: string | null
+  /***/
+  guid: number,
+  /**加油站*/
+  oilStation: string | null,
+  /**项目名称*/
+  projectName: string | null,
+  /**设备SN号*/
+  sn: string | null,
+  /**密钥key*/
+  key: string | null,
+  /**过期时间*/
+  expiedTime: string | null,
+  /**状态*/
+  state: string | null,
+  /**备注*/
+  "remark": string | null
 }
 
 /**
@@ -68,5 +82,32 @@ export interface oilSdkAuthorDtoResult {
   /** 消息 */
   msg?: string | null
   /** 分页信息输出 */
-  data?: any
+  data?: oilSdkAuthorPageOutput
+}
+
+/** 分页信息输出*/
+export interface oilSdkAuthorPageOutput{
+  /**
+   * 数据总数
+   * @format int64
+   */
+  total?: number
+  /** 数据 */
+  list?: oilSdkTableModel[] | null
+}
+
+/** 分页信息输入 */
+export interface oilSdkAuthorPostPageDto {
+  /**
+   * 当前页标
+   * @format int32
+   */
+  currentPage?: number
+  /**
+   * 每页大小
+   * @format int32
+   */
+  pageSize?: number
+  dynamicFilter?: DynamicFilterInfo
+  filter?: oilSdkFilterModel
 }

admin.ui.plus-master/src/views/admin/authorize/fuelingsdk.vue

@@ -7,23 +7,23 @@
             <el-row :gutter="35">
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
                 <el-form-item label="油站名称">
-                  <el-input v-model="sdkData.filterModel.serviceStationName" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.filterModel.oilStation" placeholder="单行输入" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
                 <el-form-item label="项目名称">
-                  <el-input v-model="sdkData.filterModel.entryName" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.filterModel.project" placeholder="单行输入" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
                 <el-form-item label="SN">
-                  <el-input v-model="sdkData.filterModel.SN" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.filterModel.sn" placeholder="单行输入" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
                 <el-form-item label="选择时间">
                   <el-date-picker
-                    v-model="sdkData.filterModel.selectDate"
+                    v-model="sdkData.filterModel.beginTime"
                     type="datetimerange"
                     range-separator="To"
                     start-placeholder="Start date"
@@ -90,8 +90,9 @@
 
 <script setup lang="ts" name="authorize/fuelingsdk">
 import {defineAsyncComponent, onMounted, reactive, ref} from "vue";
-import {OilSdkAuthorDto} from "/@/api/admin/deviceAuthorization/oilSdkAuthorDto";
+import {OilSdkAuthorDto, oilSdkFilterModel, oilSdkTableModel} from "/@/api/admin/deviceAuthorization/oilSdkAuthorDto";
 import {OilSdkAuthor} from "/@/api/admin/deviceAuthorization/oilSdkAuthor";
+import type {pageInput} from "/@/api/admin/shareDto/shareDto";
 
 /**引入组件*/
 const EditDialog = defineAsyncComponent(() => import('./component/editInfo.vue'))
@@ -103,22 +104,28 @@ const sdkData = reactive({
   loading: false,
   /**条件查询模块 */
   filterModel: {
+    /**guid*/
+    guid: 0 ,
     /**油站名称 */
-    serviceStationName: '',
+    oilStation: "",
     /**项目名称 */
-    entryName: '',
+    project: "",
     /**设备SN */
-    SN: '',
-    /**选择的时间 */
-    selectDate:'',
-  },
+    sn: "",
+    /**授权码*/
+    key: "",
+    /**开始的时间 */
+    beginTime: "",
+    /**开始的时间 */
+    endTime: "",
+  } as oilSdkFilterModel,
   /**表格信息 */
-  tableModel: [],
+  tableModel: [] as oilSdkTableModel,
   /**分页标识 */
   pageInput:{
     currentPage: 1,
     pageSize: 20,
-  },
+  } as pageInput,
   /**分页总数 */
   total: 0,
 } as OilSdkAuthorDto)
@@ -130,10 +137,10 @@ const onQuery = () => {
 
 /**重置表单 */
 const resetForm = () => {
-  sdkData.filterModel.serviceStationName = ''
-  sdkData.filterModel.entryName = ''
-  sdkData.filterModel.SN = ''
-  sdkData.filterModel.selectDate = ''
+  sdkData.filterModel.oilStation = ''
+  sdkData.filterModel.project = ''
+  sdkData.filterModel.sn = ''
+  sdkData.filterModel.beginTime = ''
 }
 /**重置 */
 const onReset = () => {
@@ -144,11 +151,11 @@ const onReset = () => {
 /**初始化 */
 const init = async () => {
   sdkData.loading = true
-  const res = await new OilSdkAuthor().getPageData()
+  const res = await new OilSdkAuthor().getPageData({...sdkData.pageInput, filter: sdkData.filterModel})
   console.log(res)
-  sdkData.tableModel = res?.tableModel ?? []
-  sdkData.pageInput = res?.pageInput ?? {}
-  sdkData.total = res?.total ?? 0
+  // sdkData.tableModel = res?.tableModel ?? []
+  // sdkData.pageInput = res?.pageInput ?? {}
+  // sdkData.total = res?.total ?? 0
   sdkData.loading = false
 }