refactor(ai): 重构AI模块文件处理和模型管理功能

- 修改AbstractFileClient移除域名拼接逻辑
- 将getModel接口改为getEnabledModels批量获取已启用模型
- 更新AiSampleMapper查询语句改用LEFT JOIN并添加筛选条件
- 移除application-local.yaml中的file-server配置项
- 添加ImgJsonSerializer组件处理图片URL序列化
- 优化AiSampleServiceImpl文件上传逻辑
- 调整分页参数验证注解格式

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/pojo/PageParam.java

@@ -26,7 +26,7 @@ public class PageParam implements Serializable {
     /**
      * 页码，从 1 开始", example = "1
      */
-    @NotNull(message = "页码不能为空")
+    @NotNull(message = "页码不能为空" )
     @Min(value = 1, message = "页码最小值为 1")
     private Integer pageNo = 1;
 

tashow-framework/tashow-common/src/main/java/com/tashow/cloud/common/serializer/ImgJsonSerializer.java

@@ -1,64 +1,50 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
-package com.tashow.cloud.common.util.serializer;
+package com.tashow.cloud.common.serializer;
 
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * @author lanhai
+ * 图片URL序列化器
+ * 自动为相对路径的图片添加文件服务器前缀
  */
 @Component
 public class ImgJsonSerializer extends JsonSerializer<String> {
 
-  /*  @Autowired
-    private Qiniu qiniu;
-    @Autowired
-    private ImgUploadUtil imgUploadUtil;*/
+    @Value("${file-server}")
+    private String fileServer;
 
     @Override
     public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        /*if (StrUtil.isBlank(value)) {
+        if (StrUtil.isBlank(value)) {
             gen.writeString(StrUtil.EMPTY);
             return;
         }
         String[] imgs = value.split(StrUtil.COMMA);
         StringBuilder sb = new StringBuilder();
         String resourceUrl = "";
-        String rule="^((http[s]{0,1})://)";
-        Pattern pattern= Pattern.compile(rule);
-        if (Objects.equals(imgUploadUtil.getUploadType(), 2)) {
-            resourceUrl = qiniu.getResourcesUrl();
-        } else if (Objects.equals(imgUploadUtil.getUploadType(), 1)) {
-            resourceUrl = imgUploadUtil.getResourceUrl();
-        }
+        String rule = "^((http[s]{0,1})://)";
+        Pattern pattern = Pattern.compile(rule);
+
+        resourceUrl = fileServer;
+
         for (String img : imgs) {
             Matcher matcher = pattern.matcher(img);
             //若图片以http或https开头，直接返回
-            if (matcher.find()){
+            if (matcher.find()) {
                 sb.append(img).append(StrUtil.COMMA);
-            }else {
+            } else {
                 sb.append(resourceUrl).append(img).append(StrUtil.COMMA);
             }
         }
-        sb.deleteCharAt(sb.length()-1);
-        gen.writeString(sb.toString());*/
+        sb.deleteCharAt(sb.length() - 1);
+        gen.writeString(sb.toString());
     }
 }

tashow-gateway/src/main/resources/application-local.yaml

@@ -7,12 +7,16 @@ spring:
       username: nacos # Nacos 账号
       password: nacos # Nacos 密码
       discovery: # 【配置中心】配置项
-        namespace: dev # 命名空间。这里使用 dev 开发环境
+        namespace: 63caf548-313d-44bb-929c-531bf2f3b1a2 # 命名空间
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
+        metadata:
+          version: 1.0.0 # 服务实例的版本号，可用于灰度发布
       config: # 【注册中心】配置项
-        namespace: dev # 命名空间。这里使用 dev 开发环境
+        namespace: 63caf548-313d-44bb-929c-531bf2f3b1a2 # 命名空间
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
 
+
+
 # 日志文件配置
 logging:
   level:

tashow-module/tashow-module-ai/pom.xml

@@ -28,6 +28,11 @@
             <groupId>com.tashow.cloud</groupId>
             <artifactId>tashow-infra-api</artifactId>
         </dependency>
+        <!--文件管理 - file-server-->
+        <dependency>
+            <groupId>com.tashow.cloud</groupId>
+            <artifactId>tashow-file-api</artifactId>
+        </dependency>
         <!-- RPC 远程调用相关 -->
         <dependency>
             <groupId>com.tashow.cloud</groupId>

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/admin/aisample/vo/AiSampleFileRespVO.java

