From 9b4148bdc413febecc814bdd39f033a89810af01 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 15 Dec 2022 18:22:44 +0800 Subject: [PATCH] user --- .../org/nl/common/domain/query/BaseQuery.java | 33 ++++++++++++------- .../java/org/nl/common/enums/QueryTEnum.java | 1 + .../java/org/nl/config/WebSocketConfig.java | 2 +- .../user/dao/mapper/SysUserMapper.java | 4 +++ .../service/user/dao/mapper/SysUserMapper.xml | 4 ++- .../src/main/resources/config/application.yml | 1 + .../src/test/java/org/nl/sso/MybatisTest.java | 7 ++-- 7 files changed, 36 insertions(+), 16 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java index 0d22889..5a6cfd8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java @@ -15,21 +15,32 @@ import java.util.Map; */ @Data public class BaseQuery { - - public Map doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build() - ,"startTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LT).build() - ,"endTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LE).build() - ,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build() - ); - + /** + * 模糊查询 + */ private String blurry; - - private String isUsed; - + /** + * 是否启用 + */ + private Boolean isUsed; + /** + * 创建时间范围查询 + */ private Date startTime; - private Date endTime; + + /** + * 字段映射Map:指定字段对应QueryWrapper的查询类型 + * @see org.nl.common.enums.QueryTEnum + * 通过buid构建 + */ + public Map doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build() + ,"startTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LT).build() + ,"endTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LE).build() + ,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build() + ); + public QueryWrapper build(){ this.paramMapping(); QueryWrapper wrapper = new QueryWrapper<>(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java index 8560071..14ce068 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java @@ -18,6 +18,7 @@ public enum QueryTEnum { LK((q, keys, o) -> { for (String key : keys) { q.like(key,o); } }), LE((q, k, v) -> { q.le(k[0],v); }), BY((q, k, v) -> { q.orderByDesc(k[0],v); }), + NO((q, k, v) -> { q.isNull(k[0]); }), LT((q, k, v) -> { q.lt(k[0],v); }); private LConsumer doP; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java index 28a447c..ec08886 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java @@ -23,7 +23,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; * @author ZhangHouYing * @date 2019-08-24 15:44 */ -@Configuration +//@Configuration public class WebSocketConfig { @Bean diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java index f7681be..2061d2a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java @@ -3,6 +3,8 @@ package org.nl.system.service.user.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.system.service.user.dao.SysUser; +import java.util.List; + /** *

* 用户表 Mapper 接口 @@ -13,4 +15,6 @@ import org.nl.system.service.user.dao.SysUser; */ public interface SysUserMapper extends BaseMapper { + List selectAl(); + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml index ecf1b48..767b972 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml @@ -1,5 +1,7 @@ - + diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 78f023f..f1095d4 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -75,6 +75,7 @@ security: # actuator 监控配置 - /actuator - /actuator/** + - /** # 上传 - /api/localStorage/pictures # 参数 diff --git a/nladmin-system/nlsso-server/src/test/java/org/nl/sso/MybatisTest.java b/nladmin-system/nlsso-server/src/test/java/org/nl/sso/MybatisTest.java index 0b7be44..2a0d046 100644 --- a/nladmin-system/nlsso-server/src/test/java/org/nl/sso/MybatisTest.java +++ b/nladmin-system/nlsso-server/src/test/java/org/nl/sso/MybatisTest.java @@ -6,6 +6,7 @@ import org.nl.AppRun; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; +import org.nl.system.service.user.dao.mapper.SysUserMapper; import org.springframework.boot.test.context.SpringBootTest; import javax.annotation.Resource; @@ -20,11 +21,11 @@ import java.util.List; public class MybatisTest { @Resource - ISysUserService sysUserService; + SysUserMapper sysUserMapper; @Test public void mybatisTest(){ - List list = sysUserService.list(); - System.out.println(JSON.toJSONString(list)); + List sysUsers = sysUserMapper.selectAl(); + System.out.println(sysUsers.size()); } }