From 18d27e892cfcf7ffd11f076a1f8ba9fc896fc145 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 25 May 2020 15:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=AE=89=E6=A6=86=E5=B1=B1=E4=B8=8Aba?=
 =?UTF-8?q?nner=E6=97=B6=E5=A4=84=E7=90=86position=E5=92=8Ccategory?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-news/pom.xml                       | 20 +++++++++----------
 .../elink/esua/epdc/entity/BannerEntity.java  |  5 +++++
 .../epdc/service/impl/BannerServiceImpl.java  |  1 +
 .../epdc/service/impl/NewsServiceImpl.java    |  4 +++-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/epdc-cloud-news/pom.xml b/epdc-cloud-news/pom.xml
index d501eae..c87f31b 100644
--- a/epdc-cloud-news/pom.xml
+++ b/epdc-cloud-news/pom.xml
@@ -31,10 +31,10 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+<!--        </dependency>-->
 
         <!--RocketMQ-->
         <dependency>
@@ -132,20 +132,20 @@
                 <server.port>9064</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.host>114.215.125.123</spring.redis.host>
+                <spring.redis.port>9603</spring.redis.port>
+                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
+                <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
-                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
+                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
diff --git a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java
index 92a1bda..adcbe29 100644
--- a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java
+++ b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/entity/BannerEntity.java
@@ -58,6 +58,11 @@ public class BannerEntity extends BaseEpdcEntity {
      */
     private String bannerType;
 
+    /**
+     * 新闻类别ID
+     */
+    private String newsCategory;
+
     /**
      * 上下架状态(0-下架，1-上架)
      */
diff --git a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java
index aa28a47..5741b05 100644
--- a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java
+++ b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java
@@ -176,6 +176,7 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
     @Override
     public Result saveNewsToBanner(BannerDTO banner, List<Long> deptIds) {
         BannerEntity bannerEntity = ConvertUtils.sourceToTarget(banner, BannerEntity.class);
+
         if (this.baseDao.insert(bannerEntity) > NumConstant.ZERO) {
             bannerDepartmentService.save(bannerEntity.getId(), deptIds);
         }
diff --git a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
index cbd7e5d..cbded6e 100644
--- a/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
+++ b/epdc-cloud-news/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
@@ -443,7 +443,9 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
 
         BannerDTO banner = ConvertUtils.sourceToTarget(newsEntity, BannerDTO.class);
         banner = packBannerDtoByNews(banner, newsId, newsEntity.getNewsImageUrl(), newsEntity.getNewsTitle());
-
+        // 平安榆山相关新闻上banner时，POSITION设为2
+        banner.setPosition(NumConstant.TWO_STR);
+        banner.setNewsCategory(newsEntity.getNewsCateroryId());
         this.bannerService.saveNewsToBanner(banner, deptIds);
 
         NewsEntity news = new NewsEntity();