From 73fe3c5574c8fbb7b18fa9b76d53b918f6f921e1 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 12 十一月 2025 11:09:04 +0800
Subject: [PATCH] 更换前端打包方式，将ip地址配置提取到public
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
index 2a805b0..0ebc1f3 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
@@ -4,10 +4,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
-import com.mes.hollow.entity.HollowGlassOutRelationInfo;
import com.mes.hollow.service.HollowGlassOutRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.hollowqueue.mapper.HollowGlassQueueInfoMapper;
@@ -16,8 +14,9 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
-import java.util.Optional;
/**
* (HollowGlassQueueInfo)琛ㄦ湇鍔″疄鐜扮被
@@ -46,6 +45,7 @@
@Override
public List<HollowGlassQueueInfo> queryHollowGlassQueueInfoByLine(int cell) {
+ LocalDateTime twoDaysAgo = LocalDate.now().atStartOfDay().minusDays(1);
List<String> relationIds = this.listObjs(
new LambdaQueryWrapper<HollowGlassQueueInfo>()
.lt(HollowGlassQueueInfo::getState, 1)
@@ -59,7 +59,8 @@
.in("relation_id", relationIds)
.eq("cell", cell)
.eq("is_pair", 1)
- .select("width","height","flow_card_id","relation_id", "hollow_sequence", "cell", "MAX(state) as state", "MAX(layer) as layer")
+ .ge("create_time", twoDaysAgo)
+ .select("width", "height", "flow_card_id", "relation_id", "hollow_sequence", "cell", "MAX(state) as state", "MAX(layer) as layer")
.groupBy("relation_id", "hollow_sequence")
.orderByAsc("relation_id", "hollow_sequence")
);
@@ -104,5 +105,10 @@
}
}
+
+ @Override
+ public List<String> queryNeedInCarGlass() {
+ return baseMapper.queryNeedInCarGlass();
+ }
}
--
Gitblit v1.8.0