Skip to content

Commit 1ee2c16

Browse files
committed
refactor: 优化数据库兼容性
1 parent c711b0e commit 1ee2c16

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/service/terms/ThirdPartyUserTermBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public SqlFragments createFragments(String columnFullName, RDBColumnMetadata col
4848
sqlFragments.addSql("not");
4949
}
5050
sqlFragments
51-
.addSql("exists(select 1 from ",getTableName("s_third_party_user_bind",column)," _bind where _bind.user_id =", columnFullName);
51+
.addSql("exists(select 1 from ",getTableName("s_third_party_user_bind",column)," bind_ where bind_.user_id =", columnFullName);
5252

5353
if (CollectionUtils.isEmpty(term.getOptions())) {
5454
throw new I18nSupportException("error.query_conditions_are_not_specified", column.getName()+"$user-third$type");
@@ -60,7 +60,7 @@ public SqlFragments createFragments(String columnFullName, RDBColumnMetadata col
6060
Arrays.fill(args, "?");
6161
sqlFragments
6262
.addSql(
63-
"and _bind.type = ? and _bind.provider in (", String.join(",", args), ")")
63+
"and bind_.type = ? and bind_.provider in (", String.join(",", args), ")")
6464
.addParameter(type)
6565
.addParameter(idList);
6666

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/events/handler/DeviceProductDeployHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void run(String... args) {
131131
productService
132132
.createQuery()
133133
.fetch()
134-
.filter(product -> new Byte((byte) 1).equals(product.getState()))
134+
.filter(product -> Byte.valueOf((byte) 1).equals(product.getState()))
135135
.flatMap(deviceProductEntity -> this
136136
.doRegisterMetadata(deviceProductEntity.getId(), deviceProductEntity.getMetadata())
137137
.onErrorResume(err -> {

jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/service/terms/AlarmBindRuleTerm.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ public SqlFragments createFragments(String columnFullName,
5959
}
6060

6161
sqlFragments
62-
.addSql("exists(select 1 from ", getTableName("s_alarm_rule_bind", column), " _bind where _bind.rule_id =", columnFullName);
62+
.addSql("exists(select 1 from ", getTableName("s_alarm_rule_bind", column), " bind_ where bind_.rule_id =", columnFullName);
6363

6464
List<Object> alarmId = convertList(column, term);
6565
sqlFragments
66-
.addSql("and _bind.alarm_id in (")
66+
.addSql("and bind_.alarm_id in (")
6767
.add(SqlUtils.createQuestionMarks(alarmId.size()))
6868
// )
6969
.add(SqlFragments.RIGHT_BRACKET)

jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/service/terms/RuleBindAlarmTerm.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,19 @@ public SqlFragments createFragments(String columnFullName,
7878
sqlFragments.addSql("not");
7979
}
8080
sqlFragments
81-
.addSql("exists(select 1 from ", getTableName("s_alarm_rule_bind", column), " _bind where _bind.alarm_id =", columnFullName);
81+
.addSql("exists(select 1 from ", getTableName("s_alarm_rule_bind", column), " bind_ where bind_.alarm_id =", columnFullName);
8282

8383
sqlFragments
8484
.addSql(
85-
"and _bind.rule_id in (",
85+
"and bind_.rule_id in (",
8686
bindTerm.ruleId.stream().map(r -> "?").collect(Collectors.joining(",")),
8787
")")
8888
.addParameter(bindTerm.ruleId);
8989

9090
if (CollectionUtils.isNotEmpty(bindTerm.branchId)) {
9191
sqlFragments
9292
.addSql(
93-
"and _bind.branch_index in (",
93+
"and bind_.branch_index in (",
9494
bindTerm.branchId.stream().map(r -> "?").collect(Collectors.joining(",")),
9595
")")
9696
.addParameter(bindTerm.branchId);

0 commit comments

Comments
 (0)