From 227eff61120aaca63e068035d745d86452e6499a Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:35:12 +0800
Subject: [PATCH] feat(mes): 优化生产订单与排产任务列表显示，新增启停工及校验逻辑 1. 生产订单列表展示优化 (WorkOrder) - 新增「生产状态」列，全局注册 `ORDER_PRODUCTION_STATUS` 常量并绑定系统动态字典。 - 彻底重构「工序生产进度」单元格显示：弃用臃肿的 Steps 组件，改为极简横向布局（彩色状态圆点 + 进度百分比），解决表格行高被强行撑开及内容截断问题，支持横向滚动。 - 优化「完成进度」列宽及展示样式，将百分比数值外置同行显示，更加直观。 2. 排产任务列表改造 (Task) - 顶部表头重构，由单一标题重构为「全部 / 未完成 / 已完成」的 Tabs 标签页切换结构。 - 重写数据过滤逻辑，剥离写死的 status 查询，改为使用 `scheduleStatus` 字段动态响应 Tabs 切换 (0: 未完成, 1: 已完成)。 3. 工单业务逻辑增强与状态流转 - 落实「工单查询逻辑设计方案」，优化底层的工单条件检索逻辑。 - 实现「添加工单启停功能」与「停工状态」，支持工单在执行过程中的暂停与恢复业务流转。 - 强化容错与防呆设计：操作「完成订单」时增加前置校验 `handleCheckFinish`，若生产状态为未完成，强制弹出二次确认 Modal，避免误操作。 # 相关讨论/参考方案 # - 添加工单启停功能 # - 停工状态功能设计方案 # - 工单查询逻辑设计方案 # - 工单完成进度显示优化
---
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java | 119 ++++++++---------------------------------------------------
1 files changed, 17 insertions(+), 102 deletions(-)
diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java
index 235e54a..5668da0 100644
--- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java
+++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiModelServiceImpl.java
@@ -1,9 +1,5 @@
package cn.iocoder.yudao.module.ai.service.model;
-import cn.iocoder.yudao.module.ai.enums.model.AiPlatformEnum;
-import cn.iocoder.yudao.module.ai.framework.ai.core.model.AiModelFactory;
-import cn.iocoder.yudao.module.ai.framework.ai.core.model.midjourney.api.MidjourneyApi;
-import cn.iocoder.yudao.module.ai.framework.ai.core.model.suno.api.SunoApi;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -11,52 +7,36 @@
import cn.iocoder.yudao.module.ai.controller.admin.model.vo.model.AiModelSaveReqVO;
import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiApiKeyDO;
import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiModelDO;
-import cn.iocoder.yudao.module.ai.dal.mysql.model.AiChatMapper;
-import com.agentsflex.llm.ollama.OllamaLlm;
-import com.agentsflex.llm.ollama.OllamaLlmConfig;
-import com.agentsflex.llm.qwen.QwenLlm;
-import com.agentsflex.llm.qwen.QwenLlmConfig;
-import dev.tinyflow.core.Tinyflow;
+import cn.iocoder.yudao.module.ai.dal.mysql.model.AiModelMapper;
+import cn.iocoder.yudao.module.ai.enums.model.AiPlatformEnum;
+import cn.iocoder.yudao.module.ai.framework.ai.core.model.AiModelFactory;
import jakarta.annotation.Resource;
import org.springframework.ai.chat.model.ChatModel;
import org.springframework.ai.embedding.EmbeddingModel;
-import org.springframework.ai.image.ImageModel;
-import org.springframework.ai.vectorstore.SimpleVectorStore;
import org.springframework.ai.vectorstore.VectorStore;
+import org.springframework.ai.vectorstore.milvus.MilvusVectorStore;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
-
import java.util.List;
import java.util.Map;
-
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.ai.enums.ErrorCodeConstants.*;
-/**
- * AI 妯″瀷 Service 瀹炵幇绫�
- *
- * @author fansili
- */
@Service
@Validated
public class AiModelServiceImpl implements AiModelService {
@Resource
private AiApiKeyService apiKeyService;
-
@Resource
- private AiChatMapper modelMapper;
-
+ private AiModelMapper modelMapper;
@Resource
private AiModelFactory modelFactory;
@Override
public Long createModel(AiModelSaveReqVO createReqVO) {
- // 1. 鏍￠獙
AiPlatformEnum.validatePlatform(createReqVO.getPlatform());
apiKeyService.validateApiKey(createReqVO.getKeyId());
-
- // 2. 鎻掑叆
AiModelDO model = BeanUtils.toBean(createReqVO, AiModelDO.class);
modelMapper.insert(model);
return model.getId();
@@ -64,30 +44,16 @@
@Override
public void updateModel(AiModelSaveReqVO updateReqVO) {
- // 1. 鏍￠獙
validateModelExists(updateReqVO.getId());
AiPlatformEnum.validatePlatform(updateReqVO.getPlatform());
apiKeyService.validateApiKey(updateReqVO.getKeyId());
-
- // 2. 鏇存柊
- AiModelDO updateObj = BeanUtils.toBean(updateReqVO, AiModelDO.class);
- modelMapper.updateById(updateObj);
+ modelMapper.updateById(BeanUtils.toBean(updateReqVO, AiModelDO.class));
}
@Override
public void deleteModel(Long id) {
- // 鏍￠獙瀛樺湪
validateModelExists(id);
- // 鍒犻櫎
modelMapper.deleteById(id);
- }
-
- private AiModelDO validateModelExists(Long id) {
- AiModelDO model = modelMapper.selectById(id);
- if (modelMapper.selectById(id) == null) {
- throw exception(MODEL_NOT_EXISTS);
- }
- return model;
}
@Override
@@ -98,9 +64,7 @@
@Override
public AiModelDO getRequiredDefaultModel(Integer type) {
AiModelDO model = modelMapper.selectFirstByStatus(type, CommonStatusEnum.ENABLE.getStatus());
- if (model == null) {
- throw exception(MODEL_DEFAULT_NOT_EXISTS);
- }
+ if (model == null) throw exception(MODEL_DISABLE);
return model;
}
@@ -112,15 +76,19 @@
@Override
public AiModelDO validateModel(Long id) {
AiModelDO model = validateModelExists(id);
- if (CommonStatusEnum.isDisable(model.getStatus())) {
- throw exception(MODEL_DISABLE);
- }
+ if (CommonStatusEnum.isDisable(model.getStatus())) throw exception(MODEL_DISABLE);
return model;
}
@Override
public List<AiModelDO> getModelListByStatusAndType(Integer status, Integer type, String platform) {
return modelMapper.selectListByStatusAndType(status, type, platform);
+ }
+
+ private AiModelDO validateModelExists(Long id) {
+ AiModelDO model = modelMapper.selectById(id);
+ if (model == null) throw exception(MODEL_NOT_EXISTS);
+ return model;
}
// ========== 涓� Spring AI 闆嗘垚 ==========
@@ -130,72 +98,19 @@
AiModelDO model = validateModel(id);
AiApiKeyDO apiKey = apiKeyService.validateApiKey(model.getKeyId());
AiPlatformEnum platform = AiPlatformEnum.validatePlatform(apiKey.getPlatform());
- return modelFactory.getOrCreateChatModel(platform, apiKey.getApiKey(), apiKey.getUrl());
- }
-
- @Override
- public ImageModel getImageModel(Long id) {
- AiModelDO model = validateModel(id);
- AiApiKeyDO apiKey = apiKeyService.validateApiKey(model.getKeyId());
- AiPlatformEnum platform = AiPlatformEnum.validatePlatform(apiKey.getPlatform());
- return modelFactory.getOrCreateImageModel(platform, apiKey.getApiKey(), apiKey.getUrl());
- }
-
- @Override
- public MidjourneyApi getMidjourneyApi(Long id) {
- AiModelDO model = validateModel(id);
- AiApiKeyDO apiKey = apiKeyService.validateApiKey(model.getKeyId());
- return modelFactory.getOrCreateMidjourneyApi(apiKey.getApiKey(), apiKey.getUrl());
- }
-
- @Override
- public SunoApi getSunoApi() {
- AiApiKeyDO apiKey = apiKeyService.getRequiredDefaultApiKey(
- AiPlatformEnum.SUNO.getPlatform(), CommonStatusEnum.ENABLE.getStatus());
- return modelFactory.getOrCreateSunoApi(apiKey.getApiKey(), apiKey.getUrl());
+ return modelFactory.getOrCreateChatModel(platform, apiKey.getApiKey(), apiKey.getUrl(), model.getModel());
}
@Override
public VectorStore getOrCreateVectorStore(Long id, Map<String, Class<?>> metadataFields) {
- // 鑾峰彇妯″瀷 + 瀵嗛挜
AiModelDO model = validateModel(id);
AiApiKeyDO apiKey = apiKeyService.validateApiKey(model.getKeyId());
AiPlatformEnum platform = AiPlatformEnum.validatePlatform(apiKey.getPlatform());
- // 鍒涘缓鎴栬幏鍙� EmbeddingModel 瀵硅薄
EmbeddingModel embeddingModel = modelFactory.getOrCreateEmbeddingModel(
platform, apiKey.getApiKey(), apiKey.getUrl(), model.getModel());
- // 鍒涘缓鎴栬幏鍙� VectorStore 瀵硅薄
- return modelFactory.getOrCreateVectorStore(SimpleVectorStore.class, embeddingModel, metadataFields);
-// return modelFactory.getOrCreateVectorStore(QdrantVectorStore.class, embeddingModel, metadataFields);
-// return modelFactory.getOrCreateVectorStore(RedisVectorStore.class, embeddingModel, metadataFields);
-// return modelFactory.getOrCreateVectorStore(MilvusVectorStore.class, embeddingModel, metadataFields);
+ return modelFactory.getOrCreateVectorStore(MilvusVectorStore.class, embeddingModel, metadataFields);
}
- // TODO @lesan锛氭槸涓嶆槸杩斿洖 Llm 瀵硅薄浼氬ソ鐐瑰搱锛�
- @Override
- public void getLLmProvider4Tinyflow(Tinyflow tinyflow, Long modelId) {
- AiModelDO model = validateModel(modelId);
- AiApiKeyDO apiKey = apiKeyService.validateApiKey(model.getKeyId());
- AiPlatformEnum platform = AiPlatformEnum.validatePlatform(apiKey.getPlatform());
- switch (platform) {
- // TODO @lesan 鑰冭檻鍒版湭鏉ヤ笉闇�瑕佷娇鐢╝gents-flex 鐜板湪浠呮祴璇曢�氫箟鍗冮棶
- // TODO @lesan锛氥�愰噸瑕併�戞槸涓嶆槸鍙互瀹炵幇涓�涓� SpringAiLlm锛岃繖鏍风殑璇濓紝鍐呴儴鍏ㄩ儴鐢ㄥ畠灏卞ソ浜嗐�傚彧瀹炵幇 chat 閮ㄥ垎锛涜繖鏍凤紝灏辨妸 flex 浣滀负涓�涓� agent 妗嗘灦锛屽唴閮ㄨ皟鐢紝杩樻槸 spring ai 鐩稿叧鐨勩�傛垚鏈彲鑳戒綆涓�鐐癸紵锛�
- case TONG_YI:
- QwenLlmConfig qwenLlmConfig = new QwenLlmConfig();
- qwenLlmConfig.setApiKey(apiKey.getApiKey());
- qwenLlmConfig.setModel(model.getModel());
- // TODO @lesan锛氳繖涓湁鐐瑰鎬�傘�傘�傚鏋滀竴涓摼寮忛噷锛屾湁澶氫釜妯″瀷锛屽拫鏁村憖銆傘�傘��
- tinyflow.setLlmProvider(id -> new QwenLlm(qwenLlmConfig));
- break;
- case OLLAMA:
- OllamaLlmConfig ollamaLlmConfig = new OllamaLlmConfig();
- ollamaLlmConfig.setEndpoint(apiKey.getUrl());
- ollamaLlmConfig.setModel(model.getModel());
- tinyflow.setLlmProvider(id -> new OllamaLlm(ollamaLlmConfig));
- break;
- }
- }
-
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3