From 4e20a1aaaba1bb843820fca844c20055a33febce Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 19 七月 2024 17:39:19 +0800
Subject: [PATCH] 1. 新增webSocket相关功能
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt
index 37f67a2..96d689b 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt
@@ -431,6 +431,7 @@
if (!bool){
daytaskVo.runingstatus = Constant.TaskProgress.RUNINGSTATUS3.text
}
+
}
//涓よ�呯姸鎬佺浉鍚屾椂涓嶅仛淇敼锛屽叾浣欐儏鍐垫棩浠诲姟閮戒负姝ｅ湪鎵ц
else if (subtask.status != daytaskVo.runingstatus){
@@ -442,30 +443,6 @@
//****************************************************************************************
subtaskMapper.updateByPrimaryKeySelective(subtask)
}
-
- //鍒ゆ柇瀵瑰簲椤跺眰浠诲姟鐨勬墽琛岀姸鎬�
-// val daytaskVolist = taskService.getDayTaskByTaskID(toptaskVo.tguid!!)
-// val iterator: Iterator<TaskVo> = daytaskVolist.iterator()
-// if (daytaskVo.runingstatus == Constant.TaskProgress.RUNINGSTATUS3.text
-// && toptaskVo.runingstatus == Constant.TaskProgress.RUNINGSTATUS2.text) {
-// var bool = false
-// while (iterator.hasNext()) {
-// val tmp = iterator.next()
-// if (tmp.runingstatus != Constant.TaskProgress.RUNINGSTATUS3.text) {
-// bool = true
-// break
-// }
-// }
-// if (!bool){
-// toptaskVo.runingstatus = Constant.TaskProgress.RUNINGSTATUS3.text
-// }
-// }
-// else if (daytaskVo.runingstatus != toptaskVo.runingstatus){
-// toptaskVo.runingstatus = Constant.TaskProgress.RUNINGSTATUS2.text
-// }
-// val toptask = Task()
-// BeanUtils.copyProperties(toptaskVo, toptask)
-// taskMapper.updateByPrimaryKeySelective(toptask)
//瀵瑰凡缁撴潫鐨勫瓙浠诲姟杩涜鑷姩璇勫垎
if (subtask.status == Constant.TaskProgress.RUNINGSTATUS3.text) {
--
Gitblit v1.9.3