From 4644a64be87033d1569e43cc672ed9c777eae43b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 18 二月 2025 14:49:17 +0800
Subject: [PATCH] 添加架子复位接口与定时任务

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java |   85 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
index 968cd59..16a72bf 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -1,11 +1,12 @@
 package com.mes.engineering.service.impl;
+
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mes.engineering.entity.Engineering;
 import com.mes.engineering.mapper.EngineeringMapper;
 import com.mes.engineering.service.EngineeringService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mes.pp.entity.OptimizeProject;
 import com.mes.pp.mapper.OptimizeProjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -25,18 +26,28 @@
  */
 @Service
 @Slf4j
+
 public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engineering> implements EngineeringService {
 
     @Autowired
     OptimizeProjectMapper optimizeProjectMapper;
+    @Autowired
+    private EngineeringMapper engineeringMapper;
+
     //寮�濮�/鏆傚仠浠诲姟
     @Override
     public  boolean  changeTask(String projectId, Integer state) {
-        //浣跨敤projectId浣滀负鏉′欢淇敼state瀛楁
+        //鏆傚仠姝ｅ湪杩涜宸ョ▼
+//        LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
+//        pauseWrapper.set(Engineering::getState,0);
+//        pauseWrapper.eq(Engineering::getState,1);
+//        boolean pause = pauseWrapper.update();
+        //浣跨敤projectId浣滀负鏉′欢寮�濮嬪伐绋�
         LambdaUpdateChainWrapper<Engineering> wrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
         wrapper.set(Engineering::getState,state);
         wrapper.eq(Engineering::getEngineerId,projectId);
-        return  wrapper.update();
+        boolean pause = wrapper.update();
+        return pause;
     }
 
     @Override
@@ -79,17 +90,75 @@
     }
 
     @Override
-    public void saveEngineering(List<Engineering> engineerings) {
-        this.saveBatch(engineerings);
+    public void saveEngineering(List<Engineering> engineering) {
+        this.saveBatch(engineering);
         //淇濆瓨閽㈠寲宸ョ▼淇℃伅
     }
 
     @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
+    @DS("northGlassMes")
+    public List<Engineering> selectTask() {
+        //鏌ヨ鍙紑濮嬩换鍔＄殑宸ョ▼
+        QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
+//        wrapper.eq("state", 0);
+        return engineeringMapper.selectList(wrapper);
+    }
+
+    @Override
+    public boolean pauseTask(String engineerId, Integer state) {
+        //鏆傚仠姝ｅ湪杩涜宸ョ▼
+        LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
+        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);
+    }
+
+    @Override
+    public boolean changeTasks(Engineering engineering) {
+        //鏆傚仠姝ｅ湪杩涜宸ョ▼
+        LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
+        pauseWrapper.set(Engineering::getState,0);
+        pauseWrapper.eq(Engineering::getState,1);
+        pauseWrapper.eq(Engineering::getStationCell,engineering.getStationCell());
+        pauseWrapper.update();
+
+        LambdaUpdateChainWrapper<Engineering> wrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
+        wrapper.set(Engineering::getState,engineering.getState());
+        wrapper.set(Engineering::getStationCell,engineering.getStationCell());
+        wrapper.eq(Engineering::getEngineerId,engineering.getEngineerId());
+        return wrapper.update();
+    }
+
 
 }

--
Gitblit v1.8.0