diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleData.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleData.java index 91ff179..d762a9a 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleData.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleData.java @@ -47,6 +47,14 @@ public class RuleData extends BaseEntity { * 规则作用域 */ private String ruleRegion; + /** + * 引擎编码 + */ + private String ruleCoding; + /** + * 激活状态 + */ + private String ruleActivate; /** * 规则状态 */ @@ -59,6 +67,8 @@ public class RuleData extends BaseEntity { .ruleName(ruleDataUpdReq.getRuleName()) .ruleType(ruleDataUpdReq.getRuleType()) .ruleRegion(ruleDataUpdReq.getRuleRegion()) + .ruleCoding(ruleDataUpdReq.getRuleCoding()) + .ruleActivate(ruleDataUpdReq.getRuleActivate()) .ruleStatus(ruleDataUpdReq.getRuleStatus()) .build(); } @@ -68,6 +78,8 @@ public class RuleData extends BaseEntity { .ruleName(ruleDataAddReq.getRuleName()) .ruleType(ruleDataAddReq.getRuleType()) .ruleRegion(ruleDataAddReq.getRuleRegion()) + .ruleCoding(ruleDataAddReq.getRuleCoding()) + .ruleActivate(ruleDataAddReq.getRuleActivate()) .ruleStatus(ruleDataAddReq.getRuleStatus()) .build(); } diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataAddReq.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataAddReq.java index 6caa05f..e917d4d 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataAddReq.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataAddReq.java @@ -2,6 +2,7 @@ package com.muyu.common.domain.req; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.validation.custom.IsSysRuleActivate; import com.muyu.common.core.validation.custom.IsSysRuleRegion; import com.muyu.common.core.validation.custom.IsSysRuleZM; import com.muyu.common.core.validation.custom.IsSystemYesNo; @@ -48,6 +49,19 @@ public class RuleDataAddReq { @IsSysRuleRegion @Schema(description = "规则作用域",defaultValue = "F",type = "String") private String ruleRegion; + /** + * 引擎编码 + */ + @NotEmpty(message = "编码不可为空") + @Schema(description = "引擎编码",defaultValue = "notNull",type = "String") + private String ruleCoding; + /** + * 激活状态 + */ + @NotEmpty(message = "激活状态不可为空") + @IsSysRuleActivate + @Schema(description = "激活状态",defaultValue = "S",type = "String") + private String ruleActivate; /** * 规则状态 */ diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataListReq.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataListReq.java index a05b0da..87575c5 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataListReq.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataListReq.java @@ -1,8 +1,11 @@ package com.muyu.common.domain.req; +import com.muyu.common.core.validation.custom.IsSysRuleActivate; +import com.muyu.common.core.validation.custom.IsSysRuleZM; import com.muyu.common.core.validation.custom.IsSystemYesNo; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -27,16 +30,23 @@ public class RuleDataListReq { */ @Schema(description = "规则名称",defaultValue = "邮箱规则接口",type = "String") private String ruleName; + /** + * 规则类型 + */ + @IsSysRuleZM + @Schema(description = "规则类型",defaultValue = "Z",type = "String") + private String ruleType; + /** + * 激活状态 + */ + @IsSysRuleActivate + @Schema(description = "激活状态",defaultValue = "S",type = "String") + private String ruleActivate; /** * 规则状态 */ @Schema(description = "规则状态",defaultValue = "Y",type = "String") @IsSystemYesNo private String ruleStatus; - /** - * 创建人 - */ - @Schema(description = "创建人",defaultValue = "yuan",type = "String") - private String createBy; } diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataUpdReq.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataUpdReq.java index 1eac8ed..c832e33 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataUpdReq.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataUpdReq.java @@ -2,6 +2,7 @@ package com.muyu.common.domain.req; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.validation.custom.IsSysRuleActivate; import com.muyu.common.core.validation.custom.IsSysRuleRegion; import com.muyu.common.core.validation.custom.IsSysRuleZM; import com.muyu.common.core.validation.custom.IsSystemYesNo; @@ -53,6 +54,19 @@ public class RuleDataUpdReq { @IsSysRuleRegion @Schema(description = "规则作用域",defaultValue = "F",type = "String") private String ruleRegion; + /** + * 引擎编码 + */ + @NotEmpty(message = "编码不可为空") + @Schema(description = "引擎编码",defaultValue = "notNull",type = "String") + private String ruleCoding; + /** + * 激活状态 + */ + @NotEmpty(message = "激活状态不可为空") + @IsSysRuleActivate + @Schema(description = "激活状态",defaultValue = "S",type = "String") + private String ruleActivate; /** * 规则状态 */ diff --git a/cloud-rule-server/src/main/java/com/muyu/controller/RuleDataController.java b/cloud-rule-server/src/main/java/com/muyu/controller/RuleDataController.java index f636bed..1440a4b 100644 --- a/cloud-rule-server/src/main/java/com/muyu/controller/RuleDataController.java +++ b/cloud-rule-server/src/main/java/com/muyu/controller/RuleDataController.java @@ -24,7 +24,7 @@ import java.util.List; * @Date:2024/8/21 20:36 */ @RestController -@RequestMapping("/rule_data") +@RequestMapping("/ruleData") @Tag(name = "规则控制层",description = "进行规则制定,查看等操作") public class RuleDataController {