From 7166f4e2f86ed2532a38d5c210284dd9ca7be4c7 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 03 Jun 2024 13:57:45 +0800
Subject: [PATCH] 图斑编号模糊搜索功能
---
src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java | 6 ++----
src/main/java/com/dji/sample/patches/model/Param/PatchesParam.java | 2 ++
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 9 +++++++--
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/controller/PatchesController.java b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
index 93da704..c5aa58c 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -54,12 +54,17 @@
@SysLogAnnotation(operModul = "图斑", operType = "查询", operDesc = "查询图斑的全部信息")
public ResponseResult<PaginationData<LotInfo>> page(@RequestParam Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
- @RequestParam String workspaceId) {
+ @RequestParam String workspaceId,
+ @RequestParam(name = "dkbh", defaultValue = "") String dkbh
+ ) {
//调用service分页查询
PatchesParam param = PatchesParam.builder()
.page(page)
.workspaceId(workspaceId)
- .pageSize(pageSize).build();
+ .pageSize(pageSize)
+ .dkbh(dkbh)
+ .build();
+
PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
}
diff --git a/src/main/java/com/dji/sample/patches/model/Param/PatchesParam.java b/src/main/java/com/dji/sample/patches/model/Param/PatchesParam.java
index d0f9a93..e08059d 100644
--- a/src/main/java/com/dji/sample/patches/model/Param/PatchesParam.java
+++ b/src/main/java/com/dji/sample/patches/model/Param/PatchesParam.java
@@ -17,4 +17,6 @@
private int pageSize = 10;
private String workspaceId;
+
+ private String dkbh;
}
diff --git a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
index c4bf342..bb5ba91 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
@@ -1,7 +1,6 @@
package com.dji.sample.patches.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dji.sample.common.model.Pagination;
import com.dji.sample.common.model.PaginationData;
@@ -11,10 +10,8 @@
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
-import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.util.List;
import java.util.stream.Collectors;
@@ -35,7 +32,8 @@
public PaginationData<LotInfo> limitGet(PatchesParam param) {
Page<LotInfo> page = mapper.selectPage(new Page<LotInfo>(param.getPage(), param.getPageSize()),
new LambdaQueryWrapper<LotInfo>()
- .eq(LotInfo::getWorkspaceId, param.getWorkspaceId()));
+ .eq(LotInfo::getWorkspaceId, param.getWorkspaceId())
+ .like(LotInfo::getDkbh,param.getDkbh()));
List<LotInfo> records = page.getRecords()
.stream()
.collect(Collectors.toList());
--
Gitblit v1.9.3