天气预警，与公告通知功能

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/message/vo/MessageAppPageVo.java

@@ -0,0 +1,54 @@
+package com.xunmei.common.core.domain.message.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 公告通知对象 core_announcement_notification
+ *
+ * @author xunmei
+ * @date 2023-09-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+
+@ApiModel(value = "CoreAnnouncementNotification对象" , description = "公告通知")
+public class MessageAppPageVo
+        {
+private static final long serialVersionUID=1L;
+
+    /**  */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 标题 */
+    private String title;
+
+    /** 内容 */
+            @ApiModelProperty(value = "内容")
+    private String content;
+    /** 发布时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+            @ApiModelProperty(value = "发布时间")
+    private Date publishTime;
+
+
+
+            @ApiModelProperty(value = "附件")
+            private List<String> fileList;
+
+            @ApiModelProperty(value = "附件")
+            private String strFileList;
+
+   private Integer isRead;
+        }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/controller/CoreAnnouncementNotificationController.java

@@ -6,6 +6,7 @@ import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationDto
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationPageDto;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationPageVo;
+import com.xunmei.common.core.domain.message.vo.MessageAppPageVo;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -105,7 +106,7 @@ public class CoreAnnouncementNotificationController extends BaseController {
 
     @ApiOperation(value = "App查询消息列表")
     @PostMapping("/appList")
-    public TableDataInfo<CoreAnnouncementNotificationAppPageVo> appList(@RequestBody CoreAnnouncementNotificationAppPageDto request) {
+    public TableDataInfo<MessageAppPageVo> appList(@RequestBody CoreAnnouncementNotificationAppPageDto request) {
         return coreAnnouncementNotificationService.selectAppPage(request);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/mapper/CoreAnnouncementNotificationMapper.java

@@ -10,6 +10,7 @@ import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationApp
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationPageDto;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationPageVo;
+import com.xunmei.common.core.domain.message.vo.MessageAppPageVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -83,9 +84,9 @@ public interface CoreAnnouncementNotificationMapper extends BaseMapper<CoreAnnou
 
     void deleteNotificationToUsers(@Param("notificationId")  Long notificationId);
 
-    Page<CoreAnnouncementNotificationAppPageVo> selectAppPage(@Param("page")Page<CoreAnnouncementNotificationAppPageVo> page, @Param("request")CoreAnnouncementNotificationAppPageDto request);
+    Page<MessageAppPageVo> selectAppPage(@Param("page")Page<MessageAppPageVo> page, @Param("request")CoreAnnouncementNotificationAppPageDto request);
 
-    List<CoreAnnouncementNotificationToUser> selectNotificationToUsers(@Param("request")CoreAnnouncementNotificationAppPageDto request, @Param("records")List<CoreAnnouncementNotificationAppPageVo> records);
+    List<CoreAnnouncementNotificationToUser> selectNotificationToUsers(@Param("request")CoreAnnouncementNotificationAppPageDto request, @Param("records")List<MessageAppPageVo> records);
 
     CoreAnnouncementNotificationToUser checkIsRead(@Param("request") CoreAnnouncementNotificationAppPageDto request);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/service/ICoreAnnouncementNotificationService.java

@@ -7,6 +7,7 @@ import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationDto
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationPageDto;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationPageVo;
+import com.xunmei.common.core.domain.message.vo.MessageAppPageVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 import java.util.List;
@@ -76,7 +77,7 @@ public interface ICoreAnnouncementNotificationService extends IService<CoreAnnou
 
     void publish(Long id);
 
-    TableDataInfo<CoreAnnouncementNotificationAppPageVo> selectAppPage(CoreAnnouncementNotificationAppPageDto request);
+    TableDataInfo<MessageAppPageVo> selectAppPage(CoreAnnouncementNotificationAppPageDto request);
 
     void markIsRead(CoreAnnouncementNotificationAppPageDto request);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/message/service/impl/CoreAnnouncementNotificationServiceImpl.java

@@ -18,6 +18,7 @@ import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationDto
 import com.xunmei.common.core.domain.message.dto.CoreAnnouncementNotificationPageDto;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo;
 import com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationPageVo;
+import com.xunmei.common.core.domain.message.vo.MessageAppPageVo;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.bean.BeanUtils;
@@ -103,8 +104,8 @@ public class CoreAnnouncementNotificationServiceImpl extends ServiceImpl<CoreAnn
     }
 
     @Override
-    public TableDataInfo<CoreAnnouncementNotificationAppPageVo> selectAppPage(CoreAnnouncementNotificationAppPageDto request) {
-        Page<CoreAnnouncementNotificationAppPageVo> page;
+    public TableDataInfo<MessageAppPageVo> selectAppPage(CoreAnnouncementNotificationAppPageDto request) {
+        Page<MessageAppPageVo> page;
         //分页
         if (request.getPageNum()!=null&&request.getPageSize()!=null)
         {
@@ -135,8 +136,8 @@ public class CoreAnnouncementNotificationServiceImpl extends ServiceImpl<CoreAnn
         coreAnnouncementNotificationMapper.insertNotificationUser(notificationUser);
     }
 
-    private Page<CoreAnnouncementNotificationAppPageVo> buildNewNotificationAppPageVo(Page<CoreAnnouncementNotificationAppPageVo> page, CoreAnnouncementNotificationAppPageDto request) {
-        List<CoreAnnouncementNotificationAppPageVo> records = page.getRecords();
+    private Page<MessageAppPageVo> buildNewNotificationAppPageVo(Page<MessageAppPageVo> page, CoreAnnouncementNotificationAppPageDto request) {
+        List<MessageAppPageVo> records = page.getRecords();
         List<CoreAnnouncementNotificationToUser> list = coreAnnouncementNotificationMapper.selectNotificationToUsers(request,records);
             records.forEach(r->{
                 int num = (int) list.stream().filter(a->a.getUserId().equals(request.getUserId())&&a.getAnnouncementNotificationId().equals(r.getId())).count();

soc-modules/soc-modules-core/src/main/resources/mapper/message/CoreAnnouncementNotificationMapper.xml

@@ -81,7 +81,7 @@
         </foreach>
     </select>
     <select id="selectAppPage"
-            resultType="com.xunmei.common.core.domain.message.vo.CoreAnnouncementNotificationAppPageVo">
+            resultType="com.xunmei.common.core.domain.message.vo.MessageAppPageVo">
         select T.*,T.file_list as strFileList from (select a.* from core_announcement_notification a
                          left join core_announcement_notification_to_role b on a.id = b.announcement_notification_id
                          left join core_announcement_notification_to_org c on a.id = c.announcement_notification_id