From c28efbbb9c8266ca47a37289dcf20e455a987be2 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 8 Sep 2025 14:37:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(profitsharing,=20mobile,=20pc):=20?=
 =?UTF-8?q?=E4=B8=BA=E5=AF=B9=E8=B1=A1=E6=B7=BB=E5=8A=A0=E6=99=AF=E5=8C=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ProfitSharingConfigController 中，为分页查询结果添加景区名称信息
- 在 AppScenicServiceImpl 中，为额外设备列表添加景区名称信息
- 在 SourceServiceImpl 中，为资源响应对象添加景区名称信息

这些修改增强了对象数据，使其包含相关的景区名称，提高了数据的完整性和可读性。
---
 .../controller/ProfitSharingConfigController.java   | 13 +++++++++++++
 .../service/mobile/impl/AppScenicServiceImpl.java   |  2 ++
 .../basic/service/pc/impl/SourceServiceImpl.java    |  7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/src/main/java/com/ycwl/basic/profitsharing/controller/ProfitSharingConfigController.java b/src/main/java/com/ycwl/basic/profitsharing/controller/ProfitSharingConfigController.java
index bc0bcce..7652a00 100644
--- a/src/main/java/com/ycwl/basic/profitsharing/controller/ProfitSharingConfigController.java
+++ b/src/main/java/com/ycwl/basic/profitsharing/controller/ProfitSharingConfigController.java
@@ -2,12 +2,14 @@ package com.ycwl.basic.profitsharing.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO;
 import com.ycwl.basic.profitsharing.dto.ProfitSharingConfigReqQuery;
 import com.ycwl.basic.profitsharing.dto.ProfitSharingConfigVO;
 import com.ycwl.basic.profitsharing.entity.ProfitSharingConfig;
 import com.ycwl.basic.profitsharing.entity.ProfitSharingUser;
 import com.ycwl.basic.profitsharing.mapper.ProfitSharingConfigMapper;
 import com.ycwl.basic.profitsharing.mapper.ProfitSharingUserMapper;
+import com.ycwl.basic.repository.ScenicRepository;
 import com.ycwl.basic.utils.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,11 +26,22 @@ public class ProfitSharingConfigController {
     private ProfitSharingConfigMapper configMapper;
     @Autowired
     private ProfitSharingUserMapper userMapper;
+    @Autowired
+    private ScenicRepository scenicRepository;
+
     // 新增: 分页查询接口
     @PostMapping("/page")
     public ApiResponse<PageInfo<ProfitSharingConfigVO>> pageQuery(@RequestBody ProfitSharingConfigReqQuery req) {
         PageHelper.startPage(req.getPageNum(), req.getPageSize());
         List<ProfitSharingConfigVO> list = configMapper.list(req);
+        list.forEach(item -> {
+            try {
+                ScenicV2DTO scenicBasic = scenicRepository.getScenicBasic(item.getScenicId());
+                item.setScenicName(scenicBasic.getName());
+            } catch (Exception e) {
+                item.setScenicName("");
+            }
+        });
         PageInfo<ProfitSharingConfigVO> pageInfo = new PageInfo<>(list);
         return ApiResponse.success(pageInfo);
     }
diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java
index c608723..d85165b 100644
--- a/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java
@@ -306,6 +306,8 @@ public class AppScenicServiceImpl implements AppScenicService {
         }
         List<DeviceRespVO> extraDeviceList = extraDeviceMapper.listExtraDeviceByScenicId(scenicId);
         for (DeviceRespVO deviceRespVO : extraDeviceList) {
+            ScenicV2DTO scenicBasic = scenicRepository.getScenicBasic(deviceRespVO.getScenicId());
+            deviceRespVO.setScenicName(scenicBasic.getName());
             if (redisTemplate.hasKey("ext_device:online:"+deviceRespVO.getNo())) {
                 String onlineTs = redisTemplate.opsForValue().get("ext_device:online:"+deviceRespVO.getNo());
                 if (!StringUtils.isNumeric(onlineTs)) {
diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java
index 3910bc6..d5adf26 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java
@@ -3,6 +3,7 @@ package com.ycwl.basic.service.pc.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ycwl.basic.exception.BaseException;
+import com.ycwl.basic.integration.scenic.dto.scenic.ScenicV2DTO;
 import com.ycwl.basic.mapper.SourceMapper;
 import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
 import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity;
@@ -161,6 +162,12 @@ public class SourceServiceImpl implements SourceService {
                 sourceRespVO.setVideoUrl(sourceRespVO.getVideoUrl());
             }
         }
+        try {
+            ScenicV2DTO scenicBasic = scenicRepository.getScenicBasic(sourceRespVO.getScenicId());
+            sourceRespVO.setScenicName(scenicBasic.getName());
+        } catch (Exception e) {
+            sourceRespVO.setScenicName("");
+        }
         return ApiResponse.success(sourceRespVO);
     }