diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelEvaluateDetails.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelEvaluateDetails.java
index 4aab4e5..88c8b07 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelEvaluateDetails.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelEvaluateDetails.java
@@ -1,6 +1,8 @@
package com.bonus.ai.domain;
import com.bonus.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.Date;
@@ -10,6 +12,8 @@ import java.util.Date;
* @author bonus
* @date 2024-12-17
*/
+@EqualsAndHashCode(callSuper = true)
+@Data
public class ModelEvaluateDetails extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/DataSetBasicFileMapper.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/DataSetBasicFileMapper.java
index 28bd1af..68b7e03 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/DataSetBasicFileMapper.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/DataSetBasicFileMapper.java
@@ -26,6 +26,8 @@ public interface DataSetBasicFileMapper {
public DataSetBasicFileEntity selectDataSetBasicFileByFileName(@Param("parentId") Long parentId,@Param("fileName")String fileName);
+ public DataSetBasicFileEntity selectFileName(@Param("parentId") Long parentId,@Param("fileName")String fileName);
+
/**
* 查询文件基础
*
diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetBasicFileServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetBasicFileServiceImpl.java
index ce74229..c46e682 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetBasicFileServiceImpl.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/DataSetBasicFileServiceImpl.java
@@ -150,7 +150,7 @@ public class DataSetBasicFileServiceImpl implements DataSetBasicFileService {
DataSetBasicFileEntity basicFile = new DataSetBasicFileEntity();
int num = getNumberFromFileName(entity.getFileName());
do {
- basicFile = dataSetBasicFileMapper.selectDataSetBasicFileByFileName(entity.getParentId(), entity.getFileName());
+ basicFile = dataSetBasicFileMapper.selectFileName(entity.getParentId(), entity.getFileName());
// 如果存在,则修改文件名并递增 num
if (ObjectUtils.isNotEmpty(basicFile)) {
num++; // 递增 num
@@ -675,7 +675,7 @@ public class DataSetBasicFileServiceImpl implements DataSetBasicFileService {
try {
fileStream = minioUtil.downloadFile(fileEntity.getFileUrl());
String zipEntryName = parentDirectory.isEmpty() ? fileEntity.getFileName() : parentDirectory + File.separator + fileEntity.getFileName();
- ZipEntry zipEntry = new ZipEntry(parentDirectory);
+ ZipEntry zipEntry = new ZipEntry(zipEntryName);
zos.putNextEntry(zipEntry);
IOUtils.copy(fileStream, zos);
zos.closeEntry();
diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelEvaluateDetailsServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelEvaluateDetailsServiceImpl.java
index 94a8242..cb264b3 100644
--- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelEvaluateDetailsServiceImpl.java
+++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelEvaluateDetailsServiceImpl.java
@@ -5,6 +5,7 @@ import com.bonus.ai.mapper.ModelEvaluateDetailsMapper;
import com.bonus.ai.service.ModelEvaluateDetailsService;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.common.security.utils.SecurityUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -63,6 +64,7 @@ public class ModelEvaluateDetailsServiceImpl implements ModelEvaluateDetailsServ
@Override
public AjaxResult insertAiModelEvaluateDetails(ModelEvaluateDetails aiModelEvaluateDetails) {
try {
+ aiModelEvaluateDetails.setUserId(SecurityUtils.getUserId().toString());
int rows = aiModelEvaluateDetailsMapper.insertAiModelEvaluateDetails(aiModelEvaluateDetails);
return rows > 0 ? AjaxResult.success() : AjaxResult.error();
} catch (Exception e) {
diff --git a/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml b/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml
index ce6e884..efe5781 100644
--- a/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml
+++ b/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml
@@ -21,13 +21,13 @@ spring:
password: nacos
discovery:
# 服务注册地址
- server-addr: 192.168.0.14:8848
- namespace: f648524d-0a7b-449e-8f92-64e05236fd51
+ server-addr: 127.0.0.1:8848
+ namespace: db93cb6f-e0b3-4f24-a5fc-72f5562f5676
config:
# 配置中心地址
- server-addr: 192.168.0.14:8848
- namespace: f648524d-0a7b-449e-8f92-64e05236fd51
+ server-addr: 127.0.0.1:8848
+ namespace: db93cb6f-e0b3-4f24-a5fc-72f5562f5676
# 配置文件格式
file-extension: yml
diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetBasicFileMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetBasicFileMapper.xml
index fe1430d..7744be8 100644
--- a/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetBasicFileMapper.xml
+++ b/bonus-modules/bonus-ai/src/main/resources/mapper/DataSetBasicFileMapper.xml
@@ -81,6 +81,14 @@
ORDER BY abf.is_directory DESC ,abf.create_time DESC
+
+
+
insert into ai_basic_file
diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/ModelEvaluateDetailsMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/ModelEvaluateDetailsMapper.xml
index d456bbe..1155e15 100644
--- a/bonus-modules/bonus-ai/src/main/resources/mapper/ModelEvaluateDetailsMapper.xml
+++ b/bonus-modules/bonus-ai/src/main/resources/mapper/ModelEvaluateDetailsMapper.xml
@@ -24,49 +24,40 @@
- select id,
- evaluate_id,
- user_id,
- just_sqmple,
- lose_sample,
- tp_num,
- tn_num,
- fp_num,
- fn_num,
- evalute_time,
- accuracy_rate,
- recall_rate,
- accurate_rate,
- f_grade,
- is_active,
- update_time
- from ai_model_evaluate_details
+ select amed.id,
+ amed.evaluate_id,
+ su.user_name as user_id,
+ amed.just_sqmple,
+ amed.lose_sample,
+ amed.tp_num,
+ amed.tn_num,
+ amed.fp_num,
+ amed.fn_num,
+ amed.evalute_time,
+ amed.accuracy_rate,
+ amed.recall_rate,
+ amed.accurate_rate,
+ amed.f_grade,
+ amed.is_active,
+ amed.update_time
+ from ai_model_evaluate_details amed
+ LEFT JOIN sys_user su ON amed.user_id = su.user_id
@@ -138,7 +129,7 @@
- delete from ai_model_evaluate_details where id in
+ update ai_model_evaluate_details set is_active ='1' where id in
#{id}
diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/ModelEvaluateMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/ModelEvaluateMapper.xml
index 453eb1a..60958c7 100644
--- a/bonus-modules/bonus-ai/src/main/resources/mapper/ModelEvaluateMapper.xml
+++ b/bonus-modules/bonus-ai/src/main/resources/mapper/ModelEvaluateMapper.xml
@@ -24,51 +24,52 @@
- select id,
- create_by,
- evaluate_name,
- evaluate_version,
- sample_all,
- process_speed,
- memory_usage,
- enviro_conditions,
- accuracy_rate,
- recall_rate,
- accurate_rate,
- f_grade,
- remart,
- create_time,
- is_active,
- update_time
- from ai_model_evaluate
+ select ame.id,
+ su.user_name AS create_by,
+ ame.evaluate_name,
+ ame.evaluate_version,
+ ame.sample_all,
+ ame.process_speed,
+ ame.memory_usage,
+ ame.enviro_conditions,
+ ame.accuracy_rate,
+ ame.recall_rate,
+ ame.accurate_rate,
+ ame.f_grade,
+ ame.remart,
+ ame.create_time,
+ ame.is_active,
+ ame.update_time
+ from ai_model_evaluate ame
+ LEFT JOIN sys_user su ON ame.create_by = su.user_id