From 52a0c16de9b0955a5f092560b73f16e41684f97b Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期二, 31 十二月 2024 10:13:35 +0800 Subject: [PATCH] 1. 环信码生成时,如果在线场景当期没有评估(未巡查)结果,则延用历史最新一次的结果; 2. 新增跨时间跨月度的历史整改记录查询逻辑 3. 优化获取顶层任务和日任务的获取逻辑 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/BgTaskServiceImpl.kt | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/BgTaskServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/BgTaskServiceImpl.kt index 613e021..99db03a 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/BgTaskServiceImpl.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/BgTaskServiceImpl.kt @@ -1,5 +1,6 @@ package cn.flightfeather.supervision.lightshare.service.impl +import cn.flightfeather.supervision.common.exception.BizException import cn.flightfeather.supervision.common.executor.BackgroundTaskCtrl import cn.flightfeather.supervision.common.executor.BgTaskConditionVo import cn.flightfeather.supervision.common.executor.BgTaskStatus @@ -15,21 +16,21 @@ } override fun startTask(condition: BgTaskConditionVo): BgTaskStatus? { - condition.type ?: throw IllegalStateException("浠诲姟绫诲瀷涓嶈兘涓虹┖") - condition.id ?: throw IllegalStateException("浠诲姟id涓嶈兘涓虹┖") + condition.type ?: throw BizException("浠诲姟绫诲瀷涓嶈兘涓虹┖") + condition.id ?: throw BizException("浠诲姟id涓嶈兘涓虹┖") val task = backgroundTaskCtrl.startTask(condition.type!!, condition.id!!) return task.taskStatus } override fun shutDownTask(condition: BgTaskConditionVo): List<BgTaskStatus?> { - condition.type ?: throw IllegalStateException("浠诲姟绫诲瀷涓嶈兘涓虹┖") + condition.type ?: throw BizException("浠诲姟绫诲瀷涓嶈兘涓虹┖") return backgroundTaskCtrl.shutDownTask(condition.type!!, condition.id) } override fun removeTask(condition: BgTaskConditionVo): Boolean { - condition.type ?: throw IllegalStateException("浠诲姟绫诲瀷涓嶈兘涓虹┖") - condition.id ?: throw IllegalStateException("浠诲姟id涓嶈兘涓虹┖") + condition.type ?: throw BizException("浠诲姟绫诲瀷涓嶈兘涓虹┖") + condition.id ?: throw BizException("浠诲姟id涓嶈兘涓虹┖") return backgroundTaskCtrl.removeTask(condition.type!!, condition.id!!) } -- Gitblit v1.9.3