BJ_ZTEITS-Developers / parking-cloud-yudao

Commit a85d51cc8c407316c382f21a093b3969109d48fd

Authored by Lesan
1 parent 34399144

fix: 添加addListenerFieldExtension方法

Inline Side-by-side
Showing 2 changed files with 11 additions and 14 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java
  View file @a85d51c
... ... @@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
5 5 import cn.hutool.core.map.MapUtil;
6 6 import cn.hutool.core.util.*;
7 7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  8 +import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
8 9 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
9 10 import cn.iocoder.yudao.framework.common.util.string.StrUtils;
10 11 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
... ... @@ -361,6 +362,13 @@ public class BpmnModelUtils {
361 362 return Convert.toBool(extensionElements.get(0).getElementText(), false);
362 363 }
363 364  
  365 + public static void addListenerFieldExtension(FlowableListener flowableListener, Object obj) {
  366 + FieldExtension fieldExtension = new FieldExtension();
  367 + fieldExtension.setFieldName("listenerConfig");
  368 + fieldExtension.setStringValue(JsonUtils.toJsonString(obj));
  369 + flowableListener.getFieldExtensions().add(fieldExtension);
  370 + }
  371 +
364 372 // ========== BPM 简单查找相关的方法 ==========
365 373  
366 374 /**
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
  View file @a85d51c
... ... @@ -5,7 +5,6 @@ import cn.hutool.core.lang.Assert;
5 5 import cn.hutool.core.map.MapUtil;
6 6 import cn.hutool.core.util.*;
7 7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
8   -import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
9 8 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
10 9 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.ConditionGroups;
11 10 import cn.iocoder.yudao.module.bpm.enums.definition.*;
... ... @@ -453,10 +452,7 @@ public class SimpleModelUtils {
453 452 flowableListener.setEvent(TaskListener.EVENTNAME_CREATE);
454 453 flowableListener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_DELEGATEEXPRESSION);
455 454 flowableListener.setImplementation(DELEGATE_EXPRESSION);
456   - FieldExtension fieldExtension = new FieldExtension();
457   - fieldExtension.setFieldName("listenerConfig");
458   - fieldExtension.setStringValue(JsonUtils.toJsonString(node.getTaskCreateListener()));
459   - flowableListener.getFieldExtensions().add(fieldExtension);
  455 + addListenerFieldExtension(flowableListener, node.getTaskCreateListener());
460 456 flowableListeners.add(flowableListener);
461 457 }
462 458 if (node.getTaskAssignListener() != null
... ... @@ -465,11 +461,7 @@ public class SimpleModelUtils {
465 461 flowableListener.setEvent(TaskListener.EVENTNAME_ASSIGNMENT);
466 462 flowableListener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_DELEGATEEXPRESSION);
467 463 flowableListener.setImplementation(DELEGATE_EXPRESSION);
468   - // TODO @lesan：可以在 BpmnModelUtils 搞个方法，类似 public static Integer parseCandidateStrategy。这样，就收敛啦！
469   - FieldExtension fieldExtension = new FieldExtension();
470   - fieldExtension.setFieldName("listenerConfig");
471   - fieldExtension.setStringValue(JsonUtils.toJsonString(node.getTaskAssignListener()));
472   - flowableListener.getFieldExtensions().add(fieldExtension);
  464 + addListenerFieldExtension(flowableListener, node.getTaskAssignListener());
473 465 flowableListeners.add(flowableListener);
474 466 }
475 467 if (node.getTaskCompleteListener() != null
... ... @@ -478,10 +470,7 @@ public class SimpleModelUtils {
478 470 flowableListener.setEvent(TaskListener.EVENTNAME_COMPLETE);
479 471 flowableListener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_DELEGATEEXPRESSION);
480 472 flowableListener.setImplementation(DELEGATE_EXPRESSION);
481   - FieldExtension fieldExtension = new FieldExtension();
482   - fieldExtension.setFieldName("listenerConfig");
483   - fieldExtension.setStringValue(JsonUtils.toJsonString(node.getTaskCompleteListener()));
484   - flowableListener.getFieldExtensions().add(fieldExtension);
  473 + addListenerFieldExtension(flowableListener, node.getTaskCompleteListener());
485 474 flowableListeners.add(flowableListener);
486 475 }
487 476 if (CollUtil.isNotEmpty(flowableListeners)) {
... ...