From 841b3029c20fecd2dded1786647c5adfd627969d Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 8 Mar 2024 12:01:19 +0800
Subject: [PATCH] =?UTF-8?q?2024-3-8=20=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?-=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/device/domain/vo/IEquipmentVO.java  |  8 ++++----
 .../impl/DeviceInterfaceServiceImpl.java       | 18 +++++++++---------
 .../mapper/device/DeviceInterfaceMapper.xml    |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java
index a079d7ac3..0b2edfd88 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java
@@ -12,8 +12,8 @@ public class IEquipmentVO {
     private Double failureRate;
     // 设备有效利用率
     private Double utilizationRatio;
-    // 设备维修质量
-    private Double rapairQuantity;
+    // 设备维修质量 拼错了！！！！！
+    private String rapairQuantity;
     // 设备状态
     private String equipmentStatus;
 
@@ -25,11 +25,11 @@ public class IEquipmentVO {
         this.equipmentStatus = equipmentStatus;
     }
 
-    public Double getRapairQuantity() {
+    public String getRapairQuantity() {
         return rapairQuantity;
     }
 
-    public void setRapairQuantity(Double rapairQuantity) {
+    public void setRapairQuantity(String rapairQuantity) {
         this.rapairQuantity = rapairQuantity;
     }
 
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java
index 0a560a28c..9045db323 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java
@@ -95,26 +95,26 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
                     runTime += diffTime;
                 }
                 // 计算维修质量（故障时间（小时）/故障次数）
-                double rapairQuantity = runTime / 3600000 / workOrderList.size();
-                equipmentVO.setRapairQuantity(Double.valueOf(rapairQuantity));
+                Double rapairQuantity = runTime / 3600000 / workOrderList.size();
+                String douStr = String.format("%.2f", rapairQuantity);
+                equipmentVO.setRapairQuantity(douStr);
             } else {
                 // 没有该记录则默认为0
-                equipmentVO.setRapairQuantity(0D);
+                equipmentVO.setRapairQuantity("0.00");
             }
         }
 
         // 按照raparQuantity字段进行排序，并使用subList获取前10个结果
         List<IEquipmentVO> top10 = equipmentVOList.stream()
-                .sorted(Comparator.comparingDouble(IEquipmentVO::getRapairQuantity)) // 排序
-                .limit(10) // 限制结果数量为10
-                .collect(Collectors.toList()); // 将结果收集到List中
-
+                .sorted(Comparator.comparing(IEquipmentVO::getRapairQuantity).reversed())// 由正序改为 反转排序 倒序
+//                .limit(10) // 限制结果数量为10 改为不限制结果数量
+                .collect(Collectors.toList()); //将结果收集到List中
         return success(top10);
     }
 
 
     /**
-     * 设备稳定性-MTBF top10
+     * 设备稳定性-MTBF
      * 公式：实际运转时间/停机次数
      */
     @Override
@@ -132,7 +132,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
 
     /**
      * 完好设备占比
-     * 公式：维修/故障设备
+     * 公式：（所有设备-故障设备）/所有设备
      */
     @Override
     @DS("#header.poolName")
diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
index bdd8cff70..9cd330cc4 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml
@@ -96,7 +96,7 @@
         )/COUNT(equipment_code) as decimal(18,2))as mtbf
         from equ_operation eo
         <where>
-            <if test="timeDimension == 'dd' ">and day(eo.create_time) = day(getdate())</if>
+            <if test="timeDimension == 'dd' ">and convert(char(10),eo.create_time,120) = convert(char(10),getdate(),120)</if>
             <if test="timeDimension == 'mm' ">and month(eo.create_time) = month(getdate())</if>
             <if test="timeDimension == 'yyyy' ">and year(eo.create_time) = year(getdate())</if>
         </where>