ID改字符串

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/SysMessageWrapper.java

@@ -0,0 +1,70 @@
+package com.ym.mec.biz.dal.wrapper;
+
+import com.ym.mec.biz.dal.enums.MessageSendMode;
+import com.ym.mec.biz.dal.enums.SendStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+public class SysMessageWrapper {
+
+    @Data
+    public static class Message {
+
+        /** 主键 */
+        private String id;
+
+        private Integer messageConfigId;
+
+        /** 标题 */
+        @ApiModelProperty(value = "标题",required = false)
+        private String title;
+
+        /** 消息内容 */
+        @ApiModelProperty(value = "消息内容",required = false)
+        private String content;
+
+        /** 消息类型；1，表示短信；2，表示邮件; 3,app推送消息 */
+        @ApiModelProperty(value = "消息类型",required = false)
+        private MessageSendMode type;
+
+        /** 状态，-1,发送失败;0,待发送;1,发送中;2,发送完成 */
+        @ApiModelProperty(value = "状态",required = false)
+        private SendStatusEnum status;
+
+        /** 接收人(多个人用逗号分隔) */
+        @ApiModelProperty(value = "接收人(多个人用逗号分隔)",required = false)
+        private String receiver;
+
+        /** 发送时间 */
+        @ApiModelProperty(value = "发送时间",required = false)
+        private java.util.Date sendTime;
+
+        /** 错误信息 */
+        @ApiModelProperty(value = "错误信息",required = false)
+        private String errorMsg;
+
+        /** 创建时间 */
+        private java.util.Date createOn;
+
+        /** 修改时间 */
+        private java.util.Date modifyOn;
+
+        /** 用户编号 */
+        @ApiModelProperty(value = "用户编号",required = false)
+        private Integer userId;
+
+        /** 备注 */
+        @ApiModelProperty(value = "备注",required = false)
+        private String memo;
+
+        /** 是否已读 */
+        @ApiModelProperty(value = "是否已读",required = false)
+        private Integer readStatus;
+
+        @ApiModelProperty(value = "消息组",required = false)
+        private String group;
+
+        @ApiModelProperty(value = "极光推送客户端标识",required = false)
+        private String jpushType;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/SysMessageService.java

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.entity.SysMessage;
 import com.ym.mec.biz.dal.enums.MessageSendMode;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.page.SysMessageQueryInfo;
+import com.ym.mec.biz.dal.wrapper.SysMessageWrapper;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
@@ -203,5 +204,5 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	R<com.microsvc.toolkit.common.response.paging.PageInfo<CbsMessageWrapper.SysMessage>> queryMessageCode(SysMessageVo.SysMessageQuery query);
 
 
-    PageInfo<SysMessage> queryPage(SysMessageQueryInfo queryInfo);
+    PageInfo<SysMessageWrapper.Message> queryPage(SysMessageQueryInfo queryInfo);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -23,6 +23,7 @@ import com.ym.mec.biz.dal.enums.MessageSendMode;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.SendStatusEnum;
 import com.ym.mec.biz.dal.page.SysMessageQueryInfo;
+import com.ym.mec.biz.dal.wrapper.SysMessageWrapper;
 import com.ym.mec.biz.service.SysMessageConfigService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.biz.service.SysUserService;
@@ -109,11 +110,11 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
      * @return IPage<SysMessageWrapper.SysMessage>
      */
     @Override
-    public PageInfo<SysMessage> queryPage(SysMessageQueryInfo query){
+    public PageInfo<SysMessageWrapper.Message> queryPage(SysMessageQueryInfo query){
 
         CbsMessageWrapper.SysMessageQuery cbsQuery = getSysMessageQuery(query);
 
-        PageInfo<SysMessage> pageInfo = new PageInfo<>(query.getPage(), query.getRows());
+        PageInfo<SysMessageWrapper.Message> pageInfo = new PageInfo<>(query.getPage(), query.getRows());
 
         cbsQuery.setPage(query.getPage());
         cbsQuery.setRows(query.getRows());
@@ -124,7 +125,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
             return pageInfo;
         }
         List<SysMessage> sysMessages = rows.stream().map(this::convert).collect(Collectors.toList());
-        pageInfo.setRows(sysMessages);
+        pageInfo.setRows(JSON.parseArray(JSON.toJSONString(sysMessages), SysMessageWrapper.Message.class));
         pageInfo.setTotal(sysMessagePageInfo.getTotal());
         return pageInfo;
     }