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/UserinfoService.kt | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt
index 4ff4b70..6fca31c 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt
@@ -1,13 +1,18 @@
package cn.flightfeather.supervision.lightshare.service
+import cn.flightfeather.supervision.domain.ds1.entity.Scense
import cn.flightfeather.supervision.domain.ds1.entity.Userinfo
+import cn.flightfeather.supervision.domain.ds2.entity.UserinfoTZ
+import cn.flightfeather.supervision.lightshare.vo.AreaVo
+import cn.flightfeather.supervision.lightshare.vo.DataHead
+import org.springframework.web.bind.annotation.RequestBody
interface UserinfoService {
fun findOne(id: String): Userinfo?
fun findAll(): MutableList<Userinfo>
- fun findByType(typeId: Byte): List<Userinfo>
+ fun findByType(typeId: Byte, enable: Boolean?): List<Userinfo>
fun save(userinfo: Userinfo): Int
@@ -15,11 +20,26 @@
fun delete(id: String): Int
+ /**
+ * 鏍规嵁璐︽埛鍚嶇О妯＄硦鎼滅储
+ */
+ fun search(areaVo: AreaVo, keyword: String, userType: Int?, page: Int?, perPage: Int?)
+ : Pair<DataHead, List<Userinfo?>>
+
fun findOneByName(userinfo: Userinfo): Userinfo?
fun createAccount(sceneId: String): Userinfo
fun findByScene(sceneId: String): Userinfo?
+ /**
+ * 鏍规嵁鍦烘櫙鍚嶇О锛岃幏鍙栧悎閫傜殑璐︽埛鍚�
+ */
+ fun getUName(sceneName: String): String
+
fun autoCreateAccount()
+
+ fun createAccount(scence: Scense):Userinfo
+
+ fun createAccountTZ(userinfo: Userinfo, scence: Scense): UserinfoTZ
}
\ No newline at end of file
--
Gitblit v1.9.3