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 @@
spring-cloud-starter-alibaba-nacos-discovery
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-config
-
+
+
+
+
@@ -132,20 +132,20 @@
9064
2
- 47.104.224.45
- 6379
- elink@888
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
-
+
- epdc
+ epdcyushan
elink833066
false
47.104.224.45:8848
- 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ de000340-5fc4-45aa-bdbc-dd96852012ad
47.104.85.99:9876;114.215.125.123:9876
organizationGroup
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
@Override
public Result saveNewsToBanner(BannerDTO banner, List 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 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();