Skip to content

o2oa
o2oa

weixin_42566577 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 1
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 8af4cbb9 编写于 作者: O o2null
浏览文件
操作

Merge branch 'feature/index' into 'develop' 

修复ctl ec 以及允许多选优先路由

See merge request o2oa/o2oa!1292
上级 3136594e 63987c82
隐藏空白更改
内联 并排
Showing with 66 addition and 55 deletion
o2server/x_console/src/main/java/com/x/server/console/action/EraseContentLog.java
浏览文件 @ 8af4cbb9
...@@ -5,27 +5,27 @@ import com.x.base.core.project.logger.LoggerFactory; ...@@ -5,27 +5,27 @@ import com.x.base.core.project.logger.LoggerFactory;
public class EraseContentLog extends EraseContent { public class EraseContentLog extends EraseContent {
private static final Logger LOGGER = LoggerFactory.getLogger(EraseContentLog.class); private static final Logger LOGGER = LoggerFactory.getLogger(EraseContentLog.class);
@Override @Override
public boolean execute() { public boolean execute() {
try { try {
ClassLoader classLoader = EntityClassLoaderTools.concreteClassLoader(); ClassLoader classLoader = EntityClassLoaderTools.concreteClassLoader();
Thread.currentThread().setContextClassLoader(classLoader); Thread.currentThread().setContextClassLoader(classLoader);
this.init("log", null, classLoader); this.init("log", null, classLoader);
addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.FormVersion")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.FormVersion"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.ProcessVersion")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.ProcessVersion"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.ScriptVersion")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.ScriptVersion"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.log.SignalStackLog")); // addClass(classLoader.loadClass("com.x.processplatform.core.entity.log.SignalStackLog"));
addClass(classLoader.loadClass("com.x.program.center.core.entity.PromptErrorLog")); addClass(classLoader.loadClass("com.x.program.center.core.entity.PromptErrorLog"));
addClass(classLoader.loadClass("com.x.program.center.core.entity.ScheduleLog")); addClass(classLoader.loadClass("com.x.program.center.core.entity.ScheduleLog"));
addClass(classLoader.loadClass("com.x.program.center.core.entity.UnexpectedErrorLog")); addClass(classLoader.loadClass("com.x.program.center.core.entity.UnexpectedErrorLog"));
addClass(classLoader.loadClass("com.x.program.center.core.entity.WarnLog")); addClass(classLoader.loadClass("com.x.program.center.core.entity.WarnLog"));
this.run(); this.run();
return true; return true;
} catch (Exception e) { } catch (Exception e) {
LOGGER.error(e); LOGGER.error(e);
} }
return false; return false;
} }
} }
\ No newline at end of file
o2server/x_console/src/main/java/com/x/server/console/action/EraseContentProcessPlatform.java
浏览文件 @ 8af4cbb9
...@@ -6,33 +6,36 @@ import com.x.base.core.project.logger.LoggerFactory; ...@@ -6,33 +6,36 @@ import com.x.base.core.project.logger.LoggerFactory;
public class EraseContentProcessPlatform extends EraseContent { public class EraseContentProcessPlatform extends EraseContent {
private static final Logger LOGGER = LoggerFactory.getLogger(EraseContentProcessPlatform.class); private static final Logger LOGGER = LoggerFactory.getLogger(EraseContentProcessPlatform.class);
public boolean execute() { public boolean execute() {
try { try {
ClassLoader classLoader = EntityClassLoaderTools.concreteClassLoader(); ClassLoader classLoader = EntityClassLoaderTools.concreteClassLoader();
Thread.currentThread().setContextClassLoader(classLoader); Thread.currentThread().setContextClassLoader(classLoader);
this.init("processPlatform", ItemCategory.pp, classLoader); this.init("processPlatform", ItemCategory.pp, classLoader);
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Attachment")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Attachment"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.DocumentVersion")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.DocSign"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Draft")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.DocSignScrawl"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Read")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.DocumentVersion"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.ReadCompleted")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Draft"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Record")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.KeyLock"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Review")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Read"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.SerialNumber")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.ReadCompleted"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Task")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Record"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.TaskCompleted")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Review"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Work")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.SerialNumber"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.WorkCompleted")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Snap"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.WorkLog")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Task"));
addClass(classLoader.loadClass("com.x.processplatform.core.entity.log.SignalStackLog")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.TaskCompleted"));
addClass(classLoader.loadClass("com.x.query.core.entity.Item")); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Work"));
this.run(); addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.WorkCompleted"));
return true; addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.WorkLog"));
} catch (Exception e) { addClass(classLoader.loadClass("com.x.query.core.entity.Item"));
LOGGER.error(e); this.run();
} return true;
return false; } catch (Exception e) {
} LOGGER.error(e);
}
return false;
}
} }
\ No newline at end of file
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java
浏览文件 @ 8af4cbb9
...@@ -661,13 +661,21 @@ public class ManualProcessor extends AbstractManualProcessor { ...@@ -661,13 +661,21 @@ public class ManualProcessor extends AbstractManualProcessor {
} }
} }
/**
* 存在优先路由,如果有人选择了优先路由那么直接流转.需要判断是否启用了soleDirect,允许存在多个优先路由
*
* @param aeiObjects
* @param taskCompleteds
* @return
* @throws Exception
*/
private boolean soleDirect(AeiObjects aeiObjects, List<TaskCompleted> taskCompleteds) throws Exception { private boolean soleDirect(AeiObjects aeiObjects, List<TaskCompleted> taskCompleteds) throws Exception {
// 存在优先路由,如果有人选择了优先路由那么直接流转.需要判断是否启用了soleDirect final List<String> soleRouteNames = aeiObjects.getRoutes().stream()
Optional<Route> route = aeiObjects.getRoutes().stream().filter(r -> BooleanUtils.isTrue(r.getSoleDirect())) .filter(r -> BooleanUtils.isTrue(r.getSoleDirect()))
.findFirst(); .map(Route::getName).collect(Collectors.toList());
if (route.isPresent()) { if (!soleRouteNames.isEmpty()) {
Optional<TaskCompleted> taskCompleted = taskCompleteds.stream() Optional<TaskCompleted> taskCompleted = taskCompleteds.stream()
.filter(t -> StringUtils.equals(t.getRouteName(), route.get().getName())).findFirst(); .filter(t -> soleRouteNames.contains(t.getRouteName())).findFirst();
if (taskCompleted.isPresent()) { if (taskCompleted.isPresent()) {
return true; return true;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或