From 5137d12b0ea73b76ab08a5a223c569f02491ed61 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Fri, 18 Oct 2024 11:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=81=9C=E6=9C=BA=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95job=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/apiservice/schedulejob/MesAccountJob.java       |  2 +-
 .../serviceimpl/base/MesDowntimeRecordServiceImpl.java      | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesAccountJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesAccountJob.java
index 575e394..8f83a92 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesAccountJob.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesAccountJob.java
@@ -145,7 +145,7 @@ public class MesAccountJob extends BaseMesScheduleJob {
                     DdlPreparedPack.getStringEqualPack(detailLogs.get(0).getEquipVariableValue(), "mouldNo", mouldMultipackBeanTemp);
                     List<MesMouldMultiCavity> mouldMultiCavities = mesMouldMultiCavityRepository.findByHqlWhere(mouldMultipackBeanTemp);
                     if (CollectionUtils.isEmpty(mouldMultiCavities)) {
-                        continue;
+                        partNo = "";
                     } else {
                         List<String> partList = mouldMultiCavities.stream().map(MesMouldMultiCavity::getPartNo).distinct().collect(Collectors.toList());
                         partNo = String.join(",", partList);
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDowntimeRecordServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDowntimeRecordServiceImpl.java
index 1cee1fc..ad9852d 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDowntimeRecordServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDowntimeRecordServiceImpl.java
@@ -11,6 +11,7 @@ import cn.estsh.i3plus.platform.common.util.MesConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
@@ -173,6 +174,10 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
                     mesDowntimeRecordRDao.insert(mesDowntimeRecord);
 
                 }else {
+                    // 如果上一次停机还未结束，则不需要再生成一条新的记录
+                    if (StringUtils.isEmpty(mesDowntimeRecordDaoList.get(0).getModifyDatetime())) {
+                        continue;
+                    }
                     ConvertBean.serviceModelUpdate(mesDowntimeRecordDaoList.get(0), "MesDowntimeRecordJob");
                     mesDowntimeRecordDaoList.get(0).setSystemSyncStatus(2);
                     mesDowntimeRecordRDao.update(mesDowntimeRecordDaoList.get(0));
@@ -216,9 +221,11 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
             DdlPreparedPack.getStringBiggerPack(downtimeRecord.getCreateDatetime(), "createDatetime", ddlPackBean);
         }
         if (!StringUtils.isEmpty(downtimeRecord.getModifyDatetime())) {
-            DdlPreparedPack.getStringBiggerPack(downtimeRecord.getModifyDatetime(), "modifyDatetime", ddlPackBean);
+            DdlPreparedPack.getStringSmallerPack(downtimeRecord.getModifyDatetime(), "modifyDatetime", ddlPackBean);
         }
 
+        pager = PagerHelper.getPager(pager, mesDowntimeRecordRDao.findByHqlWhereCount(ddlPackBean));
+
         List<MesDowntimeRecord> recordList = mesDowntimeRecordRDao.findByHqlWherePage(ddlPackBean, pager);
         if (!CollectionUtils.isEmpty(recordList)) {
             List<String> reasonCodeList = recordList.stream().map(MesDowntimeRecord::getReasonCode).distinct().collect(Collectors.toList());
@@ -261,12 +268,12 @@ public class MesDowntimeRecordServiceImpl extends BaseMesService<MesDowntimeReco
                 if (StringUtils.isEmpty(mesDowntimeRecordResModel.getModifyDatetime())) {
                     Date startTime = DateUtil.parseDateTime(mesDowntimeRecordResModel.getCreateDatetime());
                     Date currentTime = new Date();
-                    Long time = (currentTime.getTime() - startTime.getTime())/1000;
+                    Long time = (currentTime.getTime() - startTime.getTime())/(1000 * 60);
                     mesDowntimeRecordResModel.setCurrentDownTime(time.intValue());
                 } else {
                     Date startTime = DateUtil.parseDateTime(mesDowntimeRecordResModel.getCreateDatetime());
                     Date endTime = DateUtil.parseDateTime(mesDowntimeRecordResModel.getModifyDatetime());
-                    Long time = (endTime.getTime() - startTime.getTime())/1000;
+                    Long time = (endTime.getTime() - startTime.getTime())/(1000 * 60);
                     mesDowntimeRecordResModel.setDownTime(time.intValue());
                 }
                 list.add(mesDowntimeRecordResModel);