From 9ab3f66c78f1fb6ca8d5a256b26455849e9bdddd Mon Sep 17 00:00:00 2001 From: yuan <1363654894@qq.com> Date: Sat, 24 Aug 2024 01:11:52 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=B7=BB=E5=8A=A0Add=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/common/domain/RuleData.java | 10 ++++ .../common/domain/req/RuleDataAddReq.java | 60 +++++++++++++++++++ .../common/domain/req/RuleDataUpdReq.java | 2 + .../muyu/controller/RuleDataController.java | 11 +++- 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataAddReq.java 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 7b02131..dc2d6ea 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.common.domain.req.RuleDataAddReq; import com.muyu.common.domain.req.RuleDataUpdReq; import lombok.*; import lombok.experimental.SuperBuilder; @@ -61,4 +62,13 @@ public class RuleData extends BaseEntity { .ruleStatus(ruleDataUpdReq.getRuleStatus()) .build(); } + + public static RuleData addBuild(RuleDataAddReq ruleDataAddReq) { + return RuleData.builder() + .ruleName(ruleDataAddReq.getRuleName()) + .ruleType(ruleDataAddReq.getRuleType()) + .ruleRegion(ruleDataAddReq.getRuleRegion()) + .ruleRegion(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 new file mode 100644 index 0000000..6caa05f --- /dev/null +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/req/RuleDataAddReq.java @@ -0,0 +1,60 @@ +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.IsSysRuleRegion; +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; +import lombok.NoArgsConstructor; + +/** + * @Author：蓬叁 + * @Package：com.muyu.common.domain.req + * @Project：cloud-rule + * @name：RuleDataAddReq + * @Date：2024/8/23 下午10:34 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "规则添加请求对象") +public class RuleDataAddReq { + + /** + * 规则名称 + */ + @NotEmpty(message = "规则名称不可为空 ") + @Schema(title = "规则名称" , type = "String",defaultValue = "XX规则" + ,description = "规则名称一般为类型名称,方便使用者进行区分" ,requiredProperties = {"ruleName"}) + private String ruleName; + /** + * 规则类型 + */ + @NotEmpty(message = "规则类型不可为空") + @IsSysRuleZM //判断 Z 自定义规则 M 模板规则 + @Schema(description = "规则类型",defaultValue = "Z",type = "String") + private String ruleType; + /** + * 规则作用域 + */ + @NotEmpty(message = "规则作用域不可为空") + @IsSysRuleRegion + @Schema(description = "规则作用域",defaultValue = "F",type = "String") + private String ruleRegion; + /** + * 规则状态 + */ + @NotEmpty(message = "规则状态不可为空 ") + @IsSystemYesNo + @Schema(title = "接口开通状态" , type = "String" , defaultValue = "Y", + description = "状态为Y和N,如果为Y则客户可以使用接口规则，若为N则客户不可以使用接口规则") + private String ruleStatus; + +} 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 439c860..73d5721 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 @@ -6,6 +6,7 @@ import com.muyu.common.core.validation.custom.IsSysRuleRegion; 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; @@ -23,6 +24,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@Tag(name = "规则修改请求对象") public class RuleDataUpdReq { /** 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 d099525..14e0f16 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 @@ -2,6 +2,7 @@ package com.muyu.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.domain.RuleData; +import com.muyu.common.domain.req.RuleDataAddReq; import com.muyu.common.domain.req.RuleDataListReq; import com.muyu.common.domain.req.RuleDataUpdReq; import com.muyu.common.domain.resp.RuleDataResp; @@ -44,8 +45,14 @@ public class RuleDataController { ); } -// @PostMapping("/add") -// @Operation(summary = "添加",description = "根据用户") + @PostMapping("/add") + @Operation(summary = "添加",description = "根据客户需求创建对应规则") + public Result add( + @Validated @RequestBody RuleDataAddReq ruleDataAddReq + ){ + ruleDataService.save(RuleData.addBuild(ruleDataAddReq)); + return Result.success(null,"操作成功"); + } /** * 修改接口规则