1、发布通知内容新增可以发布视频

2、通知列表和详情接口增加视频地址字段返回

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java

@@ -149,4 +149,9 @@ public class NoticeDTO implements Serializable {
      * 联系方式
      */
     private String mobile;
+
+    /**
+     * 通知视频地址
+     */
+    private String noticeVideoUrl;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java

@@ -53,4 +53,9 @@ public class EpdcNoticeDetailResultDTO implements Serializable {
      * 联系电话
      */
     private String mobile;
+
+    /**
+     * 通知视频地址
+     */
+    private String noticeVideoUrl;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java

@@ -53,4 +53,9 @@ public class EpdcNoticeListResultDTO implements Serializable {
      * 联系电话
      */
     private String mobile;
+
+    /**
+     * 通知视频地址
+     */
+    private String noticeVideoUrl;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java

@@ -116,4 +116,9 @@ public class NoticeEntity extends BaseEpdcEntity {
      * 联系方式
      */
     private String mobile;
+
+    /**
+     * 通知视频地址
+     */
+    private String noticeVideoUrl;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

@@ -176,6 +176,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
      * @date 2019/9/5 16:02
      */
     private void saveOrUpdate(NoticeDTO dto) {
+        if (StringUtils.isEmpty(dto.getNoticeContent()) && StringUtils.isEmpty(dto.getNoticeVideoUrl())) {
+            throw new RenException("请填写内容或上传视频");
+        }
         UserDetail user = SecurityUser.getUser();
         // 通知所属部门（发布者所在部门）
         Long noticeDeptId = user.getDeptId();

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml

@@ -34,7 +34,8 @@
             n.RELEASE_TIME AS noticeTime,
             SUBSTRING_INDEX(n.ALL_DEPT_NAMES,'-',-1) AS deptName,
             n.NOTICE_IMAGE_URL imgUrl,
-            n.MOBILE mobile
+            n.MOBILE mobile,
+            n.NOTICE_VIDEO_URL AS noticeVideoUrl
         FROM
             epdc_notice n
         WHERE
@@ -112,7 +113,8 @@
             SUBSTRING_INDEX(en.ALL_DEPT_NAMES,'-',-1) AS deptName,
             en.NOTICE_IMAGE_URL imgUrl,
             en.NOTICE_CONTENT noticeContent,
-            en.MOBILE as mobile
+            en.MOBILE as mobile,
+            en.NOTICE_VIDEO_URL AS noticeVideoUrl
         FROM
             epdc_notice en
         RIGHT JOIN epdc_notice_department nd ON en.ID = nd.NOTICE_ID