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

代码格式精简

Browse Source
This commit is contained in:
chenwenjian 2023-08-17 10:31:44 +08:00
parent 461f3a6c3c
commit 52d7982b7c
9 changed files with 44 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/BlackAndWhiteListApi.java
View File

@ -21,28 +21,35 @@ import java.util.List;
public interface BlackAndWhiteListApi {
/**
* 创建黑名单
* @param req
* @return
* 创建黑名单或白名单
* @param req 包含module和param两个字段
* @return 记录id
*/
@PostMapping("api/black-list/create")
@PostMapping("api/black-white-list/create")
ApiResult<Long> create(@RequestBody @Validated BlackAndWhiteListReq req);
/**
* 删除黑名单
* @return
* 删除黑名单或白名单
* @param req 包含module和param两个字段
* @return void
*/
@PostMapping("api/black-list/delete")
ApiResult<List<Long>> delete(@RequestBody @Validated BlackAndWhiteListReq req);
@PostMapping("api/black-white-list/delete")
ApiResult<Void> delete(@RequestBody @Validated BlackAndWhiteListReq req);
/**
* 查询黑名单
* @return
* 查询黑名单或白名单
* @param req 包含module和param两个字段
* @return 黑白名单记录列表
*/
@PostMapping("api/black-list/query")
@PostMapping("api/black-white-list/query")
ApiResult<List<BlackAndWhiteListResp>> detail(@RequestBody @Validated BlackAndWhiteListReq req);
@PostMapping("api/black-list/is-in")
/**
* 判断指定模块、指定参数记录是否在黑名单或白名单中
* @param req 包含module和param两个字段
* @return 若记录存在则返回true，否则返回false
*/
@PostMapping("api/black-white-list/is-in")
ApiResult<Boolean> isInBlackOrWhiteList(@RequestBody @Validated BlackAndWhiteListReq req);
}

15
black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/config/NanopartApiAutoConfiguration.java
View File

@ -1,15 +0,0 @@
//package cn.axzo.nanopart.api.config;
//
//import cn.axzo.nanopart.api.constant.NanopartConstant;
//import org.springframework.cloud.openfeign.EnableFeignClients;
//
///**
// * @author： chenwenjian
// * @date： 2023/8/11 16:28
// * @description：
// * @modifiedBy：
// * @version: 1.0
// */
//@EnableFeignClients(NanopartConstant.BASIC_FEIGN_PACKAGE)
//public class NanopartApiAutoConfiguration {
//}

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

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

3
black-list/black-list-api/src/main/java/cn/axzo/nanopart/api/response/BlackAndWhiteListResp.java
View File

@ -3,6 +3,7 @@ package cn.axzo.nanopart.api.response;
import lombok.Data;
import java.util.Date;
import java.util.Map;
/**
* @author： chenwenjian
@ -24,7 +25,7 @@ public class BlackAndWhiteListResp {
/**
* 参数
*/
private String param;
private Map<String,Object> param;
private Date createAt;

2
black-list/black-list-api/src/main/resources/META-INF/spring.factories.bak
View File

@ -1,2 +0,0 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
cn.axzo.nanopart.api.config.NanopartApiAutoConfiguration

2
black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/controller/BlackAndWhiteListController.java
View File

