Merge pull request #1288 from ljwwd2/main

供应器管理
2026-07-22 07:03:53 +08:00 · 2025-05-17 15:47:42 +08:00
parent a557322dc6 253f4c59a3
commit e6ad9e23cc
12 changed files with 524 additions and 226 deletions
@@ -0,0 +1,13 @@
+package xiaozhi.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface CreateGroup {
+    // 可以定义一些元数据或者参数
+}
+
@@ -0,0 +1,13 @@
+package xiaozhi.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UpdateGroup {
+    // 可以定义一些元数据或者参数
+}
+
@@ -1,7 +1,10 @@
 package xiaozhi.common.exception;

 import org.apache.shiro.authz.UnauthorizedException;
+import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.resource.NoResourceFoundException;
@@ -10,6 +13,8 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import xiaozhi.common.utils.Result;

+import java.util.List;
+import java.util.Objects;
 /**
 * 异常处理器
 * Copyright (c) 人人开源 All rights reserved.
@@ -60,4 +65,16 @@ public class RenExceptionHandler {
        return new Result<Void>().error(404, "资源不存在");
    }

+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Result<Void> handleMethodArgumentNotValidException(MethodArgumentNotValidException ex) {
+        StringBuilder sb = new StringBuilder();
+        List<ObjectError> allErrors = ex.getBindingResult().getAllErrors();
+        String errorMsg = allErrors.stream()
+                .filter(Objects::nonNull)
+                .map(DefaultMessageSourceResolvable::getDefaultMessage)
+                .findFirst()
+                .orElse("");
+        return new Result<Void>().error(400, errorMsg);
+    }
+
 }
@@ -1,6 +1,7 @@
 package xiaozhi.common.service.impl;

 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -18,6 +19,7 @@ import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -92,6 +94,59 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> implements Bas
        return page;
    }

+    /**
+     * 获取分页对象
+     * @see xiaozhi.common.constant.Constant
+     * params.put(Constant.PAGE, "1");
+     * params.put(Constant.LIMIT, "10");
+     * params.put(Constant.ORDER_FIELD, List.of("model_type", "sort"));
+     * params.put(Constant.ORDER, "asc");
+     *
+     * @param params         分页查询参数
+     */
+    protected IPage<T> getPage(Map<String, Object> params) {
+        // 分页参数
+        long curPage = 1;
+        long limit = 10;
+
+        if (params.get(Constant.PAGE) != null) {
+            curPage = Long.parseLong((String) params.get(Constant.PAGE));
+        }
+
+        if (params.get(Constant.LIMIT) != null) {
+            limit = Long.parseLong((String) params.get(Constant.LIMIT));
+        }
+
+        // 分页对象
+        Page<T> page = new Page<>(curPage, limit);
+
+        // 分页参数
+        params.put(Constant.PAGE, page);
+
+        // 排序字段
+        Object orderField = params.get(Constant.ORDER_FIELD);
+
+        List<String> orderFields = new ArrayList<>();
+
+        if (orderField instanceof String) {
+            orderFields.add((String) orderField);
+        } else if (orderField instanceof List) {
+            orderFields.addAll( (List<String>) orderField);
+        }
+        String order = (String) params.get(Constant.ORDER);
+
+        // 有排序字段则排序，默认降序
+        if (CollectionUtils.isNotEmpty(orderFields)) {
+            if (StringUtils.isNotBlank(order) && Constant.ASC.equalsIgnoreCase(order)) {
+                return page.addOrder(OrderItem.ascs(orderFields.toArray(new String[orderFields.size()])));
+            } else {
+                return page.addOrder(OrderItem.descs(orderFields.toArray(new String[orderFields.size()])));
+            }
+        }
+
+        return page;
+    }
+
    protected <D> PageData<D> getPageData(List<?> list, long total, Class<D> target) {
        List<D> targetList = ConvertUtils.sourceToTarget(list, target);

@@ -0,0 +1,68 @@
+package xiaozhi.modules.model.controller;
+
+import java.util.List;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import xiaozhi.common.annotation.UpdateGroup;
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.utils.Result;
+import xiaozhi.modules.model.dto.ModelProviderDTO;
+import xiaozhi.modules.model.service.ModelProviderService;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/models/provider")
+@Tag(name = "模型供应器")
+public class ModelProviderController {
+
+    private final ModelProviderService modelProviderService;
+
+    @GetMapping
+    @Operation(summary = "获取模型供应器列表")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<PageData<ModelProviderDTO>> getListPage(ModelProviderDTO modelProviderDTO,
+                                                             @RequestParam(required = true, defaultValue = "0") String page,
+                                                             @RequestParam(required = true, defaultValue = "10") String limit) {
+        return new Result<PageData<ModelProviderDTO>>()
+                .ok(modelProviderService.getListPage(modelProviderDTO, page, limit));
+    }
+
+    @PostMapping
+    @Operation(summary = "新增模型供应器")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<ModelProviderDTO> add(@RequestBody @Validated ModelProviderDTO modelProviderDTO) {
+        ModelProviderDTO resp = modelProviderService.add(modelProviderDTO);
+        return new Result<ModelProviderDTO>().ok(resp);
+    }
+
+    @PutMapping
+    @Operation(summary = "修改模型供应器")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<ModelProviderDTO> edit(@RequestBody @Validated(UpdateGroup.class) ModelProviderDTO modelProviderDTO) {
+        ModelProviderDTO resp = modelProviderService.edit(modelProviderDTO);
+        return new Result<ModelProviderDTO>().ok(resp);
+    }
+
+    @PostMapping("/delete")
+    @Operation(summary = "删除模型供应器")
+    @RequiresPermissions("sys:role:superAdmin")
+    @Parameter(name = "ids", description = "ID数组", required = true)
+    public Result<Void> delete(@RequestBody List<String> ids) {
+        modelProviderService.delete(ids);
+        return new Result<>();
+    }
+
+}
@@ -8,29 +8,38 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;

 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import xiaozhi.common.annotation.UpdateGroup;

@Data
@Schema(description = "模型供应器/商")
 public class ModelProviderDTO implements Serializable {
    //
-    // @Schema(description = "主键")
-    // private Long id;
+    @Schema(description = "主键")
+    @NotBlank(message = "id不能为空", groups = UpdateGroup.class)
+    private String id;

    @Schema(description = "模型类型(Memory/ASR/VAD/LLM/TTS)")
+    @NotBlank(message = "modelType不能为空")
    private String modelType;

    @Schema(description = "供应器类型")
+    @NotBlank(message = "providerCode不能为空")
    private String providerCode;

    @Schema(description = "供应器名称")
+    @NotBlank(message = "name不能为空")
    private String name;

    @Schema(description = "供应器字段列表(JSON格式)")
    @TableField(typeHandler = JacksonTypeHandler.class)
+    @NotBlank(message = "fields(JSON格式)不能为空")
    private String fields;

    @Schema(description = "排序")
+    @NotNull(message = "sort不能为空")
    private Integer sort;

    @Schema(description = "更新者")
@@ -30,7 +30,7 @@ public class ModelProviderEntity {
    private String name;

    @Schema(description = "供应器字段列表(JSON格式)")
-    @TableField(typeHandler = JacksonTypeHandler.class)
+//    @TableField(typeHandler = JacksonTypeHandler.class)
    private String fields;

    @Schema(description = "排序")
@@ -2,8 +2,8 @@ package xiaozhi.modules.model.service;

 import java.util.List;

+import xiaozhi.common.page.PageData;
 import xiaozhi.modules.model.dto.ModelProviderDTO;
-import xiaozhi.modules.model.entity.ModelProviderEntity;

 public interface ModelProviderService {

@@ -11,11 +11,15 @@ public interface ModelProviderService {

    List<ModelProviderDTO> getListByModelType(String modelType);

-    ModelProviderDTO add(ModelProviderEntity modelProviderEntity);
+    ModelProviderDTO add(ModelProviderDTO modelProviderDTO);

-    ModelProviderDTO edit(ModelProviderEntity modelProviderEntity);
+    ModelProviderDTO edit(ModelProviderDTO modelProviderDTO);

-    void delete();
+    void delete(String id);
+
+    void delete(List<String> id);
+
+    PageData<ModelProviderDTO> getListPage(ModelProviderDTO modelProviderDTO, String page, String limit);

    List<ModelProviderDTO> getList(String modelType, String provideCode);
 }
@@ -1,19 +1,29 @@
 package xiaozhi.modules.model.service.impl;

+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;

+import cn.hutool.json.JSONArray;
 import lombok.AllArgsConstructor;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.exception.RenException;
+import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
+import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.modules.model.dao.ModelProviderDao;
 import xiaozhi.modules.model.dto.ModelProviderDTO;
 import xiaozhi.modules.model.entity.ModelProviderEntity;
 import xiaozhi.modules.model.service.ModelProviderService;
+import xiaozhi.modules.security.user.SecurityUser;

@Service
@AllArgsConstructor
@@ -32,18 +42,75 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
    }

    @Override
-    public ModelProviderDTO add(ModelProviderEntity modelProviderEntity) {
-        return null;
+    public PageData<ModelProviderDTO> getListPage(ModelProviderDTO modelProviderDTO, String page, String limit) {
+
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put(Constant.PAGE, page);
+        params.put(Constant.LIMIT, limit);
+        params.put(Constant.ORDER_FIELD, List.of("model_type", "sort"));
+        params.put(Constant.ORDER, "asc");
+
+        IPage<ModelProviderEntity> pageParam = getPage(params);
+
+        QueryWrapper<ModelProviderEntity> wrapper = new QueryWrapper<ModelProviderEntity>();
+
+        if (StringUtils.isNotBlank(modelProviderDTO.getModelType())) {
+            wrapper.eq("model_type", modelProviderDTO.getModelType());
+        }
+
+        if (StringUtils.isNotBlank(modelProviderDTO.getName())) {
+            wrapper.like("name", "%" + modelProviderDTO.getName() + "%");
+        }
+        return getPageData(modelProviderDao.selectPage(pageParam, wrapper), ModelProviderDTO.class);
+    }
+
+    public static void main(String[] args) {
+        String jsonString = "\"[]\"";
+        JSONArray jsonArray = new JSONArray(jsonString);
+        System.out.println("字符串转 JSONArray: " + jsonArray.toString());
    }

    @Override
-    public ModelProviderDTO edit(ModelProviderEntity modelProviderEntity) {
-        return null;
+    public ModelProviderDTO add(ModelProviderDTO modelProviderDTO) {
+        UserDetail user = SecurityUser.getUser();
+        modelProviderDTO.setCreator(user.getId());
+        modelProviderDTO.setUpdater(user.getId());
+        modelProviderDTO.setCreateDate(new Date());
+        modelProviderDTO.setUpdateDate(new Date());
+        // 去除Fields左右的双引号
+
+        modelProviderDTO.setFields(modelProviderDTO.getFields());
+        ModelProviderEntity entity = ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class);
+        if (modelProviderDao.insert(entity) == 0) {
+            throw new RenException("新增数据失败");
+        }
+
+        return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class);
    }

    @Override
-    public void delete() {
+    public ModelProviderDTO edit(ModelProviderDTO modelProviderDTO) {
+        UserDetail user = SecurityUser.getUser();
+        modelProviderDTO.setUpdater(user.getId());
+        modelProviderDTO.setUpdateDate(new Date());
+        if (modelProviderDao.updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) {
+            throw new RenException("修改数据失败");
+        }
+        return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class);
+    }

+    @Override
+    public void delete(String id) {
+        if (modelProviderDao.deleteById(id) == 0) {
+            throw new RenException("删除数据失败");
+        }
+    }
+
+    @Override
+    public void delete(List<String> ids) {
+        if (modelProviderDao.deleteBatchIds(ids) == 0) {
+            throw new RenException("删除数据失败");
+        }
    }

    @Override
@@ -166,20 +166,20 @@ export default {
      configJson: formData.configJson
    };
    RequestService.sendRequest()
-        .url(`${getServiceUrl()}/models/${modelType}/${provideCode}/${id}`)
-        .method('PUT')
-        .data(payload)
-        .success((res) => {
-            RequestService.clearRequestTime();
-            callback(res);
-        })
-        .fail((err) => {
-            console.error('更新模型失败:', err);
-            this.$message.error(err.msg || '更新模型失败');
-            RequestService.reAjaxFun(() => {
-                this.updateModel(params, callback);
-            });
-        }).send();
+      .url(`${getServiceUrl()}/models/${modelType}/${provideCode}/${id}`)
+      .method('PUT')
+      .data(payload)
+      .success((res) => {
+        RequestService.clearRequestTime();
+        callback(res);
+      })
+      .fail((err) => {
+        console.error('更新模型失败:', err);
+        this.$message.error(err.msg || '更新模型失败');
+        RequestService.reAjaxFun(() => {
+          this.updateModel(params, callback);
+        });
+      }).send();
  },
  // 设置默认模型
  setDefaultModel(id, callback) {
@@ -197,5 +197,117 @@ export default {
          this.setDefaultModel(id, callback)
        })
      }).send()