@@ -1,6 +1,9 @@
 package com.tashow.cloud.ai.controller.admin.aisample.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import com.tashow.cloud.common.serializer.ImgJsonSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -10,6 +13,7 @@ import lombok.Data;
 public class AiSampleFileRespVO {
 
     @Schema(description = "文件地址")
+    @JsonSerialize(using = ImgJsonSerializer.class)
     private String fileUrl;
 
     @Schema(description = "文件名称")

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/admin/aisample/vo/AiSamplePageReqVO.java

@@ -12,10 +12,10 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class AiSamplePageReqVO extends PageParam {
 
-    @Schema(description = "标签ids", example = "25839")
+    @Schema(description = "标签ids")
     private String tagIds;
 
-    @Schema(description = "样本名称", example = "张三")
+    @Schema(description = "样本名称")
     private String sampleName;
 
     @Schema(description = "样本格式", example = "1")

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/admin/aisample/vo/AiSampleRespVO.java

@@ -1,8 +1,9 @@
 package com.tashow.cloud.ai.controller.admin.aisample.vo;
-
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.tashow.cloud.ai.dal.dataobject.aisample.AiSampleTagDO;
+import com.tashow.cloud.common.serializer.ImgJsonSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -21,6 +22,7 @@ public class AiSampleRespVO {
     private List<AiSampleTagDO> tags;
 
     @Schema(description = "样本文件地址")
+    @JsonSerialize(using = ImgJsonSerializer.class)
     private String sampleFilePath;
 
     @Schema(description = "样本名称", example = "张三")

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/admin/model/AiModelController.java

@@ -17,6 +17,8 @@ import jakarta.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 import static com.tashow.cloud.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - AI模型管理")
@@ -53,12 +55,11 @@ public class AiModelController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得模型")
-    @Parameter(name = "id", description = "编号", required = true, example = "1")
+    @Operation(summary = "获取所有已启用的模型")
     @PermitAll
-    public CommonResult<AiModelRespVO> getModel(@RequestParam("id") Long id) {
-        AiModelDO model = modelService.getModel(id);
-        return success(BeanUtils.toBean(model, AiModelRespVO.class));
+    public CommonResult<List<AiModelRespVO>> getEnabledModels() {
+        List<AiModelDO> models = modelService.getEnabledModels();
+        return success(BeanUtils.toBean(models, AiModelRespVO.class));
     }
 
     @GetMapping("/page")
@@ -69,14 +70,4 @@ public class AiModelController {
         return success(BeanUtils.toBean(pageResult, AiModelRespVO.class));
     }
 
-    @PutMapping("/update-status")
-    @Operation(summary = "更新状态")
-    @Parameter(name = "id", description = "编号", required = true)
-    @Parameter(name = "status", description = "状态（0-禁用 1-启用 2-测试中 3-已废弃）", required = true)
-    @PermitAll
-    public CommonResult<Boolean> updateStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
-        modelService.updateStatus(id, status);
-        return success(true);
-    }
-
 }

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/controller/admin/model/vo/AiModelSaveReqVO.java

@@ -14,7 +14,7 @@ public class AiModelSaveReqVO {
     @Schema(description = "主键", example = "1")
     private Long id;
 
-    @Schema(description = "模型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "宠物声音翻译模型")
+    @Schema(description = "模型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "模型")
     @NotBlank(message = "模型名称不能为空")
     private String modelName;
 
@@ -22,14 +22,14 @@ public class AiModelSaveReqVO {
     @NotBlank(message = "版本号不能为空")
     private String version;
 
-    @Schema(description = "负载百分比（0.0-1.0）", example = "0.75")
+    @Schema(description = "负载", example = "0.75")
     private BigDecimal loadPercentage;
 
-    @Schema(description = "状态（0-禁用 1-启用 2-测试中 3-已废弃）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态（0-禁用 1-启用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "状态不能为空")
     private Integer status;
 
-    @Schema(description = "版本描述", example = "优化了翻译准确率")
+    @Schema(description = "版本描述", example = "描述")
     private String description;
 
 }

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/dataobject/model/AiModelDO.java

@@ -54,4 +54,6 @@ public class AiModelDO extends BaseDO {
      */
     private String description;
 
+
+
 }

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/mysql/aisample/AiSampleMapper.java

@@ -28,14 +28,18 @@ public interface AiSampleMapper extends BaseMapperX<AiSampleDO> {
             ",sample_mine_type sampleMineType ,sample_size sampleSize, remark,creator,updater,create_time createTime" +
             ",update_time updateTime,deleted,tenant_id tenantId " +
             "FROM tz_ai_sample t " +
-            "INNER JOIN tz_ai_sample_tag_relate r ON t.id = r.sample_id " +
+            "LEFt JOIN tz_ai_sample_tag_relate r ON t.id = r.sample_id " +
             "<where>" +
+             "AND t.deleted =0"+
             "    <if test=\"pageReqVO.tagIds != null and pageReqVO.tagIds != ''\">" +
             "        AND  FIND_IN_SET(r.sample_tag_id,${pageReqVO.tagIds}) " +
             "    </if>" +
             "    <if test=\"pageReqVO.sampleName != null and pageReqVO.sampleName != ''\">" +
             "        AND t.sample_name LIKE CONCAT('%',#{pageReqVO.sampleName},'%')" +
             "    </if>" +
+            "    <if test=\"pageReqVO.sampleMineType != null and pageReqVO.sampleMineType != ''\">" +
+            "        AND t.sample_mine_type LIKE CONCAT('%',#{pageReqVO.sampleMineType},'%')" +
+            "    </if>" +
             "</where>" +
             "GROUP BY t.id ORDER BY t.id DESC" +
             "</script>")

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/framework/rpc/config/RpcConfiguration.java

@@ -1,6 +1,6 @@
 package com.tashow.cloud.ai.framework.rpc.config;
 
-import com.tashow.cloud.infraapi.api.file.FileApi;
+import com.tashow.cloud.fileapi.api.file.FileApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/framework/security/config/SecurityConfiguration.java

@@ -32,8 +32,6 @@ public class SecurityConfiguration {
                         .requestMatchers(adminSeverContextPath + "/**").permitAll();
                 // 文件读取
                 registry.requestMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll();
-                // AI模型管理接口
-                registry.requestMatchers("/ai/model/**").permitAll();
                 // RPC 服务的安全配置
                 registry.requestMatchers(ApiConstants.PREFIX + "/**").permitAll();
             }

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/aisample/AiSampleServiceImpl.java

@@ -14,7 +14,7 @@ import com.tashow.cloud.ai.dal.mysql.aisample.AiSampleTagMapper;
 import com.tashow.cloud.ai.dal.mysql.aisample.AiSampleTagRelateMapper;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
-import com.tashow.cloud.infraapi.api.file.FileApi;
+import com.tashow.cloud.fileapi.api.file.FileApi;
 import com.tashow.cloud.mybatis.mybatis.core.util.MyBatisUtils;
 import jakarta.annotation.Resource;
 import lombok.SneakyThrows;
@@ -44,8 +44,7 @@ public class AiSampleServiceImpl implements AiSampleService {
     private AiSampleTagRelateMapper aiSampleTagRelateMapper;
     @Resource
     private FileApi fileApi;
-    @Value("file-server")
-    private String fileServer;
+
 
     @Override
     @SneakyThrows
@@ -55,15 +54,15 @@ public class AiSampleServiceImpl implements AiSampleService {
         /* 调用文件上传服务*/
         for (MultipartFile file : uploadReqVO.getFiles()) {
             //返回上传结果
-            String file1 = fileServer + fileApi.createFile(file.getBytes());
+            String filePath=fileApi.createFile(file.getOriginalFilename(), "", file.getBytes());
             //保存样本信息
             AiSampleDO aiSampleDO = new AiSampleDO();
-            aiSampleDO.setSampleFilePath(file1);
+            aiSampleDO.setSampleFilePath(filePath);
             aiSampleDO.setSampleName(file.getOriginalFilename());
             aiSampleDO.setSampleMineType(file.getContentType());
             aiSampleDO.setSampleSize(file.getSize());
             aiSampleMapper.insert(aiSampleDO);
-            urls.add(new AiSampleFileRespVO().setFileUrl(file1).setFileName(file.getOriginalFilename()));
+            urls.add(new AiSampleFileRespVO().setFileUrl(filePath).setFileName(file.getOriginalFilename()));
         }
         // 返回
         return urls;
@@ -172,7 +171,6 @@ public class AiSampleServiceImpl implements AiSampleService {
             Object[] tagsId = list.stream().map(AiSampleTagRelateDO::getSampleTagId).toArray();
             List<AiSampleTagDO> list1 = aiSampleTagDOS.stream().filter(a -> ArrayUtil.containsAny(tagsId, a.getId())).toList();
             aiSampleDO.setTags(list1);
-            aiSampleDO.setSampleFilePath(aiSampleDO.getSampleFilePath());
         }
         return new PageResult<>(aiSampleDOPageResult.getRecords(), aiSampleDOPageResult.getTotal());
     }

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java

@@ -20,7 +20,7 @@ import com.tashow.cloud.ai.dal.mysql.dialog.AiDialogMessageMapper;
 import com.tashow.cloud.common.pojo.PageParam;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.object.BeanUtils;
-import com.tashow.cloud.infraapi.api.file.FileApi;
+import com.tashow.cloud.fileapi.api.file.FileApi;
 import jakarta.annotation.Resource;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/model/AiModelService.java

@@ -6,6 +6,8 @@ import com.tashow.cloud.ai.dal.dataobject.model.AiModelDO;
 import com.tashow.cloud.common.pojo.PageResult;
 import jakarta.validation.Valid;
 
+import java.util.List;
+
 /**
  * AI模型管理 Service 接口
  *
@@ -36,12 +38,11 @@ public interface AiModelService {
     void deleteModel(Long id);
 
     /**
-     * 获得模型
+     * 获取所有已启用的模型
      *
-     * @param id 编号
-     * @return 模型
+     * @return 已启用的模型列表
      */
-    AiModelDO getModel(Long id);
+    List<AiModelDO> getEnabledModels();
 
     /**
      * 获得模型分页
@@ -51,12 +52,4 @@ public interface AiModelService {
      */
     PageResult<AiModelDO> getModelPage(AiModelPageReqVO pageReqVO);
 
-    /**
-     * 更新状态
-     *
-     * @param id 编号
-     * @param status 状态
-     */
-    void updateStatus(Long id, Integer status);
-
 }

tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/model/AiModelServiceImpl.java

@@ -1,5 +1,6 @@
 package com.tashow.cloud.ai.service.model;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.tashow.cloud.ai.controller.admin.model.vo.AiModelPageReqVO;
 import com.tashow.cloud.ai.controller.admin.model.vo.AiModelSaveReqVO;
 import com.tashow.cloud.ai.dal.dataobject.model.AiModelDO;
@@ -10,6 +11,8 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import java.util.List;
+
 /**
  * AI模型管理 Service 实现类
  *
@@ -29,6 +32,7 @@ public class AiModelServiceImpl implements AiModelService {
         return model.getId();
     }
 
+
     @Override
     public void updateModel(AiModelSaveReqVO updateReqVO) {
         AiModelDO updateObj = BeanUtils.toBean(updateReqVO, AiModelDO.class);
@@ -41,8 +45,11 @@ public class AiModelServiceImpl implements AiModelService {
     }
 
     @Override
-    public AiModelDO getModel(Long id) {
-        return modelMapper.selectById(id);
+    public List<AiModelDO> getEnabledModels() {
+        return modelMapper.selectList(
+            new LambdaQueryWrapper<AiModelDO>()
+                .eq(AiModelDO::getStatus, 1)
+        );
     }
 
     @Override
@@ -50,12 +57,4 @@ public class AiModelServiceImpl implements AiModelService {
         return modelMapper.selectPage(pageReqVO);
     }
 
-    @Override
-    public void updateStatus(Long id, Integer status) {
-        AiModelDO updateObj = new AiModelDO();
-        updateObj.setId(id);
-        updateObj.setStatus(status);
-        modelMapper.updateById(updateObj);
-    }
-
 }

tashow-module/tashow-module-ai/src/main/resources/application-local.yaml

@@ -15,3 +15,7 @@ spring:
         namespace: 63caf548-313d-44bb-929c-531bf2f3b1a2 # 命名空间
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
 
+--- #################### 外部服务配置 ####################
+
+# AI翻译服务URL
+translate-server: http://43.139.42.137:8000/analyze/audio

tashow-module/tashow-module-file/src/main/java/com/tashow/cloud/file/framework/file/core/client/AbstractFileClient.java

@@ -63,7 +63,7 @@ public abstract class AbstractFileClient<Config extends FileClientConfig> implem
      * @return URL 访问地址
      */
     protected String formatFileUrl(String domain, String path) {
-        return StrUtil.format("{}/admin-api/file/{}/get/{}", domain, getId(), path);
+        return StrUtil.format("/admin-api/file/{}/get/{}", getId(), path);
     }
 
 }

tashow-module/tashow-module-file/src/main/resources/application-local.yaml

@@ -14,4 +14,3 @@ spring:
       config: # 【注册中心】配置项
         namespace: 63caf548-313d-44bb-929c-531bf2f3b1a2 # 命名空间
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
-

tashow-module/tashow-module-system/src/main/java/com/tashow/cloud/system/service/user/AdminUserServiceImpl.java

@@ -10,6 +10,8 @@ import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.common.util.collection.CollectionUtils;
 import com.tashow.cloud.common.util.object.BeanUtils;
 import com.tashow.cloud.common.util.validation.ValidationUtils;
+
+
 import com.tashow.cloud.infraapi.api.config.ConfigApi;
 import com.tashow.cloud.infraapi.api.file.FileApi;
 import com.tashow.cloud.permission.core.util.DataPermissionUtils;