From fd143352938b26016794e7074df62af104c2b466 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 25 七月 2024 08:46:43 +0800
Subject: [PATCH] 增加推送数据时非空判断
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index b3fb398..8de5698 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -309,7 +309,7 @@
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
.notInSql(BigStorageCage::getDeviceId,
"select distinct device_id from big_storage_cage_details where state in (100,102,103)")
- .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
+ .ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
.orderByAsc(BigStorageCage::getDeviceId)
.last("limit 1"));
if (null != bigStorageCage) {
@@ -322,7 +322,7 @@
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getRemainWidth, slotWidth)
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
- .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
+ .ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
.orderByAsc(BigStorageCage::getDeviceId)
.last("limit 1"));
Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
@@ -353,15 +353,15 @@
public boolean TemperingGlass(String temperingLayoutId, String engineerId) {
LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
temperingGlassInfoLambdaQueryWrapper
- .eq(TemperingGlassInfo::getTemperingLayoutId, temperingLayoutId)
- .eq(TemperingGlassInfo::getEngineerId, engineerId);
- List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);
- if (temperingGlassInfoList.size() == 0) {
- LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutId)
- .eq(BigStorageCageDetails::getEngineerId, engineerId)
- .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL);
- List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(wrapper);
+ .eq(TemperingGlassInfo::getState,Const.TEMPERING_NEW);
+ List<TemperingGlassInfo> temperingGlassInfoList=temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);
+
+ if(temperingGlassInfoList.size()==0){
+ LambdaQueryWrapper<BigStorageCageDetails> wrapper =new LambdaQueryWrapper<>();
+ wrapper.eq(BigStorageCageDetails::getTemperingLayoutId,temperingLayoutId)
+ .eq(BigStorageCageDetails::getEngineerId,engineerId)
+ .in(BigStorageCageDetails::getState,Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL);
+ List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(wrapper);
for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
) {
@@ -385,9 +385,10 @@
}
@Override
- public List<Map<String, Object>> selectTemperingGlass() {
+ public List<Map<String, Object>> selectTemperingGlass(){
QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>();
wrapper.select("engineer_id,tempering_layout_id,count(*) as count")
+ .in("state",Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL)
.groupBy("engineer_id,tempering_layout_id");
List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper);
return TemperingGlass;
--
Gitblit v1.8.0