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/impl/DeviceServiceImpl.kt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DeviceServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DeviceServiceImpl.kt index 619c65d..9dea773 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DeviceServiceImpl.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/DeviceServiceImpl.kt @@ -8,6 +8,9 @@ import cn.flightfeather.supervision.domain.ds1.entity.* import cn.flightfeather.supervision.domain.ds1.repository.DeviceRep import cn.flightfeather.supervision.lightshare.service.DeviceService +import cn.flightfeather.supervision.lightshare.vo.AreaVo +import cn.flightfeather.supervision.lightshare.vo.DataHead +import cn.flightfeather.supervision.lightshare.vo.MonitorDeviceInfoVo import com.google.gson.Gson import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Service @@ -112,4 +115,10 @@ obj.dlPicUrl = oldImg.joinToString(";") return deviceRep.updateStatus(obj) } + + override fun searchExternalDevice( + areaVo: AreaVo, keyword: String, page: Int?, perPage: Int?, + ): Pair<DataHead, MonitorDeviceInfoVo> { + TODO("Not yet implemented") + } } \ No newline at end of file -- Gitblit v1.9.3