-  }
+  },
+
+  /**
+   * 获取模型配置列表（支持查询参数）
+   * @param {Object} params - 查询参数对象，例如 { name: 'test', modelType: 1 }
+   * @param {Function} callback - 回调函数
+   */
+  getModelProvidersPage(params, callback) {
+    // 构建查询参数
+    const queryParams = new URLSearchParams();
+    if (params.name) queryParams.append('name', params.name);
+    if (params.modelType !== undefined) queryParams.append('modelType', params.modelType);
+    if (params.page !== undefined) queryParams.append('page', params.page);
+    if (params.limit !== undefined) queryParams.append('limit', params.limit);
+
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/provider?${queryParams.toString()}`)
+      .method('GET')
+      // 如果需要额外设置 header，可以在这里添加
+      // .headers({ 'X-Custom-Header': 'xxx' })
+      .success((res) => {
+        RequestService.clearRequestTime();
+        callback(res);
+      })
+      .fail((err) => {
+        console.error('获取供应器列表失败:', err);
+        this.$message.error('获取供应器列表失败');
+        RequestService.reAjaxFun(() => {
+          this.getModelProviders(params, callback);
+        });
+      }).send();
+  },
+
+  /**
+   * 新增模型供应器配置
+   * @param {Object} params - 请求参数对象，例如 { modelType: '1', providerCode: '1', name: '1', fields: '1', sort: 1 }
+   * @param {Function} callback - 成功回调函数
+   */
+  addModelProvider(params, callback) {
+    const postData = {
+      modelType: params.modelType || '',
+      providerCode: params.providerCode || '',
+      name: params.name || '',
+      fields: JSON.stringify(params.fields || []),
+      sort: params.sort || 0
+    };
+
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/provider`)
+      .method('POST')
+      .data(postData)
+      .success((res) => {
+        console.log('新增模型供应器成功:', res);
+        RequestService.clearRequestTime();
+        // this.$message.success('新增模型供应器成功');
+        callback(res);
+      })
+      .fail((err) => {
+        console.error('新增模型供应器失败:', err);
+        // this.$message.error(err.msg || '新增模型供应器失败');
+        // RequestService.reAjaxFun(() => {
+        //   this.addModelProvider(params, callback);
+        // });
+      }).send();
+  },
+
+  /**
+   * 更新模型供应器配置
+   * @param {Object} params - 请求参数对象，例如 { id: '111', modelType: '1', providerCode: '1', name: '1', fields: '1', sort: 1 }
+   * @param {Function} callback - 成功回调函数
+   */
+  updateModelProvider(params, callback) {
+    const putData = {
+      id: params.id || '',
+      modelType: params.modelType || '',
+      providerCode: params.providerCode || '',
+      name: params.name || '',
+      fields: JSON.stringify(params.fields || []),
+      sort: params.sort || 0
+    };
+
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/provider`)
+      .method('PUT')
+      .data(putData)
+      .success((res) => {
+        RequestService.clearRequestTime();
+        callback(res);
+      })
+      .fail((err) => {
+        console.error('更新模型供应器失败:', err);
+        RequestService.reAjaxFun(() => {
+          this.updateModelProvider(params, callback);
+        });
+      }).send();
+  },
+  // 删除
+  deleteModelProviderByIds(ids, callback) {
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/provider/delete`)
+      .method('POST')
+      .data(ids)
+      .success((res) => {
+        RequestService.clearRequestTime()
+        callback(res);
+      })
+      .fail((err) => {
+        console.error('删除参数失败:', err)
+        RequestService.reAjaxFun(() => {
+          this.deleteParam(ids, callback)
+        })
+      }).send()
+  },
 }
