From c36148d262c26e90dc487d82e3432f508417472e Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Fri, 6 Sep 2024 14:58:11 +0800
Subject: [PATCH] =?UTF-8?q?#=E8=A7=86=E9=A2=91=E8=BD=AE=E6=92=AD=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hnac/hzims/history/service/impl/HistoryDeviceServiceImpl.java | 8 ++++----
 .../station/controller/StationVideoCarouselController.java        | 5 ++---
 .../hzims/operational/station/service/VideoCarouselService.java   | 2 +-
 .../station/service/impl/VideoCarouselServiceImpl.java            | 3 +--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/history/service/impl/HistoryDeviceServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/history/service/impl/HistoryDeviceServiceImpl.java
index 68f830b..2200c88 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/history/service/impl/HistoryDeviceServiceImpl.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/history/service/impl/HistoryDeviceServiceImpl.java
@@ -212,16 +212,16 @@ public class HistoryDeviceServiceImpl implements IHistoryDeviceService {
 		// 返回结构
 		return result.getData().entrySet().stream().map(entry->{
 			HistoryDataVo history = new HistoryDataVo();
-			if("firstAttr".equals(entry.getKey())){
+			if("firstAttrId".equals(entry.getKey())){
 				history.setAttrIndex(param.getFirstAttrId());
 				history.setAttrIndexName(param.getFirstAttrName());
-			}else if("secondAttr".equals(entry.getKey())){
+			}else if("secondAttrId".equals(entry.getKey())){
 				history.setAttrIndex(param.getSecondAttrId());
 				history.setAttrIndexName(param.getSecondAttrName());
-			}else if("thirdlyAttr".equals(entry.getKey())){
+			}else if("thirdlyAttrId".equals(entry.getKey())){
 				history.setAttrIndex(param.getThirdlyAttrId());
 				history.setAttrIndexName(param.getThirdlyAttrName());
-			}else if("fourthAttr".equals(entry.getKey())){
+			}else if("fourthAttrId".equals(entry.getKey())){
 				history.setAttrIndex(param.getFourthAttrId());
 				history.setAttrIndexName(param.getFourthAttrName());
 			}else{
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoCarouselController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoCarouselController.java
index 1aa6824..d07dec1 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoCarouselController.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoCarouselController.java
@@ -34,9 +34,8 @@ public class StationVideoCarouselController extends BladeController {
     @GetMapping("/query")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "查询站点视频轮播保存记录", notes = "传入VideoRecordEntity")
-    public R query(@RequestParam("stationId") String stationId,
-                   @RequestParam("userId") String userId) {
-        return R.data(videoCarouselService.videoCarousel(stationId,userId));
+    public R query(@RequestParam("userId") String userId) {
+        return R.data(videoCarouselService.videoCarousel(userId));
     }
 
 
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/VideoCarouselService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/VideoCarouselService.java
index 543d060..5fa4115 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/VideoCarouselService.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/VideoCarouselService.java
@@ -10,5 +10,5 @@ import com.hnac.hzims.operational.station.vo.StationVideoCarouselVO;
 public interface VideoCarouselService extends IService<VideoCarouselEntity> {
     boolean submit(VideoCarouselEntity entity);
 
-    StationVideoCarouselVO videoCarousel(String stationId, String userId);
+    StationVideoCarouselVO videoCarousel(String userId);
 }
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/VideoCarouselServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/VideoCarouselServiceImpl.java
index 28423f4..ebc836e 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/VideoCarouselServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/VideoCarouselServiceImpl.java
@@ -58,12 +58,11 @@ public class VideoCarouselServiceImpl extends ServiceImpl<VideoCarouselMapper, V
 
     /**
      * 查询视频轮播保存记录
-     * @param stationId
      * @param userId
      * @return
      */
     @Override
-    public StationVideoCarouselVO videoCarousel(String stationId, String userId) {
+    public StationVideoCarouselVO videoCarousel(String userId) {
         VideoCarouselEntity videoCarousel = this.getOne(Wrappers.<VideoCarouselEntity>lambdaQuery()
                 .eq(VideoCarouselEntity::getCreateUser,userId)
         );