From f2d87e1e765f525c63b742943c8b865032db82df Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 19 三月 2025 07:45:41 +0800
Subject: [PATCH] 模型调整
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StAdjustConfigServiceImpl.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StAdjustConfigServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StAdjustConfigServiceImpl.java
index 60a5a8a..335d715 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StAdjustConfigServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StAdjustConfigServiceImpl.java
@@ -9,6 +9,7 @@
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.model.api.mcs.dto.StAdjustConfigDTO;
+import com.iailab.module.model.common.enums.AdjustConfigStatusEnum;
import com.iailab.module.model.mcs.pre.entity.MmItemOutputEntity;
import com.iailab.module.model.mcs.sche.dao.StAdjustConfigDao;
import com.iailab.module.model.mcs.sche.entity.StAdjustConfigDetEntity;
@@ -21,10 +22,9 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
/**
* @author PanZhibao
@@ -87,16 +87,21 @@
return ConvertUtils.sourceToTarget(list, StAdjustConfigDTO.class);
}
- public StAdjustConfigEntity getByModelId(String modelId) {
- return baseDao.selectOne("schedule_model_id", modelId,"status",1);
- }
-
-
- public List<StAdjustConfigDetEntity> getDetByModelId(String modelId) {
- StAdjustConfigEntity configEntity = getByModelId(modelId);
- if (null == configEntity) {
- return null;
+ @Override
+ public Map<StAdjustConfigEntity, List<StAdjustConfigDetEntity>> getAdjustConfigMap(String modelId) {
+ Map<StAdjustConfigEntity, List<StAdjustConfigDetEntity>> result = new HashMap<>();
+ QueryWrapper<StAdjustConfigEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("schedule_model_id", modelId)
+ .eq("status", AdjustConfigStatusEnum.ENABLE.getCode());
+ List<StAdjustConfigEntity> configList = baseDao.selectList(queryWrapper);
+ if (!CollectionUtils.isEmpty(configList)) {
+ return result;
}
- return stAdjustConfigDetService.getListByConfigId(configEntity.getId());
+ for (StAdjustConfigEntity entity : configList) {
+ List<StAdjustConfigDetEntity> detList = stAdjustConfigDetService.getListByConfigId(entity.getId());
+ result.put(entity, detList);
+ }
+
+ return result;
}
}
\ No newline at end of file
--
Gitblit v1.9.3