@@ -10,15 +10,15 @@

      <el-form :model="form" label-width="100px" :rules="rules" ref="form" class="custom-form">
        <div style="display: flex; gap: 20px; margin-bottom: 20px;">
-          <el-form-item label="类别" prop="model_type" style="flex: 1;">
-            <el-select v-model="form.model_type" placeholder="请选择类别" class="custom-input-bg" style="width: 100%;">
+          <el-form-item label="类别" prop="modelType" style="flex: 1;">
+            <el-select v-model="form.modelType" placeholder="请选择类别" class="custom-input-bg" style="width: 100%;">
              <el-option v-for="item in modelTypes" :key="item.value" :label="item.label" :value="item.value">
              </el-option>
            </el-select>
          </el-form-item>

-          <el-form-item label="供应器编码" prop="provider_code" style="flex: 1;">
-            <el-input v-model="form.provider_code" placeholder="请输入供应器编码" class="custom-input-bg"></el-input>
+          <el-form-item label="供应器编码" prop="providerCode" style="flex: 1;">
+            <el-input v-model="form.providerCode" placeholder="请输入供应器编码" class="custom-input-bg"></el-input>
          </el-form-item>
        </div>

@@ -135,8 +135,8 @@ export default {
    return {
      saving: false,
      rules: {
-        model_type: [{required: true, message: '请选择类别', trigger: 'change'}],
-        provider_code: [{required: true, message: '请输入供应器编码', trigger: 'blur'}],
+        modelType: [{required: true, message: '请选择类别', trigger: 'change'}],
+        providerCode: [{required: true, message: '请输入供应器编码', trigger: 'blur'}],
        name: [{required: true, message: '请输入供应器名称', trigger: 'blur'}]
      },
      isAllFieldsSelected: false,
@@ -1,13 +1,14 @@
 <template>
  <div class="welcome">
-    <HeaderBar/>
+    <HeaderBar />

    <div class="operation-bar">
      <h2 class="page-title">供应器管理</h2>
      <div class="right-operations">
        <el-dropdown trigger="click" @command="handleSelectModelType" @visible-change="handleDropdownVisibleChange">
          <el-button class="category-btn">
-            类别筛选 {{ selectedModelTypeLabel }}<i class="el-icon-arrow-down el-icon--right" :class="{ 'rotate-down':DropdownVisible }"></i>
+            类别筛选 {{ selectedModelTypeLabel }}<i class="el-icon-arrow-down el-icon--right"
+              :class="{ 'rotate-down': DropdownVisible }"></i>
          </el-button>
          <el-dropdown-menu slot="dropdown">
            <el-dropdown-item command="">全部</el-dropdown-item>
@@ -16,7 +17,8 @@
            </el-dropdown-item>
          </el-dropdown-menu>
        </el-dropdown>
-        <el-input placeholder="请输入供应器名称查询" v-model="searchName" class="search-input" @keyup.enter.native="handleSearch" clearable/>
+        <el-input placeholder="请输入供应器名称查询" v-model="searchName" class="search-input" @keyup.enter.native="handleSearch"
+          clearable />
        <el-button class="btn-search" @click="handleSearch">搜索</el-button>
      </div>
    </div>
@@ -26,35 +28,37 @@
        <div class="content-area">
          <el-card class="provider-card" shadow="never">
            <el-table ref="providersTable" :data="filteredProvidersList" class="transparent-table" v-loading="loading"
-                      element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
-                      element-loading-background="rgba(255, 255, 255, 0.7)"
-                      :header-cell-class-name="headerCellClassName">
+              element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(255, 255, 255, 0.7)" :header-cell-class-name="headerCellClassName">
              <el-table-column label="选择" align="center" width="120">
                <template slot-scope="scope">
                  <el-checkbox v-model="scope.row.selected"></el-checkbox>
                </template>
              </el-table-column>
-              <el-table-column label="类别" prop="model_type" align="center" width="200">
+
+              <el-table-column label="类别" prop="modelType" align="center" width="200">
                <template slot="header" slot-scope="scope">
-                  <el-dropdown trigger="click" @command="handleSelectModelType" @visible-change="isDropdownOpen = $event">
-                      <span class="dropdown-trigger" :class="{ 'active': isDropdownOpen }">
-                          类别{{ selectedModelTypeLabel }} <i class="dropdown-arrow" :class="{ 'is-active': isDropdownOpen }"></i>
-                      </span>
-                      <el-dropdown-menu slot="dropdown">
-                          <el-dropdown-item command="">全部</el-dropdown-item>
-                          <el-dropdown-item v-for="item in modelTypes" :key="item.value" :command="item.value">
-                              {{ item.label }}
-                          </el-dropdown-item>
-                      </el-dropdown-menu>
+                  <el-dropdown trigger="click" @command="handleSelectModelType"
+                    @visible-change="isDropdownOpen = $event">
+                    <span class="dropdown-trigger" :class="{ 'active': isDropdownOpen }">
+                      类别{{ selectedModelTypeLabel }} <i class="dropdown-arrow"
+                        :class="{ 'is-active': isDropdownOpen }"></i>
+                    </span>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item command="">全部</el-dropdown-item>
+                      <el-dropdown-item v-for="item in modelTypes" :key="item.value" :command="item.value">
+                        {{ item.label }}
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
                  </el-dropdown>
                </template>
                <template slot-scope="scope">
-                  <el-tag :type="getModelTypeTag(scope.row.model_type)">
-                    {{ getModelTypeLabel(scope.row.model_type) }}
+                  <el-tag :type="getModelTypeTag(scope.row.modelType)">
+                    {{ getModelTypeLabel(scope.row.modelType) }}
                  </el-tag>
                </template>
              </el-table-column>
-              <el-table-column label="供应器编码" prop="provider_code" align="center" width="150"></el-table-column>
+              <el-table-column label="供应器编码" prop="providerCode" align="center" width="150"></el-table-column>
              <el-table-column label="名称" prop="name" align="center"></el-table-column>
              <el-table-column label="字段配置" align="center">
                <template slot-scope="scope">
@@ -97,7 +101,8 @@
                <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">
                  上一页
                </button>
-                <button v-for="page in visiblePages" :key="page" class="pagination-btn" :class="{ active: page === currentPage }" @click="goToPage(page)">
+                <button v-for="page in visiblePages" :key="page" class="pagination-btn"
+                  :class="{ active: page === currentPage }" @click="goToPage(page)">
                  {{ page }}
                </button>
                <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">
@@ -112,33 +117,35 @@
    </div>

    <!-- 新增/编辑供应器对话框 -->
-    <provider-dialog :title="dialogTitle" :visible.sync="dialogVisible" :form="providerForm" :model-types="modelTypes" @submit="handleSubmit" @cancel="dialogVisible = false"/>
+    <provider-dialog :title="dialogTitle" :visible.sync="dialogVisible" :form="providerForm" :model-types="modelTypes"
+      @submit="handleSubmit" @cancel="dialogVisible = false" />

    <el-footer>
-      <version-footer/>
+      <version-footer />
    </el-footer>
  </div>
 </template>

 <script>
+import Api from "@/apis/api";
 import HeaderBar from "@/components/HeaderBar.vue";
 import ProviderDialog from "@/components/ProviderDialog.vue";
 import VersionFooter from "@/components/VersionFooter.vue";

 export default {
-  components: {HeaderBar, ProviderDialog, VersionFooter},
+  components: { HeaderBar, ProviderDialog, VersionFooter },
  data() {
    return {
      searchName: "",
      searchModelType: "",
      providersList: [],
      modelTypes: [
-        {value: "ASR", label: "语音识别"},
-        {value: "TTS", label: "语音合成"},
-        {value: "LLM", label: "大语言模型"},
-        {value: "Intent", label: "意图识别"},
-        {value: "Memory", label: "记忆模块"},
-        {value: "VAD", label: "语音活动检测"}
+        { value: "ASR", label: "语音识别" },
+        { value: "TTS", label: "语音合成" },
+        { value: "LLM", label: "大语言模型" },
+        { value: "Intent", label: "意图识别" },
+        { value: "Memory", label: "记忆模块" },
+        { value: "VAD", label: "语音活动检测" }
      ],
      currentPage: 1,
      loading: false,
@@ -152,8 +159,8 @@ export default {
      sensitive_keys: ["api_key", "personal_access_token", "access_token", "token", "secret", "access_key_secret", "secret_key"],
      providerForm: {
        id: null,
-        model_type: "",
-        provider_code: "",
+        modelType: "",
+        providerCode: "",
        name: "",
        fields: [],
        sort: 0
@@ -189,123 +196,50 @@ export default {
      return pages;
    },
    filteredProvidersList() {
-      let list = this.providersList.filter(item => {
-        const nameMatch = item.name.toLowerCase().includes(this.searchName.toLowerCase());
-        const typeMatch = !this.searchModelType || item.model_type === this.searchModelType;
-        return nameMatch && typeMatch;
-      });
+      return this.providersList;

-      list.sort((a, b) => a.sort - b.sort);
+      // let list = this.providersList.filter(item => {
+      //   const nameMatch = item.name.toLowerCase().includes(this.searchName.toLowerCase());
+      //   const typeMatch = !this.searchModelType || item.model_type === this.searchModelType;
+      //   return nameMatch && typeMatch;
+      // });

-      // 分页处理
-      const start = (this.currentPage - 1) * this.pageSize;
-      return list.slice(start, start + this.pageSize);
+      // list.sort((a, b) => a.sort - b.sort);
+
+      // // 分页处理
+      // const start = (this.currentPage - 1) * this.pageSize;
+      // return list.slice(start, start + this.pageSize);
    }
  },
  methods: {
    fetchProviders() {
      this.loading = true;

-      // 模拟API请求延迟
-      setTimeout(() => {
-        this.loading = false;
-
-        // 模拟数据 - 从数据库结构中提取
-        this.providersList = [
-          {
-            id: "SYSTEM_ASR_DoubaoASR",
-            model_type: "ASR",
-            provider_code: "doubao",
-            name: "火山引擎语音识别",
-            fields: JSON.parse('[{"key": "appid", "type": "string", "label": "应用ID"}, {"key": "access_token", "type": "string", "label": "访问令牌"}, {"key": "cluster", "type": "string", "label": "集群"}, {"key": "output_dir", "type": "string", "label": "输出目录"}]'),
-            sort: 3,
-            selected: false
-          },
-          {
-            id: "SYSTEM_ASR_FunASR",
-            model_type: "ASR",
-            provider_code: "fun_local",
-            name: "FunASR语音识别",
-            fields: JSON.parse('[{"key": "model_dir", "type": "string", "label": "模型目录"}, {"key": "output_dir", "type": "string", "label": "输出目录"}]'),
-            sort: 1,
-            selected: false
-          },
-          {
-            id: "SYSTEM_LLM_openai",
-            model_type: "LLM",
-            provider_code: "openai",
-            name: "OpenAI接口",
-            fields: JSON.parse('[{"key": "base_url", "type": "string", "label": "基础URL"}, {"key": "model_name", "type": "string", "label": "模型名称"}, {"key": "api_key", "type": "string", "label": "API密钥"}, {"key": "temperature", "type": "number", "label": "温度"}, {"key": "max_tokens", "type": "number", "label": "最大令牌数"}]'),
-            sort: 1,
-            selected: false
-          },
-          {
-            id: "SYSTEM_TTS_edge",
-            model_type: "TTS",
-            provider_code: "edge",
-            name: "Edge TTS",
-            fields: JSON.parse('[{"key": "voice", "type": "string", "label": "音色"}, {"key": "output_dir", "type": "string", "label": "输出目录"}]'),
-            sort: 1,
-            selected: false
-          },
-          {
-            id: "SYSTEM_Memory_mem0ai",
-            model_type: "Memory",
-            provider_code: "mem0ai",
-            name: "Mem0AI记忆",
-            fields: JSON.parse('[{"key": "api_key", "type": "string", "label": "API密钥"}]'),
-            sort: 1,
-            selected: false
-          },
-          {
-            id: "SYSTEM_VAD_SileroVAD",
-            model_type: "VAD",
-            provider_code: "silero",
-            name: "SileroVAD语音活动检测",
-            fields: JSON.parse('[{"key": "threshold", "type": "number", "label": "检测阈值"}, {"key": "model_dir", "type": "string", "label": "模型目录"}, {"key": "min_silence_duration_ms", "type": "number", "label": "最小静音时长"}]'),
-            sort: 1,
-            selected: false
-          },
-          {
-            id: "SYSTEM_Intent_nointent",
-            model_type: "Intent",
-            provider_code: "nointent",
-            name: "无意图识别",
-            fields: [],
-            sort: 1,
-            selected: false
-          },
-          {
-            id: "SYSTEM_TTS_aliyun",
-            model_type: "TTS",
-            provider_code: "aliyun",
-            name: "阿里云TTS",
-            fields: JSON.parse('[{"key": "output_dir", "type": "string", "label": "输出目录"}, {"key": "appkey", "type": "string", "label": "应用密钥"}, {"key": "token", "type": "string", "label": "访问令牌"}, {"key": "voice", "type": "string", "label": "音色"}, {"key": "access_key_id", "type": "string", "label": "访问密钥ID"}, {"key": "access_key_secret", "type": "string", "label": "访问密钥密码"}]'),
-            sort: 9,
-            selected: false
-          },
-          {
-            id: "SYSTEM_LLM_coze",
-            model_type: "LLM",
-            provider_code: "coze",
-            name: "Coze接口",
-            fields: JSON.parse('[{"key": "bot_id", "type": "string", "label": "机器人ID"}, {"key": "user_id", "type": "string", "label": "用户ID"}, {"key": "personal_access_token", "type": "string", "label": "个人访问令牌"}]'),
-            sort: 6,
-            selected: false
-          },
-          {
-            id: "SYSTEM_TTS_TencentTTS",
-            model_type: "TTS",
-            provider_code: "tencent",
-            name: "腾讯语音合成",
-            fields: JSON.parse('[{"key": "appid", "type": "string", "label": "应用ID"}, {"key": "secret_id", "type": "string", "label": "Secret ID"}, {"key": "secret_key", "type": "string", "label": "Secret Key"}, {"key": "output_dir", "type": "string", "label": "输出目录"}, {"key": "region", "type": "string", "label": "区域"}, {"key": "voice", "type": "string", "label": "音色ID"}]'),
-            sort: 5,
-            selected: false
+      Api.model.getModelProvidersPage(
+        {
+          page: this.currentPage,
+          limit: this.pageSize,
+          name: this.searchName,
+          modelType: this.searchModelType
+        },
+        ({ data }) => {
+          this.loading = false;
+          if (data.code === 0) {
+            this.providersList = data.data.list.map(item => {
+              return {
+                ...item,
+                selected: false,
+                fields: JSON.parse(item.fields)
+              };
+            });
+            this.total = data.data.total;
+          } else {
+            this.$message.error({
+              message: data.msg || '获取参数列表失败'
+            });
          }
-        ];
-
-        this.total = this.providersList.length;
-      }, 500);
+        }
+      );
    },
    handleSearch() {
      this.currentPage = 1;
@@ -326,8 +260,8 @@ export default {
      this.dialogTitle = "新增供应器";
      this.providerForm = {
        id: null,
-        model_type: "",
-        provider_code: "",
+        modelType: "",
+        providerCode: "",
        name: "",
        fields: [],
        sort: 0
@@ -342,43 +276,36 @@ export default {
      };
      this.dialogVisible = true;
    },
-    handleSubmit({form, done}) {
+    handleSubmit({ form, done }) {
      this.loading = true;
-      setTimeout(() => {
-        this.loading = false;
+      if (form.id) {
+        // 编辑
+        Api.model.updateModelProvider(form, ({ data }) => {

-        if (form.id) {
-          // 模拟编辑操作
-          const index = this.providersList.findIndex(p => p.id === form.id);
-          if (index !== -1) {
-            this.providersList.splice(index, 1, {
-              ...form,
-              fields: typeof form.fields === 'string' ? JSON.parse(form.fields) : form.fields
-            });
+          if (data.code === 0) {
+            this.fetchProviders(); // 刷新表格
            this.$message.success({
              message: "修改成功",
              showClose: true
            });
          }
-        } else {
-          // 模拟新增操作
-          const newId = `SYSTEM_${form.model_type}_${form.provider_code}`;
-          this.providersList.unshift({
-            ...form,
-            id: newId,
-            fields: typeof form.fields === 'string' ? JSON.parse(form.fields) : form.fields,
-            selected: false
-          });
-          this.total += 1;
-          this.$message.success({
-            message: "新增成功",
-            showClose: true
-          });
-        }
-
-        this.dialogVisible = false;
-        done && done();
-      }, 500);
+        });
+      } else {
+        // 新增
+        Api.model.addModelProvider(form, ({ data }) => {
+          if (data.code === 0) {
+            this.fetchProviders(); // 刷新表格
+            this.$message.success({
+              message: "新增成功",
+              showClose: true
+            });
+            this.total += 1;
+          }
+        });
+      }
+      this.loading = false;
+      this.dialogVisible = false;
+      done && done();
    },
    deleteSelectedProviders() {
      const selectedRows = this.providersList.filter(row => row.selected);
@@ -398,16 +325,25 @@ export default {
      this.$confirm(`确定要删除选中的${providerCount}个供应器吗？`, '警告', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
      }).then(() => {
        const ids = providers.map(provider => provider.id);
-        // 模拟删除操作
-        this.providersList = this.providersList.filter(p => !ids.includes(p.id));
-        this.total = this.providersList.length;
+        Api.model.deleteModelProviderByIds(ids, ({ data }) => {
+          if (data.code === 0) {

-        this.$message.success({
-          message: `成功删除${providerCount}个供应器`,
-          showClose: true
+            this.isAllSelected = false;
+            this.fetchProviders(); // 刷新表格
+
+            this.$message.success({
+              message: `成功删除${providerCount}个参数`,
+              showClose: true
+            });
+          } else {
+            this.$message.error({
+              message: data.msg || '删除失败，请重试',
+              showClose: true
+            });
+          }
        });
      }).catch(() => {
        this.$message({
@@ -434,8 +370,9 @@ export default {
      return typeItem ? typeItem.label : type;
    },
    isSensitiveField(fieldKey) {
+      if (typeof fieldKey !== 'string') return false;
      return this.sensitive_keys.some(key =>
-          fieldKey.toLowerCase().includes(key.toLowerCase())
+        fieldKey.toLowerCase().includes(key.toLowerCase())
      );
    },
    handlePageSizeChange(val) {
@@ -443,7 +380,7 @@ export default {
      this.currentPage = 1;
      this.fetchProviders();
    },
-    headerCellClassName({columnIndex}) {
+    headerCellClassName({ columnIndex }) {
      if (columnIndex === 0) {
        return "custom-selection-header";
      }
@@ -461,6 +398,7 @@ export default {
    },
    goNext() {
      if (this.currentPage < this.pageCount) {
+        console.log("this.currentPage", this.currentPage);
        this.currentPage++;
        this.fetchProviders();
      }
@@ -552,7 +490,7 @@ export default {
  flex-direction: column;
 }

-.el-card{
+.el-card {
  border: none;
 }

@@ -563,6 +501,7 @@ export default {
  flex-direction: column;
  box-shadow: none;
  overflow: hidden;
+
  ::v-deep .el-card__body {
    padding: 15px;
    display: flex;
@@ -748,7 +687,7 @@ export default {
        padding-bottom: 16px;
      }

-      & + tr {
+      &+tr {
        margin-top: 10px;
      }
    }
@@ -918,19 +857,20 @@ export default {
 .el-icon-arrow-down {
  transition: transform 0.3s ease;
 }
-.dropdown-trigger {
-    font-size: 14px;
-    color: #303133;
-    cursor: pointer;
-    display: flex;
-    align-items: center;

-    &:hover {
-        color: #409EFF;
-    }
+.dropdown-trigger {
+  font-size: 14px;
+  color: #303133;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+
+  &:hover {
+    color: #409EFF;
+  }
 }

 .dropdown-trigger.active {
-    color: #409EFF;
+  color: #409EFF;
 }
 </style>