lywsvip/magic-api
1
0
Fork 0
mirror of https://gitee.com/ssssssss-team/magic-api.git synced 2026-06-08 01:48:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.[新增]查询过滤无效数据

Browse Source 
2.[优化]save方法判断是insert or update考虑并发插入
This commit is contained in:
wangshuai
2021-07-15 16:58:10 +08:00
parent 41760c2533
commit 875fc6efd9
5 changed files with 90 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/CrudConfig.java
View File

@@ -15,6 +15,10 @@ public class CrudConfig {
* 逻辑删除值
*/
private String logicDeleteValue="0";
/**
* 是否控制并发插入
*/
private boolean isLimitParallel=false;
public String getLogicDeleteColumn() {
return logicDeleteColumn;
@@ -31,4 +35,12 @@ public class CrudConfig {
public void setLogicDeleteValue(String logicDeleteValue) {
this.logicDeleteValue = logicDeleteValue;
}
public boolean isLimitParallel() {
return isLimitParallel;
}
public void setLimitParallel(boolean limitParallel) {
isLimitParallel = limitParallel;
}
}

1
magic-api-spring-boot-starter/src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java
View File

@@ -403,6 +403,7 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer, WebSocketCon
sqlModule.setDialectAdapter(dialectAdapter);
sqlModule.setLogicDeleteColumn(properties.getCrudConfig().getLogicDeleteColumn());
sqlModule.setLogicDeleteValue(properties.getCrudConfig().getLogicDeleteColumn());
sqlModule.setLimitParallel(properties.getCrudConfig().isLimitParallel());
return sqlModule;
}

9
magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java
View File

@@ -65,6 +65,7 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
private long ttl;
private String logicDeleteColumn;
private String logicDeleteValue;
private boolean isLimitParallel;
public SQLModule() {
}
@@ -149,6 +150,14 @@ public class SQLModule extends HashMap<String, SQLModule> implements MagicModule
this.logicDeleteValue = logicDeleteValue;
}
public boolean isLimitParallel() {
return isLimitParallel;
}
public void setLimitParallel(boolean limitParallel) {
isLimitParallel = limitParallel;
}
protected SqlCache getSqlCache() {
return sqlCache;
}

57
magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java
View File

