suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhouhao 2020-07-20 21:01:24 +08:00
parent bbef8be109 64df73abdb
commit b7adb65eb7
2 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetlinks-components/rule-engine-component/src/main/java/org/jetlinks/community/rule/engine/messaging/RuleEngineSubscriptionProvider.java
View File

@ -36,7 +36,7 @@ public class RuleEngineSubscriptionProvider implements SubscriptionProvider {
@Override
public Flux<Message> subscribe(SubscribeRequest request) {
return messageGateway.subscribe(Subscription.asList(request.getTopic()), "rule:sub:" + request.getId(), true)
return messageGateway.subscribe(Subscription.asList(request.getTopic()),messageGateway.nextSubscriberId( "rule:sub:" + request.getId()), true)
.map(msg -> Message.success(request.getId(), msg.getTopic(), msg.convertMessage()));
}
}

64
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/term/DeviceTagTerm.java
View File

@ -1,5 +1,6 @@
package org.jetlinks.community.device.service.term;
import com.alibaba.fastjson.JSON;
import org.hswebframework.ezorm.core.param.Term;
import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
import org.hswebframework.ezorm.rdb.operator.builder.fragments.PrepareSqlFragments;
@ -7,6 +8,12 @@ import org.hswebframework.ezorm.rdb.operator.builder.fragments.SqlFragments;
import org.hswebframework.ezorm.rdb.operator.builder.fragments.term.AbstractTermFragmentBuilder;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* where("id$dev-tag$location","重庆")
*/
@ -16,39 +23,70 @@ public class DeviceTagTerm extends AbstractTermFragmentBuilder {
super("dev-tag", "根据设备标签查询设备");
}
private void acceptTerm(PrepareSqlFragments fragments, String terms) {
List<Map<String, String>> tags;
//json
if (terms.startsWith("[")) {
//
tags = (List) JSON.parseArray(terms, Map.class);
} else if (terms.startsWith("{")) {
acceptTerm(fragments, JSON.parseObject(terms));
return;
} else {
tags = Stream.of(terms.split("[,]"))
.map(str -> str.split("[:]"))
.map(str -> {
Map<String, String> tag = new HashMap<>();
tag.put("key", str[0]);
tag.put("value", str.length > 1 ? str[1] : null);
return tag;
})
.collect(Collectors.toList());
}
String[] tags = terms.split("[,]");
acceptTerm(fragments, tags);
}
private void acceptTerm(PrepareSqlFragments fragments, Map<?, ?> terms) {
acceptTerm(fragments, terms.entrySet().stream().map(e -> {
Map<String, String> tag = new HashMap<>();
tag.put("key", String.valueOf(e.getKey()));
tag.put("value", String.valueOf(e.getValue()));
return tag;
}).collect(Collectors.toList()));
}
private void acceptTerm(PrepareSqlFragments fragments, List<Map<String, String>> tags) {
int len = 0;
fragments.addSql("and (");
for (String tag : tags) {
String[] kv = tag.split("[:]");
if (kv.length != 2) {
continue;
}
for (Map<String, String> tag : tags) {
if (len++ > 0) {
fragments.addSql("or");
}
fragments.addSql("(d.key = ? and d.value like ?)").addParameter(kv[0], kv[1]);
fragments.addSql("(d.key = ? and d.value like ?)").addParameter(tag.get("key"), tag.get("value"));
}
if (tags.isEmpty()) {
fragments.addSql("1=2");
}
fragments.addSql(")");
}
@Override
public SqlFragments createFragments(String columnFullName, RDBColumnMetadata column, Term term) {
String val = String.valueOf(term.getValue());
PrepareSqlFragments fragments = PrepareSqlFragments.of();
fragments.addSql("exists(select 1 from dev_device_tags d where d.device_id =", columnFullName);
Object value = term.getValue();
acceptTerm(fragments,val);
if (value instanceof Map) {
acceptTerm(fragments, (Map<?, ?>) value);
} else if (value instanceof List) {
acceptTerm(fragments, (List<Map<String, String>>) value);
} else {
acceptTerm(fragments, String.valueOf(value));
}
fragments.addSql(")");