root/nl-sso-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-15 16:07:40 +08:00
parent 8fea54e226
commit c00558fce3
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/BaseQuery.java
View File

@@ -16,10 +16,10 @@ import java.util.Map;
@Data @Data
public class BaseQuery<T> { public class BaseQuery<T> {
public Map<String, QParam> doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK) public Map<String, QParam> doP = MapOf.of("blurry", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build()
,"startTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LT) ,"startTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LT).build()
,"endTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LE) ,"endTime", QParam.builder().k(new String[]{"createTime"}).type(QueryTEnum.LE).build()
,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY) ,"sort", QParam.builder().k(new String[]{"sort"}).type(QueryTEnum.BY).build()
); );
private String blurry; private String blurry;
@@ -30,14 +30,12 @@ public class BaseQuery<T> {
private Date endTime; private Date endTime;
private String sort;
public QueryWrapper<T> build(){ public QueryWrapper<T> build(){
this.paramMapping(); this.paramMapping();
QueryWrapper<T> wrapper = new QueryWrapper<>(); QueryWrapper<T> wrapper = new QueryWrapper<>();
JSONObject json = (JSONObject)JSONObject.toJSON(this); JSONObject json = (JSONObject)JSONObject.toJSON(this);
json.forEach((key, vel) -> { json.forEach((key, vel) -> {
if (vel != null){ if (vel != null && !key.equals("doP")){
QParam qParam = doP.get(key); QParam qParam = doP.get(key);
if (qParam != null){ if (qParam != null){
QueryTEnum.build(qParam.type,wrapper,qParam.k,vel); QueryTEnum.build(qParam.type,wrapper,qParam.k,vel);

11
nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/PageQuery.java
View File

@@ -7,6 +7,7 @@ import lombok.Data;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.Locale;
/** /**
@@ -56,12 +57,10 @@ public class PageQuery implements Serializable {
Page<T> page = new Page<>(pageNum, pageSize); Page<T> page = new Page<>(pageNum, pageSize);
if (StringUtils.isNotEmpty(sort)){ if (StringUtils.isNotEmpty(sort)){
String[] split = sort.split(","); String[] split = sort.split(",");
for (String col : split) { String col = split[0];
OrderItem item = new OrderItem(); OrderItem item = new OrderItem();
item.setColumn(col); item.setColumn(split[0]);
item.setAsc(isAsc); item.setAsc(split[1].toLowerCase(Locale.ROOT).equals("asc"));
page.addOrder(item);
}
} }
return page; return page;
} }

3
nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java
View File

@@ -1,6 +1,9 @@
package org.nl.common.domain.query; package org.nl.common.domain.query;
import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.nl.common.enums.QueryTEnum; import org.nl.common.enums.QueryTEnum;
/* /*

2
nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java
View File

@@ -27,7 +27,7 @@ public class SysUser implements Serializable {
/** /**
* 用户标识 * 用户标识
*/ */
@TableId(value = "user_id", type = IdType.AUTO) @TableId(value = "user_id", type = IdType.INPUT)
private Long userId; private Long userId;
/** /**