From 185780a99960e9c445694205d164fb85d460a157 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 13 Nov 2024 10:30:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E6=9C=AB=E5=A4=A7=E5=B1=8F=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/MesEarlyWarningServiceImpl.java | 26 +++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java index 752372d..411aef3 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java @@ -170,6 +170,26 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService { @Override public void savePicture(KanBanPictureModel model) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode()); + DdlPreparedPack.getOrderBy("createDatetime",CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), ddlPackBean); + List screenList = screenRao.findByHqlWhere(ddlPackBean); + if (!screenList.isEmpty()) { + //5分钟内只记录一次,防止前端不断刷数据 + MesEarlyWarningScreen mesEarlyWarningScreen = screenList.get(0); + try { + Date date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(mesEarlyWarningScreen.getCreateDatetime()); + Calendar dateC = Calendar.getInstance(); + dateC.setTime(date); + dateC.add(Calendar.MINUTE,5); + Calendar now = Calendar.getInstance(); + now.setTime(new Date()); + if (dateC.before(now)){ + return; + } + } catch (ParseException e) { + } + + } MesEarlyWarningScreen mesEarlyWarningScreen = new MesEarlyWarningScreen(); mesEarlyWarningScreen.setPicture(model.getPicture()); if (model.getId() != null){ @@ -177,7 +197,7 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService { } mesEarlyWarningScreen.setOrganizeCode(model.getOrganizeCode()); ConvertBean.saveOrUpdate(mesEarlyWarningScreen, AuthUtil.getSessionUser().getUserName()); - screenRao.insert(mesEarlyWarningScreen); + screenRao.insert(mesEarlyWarningScreen); } /** @@ -422,9 +442,9 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService { } mesKanBanShowModel.setRealProductionBuffer(realProductionBuffer); Long productionYellowBuffer = kanBan.getProductionYellowBuffer(); - if (realProductionBuffer < productionRedBuffer){ + if (realProductionBuffer < productionYellowBuffer){ mesKanBanShowModel.setRealProductionBufferColor("RED"); - }else if (realProductionBuffer < productionYellowBuffer){ + }else if (realProductionBuffer < productionRedBuffer){ mesKanBanShowModel.setRealProductionBufferColor("YELLOW"); } //声音信息