Преглед изворни кода

Merge remote-tracking branch 'origin/master_rule_engine' into master_rule_engine

jiequan.bi пре 4 година
родитељ
комит
600636bdfe

+ 7 - 7
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleAccountThreshold.java

@@ -1,21 +1,17 @@
 package cn.com.ctop.alarm.modules.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.util.Date;
+
 /**
  * 规则关联账户 阈值
  *
@@ -42,6 +38,10 @@ public class RuleAccountThreshold {
     @Excel(name = "账户id", width = 15)
     @ApiModelProperty(value = "账户id")
     private Long accountId;
+
+    private Long groupId; // 组id
+    private String batchNo; // 批次号
+
     /**
      * 规则id
      */
@@ -53,7 +53,7 @@ public class RuleAccountThreshold {
      */
     @Excel(name = "阈值", width = 15)
     @ApiModelProperty(value = "阈值")
-    private String threshoId;
+    private String threshold;
     /**
      * createTime
      */

+ 1 - 1
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleAccountTemplateServiceImpl.java

@@ -88,7 +88,7 @@ public class RuleAccountTemplateServiceImpl extends ServiceImpl<RuleAccountTempl
                 threshold.setAccountId(accountId);
                 threshold.setRuleId(ruleBase.getId());
                 if (ruleBase.getVariableType() == 0) {
-                    threshold.setThreshoId(ruleBase.getThreshold());
+                    threshold.setThreshold(ruleBase.getThreshold());
                 }
                 ruleAccountThresholdService.save(threshold);
             }

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

@@ -74,7 +74,7 @@ public class RuleAccountThresholdServiceImpl extends ServiceImpl<RuleAccountThre
                 } else {
 
                 }*/
-                updateThreshold.setThreshoId(threshold);
+                updateThreshold.setThreshold(threshold);
                 QueryWrapper<RuleAccountThreshold> updateQueryWrapper = new QueryWrapper();
                 updateQueryWrapper.eq("account_id", accountId);
                 updateQueryWrapper.eq("rule_id", ruleId);

+ 1 - 1
module-alarm/src/main/java/cn/com/ctop/alarm/modules/service/impl/RuleGroupServiceImpl.java

@@ -318,7 +318,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
         try {
             obj = new JSONObject();
             for (RuleAccountThreshold threshold : thresholdList) {
-                obj.put(String.valueOf(threshold.getRuleId()), threshold.getThreshoId());
+                obj.put(String.valueOf(threshold.getRuleId()), threshold.getThreshold());
             }
         } catch (Exception e) {
             log.error("获取账户阈值数据集失败", e);