工作流编程

ibzwf-core/src/main/java/cn/ibizlab/core/extensions/service/WFCoreService.java

@@ -162,7 +162,7 @@ public class WFCoreService
 		variables.put("businessKey",businessKey);
 		variables.put("activedata",instance.get("activedata"));
 		variables.put("curuser",AuthenticationUser.getAuthenticationUser());
-		variables.put("cloud-serviceid",system+"-app-"+appname);
+		variables.put("cloud-serviceid",system+"-"+appname);
 		variables.put("system",system);
 		variables.put("appname",appname);
 		variables.put("entitys",entity);
@@ -288,7 +288,7 @@ public class WFCoreService
 		String processInstanceBusinessKey=system+":"+entity+":k-"+businessKey;
 		Map<String, Object> variables = new LinkedHashMap<>();
 		variables.put("sequenceFlowId",taskWay.getSequenceflowid());
-		variables.put("cloud-serviceid",system+"-app-"+appname);
+		variables.put("cloud-serviceid",system+"-"+appname);
 
 		Map<String, Object> transientVariables = new LinkedHashMap<>();
 		transientVariables.put("activedata",taskWay.get("activedata"));
@@ -395,23 +395,14 @@ public class WFCoreService
 				InputStream inputStream2 = null;
 				String bmpmfileId="";
 				String fileFullPath ="";
-				try
-				{
-
+				try {
 					inputStream2=new FileInputStream(bpmnFile);
 					reader2 = factory.createXMLStreamReader(inputStream2);
-
 					BpmnModel entitymodel=bpmnXMLConverter.convertToBpmnModel(reader2);
-
 					entitymodel.getProcesses().get(0).setId(processDefinitionKey);
-
-
-
-
 					byte[] bs= bpmnXMLConverter.convertToXML(entitymodel);
 					bmpmfileId=DigestUtils.md5DigestAsHex(bs);
 					fileFullPath = this.fileRoot+"ibizutil"+File.separator+bmpmfileId+File.separator+processDefinitionKey+".bpmn20.xml";
-
 					is = new ByteArrayInputStream(bs);
 					File file = new File(fileFullPath);
 					File parent = new File(file.getParent());
@@ -446,14 +437,11 @@ public class WFCoreService
 				inputStream=new FileInputStream(new File(fileFullPath));
 				DeploymentBuilder deploymentBuilder = repositoryService.createDeployment().name(curProcess.getName()).key(processDefinitionKey)
 						.addInputStream(fileFullPath,inputStream);
-
 				Deployment deployment= deploymentBuilder.deploy();
 
 				wfProcessDefinition.setBpmnfile("[{\"id\":\""+bmpmfileId+"\",\"name\":\""+processDefinitionKey+".bpmn20.xml\"}]");
 				wfProcessDefinition.setMd5check(bmpmfileId);
 				iwfProcessDefinitionService.save(wfProcessDefinition);
-//				wfProcessDefinition.setMd5check(md5);
-//				iwfProcessDefinitionService.update(wfProcessDefinition);
 				log.warn("部署流程 name:"+curProcess.getName()+" key "+deployment.getKey() + " deploy "+deployment);