1.添加分页工具类

2.打印模板关联到客户
3.对非数据库字段添加注解

src/main/java/com/glxp/udi/admin/controller/param/SystemPDFTemplateController.java

@@ -1,5 +1,7 @@
 package com.glxp.udi.admin.controller.param;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
 import com.glxp.udi.admin.common.res.BaseResponse;
@@ -8,9 +10,9 @@ import com.glxp.udi.admin.req.param.SystemPDFTemplateRequest;
 import com.glxp.udi.admin.req.param.SystemPDFTemplateSaveRequest;
 import com.glxp.udi.admin.res.PageSimpleResponse;
 import com.glxp.udi.admin.res.param.SystemPDFTemplateResponse;
-import com.glxp.udi.admin.res.param.SystemPDFTemplateSelectResponse;
 import com.glxp.udi.admin.service.param.SystemPDFTemplateService;
 import com.glxp.udi.admin.util.JasperUtils;
+import com.glxp.udi.admin.util.PageUtil;
 import com.glxp.udi.common.enums.ResultEnum;
 import com.glxp.udi.common.util.ResultVOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -24,6 +26,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -55,24 +58,27 @@ public class SystemPDFTemplateController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @AuthRuleAnnotation("system/pdf/template/list")
+    /**
-    @GetMapping("/system/pdf/template/pdfTemplates")
+     * 查询客户专属和公共的打印模板
-    public BaseResponse pdfTemplates(@RequestParam(value = "page", defaultValue = "1") Integer page,
+     *
-                                     @RequestParam(value = "limit", defaultValue = "100") Integer limit) {
+     * @param systemPDFTemplateRequest
-
+     * @return
-        Page<SystemPDFTemplateEntity> pageResult = systemPDFTemplateService.listPDFTemplates(page, limit);
+     */
-        PageSimpleResponse<SystemPDFTemplateSelectResponse> pageSimpleResponse = new PageSimpleResponse<>();
+    @PostMapping("/system/pdf/template/customerTemplates")
-        pageSimpleResponse.setTotal(pageResult.getTotal());
+    public BaseResponse customerTemplates(@RequestBody SystemPDFTemplateRequest systemPDFTemplateRequest) {
-        List<SystemPDFTemplateSelectResponse> systemPDFTemplateSelectResponses = pageResult.getRecords().stream().map(e -> {
+        IPage<SystemPDFTemplateEntity> page = systemPDFTemplateService.findCustomerTemplates(systemPDFTemplateRequest);
-            SystemPDFTemplateSelectResponse systemPDFTemplateSelectResponse = new SystemPDFTemplateSelectResponse();
+        List<SystemPDFTemplateResponse> systemPDFTemplateResponses =new ArrayList<>(page.getRecords().size());
-            BeanUtils.copyProperties(e, systemPDFTemplateSelectResponse);
+        if (page.getTotal() > 0) {
-            systemPDFTemplateSelectResponse.setIdStr(String.valueOf(e.getId()));
+            page.getRecords().forEach(systemPDFTemplateEntity -> {
-            return systemPDFTemplateSelectResponse;
+                SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse();
-        }).collect(Collectors.toList());
+                BeanUtil.copyProperties(systemPDFTemplateEntity, systemPDFTemplateResponse);
-        pageSimpleResponse.setList(systemPDFTemplateSelectResponses);
+                systemPDFTemplateResponses.add(systemPDFTemplateResponse);
-        return ResultVOUtils.success(pageSimpleResponse);
+            });
+        }
+        return ResultVOUtils.success(PageUtil.page(page, systemPDFTemplateResponses));
     }
 
+
     @AuthRuleAnnotation("system/pdf/template/save")
     @PostMapping("/system/pdf/template/save")
     public BaseResponse save(@RequestBody @Valid SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest, BindingResult bindingResult) {
@@ -95,7 +101,6 @@ public class SystemPDFTemplateController {
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
-
         return ResultVOUtils.success();
     }
 

src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateDao.java

@@ -27,4 +27,5 @@ public interface SystemPDFTemplateDao extends BaseMapper<SystemPDFTemplateEntity
      * @return
      */
     int countByName(@Param("name") String name);
+
 }

