|
@@ -1,6 +1,8 @@
|
|
|
package com.flow.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
+import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
+import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.flow.common.core.exception.BaseException;
|
|
|
import com.flow.common.mybatis.constant.SqlConstant;
|
|
|
import com.flow.common.mybatis.service.impl.BaseServiceImpl;
|
|
@@ -49,6 +51,8 @@ public class FlowModelServiceImpl extends BaseServiceImpl<FlowModelDao, FlowMode
|
|
|
@Autowired
|
|
|
private FlowDefineService flowDefineService;
|
|
|
@Autowired
|
|
|
+ private ObjectMapper objectMapper;
|
|
|
+ @Autowired
|
|
|
private ReportTemplateService reportTemplateService;
|
|
|
|
|
|
@Override
|
|
@@ -155,7 +159,7 @@ public class FlowModelServiceImpl extends BaseServiceImpl<FlowModelDao, FlowMode
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
|
- public FlowDefine deploy(Long modelId) {
|
|
|
+ public FlowDefine deploy(Long modelId) throws JsonProcessingException {
|
|
|
FlowModel flowModel = flowModelDao.selectById(modelId);
|
|
|
if (!flowModel.getEnable()) {
|
|
|
throw new BaseException("模型已停用无法发布");
|
|
@@ -165,11 +169,14 @@ public class FlowModelServiceImpl extends BaseServiceImpl<FlowModelDao, FlowMode
|
|
|
flowModel.setVersion(flowModel.getVersion() + 1);
|
|
|
flowModelDao.updateById(flowModel);
|
|
|
BpmnModel bpmnModel = flowModel.toBpmnModel();
|
|
|
+ FormModel formModel = flowModel.getForm();
|
|
|
+ String formJson = objectMapper.writeValueAsString(formModel);
|
|
|
Deployment deploy = repositoryService.createDeployment()
|
|
|
.key(flowModel.getCode())
|
|
|
.name(flowModel.getName())
|
|
|
.category(flowModel.getGroupId().toString())
|
|
|
.addBpmnModel(String.format("%s.bpmn20.xml", flowModel.getName()), bpmnModel)
|
|
|
+ .addString(String.format("%s.form", flowModel.getName()), formJson)
|
|
|
// .enableDuplicateFiltering()
|
|
|
.deploy();
|
|
|
ProcessDefinition definition = repositoryService.createProcessDefinitionQuery()
|