From d3ecca051e72a3e37cf947f63006068d19a37991 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期三, 05 六月 2024 08:54:30 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java | 37 ++++++++++++++----------------------- 1 files changed, 14 insertions(+), 23 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java index f66cf65..e5bf336 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java @@ -1,20 +1,12 @@ package com.mes.downglassinfo.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.downglassinfo.entity.DownGlassInfo; -import com.mes.downglassinfo.entity.DownGlassTask; import com.mes.downglassinfo.mapper.DownGlassInfoMapper; import com.mes.downglassinfo.service.DownGlassInfoService; -import com.mes.downglassinfo.service.DownGlassTaskService; -import com.mes.downworkstation.entity.DownWorkstation; -import com.mes.downworkstation.mapper.DownWorkstationMapper; -import com.mes.downworkstation.service.DownWorkstationService; -import com.mes.downworkstation.service.DownWorkstationTaskService; -import com.mes.tools.WebSocketServer; import org.springframework.stereotype.Service; - -import java.util.List; @Service public class DownGlassInfoServiceImpl extends ServiceImpl<DownGlassInfoMapper, DownGlassInfo> implements DownGlassInfoService { @@ -22,25 +14,24 @@ // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙� @Override public Integer getMaxSequenceByFlowCardId(String flowCardId) { - QueryWrapper<DownGlassInfo> queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("flow_card_id", flowCardId); - queryWrapper.orderByDesc("sequence"); // 鎸夌収搴忓彿鍊掑簭鎺掑簭 - queryWrapper.select("sequence").last("LIMIT 1"); // 閫夋嫨鏈�澶у簭鍙峰苟闄愬埗缁撴灉涓�1鏉¤褰� - DownGlassInfo downGlassInfo = baseMapper.selectOne(queryWrapper); - if (downGlassInfo != null) { - return downGlassInfo.getSequence(); - } - return 0; + LambdaQueryWrapper<DownGlassInfo> lambdaQueryWrapper = Wrappers.lambdaQuery(); + lambdaQueryWrapper.eq(DownGlassInfo::getFlowCardId, flowCardId) + .select(DownGlassInfo::getSequence) + .orderByDesc(DownGlassInfo::getSequence) + .last("LIMIT 1"); + + DownGlassInfo downGlassInfo = baseMapper.selectOne(lambdaQueryWrapper); + return downGlassInfo != null ? downGlassInfo.getSequence() : 0; } + @Override public void insertDownGlassInfo(DownGlassInfo downGlassInfo) { + + + baseMapper.insert(downGlassInfo); } - - - - } -- Gitblit v1.8.0