From 8a9b0adc7fe0f72c4de8c8e5d14e282f5913d63d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 十二月 2024 14:48:36 +0800
Subject: [PATCH] 1、fixbug:笼内玻璃错乱问题解决 2、中空问题修复：避免多个线程拿到的空格相同 3、swagger名称显示
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
index 9b7ffb7..16c4a41 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassOutRelationInfoServiceImpl.java
@@ -12,12 +12,14 @@
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
+import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -38,6 +40,9 @@
@Resource
HollowGlassQueueInfoService hollowGlassQueueInfoService;
+ @Resource
+ RedisUtil redisUtil;
+
@Override
public HollowGlassOutRelationInfo receiveTask(String flowCardId, int cell, int totalPairQuantity) {
return childrenTask(flowCardId,cell,totalPairQuantity,0);
@@ -46,6 +51,12 @@
@Override
public HollowGlassOutRelationInfo forceOutGlass(String flowCardId, int cell, int totalPairQuantity) {
return childrenTask(flowCardId,cell,totalPairQuantity,1);
+ }
+
+ @Override
+ public Boolean dispatchHollowSwitch(Boolean flag) {
+ redisUtil.setCacheObject("dispatchHollowSwitch", flag);
+ return redisUtil.getCacheObject("dispatchHollowSwitch");
}
@@ -71,6 +82,8 @@
BeanUtils.copyProperties(queue, queueInfo);
queueInfo.setState(Const.TEMPERING_NEW);
queueInfo.setCell(cell);
+ queueInfo.setCreateTime(new Date());
+ queueInfo.setUpdateTime(new Date());
hollowQueues.add(queueInfo);
if (queue.getIsPair() == 1){
isPairCount -=1;
--
Gitblit v1.8.0