diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java index 3c84278e..424e1ed9 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java index 4134b515..f5f9b1a5 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeDetailResultDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java index ac748148..fac169a7 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java index 4480ebe1..d5cca655 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index c8990685..22a46827 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/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 * @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(); diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml index 507b0157..9018f08d 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml +++ b/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