src/main/java/com/glxp/udi/admin/entity/auth/UserRegisterEntity.java

@@ -1,5 +1,6 @@
 package com.glxp.udi.admin.entity.auth;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -43,6 +44,7 @@ public class UserRegisterEntity {
 
     private String comments;
 
+    @TableField(exist = false)
     private int checkCode;
 
     private String areaCode;

src/main/java/com/glxp/udi/admin/req/param/SystemPDFTemplateRequest.java

@@ -22,4 +22,6 @@ public class SystemPDFTemplateRequest extends ListPageRequest {
     private String remark;
     private Date create_time;
     private Date update_time;
+
+    private String customerId;
 }

src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateService.java

@@ -2,6 +2,7 @@ package com.glxp.udi.admin.service.param;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.udi.admin.dao.param.SystemPDFTemplateDao;
 import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity;
@@ -65,8 +66,25 @@ public class SystemPDFTemplateService {
         wrapper.like(StrUtil.isNotBlank(systemPDFTemplateRequest.getName()), "name", systemPDFTemplateRequest.getName())
                 .eq(null != systemPDFTemplateRequest.getModule(), "module", systemPDFTemplateRequest.getModule())
                 .eq(null != systemPDFTemplateRequest.getId(), "id", systemPDFTemplateRequest.getId())
+                .eq(StrUtil.isNotBlank(systemPDFTemplateRequest.getCustomerId()), "customerId", systemPDFTemplateRequest.getCustomerId())
                 .orderByDesc("update_time");
         return wrapper;
     }
 
+    /**
+     * 查询客户专属和公共模板
+     *
+     * @param systemPDFTemplateRequest
+     * @return
+     */
+    public IPage<SystemPDFTemplateEntity> findCustomerTemplates(SystemPDFTemplateRequest systemPDFTemplateRequest) {
+        QueryWrapper<SystemPDFTemplateEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StrUtil.isNotBlank(systemPDFTemplateRequest.getCustomerId()), "customerId", systemPDFTemplateRequest.getCustomerId())
+                .or()
+                .isNull("customerId");
+
+        IPage<SystemPDFTemplateEntity> page = new Page<>(systemPDFTemplateRequest.getPage(), systemPDFTemplateRequest.getLimit());
+        return systemPDFTemplateDao.selectPage(page, wrapper);
+    }
+
 }

src/main/java/com/glxp/udi/admin/util/PageUtil.java

@@ -0,0 +1,43 @@
+package com.glxp.udi.admin.util;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.glxp.udi.admin.res.PageSimpleResponse;
+
+import java.util.List;
+
+/**
+ * 分页工具
+ */
+public class PageUtil {
+
+    /**
+     * 根据mybatis-plus的分页对象封装分页参数对象
+     *
+     * @param page mybatis-plus分页对象
+     * @param <T>  查询数据实体类
+     * @return
+     */
+    public static <T> PageSimpleResponse<T> page(IPage<T> page) {
+        PageSimpleResponse<T> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(page.getTotal());
+        pageSimpleResponse.setList(page.getRecords());
+        return pageSimpleResponse;
+    }
+
+    /**
+     * 根据mybatis-plus的分页对象和自定义结果集封装分页返回对象
+     *
+     * @param page mybatis-plus分页对象
+     * @param list 自定义结果集
+     * @param <T>  查询数据实体类
+     * @param <V>  接口响应实体类
+     * @return
+     */
+    public static <T, V> PageSimpleResponse<V> page(IPage<T> page, List<V> list) {
+        PageSimpleResponse<V> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(page.getTotal());
+        pageSimpleResponse.setList(list);
+        return pageSimpleResponse;
+    }
+
+}