Skip to content

o2oa
o2oa

ghsby / o2oa
落后 Fork 源项目 2880 个版本

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

通知 1
Star 1
Fork 0
o2oa
o2oa

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

提交 a041c453 编写于 作者: Z zhourui
浏览文件
操作

退回getForm

上级 235099d0
隐藏空白更改
内联 并排
Showing with 26 addition and 40 deletion
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
浏览文件 @ a041c453
...@@ -48,26 +48,19 @@ class V2LookupWorkOrWorkCompleted extends BaseAction { ...@@ -48,26 +48,19 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
if (optional.isPresent()) { if (optional.isPresent()) {
this.wo = (Wo) optional.get(); this.wo = (Wo) optional.get();
} else { } else {
// 必须重新取出,因为getWorkWorkCompletedForm的form是从缓存中取出,关联值是老的,要重新计算etag需要重新获取更新后的值. List<String> list = new ArrayList<>();
try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { CompletableFuture<List<String>> relatedFormFuture = this.relatedFormFuture(this.form.getProperties());
this.form = emc.find(form.getId(), Form.class); CompletableFuture<List<String>> relatedScriptFuture = this
} .relatedScriptFuture(this.form.getProperties());
if (null != this.form) { list.add(this.form.getId() + this.form.getUpdateTime().getTime());
List<String> list = new ArrayList<>(); list.addAll(relatedFormFuture.get(10, TimeUnit.SECONDS));
CompletableFuture<List<String>> relatedFormFuture = this list.addAll(relatedScriptFuture.get(10, TimeUnit.SECONDS));
.relatedFormFuture(this.form.getProperties()); list = list.stream().sorted().collect(Collectors.toList());
CompletableFuture<List<String>> relatedScriptFuture = this this.wo.setId(this.form.getId());
.relatedScriptFuture(this.form.getProperties()); CRC32 crc = new CRC32();
list.add(this.form.getId() + this.form.getUpdateTime().getTime()); crc.update(StringUtils.join(list, "#").getBytes());
list.addAll(relatedFormFuture.get(10, TimeUnit.SECONDS)); this.wo.setCacheTag(crc.getValue() + "");
list.addAll(relatedScriptFuture.get(10, TimeUnit.SECONDS)); CacheManager.put(cacheCategory, cacheKey, wo);
list = list.stream().sorted().collect(Collectors.toList());
this.wo.setId(this.form.getId());
CRC32 crc = new CRC32();
crc.update(StringUtils.join(list, "#").getBytes());
this.wo.setCacheTag(crc.getValue() + "");
CacheManager.put(cacheCategory, cacheKey, wo);
}
} }
} }
result.setData(wo); result.setData(wo);
......
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java
浏览文件 @ a041c453
...@@ -48,26 +48,19 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction { ...@@ -48,26 +48,19 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
if (optional.isPresent()) { if (optional.isPresent()) {
this.wo = (Wo) optional.get(); this.wo = (Wo) optional.get();
} else { } else {
// 必须重新取出,因为getWorkWorkCompletedForm的form是从缓存中取出,关联值是老的,要重新计算etag需要重新获取更新后的值. List<String> list = new ArrayList<>();
try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { CompletableFuture<List<String>> relatedFormFuture = this.relatedFormFuture(this.form.getProperties());
this.form = emc.find(form.getId(), Form.class); CompletableFuture<List<String>> relatedScriptFuture = this
} .relatedScriptFuture(this.form.getProperties());
if (null != this.form) { list.add(this.form.getId() + this.form.getUpdateTime().getTime());
List<String> list = new ArrayList<>(); list.addAll(relatedFormFuture.get(10, TimeUnit.SECONDS));
CompletableFuture<List<String>> relatedFormFuture = this list.addAll(relatedScriptFuture.get(10, TimeUnit.SECONDS));
.relatedFormFuture(this.form.getProperties()); list = list.stream().sorted().collect(Collectors.toList());
CompletableFuture<List<String>> relatedScriptFuture = this this.wo.setId(this.form.getId());
.relatedScriptFuture(this.form.getProperties()); CRC32 crc = new CRC32();
list.add(this.form.getId() + this.form.getUpdateTime().getTime()); crc.update(StringUtils.join(list, "#").getBytes());
list.addAll(relatedFormFuture.get(10, TimeUnit.SECONDS)); this.wo.setCacheTag(crc.getValue() + "");
list.addAll(relatedScriptFuture.get(10, TimeUnit.SECONDS)); CacheManager.put(cacheCategory, cacheKey, wo);
list = list.stream().sorted().collect(Collectors.toList());
this.wo.setId(this.form.getId());
CRC32 crc = new CRC32();
crc.update(StringUtils.join(list, "#").getBytes());
this.wo.setCacheTag(crc.getValue() + "");
CacheManager.put(cacheCategory, cacheKey, wo);
}
} }
} }
result.setData(wo); result.setData(wo);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或