From b212ef0208cb094f63ea8a239a1361f8e859c839 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 08 七月 2024 17:40:39 +0800
Subject: [PATCH] 2024.7.8
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/SubtaskServiceImpl.kt | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 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 dafb0c5..37f67a2 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
@@ -7,6 +7,7 @@
import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.common.utils.DateUtil
import cn.flightfeather.supervision.common.utils.UUIDGenerator
+import cn.flightfeather.supervision.domain.ds1.repository.SubTaskRep
import cn.flightfeather.supervision.domain.ds1.repository.TaskRep
import cn.flightfeather.supervision.lightshare.service.SubtaskService
import cn.flightfeather.supervision.lightshare.service.TaskService
@@ -27,6 +28,7 @@
private val subtaskMapper: SubtaskMapper,
private val aopEvaluation: AopEvaluation,
private val taskRep: TaskRep,
+ private val subTaskRep: SubTaskRep,
) : SubtaskService {
val dateUtil = DateUtil()
@@ -393,7 +395,7 @@
// //鏍规嵁鏃ユ湡鑾峰彇鏃ヤ换鍔�
// val daytaskVo = taskService.findByDate(dateUtil.getDate(subtask.planstarttime)!!)
- //2019.3.1 by Riku 搴旇鐩存帴鏍规嵁瀛愪换鍔＄殑鏃ヤ换鍔d鏌ヨ鏃ヤ换鍔�
+ //搴旇鐩存帴鏍规嵁瀛愪换鍔＄殑鏃ヤ换鍔d鏌ヨ鏃ヤ换鍔�
val daytaskVo = taskService.findByID(subtask.tsguid!!)
//鍒ゆ柇鏄惁鏈夋棩浠诲姟
@@ -442,28 +444,28 @@
}
//鍒ゆ柇瀵瑰簲椤跺眰浠诲姟鐨勬墽琛岀姸鎬�
- 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)
+// 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) {
@@ -946,8 +948,8 @@
return subtaskMapper.getSummary(topTaskId, sceneTypeId)
}
- override fun getSummaryByArea(areaVo: AreaVo): List<TaskProgressVo> {
- areaVo.scensetypeid ?: throw BizException("缂哄皯鍦烘櫙绫诲瀷鍙傛暟")
+ override fun getTaskProgressByArea(areaVo: AreaVo): List<TaskProgressVo> {
+// areaVo.scensetypeid ?: throw BizException("缂哄皯鍦烘櫙绫诲瀷鍙傛暟")
val res = mutableListOf<TaskProgressVo>()
taskRep.findTasks(areaVo).forEach {t->
if (t?.tguid == null) return@forEach
@@ -973,4 +975,8 @@
override fun getByScene(sceneId: String, startTime: LocalDateTime?, endTime: LocalDateTime?): List<SubTaskSummary> {
return subtaskMapper.getSummaryByScene(sceneId, startTime, endTime)
}
+
+ override fun getSummaryByArea(areaVo: AreaVo): List<SubTaskSummary> {
+ return subTaskRep.findSummary(areaVo)
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3