From 1a50b0f256dd138b3084e28888cf8fb47eb300bb Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Thu, 18 Aug 2022 16:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceScreenServiceImpl.java | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java
index aa3a5434..27013fe7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java
@@ -138,23 +138,23 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
             if (start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 wt_mibf += between;
             }
             if (start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 wt_mibf += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 wt_mibf += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 wt_mibf += between;
             }
         }
@@ -168,29 +168,29 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
             if (start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 wt_mttr += between;
             }
             if (start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 wt_mttr += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 wt_mttr += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 wt_mttr += between;
             }
         }
 
-        jo1.put("MIBF", wt_mibf);
-        jo1.put("MTTR", wt_mttr);
+        jo1.put("MIBF", NumberUtil.roundStr(wt_mibf/60,2));
+        jo1.put("MTTR", NumberUtil.roundStr(wt_mttr/60,2));
         jo1.put("err_times", wt_err_rows.size());
         //综合工段
         JSONObject jo2 = new JSONObject();
@@ -206,23 +206,23 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
             if (start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 zh_mibf += between;
             }
             if (start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 zh_mibf += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 zh_mibf += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 zh_mibf += between;
             }
         }
@@ -236,29 +236,29 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
             if (start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 zh_mttr += between;
             }
             if (start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 zh_mttr += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 zh_mttr += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 zh_mttr += between;
             }
         }
 
-        jo2.put("MIBF", zh_mibf);
-        jo2.put("MTTR", zh_mttr);
+        jo2.put("MIBF", NumberUtil.roundStr(zh_mibf/60,2));
+        jo2.put("MTTR", NumberUtil.roundStr(zh_mttr/60,2));
         jo2.put("err_times", zh_err_rows.size());
         //成品工段
         JSONObject jo3 = new JSONObject();
@@ -274,23 +274,23 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
             if (start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 cp_mibf += between;
             }
             if (start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 cp_mibf += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 cp_mibf += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 cp_mibf += between;
             }
         }
@@ -304,29 +304,29 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
             if (start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 cp_mttr += between;
             }
             if (start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date1 = DateUtil.parse(start_time);
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(date1, date2, DateUnit.HOUR);
+                long between = DateUtil.between(date1, date2, DateUnit.MINUTE);
                 cp_mttr += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isEmpty(end_time)) {
                 Date date2 = DateUtil.date();
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 cp_mttr += between;
             }
             if (!start_time.startsWith(now) && StrUtil.isNotEmpty(end_time)) {
                 Date date2 = DateUtil.parse(end_time);
-                long between = DateUtil.between(today_begin, date2, DateUnit.HOUR);
+                long between = DateUtil.between(today_begin, date2, DateUnit.MINUTE);
                 cp_mttr += between;
             }
         }
 
-        jo3.put("MIBF", cp_mibf);
-        jo3.put("MTTR", cp_mttr);
+        jo3.put("MIBF", NumberUtil.roundStr(cp_mibf/60,2));
+        jo3.put("MTTR", NumberUtil.roundStr(cp_mttr/60,2));
         jo3.put("err_times", cp_err_rows.size());
 
         JSONObject result = new JSONObject();