wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加detail去重

Browse Source
This commit is contained in:
chenwenjian 2023-08-17 19:03:52 +08:00
parent 8c0a8051bb
commit 389692b0e2
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/constant/NanopartConstant.java
View File

@ -8,5 +8,7 @@ package cn.axzo.nanopart.api.constant;
* @version: 1.0
*/
public class NanopartConstant {
public static final String BASIC_FEIGN_PACKAGE = "cn.axzo.nanopart.api";
public static final String PHONE_REGEXP = "^1[3456789]\\d{9}$";
}

9
black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/request/BlackAndWhiteListReq.java
View File

@ -17,11 +17,20 @@ import java.util.Map;
@Data
public class BlackAndWhiteListReq {
/**
* 名单类型，0为黑名单，1为白名单
*/
@NotNull(message = "名单类型错误")
private ListTypeEnum type;
/**
* 模块名，自主定义，例：cms-login
*/
@NotBlank(message = "模块名不能为空")
private String module;
/**
* 限制条件，如：phone:13698745673
*/
private Map<String,Object> param;
}

3
black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/dao/repository/BlackAndWhiteListRepository.java
View File

@ -59,7 +59,8 @@ public class BlackAndWhiteListRepository extends ServiceImpl<BlackAndWhiteListMa
QueryWrapper<SaasBlackWhiteList> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type",req.getType().getValue())
.eq(StringUtils.isNotBlank(req.getModule()),"module",req.getModule())
.eq("is_delete",0);
.eq("is_delete",0)
.groupBy("type","param");
buildQueryWrapper(queryWrapper, req.getParam(), "");
return blackAndWhiteListMapper.selectList(queryWrapper);
}