1.发送短信签名由"矿拉拉"改为"开物云ECO";

2.解决消息列表分页不生效问题

sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/model/SckwSms.java

@@ -18,7 +18,7 @@ import java.util.Map;
 public class SckwSms {
 
     public SckwSms(){
-        this.signName = "矿拉拉";
+        this.signName = "开物云ECO";
     }
 
     /**

sckw-modules/sckw-message/src/main/java/com/sckw/message/controller/MessageController.java

@@ -1,21 +1,20 @@
 package com.sckw.message.controller;
 
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.sckw.core.model.page.PageHelperUtil;
-import com.sckw.core.model.page.PageResult;
+import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.message.model.KwmMessage;
-import com.sckw.message.model.vo.req.*;
-import com.sckw.message.model.vo.res.KwmMessageListResVO;
+import com.sckw.message.model.dto.SelectMessagesDTO;
+import com.sckw.message.model.vo.req.DeleteMessagesReqVO;
+import com.sckw.message.model.vo.req.ReadMessagesReqVO;
+import com.sckw.message.model.vo.req.SelectMessagesReqVO;
+import com.sckw.message.model.vo.req.StatisticsMessagesReqVO;
 import com.sckw.message.service.MessageService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * @param
  * @desc: 消息相关接口
@@ -52,10 +51,8 @@ public class MessageController {
      */
     @PostMapping(value = "/select", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult select(@RequestBody @Valid SelectMessagesReqVO params) {
-        PageHelper.startPage(params.getPage(), params.getPageSize());
-        List<KwmMessageListResVO> list = messageService.select(params);
-        PageResult result = PageHelperUtil.getPageResult(new PageInfo<>(list));
-        return HttpResult.ok("分页查询消息成功", result);
+        PageRes res = messageService.select(BeanUtils.copyProperties(params, SelectMessagesDTO.class));
+        return HttpResult.ok("分页查询消息成功", res);
     }
 
     /**

sckw-modules/sckw-message/src/main/java/com/sckw/message/model/dto/SelectMessagesDTO.java

@@ -60,4 +60,13 @@ public class SelectMessagesDTO implements Serializable {
      * 消息列表排序类型 1状态升序，创建时间降序   2创建时间降序
      */
     private Integer sortType;
+
+    /**
+     * 当前页码
+     */
+    private int page;
+    /**
+     * 每页数量
+     */
+    private int pageSize;
 }

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/MessageService.java

@@ -1,9 +1,12 @@
 package com.sckw.message.service;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.vo.TableBottom;
 import com.sckw.core.model.vo.TableStatisticRes;
 import com.sckw.core.model.vo.TableTop;
@@ -20,7 +23,6 @@ import com.sckw.message.model.dto.UserMsgCenterLatestMsgDTO;
 import com.sckw.message.model.dto.UserMsgCenterReqDTO;
 import com.sckw.message.model.vo.req.DeleteMessagesReqVO;
 import com.sckw.message.model.vo.req.ReadMessagesReqVO;
-import com.sckw.message.model.vo.req.SelectMessagesReqVO;
 import com.sckw.message.model.vo.req.StatisticsMessagesReqVO;
 import com.sckw.message.model.vo.res.KwmMessageListResVO;
 import com.sckw.message.model.vo.res.MessagesStatisticsResVO;
@@ -105,14 +107,14 @@ public class MessageService {
     }
 
     /**
-     * @param reqVO
+     * @param dto
      * @return java.util.List<com.sckw.message.model.KwmMessage>
      * @desc: 分页查询消息列表
      * @author: yzc
      * @date: 2023-06-13 9:05
      */
-    public List<KwmMessageListResVO> select(SelectMessagesReqVO reqVO) {
-        SelectMessagesDTO dto = BeanUtils.copyProperties(reqVO, SelectMessagesDTO.class);
+    public PageRes select(SelectMessagesDTO dto) {
+        PageHelper.startPage(dto.getPage(), dto.getPageSize());
         //当前登录人是企业管理员则查看全部消息，否则只查看对应用户消息
         Integer isMain = LoginUserHolder.getIsMain();
         if (Objects.equals(isMain, 1)) {
@@ -121,8 +123,9 @@ public class MessageService {
             dto.setUserId(LoginUserHolder.getUserId());
         }
         List<MessageListDTO> list = kwmMessageService.findPage(dto);
+        PageInfo<MessageListDTO> pageInfo = new PageInfo<>(list);
         if (CollectionUtils.isEmpty(list)) {
-            return Collections.emptyList();
+            return PageRes.build(pageInfo, list);
         }
         Map<String, String> categoryMap, statusMap;
         Map<String, Map<String, String>> dictMap = remoteSystemService.queryDictByType(
@@ -158,7 +161,7 @@ public class MessageService {
             }
             result.add(res);
         });
-        return result;
+        return PageRes.build(pageInfo, result);
     }
 
     /**