From 65ae23a956a9bf581b34f891a48f21fdeaa40556 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 31 Oct 2025 11:12:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor(scenic):=20=E6=9B=BF=E6=8D=A2ScenicEnt?= =?UTF-8?q?ity=E4=B8=BAScenicV2DTO=E4=BB=A5=E4=BC=98=E5=8C=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将DeviceStatsServiceImpl中的ScenicEntity替换为ScenicV2DTO - 将FaceSampleServiceImpl中的ScenicEntity替换为ScenicV2DTO - 将TaskTaskServiceImpl中的ScenicEntity替换为ScenicV2DTO - 更新相关方法调用以使用新的DTO结构 - 确保景点名称获取逻辑保持一致 -优化数据访问层以提高性能和可维护性 --- .../ycwl/basic/service/pc/impl/DeviceStatsServiceImpl.java | 6 +++--- .../ycwl/basic/service/pc/impl/FaceSampleServiceImpl.java | 4 ++-- .../ycwl/basic/service/task/impl/TaskTaskServiceImpl.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) 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");