From f6c40ea6668b1cc0884c379b0c2db18c30605e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E6=9C=9D?= <13694051+wangxizhao123@user.noreply.gitee.com> Date: Wed, 8 May 2024 21:49:44 +0800 Subject: [PATCH] =?UTF-8?q?fase()=E5=BC=95=E6=93=8E=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/goods/controller/RuleEngineController.java | 2 +- .../main/java/com/muyu/goods/domain/RuleEngine.java | 12 ++++++------ .../com/muyu/goods/domain/req/RuleEditionReq.java | 9 +++++++++ .../src/main/java/com/muyu/goods/scope/ToCode.txt | 1 + .../com/muyu/goods/service/IRuleEngineService.java | 2 +- .../goods/service/impl/RuleEngineServiceImpl.java | 12 ++++++++---- .../main/resources/mapper/goods/EditionMapper.xml | 2 ++ 7 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 muyu-modules/muyu-goods/src/main/java/com/muyu/goods/domain/req/RuleEditionReq.java diff --git a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/controller/RuleEngineController.java b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/controller/RuleEngineController.java index 95f96ae..c48bb68 100644 --- a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/controller/RuleEngineController.java +++ b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/controller/RuleEngineController.java @@ -122,7 +122,7 @@ public class RuleEngineController extends BaseController } @PostMapping("/spliceNameToCode") - public Result spliceNameToCode(@RequestParam String name, @RequestParam String code,@RequestParam String level){ + public Result spliceNameToCode(@RequestParam String name, @RequestParam String code,@RequestParam Integer level){ return ruleEngineService.spliceNameToCode(name,code,level); } diff --git a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/domain/RuleEngine.java b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/domain/RuleEngine.java index fdf29b8..70b2c0a 100644 --- a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/domain/RuleEngine.java +++ b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/domain/RuleEngine.java @@ -28,11 +28,11 @@ public class RuleEngine extends BaseEntity /** 规则级别 */ @Excel(name = "规则级别") - private String ruleLevel; + private Integer ruleLevel; /** 规则类型 */ @Excel(name = "规则类型") - private String ruleType; + private Integer ruleType; /** 是否激活 */ @Excel(name = "是否激活") @@ -73,21 +73,21 @@ public class RuleEngine extends BaseEntity { return ruleCode; } - public void setRuleLevel(String ruleLevel) + public void setRuleLevel(Integer ruleLevel) { this.ruleLevel = ruleLevel; } - public String getRuleLevel() + public Integer getRuleLevel() { return ruleLevel; } - public void setRuleType(String ruleType) + public void setRuleType(Integer ruleType) { this.ruleType = ruleType; } - public String getRuleType() + public Integer getRuleType() { return ruleType; } diff --git a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/domain/req/RuleEditionReq.java b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/domain/req/RuleEditionReq.java new file mode 100644 index 0000000..0366cb9 --- /dev/null +++ b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/domain/req/RuleEditionReq.java @@ -0,0 +1,9 @@ +package com.muyu.goods.domain.req; + +import lombok.Data; + +@Data +public class RuleEditionReq { + private String val; + private String code; +} diff --git a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/scope/ToCode.txt b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/scope/ToCode.txt index 41c3514..f459c37 100644 --- a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/scope/ToCode.txt +++ b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/scope/ToCode.txt @@ -1,6 +1,7 @@ let packageName = "com.muyu.rule.goods"; let customName = "custom"; let templateName = "template"; + let parentClass = "DataModelEngine"; let ruleContent = `package ${packageName}.${customName}; import com.muyu.engine.action.ActionDiscard; diff --git a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/service/IRuleEngineService.java b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/service/IRuleEngineService.java index 7603fc6..dbf131a 100644 --- a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/service/IRuleEngineService.java +++ b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/service/IRuleEngineService.java @@ -73,5 +73,5 @@ public interface IRuleEngineService void updateRuleStatus(RuleEngine ruleEngine); - Result spliceNameToCode(String name, String code, String level); + Result spliceNameToCode(String name, String code, Integer level); } diff --git a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/service/impl/RuleEngineServiceImpl.java b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/service/impl/RuleEngineServiceImpl.java index b3a55ce..84ce2cc 100644 --- a/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/service/impl/RuleEngineServiceImpl.java +++ b/muyu-modules/muyu-goods/src/main/java/com/muyu/goods/service/impl/RuleEngineServiceImpl.java @@ -10,6 +10,7 @@ import java.util.stream.Collectors; import com.muyu.common.core.domain.Result; import com.muyu.goods.constant.ConfigCodeConstants; +import com.muyu.goods.domain.req.RuleEditionReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.muyu.goods.mapper.RuleEngineMapper; @@ -138,7 +139,9 @@ public class RuleEngineServiceImpl implements IRuleEngineService } @Override - public Result spliceNameToCode(String name, String code, String level) { + public Result spliceNameToCode(String name, String code, Integer level) { + List stringList = List.of(new String[]{"questEngine", "dataSetEngine", "recordsEngine", "fieldEngine"}); + RuleEditionReq ruleEditionReq = new RuleEditionReq(); String val = name + "_" + code; String scope = ConfigCodeConstants.CONFIG_FILE_NAME_CODE[0]; String path = ConfigCodeConstants.BASE_FILE_PATH+scope; @@ -147,12 +150,13 @@ public class RuleEngineServiceImpl implements IRuleEngineService cod = Files.readString(Paths.get(path)); String s1 = Pattern.compile("this.form.name").matcher(cod).replaceAll(name); String s2 = Pattern.compile("this.form.versionCode").matcher(s1).replaceAll(code); - String s3 = Pattern.compile("parentClass").matcher(s2).replaceAll(level); - + String s3 = Pattern.compile("parentClass").matcher(s2).replaceAll(stringList.get(level-1)); + ruleEditionReq.setVal(val); + ruleEditionReq.setCode(s3); System.out.println(cod); } catch (IOException e) { throw new RuntimeException(e); } - return Result.success(val,cod); + return Result.success(ruleEditionReq); } } diff --git a/muyu-modules/muyu-goods/src/main/resources/mapper/goods/EditionMapper.xml b/muyu-modules/muyu-goods/src/main/resources/mapper/goods/EditionMapper.xml index aa0dfb2..8700629 100644 --- a/muyu-modules/muyu-goods/src/main/resources/mapper/goods/EditionMapper.xml +++ b/muyu-modules/muyu-goods/src/main/resources/mapper/goods/EditionMapper.xml @@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update edition + name = #{name}, + edition_content = #{editionContent}, rule_content = #{ruleContent}, where id = #{id}