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

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

@@ -0,0 +1,9 @@
+package com.xunmei.common.core.domain.message.vo;
+
+import lombok.Data;
+
+@Data
+public class FileObject {
+    private String url;
+    private String name;
+}

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

@@ -1,5 +1,6 @@
 package com.xunmei.common.core.domain.message.vo;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -45,7 +46,7 @@ private static final long serialVersionUID=1L;
 
 
             @ApiModelProperty(value = "附件")
-            private List<String> fileList;
+            private List<FileObject> fileList;
 
             @ApiModelProperty(value = "附件")
             private String strFileList;

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

@@ -3,10 +3,13 @@ package com.xunmei.core.message.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotification;
@@ -18,6 +21,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.FileObject;
 import com.xunmei.common.core.domain.message.vo.MessageAppPageVo;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
@@ -142,8 +146,19 @@ public class CoreAnnouncementNotificationServiceImpl extends ServiceImpl<CoreAnn
             records.forEach(r->{
                 int num = (int) list.stream().filter(a->a.getUserId().equals(request.getUserId())&&a.getAnnouncementNotificationId().equals(r.getId())).count();
                 r.setIsRead(num);
-                r.setFileList(ObjectUtil.isNotEmpty(r.getStrFileList()) ? JSON.parseArray(r.getStrFileList(), String.class) : null);
-                r.setStrFileList(null);
+                List<FileObject> objects = new ArrayList<>();
+            if(ObjectUtil.isNotEmpty(r.getStrFileList())){
+                ObjectMapper objectMapper = new ObjectMapper();
+                  List<String> lista =  JSON.parseArray(r.getStrFileList(), String.class);
+                  for(String str:lista){
+                      FileObject object = JSONObject.parseObject(str,FileObject.class);
+                      objects.add(object);
+                  }
+                    r.setFileList(objects);
+                    r.setStrFileList(null);
+            }
+                //r.setFileList(ObjectUtil.isNotEmpty(r.getStrFileList()) ? JSON.parseArray(r.getStrFileList(), FileObject.class) : null);
+
             });
         return page;
     }