From 6904763f0e74d9a9fa4dbc39f635d2aee39416c6 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 30 九月 2025 09:34:22 +0800
Subject: [PATCH] 2025.9.30

---
 src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 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 0d7b9c4..9405863 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt
@@ -2,24 +2,28 @@
 
 import cn.flightfeather.supervision.domain.entity.Userinfo
 import cn.flightfeather.supervision.lightshare.vo.*
+import org.apache.poi.hssf.usermodel.HSSFWorkbook
 import org.springframework.web.multipart.MultipartFile
 import javax.servlet.http.HttpServletResponse
 
 interface UserinfoService {
     fun findOne(id: String): Userinfo
 
-    fun findAll(): MutableList<Userinfo>
+    fun findAll(): MutableList<Userinfo?>
 
-    fun save(userinfo: Userinfo): Int
+    fun save(userinfo: Userinfo): BaseResponse<Int>
 
-    fun update(userinfo: Userinfo): Int
+    fun save2(info: UserBaseInfo): BaseResponse<Int>
+
+    fun resetPassword(userId: String):BaseResponse<Boolean>
+
+    fun update(userinfo: Userinfo): BaseResponse<Int>
 
     fun delete(id: String): Int
 
     fun findOneByName(userinfo: Userinfo): Userinfo
 
     fun login(loginRequestVo: LoginRequestVo): AccessToken
-
 
     fun register(loginRequestVo: LoginRequestVo): AccessToken
 
@@ -29,12 +33,21 @@
 
     fun upLoadAccountPic(userId: String, files: Array<MultipartFile>): String
 
-    fun changePassword(userId: String, oldPassword: String, newPassword: String): Int
+    fun changePassword(userId: String, oldPassword: String, newPassword: String): BaseResponse<String>
 
-    fun searchUser(userId: String,condition: UserSearchCondition, page: Int, perPage: Int, response: HttpServletResponse): List<Userinfo>
+    fun searchUser(
+        userId: String, condition: UserSearchCondition, page: Int, perPage: Int,
+        response:
+        HttpServletResponse,
+    ): List<Userinfo?>
 
-    fun getBaseInfo(userId: String): UserBaseInfo
+    fun getBaseInfo(userId: String, wxUserId: String?): UserBaseInfo
 
-    fun search(district: String?, sceneType: Int?, userType: Int?, page: Int, perPage: Int): BaseResponse<List<Userinfo>>
+    fun search(district: String?, sceneType: Int?, userType: Int?, page: Int, perPage: Int):
+            BaseResponse<List<Userinfo?>>
+
+    fun getSceneCount(userId: String, condition: UserSearchCondition): BaseResponse<Triple<Int, Int, Int>>
+
+    fun createUsers(workbook: HSSFWorkbook)
 
 }
\ No newline at end of file

--
Gitblit v1.9.3