会议模板接口代码优化-分修改

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingTemplateController.java

@@ -2,6 +2,7 @@ package com.usky.meeting.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.meeting.domain.MeetingTemplate;
@@ -63,10 +64,12 @@ public class MeetingTemplateController {
      * @return 模板列表
      */
     @GetMapping("/templateList")
-    public ApiResult<List<MeetingTemplate>> list(@RequestParam(required = false) String name,
-                                                 @RequestParam(required = false) Integer type,
-                                                 @RequestParam(required = false) String layout) {
-        return ApiResult.success(meetingTemplateService.templateList(name, type, layout));
+    public ApiResult<CommonPage<MeetingTemplate>> list(@RequestParam(defaultValue = "1") Integer pageNum,
+                                                             @RequestParam(defaultValue = "10") Integer pageSize,
+                                                             @RequestParam(required = false) String name,
+                                                             @RequestParam(required = false) Integer type,
+                                                             @RequestParam(required = false) String layout) {
+        return ApiResult.success(meetingTemplateService.templateList(pageNum, pageSize, name, type, layout));
     }
 
     @PutMapping("/batchPublishing")

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/MeetingTemplateService.java

@@ -1,5 +1,6 @@
 package com.usky.meeting.service;
 
+import com.usky.common.core.bean.CommonPage;
 import com.usky.meeting.domain.MeetingTemplate;
 import com.usky.common.mybatis.core.CrudService;
 
@@ -32,9 +33,9 @@ public interface MeetingTemplateService extends CrudService<MeetingTemplate> {
      * @param name  模板名称
      * @param type  模板类型
      * @param layout  模板布局
-     * @return  模板列表
+     * @return 模板列表
      */
-    List<MeetingTemplate> templateList(String name, Integer type, String layout);
+    CommonPage<MeetingTemplate> templateList(Integer pageNum, Integer pageSize, String name, Integer type, String layout);
 
     /**
      * 批量发布

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingTemplateServiceImpl.java

@@ -2,6 +2,7 @@ package com.usky.meeting.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.meeting.domain.MeetingDevice;
@@ -17,6 +18,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.security.Security;
 import java.time.LocalDateTime;
@@ -86,13 +88,18 @@ public class MeetingTemplateServiceImpl extends AbstractCrudService<MeetingTempl
     }
 
     @Override
-    public List<MeetingTemplate> templateList(String name, Integer type, String layout) {
-        LambdaQueryWrapper<MeetingTemplate> lambdaQuery = new LambdaQueryWrapper<>();
-        lambdaQuery.eq(MeetingTemplate::getTenantId, SecurityUtils.getTenantId())
+    public CommonPage<MeetingTemplate> templateList(Integer pageNum, Integer pageSize, String name, Integer type,
+                                                    String layout) {
+        Page<MeetingTemplate> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<MeetingTemplate> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MeetingTemplate::getTenantId, SecurityUtils.getTenantId())
                 .like(StringUtils.isNotBlank(name), MeetingTemplate::getName, name)
                 .eq(type != null, MeetingTemplate::getType, type)
-                .eq(StringUtils.isNotBlank(layout) && !"all".equals(layout), MeetingTemplate::getLayout, layout);
-        return baseMapper.selectList(lambdaQuery);
+                .eq(StringUtils.isNotBlank(layout) && !"all".equals(layout),
+                        MeetingTemplate::getLayout, layout);
+
+        Page<MeetingTemplate> mpPage = baseMapper.selectPage(page, wrapper);
+        return new CommonPage<>(mpPage.getRecords(), mpPage.getTotal(), pageSize, pageNum);
     }
 
     @Override