q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(scenic): 替换ScenicEntity为ScenicV2DTO以优化数据访问

Browse Source 
- 将DeviceStatsServiceImpl中的ScenicEntity替换为ScenicV2DTO
- 将FaceSampleServiceImpl中的ScenicEntity替换为ScenicV2DTO
- 将TaskTaskServiceImpl中的ScenicEntity替换为ScenicV2DTO
- 更新相关方法调用以使用新的DTO结构
- 确保景点名称获取逻辑保持一致
-优化数据访问层以提高性能和可维护性
This commit is contained in:
Jerry Yan
2025-10-31 11:12:38 +08:00
parent b9ade63e8e
commit 65ae23a956
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ycwl/basic/service/pc/impl/DeviceStatsServiceImpl.java
View File

@@ -3,7 +3,7 @@ package com.ycwl.basic.service.pc.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.ycwl.basic.mapper.ScenicDeviceStatsMapper; import com.ycwl.basic.mapper.ScenicDeviceStatsMapper;
import com.ycwl.basic.model.pc.device.entity.DeviceEntity; 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.ScenicDeviceStatsListResp;
import com.ycwl.basic.model.pc.scenicDeviceStats.resp.ScenicDeviceStatsResp; import com.ycwl.basic.model.pc.scenicDeviceStats.resp.ScenicDeviceStatsResp;
import com.ycwl.basic.repository.DeviceRepository; import com.ycwl.basic.repository.DeviceRepository;
@@ -39,7 +39,7 @@ public class DeviceStatsServiceImpl implements DeviceStatsService {
resp.setRealtime(true); resp.setRealtime(true);
List<ScenicDeviceStatsResp> data = mapper.countRealtimeStatsByScenicId(scenicId, start, end); List<ScenicDeviceStatsResp> data = mapper.countRealtimeStatsByScenicId(scenicId, start, end);
data.forEach(item -> { data.forEach(item -> {
ScenicEntity scenic = scenicRepository.getScenic(item.getScenicId()); ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId());
if (scenic != null) { if (scenic != null) {
item.setScenicName(scenic.getName()); item.setScenicName(scenic.getName());
} }
@@ -53,7 +53,7 @@ public class DeviceStatsServiceImpl implements DeviceStatsService {
resp.setRealtime(false); resp.setRealtime(false);
List<ScenicDeviceStatsResp> data = mapper.countCachedStatsByScenicId(scenicId, start, end); List<ScenicDeviceStatsResp> data = mapper.countCachedStatsByScenicId(scenicId, start, end);
data.forEach(item -> { data.forEach(item -> {
ScenicEntity scenic = scenicRepository.getScenic(item.getScenicId()); ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId());
if (scenic != null) { if (scenic != null) {
item.setScenicName(scenic.getName()); item.setScenicName(scenic.getName());
} }

4
src/main/java/com/ycwl/basic/service/pc/impl/FaceSampleServiceImpl.java
View File

@@ -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.entity.FaceSampleEntity;
import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery; import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery;
import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO; 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.DeviceRepository;
import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.repository.ScenicRepository;
import com.ycwl.basic.service.pc.FaceSampleService; import com.ycwl.basic.service.pc.FaceSampleService;
@@ -36,7 +36,7 @@ public class FaceSampleServiceImpl implements FaceSampleService {
PageHelper.startPage(faceSampleReqQuery.getPageNum(),faceSampleReqQuery.getPageSize()); PageHelper.startPage(faceSampleReqQuery.getPageNum(),faceSampleReqQuery.getPageSize());
List<FaceSampleRespVO> list = faceSampleMapper.list(faceSampleReqQuery); List<FaceSampleRespVO> list = faceSampleMapper.list(faceSampleReqQuery);
list.forEach(item -> { list.forEach(item -> {
ScenicEntity scenic = scenicRepository.getScenic(item.getScenicId()); ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId());
if (scenic != null) { if (scenic != null) {
item.setScenicName(scenic.getName()); item.setScenicName(scenic.getName());
} }

4
src/main/java/com/ycwl/basic/service/task/impl/TaskTaskServiceImpl.java
View File

@@ -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.mp.MpConfigEntity;
import com.ycwl.basic.model.pc.renderWorker.entity.RenderWorkerEntity; 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.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.source.entity.SourceEntity;
import com.ycwl.basic.model.pc.task.entity.TaskEntity; import com.ycwl.basic.model.pc.task.entity.TaskEntity;
import com.ycwl.basic.model.pc.task.req.TaskReqQuery; import com.ycwl.basic.model.pc.task.req.TaskReqQuery;
@@ -643,7 +643,7 @@ public class TaskTaskServiceImpl implements TaskService {
return; return;
} }
ScenicEntity scenic = scenicRepository.getScenic(item.getScenicId()); ScenicV2DTO scenic = scenicRepository.getScenicBasic(item.getScenicId());
ScenicConfigManager configManager = scenicRepository.getScenicConfigManager(item.getScenicId()); ScenicConfigManager configManager = scenicRepository.getScenicConfigManager(item.getScenicId());
String configTitle = configManager.getString("first_notification_title"); String configTitle = configManager.getString("first_notification_title");
String configContent = configManager.getString("first_notification_content"); String configContent = configManager.getString("first_notification_content");