From 49aea9b28560b44d8b2bb9fa3f334c4e5dec0143 Mon Sep 17 00:00:00 2001 From: ire <931903008@qq.com> Date: Thu, 2 Jan 2025 14:08:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=9C=8D=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=BE=AE=E8=B0=83=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../async/AsyncFineTuningTaskService.java | 4 ++-- .../async/AsyncModelServiceService.java | 19 +++++++++++++------ .../FineTuningTaskServiceImpl.java | 8 +++++++- .../modelservice/ModelServiceServiceImpl.java | 10 ++++++++-- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncFineTuningTaskService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncFineTuningTaskService.java index 4c248e94b..1d07bf34c 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncFineTuningTaskService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncFineTuningTaskService.java @@ -32,7 +32,7 @@ public class AsyncFineTuningTaskService { @Async public void startFineTuningTask() { try { - + Thread.sleep(30000); }catch(Exception e){ }; @@ -42,7 +42,7 @@ public class AsyncFineTuningTaskService { @Async public void stopFineTuningTask() { try { - + Thread.sleep(30000); }catch(Exception e){ }; diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java index 404a4d853..1146ada56 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.llm.service.async; +import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO; import cn.iocoder.yudao.module.llm.dal.mysql.finetuningtask.FineTuningTaskMapper; +import cn.iocoder.yudao.module.llm.dal.mysql.modelservice.ModelServiceMapper; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -12,23 +14,28 @@ public class AsyncModelServiceService { @Resource private FineTuningTaskMapper fineTuningTaskMapper; + @Resource + private ModelServiceMapper modelServiceMapper; + //模型服务开启 @Async - public void startModelService() { + public void startModelService(ModelServiceDO updateObj) { try { - + Thread.sleep(30000); }catch(Exception e){ - + updateObj.setStatus(5); + modelServiceMapper.updateById(updateObj); }; } //调型服务关闭 @Async - public void stopModelService() { + public void stopModelService(ModelServiceDO updateObj) { try { - + Thread.sleep(30000); }catch(Exception e){ - + updateObj.setStatus(5); + modelServiceMapper.updateById(updateObj); }; } } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java index beee97dda..ff53ba001 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java @@ -136,13 +136,19 @@ public class FineTuningTaskServiceImpl implements FineTuningTaskService { fineTuningTaskMapper.stopStartTask(id,1); //todo 调用模型服务,开启调优任务 asyncFineTuningTaskService.startFineTuningTask(); + + fineTuningTaskMapper.stopStartTask(id,2); + } @Override public void stopFineTuningTask(Long id) { - fineTuningTaskMapper.stopStartTask(id,0); + fineTuningTaskMapper.stopStartTask(id,1); //todo 调用模型服务,停止调优任务 asyncFineTuningTaskService.stopFineTuningTask(); + + fineTuningTaskMapper.stopStartTask(id,0); + } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java index 98ec652b1..1d7f3d114 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java @@ -87,7 +87,10 @@ public class ModelServiceServiceImpl implements ModelServiceService { modelServiceMapper.updateById(updateObj); //todo 开启模型服务 - asyncModelServiceService.startModelService(); + asyncModelServiceService.startModelService(updateObj); + + updateObj.setStatus(2); + modelServiceMapper.updateById(updateObj); } @Override @@ -97,7 +100,10 @@ public class ModelServiceServiceImpl implements ModelServiceService { modelServiceMapper.updateById(updateObj); //todo 关闭模型服务 - asyncModelServiceService.stopModelService(); + asyncModelServiceService.stopModelService(updateObj); + + updateObj.setStatus(3); + modelServiceMapper.updateById(updateObj); }