From d799fbde44cc568a3e15d78dc6e582ff244ffa89 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 三月 2025 16:05:44 +0800
Subject: [PATCH] 1、卧式理片重置任务调整，避免无任务情况下无法将任务交互表的数据清掉 2、中空领取任务界面新增产品名称，便于识别产品 3、调整部分定时任务间隔时间 4、定时任务分隔开，按照两个/多个界面的websocket由一个分为多个 5、取消钢化功能开发中z
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
index 60e6139..5fb79c9 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
@@ -11,6 +11,7 @@
import com.mes.tools.DateUtil;
import com.mes.utils.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -29,6 +30,10 @@
@Autowired
RedisUtil redisUtil;
+ @Value("${mes.ratio}")
+ private int ratio;
+
+
@Override
public List<EdgGlassTaskInfo> selectEdgInfo() {
EdgGlassInfoRequest request = redisUtil.getCacheObject("edgGlassRequest");
@@ -45,7 +50,13 @@
.in(CollectionUtils.isNotEmpty(request.getStateList()), EdgGlassTaskInfo::getState, request.getStateList())
.between(null != request.getBeginDate(), EdgGlassTaskInfo::getCreateTime, request.getBeginDate(), request.getEndDate())
.orderByDesc(EdgGlassTaskInfo::getCreateTime);
- return this.list(edgGlassWrapper);
+ List<EdgGlassTaskInfo> list = this.list(edgGlassWrapper);
+ list.stream().forEach(e -> {
+ e.setWidth(e.getWidth() / ratio);
+ e.setHeight(e.getHeight() / ratio);
+ e.setThickness(e.getThickness() / ratio);
+ });
+ return list;
}
@Override
@@ -68,7 +79,7 @@
public List<EdgGlassTaskInfo> selectTaskCacheIsRun() {
QueryWrapper<EdgGlassTaskInfo> wrapper = new QueryWrapper<EdgGlassTaskInfo>()
.select("line")
- .eq("status", 1)
+ .eq("state", 1)
.groupBy("line");
return this.list(wrapper);
--
Gitblit v1.8.0