From 3050db3dbea1d48ed07b79290ac42df76f0361d2 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 09 十二月 2024 08:45:41 +0800
Subject: [PATCH] 修改调度逻辑为按预排的格子进行调度
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index 68cace1..d7712f9 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -19,7 +19,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,9 +35,9 @@
@Service
public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
- @Resource
+ @Autowired
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
- @Resource
+ @Autowired
UpPattenUsageMapper upPattenUsageMapper;
@Autowired
@@ -58,7 +57,7 @@
if (flag && CollectionUtil.isNotEmpty(emptyList)) {
return emptyList.get(0);
}
- if (CollectionUtil.isEmpty(emptyList) || emptyList.size() == 1) {
+ if (CollectionUtil.isEmpty(emptyList)) {
return null;
}
return emptyList.get(0);
@@ -183,5 +182,10 @@
return true;
}
+ @Override
+ public EdgStorageCage getEdgStorageCageBySize(int deviceId, double width, double height, int slot) {
+ return baseMapper.getEdgStorageCageBySize(deviceId, width, height, slot);
+ }
+
}
--
Gitblit v1.8.0