From 2b91b242113bd10f1be241d19ab154e9ad6506cd Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 10 六月 2025 14:18:00 +0800
Subject: [PATCH] 国际化命名
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 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..c1a12a5 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
@@ -4,15 +4,18 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.common.config.ConstSysConfig;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.entity.request.EdgGlassInfoRequest;
import com.mes.edgglasstask.mapper.EdgGlassTaskInfoMapper;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
+import com.mes.sysconfig.service.SysConfigService;
import com.mes.tools.DateUtil;
import com.mes.utils.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -28,9 +31,16 @@
@Autowired
RedisUtil redisUtil;
+ @Resource
+ SysConfigService sysConfigService;
+
+// @Value("${mes.ratio}")
+// private int ratio;
+
@Override
public List<EdgGlassTaskInfo> selectEdgInfo() {
+ int ratio = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_RATIO);
EdgGlassInfoRequest request = redisUtil.getCacheObject("edgGlassRequest");
if (null == request) {
@@ -45,7 +55,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 +84,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