From e9bb9ab48a42baaf07840c56a75757c8297e546b Mon Sep 17 00:00:00 2001 From: 75349 <753495441@qq.com> Date: Fri, 9 Dec 2022 11:12:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AD=97=E6=AE=B5=E7=89=B9=E6=AE=8A=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liteflow/mysql/cmp/costCenter/CostCenter02Cmp.java | 6 +++++- .../liteflow/mysql/cmp/costCenter/CostCenterCmp.java | 6 +++++- .../mysql/cmp/profitCenter/ProfitCenter01Cmp.java | 6 +++++- .../mysql/cmp/profitCenter/ProfitCenter02Cmp.java | 6 +++++- .../liteflow/mysql/cmp/profitCenter/ProfitCenterCmp.java | 6 +++++- .../liteflow/mysql/controller/ChainController.java | 5 +++++ .../com/example/liteflow/mysql/service/ChainService.java | 1 + .../liteflow/mysql/service/impl/ChainServiceImpl.java | 8 ++++++++ 8 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/example/liteflow/mysql/cmp/costCenter/CostCenter02Cmp.java b/src/main/java/com/example/liteflow/mysql/cmp/costCenter/CostCenter02Cmp.java index 1cf97cc..854394a 100644 --- a/src/main/java/com/example/liteflow/mysql/cmp/costCenter/CostCenter02Cmp.java +++ b/src/main/java/com/example/liteflow/mysql/cmp/costCenter/CostCenter02Cmp.java @@ -57,7 +57,11 @@ public class CostCenter02Cmp extends NodeIfComponent { String contentName = baseDataEntity.getContentName(); droolStr = StrUtil.replace(droolStr, contentName, content, false); } - droolStr = StrUtil.replace(droolStr, name, "\"" + fieldValue + "\"", false); + String filedValueStr = ""; + if (ObjectUtil.isNotNull(fieldValue)) { + filedValueStr = fieldValue.toString(); + } + droolStr = StrUtil.replace(droolStr, name, filedValueStr, false); } log.info("after - replace4 = {}", droolStr); diff --git a/src/main/java/com/example/liteflow/mysql/cmp/costCenter/CostCenterCmp.java b/src/main/java/com/example/liteflow/mysql/cmp/costCenter/CostCenterCmp.java index 184d157..733c5d4 100644 --- a/src/main/java/com/example/liteflow/mysql/cmp/costCenter/CostCenterCmp.java +++ b/src/main/java/com/example/liteflow/mysql/cmp/costCenter/CostCenterCmp.java @@ -52,7 +52,11 @@ public class CostCenterCmp extends NodeIfComponent { String contentName = baseDataEntity.getContentName(); droolStr = StrUtil.replace(droolStr, contentName, content, false); } - droolStr = StrUtil.replace(droolStr, name, "\"" + fieldValue + "\"", false); + String filedValueStr = ""; + if (ObjectUtil.isNotNull(fieldValue)) { + filedValueStr = fieldValue.toString(); + } + droolStr = StrUtil.replace(droolStr, name, filedValueStr, false); } log.info("after - droolStr = {}", droolStr); diff --git a/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenter01Cmp.java b/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenter01Cmp.java index f93e97a..3f8349d 100644 --- a/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenter01Cmp.java +++ b/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenter01Cmp.java @@ -46,7 +46,11 @@ public class ProfitCenter01Cmp extends NodeIfComponent { String contentName = baseDataEntity.getContentName(); droolStr = StrUtil.replace(droolStr, contentName, content, false); } - droolStr = StrUtil.replace(droolStr, name, "\"" + fieldValue + "\"", false); + String filedValueStr = ""; + if (ObjectUtil.isNotNull(fieldValue)) { + filedValueStr = fieldValue.toString(); + } + droolStr = StrUtil.replace(droolStr, name, filedValueStr, false); } log.info("after - droolStr = {}", droolStr); diff --git a/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenter02Cmp.java b/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenter02Cmp.java index 75d89b5..d7298f1 100644 --- a/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenter02Cmp.java +++ b/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenter02Cmp.java @@ -52,7 +52,11 @@ public class ProfitCenter02Cmp extends NodeIfComponent { String contentName = baseDataEntity.getContentName(); droolStr = StrUtil.replace(droolStr, contentName, content, false); } - droolStr = StrUtil.replace(droolStr, name, "\"" + fieldValue + "\"", false); + String filedValueStr = ""; + if (ObjectUtil.isNotNull(fieldValue)) { + filedValueStr = fieldValue.toString(); + } + droolStr = StrUtil.replace(droolStr, name, filedValueStr, false); } log.info("after - droolStr = {}", droolStr); diff --git a/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenterCmp.java b/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenterCmp.java index d7e10ac..ee38f6c 100644 --- a/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenterCmp.java +++ b/src/main/java/com/example/liteflow/mysql/cmp/profitCenter/ProfitCenterCmp.java @@ -45,7 +45,11 @@ public class ProfitCenterCmp extends NodeIfComponent { String contentName = baseDataEntity.getContentName(); droolStr = StrUtil.replace(droolStr, contentName, content, false); } - droolStr = StrUtil.replace(droolStr, name, "\"" + fieldValue + "\"", false); + String filedValueStr = ""; + if (ObjectUtil.isNotNull(fieldValue)) { + filedValueStr = fieldValue.toString(); + } + droolStr = StrUtil.replace(droolStr, name, filedValueStr, false); } log.info("after - droolStr = {}", droolStr); diff --git a/src/main/java/com/example/liteflow/mysql/controller/ChainController.java b/src/main/java/com/example/liteflow/mysql/controller/ChainController.java index f01e897..002b3b7 100644 --- a/src/main/java/com/example/liteflow/mysql/controller/ChainController.java +++ b/src/main/java/com/example/liteflow/mysql/controller/ChainController.java @@ -28,4 +28,9 @@ public class ChainController { public void executeChain(@PathVariable("chainName") String chainName) { chainService.executeChain(chainName); } + + @GetMapping("/getChainByName/{chainName}") + public ChainEntity getChainByName(@PathVariable("chainName") String chainName) { + return chainService.getChainName(chainName); + } } diff --git a/src/main/java/com/example/liteflow/mysql/service/ChainService.java b/src/main/java/com/example/liteflow/mysql/service/ChainService.java index d8997b4..7e5635a 100644 --- a/src/main/java/com/example/liteflow/mysql/service/ChainService.java +++ b/src/main/java/com/example/liteflow/mysql/service/ChainService.java @@ -11,4 +11,5 @@ public interface ChainService { void executeChain(String chainName); + ChainEntity getChainName(String chainName); } diff --git a/src/main/java/com/example/liteflow/mysql/service/impl/ChainServiceImpl.java b/src/main/java/com/example/liteflow/mysql/service/impl/ChainServiceImpl.java index 646393c..9c68183 100644 --- a/src/main/java/com/example/liteflow/mysql/service/impl/ChainServiceImpl.java +++ b/src/main/java/com/example/liteflow/mysql/service/impl/ChainServiceImpl.java @@ -2,6 +2,7 @@ package com.example.liteflow.mysql.service.impl; import cn.hutool.core.util.RandomUtil; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.example.liteflow.mysql.entity.ChainEntity; import com.example.liteflow.mysql.mapper.ChainMapper; @@ -35,6 +36,13 @@ public class ChainServiceImpl extends ServiceImpl imp flowExecutor.reloadRule(); } + @Override + public ChainEntity getChainName(String chainName) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ChainEntity::getChainName, chainName); + return this.getOne(queryWrapper); + } + @Override public void executeChain(String chainName) { List list = this.generateCostCenterTestData();