Ver código fonte

Merge branch 'master_rule_engine' of http://git.tjyourong.com.cn/ctop/adsp-boot into master_rule_engine

zhaoxian 4 anos atrás
pai
commit
78f7cb5680

+ 11 - 1
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/vo/TemplateAppliedVo.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.alarm.modules.entity.vo;
 package cn.com.ctop.alarm.modules.entity.vo;
 
 
 public class TemplateAppliedVo {
 public class TemplateAppliedVo {
+    private Long id;
     private Long accountId;
     private Long accountId;
     private String authName;
     private String authName;
     private Long templateId;
     private Long templateId;
@@ -10,6 +11,14 @@ public class TemplateAppliedVo {
     private String userId;
     private String userId;
     private String userName;
     private String userName;
 
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getAccountId() {
     public Long getAccountId() {
         return accountId;
         return accountId;
     }
     }
@@ -77,7 +86,8 @@ public class TemplateAppliedVo {
     @Override
     @Override
     public String toString() {
     public String toString() {
         return "TemplateAppliedVo{" +
         return "TemplateAppliedVo{" +
-                "accountId=" + accountId +
+                "id=" + id +
+                ", accountId=" + accountId +
                 ", authName='" + authName + '\'' +
                 ", authName='" + authName + '\'' +
                 ", templateId=" + templateId +
                 ", templateId=" + templateId +
                 ", templateName='" + templateName + '\'' +
                 ", templateName='" + templateName + '\'' +

+ 1 - 0
module-alarm/src/main/java/cn/com/ctop/alarm/modules/mapper/xml/RuleAccountTemplateMapper.xml

@@ -5,6 +5,7 @@
     <select id="getTemplateApplied" parameterType="Map"
     <select id="getTemplateApplied" parameterType="Map"
             resultType="cn.com.ctop.alarm.modules.entity.vo.TemplateAppliedVo">
             resultType="cn.com.ctop.alarm.modules.entity.vo.TemplateAppliedVo">
         select
         select
+        t1.id id,
         t1.account_id accountId,
         t1.account_id accountId,
         t2.auth_name authName,
         t2.auth_name authName,
         t1.template_id templateId,
         t1.template_id templateId,

+ 0 - 3
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleAccountThresholdServiceImpl.java

@@ -82,9 +82,6 @@ public class RuleAccountThresholdServiceImpl extends ServiceImpl<RuleAccountThre
                             continue;
                             continue;
                         }
                         }
                         String threshold = ruleJson.getString("threshold");
                         String threshold = ruleJson.getString("threshold");
-                        if (Check.isNull(threshold)) {
-                            continue;
-                        }
                         RuleAccountThreshold addRuleAccountThreshold = new RuleAccountThreshold();
                         RuleAccountThreshold addRuleAccountThreshold = new RuleAccountThreshold();
                         addRuleAccountThreshold.setAccountId(accountId);
                         addRuleAccountThreshold.setAccountId(accountId);
                         addRuleAccountThreshold.setGroupId(groupId);
                         addRuleAccountThreshold.setGroupId(groupId);