From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期二, 17 十二月 2024 11:41:00 +0800 Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt | 14 +++++++++++++- 1 files changed, 13 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 df41591..6fca31c 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserinfoService.kt @@ -3,13 +3,16 @@ 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 @@ -17,12 +20,21 @@ 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() -- Gitblit v1.9.3