From a041c453ac071ef6da400b1ff270db6954d5a7b4 Mon Sep 17 00:00:00 2001 From: zhourui Date: Wed, 9 Dec 2020 22:33:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=9B=9EgetForm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/V2LookupWorkOrWorkCompleted.java | 33 ++++++++----------- .../V2LookupWorkOrWorkCompletedMobile.java | 33 ++++++++----------- 2 files changed, 26 insertions(+), 40 deletions(-) diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java index 165254a006..a5ea415d7a 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java @@ -48,26 +48,19 @@ class V2LookupWorkOrWorkCompleted extends BaseAction { if (optional.isPresent()) { this.wo = (Wo) optional.get(); } else { - // 必须重新取出,因为getWorkWorkCompletedForm的form是从缓存中取出,关联值是老的,要重新计算etag需要重新获取更新后的值. - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - this.form = emc.find(form.getId(), Form.class); - } - if (null != this.form) { - List list = new ArrayList<>(); - CompletableFuture> relatedFormFuture = this - .relatedFormFuture(this.form.getProperties()); - CompletableFuture> relatedScriptFuture = this - .relatedScriptFuture(this.form.getProperties()); - list.add(this.form.getId() + this.form.getUpdateTime().getTime()); - list.addAll(relatedFormFuture.get(10, TimeUnit.SECONDS)); - list.addAll(relatedScriptFuture.get(10, TimeUnit.SECONDS)); - 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); - } + List list = new ArrayList<>(); + CompletableFuture> relatedFormFuture = this.relatedFormFuture(this.form.getProperties()); + CompletableFuture> relatedScriptFuture = this + .relatedScriptFuture(this.form.getProperties()); + list.add(this.form.getId() + this.form.getUpdateTime().getTime()); + list.addAll(relatedFormFuture.get(10, TimeUnit.SECONDS)); + list.addAll(relatedScriptFuture.get(10, TimeUnit.SECONDS)); + 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); diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java index c4a784f3be..193f4bcfb7 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java @@ -48,26 +48,19 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction { if (optional.isPresent()) { this.wo = (Wo) optional.get(); } else { - // 必须重新取出,因为getWorkWorkCompletedForm的form是从缓存中取出,关联值是老的,要重新计算etag需要重新获取更新后的值. - try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { - this.form = emc.find(form.getId(), Form.class); - } - if (null != this.form) { - List list = new ArrayList<>(); - CompletableFuture> relatedFormFuture = this - .relatedFormFuture(this.form.getProperties()); - CompletableFuture> relatedScriptFuture = this - .relatedScriptFuture(this.form.getProperties()); - list.add(this.form.getId() + this.form.getUpdateTime().getTime()); - list.addAll(relatedFormFuture.get(10, TimeUnit.SECONDS)); - list.addAll(relatedScriptFuture.get(10, TimeUnit.SECONDS)); - 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); - } + List list = new ArrayList<>(); + CompletableFuture> relatedFormFuture = this.relatedFormFuture(this.form.getProperties()); + CompletableFuture> relatedScriptFuture = this + .relatedScriptFuture(this.form.getProperties()); + list.add(this.form.getId() + this.form.getUpdateTime().getTime()); + list.addAll(relatedFormFuture.get(10, TimeUnit.SECONDS)); + list.addAll(relatedScriptFuture.get(10, TimeUnit.SECONDS)); + 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); -- GitLab