@@ -8,6 +8,9 @@ import org.ssssssss.magicapi.modules.SQLModule;
import org.ssssssss.script.annotation.Comment;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -15,7 +18,7 @@ import java.util.stream.Collectors;
* @author
*/
public class NamedTable {
private static Lock lock = new ReentrantLock();
String tableName;
SQLModule sqlModule;
@@ -23,6 +26,7 @@ public class NamedTable {
String primary;
String logicDeleteColumn;
String logicDeleteValue;
boolean isLimitParallel;
Map<String, Object> columns = new HashMap<>();
List<String> fields = new ArrayList<>();
@@ -41,8 +45,9 @@ public class NamedTable {
this.tableName = tableName;
this.sqlModule = sqlModule;
this.rowMapColumnMapper = rowMapColumnMapper;
this.logicDeleteColumn =sqlModule.getLogicDeleteColumn();
this.logicDeleteValue =sqlModule.getLogicDeleteValue();
this.logicDeleteColumn = sqlModule.getLogicDeleteColumn();
this.logicDeleteValue = sqlModule.getLogicDeleteValue();
this.isLimitParallel = sqlModule.isLimitParallel();
}
@Comment("设置主键名，update时使用")
@@ -163,7 +168,7 @@ public class NamedTable {
}
@Comment("执行delete语句")
public int delete(@Comment("是否逻辑删除")boolean isLogicDelete) {
public int delete(@Comment("是否逻辑删除") boolean isLogicDelete) {
if (where.isEmpty()) {
throw new MagicAPIException("delete语句不能没有条件");
}
@@ -194,20 +199,34 @@ public class NamedTable {
if (StringUtils.isNotBlank(primaryValue)) {
List<Object> params = new ArrayList<>();
params.add(primaryValue);
Integer count = sqlModule.selectInt(new BoundSql("select count(1) count from " + this.tableName + " where " + this.primary + " = ?", params, sqlModule));
if (count == 0) {
return insert(data);
if (isLimitParallel) {
lock.lock();
}
try {
Integer count = sqlModule.selectInt(new BoundSql("select count(*) count from " + this.tableName + " where " + this.primary + " = ?", params, sqlModule));
if (count == 0) {
return insert(data);
}
return update(data);
} catch (Exception e) {
e.printStackTrace();
} finally {
if (isLimitParallel) {
lock.unlock();
}
}
return update(data);
} else {
return insert(data);
}
}
if (StringUtils.isNotBlank(primaryValue)) {
return update(data);
}
return insert(data);
}
@Comment("保存到表中，当主键有值时则修改，否则插入")
public Object save(boolean beforeQuery) {
return this.save(null, beforeQuery);
@@ -219,18 +238,31 @@ public class NamedTable {
}
@Comment("执行`select`查询")
public List<Map<String, Object>> select() {
return sqlModule.select(buildSelect());
}
@Comment("执行`select`查询")
public List<Map<String, Object>> select(@Comment("排除无效数据") boolean excludeInvalid) {
return sqlModule.select(buildSelect(excludeInvalid));
}
@Comment("执行`selectOne`查询")
public Map<String, Object> selectOne() {
return sqlModule.selectOne(buildSelect());
}
@Comment("执行`selectOne`查询")
public Map<String, Object> selectOne(@Comment("排除无效数据") boolean excludeInvalid) {
return sqlModule.selectOne(buildSelect(excludeInvalid));
}
private BoundSql buildSelect() {
return buildSelect(false);
}
private BoundSql buildSelect(boolean excludeInvalid) {
StringBuilder builder = new StringBuilder();
builder.append("select ");
if (this.fields.isEmpty()) {
@@ -240,7 +272,9 @@ public class NamedTable {
}
builder.append(" from ").append(tableName);
List<Object> params = new ArrayList<>();
where.and(excludeInvalid, it -> where.ne(logicDeleteColumn, logicDeleteValue));
if (!where.isEmpty()) {
where.and();
builder.append(where.getSql());
params.addAll(where.getParams());
}
@@ -260,6 +294,11 @@ public class NamedTable {
return sqlModule.page(buildSelect());
}
@Comment("执行分页查询")
public Object page(@Comment("排除无效数据") boolean excludeInvalid) {
return sqlModule.page(buildSelect(excludeInvalid));
}
@Comment("执行update语句")
public int update() {
return update(null);

24
magic-api/src/main/java/org/ssssssss/magicapi/modules/table/Where.java
View File

@@ -385,24 +385,40 @@ public class Where {
return namedTable.delete();
}
@Comment("执行delete语句")
public int delete(@Comment("是否逻辑删除")boolean isLogicDelete) {
return namedTable.delete(isLogicDelete);
}
@Comment("执行update语句")
public int update(@Comment("各项列和值") Map<String, Object> data) {
return namedTable.update(data);
}
@Comment("执行update语句")
public int update(@Comment("各项列和值") Map<String, Object> data,@Comment("是否更新空值字段") boolean isUpdateBlank) {
return namedTable.update(data,isUpdateBlank);
}
@Comment("执行分页查询")
public Object page() {
return namedTable.page();
}
@Comment("执行分页查询")
public Object page(@Comment("排除无效数据") boolean excludeInvalid) {
return namedTable.page();
}
@Comment("执行select查询")
public List<Map<String, Object>> select() {
return namedTable.select();
}
@Comment("执行select查询")
public List<Map<String, Object>> select(@Comment("排除无效数据") boolean excludeInvalid) {
return namedTable.select(excludeInvalid);
}
@Comment("执行selectOne查询")
public Map<String, Object> selectOne() {
return namedTable.selectOne();
}
@Comment("执行selectOne查询")
public Map<String, Object> selectOne(@Comment("排除无效数据") boolean excludeInvalid) {
return namedTable.selectOne(excludeInvalid);
}
}