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/domain/ds1/repository/TaskRep.kt | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt
index 8dba496..21133a7 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/domain/ds1/repository/TaskRep.kt
@@ -1,19 +1,21 @@
package cn.flightfeather.supervision.domain.ds1.repository
+import cn.flightfeather.supervision.domain.ds1.entity.Monitorobjectversion
import cn.flightfeather.supervision.domain.ds1.entity.Task
+import cn.flightfeather.supervision.domain.ds1.mapper.MonitorobjectversionMapper
import cn.flightfeather.supervision.domain.ds1.mapper.TaskMapper
import cn.flightfeather.supervision.lightshare.vo.AreaVo
import org.springframework.stereotype.Repository
-import java.time.LocalDate
+import tk.mybatis.mapper.entity.Example
import java.time.ZoneId
import java.util.*
@Repository
-class TaskRep(private val taskMapper: TaskMapper) {
+class TaskRep(private val taskMapper: TaskMapper, private val monitorobjectversionMapper: MonitorobjectversionMapper) {
private fun exampleTask(areaVo: AreaVo): Task?{
areaVo.starttime ?: return null
- val mStart = LocalDate.parse(areaVo.starttime).withDayOfMonth(1).atStartOfDay()
+ val mStart = areaVo.starttime!!.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0)
val mEnd = mStart.plusMonths(1).minusSeconds(1)
return Task().apply {
provincecode = areaVo.provincecode
@@ -23,6 +25,11 @@
endtime = Date.from(mEnd.atZone(ZoneId.systemDefault()).toInstant())
}
}
+
+ fun update(task: Task): Int {
+ return taskMapper.updateByPrimaryKeySelective(task)
+ }
+
/**
* 鏌ユ壘涓�涓�讳换鍔�
*/
@@ -35,4 +42,27 @@
val example = exampleTask(areaVo) ?: return emptyList()
return taskMapper.select(example)
}
+
+ fun findTasks(task: Task): List<Task?> {
+ return taskMapper.select(task)
+ }
+
+ /**
+ * 鑾峰彇鎬讳换鍔″搴旂殑鐩戠鐗堟湰
+ */
+ fun findMonitorList(taskId: String, sceneTypeId:String?): List<Monitorobjectversion> {
+ val monitorList = monitorobjectversionMapper.findMonitorListByScene(taskId, sceneTypeId)
+ return monitorList.sortedBy { it.displayid }
+ }
+
+ /**
+ * 鑾峰彇鏃ヤ换鍔�
+ * @param taskId 椤跺眰浠诲姟id
+ */
+ fun findDayTasks(taskId: String?): List<Task?> {
+ return taskMapper.selectByExample(Example(Task::class.java).apply {
+ createCriteria().andEqualTo("tsguid", taskId)
+ orderBy("starttime").desc()
+ })
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3