1

src/main/java/com/fdkankan/fusion/controller/CaseFusionController.java

@@ -8,6 +8,7 @@ import com.fdkankan.fusion.common.util.CameraUtil;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.entity.jsonEntity.Transform;
 import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.request.CaseOverviewParam;
 import com.fdkankan.fusion.request.FusionParam;
 import com.fdkankan.fusion.response.FusionNumVo;
 import com.fdkankan.fusion.response.SceneVo;
@@ -54,6 +55,12 @@ public class CaseFusionController extends BaseController{
         return ResultData.ok(getSceneListVo(fusionId));
     }
 
+    @PostMapping("/pageList")
+    public ResultData pageList(@RequestBody CaseOverviewParam param) {
+
+        return ResultData.ok(caseFusionService.pageList(param));
+    }
+
     @GetMapping("/info")
     public ResultData info(@RequestParam(required = false) Integer fusionId){
         CaseFusion caseFusion = caseFusionService.getById(fusionId);

src/main/java/com/fdkankan/fusion/controller/CaseOverviewController.java

@@ -38,7 +38,7 @@ public class CaseOverviewController extends BaseController{
     ICaseTabulationService caseTabulationService;
 
 
-    @PostMapping("/list")
+    @PostMapping("/pageList")
     public ResultData list(@RequestBody CaseOverviewParam param) {
 
         return ResultData.ok(caseOverviewService.pageList(param));

src/main/java/com/fdkankan/fusion/controller/CaseTabulationController.java

@@ -36,7 +36,7 @@ public class CaseTabulationController extends BaseController{
     @Autowired
     ICaseOverviewService caseOverviewService;
 
-    @PostMapping("/list")
+    @PostMapping("/pageList")
     public ResultData list(@RequestBody CaseOverviewParam param) {
 
         return ResultData.ok(caseTabulationService.pageList(param));

src/main/java/com/fdkankan/fusion/request/CaseOverviewParam.java

@@ -7,4 +7,5 @@ import lombok.Data;
 @Data
 public class CaseOverviewParam extends RequestBase {
     private String title;
+    private String fusionTitle;
 }

src/main/java/com/fdkankan/fusion/service/ICaseFusionService.java

@@ -1,7 +1,10 @@
 package com.fdkankan.fusion.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.entity.CaseFusion;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.fusion.request.CaseOverviewParam;
 
 import java.util.List;
 
@@ -16,4 +19,6 @@ import java.util.List;
 public interface ICaseFusionService extends IService<CaseFusion> {
 
     List<CaseFusion> getListByCaseId(Integer caseId);
+
+    PageInfo pageList(CaseOverviewParam param);
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseFusionServiceImpl.java

@@ -1,10 +1,15 @@
 package com.fdkankan.fusion.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.entity.CaseFusion;
 import com.fdkankan.fusion.mapper.ICaseFusionMapper;
+import com.fdkankan.fusion.request.CaseOverviewParam;
 import com.fdkankan.fusion.service.ICaseFusionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.util.StringUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,4 +31,15 @@ public class CaseFusionServiceImpl extends ServiceImpl<ICaseFusionMapper, CaseFu
         wrapper.eq(CaseFusion::getCaseId,caseId);
         return this.list(wrapper);
     }
+
+    @Override
+    public PageInfo pageList(CaseOverviewParam param) {
+        LambdaQueryWrapper<CaseFusion> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(param.getFusionTitle())){
+            wrapper.like(CaseFusion::getFusionTitle,param.getFusionTitle());
+        }
+        wrapper.orderByDesc(CaseFusion::getFusionId);
+        Page<CaseFusion> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        return PageInfo.PageInfo(page);
+    }
 }