@ -29,7 +29,7 @@ public class BlackAndWhiteListController implements BlackAndWhiteListApi {
}
@Override
public ApiResult<List<Long>> delete(BlackAndWhiteListReq req) {
public ApiResult<Void> delete(BlackAndWhiteListReq req) {
return blackAndWhiteListService.delete(req);
}

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

@ -6,6 +6,7 @@ import cn.axzo.nanopart.api.request.BlackAndWhiteListReq;
import cn.axzo.nanopart.server.dao.entity.SaasBlackWhiteList;
import cn.axzo.nanopart.server.dao.mapper.BlackAndWhiteListMapper;
import cn.azxo.framework.common.utils.StringUtils;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
@ -13,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
import org.json.JSONObject;
import org.springframework.stereotype.Repository;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -34,26 +34,25 @@ public class BlackAndWhiteListRepository extends ServiceImpl<BlackAndWhiteListMa
public Long create(BlackAndWhiteListReq req){
SaasBlackWhiteList blackWhiteList = BeanMapper.copyBean(req, SaasBlackWhiteList.class);
blackWhiteList.setCreateAt(new Date(System.currentTimeMillis()));
blackWhiteList.setUpdateAt(new Date(System.currentTimeMillis()));
Date nowTime = new Date(System.currentTimeMillis());
blackWhiteList.setCreateAt(nowTime);
blackWhiteList.setUpdateAt(nowTime);
blackAndWhiteListMapper.insert(blackWhiteList);
return blackWhiteList.getId();
}
public List<Long> delete(BlackAndWhiteListReq req) {
public Void delete(BlackAndWhiteListReq req) {
List<SaasBlackWhiteList> blackWhiteLists = detail(req);
ArrayList<Long> deletedList = new ArrayList<>();
if (blackWhiteLists!=null&&blackWhiteLists.size()>0){
blackWhiteLists.stream().forEach(saasBlackWhiteList -> {
if (CollectionUtil.isNotEmpty(blackWhiteLists)){
blackWhiteLists.forEach(saasBlackWhiteList -> {
lambdaUpdate().eq(SaasBlackWhiteList::getId,saasBlackWhiteList.getId())
.eq(SaasBlackWhiteList::getIsDelete,0)
.set(SaasBlackWhiteList::getIsDelete,saasBlackWhiteList.getId())
.update();
deletedList.add(saasBlackWhiteList.getId());
log.info("deleted record:{}", JSONObject.valueToString(saasBlackWhiteList));
});
}
return deletedList;
return null;
}
public List<SaasBlackWhiteList> detail(BlackAndWhiteListReq req) {
@ -65,9 +64,7 @@ public class BlackAndWhiteListRepository extends ServiceImpl<BlackAndWhiteListMa
}
private void buildQueryWrapper(QueryWrapper<SaasBlackWhiteList> queryWrapper, Map<String, Object> params, String prefix) {
params.entrySet().stream().forEach(entry -> {
String key = entry.getKey();
Object value = entry.getValue();
params.forEach((key, value) -> {
String fullKey = prefix.isEmpty() ? key : prefix + "." + key;
if (value instanceof Map) {
buildQueryWrapper(queryWrapper, (Map<String, Object>) value, fullKey);

2
black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/service/BlackAndWhiteListService.java
View File

@ -18,7 +18,7 @@ public interface BlackAndWhiteListService {
ApiResult<Long> create(BlackAndWhiteListReq req);
ApiResult<List<Long>> delete(BlackAndWhiteListReq req);
ApiResult<Void> delete(BlackAndWhiteListReq req);
ApiResult<List<BlackAndWhiteListResp>> detail(BlackAndWhiteListReq req);

34
black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/service/impl/BlackAndWhiteListServiceImpl.java
View File

@ -7,9 +7,9 @@ import cn.axzo.nanopart.api.response.BlackAndWhiteListResp;
import cn.axzo.nanopart.server.dao.entity.SaasBlackWhiteList;
import cn.axzo.nanopart.server.dao.repository.BlackAndWhiteListRepository;
import cn.axzo.nanopart.server.service.BlackAndWhiteListService;
import cn.hutool.core.collection.CollectionUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.json.JSONObject;
import org.springframework.stereotype.Service;
import java.util.List;
@ -30,8 +30,8 @@ public class BlackAndWhiteListServiceImpl implements BlackAndWhiteListService {
/**
* 新增一条黑白名单记录
* @param req
* @return
* @param req 包含module和param两个字段
* @return 记录id
*/
@Override
public ApiResult<Long> create(BlackAndWhiteListReq req) {
@ -41,44 +41,34 @@ public class BlackAndWhiteListServiceImpl implements BlackAndWhiteListService {
/**
* 删除指定条件的所有黑白名单记录
*
* @param req
* @return
* @param req 包含module和param两个字段
* @return null
*/
@Override
public ApiResult<List<Long>> delete(BlackAndWhiteListReq req) {
public ApiResult<Void> delete(BlackAndWhiteListReq req) {
return ApiResult.ok(blackAndWhiteListRepository.delete(req));
}
/**
* 查询指定条件的所有黑白名单记录
* @param req
* @return
* @param req 包含module和param两个字段
* @return 记录列表
*/
@Override
public ApiResult<List<BlackAndWhiteListResp>> detail(BlackAndWhiteListReq req) {
List<SaasBlackWhiteList> saasBlackWhiteLists = blackAndWhiteListRepository.detail(req);
List<BlackAndWhiteListResp> blackAndWhiteListResps = BeanMapper.copyList(saasBlackWhiteLists, BlackAndWhiteListResp.class, (saasBlackWhiteList, blackAndWhiteListResp) -> {
JSONObject jsonObject = new JSONObject(saasBlackWhiteList.getParam());
blackAndWhiteListResp.setParam(jsonObject.toString());
// String jsonObjectString = jsonObject.toString();
// // 将json串中的\去除并返回
// String formattedJson = jsonObjectString.replace("", "");
// blackAndWhiteListResp.setParam(formattedJson);
});
List<BlackAndWhiteListResp> blackAndWhiteListResps = BeanMapper.copyList(saasBlackWhiteLists, BlackAndWhiteListResp.class);
return ApiResult.ok(blackAndWhiteListResps);
}
/**
* 判断是否存在指定条件的黑白名单记录
* @param req
* @return
* @param req 包含module和param两个字段
* @return 记录存在返回true，否则返回false
*/
@Override
public ApiResult<Boolean> isInBlackOrWhiteList(BlackAndWhiteListReq req) {
List<SaasBlackWhiteList> blackWhiteLists = blackAndWhiteListRepository.detail(req);
if (blackWhiteLists!=null&&blackWhiteLists.size()>0){
return ApiResult.ok(true);
}
return ApiResult.ok(false);
return ApiResult.ok(CollectionUtil.isNotEmpty(blackWhiteLists));
}
}