gtl
/
gtl-ruoyi-server
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修改部分不合适的类名

dev
gtl 2024-05-08 09:20:22 +08:00
parent b36bfd17e8
commit 49606ab287
5 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/EngineVersion.java
View File

@ -10,9 +10,9 @@ import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.ruleEngine.domain.req.EngineConfigQueryReq; import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq;
import com.ruoyi.ruleEngine.domain.req.EngineConfigSaveReq; import com.ruoyi.ruleEngine.domain.req.EngineVersionSaveReq;
import com.ruoyi.ruleEngine.domain.req.EngineConfigEditReq; import com.ruoyi.ruleEngine.domain.req.EngineVersionEditReq;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.web.domain.BaseEntity;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.Date; 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() return EngineVersion.builder()
.versionClass(engineConfigQueryReq.getVersionClass()) .versionClass(engineConfigQueryReq.getVersionClass())
.name(engineConfigQueryReq.getName()) .name(engineConfigQueryReq.getName())
@ -97,7 +97,7 @@ public class EngineVersion extends BaseEntity {
/** /**
* 添加构造器 * 添加构造器
*/ */
public static EngineVersion saveBuild(EngineConfigSaveReq engineConfigSaveReq, Supplier<String> createBy){ public static EngineVersion saveBuild(EngineVersionSaveReq engineConfigSaveReq, Supplier<String> createBy){
return EngineVersion.builder() return EngineVersion.builder()
.versionClass(engineConfigSaveReq.getVersionClass()) .versionClass(engineConfigSaveReq.getVersionClass())
.name(engineConfigSaveReq.getName()) .name(engineConfigSaveReq.getName())
@ -115,7 +115,7 @@ public class EngineVersion extends BaseEntity {
/** /**
* 修改构造器 * 修改构造器
*/ */
public static EngineVersion editBuild(Long id, EngineConfigEditReq engineConfigEditReq, Supplier<String> updateBy){ public static EngineVersion editBuild(Long id, EngineVersionEditReq engineConfigEditReq, Supplier<String> updateBy){
return EngineVersion.builder() return EngineVersion.builder()
.id(id) .id(id)
.versionClass(engineConfigEditReq.getVersionClass()) .versionClass(engineConfigEditReq.getVersionClass())

7
ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigEditReq.java → ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionEditReq.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.ruleEngine.domain.req;
import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@ -10,7 +9,7 @@ import io.swagger.annotations.*;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.web.domain.BaseEntity;
/** /**
* 引擎规则配置对象 engine_config * 引擎规则版本对象 engine_version
* *
* @author gtl * @author gtl
* @date 2024-05-02 * @date 2024-05-02
@ -19,8 +18,8 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
@SuperBuilder @SuperBuilder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(value = "EngineConfigEditReq", description = "引擎规则配置") @ApiModel(value = "EngineVersionEditReq", description = "引擎规则版本")
public class EngineConfigEditReq extends BaseEntity { public class EngineVersionEditReq extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

7
ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigQueryReq.java → ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionQueryReq.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.ruleEngine.domain.req;
import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@ -10,7 +9,7 @@ import io.swagger.annotations.*;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.web.domain.BaseEntity;
/** /**
* 引擎规则配置对象 engine_config * 引擎规则版本对象 engine_version
* *
* @author gtl * @author gtl
* @date 2024-05-02 * @date 2024-05-02
@ -19,8 +18,8 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
@SuperBuilder @SuperBuilder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(value = "EngineConfigQueryReq", description = "引擎规则配置") @ApiModel(value = "EngineVersionQueryReq", description = "引擎规则版本")
public class EngineConfigQueryReq extends BaseEntity { public class EngineVersionQueryReq extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

7
ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineConfigSaveReq.java → ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-common/src/main/java/com/ruoyi/ruleEngine/domain/req/EngineVersionSaveReq.java
View File

@ -2,7 +2,6 @@ package com.ruoyi.ruleEngine.domain.req;
import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
@ -10,7 +9,7 @@ import io.swagger.annotations.*;
import com.ruoyi.common.core.web.domain.BaseEntity; import com.ruoyi.common.core.web.domain.BaseEntity;
/** /**
* 引擎规则配置对象 engine_config * 引擎规则版本对象 engine_version
* *
* @author gtl * @author gtl
* @date 2024-05-02 * @date 2024-05-02
@ -19,8 +18,8 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
@SuperBuilder @SuperBuilder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(value = "EngineConfigSaveReq", description = "引擎规则配置") @ApiModel(value = "EngineVersionSaveReq", description = "引擎规则版本")
public class EngineConfigSaveReq extends BaseEntity { public class EngineVersionSaveReq extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

20
ruoyi-modules/ruoyi-rule_engine/ruoyi-rule_engine-server/src/main/java/com/ruoyi/ruleEngine/controller/EngineVersionController.java
View File

@ -8,9 +8,9 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.ruleEngine.domain.EngineVersion; import com.ruoyi.ruleEngine.domain.EngineVersion;
import com.ruoyi.ruleEngine.domain.model.TestData; import com.ruoyi.ruleEngine.domain.model.TestData;
import com.ruoyi.ruleEngine.domain.req.EngineConfigEditReq; import com.ruoyi.ruleEngine.domain.req.EngineVersionEditReq;
import com.ruoyi.ruleEngine.domain.req.EngineConfigQueryReq; import com.ruoyi.ruleEngine.domain.req.EngineVersionQueryReq;
import com.ruoyi.ruleEngine.domain.req.EngineConfigSaveReq; import com.ruoyi.ruleEngine.domain.req.EngineVersionSaveReq;
import com.ruoyi.ruleEngine.domain.req.VersionClassCreateReq; import com.ruoyi.ruleEngine.domain.req.VersionClassCreateReq;
import com.ruoyi.ruleEngine.domain.resp.VersionClassCreateResp; import com.ruoyi.ruleEngine.domain.resp.VersionClassCreateResp;
import com.ruoyi.ruleEngine.service.EngineVersionService; import com.ruoyi.ruleEngine.service.EngineVersionService;
@ -41,7 +41,7 @@ public class EngineVersionController extends BaseController {
@ApiOperation("查询引擎规则版本列表") @ApiOperation("查询引擎规则版本列表")
@RequiresPermissions("ruleEngine:version:list") @RequiresPermissions("ruleEngine:version:list")
@GetMapping("/list") @GetMapping("/list")
public Result<List<EngineVersion>> list(EngineConfigQueryReq engineConfigQueryReq) { public Result<List<EngineVersion>> list(EngineVersionQueryReq engineConfigQueryReq) {
return Result.success(engineVersionService.list(EngineVersion.queryBuild(engineConfigQueryReq))); return Result.success(engineVersionService.list(EngineVersion.queryBuild(engineConfigQueryReq)));
} }
@ -58,7 +58,7 @@ public class EngineVersionController extends BaseController {
/** /**
* 测试引擎规则版本 * 测试引擎规则版本
*/ */
@ApiOperation("测试引擎规则配置") @ApiOperation("测试引擎规则版本")
@RequiresPermissions("ruleEngine:version:add") @RequiresPermissions("ruleEngine:version:add")
@PostMapping(value = "/test") @PostMapping(value = "/test")
public Result<Object> ruleTest(@RequestBody TestData testData) { public Result<Object> ruleTest(@RequestBody TestData testData) {
@ -71,8 +71,8 @@ public class EngineVersionController extends BaseController {
@RequiresPermissions("ruleEngine:version:add") @RequiresPermissions("ruleEngine:version:add")
@Log(title = "引擎规则配置", businessType = BusinessType.INSERT) @Log(title = "引擎规则配置", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
@ApiOperation("新增引擎规则配置") @ApiOperation("新增引擎规则版本")
public Result<String> add(@RequestBody EngineConfigSaveReq engineConfigSaveReq) { public Result<String> add(@RequestBody EngineVersionSaveReq engineConfigSaveReq) {
return toAjax(engineVersionService.save(EngineVersion.saveBuild(engineConfigSaveReq, SecurityUtils::getUsername))); return toAjax(engineVersionService.save(EngineVersion.saveBuild(engineConfigSaveReq, SecurityUtils::getUsername)));
} }
@ -82,8 +82,8 @@ public class EngineVersionController extends BaseController {
@RequiresPermissions("ruleEngine:version:edit") @RequiresPermissions("ruleEngine:version:edit")
@Log(title = "引擎规则配置", businessType = BusinessType.UPDATE) @Log(title = "引擎规则配置", businessType = BusinessType.UPDATE)
@PutMapping("/{id}") @PutMapping("/{id}")
@ApiOperation("修改引擎规则配置") @ApiOperation("修改引擎规则版本")
public Result<String> edit(@PathVariable Long id, @RequestBody EngineConfigEditReq engineConfigEditReq) { public Result<String> edit(@PathVariable Long id, @RequestBody EngineVersionEditReq engineConfigEditReq) {
return toAjax(engineVersionService.updateById(EngineVersion.editBuild(id,engineConfigEditReq, SecurityUtils::getUsername))); return toAjax(engineVersionService.updateById(EngineVersion.editBuild(id,engineConfigEditReq, SecurityUtils::getUsername)));
} }
@ -93,7 +93,7 @@ public class EngineVersionController extends BaseController {
@RequiresPermissions("ruleEngine:version:remove") @RequiresPermissions("ruleEngine:version:remove")
@Log(title = "引擎规则配置", businessType = BusinessType.DELETE) @Log(title = "引擎规则配置", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
@ApiOperation("删除引擎规则配置") @ApiOperation("删除引擎规则版本")
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4")
public Result<String> remove(@PathVariable List<Long> ids) { public Result<String> remove(@PathVariable List<Long> ids) {
return toAjax(engineVersionService.removeBatchByIds(ids)); return toAjax(engineVersionService.removeBatchByIds(ids));