From 8a7125c30b2b8f2d12f656b8ad64e84db591a307 Mon Sep 17 00:00:00 2001 From: jiang Date: Mon, 9 Dec 2024 10:22:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus-ai/src/main/resources/bootstrap.yml | 10 ++++++---- scripts/ai_bootstrap.yml | 2 +- scripts/auth_bootstrap.yml | 2 +- scripts/file_bootstrap.yml | 2 +- scripts/gateway_bootstrap.yml | 2 +- scripts/gen_bootstrap.yml | 2 +- scripts/job_bootstrap.yml | 2 +- scripts/system_bootstrap.yml | 2 +- scripts/visual_bootstrap.yml | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml b/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml index 743ea4b..efe5781 100644 --- a/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml @@ -21,12 +21,14 @@ 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/scripts/ai_bootstrap.yml b/scripts/ai_bootstrap.yml index 0abdfdb..ab9d74c 100644 --- a/scripts/ai_bootstrap.yml +++ b/scripts/ai_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18083 + port: 19093 # Spring spring: servlet: diff --git a/scripts/auth_bootstrap.yml b/scripts/auth_bootstrap.yml index 660671f..7020627 100755 --- a/scripts/auth_bootstrap.yml +++ b/scripts/auth_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18091 + port: 19091 # Spring spring: diff --git a/scripts/file_bootstrap.yml b/scripts/file_bootstrap.yml index 3a7bd48..fc98c91 100755 --- a/scripts/file_bootstrap.yml +++ b/scripts/file_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18093 + port: 19093 # Spring spring: diff --git a/scripts/gateway_bootstrap.yml b/scripts/gateway_bootstrap.yml index adcc4ef..f517014 100755 --- a/scripts/gateway_bootstrap.yml +++ b/scripts/gateway_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18090 + port: 19090 servlet: context-path: zhgd # Spring diff --git a/scripts/gen_bootstrap.yml b/scripts/gen_bootstrap.yml index df92a17..1d4beb6 100755 --- a/scripts/gen_bootstrap.yml +++ b/scripts/gen_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18094 + port: 19094 # Spring spring: diff --git a/scripts/job_bootstrap.yml b/scripts/job_bootstrap.yml index f851c7f..291cf5f 100755 --- a/scripts/job_bootstrap.yml +++ b/scripts/job_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18095 + port: 19095 # Spring spring: diff --git a/scripts/system_bootstrap.yml b/scripts/system_bootstrap.yml index aafe6ad..d38f9de 100755 --- a/scripts/system_bootstrap.yml +++ b/scripts/system_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18092 + port: 19092 # Spring spring: diff --git a/scripts/visual_bootstrap.yml b/scripts/visual_bootstrap.yml index 09a5853..b5a8481 100755 --- a/scripts/visual_bootstrap.yml +++ b/scripts/visual_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 18096 + port: 19096 # Spring spring: From 274731c5ec00522e8f5359ee2d8084c5789cf66b Mon Sep 17 00:00:00 2001 From: jiang Date: Mon, 9 Dec 2024 10:32:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/ai_bootstrap.yml | 2 +- scripts/auth_bootstrap.yml | 2 +- scripts/gateway_bootstrap.yml | 2 +- scripts/system_bootstrap.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/ai_bootstrap.yml b/scripts/ai_bootstrap.yml index ab9d74c..f320b60 100644 --- a/scripts/ai_bootstrap.yml +++ b/scripts/ai_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 19093 + port: 29093 # Spring spring: servlet: diff --git a/scripts/auth_bootstrap.yml b/scripts/auth_bootstrap.yml index 7020627..d495590 100755 --- a/scripts/auth_bootstrap.yml +++ b/scripts/auth_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 19091 + port: 29091 # Spring spring: diff --git a/scripts/gateway_bootstrap.yml b/scripts/gateway_bootstrap.yml index f517014..34276d7 100755 --- a/scripts/gateway_bootstrap.yml +++ b/scripts/gateway_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 19090 + port: 29090 servlet: context-path: zhgd # Spring diff --git a/scripts/system_bootstrap.yml b/scripts/system_bootstrap.yml index d38f9de..baed1ee 100755 --- a/scripts/system_bootstrap.yml +++ b/scripts/system_bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 19092 + port: 29092 # Spring spring: From cb10ed7f7c0ee431979293fea6421e1c9fc44846 Mon Sep 17 00:00:00 2001 From: jiang Date: Tue, 10 Dec 2024 16:20:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/controller/ModelManagerController.java | 83 +++++++++++++ .../ai/domain/DataSetBasicFileEntity.java | 2 +- .../bonus/ai/domain/ModelManagerEntity.java | 59 +++++++++ .../domain/dataset/AnnotationTaskEntity.java | 2 + .../bonus/ai/mapper/ModelManagerMapper.java | 54 +++++++++ .../service/Impl/ModelManagerServiceImpl.java | 108 +++++++++++++++++ .../bonus/ai/service/ModelManagerService.java | 56 +++++++++ .../resources/mapper/AnnotationTaskMapper.xml | 1 + .../main/resources/mapper/DatasetMapper.xml | 3 +- .../resources/mapper/ModelManagerMapper.xml | 112 ++++++++++++++++++ 10 files changed, 478 insertions(+), 2 deletions(-) create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/ModelManagerController.java create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelManagerEntity.java create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/ModelManagerMapper.java create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelManagerServiceImpl.java create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/ModelManagerService.java create mode 100644 bonus-modules/bonus-ai/src/main/resources/mapper/ModelManagerMapper.xml diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/ModelManagerController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/ModelManagerController.java new file mode 100644 index 0000000..3b86801 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/ModelManagerController.java @@ -0,0 +1,83 @@ +package com.bonus.ai.controller; + +import com.bonus.ai.domain.ModelManagerEntity; +import com.bonus.ai.service.ModelManagerService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.RequiresPermissions; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 模型管理Controller + * + * @author bonus + * @date 2024-12-10 + */ +@RestController +@RequestMapping("/manager") +public class ModelManagerController extends BaseController { + @Resource + private ModelManagerService aiModelManagerService; + + /** + * 查询模型管理列表 + */ + @RequiresPermissions("model:manager:list") + @GetMapping("/list") + public TableDataInfo list(ModelManagerEntity aiModelManager) { + try { + startPage(); + List list = aiModelManagerService.selectAiModelManagerList(aiModelManager); + return getDataTable(list); + } catch (Exception e) { + return getDataTable(new ArrayList<>()); + } + + } + + /** + * 获取模型管理详细信息 + */ + @RequiresPermissions("model:manager:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return aiModelManagerService.selectAiModelManagerById(id); + } + + /** + * 新增模型管理 + */ + @RequiresPermissions("model:manager:add") + @PostMapping("/add") + @SysLog(title = "模型管理", businessType = OperaType.INSERT, logType = 0, module = "模型管理", details = "导出模型管理列表") + public AjaxResult add(@RequestBody ModelManagerEntity aiModelManager) { + return aiModelManagerService.insertAiModelManager(aiModelManager); + } + + /** + * 修改模型管理 + */ + @RequiresPermissions("model:manager:edit") + @PostMapping("/edit") + @SysLog(title = "模型管理", businessType = OperaType.UPDATE, logType = 0, module = "模型管理", details = "导出模型管理列表") + public AjaxResult edit(@RequestBody ModelManagerEntity aiModelManager) { + return aiModelManagerService.updateAiModelManager(aiModelManager); + } + + /** + * 删除模型管理 + */ + @RequiresPermissions("model:manager:remove") + @PostMapping("/delete/{ids}") + @SysLog(title = "模型管理", businessType = OperaType.DELETE, logType = 0, module = "模型管理", details = "导出模型管理列表") + public AjaxResult remove(@PathVariable Long[] ids) { + return aiModelManagerService.deleteAiModelManagerByIds(ids); + } +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetBasicFileEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetBasicFileEntity.java index adb6ad3..50e61e3 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetBasicFileEntity.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/DataSetBasicFileEntity.java @@ -69,7 +69,7 @@ public class DataSetBasicFileEntity extends BaseEntity { private Date uploadTime; private Long dataSetId; - + private String auditFailedReason; /**查询目的，表示文件在当前任务下的标注状态*/ String fileAnnotationStatus; String annotationResult; diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelManagerEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelManagerEntity.java new file mode 100644 index 0000000..bb8b69f --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelManagerEntity.java @@ -0,0 +1,59 @@ +package com.bonus.ai.domain; + +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 模型管理对象 ai_model_manager + * + * @author bonus + * @date 2024-12-10 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class ModelManagerEntity extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + private Long id; + + /** + * 模型名称 + */ + private String modelName; + + /** + * 版本号 + */ + private String modelVersion; + + /** + * 模型类型 + */ + private String modelType; + + /** + * 模型框架 + */ + private String modelFrame; + + /** + * 模型上传path + */ + private String modelPath; + + /** + * 使用手册path + */ + private String modelManual; + + /** + * 是否删除 + */ + private String isActive; + +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java index 604c66f..5cd5a4c 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java @@ -79,6 +79,8 @@ public class AnnotationTaskEntity extends BaseEntity { /**最新版本数*/ private String lastVersionName; + private String auditFailedReason; + @Data public static class UserFileCount{ diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/ModelManagerMapper.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/ModelManagerMapper.java new file mode 100644 index 0000000..34efac1 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/ModelManagerMapper.java @@ -0,0 +1,54 @@ +package com.bonus.ai.mapper; + + +import com.bonus.ai.domain.ModelManagerEntity; + +import java.util.List; + +/** + * 模型管理Mapper接口 + * + * @author bonus + * @date 2024-12-10 + */ +public interface ModelManagerMapper { + /** + * 查询模型管理 + * + * @param id 模型管理主键 + * @return 模型管理 + */ + public ModelManagerEntity selectAiModelManagerById(Long id); + + /** + * 查询模型管理列表 + * + * @param aiModelManager 模型管理 + * @return 模型管理集合 + */ + public List selectAiModelManagerList(ModelManagerEntity aiModelManager); + + /** + * 新增模型管理 + * + * @param aiModelManager 模型管理 + * @return 结果 + */ + public int insertAiModelManager(ModelManagerEntity aiModelManager); + + /** + * 修改模型管理 + * + * @param aiModelManager 模型管理 + * @return 结果 + */ + public int updateAiModelManager(ModelManagerEntity aiModelManager); + + /** + * 批量删除模型管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAiModelManagerByIds(Long[] ids); +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelManagerServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelManagerServiceImpl.java new file mode 100644 index 0000000..7896fb2 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelManagerServiceImpl.java @@ -0,0 +1,108 @@ +package com.bonus.ai.service.Impl; + +import java.util.List; + +import com.bonus.ai.domain.ModelManagerEntity; +import com.bonus.ai.mapper.ModelManagerMapper; +import com.bonus.ai.service.ModelManagerService; +import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.web.domain.AjaxResult; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + + +/** + * 模型管理Service业务层处理 + * + * @author bonus + * @date 2024-12-10 + */ +@Service +public class ModelManagerServiceImpl implements ModelManagerService { + @Resource + private ModelManagerMapper aiModelManagerMapper; + + /** + * 查询模型管理 + * + * @param id 模型管理主键 + * @return 模型管理 + */ + @Override + public AjaxResult selectAiModelManagerById(Long id) { + try { + ModelManagerEntity aiModelManager = aiModelManagerMapper.selectAiModelManagerById(id); + if (ObjectUtils.isEmpty(aiModelManager)) { + return AjaxResult.error(); + } else { + return AjaxResult.success(); + } + } catch (Exception e) { + return AjaxResult.error(); + } + } + + /** + * 查询模型管理列表 + * + * @param aiModelManager 模型管理 + * @return 模型管理 + */ + @Override + public List selectAiModelManagerList(ModelManagerEntity aiModelManager) { + return aiModelManagerMapper.selectAiModelManagerList(aiModelManager); + } + + /** + * 新增模型管理 + * + * @param aiModelManager 模型管理 + * @return 结果 + */ + @Override + public AjaxResult insertAiModelManager(ModelManagerEntity aiModelManager) { + aiModelManager.setCreateTime(DateUtils.getNowDate()); + try { + int rows = aiModelManagerMapper.insertAiModelManager(aiModelManager); + return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + } catch (Exception e) { + return AjaxResult.error(); + } + } + + /** + * 修改模型管理 + * + * @param aiModelManager 模型管理 + * @return 结果 + */ + @Override + public AjaxResult updateAiModelManager(ModelManagerEntity aiModelManager) { + aiModelManager.setUpdateTime(DateUtils.getNowDate()); + try { + int rows = aiModelManagerMapper.updateAiModelManager(aiModelManager); + return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + } catch (Exception e) { + return AjaxResult.error(); + } + } + + /** + * 批量删除模型管理 + * + * @param ids 需要删除的模型管理主键 + * @return 结果 + */ + @Override + public AjaxResult deleteAiModelManagerByIds(Long[] ids) { + try { + int rows = aiModelManagerMapper.deleteAiModelManagerByIds(ids); + return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + } catch (Exception e) { + return AjaxResult.error(); + } + } +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/ModelManagerService.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/ModelManagerService.java new file mode 100644 index 0000000..e1cfde1 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/ModelManagerService.java @@ -0,0 +1,56 @@ +package com.bonus.ai.service; + +import com.bonus.ai.domain.ModelManagerEntity; +import com.bonus.common.core.web.domain.AjaxResult; + +import java.util.List; + +/** + * 模型管理Service接口 + * + * @author bonus + * @date 2024-12-10 + */ +public interface ModelManagerService +{ + /** + * 查询模型管理 + * + * @param id 模型管理主键 + * @return 模型管理 + */ + public AjaxResult selectAiModelManagerById(Long id); + + /** + * 查询模型管理列表 + * + * @param aiModelManager 模型管理 + * @return 模型管理集合 + */ + public List selectAiModelManagerList(ModelManagerEntity aiModelManager); + + /** + * 新增模型管理 + * + * @param aiModelManager 模型管理 + * @return 结果 + */ + public AjaxResult insertAiModelManager(ModelManagerEntity aiModelManager); + + /** + * 修改模型管理 + * + * @param aiModelManager 模型管理 + * @return 结果 + */ + public AjaxResult updateAiModelManager(ModelManagerEntity aiModelManager); + + /** + * 批量删除模型管理 + * + * @param ids 需要删除的模型管理主键集合 + * @return 结果 + */ + public AjaxResult deleteAiModelManagerByIds(Long[] ids); + +} diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml index b86c7cd..7d3cb9a 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml @@ -240,6 +240,7 @@ adfm.create_time AS createTime, atap.annotation_status AS fileAnnotationStatus, atap.annotation_result AS annotationResult, + atap.audit_failed_reason AS auditFailedReason, aat.task_id FROM ai_basic_file abf LEFT JOIN ai_dataset_file_map adfm ON abf.file_id = adfm.file_id diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/DatasetMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/DatasetMapper.xml index 8969e5d..c099a6f 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/DatasetMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/DatasetMapper.xml @@ -48,7 +48,8 @@ WHERE adfm.dataset_id = ad.dataset_id) AS annotatedCount, (SELECT COUNT(*) FROM ai_dataset_file_map adfm - WHERE adfm.dataset_id = ad.dataset_id AND adfm.is_annotated = '0') AS notAnnotatedCount + WHERE adfm.dataset_id = ad.dataset_id AND adfm.is_annotated = '0') AS notAnnotatedCount, + ( SELECT adv.version_name FROM ai_dataset_version adv WHERE adv.dataset_id = ad.dataset_id ORDER BY adv.create_time DESC LIMIT 1 ) AS latestVersionName FROM ai_dataset ad diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/ModelManagerMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/ModelManagerMapper.xml new file mode 100644 index 0000000..8f424b4 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/ModelManagerMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + select id, + create_by, + model_name, + model_version, + model_type, + model_frame, + model_path, + model_manual, + remark, + create_time, + update_time, + is_active + from ai_model_manager + + + + + + + + insert into ai_model_manager + + id, + create_by, + model_name, + model_version, + model_type, + model_frame, + model_path, + model_manual, + remark, + create_time, + update_time, + is_active, + + + #{id}, + #{createBy}, + #{modelName}, + #{modelVersion}, + #{modelType}, + #{modelFrame}, + #{modelPath}, + #{modelManual}, + #{remark}, + #{createTime}, + #{updateTime}, + #{isActive}, + + + + + update ai_model_manager + + create_by = #{createBy}, + model_name = #{modelName}, + model_version = #{modelVersion}, + model_type = #{modelType}, + model_frame = #{modelFrame}, + model_path = #{modelPath}, + model_manual = #{modelManual}, + remark = #{remark}, + create_time = #{createTime}, + update_time = #{updateTime}, + is_active = #{isActive}, + + where id = #{id} + + + + delete from ai_model_manager where id in + + #{id} + + + \ No newline at end of file From 1a1c22b2e18926a8fab02f4723db71e134bb963a Mon Sep 17 00:00:00 2001 From: jiang Date: Wed, 11 Dec 2024 18:37:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MirrorManagerController.java | 83 +++++++++ .../ai/controller/ModelManagerController.java | 18 +- .../bonus/ai/domain/MirrorManagerEntity.java | 66 +++++++ .../bonus/ai/domain/ModelManagerEntity.java | 19 +- .../bonus/ai/mapper/MirrorManagerMapper.java | 54 ++++++ .../Impl/MirrorManagerServiceImpl.java | 106 ++++++++++++ .../service/Impl/ModelManagerServiceImpl.java | 34 +++- .../ai/service/MirrorManagerService.java | 56 ++++++ .../bonus/ai/service/ModelManagerService.java | 12 +- .../resources/mapper/MirrorManagerMapper.xml | 162 ++++++++++++++++++ .../resources/mapper/ModelManagerMapper.xml | 66 ++++--- 11 files changed, 646 insertions(+), 30 deletions(-) create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/MirrorManagerController.java create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/MirrorManagerEntity.java create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/MirrorManagerMapper.java create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/MirrorManagerServiceImpl.java create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/MirrorManagerService.java create mode 100644 bonus-modules/bonus-ai/src/main/resources/mapper/MirrorManagerMapper.xml diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/MirrorManagerController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/MirrorManagerController.java new file mode 100644 index 0000000..0ebf510 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/MirrorManagerController.java @@ -0,0 +1,83 @@ +package com.bonus.ai.controller; + +import com.bonus.ai.domain.MirrorManagerEntity; +import com.bonus.ai.service.MirrorManagerService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.RequiresPermissions; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * 镜像管理Controller + * + * @author bonus + * @date 2024-12-11 + */ +@RestController +@RequestMapping("/mirror") +public class MirrorManagerController extends BaseController { + @Resource + private MirrorManagerService aiMirrorManagerService; + + /** + * 查询镜像管理列表 + */ + @RequiresPermissions("mirror:manager:list") + @GetMapping("/list") + public TableDataInfo list(MirrorManagerEntity aiMirrorManager) { + try { + startPage(); + List list = aiMirrorManagerService.selectAiMirrorManagerList(aiMirrorManager); + return getDataTable(list); + } catch (Exception e) { + return getDataTable(new ArrayList<>()); + } + + } + + /** + * 获取镜像管理详细信息 + */ + @RequiresPermissions("mirror:manager:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return aiMirrorManagerService.selectAiMirrorManagerById(id); + } + + /** + * 新增镜像管理 + */ + @RequiresPermissions("mirror:manager:add") + @PostMapping("/add") + @SysLog(title = "镜像管理", businessType = OperaType.INSERT, logType = 0, module = "镜像管理", details = "导出镜像管理列表") + public AjaxResult add(@RequestBody MirrorManagerEntity aiMirrorManager) { + return aiMirrorManagerService.insertAiMirrorManager(aiMirrorManager); + } + + /** + * 修改镜像管理 + */ + @RequiresPermissions("mirror:manager:edit") + @PutMapping("/edit") + @SysLog(title = "镜像管理", businessType = OperaType.UPDATE, logType = 0, module = "镜像管理", details = "导出镜像管理列表") + public AjaxResult edit(@RequestBody MirrorManagerEntity aiMirrorManager) { + return aiMirrorManagerService.updateAiMirrorManager(aiMirrorManager); + } + + /** + * 删除镜像管理 + */ + @RequiresPermissions("mirror:manager:remove") + @PostMapping("/delete/{ids}") + @SysLog(title = "镜像管理", businessType = OperaType.DELETE, logType = 0, module = "镜像管理", details = "导出镜像管理列表") + public AjaxResult remove(@PathVariable Long[] ids) { + return aiMirrorManagerService.deleteAiMirrorManagerByIds(ids); + } +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/ModelManagerController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/ModelManagerController.java index 3b86801..b7df134 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/ModelManagerController.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/ModelManagerController.java @@ -9,6 +9,7 @@ import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.ArrayList; @@ -21,7 +22,7 @@ import java.util.List; * @date 2024-12-10 */ @RestController -@RequestMapping("/manager") +@RequestMapping("/model") public class ModelManagerController extends BaseController { @Resource private ModelManagerService aiModelManagerService; @@ -80,4 +81,19 @@ public class ModelManagerController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return aiModelManagerService.deleteAiModelManagerByIds(ids); } + + /** + * 文件上传 + */ + @RequiresPermissions("model:manager:uploadFile") + @PostMapping("/uploadFile") + @SysLog(title = "模型管理", businessType = OperaType.DELETE, logType = 0, module = "模型管理", details = "导出模型管理列表") + public AjaxResult uploadFile(@RequestParam("file") MultipartFile file, + @RequestParam("chunk") int chunk, + @RequestParam("totalChunks") int totalChunks, + @RequestParam("fileName") String fileName) { + return aiModelManagerService.uploadFile(file, chunk, totalChunks,fileName); + } + + } diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/MirrorManagerEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/MirrorManagerEntity.java new file mode 100644 index 0000000..e06ee99 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/MirrorManagerEntity.java @@ -0,0 +1,66 @@ +package com.bonus.ai.domain; + + +import com.bonus.common.core.annotation.Excel; +import com.bonus.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 镜像管理对象 ai_mirror_manager + * + * @author bonus + * @date 2024-12-11 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class MirrorManagerEntity extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 构建方式 */ + private String conManner; + + /** 接口文档 */ + private String interfaceDocument; + + /** 文档上传path */ + private String documentPath; + + /** 镜像名称 */ + private String mirrorName; + + /** 镜像版本 */ + private String mirrorVersion; + + /** 所属模型 */ + private String ownModel; + + /** 运行环境 */ + private String runEnvironment; + + /** 模型框架 */ + private String modelFrame; + + /** 语言 */ + private String language; + + /** 镜像文件path */ + private String mirrorPath; + + /** 是否删除 */ + private String isActive; + + /** 数据集id */ + private String datasetId; + + /** 模型文件名 */ + private String modelFileName; + + /** 使用手册文件名 */ + private String manualFileName; +} + diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelManagerEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelManagerEntity.java index bb8b69f..5b47cd6 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelManagerEntity.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/ModelManagerEntity.java @@ -40,20 +40,33 @@ public class ModelManagerEntity extends BaseEntity { * 模型框架 */ private String modelFrame; - + /** + * 模型文件名 + */ + private String modelFileName; /** * 模型上传path */ private String modelPath; - + /** + * 使用手册文件名 + */ + private String manualFileName; /** * 使用手册path */ private String modelManual; - /** * 是否删除 */ private String isActive; + /** + * 数据集id + */ + private Long datasetId; + /** + * 数据集名称 + */ + private String datasetName; } diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/MirrorManagerMapper.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/MirrorManagerMapper.java new file mode 100644 index 0000000..94f5f0f --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/MirrorManagerMapper.java @@ -0,0 +1,54 @@ +package com.bonus.ai.mapper; + + +import com.bonus.ai.domain.MirrorManagerEntity; + +import java.util.List; + +/** + * 镜像管理Mapper接口 + * + * @author bonus + * @date 2024-12-11 + */ +public interface MirrorManagerMapper { + /** + * 查询镜像管理 + * + * @param id 镜像管理主键 + * @return 镜像管理 + */ + public MirrorManagerEntity selectAiMirrorManagerById(Long id); + + /** + * 查询镜像管理列表 + * + * @param aiMirrorManager 镜像管理 + * @return 镜像管理集合 + */ + public List selectAiMirrorManagerList(MirrorManagerEntity aiMirrorManager); + + /** + * 新增镜像管理 + * + * @param aiMirrorManager 镜像管理 + * @return 结果 + */ + public int insertAiMirrorManager(MirrorManagerEntity aiMirrorManager); + + /** + * 修改镜像管理 + * + * @param aiMirrorManager 镜像管理 + * @return 结果 + */ + public int updateAiMirrorManager(MirrorManagerEntity aiMirrorManager); + + /** + * 批量删除镜像管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteAiMirrorManagerByIds(Long[] ids); +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/MirrorManagerServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/MirrorManagerServiceImpl.java new file mode 100644 index 0000000..911d9c1 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/MirrorManagerServiceImpl.java @@ -0,0 +1,106 @@ +package com.bonus.ai.service.Impl; + +import com.bonus.ai.domain.MirrorManagerEntity; +import com.bonus.ai.mapper.MirrorManagerMapper; +import com.bonus.ai.service.MirrorManagerService; +import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.web.domain.AjaxResult; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 镜像管理Service业务层处理 + * + * @author bonus + * @date 2024-12-11 + */ +@Service +public class MirrorManagerServiceImpl implements MirrorManagerService { + @Resource + private MirrorManagerMapper aiMirrorManagerMapper; + + /** + * 查询镜像管理 + * + * @param id 镜像管理主键 + * @return 镜像管理 + */ + @Override + public AjaxResult selectAiMirrorManagerById(Long id) { + try { + MirrorManagerEntity aiMirrorManager = aiMirrorManagerMapper.selectAiMirrorManagerById(id); + if (ObjectUtils.isEmpty(aiMirrorManager)) { + return AjaxResult.error(); + } else { + return AjaxResult.success(aiMirrorManager); + } + } catch (Exception e) { + return AjaxResult.error(); + } + } + + /** + * 查询镜像管理列表 + * + * @param aiMirrorManager 镜像管理 + * @return 镜像管理 + */ + @Override + public List selectAiMirrorManagerList(MirrorManagerEntity aiMirrorManager) { + return aiMirrorManagerMapper.selectAiMirrorManagerList(aiMirrorManager); + } + + /** + * 新增镜像管理 + * + * @param aiMirrorManager 镜像管理 + * @return 结果 + */ + @Override + public AjaxResult insertAiMirrorManager(MirrorManagerEntity aiMirrorManager) { + aiMirrorManager.setCreateTime(DateUtils.getNowDate()); + try { + int rows = aiMirrorManagerMapper.insertAiMirrorManager(aiMirrorManager); + return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + } catch (Exception e) { + return AjaxResult.error(); + } + } + + /** + * 修改镜像管理 + * + * @param aiMirrorManager 镜像管理 + * @return 结果 + */ + @Override + public AjaxResult updateAiMirrorManager(MirrorManagerEntity aiMirrorManager) { + aiMirrorManager.setUpdateTime(DateUtils.getNowDate()); + try { + int rows = aiMirrorManagerMapper.updateAiMirrorManager(aiMirrorManager); + return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + } catch (Exception e) { + return AjaxResult.error(); + } + } + + /** + * 批量删除镜像管理 + * + * @param ids 需要删除的镜像管理主键 + * @return 结果 + */ + @Override + public AjaxResult deleteAiMirrorManagerByIds(Long[] ids) { + try { + int rows = aiMirrorManagerMapper.deleteAiMirrorManagerByIds(ids); + return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + } catch (Exception e) { + return AjaxResult.error(); + } + } + +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelManagerServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelManagerServiceImpl.java index 7896fb2..3c07116 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelManagerServiceImpl.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/ModelManagerServiceImpl.java @@ -2,14 +2,18 @@ package com.bonus.ai.service.Impl; import java.util.List; +import com.bonus.ai.domain.DataSetBasicFileEntity; import com.bonus.ai.domain.ModelManagerEntity; import com.bonus.ai.mapper.ModelManagerMapper; import com.bonus.ai.service.ModelManagerService; +import com.bonus.ai.utils.MinioUtil; 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; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -25,6 +29,9 @@ public class ModelManagerServiceImpl implements ModelManagerService { @Resource private ModelManagerMapper aiModelManagerMapper; + @Resource + private MinioUtil minioUtil; + /** * 查询模型管理 * @@ -38,7 +45,7 @@ public class ModelManagerServiceImpl implements ModelManagerService { if (ObjectUtils.isEmpty(aiModelManager)) { return AjaxResult.error(); } else { - return AjaxResult.success(); + return AjaxResult.success(aiModelManager); } } catch (Exception e) { return AjaxResult.error(); @@ -65,6 +72,7 @@ public class ModelManagerServiceImpl implements ModelManagerService { @Override public AjaxResult insertAiModelManager(ModelManagerEntity aiModelManager) { aiModelManager.setCreateTime(DateUtils.getNowDate()); + aiModelManager.setCreateBy(SecurityUtils.getUserId().toString()); try { int rows = aiModelManagerMapper.insertAiModelManager(aiModelManager); return rows > 0 ? AjaxResult.success() : AjaxResult.error(); @@ -105,4 +113,28 @@ public class ModelManagerServiceImpl implements ModelManagerService { return AjaxResult.error(); } } + + /** + * 文件上传 + * + * @param file 文件流 + * @param chunk 当前分片 + * @param totalChunks 总分片 + */ + @Override + public AjaxResult uploadFile(MultipartFile file, int chunk, int totalChunks, String fileName) { + try { + // 使用唯一路径保存分片到 MinIO + String objectName = SecurityUtils.getUserId().toString() + "/temp/" + fileName + "/chunk_" + chunk; + minioUtil.uploadFile(file, objectName); + // 检查是否是最后一个分片，若是则合并 + if (chunk == totalChunks) { + DataSetBasicFileEntity entity = minioUtil.mergeChunksWithMultithreading(fileName, totalChunks, minioUtil.joinPath(SecurityUtils.getUserId().toString(), "model/")); + return AjaxResult.success(entity); + } + return AjaxResult.success(); + } catch (Exception e) { + return AjaxResult.error(); + } + } } diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/MirrorManagerService.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/MirrorManagerService.java new file mode 100644 index 0000000..0b45905 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/MirrorManagerService.java @@ -0,0 +1,56 @@ +package com.bonus.ai.service; + +import com.bonus.ai.domain.MirrorManagerEntity; +import com.bonus.common.core.web.domain.AjaxResult; + +import java.util.List; + +/** + * 镜像管理Service接口 + * + * @author bonus + * @date 2024-12-11 + */ +public interface MirrorManagerService +{ + /** + * 查询镜像管理 + * + * @param id 镜像管理主键 + * @return 镜像管理 + */ + public AjaxResult selectAiMirrorManagerById(Long id); + + /** + * 查询镜像管理列表 + * + * @param aiMirrorManager 镜像管理 + * @return 镜像管理集合 + */ + public List selectAiMirrorManagerList(MirrorManagerEntity aiMirrorManager); + + /** + * 新增镜像管理 + * + * @param aiMirrorManager 镜像管理 + * @return 结果 + */ + public AjaxResult insertAiMirrorManager(MirrorManagerEntity aiMirrorManager); + + /** + * 修改镜像管理 + * + * @param aiMirrorManager 镜像管理 + * @return 结果 + */ + public AjaxResult updateAiMirrorManager(MirrorManagerEntity aiMirrorManager); + + /** + * 批量删除镜像管理 + * + * @param ids 需要删除的镜像管理主键集合 + * @return 结果 + */ + public AjaxResult deleteAiMirrorManagerByIds(Long[] ids); + +} diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/ModelManagerService.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/ModelManagerService.java index e1cfde1..164d134 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/ModelManagerService.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/ModelManagerService.java @@ -2,6 +2,7 @@ package com.bonus.ai.service; import com.bonus.ai.domain.ModelManagerEntity; import com.bonus.common.core.web.domain.AjaxResult; +import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -11,8 +12,7 @@ import java.util.List; * @author bonus * @date 2024-12-10 */ -public interface ModelManagerService -{ +public interface ModelManagerService { /** * 查询模型管理 * @@ -53,4 +53,12 @@ public interface ModelManagerService */ public AjaxResult deleteAiModelManagerByIds(Long[] ids); + /** + * 文件上传 + * + * @param file 文件流 + * @param chunk 当前分片 + * @param totalChunks 总分片 + */ + AjaxResult uploadFile(MultipartFile file, int chunk, int totalChunks,String fileName); } diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/MirrorManagerMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/MirrorManagerMapper.xml new file mode 100644 index 0000000..a953770 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/MirrorManagerMapper.xml @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, + create_by, + con_manner, + interface_document, + document_path, + mirror_name, + mirror_version, + own_model, + run_environment, + model_frame, + language, + mirror_path, + remark, + create_time, + update_time, + is_active, + datasetId, + modelFileName, + manualFileName + from ai_mirror_manager + + + + + + + + insert into ai_mirror_manager + + id, + create_by, + con_manner, + interface_document, + document_path, + mirror_name, + mirror_version, + own_model, + run_environment, + model_frame, + language, + mirror_path, + remark, + create_time, + update_time, + is_active, + datasetId, + modelFileName, + manualFileName, + + + #{id}, + #{createBy}, + #{conManner}, + #{interfaceDocument}, + #{documentPath}, + #{mirrorName}, + #{mirrorVersion}, + #{ownModel}, + #{runEnvironment}, + #{modelFrame}, + #{language}, + #{mirrorPath}, + #{remark}, + #{createTime}, + #{updateTime}, + #{isActive}, + #{datasetId}, + #{modelFileName}, + #{manualFileName}, + + + + + update ai_mirror_manager + + create_by = #{createBy}, + con_manner = #{conManner}, + interface_document = #{interfaceDocument}, + document_path = #{documentPath}, + mirror_name = #{mirrorName}, + mirror_version = #{mirrorVersion}, + own_model = #{ownModel}, + run_environment = #{runEnvironment}, + model_frame = #{modelFrame}, + language = #{language}, + mirror_path = #{mirrorPath}, + remark = #{remark}, + create_time = #{createTime}, + update_time = #{updateTime}, + is_active = #{isActive}, + datasetId = #{datasetId}, + modelFileName = #{modelFileName}, + manualFileName = #{manualFileName}, + + where id = #{id} + + + + delete from ai_mirror_manager where id in + + #{id} + + + \ No newline at end of file diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/ModelManagerMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/ModelManagerMapper.xml index 8f424b4..0867ae8 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/ModelManagerMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/ModelManagerMapper.xml @@ -17,40 +17,52 @@ + + + + - select id, - create_by, - model_name, - model_version, - model_type, - model_frame, - model_path, - model_manual, - remark, - create_time, - update_time, - is_active - from ai_model_manager + select amm.id, + su.user_name AS create_by, + amm.model_name, + amm.model_version, + amm.model_type, + amm.model_frame, + amm.model_path, + amm.model_manual, + amm.remark, + amm.create_time, + amm.update_time, + amm.is_active, + amm.dataset_id, + ad.dataset_name, + amm.manual_file_name, + amm.model_file_name + from ai_model_manager amm + LEFT JOIN sys_user su ON amm.create_by = su.user_id + LEFT JOIN ai_dataset ad ON amm.dataset_id = ad.dataset_id - - and model_name like concat('%', #{modelName}, '%') - and model_version = #{modelVersion} - and model_type = #{modelType} - and model_frame = #{modelFrame} - and model_path = #{modelPath} - and model_manual = #{modelManual} - and is_active = #{isActive} + and amm.model_name like concat('%', #{modelName}, '%') + + and amm.model_version = #{modelVersion} + and amm.model_type = #{modelType} + and amm.model_frame = #{modelFrame} + and amm.model_path = #{modelPath} + and amm.model_manual = #{modelManual} + and amm.is_active = #{isActive} @@ -67,6 +79,9 @@ remark, create_time, update_time, + dataset_id, + model_file_name, + manual_file_name, is_active, @@ -81,6 +96,9 @@ #{remark}, #{createTime}, #{updateTime}, + #{datasetId}, + #{modelFileName}, + #{manualFileName}, #{isActive}, @@ -88,7 +106,6 @@ update ai_model_manager - create_by = #{createBy}, model_name = #{modelName}, model_version = #{modelVersion}, model_type = #{modelType}, @@ -98,6 +115,9 @@ remark = #{remark}, create_time = #{createTime}, update_time = #{updateTime}, + dataset_Id = #{datasetId}, + model_file_name = #{modelFileName}, + manual_file_name = #{manualFileName}, is_active = #{isActive}, where id = #{id}