10/9 novelty

src/main/java/cn/cslg/pas/common/dto/NoveltyProjectDTO/QueryTemplateDTO.java

@@ -13,4 +13,7 @@ public class QueryTemplateDTO {
      * 模板id
      */
     private Integer templateId;
+
+    private Long size;
+    private Long current;
 }

src/main/java/cn/cslg/pas/controller/NoveltyProjectController.java

@@ -192,9 +192,7 @@ public class NoveltyProjectController {
     @Operation(summary = "查询查新检索报告模板")
     @PostMapping("/queryTemplate")
     public Response queryTemplate(@RequestBody QueryTemplateDTO queryTemplateDTO) throws IOException {
-        List<QueryTemplateVO> queryTemplateVOS = noveltyReportTemplateService.queryTemplate(queryTemplateDTO);
-        Records records = new Records();
-        records.setData(queryTemplateVOS);
+        Records records = noveltyReportTemplateService.queryTemplate(queryTemplateDTO);
         return Response.success(records);
     }
 
@@ -227,7 +225,7 @@ public class NoveltyProjectController {
     @PostMapping("/deleteSearchRecord")
     public Response deleteSearchRecord(@RequestBody List<Integer> retrieveIds){
         List<Integer> ids = noveltySearchRecordService.deleteSearchRecord(retrieveIds);
-        Records records =new Records();
+        Records records = new Records();
         records.setData(ids);
         return Response.success(records);
     }

src/main/java/cn/cslg/pas/service/novelty/NoveltyReportTemplateService.java

@@ -2,13 +2,17 @@ package cn.cslg.pas.service.novelty;
 
 import cn.cslg.pas.common.dto.NoveltyProjectDTO.QueryTemplateDTO;
 import cn.cslg.pas.common.model.cronModel.Personnel;
+import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.vo.NoveltyProjectVO.QueryTemplateVO;
+import cn.cslg.pas.domain.business.RetrieveRecord;
 import cn.cslg.pas.domain.business.novelty.NoveltyReportTemplate;
 import cn.cslg.pas.mapper.novelty.NoveltyReportTemplateMapper;
 import cn.cslg.pas.service.permissions.PermissionService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,19 +33,44 @@ public class NoveltyReportTemplateService extends ServiceImpl<NoveltyReportTempl
     @Autowired
     private PermissionService permissionService;
 
-    public List<QueryTemplateVO> queryTemplate(QueryTemplateDTO queryTemplateDTO) throws IOException {
+//    public List<QueryTemplateVO> queryTemplate(QueryTemplateDTO queryTemplateDTO) throws IOException {
+//        List<QueryTemplateVO> queryTemplateVOS = new ArrayList<>();
+//        List<NoveltyReportTemplate> noveltyReportTemplates = new ArrayList<>();
+//        if (queryTemplateDTO.getTemplateId() != null) {
+//            NoveltyReportTemplate noveltyReportTemplate = this.getById(queryTemplateDTO.getTemplateId());
+//            noveltyReportTemplates.add(noveltyReportTemplate);
+//        } else {
+//            noveltyReportTemplates = this.list();
+//        }
+//        if (!noveltyReportTemplates.isEmpty()) {
+//            queryTemplateVOS = this.loadTemplateVOS(noveltyReportTemplates);
+//        }
+//        return queryTemplateVOS;
+//    }
+
+    public Records queryTemplate(QueryTemplateDTO queryTemplateDTO) throws IOException {
+        Records records = new Records();
+        Long total = null;
         List<QueryTemplateVO> queryTemplateVOS = new ArrayList<>();
         List<NoveltyReportTemplate> noveltyReportTemplates = new ArrayList<>();
         if (queryTemplateDTO.getTemplateId() != null) {
             NoveltyReportTemplate noveltyReportTemplate = this.getById(queryTemplateDTO.getTemplateId());
             noveltyReportTemplates.add(noveltyReportTemplate);
         } else {
-            noveltyReportTemplates = this.list();
-        }
-        if (!noveltyReportTemplates.isEmpty()) {
-            queryTemplateVOS = this.loadTemplateVOS(noveltyReportTemplates);
+            LambdaQueryWrapper<NoveltyReportTemplate> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.orderByDesc(NoveltyReportTemplate::getCreateTime);
+            IPage<NoveltyReportTemplate> noveltyReportTemplatePage = this.page(new Page<>(queryTemplateDTO.getCurrent(), queryTemplateDTO.getSize()), queryWrapper);
+            noveltyReportTemplates = noveltyReportTemplatePage.getRecords();
+            total = noveltyReportTemplatePage.getTotal();
         }
-        return queryTemplateVOS;
+//        if (!noveltyReportTemplates.isEmpty()) {
+//            queryTemplateVOS = this.loadTemplateVOS(noveltyReportTemplates);
+//        }
+        records.setData(noveltyReportTemplates);
+        records.setCurrent(queryTemplateDTO.getCurrent());
+        records.setSize(queryTemplateDTO.getSize());
+        records.setTotal(total);
+        return records;
     }
 
     private List<QueryTemplateVO> loadTemplateVOS(List<NoveltyReportTemplate> noveltyReportTemplates) throws IOException {