From 1c7193c555965a39927daf4744719fca20d67fd2 Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 25 Nov 2024 10:47:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=AE=B1=E9=98=B2=E9=94=99=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E4=B8=8A=E6=AC=A1=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=AE=B0=E5=BF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesBoxingErrorProofingService.java | 8 ++++++-- .../estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java index 26d5350..c204bb1 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java @@ -90,7 +90,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer @Override public Integer getIsMemory(String organizeCode, String userName) { - Object object = redisMesPcn.getObject(new StringJoiner(MesPcnExtConstWords.COLON).add(organizeCode).add(this.getClass().getSimpleName()).add(userName).toString()); + Object object = redisMesPcn.getObject(getKey(organizeCode, userName)); if (Objects.isNull(object)) { return CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } else { @@ -159,7 +159,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer updateMesPackage(mesPackage, mesPackageDetail.getModifyUser(), 1d, false); } //缓存是否记忆开关 - saveRedis(new StringJoiner(MesPcnExtConstWords.COLON).add(mesPackageDetail.getOrganizeCode()).add(this.getClass().getSimpleName()).add(mesPackageDetail.getModifyUser()).toString(),mesPackageDetail.getIsMemory()); + saveRedis(getKey(mesPackageDetail.getOrganizeCode(), mesPackageDetail.getModifyUser()),mesPackageDetail.getIsMemory()); mesPackage.setMesPackageDetail(saveMesPackageDetail); return mesPackage; } @@ -538,4 +538,8 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer } } + private String getKey(String organizeCode, String userName) { + return new StringJoiner(MesPcnExtConstWords.COLON).add(organizeCode).add(MesPcnExtConstWords.USER_INFO_CONTEXT).add(userName).add(MesPcnExtConstWords.BOXING_ERROR_PROOFING).add(MesPcnExtConstWords.IS_MEMORY).toString(); + } + } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 22f77a6..32136e9 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -504,6 +504,12 @@ public class MesPcnExtConstWords { public static final String REPEAT_ASSEMBLY_SN_CONTEXT = "REPEAT_ASSEMBLY_SN_CONTEXT"; // 设备计数上下文 public static final String SHORT_COUNTER_CONTEXT = "SHORT_COUNTER_CONTEXT"; + // 用户缓存 + public static final String USER_INFO_CONTEXT = "USER_INFO_CONTEXT"; + // 装箱防错 + public static final String BOXING_ERROR_PROOFING = "BOXING_ERROR_PROOFING"; + // 是否记忆 + public static final String IS_MEMORY = "IS_MEMORY"; // 上下文: 展示组件数据 public static final String MODULE_CONTENT_CONTEXT = "MODULE_CONTENT_CONTEXT";