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 ec6750f..52a11a4 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 @@ -28,8 +28,8 @@ public class RuleData extends BaseEntity { /** * 规则ID */ - @TableId(value = "id",type = IdType.AUTO) - private Long id; + @TableId(value = "rule_id",type = IdType.AUTO) + private Long ruleId; /** * 规则分类 */ @@ -57,7 +57,7 @@ public class RuleData extends BaseEntity { public static RuleData updBuild(RuleDataUpdReq ruleDataUpdReq, Supplier idSupplier) { return RuleData.builder() - .id(idSupplier.get()) + .ruleId(idSupplier.get()) .ruleClassify(ruleDataUpdReq.getRuleClassify()) .ruleName(ruleDataUpdReq.getRuleName()) .ruleCode(ruleDataUpdReq.getRuleCode()) diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleDataClassify.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleDataClassify.java index b3a1362..5e2d2f7 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleDataClassify.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleDataClassify.java @@ -25,15 +25,15 @@ public class RuleDataClassify extends BaseEntity { /** * 类型ID */ - @TableId(value = "id",type = IdType.AUTO) - private Long ruleId; + @TableId(value = "rule_data_classify_id",type = IdType.AUTO) + private Long ruleDataClassifyId; /** * 规则类型名称 */ - private String rule_type_name; + private String ruleTypeName; /** * 规则类型描述 */ - private String rule_type_description; + private String ruleTypeDescription; } diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleVersion.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleVersion.java new file mode 100644 index 0000000..c3fbcd2 --- /dev/null +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/RuleVersion.java @@ -0,0 +1,62 @@ +package com.muyu.common.domain; + +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 lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author：蓬叁 + * @Package：com.muyu.common.domain + * @Project：cloud-rule + * @name：RuleVersion + * @Date：2024/8/23 上午11:43 + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName(value = "rule_version") +public class RuleVersion extends BaseEntity { + + /** + * 规则版本ID + */ + @TableId(value = "rule_version_id",type = IdType.AUTO) + private Long ruleVersionId ; + /** + * 版本类 + */ + private String ruleVersionType ; + /** + * 版本名称 + */ + private String ruleVersionName ; + /** + * 版本编号 + */ + private String ruleVersionCode ; + /** + * 是否激活 + */ + private String ruleVersionActivate ; + /** + * 版本状态 + */ + private String ruleVersionStatus ; + /** + * 是否测试 + */ + private String ruleVersionTest ; + /** + * 备注 + */ + private String ruleVersionRemark ; + +} diff --git a/cloud-rule-common/src/main/java/com/muyu/common/domain/resp/RuleDataResp.java b/cloud-rule-common/src/main/java/com/muyu/common/domain/resp/RuleDataResp.java index 75c4b76..b715554 100644 --- a/cloud-rule-common/src/main/java/com/muyu/common/domain/resp/RuleDataResp.java +++ b/cloud-rule-common/src/main/java/com/muyu/common/domain/resp/RuleDataResp.java @@ -73,7 +73,7 @@ public class RuleDataResp { public static RuleDataResp ruleDataBuild(RuleData ruleData, Supplier> function) { return RuleDataResp.builder() - .id(ruleData.getId()) + .id(ruleData.getRuleId()) .ruleName(ruleData.getRuleName()) .ruleCode(ruleData.getRuleCode()) .ruleExplain(ruleData.getRuleExplain()) 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 4f2d703..0cb4b87 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 @@ -48,64 +48,64 @@ public class RuleDataController { /** * 修改接口规则 - * @param id + * @param ruleId * @param ruleDataUpdReq * @return 修改结果 */ - @PutMapping("/upd/{id}") + @PutMapping("/upd/{ruleId}") @Operation(summary = "接口规则修改",description = "通过ID修改接口规则信息") public Result update( @Schema(title = "客户ID",type = "Long",defaultValue = "1",description = "修改接口规则信息需要唯一条件") - @PathVariable("id") Long id, + @PathVariable("ruleId") Long ruleId, @Validated @RequestBody RuleDataUpdReq ruleDataUpdReq){ - ruleDataService.updateById(RuleData.updBuild(ruleDataUpdReq,() -> id)); + ruleDataService.updateById(RuleData.updBuild(ruleDataUpdReq,() -> ruleId)); return Result.success(null,"操作成功"); } /** * 删除接口规则 - * @param id 请求ID + * @param ruleId 请求ID * @return 删除结果 */ - @DeleteMapping("/del/{id}") + @DeleteMapping("/del/{ruleId}") @Operation(summary = "接口规则删除",description = "通过ID删除接口规则") - public Result delete(@PathVariable("id") Long id){ - ruleDataService.getOptById(id); + public Result delete(@PathVariable("ruleId") Long ruleId){ + ruleDataService.getOptById(ruleId); return Result.success(null,"操作成功"); } /** * 根据ID获取接口规则信息 - * @param id 请求ID + * @param ruleId 请求ID * @return 规则信息 */ - @GetMapping("/{id}") + @GetMapping("/{ruleId}") @Operation(summary = "根据ID获取客户信息",description = "通过ID获取接口规则信息") - public Result findById(@PathVariable("id") Long id){ - return Result.success(ruleDataService.getById(id),"操作成功"); + public Result findById(@PathVariable("ruleId") Long ruleId){ + return Result.success(ruleDataService.getById(ruleId),"操作成功"); } /** *通过ID禁用规则 - * @param id 请求ID + * @param ruleId 请求ID * @return 禁用结果 */ - @GetMapping("/disable/{id}") + @GetMapping("/disable/{ruleId}") @Operation(summary = "通过ID禁用规则",description = "通过ID禁用规则之后，禁止用户在使用此规则") - public Result disable(@PathVariable("id") Long id){ - this.ruleDataService.disable(id); + public Result disable(@PathVariable("ruleId") Long ruleId){ + this.ruleDataService.disable(ruleId); return Result.success(null,"操作成功"); } /** *通过ID启动规则 - * @param id 请求ID + * @param ruleId 请求ID * @return 启动结果 */ - @GetMapping("/enable/{id}") + @GetMapping("/enable/{ruleId}") @Operation(summary = "通过ID启动规则",description = "通过ID禁用规则之后，禁止用户在使用此规则") - public Result enable(@PathVariable("id") Long id){ - this.ruleDataService.enable(id); + public Result enable(@PathVariable("ruleId") Long ruleId){ + this.ruleDataService.enable(ruleId); return Result.success(null,"操作成功"); } diff --git a/cloud-rule-server/src/main/java/com/muyu/servier/RuleDataService.java b/cloud-rule-server/src/main/java/com/muyu/servier/RuleDataService.java index 838b1c4..b219487 100644 --- a/cloud-rule-server/src/main/java/com/muyu/servier/RuleDataService.java +++ b/cloud-rule-server/src/main/java/com/muyu/servier/RuleDataService.java @@ -17,14 +17,14 @@ import java.util.List; public interface RuleDataService extends IService { List selectList(RuleDataListReq ruleDataListReq); - void disable(Long id); + void disable(Long ruleId); - void enable(Long id); + void enable(Long ruleId); /** * 通过规则ID设置规则状态 - * @param id ID + * @param ruleId ID * @param status 状态 SysIsYesNo */ - public void settingStatus(Long id, String status); + public void settingStatus(Long ruleId, String status); } diff --git a/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleDataServiceImpl.java b/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleDataServiceImpl.java index ea2c494..f5f6c55 100644 --- a/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleDataServiceImpl.java +++ b/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleDataServiceImpl.java @@ -51,7 +51,7 @@ public class RuleDataServiceImpl List ruleDataList = this.list(queryWrapper); return ruleDataList.stream() .map(ruleData -> RuleDataResp.ruleDataBuild(ruleData,() -> - ruleDataInfoService.selectRuleDataAndLimit(ruleData.getId(),5) + ruleDataInfoService.selectRuleDataAndLimit(ruleData.getRuleId(),5) .stream() .toList() )) @@ -59,19 +59,19 @@ public class RuleDataServiceImpl } @Override - public void disable(Long id) { - this.settingStatus(id, SystemYesNo.NO.getCode()); + public void disable(Long ruleId) { + this.settingStatus(ruleId, SystemYesNo.NO.getCode()); } @Override - public void enable(Long id) { - this.settingStatus(id, SystemYesNo.YES.getCode()); + public void enable(Long ruleId) { + this.settingStatus(ruleId, SystemYesNo.YES.getCode()); } @Override - public void settingStatus(Long id, String status) { + public void settingStatus(Long ruleId, String status) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(RuleData::getId,id); + queryWrapper.eq(RuleData::getRuleId,ruleId); boolean isExists = this.exists(queryWrapper); if (!isExists) { throw new ServiceException("操作规则不存在"); @@ -80,7 +80,7 @@ public class RuleDataServiceImpl throw new ServiceException("设置状态值违法"); } LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(RuleData::getId,id); + updateWrapper.eq(RuleData::getRuleId,ruleId); updateWrapper.set(RuleData::getRuleStatus,status); this.update(updateWrapper); }