From 1a45c6fe9ea814e432cf90c0169be9b7d991a266 Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期二, 10 十二月 2024 13:51:00 +0800 Subject: [PATCH] 1. 新增 BaseExcel.kt 和 BaseTemplate.kt 的 toObject输出到对象方法 2. 新增 BaseTemplate 是否执行的状态属性 3. 在cn.flightfeather.supervision.business.report.bean包下新增 BaseTemplateResult.kt 结果对象抽象类 以及 ProAnalysisSummaryResult.kt 和 ProDetailSummaryResult.kt 对应实现:问题整改动态跟踪和分街镇问题整改分析的中间结果对象 注:除了问题整改动态跟踪和分街镇问题整改分析其他的汇总表对象中都没有对应中间结果对象,因此这里还有报错信息 --- src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt index 8a0645f..1d418bb 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/UserMapService.kt @@ -1,12 +1,24 @@ package cn.flightfeather.supervision.lightshare.service -import cn.flightfeather.supervision.domain.ds1.entity.Version +import cn.flightfeather.supervision.domain.ds1.entity.Scense +import cn.flightfeather.supervision.domain.ds1.entity.Userinfo import cn.flightfeather.supervision.domain.ds2.entity.UserMap -import org.springframework.web.multipart.MultipartFile +import cn.flightfeather.supervision.lightshare.vo.AreaVo +import cn.flightfeather.supervision.lightshare.vo.DeviceMapVo interface UserMapService { + /** + * 鏍规嵁椋炵窘鐩戠绯荤粺涓殑鍦烘櫙id锛岃幏鍙栦笌椋炵窘鐜绯荤粺涓殑鍏宠仈鐢ㄦ埛 + */ fun getTZIdBySceneId(sceneId: String): UserMap - fun autoCreateMap() + /** + * 鏍规嵁椋炵窘鐜绯荤粺涓殑鍦烘櫙id锛岃幏鍙栦笌椋炵窘鐩戠绯荤粺涓殑鍏宠仈鐢ㄦ埛 + */ + fun getSceneByTZId(tzUserId: String): Scense? + + fun autoCreateMap(userList: List<Userinfo?>) + + fun fetchDeviceMap(page: Int?, perPage: Int?, areaVo: AreaVo): List<DeviceMapVo?> } \ No newline at end of file -- Gitblit v1.9.3