From cd7f3fa89aed4e7a4b87c0ee4164cd606103b318 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 四月 2025 09:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 6096f13..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
--
Gitblit v1.8.0