From 1ce72200c83bea66259c77bb0fce0cce1a4399ba Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期二, 17 十二月 2024 10:29:50 +0800 Subject: [PATCH] 增加上片1,2号线的数据推送 --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 34 +++++++++++++++++++++++++++++----- 1 files changed, 29 insertions(+), 5 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java index 3b1819f..21acf95 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java @@ -95,11 +95,26 @@ } @Override - public Engineering selectInitiate(Integer state) { + public Engineering selectInitiate(Integer state) { //鏌ヨ鏄惁鏈夊紑濮嬩笂鐗囩殑宸ョ▼浠诲姟 QueryWrapper<Engineering> wrapper = new QueryWrapper<>(); - wrapper.eq("state", state); + wrapper.eq("state", state) + .last("limit 1"); return engineeringMapper.selectOne(wrapper); + } + @Override + public Engineering selectInitiates(Integer state,Integer cell) { + //鏌ヨ鏄惁鏈夊紑濮嬩笂鐗囩殑宸ョ▼浠诲姟 + QueryWrapper<Engineering> wrapper = new QueryWrapper<>(); + wrapper.eq("state", state) + .eq("station_cell", cell) + .last("limit 1"); + return engineeringMapper.selectOne(wrapper); + } + + @Override + public Engineering selectUpInitiate(Integer state, Integer equipmentId) { + return null; } @Override @@ -114,9 +129,18 @@ public boolean pauseTask(String engineerId, Integer state) { //鏆傚仠姝e湪杩涜宸ョ▼ LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper()); - pauseWrapper.set(Engineering::getState,0); - pauseWrapper.eq(Engineering::getState,1); - return pauseWrapper.update(); + pauseWrapper.set(Engineering::getState, state); + pauseWrapper.eq(Engineering::getEngineerId, engineerId); + return pauseWrapper.update(); } + @Override + public boolean deleteTask(String engineerId) { + //鍒犻櫎宸ョ▼琛� + QueryWrapper<Engineering> wrapper = new QueryWrapper<>(); + wrapper.eq("engineer_id", engineerId); + return this.remove(wrapper); + } + + } -- Gitblit v1.8.0