From 49606ab287f705e4dd818934aeb9d373304ea604 Mon Sep 17 00:00:00 2001 From: gtl <2949451835@qq.com> Date: Wed, 8 May 2024 09:20:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=8D=E5=90=88=E9=80=82=E7=9A=84=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruleEngine/domain/EngineVersion.java | 12 +++++------ ...EditReq.java => EngineVersionEditReq.java} | 7 +++---- ...eryReq.java => EngineVersionQueryReq.java} | 7 +++---- ...SaveReq.java => EngineVersionSaveReq.java} | 7 +++---- .../controller/EngineVersionController.java | 20 +++++++++---------- 5 files changed, 25 insertions(+), 28 deletions(-) rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/{EngineConfigEditReq.java => EngineVersionEditReq.java} (89%) rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/{EngineConfigQueryReq.java => EngineVersionQueryReq.java} (89%) rename ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/{EngineConfigSaveReq.java => EngineVersionSaveReq.java} (90%) diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineVersion.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineVersion.java index 5d5ba02..b4064d9 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineVersion.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineVersion.java @@ -10,9 +10,9 @@ import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; import io.swagger.annotations.*; import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.ruleEngine.domain.req.EngineConfigQueryReq; -import com.ruoyi.ruleEngine.domain.req.EngineConfigSaveReq; -import com.ruoyi.ruleEngine.domain.req.EngineConfigEditReq; +import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq; +import com.ruoyi.ruleEngine.domain.req.EngineVersionSaveReq; +import com.ruoyi.ruleEngine.domain.req.EngineVersionEditReq; import com.ruoyi.common.core.web.domain.BaseEntity; import java.util.function.Supplier; import java.util.Date; @@ -82,7 +82,7 @@ public class EngineVersion extends BaseEntity { /** * 查询构造器 */ - public static EngineVersion queryBuild(EngineConfigQueryReq engineConfigQueryReq){ + public static EngineVersion queryBuild(EngineVersionQueryReq engineConfigQueryReq){ return EngineVersion.builder() .versionClass(engineConfigQueryReq.getVersionClass()) .name(engineConfigQueryReq.getName()) @@ -97,7 +97,7 @@ public class EngineVersion extends BaseEntity { /** * 添加构造器 */ - public static EngineVersion saveBuild(EngineConfigSaveReq engineConfigSaveReq, Supplier createBy){ + public static EngineVersion saveBuild(EngineVersionSaveReq engineConfigSaveReq, Supplier createBy){ return EngineVersion.builder() .versionClass(engineConfigSaveReq.getVersionClass()) .name(engineConfigSaveReq.getName()) @@ -115,7 +115,7 @@ public class EngineVersion extends BaseEntity { /** * 修改构造器 */ - public static EngineVersion editBuild(Long id, EngineConfigEditReq engineConfigEditReq, Supplier updateBy){ + public static EngineVersion editBuild(Long id, EngineVersionEditReq engineConfigEditReq, Supplier updateBy){ return EngineVersion.builder() .id(id) .versionClass(engineConfigEditReq.getVersionClass()) diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigEditReq.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionEditReq.java similarity index 89% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigEditReq.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionEditReq.java index 046a4dd..1bba474 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigEditReq.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionEditReq.java @@ -2,7 +2,6 @@ package com.ruoyi.ruleEngine.domain.req; import com.ruoyi.common.core.annotation.Excel; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; @@ -10,7 +9,7 @@ import io.swagger.annotations.*; import com.ruoyi.common.core.web.domain.BaseEntity; /** - * 引擎规则配置对象 engine_config + * 引擎规则版本对象 engine_version * * @author gtl * @date 2024-05-02 @@ -19,8 +18,8 @@ import com.ruoyi.common.core.web.domain.BaseEntity; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value = "EngineConfigEditReq", description = "引擎规则配置") -public class EngineConfigEditReq extends BaseEntity { +@ApiModel(value = "EngineVersionEditReq", description = "引擎规则版本") +public class EngineVersionEditReq extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigQueryReq.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionQueryReq.java similarity index 89% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigQueryReq.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionQueryReq.java index 23bbf5f..e863df9 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigQueryReq.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionQueryReq.java @@ -2,7 +2,6 @@ package com.ruoyi.ruleEngine.domain.req; import com.ruoyi.common.core.annotation.Excel; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; @@ -10,7 +9,7 @@ import io.swagger.annotations.*; import com.ruoyi.common.core.web.domain.BaseEntity; /** - * 引擎规则配置对象 engine_config + * 引擎规则版本对象 engine_version * * @author gtl * @date 2024-05-02 @@ -19,8 +18,8 @@ import com.ruoyi.common.core.web.domain.BaseEntity; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value = "EngineConfigQueryReq", description = "引擎规则配置") -public class EngineConfigQueryReq extends BaseEntity { +@ApiModel(value = "EngineVersionQueryReq", description = "引擎规则版本") +public class EngineVersionQueryReq extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigSaveReq.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionSaveReq.java similarity index 90% rename from ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigSaveReq.java rename to ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionSaveReq.java index 0661421..a30a487 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigSaveReq.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionSaveReq.java @@ -2,7 +2,6 @@ package com.ruoyi.ruleEngine.domain.req; import com.ruoyi.common.core.annotation.Excel; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; @@ -10,7 +9,7 @@ import io.swagger.annotations.*; import com.ruoyi.common.core.web.domain.BaseEntity; /** - * 引擎规则配置对象 engine_config + * 引擎规则版本对象 engine_version * * @author gtl * @date 2024-05-02 @@ -19,8 +18,8 @@ import com.ruoyi.common.core.web.domain.BaseEntity; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value = "EngineConfigSaveReq", description = "引擎规则配置") -public class EngineConfigSaveReq extends BaseEntity { +@ApiModel(value = "EngineVersionSaveReq", description = "引擎规则版本") +public class EngineVersionSaveReq extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineVersionController.java b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineVersionController.java index a80f656..728f92a 100644 --- a/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineVersionController.java +++ b/ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineVersionController.java @@ -8,9 +8,9 @@ import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.ruleEngine.domain.EngineVersion; import com.ruoyi.ruleEngine.domain.model.TestData; -import com.ruoyi.ruleEngine.domain.req.EngineConfigEditReq; -import com.ruoyi.ruleEngine.domain.req.EngineConfigQueryReq; -import com.ruoyi.ruleEngine.domain.req.EngineConfigSaveReq; +import com.ruoyi.ruleEngine.domain.req.EngineVersionEditReq; +import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq; +import com.ruoyi.ruleEngine.domain.req.EngineVersionSaveReq; import com.ruoyi.ruleEngine.domain.req.VersionClassCreateReq; import com.ruoyi.ruleEngine.domain.resp.VersionClassCreateResp; import com.ruoyi.ruleEngine.service.EngineVersionService; @@ -41,7 +41,7 @@ public class EngineVersionController extends BaseController { @ApiOperation("查询引擎规则版本列表") @RequiresPermissions("ruleEngine:version:list") @GetMapping("/list") - public Result> list(EngineConfigQueryReq engineConfigQueryReq) { + public Result> list(EngineVersionQueryReq engineConfigQueryReq) { return Result.success(engineVersionService.list(EngineVersion.queryBuild(engineConfigQueryReq))); } @@ -58,7 +58,7 @@ public class EngineVersionController extends BaseController { /** * 测试引擎规则版本 */ - @ApiOperation("测试引擎规则配置") + @ApiOperation("测试引擎规则版本") @RequiresPermissions("ruleEngine:version:add") @PostMapping(value = "/test") public Result ruleTest(@RequestBody TestData testData) { @@ -71,8 +71,8 @@ public class EngineVersionController extends BaseController { @RequiresPermissions("ruleEngine:version:add") @Log(title = "引擎规则配置", businessType = BusinessType.INSERT) @PostMapping - @ApiOperation("新增引擎规则配置") - public Result add(@RequestBody EngineConfigSaveReq engineConfigSaveReq) { + @ApiOperation("新增引擎规则版本") + public Result add(@RequestBody EngineVersionSaveReq engineConfigSaveReq) { return toAjax(engineVersionService.save(EngineVersion.saveBuild(engineConfigSaveReq, SecurityUtils::getUsername))); } @@ -82,8 +82,8 @@ public class EngineVersionController extends BaseController { @RequiresPermissions("ruleEngine:version:edit") @Log(title = "引擎规则配置", businessType = BusinessType.UPDATE) @PutMapping("/{id}") - @ApiOperation("修改引擎规则配置") - public Result edit(@PathVariable Long id, @RequestBody EngineConfigEditReq engineConfigEditReq) { + @ApiOperation("修改引擎规则版本") + public Result edit(@PathVariable Long id, @RequestBody EngineVersionEditReq engineConfigEditReq) { return toAjax(engineVersionService.updateById(EngineVersion.editBuild(id,engineConfigEditReq, SecurityUtils::getUsername))); } @@ -93,7 +93,7 @@ public class EngineVersionController extends BaseController { @RequiresPermissions("ruleEngine:version:remove") @Log(title = "引擎规则配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - @ApiOperation("删除引擎规则配置") + @ApiOperation("删除引擎规则版本") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") public Result remove(@PathVariable List ids) { return toAjax(engineVersionService.removeBatchByIds(ids));