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/DeviceService.kt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DeviceService.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DeviceService.kt index fceaf90..096e42a 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DeviceService.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/DeviceService.kt @@ -3,6 +3,11 @@ import cn.flightfeather.supervision.common.utils.Constant import cn.flightfeather.supervision.domain.ds1.entity.BaseDevice import cn.flightfeather.supervision.domain.ds1.entity.DeviceStatus +import cn.flightfeather.supervision.lightshare.vo.AreaVo +import cn.flightfeather.supervision.lightshare.vo.DataHead +import cn.flightfeather.supervision.lightshare.vo.MonitorDeviceInfoVo +import io.swagger.annotations.ApiParam +import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.multipart.MultipartFile interface DeviceService { @@ -39,4 +44,8 @@ *鏇存柊璁惧鍙婂浘鐗� */ fun updateDeviceLocation(deviceLocation: String, deleteImg: List<String>, files: Array<MultipartFile>): Int + + fun searchExternalDevice( + areaVo: AreaVo, keyword: String, page: Int?, perPage: Int?, + ): Pair<DataHead, MonitorDeviceInfoVo> } \ No newline at end of file -- Gitblit v1.9.3