Ver código fonte

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

# Conflicts:
#	module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleIndicator.java
syh 4 anos atrás
pai
commit
fb13cb047f

+ 5 - 5
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleAccountRel.java

@@ -29,21 +29,21 @@ public class RuleAccountRel {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.INPUT)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * 规则id
      */
-    @Excel(name = "规则id", width = 15)
+    @Excel(name = "规则id集,多个以逗号分隔", width = 15)
     @ApiModelProperty(value = "规则id")
-    private Integer ruleId;
+    private String ruleIds;
     /**
      * 账户id
      */
     @Excel(name = "账户id", width = 15)
     @ApiModelProperty(value = "账户id")
-    private Integer accountId;
+    private Long accountId;
     /**
      * 规则类型  group 组合 base 单条
      */

+ 4 - 4
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleBase.java

@@ -29,21 +29,21 @@ public class RuleBase {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.INPUT)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * 规则id
      */
     @Excel(name = "规则id", width = 15)
     @ApiModelProperty(value = "规则id")
-    private Integer ruleId;
+    private Long ruleId;
     /**
      * 1:头条2:快手
      */
     @Excel(name = "1:头条2:快手", width = 15)
     @ApiModelProperty(value = "1:头条2:快手")
-    private Integer mediaType;
+    private Long mediaType;
     /**
      * 规则名称
      */

+ 5 - 5
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleDetail.java

@@ -29,21 +29,21 @@ public class RuleDetail {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.INPUT)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * 规则id
      */
     @Excel(name = "规则id", width = 15)
     @ApiModelProperty(value = "规则id")
-    private Integer ruleId;
+    private Long ruleId;
     /**
      * 账户规则关联id
      */
     @Excel(name = "账户规则关联id", width = 15)
     @ApiModelProperty(value = "账户规则关联id")
-    private Integer ruleAccountId;
+    private Long ruleAccountId;
     /**
      * 条件: 大于 等于 小于
      */
@@ -61,7 +61,7 @@ public class RuleDetail {
      */
     @Excel(name = "排序,执行顺序", width = 15)
     @ApiModelProperty(value = "排序,执行顺序")
-    private Integer sort;
+    private Long sort;
     /**
      * createTime
      */

+ 1 - 1
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleIndicator.java

@@ -37,7 +37,7 @@ public class RuleIndicator {
      */
     @Excel(name = "1:头条2:快手", width = 15)
     @ApiModelProperty(value = "1:头条2:快手")
-    private Integer mediaType;
+    private Long mediaType;
     /**
      * 指标名称
      */