Skip to content

Commit c1fdf6d

Browse files
WxrLZQWxrLZQ
committed
搜索框中添加用户名模糊查询和预处理语言匹配查询
1 parent 972bb8b commit c1fdf6d

File tree

5 files changed

+41
-14
lines changed

5 files changed

+41
-14
lines changed

‎springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleAccountService.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.github.pagehelper.PageInfo;
44
import com.lzq.api.dto.ExampleAccount;
5+
import com.lzq.api.pojo.Content;
56

67

78
/**
@@ -15,12 +16,13 @@ public interface ExampleAccountService {
1516
/**
1617
* 通过实例名查询实例
1718
*
18-
* @param content 搜索框内容
19+
* @param queryContent 搜索框内容
1920
* @param currentPage 当前页
2021
* @param orderCondition 排序条件
22+
* @param content 内容实例
2123
* @return
2224
*/
23-
PageInfo<ExampleAccount> queryByExampleName(String content, Integer currentPage, Integer orderCondition);
25+
PageInfo<ExampleAccount> queryExample(String queryContent, Integer currentPage, Integer orderCondition, Content content);
2426

2527
/**
2628
* 查询个人喜爱实例

‎springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/ExampleAccountMapper.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
44
import com.lzq.api.dto.ExampleAccount;
5+
import com.lzq.api.pojo.Content;
56
import org.apache.ibatis.annotations.Param;
67
import org.springframework.stereotype.Repository;
78

@@ -15,7 +16,7 @@
1516
@Repository
1617
public interface ExampleAccountMapper extends BaseMapper<ExampleAccount> {
1718

18-
public List<ExampleAccount> queryByExampleName(@Param("content") String content, @Param("orderCondition") Integer orderCondition);
19+
List<ExampleAccount> queryExample(@Param("queryContent") String queryContent, @Param("orderCondition") Integer orderCondition,@Param("content") Content content);
1920

2021
List<ExampleAccount> queryPersonFavorites(@Param("username") String username,@Param("orderCondition") Integer orderCondition);
2122
}

‎springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleAccountServiceImpl.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.github.pagehelper.PageHelper;
55
import com.github.pagehelper.PageInfo;
66
import com.lzq.api.dto.ExampleAccount;
7+
import com.lzq.api.pojo.Content;
78
import com.lzq.api.service.ExampleAccountService;
89
import com.lzq.dubboservice.mapper.ExampleAccountMapper;
910
import org.apache.dubbo.config.annotation.Service;
@@ -21,11 +22,11 @@
2122
public class ExampleAccountServiceImpl extends ServiceImpl<ExampleAccountMapper, ExampleAccount> implements ExampleAccountService {
2223

2324
@Override
24-
public PageInfo<ExampleAccount> queryByExampleName(String content, Integer currentPage, Integer orderCondition) {
25+
public PageInfo<ExampleAccount> queryExample(String queryContent, Integer currentPage, Integer orderCondition, Content content) {
2526
//当前页和每页条数
2627
PageHelper.startPage(currentPage, 12);
2728
//获取全部数据
28-
List<ExampleAccount> list = baseMapper.queryByExampleName(content, orderCondition);
29+
List<ExampleAccount> list = baseMapper.queryExample(queryContent, orderCondition, content);
2930
return new PageInfo<>(list);
3031
}
3132

‎springboot-dubbo-service/src/main/resources/mapper/ExampleAccoutMapper.xml‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,25 @@
55
a.example_id, example_name, ispublic, label, img, file_name, favorites, a.username
66
</sql>
77

8-
<select id="queryByExampleName" resultType="com.lzq.api.dto.ExampleAccount">
8+
<sql id="style">
9+
<if test="content.htmlStyle != null and content.htmlStyle != '' ">
10+
and html_style=#{content.htmlStyle}
11+
</if>
12+
<if test="content.cssStyle != null and content.cssStyle != '' ">
13+
and css_style=#{content.cssStyle}
14+
</if>
15+
<if test="content.jsStyle != null and content.jsStyle != '' ">
16+
and js_style=#{content.jsStyle}
17+
</if>
18+
</sql>
19+
20+
<select id="queryExample" resultType="com.lzq.api.dto.ExampleAccount">
921
select
1022
a.username,
1123
name,
1224
user_picture,
1325
description,
14-
example_id,
26+
b.example_id,
1527
example_name,
1628
label,
1729
img,
@@ -20,10 +32,19 @@
2032
b.update_time
2133
from account a left join example b
2234
on
23-
a.username=b.username
35+
a.username=b.username
36+
left join content c
37+
on
38+
b.example_id=c.example_id
2439
where
25-
b.example_name like concat('%',#{content},'%')
26-
or b.label like concat('%',#{content},'%')
40+
b.example_name like concat('%',#{queryContent},'%')
41+
<include refid="style"/>
42+
or
43+
b.label like concat('%',#{queryContent},'%')
44+
<include refid="style"/>
45+
or
46+
a.name like concat('%',#{queryContent},'%')
47+
<include refid="style"/>
2748
<if test="orderCondition == 0">
2849
order by b.create_time desc
2950
</if>

‎springboot-dubbo-web/src/main/java/com/lzq/web/controller/QueryController.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.lzq.api.dto.AccountResult;
55
import com.lzq.api.dto.ExampleAccount;
66
import com.lzq.api.pojo.Account;
7+
import com.lzq.api.pojo.Content;
78
import com.lzq.api.pojo.Example;
89
import com.lzq.api.service.*;
910
import com.lzq.web.utils.JWTUtils;
@@ -198,11 +199,12 @@ public Map<String, Object> getFanList(HttpServletRequest request, Account result
198199
* @param request
199200
* @param content 实例名获取实例名
200201
* @param currentPage 当前页
202+
* @param exampleContent content对象
201203
* @return
202204
*/
203-
@GetMapping("/queryByExampleName")
204-
@ApiOperation("根据实例名或者标签查询实例")
205-
public Map<String, Object> queryByExampleName(HttpServletRequest request, String content,
205+
@GetMapping("/queryExample")
206+
@ApiOperation("搜索框查询")
207+
public Map<String, Object> queryByExampleName(HttpServletRequest request, String queryContent, Content content,
206208
@RequestParam(defaultValue = "1") Integer currentPage,
207209
@RequestParam(defaultValue = "0") Integer orderCondition) {
208210
String username = null;
@@ -212,7 +214,7 @@ public Map<String, Object> queryByExampleName(HttpServletRequest request, String
212214
.getClaim("username").asString();
213215
}
214216
//先查询实例用户集合
215-
PageInfo<ExampleAccount> pageInfo = exampleAccountService.queryByExampleName(content, currentPage, orderCondition);
217+
PageInfo<ExampleAccount> pageInfo = exampleAccountService.queryExample(queryContent, currentPage, orderCondition, content);
216218
List<ExampleAccount> list = pageInfo.getList();
217219
//当用户不登陆时不需要进行任何操作查询数据直接返回
218220
if (username != null) {

0 commit comments

Comments
 (0)