设备完好率

op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java

@@ -204,6 +204,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
     @DS("#header.poolName")
     public AjaxResult getEquipmentIntactRate(EquOperation equOperation) {
         //查询所有设备（设备停用的除外）
+        // CAST(SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END)*100.00/COUNT(*) as decimal(18,2)) AS intactRate
         EquOperation equipmentIntactRate = deviceInterfaceMapper.getEquipmentIntactRate(equOperation);
         return success(equipmentIntactRate);
     }

op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java

@@ -476,7 +476,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
                 List<EquOperation> subList = operationList.subList(startIndex,endIndex);
 
                 int num = equOperationMapper.insertEquOperationByBatch(subList);
-                System.out.println("数据源:"+poolName+"--->"+"第"+i+"轮"+"开始索引:"+startIndex+"________结束索引:"+endIndex+"________成功插入数量:"+num);
+                System.out.println("数据源:"+poolName+"--->"+"第"+(i+1)+"轮"+"开始索引:"+startIndex+"________结束索引:"+endIndex+"________成功插入数量:"+num);
             }
         }else {
             System.out.println("数据源:"+poolName+"当天生成过运行记录");

op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml

@@ -78,10 +78,19 @@
     <!--完好设备占比-->
     <select id="getEquipmentIntactRate" parameterType="EquOperation" resultType="com.op.device.domain.EquOperation">
         SELECT
-            SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END) AS operationEquipment,
-            SUM(CASE WHEN equipment_status = '0' or equipment_status = '2' THEN 1 Else 0 END) AS faultEquipment,
-            COUNT(*) AS totalEquipment,
-		    CAST(SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END)*100.00/COUNT(*) as decimal(18,2)) AS intactRate
+        SUM(CASE WHEN equipment_status = '1' or equipment_status = '3' THEN 1 Else 0 END) AS operationEquipment,
+        SUM(CASE WHEN equipment_status = '0' or equipment_status = '2' THEN 1 Else 0 END) AS faultEquipment,
+        COUNT(*) AS totalEquipment,
+        (
+        SELECT COUNT(id)
+        FROM equ_operation
+        WHERE '4%' > failure_rate AND CONVERT(date, create_time) = CONVERT(date, GETDATE())
+        )*100 /
+        (
+        SELECT COUNT(id)
+        FROM equ_operation
+        WHERE CONVERT(date, create_time) = CONVERT(date, GETDATE())
+        ) AS intactRate
         FROM base_equipment
         WHERE  del_flag = '0' AND status = '1'
     </select>

op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml

@@ -89,6 +89,7 @@
             <if test="createTimeStart != null "> and CONVERT(date,create_time) >= #{createTimeStart}</if>
             <if test="createTimeEnd != null "> and #{createTimeEnd} >= CONVERT(date,create_time)</if>
         </where>
+        order by CAST(create_time AS DATE) desc,group_line
     </select>
 
     <select id="selectEquOperationById" parameterType="String" resultMap="EquOperationResult">