common-frame/hcframe
17
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

feat: fix bugs,fix date query

Browse Source
This commit is contained in:
taixingyiji
2025-04-01 16:00:50 +08:00
parent 0e9da0de20
commit 58709fdc53
4 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/BaseMapperImpl.java
View File

@@ -95,20 +95,20 @@ public class BaseMapperImpl implements BaseMapper {
}
public Map<String, Object> formatMap(Map<String, Object> data) {
// 遍历 Map 并转换值
for (Map.Entry<String, Object> entry : data.entrySet()) {
Object value = entry.getValue();
if (value instanceof String) {
String strValue = (String) value;
if (strValue.matches("-?\\d+")) { // 匹配整数
data.put(entry.getKey(), Long.parseLong(strValue));
} else if (strValue.matches("-?\\d*\\.\\d+")) { // 匹配浮点数
data.put(entry.getKey(), (long) Double.parseDouble(strValue));
}
} else if (value instanceof Number) {
data.put(entry.getKey(), ((Number) value).longValue());
}
}
// // 遍历 Map 并转换值
// for (Map.Entry<String, Object> entry : data.entrySet()) {
// Object value = entry.getValue();
// if (value instanceof String) {
// String strValue = (String) value;
// if (strValue.matches("-?\\d+")) { // 匹配整数
// data.put(entry.getKey(), Long.parseLong(strValue));
// } else if (strValue.matches("-?\\d*\\.\\d+")) { // 匹配浮点数
// data.put(entry.getKey(), (long) Double.parseDouble(strValue));
// }
// } else if (value instanceof Number) {
// data.put(entry.getKey(), ((Number) value).longValue());
// }
// }
return data;
}

16
hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/Condition.java
View File

@@ -241,14 +241,14 @@ public class Condition implements Serializable {
}
private Object formatValue(Object value) {
if(value instanceof String) {
String str = (String)value;
if (str.matches("-?\\d+")) { // 匹配整数
return Long.parseLong(str);
} else if (str.matches("-?\\d*\\.\\d+")) { // 匹配浮点数
return Double.parseDouble(str);
}
}
// if(value instanceof String) {
// String str = (String)value;
// if (str.matches("-?\\d+")) { // 匹配整数
// return Long.parseLong(str);
// } else if (str.matches("-?\\d*\\.\\d+")) { // 匹配浮点数
// return Double.parseDouble(str);
// }
// }
return value;
}

54
hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/WebCondition.java
View File

@@ -1,6 +1,8 @@
package com.taixingyiji.base.module.data.module;
import cn.hutool.core.date.DateUtil;
import com.taixingyiji.base.module.data.constants.QueryConstants;
import com.taixingyiji.base.module.datasource.utils.DataUnit;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -44,30 +46,46 @@ public class WebCondition {
return valueList;
}
public static Condition.ConditionBuilder setSign(WebCondition webCondition,Condition.ConditionBuilder builder) {
public static Condition.ConditionBuilder setSign(WebCondition webCondition, Condition.ConditionBuilder builder, String dataType) {
if (DataUnit.HANGO.equals(dataType)) {
if (webCondition.key.toUpperCase().contains("TIME") && webCondition.value instanceof String) {
try {
webCondition.value = DateUtil.parse((String) webCondition.value);
} catch (Exception ignored) {
}
}
}
switch (webCondition.getSign()) {
case QueryConstants.LIKE:{
return builder.like(webCondition.key, "%"+webCondition.value+"%");
case QueryConstants.LIKE: {
return builder.like(webCondition.key, "%" + webCondition.value + "%");
}
case QueryConstants.EQUAL:{
return builder.equal(webCondition.key,webCondition.value);
case QueryConstants.EQUAL: {
return builder.equal(webCondition.key, webCondition.value);
}
case QueryConstants.BETWEEN:{
return builder.between(webCondition.key, webCondition.value,webCondition.sValue);
case QueryConstants.BETWEEN: {
if (DataUnit.HANGO.equals(dataType)) {
if (webCondition.key.toUpperCase().contains("TIME") && webCondition.sValue instanceof String) {
try {
webCondition.sValue = DateUtil.parse((String) webCondition.sValue);
} catch (Exception ignored) {
}
}
}
return builder.between(webCondition.key, webCondition.value, webCondition.sValue);
}
case QueryConstants.GT:{
case QueryConstants.GT: {
return builder.gt(webCondition.key, webCondition.value);
}
case QueryConstants.GTE:{
case QueryConstants.GTE: {
return builder.gte(webCondition.key, webCondition.value);
}
case QueryConstants.LT:{
case QueryConstants.LT: {
return builder.lt(webCondition.key, webCondition.value);
}
case QueryConstants.LTE:{
case QueryConstants.LTE: {
return builder.lte(webCondition.key, webCondition.value);
}
case QueryConstants.IN:{
case QueryConstants.IN: {
String[] strings = webCondition.value.toString().split(",");
return builder.in(webCondition.key, Arrays.asList(strings));
}
@@ -76,12 +94,12 @@ public class WebCondition {
}
}
public static Condition.ConditionBuilder setLogic(WebCondition webCondition,Condition.ConditionBuilder builder) {
public static Condition.ConditionBuilder setLogic(WebCondition webCondition, Condition.ConditionBuilder builder) {
switch (webCondition.getLogic()) {
case QueryConstants.AND:{
case QueryConstants.AND: {
return builder.and();
}
case QueryConstants.OR:{
case QueryConstants.OR: {
return builder.or();
}
default:
@@ -89,12 +107,12 @@ public class WebCondition {
}
}
public static Condition.ConditionBuilder setCurves(WebCondition webCondition,Condition.ConditionBuilder builder) {
public static Condition.ConditionBuilder setCurves(WebCondition webCondition, Condition.ConditionBuilder builder) {
switch (webCondition.getCurves()) {
case QueryConstants.L_CURVES:{
case QueryConstants.L_CURVES: {
return builder.leftCurves();
}
case QueryConstants.R_CURVES:{
case QueryConstants.R_CURVES: {
return builder.rightCurves();
}
default:

2
hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/service/impl/TableServiceImpl.java
View File

@@ -233,7 +233,7 @@ public class TableServiceImpl implements TableService {
if (!StringUtils.isEmpty(webCondition.getCurves())) {
builder = WebCondition.setCurves(webCondition, builder);
}
builder = WebCondition.setSign(webCondition, builder);
builder = WebCondition.setSign(webCondition, builder,baseMapper.getDataConfig());
}
return builder;
}