From 1e21d27a247a2ca5fb2f4445ed404b16943aabe9 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Sun, 25 Aug 2024 10:10:36 +0800 Subject: [PATCH] Changes --- .../src/main/java/rule/domain/Rule.java | 3 + .../main/java/rule/domain/RuleEdition.java | 62 ++++++++++++++++ .../src/main/java/rule/domain/RuleType.java | 6 ++ .../controller/RuleEditionController.java | 71 +++++++++++++++++++ .../muyu/rule/mapper/RuleEditionMapper.java | 9 +++ .../muyu/rule/service/RuleEditionService.java | 7 ++ .../muyu/rule/service/RuleTypeService.java | 2 + .../service/impl/RuleEditionServiceImpl.java | 17 +++++ .../rule/service/impl/RuleServiceImpl.java | 1 + 9 files changed, 178 insertions(+) create mode 100644 muyu-rule-common/src/main/java/rule/domain/RuleEdition.java create mode 100644 muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleEditionController.java create mode 100644 muyu-rule-server/src/main/java/com/muyu/rule/mapper/RuleEditionMapper.java create mode 100644 muyu-rule-server/src/main/java/com/muyu/rule/service/RuleEditionService.java create mode 100644 muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleEditionServiceImpl.java diff --git a/muyu-rule-common/src/main/java/rule/domain/Rule.java b/muyu-rule-common/src/main/java/rule/domain/Rule.java index 6e412e1..207e8a4 100644 --- a/muyu-rule-common/src/main/java/rule/domain/Rule.java +++ b/muyu-rule-common/src/main/java/rule/domain/Rule.java @@ -1,5 +1,7 @@ package rule.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.tags.Tag; @@ -25,6 +27,7 @@ public class Rule { * 规则ID */ @Excel(name = "规则ID") + @TableId(value = "id",type = IdType.AUTO) private Long id; /** * 规则名称 diff --git a/muyu-rule-common/src/main/java/rule/domain/RuleEdition.java b/muyu-rule-common/src/main/java/rule/domain/RuleEdition.java new file mode 100644 index 0000000..94d3779 --- /dev/null +++ b/muyu-rule-common/src/main/java/rule/domain/RuleEdition.java @@ -0,0 +1,62 @@ +package rule.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.constraints.NotBlank; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @ClassName RuleEdition + * @Description 规则版本实体类 + * @Author Chen + * @Date 2024/8/25 09:32 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@TableName(value = "rule_edition") +@Tag(name = "规则版本") +public class RuleEdition { + + + /** + * 版本主键 + */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + /** + * 版本类 + */ + @NotBlank(message = "版本类不能为空") + private String ruleKind; + /** + * 版本名称 + */ + @NotBlank(message = "版本名称不能为空") + private String name; + /** + * 编码 + */ + @NotBlank(message = "编码不能为空") + private String ruleCoding; + /** + * 是否激活 + */ + private String ruleActivate; + /** + * 状态 + */ + @NotBlank(message = "状态不能为空") + private String status; + /** + * 内容 + */ + private String ruleContent; + +} diff --git a/muyu-rule-common/src/main/java/rule/domain/RuleType.java b/muyu-rule-common/src/main/java/rule/domain/RuleType.java index abcaf54..01a5203 100644 --- a/muyu-rule-common/src/main/java/rule/domain/RuleType.java +++ b/muyu-rule-common/src/main/java/rule/domain/RuleType.java @@ -1,6 +1,9 @@ package rule.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,13 +20,16 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @Builder @TableName(value = "rule_type") +@Tag(name = "规则类型") public class RuleType { /** * 类型主键 */ + @TableId(value = "id",type = IdType.AUTO) private Integer id; /** * 规则类型名称 */ + private String ruleTypeName; } diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleEditionController.java b/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleEditionController.java new file mode 100644 index 0000000..36dd181 --- /dev/null +++ b/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleEditionController.java @@ -0,0 +1,71 @@ +package com.muyu.rule.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.rule.service.RuleEditionService; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import rule.domain.RuleEdition; + +import java.util.List; + +/** + * @ClassName RuleEditionController + * @Description 规则版本控制层 + * @Author Chen + * @Date 2024/8/25 09:37 + */ +@RestController +@RequestMapping("/ruleEdition") +public class RuleEditionController { + @Autowired + private RuleEditionService ruleEditionService; + + /** + * 规则版本列表 + * + * @return + */ + @RequestMapping(path = "/list", method = RequestMethod.POST) + @Operation(summary = "规则版本", description = "查看规则版本") + public Result> list() { + return Result.success(ruleEditionService.list()); + } + + /** + * 根据id删除 + * + * @param id + * @return + */ + @Operation(summary = "删除版本", description = "删除版本") + @DeleteMapping("/delete/{id}") + public Result delete(@PathVariable("id") Integer id) { + return Result.success(ruleEditionService.removeById(id)); + } + + /** + * 添加 + * + * @param ruleEdition + * @return + */ + @PostMapping("/insert") + @Operation(summary = "添加版本", description = "添加版本") + public Result insert(@RequestBody @Validated RuleEdition ruleEdition) { + return Result.success(ruleEditionService.save(ruleEdition)); + } + + /** + * 通过id修改 + * + * @param ruleEdition + * @return + */ + @PutMapping("/update") + @Operation(summary = "修改", description = "修改版本") + public Result update(@RequestBody @Validated RuleEdition ruleEdition) { + return Result.success(ruleEditionService.updateById(ruleEdition)); + } +} diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/mapper/RuleEditionMapper.java b/muyu-rule-server/src/main/java/com/muyu/rule/mapper/RuleEditionMapper.java new file mode 100644 index 0000000..4287f92 --- /dev/null +++ b/muyu-rule-server/src/main/java/com/muyu/rule/mapper/RuleEditionMapper.java @@ -0,0 +1,9 @@ +package com.muyu.rule.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import rule.domain.RuleEdition; + +@Mapper +public interface RuleEditionMapper extends BaseMapper { +} diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/service/RuleEditionService.java b/muyu-rule-server/src/main/java/com/muyu/rule/service/RuleEditionService.java new file mode 100644 index 0000000..87eba5b --- /dev/null +++ b/muyu-rule-server/src/main/java/com/muyu/rule/service/RuleEditionService.java @@ -0,0 +1,7 @@ +package com.muyu.rule.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import rule.domain.RuleEdition; + +public interface RuleEditionService extends IService { +} diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/service/RuleTypeService.java b/muyu-rule-server/src/main/java/com/muyu/rule/service/RuleTypeService.java index dfdeac3..81d95d1 100644 --- a/muyu-rule-server/src/main/java/com/muyu/rule/service/RuleTypeService.java +++ b/muyu-rule-server/src/main/java/com/muyu/rule/service/RuleTypeService.java @@ -1,5 +1,6 @@ package com.muyu.rule.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import rule.domain.RuleType; @@ -10,4 +11,5 @@ import rule.domain.RuleType; * @Date 2024/8/22 15:39 */ public interface RuleTypeService extends IService { + } diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleEditionServiceImpl.java b/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleEditionServiceImpl.java new file mode 100644 index 0000000..c2ee025 --- /dev/null +++ b/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleEditionServiceImpl.java @@ -0,0 +1,17 @@ +package com.muyu.rule.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.rule.mapper.RuleEditionMapper; +import com.muyu.rule.service.RuleEditionService; +import org.springframework.stereotype.Service; +import rule.domain.RuleEdition; + +/** + * @ClassName RuleEditionServiceImpl + * @Description 描述 + * @Author Chen + * @Date 2024/8/25 09:42 + */ +@Service +public class RuleEditionServiceImpl extends ServiceImpl implements RuleEditionService { +} diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleServiceImpl.java b/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleServiceImpl.java index 98f4c5d..0f491af 100644 --- a/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleServiceImpl.java +++ b/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleServiceImpl.java @@ -26,6 +26,7 @@ public class RuleServiceImpl extends ServiceImpl implements Ru ruleLambdaQueryWrapper.select(Rule::getRuleType, Rule::getId, Rule::getRuleDesc, Rule::getIsActivate, Rule::getName); List list = this.list(ruleLambdaQueryWrapper); list.forEach(rule1 -> { + //给手机号脱敏 rule1.setRuleDesc(Desensitization.mobilePhoneDesensitization(rule1.getRuleDesc())); // rule1.setRuleDesc(Desensitization.mobilePhoneDesensitization(rule1.getRuleCode())); }