Download as
Browse Code »

Commit 9376c0780a9138ce5a1bbeb42258fbf84f866bdd

Authored by Carlos Alberto
1 parent 18944a5e
Exists in master

Correção no signalEvent

Showing 2 changed files with 7 additions and 8 deletions   Show diff stats
cit-esi-api/src/main/java/br/com/centralit/esi/api/business/service/impl/BusinessProcessServiceImpl.java
  Diff comments   View file @9376c07
@@ -41,6 +41,8 @@ import br.com.centralit.esi.api.security.service.SecurityService; @@ -41,6 +41,8 @@ import br.com.centralit.esi.api.security.service.SecurityService;
41 import br.com.centralit.esi.api.util.EsiAppUtils; 41 import br.com.centralit.esi.api.util.EsiAppUtils;
42 import br.com.centralit.esi.exception.EsiBusinessException; 42 import br.com.centralit.esi.exception.EsiBusinessException;
43 import br.com.centralit.framework.dao.arquitetura.SearchSeven; 43 import br.com.centralit.framework.dao.arquitetura.SearchSeven;
  44 +import br.com.centralit.framework.esi.environment.EnvironmentOutput;
  45 +import br.com.centralit.framework.esi.environment.EnvironmentVariable;
44 import br.com.centralit.framework.model.Filter; 46 import br.com.centralit.framework.model.Filter;
45 import br.com.centralit.framework.model.SearchParams; 47 import br.com.centralit.framework.model.SearchParams;
46 import br.com.centralit.framework.model.WorkCalendar; 48 import br.com.centralit.framework.model.WorkCalendar;
@@ -194,16 +196,13 @@ public class BusinessProcessServiceImpl extends GenericServiceImpl<BusinessProce @@ -194,16 +196,13 @@ public class BusinessProcessServiceImpl extends GenericServiceImpl<BusinessProce
194 196
195 EnvironmentOutput output = this.delegateUserTask(new Long(137), groups, null); 197 EnvironmentOutput output = this.delegateUserTask(new Long(137), groups, null);
196 198
197 - output = this.removeUserTaskDelegation(new Long(137), groups, null); 199 + output = this.removeUserTaskDelegation(new Long(137), groups, null); */
198 200
199 List<EnvironmentVariable> variaveis = new ArrayList<EnvironmentVariable>(); 201 List<EnvironmentVariable> variaveis = new ArrayList<EnvironmentVariable>();
200 202
201 - variaveis.add(new EnvironmentVariable("idProcesso", VariableTypeEnum.LONG, new Long(1), false));  
202 - variaveis.add(new EnvironmentVariable("solicitante", VariableTypeEnum.TEXT, "carlos.alberto", false));  
203 -  
204 - EnvironmentOutput processoNegocio = this.startBusinessProcess("sigad", variaveis); 203 + EnvironmentOutput output = this.startNodeWithSignalEvent("FinalizacaoSolicitacaoServico", new Long(7), false, variaveis);
205 204
206 - List<EnvironmentVariable> variaveis = new ArrayList<EnvironmentVariable>(); 205 + /*List<EnvironmentVariable> variaveis = new ArrayList<EnvironmentVariable>();
207 206
208 variaveis.add(new EnvironmentVariable("solicitante", VariableTypeEnum.TEXT, "admin", false)); 207 variaveis.add(new EnvironmentVariable("solicitante", VariableTypeEnum.TEXT, "admin", false));
209 208
cit-esi-api/src/main/java/br/com/centralit/esi/api/execution/service/impl/WorkItemServiceImpl.java
  Diff comments   View file @9376c07
@@ -283,10 +283,10 @@ public class WorkItemServiceImpl&lt;E extends FlowElement&gt; extends GenericServiceIm @@ -283,10 +283,10 @@ public class WorkItemServiceImpl&lt;E extends FlowElement&gt; extends GenericServiceIm
283 283
284 if ((signalEventInput.getProcessInstanceId() == null || signalEventInput.getProcessInstanceId().longValue() == 0) && (UtilString.isNullOrEmpty(signalEventInput.getFlowName()))) { 284 if ((signalEventInput.getProcessInstanceId() == null || signalEventInput.getProcessInstanceId().longValue() == 0) && (UtilString.isNullOrEmpty(signalEventInput.getFlowName()))) {
285 return workItemDao.retrieveAvailabeEvents(signalEventInput.getEventName()); 285 return workItemDao.retrieveAvailabeEvents(signalEventInput.getEventName());
286 - }else if (!UtilString.isNullOrEmpty(signalEventInput.getFlowName())) {  
287 - return workItemDao.retrieveAvailabeEventsByFlowName(signalEventInput.getEventName(), signalEventInput.getFlowName());  
288 }else if (signalEventInput.getProcessInstanceId() != null && signalEventInput.getProcessInstanceId().longValue() > 0) { 286 }else if (signalEventInput.getProcessInstanceId() != null && signalEventInput.getProcessInstanceId().longValue() > 0) {
289 return workItemDao.retrieveAvailabeEventsInstanceId(signalEventInput.getEventName(), signalEventInput.getProcessInstanceId()); 287 return workItemDao.retrieveAvailabeEventsInstanceId(signalEventInput.getEventName(), signalEventInput.getProcessInstanceId());
  288 + }else if (!UtilString.isNullOrEmpty(signalEventInput.getFlowName())) {
  289 + return workItemDao.retrieveAvailabeEventsByFlowName(signalEventInput.getEventName(), signalEventInput.getFlowName());
290 }else{ 290 }else{
291 return null; 291 return null;
292 } 292 }