diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/DeviceStatsServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/DeviceStatsServiceImpl.java index b4ee0e71..8933e417 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/DeviceStatsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/DeviceStatsServiceImpl.java @@ -3,7 +3,7 @@ package com.ycwl.basic.service.pc.impl; import cn.hutool.core.date.DateUtil; import com.ycwl.basic.mapper.ScenicDeviceStatsMapper; import com.ycwl.basic.model.pc.device.entity.DeviceEntity; -import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity; +import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO; import com.ycwl.basic.model.pc.scenicDeviceStats.resp.ScenicDeviceStatsListResp; import com.ycwl.basic.model.pc.scenicDeviceStats.resp.ScenicDeviceStatsResp; import com.ycwl.basic.repository.DeviceRepository; @@ -39,7 +39,7 @@ public class DeviceStatsServiceImpl implements DeviceStatsService { resp.setRealtime(true); List data = mapper.countRealtimeStatsByScenicId(scenicId, start, end); data.forEach(item -> { - ScenicEntity scenic = scenicRepository.getScenic(item.getScenicId()); + ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId()); if (scenic != null) { item.setScenicName(scenic.getName()); } @@ -53,7 +53,7 @@ public class DeviceStatsServiceImpl implements DeviceStatsService { resp.setRealtime(false); List data = mapper.countCachedStatsByScenicId(scenicId, start, end); data.forEach(item -> { - ScenicEntity scenic = scenicRepository.getScenic(item.getScenicId()); + ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId()); if (scenic != null) { item.setScenicName(scenic.getName()); } diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/FaceSampleServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/FaceSampleServiceImpl.java index ea418f87..9fa45860 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/FaceSampleServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/FaceSampleServiceImpl.java @@ -7,7 +7,7 @@ import com.ycwl.basic.model.pc.device.entity.DeviceEntity; import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity; import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery; import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; -import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity; +import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO; import com.ycwl.basic.repository.DeviceRepository; import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.service.pc.FaceSampleService; @@ -36,7 +36,7 @@ public class FaceSampleServiceImpl implements FaceSampleService { PageHelper.startPage(faceSampleReqQuery.getPageNum(),faceSampleReqQuery.getPageSize()); List list = faceSampleMapper.list(faceSampleReqQuery); list.forEach(item -> { - ScenicEntity scenic = scenicRepository.getScenic(item.getScenicId()); + ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId()); if (scenic != null) { item.setScenicName(scenic.getName()); } diff --git a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java index e6735fdb..966946b1 100644 --- a/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java @@ -28,7 +28,7 @@ import com.ycwl.basic.model.pc.member.resp.MemberRespVO; import com.ycwl.basic.model.pc.mp.MpConfigEntity; import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity; import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; -import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity; +import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO; import com.ycwl.basic.model.pc.source.entity.SourceEntity; import com.ycwl.basic.model.pc.task.entity.TaskEntity; import com.ycwl.basic.model.pc.task.req.TaskReqQuery; @@ -643,7 +643,7 @@ public class TaskTaskServiceImpl implements TaskService { return; } - ScenicEntity scenic = scenicRepository.getScenic(item.getScenicId()); + ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId()); ScenicConfigManager configManager = scenicRepository.getScenicConfigManager(item.getScenicId()); String configTitle = configManager.getString("first_notification_title"); String configContent = configManager.getString("first_notification_content");