|
@@ -27,16 +27,16 @@ import org.jeecg.modules.activiti.service.Impl.ActNodeServiceImpl;
|
|
import org.jeecg.modules.activiti.service.Impl.ActZprocessServiceImpl;
|
|
import org.jeecg.modules.activiti.service.Impl.ActZprocessServiceImpl;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import org.springframework.web.bind.annotation.PathVariable;
|
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
+import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
|
import javax.xml.stream.XMLInputFactory;
|
|
import javax.xml.stream.XMLInputFactory;
|
|
import javax.xml.stream.XMLStreamReader;
|
|
import javax.xml.stream.XMLStreamReader;
|
|
-import java.io.IOException;
|
|
|
|
import java.io.InputStream;
|
|
import java.io.InputStream;
|
|
import java.io.InputStreamReader;
|
|
import java.io.InputStreamReader;
|
|
-import java.net.URLEncoder;
|
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -130,7 +130,9 @@ public class ActivitiProcessController {
|
|
}
|
|
}
|
|
ActZprocess actProcess = actZprocessService.getById(id);
|
|
ActZprocess actProcess = actZprocessService.getById(id);
|
|
// 当删除最后一个版本时 删除关联数据
|
|
// 当删除最后一个版本时 删除关联数据
|
|
- if (actProcess==null) return Result.error("该数据已删除!");
|
|
|
|
|
|
+ if (actProcess==null){
|
|
|
|
+ return Result.error("该数据已删除!");
|
|
|
|
+ }
|
|
if(actProcess.getVersion()==1){
|
|
if(actProcess.getVersion()==1){
|
|
deleteNodeUsers(id);
|
|
deleteNodeUsers(id);
|
|
}
|
|
}
|
|
@@ -143,7 +145,6 @@ public class ActivitiProcessController {
|
|
return Result.ok("删除成功");
|
|
return Result.ok("删除成功");
|
|
}
|
|
}
|
|
public void deleteNodeUsers(String processId){
|
|
public void deleteNodeUsers(String processId){
|
|
-
|
|
|
|
BpmnModel bpmnModel = repositoryService.getBpmnModel(processId);
|
|
BpmnModel bpmnModel = repositoryService.getBpmnModel(processId);
|
|
List<Process> processes = bpmnModel.getProcesses();
|
|
List<Process> processes = bpmnModel.getProcesses();
|
|
for(Process process : processes){
|
|
for(Process process : processes){
|
|
@@ -160,11 +161,9 @@ public class ActivitiProcessController {
|
|
*/
|
|
*/
|
|
@RequestMapping(value = "/convertToModel")
|
|
@RequestMapping(value = "/convertToModel")
|
|
public Result convertToModel( String id){
|
|
public Result convertToModel( String id){
|
|
-
|
|
|
|
ProcessDefinition pd = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult();
|
|
ProcessDefinition pd = repositoryService.createProcessDefinitionQuery().processDefinitionId(id).singleResult();
|
|
InputStream bpmnStream = repositoryService.getResourceAsStream(pd.getDeploymentId(), pd.getResourceName());
|
|
InputStream bpmnStream = repositoryService.getResourceAsStream(pd.getDeploymentId(), pd.getResourceName());
|
|
ActZprocess actProcess = actZprocessService.getById(id);
|
|
ActZprocess actProcess = actZprocessService.getById(id);
|
|
-
|
|
|
|
try {
|
|
try {
|
|
XMLInputFactory xif = XMLInputFactory.newInstance();
|
|
XMLInputFactory xif = XMLInputFactory.newInstance();
|
|
InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
|
|
InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
|
|
@@ -209,11 +208,8 @@ public class ActivitiProcessController {
|
|
/*通过流程定义id获取流程节点*/
|
|
/*通过流程定义id获取流程节点*/
|
|
@RequestMapping(value = "/getProcessNode")
|
|
@RequestMapping(value = "/getProcessNode")
|
|
public Result getProcessNode(String id){
|
|
public Result getProcessNode(String id){
|
|
-
|
|
|
|
BpmnModel bpmnModel = repositoryService.getBpmnModel(id);
|
|
BpmnModel bpmnModel = repositoryService.getBpmnModel(id);
|
|
-
|
|
|
|
List<ProcessNodeVo> list = new ArrayList<>();
|
|
List<ProcessNodeVo> list = new ArrayList<>();
|
|
-
|
|
|
|
List<Process> processes = bpmnModel.getProcesses();
|
|
List<Process> processes = bpmnModel.getProcesses();
|
|
if(processes==null||processes.size()==0){
|
|
if(processes==null||processes.size()==0){
|
|
return Result.ok();
|
|
return Result.ok();
|