From 1ed3cfcac9ac4b6f58e1fad678522f48e362a5e8 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Thu, 30 Nov 2023 15:53:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/epmet-heart/epmet-heart-server/pom.xml |  2 +-
 .../epmet/controller/IcPartyActivityController.java | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index 2da9097db4..a676923211 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -338,7 +338,7 @@
                 <!-- redis配置 -->
                 <spring.redis.index>5</spring.redis.index>
                 <spring.redis.host>192.168.203.30</spring.redis.host>
-                <spring.redis.port>10052</spring.redis.port>
+                <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>Elink833066</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
index 2ff977b4db..7d6ce386fd 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java
@@ -77,6 +77,19 @@ public class IcPartyActivityController {
         return new Result<PageData<IcPartyActivityDTO>>().ok(page);
     }
 
+    /**
+     * @Description: 联建活动 大屏
+     * @param formDTO:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.dto.IcPartyActivityDTO>>
+     * @Author: lichao
+     * @Date: 2023/11/30 15:53
+     */
+    @PostMapping("screen/search")
+    public Result<PageData<IcPartyActivityDTO>> pageForScreen(@RequestBody PartyActivityFormDTO formDTO){
+        PageData<IcPartyActivityDTO> page = icPartyActivityService.search(formDTO);
+        return new Result<PageData<IcPartyActivityDTO>>().ok(page);
+    }
+
     @PostMapping("detail")
     public Result<IcPartyActivityDTO> get(@RequestBody IcPartyActivityDTO dto){
         IcPartyActivityDTO data = icPartyActivityService.get(dto.getId());