|
@@ -390,7 +390,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
|
if (!Check.isNull(ruleDatas)) {
|
|
|
JSONArray okData = new JSONArray();
|
|
|
for (int i = 0; i < ruleDatas.size(); i++) {
|
|
|
- JSONObject targetEntity = dimensionData.getJSONObject(i);
|
|
|
+ JSONObject targetEntity = ruleDatas.getJSONObject(i);
|
|
|
String value = targetEntity.getString(ruleBase.getIndicatorCode());
|
|
|
if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, targetEntity)) {
|
|
|
okData.add(targetEntity);
|
|
@@ -527,8 +527,8 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
|
} else if ("TEL".equals(sendType)) {
|
|
|
|
|
|
} else {
|
|
|
-// sendMessageService.sendMessage("1b3deb8258e84df994f1371a51cfc14a", msg);
|
|
|
- sendMessageService.sendMessage(user.getString("id"), msg);
|
|
|
+ sendMessageService.sendMessage("1b3deb8258e84df994f1371a51cfc14a", msg);
|
|
|
+// sendMessageService.sendMessage(user.getString("id"), msg);
|
|
|
Thread.sleep(200);
|
|
|
}
|
|
|
if (!Check.isNull(msg)) {
|