From beb476733eaff1f3a76ec1be772337655803cccb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 25 十月 2024 10:53:10 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java |   64 +++++++++++++++++++++++--------
 1 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
index dceb718..99dd6aa 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zy.acs.framework.common.BaseRes;
 import com.zy.acs.framework.common.Cools;
 import com.zy.acs.framework.common.SnowflakeIdWorker;
+import com.zy.acs.framework.exception.CoolException;
 import com.zy.acs.manager.common.exception.BusinessException;
 import com.zy.acs.manager.manager.entity.FuncSta;
 import com.zy.acs.manager.manager.entity.Loc;
@@ -73,9 +75,48 @@
     }
 
     @Override
+    public List<Map<String, Object>> selectStatByLastSevenDays() {
+        return this.baseMapper.selectStatByLastSevenDays();
+    }
+
+    @Override
     @Transactional
-    public void operateTaskSts(Integer taskId, Boolean finish) {
+    public Boolean complete(Long taskId, Long userId) {
         Task task = this.getById(taskId);
+        if (null == task) {
+            return Boolean.FALSE;
+        }
+        this.maintainLocSts(task, Boolean.TRUE);
+
+        task.setTaskSts(TaskStsType.COMPLETE.val());
+        task.setUpdateTime(new Date());
+        task.setUpdateBy(userId);
+        if (!this.updateById(task)) {
+            throw new CoolException(BaseRes.ERROR);
+        }
+        return Boolean.TRUE;
+    }
+
+    @Override
+    @Transactional
+    public Boolean cancel(Long taskId, Long userId) {
+        Task task = this.getById(taskId);
+        if (null == task) {
+            return Boolean.FALSE;
+        }
+        this.maintainLocSts(task, Boolean.FALSE);
+
+        task.setTaskSts(TaskStsType.CANCEL.val());
+        task.setUpdateTime(new Date());
+        task.setUpdateBy(userId);
+        if (!this.updateById(task)) {
+            throw new CoolException(BaseRes.ERROR);
+        }
+        return Boolean.TRUE;
+    }
+
+    @Transactional
+    public void maintainLocSts(Task task, Boolean complete) {
         Loc oriLoc = null; Loc destLoc = null;
         Sta oriSta = null; Sta destSta = null;
         Date now = new Date();
@@ -85,13 +126,13 @@
                 oriLoc = locService.getById(task.getOriLoc());
                 destLoc = locService.getById(task.getDestLoc());
 
-                oriLoc.setLocSts(finish?LocStsType.IDLE.val():LocStsType.STOCK.val());
+                oriLoc.setLocSts(complete?LocStsType.IDLE.val():LocStsType.STOCK.val());
                 oriLoc.setUpdateTime(now);
                 if (!locService.updateById(oriLoc)) {
                     throw new BusinessException("Loc [" + task.getOriLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
                 }
 
-                destLoc.setLocSts(finish?LocStsType.STOCK.val():LocStsType.IDLE.val());
+                destLoc.setLocSts(complete?LocStsType.STOCK.val():LocStsType.IDLE.val());
                 destLoc.setUpdateTime(now);
                 if (!locService.updateById(destLoc)) {
                     throw new BusinessException("Loc [" + task.getDestLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
@@ -99,7 +140,7 @@
                 break;
             case LOC_TO_STA:
                 oriLoc = locService.getById(task.getOriLoc());
-                oriLoc.setLocSts(finish?LocStsType.IDLE.val():LocStsType.STOCK.val());
+                oriLoc.setLocSts(complete?LocStsType.IDLE.val():LocStsType.STOCK.val());
                 oriLoc.setUpdateTime(now);
                 if (!locService.updateById(oriLoc)) {
                     throw new BusinessException("Loc [" + task.getOriLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
@@ -107,7 +148,7 @@
                 break;
             case STA_TO_LOC:
                 destLoc = locService.getById(task.getDestLoc());
-                destLoc.setLocSts(finish?LocStsType.STOCK.val():LocStsType.IDLE.val());
+                destLoc.setLocSts(complete?LocStsType.STOCK.val():LocStsType.IDLE.val());
                 destLoc.setUpdateTime(now);
                 if (!locService.updateById(destLoc)) {
                     throw new BusinessException("Loc [" + task.getDestLoc$() + "] 搴撲綅淇敼鐘舵�佸け璐� 锛侊紒锛�");
@@ -118,7 +159,7 @@
             case TO_CHARGE:
             case TO_STANDBY:
                 FuncSta funcSta = funcStaService.getByCodeAndType(task.getDestCode(), FuncStaType.query(typeType).toString());
-                if (!finish) {
+                if (!complete) {
                     funcSta.setState(FuncStaStateType.IDLE.toString());
                     funcSta.setUpdateTime(now);
                     if (!funcStaService.updateById(funcSta)) {
@@ -129,17 +170,6 @@
             default:
                 break;
         }
-        task.setTaskSts(TaskStsType.COMPLETE.val());
-        task.setUpdateTime(now);
-        if (!this.updateById(task)) {
-            throw new BusinessException(task.getSeqNum() + "浠诲姟鏇存柊鐘舵�佸け璐�");
-        }
     }
-
-    @Override
-    public List<Map<String, Object>> selectStatByLastSevenDays() {
-        return this.baseMapper.selectStatByLastSevenDays();
-    }
-
 
 }

--
Gitblit v1.9.1