From e18062feb4097017d21ab9c87728020a0043742b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 17 十二月 2024 11:00:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 d3c02f3..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);
- return this.getOne(wrapper);
+ 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) {
//鏆傚仠姝ｅ湪杩涜宸ョ▼
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