From a907cbf5b36089e8dbdf6b10a47d76cd666fc420 Mon Sep 17 00:00:00 2001 From: Qin Dong Ming <2720806930@qq.com> Date: Mon, 2 Sep 2024 21:16:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=BC=95=E6=93=8E=E7=B1=BB?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/context/GenerateConstant.java | 2 +- .../com/muyu/controller/EngIneController.java | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java b/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java index bd911ca..ed8eba2 100644 --- a/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java +++ b/cloud-etl-common/src/main/java/com/muyu/context/GenerateConstant.java @@ -41,7 +41,7 @@ public class GenerateConstant { " * @Description: " + ruleVersion.getName() + "_" + ruleVersion.getVersionCode() + "\n" + " * @Version: 1.0\n" + " */\n" + - "public class " + getClassName(ruleVersion.getVersionClass()) + " extends " + level + " {\n" + + "public class " + getClassName(ruleVersion.getVersionCode()) + " extends " + level + " {\n" + " @Override\n" + " public void run () {\n" + " }\n" + diff --git a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java index 0913e3e..b5e9713 100644 --- a/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java +++ b/cloud-etl-server/src/main/java/com/muyu/controller/EngIneController.java @@ -86,7 +86,7 @@ public class EngIneController extends BaseController { @PostMapping("/insert") public Boolean insert(@RequestBody EngineMaintenance engineMaintenance) { //使用mabits-plus-plus的添加方法 - Boolean b = engIneService.save(engineMaintenance); + Boolean b = engIneService.save(engineMaintenance); return b; // return engIneService.add(engineMaintenance); } @@ -185,7 +185,7 @@ public class EngIneController extends BaseController { //使用mybatis-plus的查询方法 // return Result.success(engineVersionService.getByIds(id)); return Result.success(engineVersionService.list(new LambdaQueryWrapper<>() {{ - eq(EngineVersion::getEngineMaintenanceId,id); + eq(EngineVersion::getEngineMaintenanceId, id); }})); } @@ -198,25 +198,28 @@ public class EngIneController extends BaseController { // List engineMaintenances = engIneService.list(new LambdaQueryWrapper<>() {{ // eq(EngineMaintenance::getVersionId, versionId); // }}); - List engineMaintenances = engineVersionService.getByIds(versionId); + List engineMaintenances = engineVersionService.getByIds(versionId); return engineMaintenances; } /** * 生成引擎类 + * * @param engineVersion * @return */ @PostMapping("/generate") - public EngineVersion generate(@RequestBody EngineVersion engineVersion){ - EngineVersion byId1 = engineVersionService.getById(engineVersion.getId()); - EngineMaintenance byId = engIneService.selectById(byId1.getId()); - byId.setName("generate"+"_"+byId.getEngineCode()+"_"+engineVersion.getVersionCode()); - engineVersion.setRuleContent(GenerateConstant.generateConstant(byId,engineVersion)); - return engineVersion; + public EngineVersion generate(@RequestBody EngineVersion engineVersion) { + EngineVersion byId1 = engineVersionService.getById(engineVersion.getId()); + EngineMaintenance byId = engIneService.selectById(byId1.getId()); + byId.setName("generate" + "_" + byId.getEngineCode() + "_" + engineVersion.getVersionCode()); + engineVersion.setRuleContent(GenerateConstant.generateConstant(byId, engineVersion)); + return engineVersion; } - //通过id查询版本version信息 传入id 和versionId + /** + * 通过id查询版本version信息 传入id 和 versionId + */ @GetMapping("/findVersionById/{id}") public Result findVersionById(@PathVariable("id") Long id) { return Result.success(engineVersionService.getById(id));