From d6e48b72f0b7afd70205d6e88b3f336264891cc3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 九月 2024 14:11:53 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java |   59 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 44 insertions(+), 15 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 7e5a71f..2e9a36d 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
@@ -1,17 +1,22 @@
 package com.zy.acs.manager.manager.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 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.*;
+import com.zy.acs.manager.manager.entity.FuncSta;
+import com.zy.acs.manager.manager.entity.Loc;
+import com.zy.acs.manager.manager.entity.Sta;
+import com.zy.acs.manager.manager.entity.Task;
 import com.zy.acs.manager.manager.enums.*;
 import com.zy.acs.manager.manager.mapper.TaskMapper;
 import com.zy.acs.manager.manager.service.CodeService;
 import com.zy.acs.manager.manager.service.FuncStaService;
 import com.zy.acs.manager.manager.service.LocService;
 import com.zy.acs.manager.manager.service.TaskService;
-import com.zy.acs.framework.common.Cools;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,20 +34,12 @@
     private LocService locService;
     @Autowired
     private FuncStaService funcStaService;
+    @Autowired
+    private SnowflakeIdWorker snowflakeIdWorker;
 
     @Override
-    public void buildActionList(Task task) {
-        List<String> codeList = JSONArray.parseArray(task.getPhase(), String.class);
-        if (Cools.isEmpty(codeList)) {
-            throw new BusinessException(task.getSeqNum() + "浠诲姟瑙f瀽姝ラ澶辫触");
-        }
-        for (String data : codeList) {
-            Code code = codeService.selectByData(data);
-
-
-        }
-
-
+    public synchronized String generateSeqNum() {
+        return String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19);
     }
 
     @Override
@@ -146,5 +143,37 @@
         return this.baseMapper.selectStatByLastSevenDays();
     }
 
+    @Override
+    public Boolean complete(Long taskId, Long userId) {
+        Task task = this.getById(taskId);
+        if (null == task) {
+            return Boolean.FALSE;
+        }
+
+        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
+    public Boolean cancel(Long taskId, Long userId) {
+        Task task = this.getById(taskId);
+        if (null == task) {
+            return 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;
+    }
+
 
 }

--
Gitblit v1.9.1