Merge remote-tracking branch 'origin/master'

Houjie

2025-06-10 4371080df058a549cdaf31dddeca6c5fee58e23b

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java

@@ -7,6 +7,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.record.DVALRecord;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
@@ -24,7 +26,10 @@

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

/**
@@ -191,6 +196,18 @@
    */
   @GetMapping("/get2MTBF")
   public JSONObject get2MTBF(@RequestParam Map<String, Object> query) throws ParseException {
      String startTime = (String)query.get("startTime");
      String endTime = (String)query.get("endTime");
      if(StringUtils.isBlank(startTime) && StringUtils.isBlank(endTime)){
         Date dayAfter = DateUtils.getDayAfter(new Date(), -3);
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         dateFormat.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));// 设置北京时区
         query.put("startTime",dateFormat.format(dayAfter));

         String currentDateStr = DateUtils.getCurrentDateStr();
         query.put("endTime",currentDateStr);
      }

      List<Map<String, Object>> equipmentList = faultIntervalTimeService.getEquipmentList(query);
      List<FaultIntervalTime> faultIntervalTimeList = new ArrayList<>();
      for (Map<String, Object> map : equipmentList) {
@@ -209,25 +226,61 @@
            faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString());
            faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString());
            faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString());
            faultIntervalTime.setAverageRepairTime(equipmentMTBF.get(0).get("averageRepairTime").toString());
            faultIntervalTime.setAverageFaultIntervalTime(equipmentMTBF.get(0).get("averageFaultIntervalTime").toString());
            faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString());
            //计算mttr  MTTR：故障修复时间/故障次数
            BigDecimal repairTime = new BigDecimal(equipmentMTBF.get(0).get("repairTime").toString());
            BigDecimal faultNumber = new BigDecimal(equipmentMTBF.get(0).get("faultNumber").toString());
            BigDecimal averageRepairTime;
            if(new BigDecimal(0).compareTo(faultNumber) == 0){
               averageRepairTime = new BigDecimal(0);
            }else{
               averageRepairTime = repairTime.divide(faultNumber, 2, RoundingMode.HALF_UP);
            }
            //计算mtbf
            //MTBF:无故障时间/故障次数
            BigDecimal averageFaultIntervalTime;
            BigDecimal totalAvailableTime = new BigDecimal(equipmentMTBF.get(0).get("totalAvailableTime").toString());
            BigDecimal faultTime = new BigDecimal(equipmentMTBF.get(0).get("faultTime").toString());
            BigDecimal noFaultTime = new BigDecimal(equipmentMTBF.get(0).get("noFaultTime").toString());
            if(new BigDecimal(0).compareTo(faultNumber) == 0){
               averageFaultIntervalTime = new BigDecimal(0);
            }else{
//               averageFaultIntervalTime = (noFaultTime.subtract(faultTime)).divide(faultNumber, 2, BigDecimal.ROUND_HALF_EVEN);
               averageFaultIntervalTime = noFaultTime.divide(faultNumber, 2, RoundingMode.HALF_UP);
            }
            //计算完好率  完好率：无故障时间/总可利用时间
//            BigDecimal totalDay = new BigDecimal(equipmentMTBF.get(0).get("totalDay").toString());
//            BigDecimal repairDay = new BigDecimal(equipmentMTBF.get(0).get("repairDay").toString());

//            BigDecimal serviceabilityRate = noFaultTime.divide(totalAvailableTime,2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
            BigDecimal serviceabilityRate = noFaultTime.divide(totalAvailableTime,2,RoundingMode.HALF_EVEN).multiply(new BigDecimal(100));;
            //故障率
//            BigDecimal totalAvailableTime = new BigDecimal(equipmentMTBF.get(0).get("totalAvailableTime").toString());
//            BigDecimal repairTime = new BigDecimal(equipmentMTBF.get(0).get("repairTime").toString());
            BigDecimal startRate = faultTime.divide(totalAvailableTime,2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));


            faultIntervalTime.setAverageRepairTime(averageRepairTime.toString());
            faultIntervalTime.setAverageFaultIntervalTime(averageFaultIntervalTime.toString());
            faultIntervalTime.setServiceabilityRate(serviceabilityRate+"%");
            faultIntervalTime.setStartRate(startRate+"%");
            faultIntervalTimeList.add(faultIntervalTime);
         }else{
            List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getMTBFTotalAvailableTime(query);
            if(query.get("startTime") != "" && query.get("endTime") != ""){
               faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
               faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
               faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
            }else{
               faultIntervalTime.setTotalAvailableTime("0");
               faultIntervalTime.setNoFaultTime("0");
               faultIntervalTime.setAverageFaultIntervalTime("0");
            }
            faultIntervalTime.setAverageFaultIntervalTime("0");
            faultIntervalTime.setFaultTime("0");
            faultIntervalTime.setFaultNumber("0");
            faultIntervalTime.setAverageRepairTime("0");
            faultIntervalTime.setRepairTime("0");
            faultIntervalTime.setServiceabilityRate("100%");
            faultIntervalTime.setStartRate("0.00%");
            faultIntervalTimeList.add(faultIntervalTime);
         }

@@ -375,25 +428,54 @@
            faultIntervalTime.setNoFaultTime(equipmentMTBF.get(0).get("noFaultTime").toString());
            faultIntervalTime.setFaultTime(equipmentMTBF.get(0).get("faultTime").toString());
            faultIntervalTime.setFaultNumber(equipmentMTBF.get(0).get("faultNumber").toString());
            faultIntervalTime.setAverageRepairTime(equipmentMTBF.get(0).get("averageRepairTime").toString());
            faultIntervalTime.setAverageFaultIntervalTime(equipmentMTBF.get(0).get("averageFaultIntervalTime").toString());
            faultIntervalTime.setRepairTime(equipmentMTBF.get(0).get("repairTime").toString());
            faultIntervalTime.setEquipmentNumer(equipmentMTBF.get(0).get("equipmentNumer").toString());

            BigDecimal repairTime = new BigDecimal(equipmentMTBF.get(0).get("repairTime").toString());
            BigDecimal faultNumber = new BigDecimal(equipmentMTBF.get(0).get("faultNumber").toString());
            BigDecimal totalAvailableTime = new BigDecimal(equipmentMTBF.get(0).get("totalAvailableTime").toString());
            BigDecimal faultTime = new BigDecimal(equipmentMTBF.get(0).get("faultTime").toString());
            BigDecimal equipmentNumer = new BigDecimal(equipmentMTBF.get(0).get("equipmentNumer").toString());
            BigDecimal totalDay = new BigDecimal(equipmentMTBF.get(0).get("totalDay").toString());
            BigDecimal repairDay = new BigDecimal(equipmentMTBF.get(0).get("repairDay").toString());
            //计算mttr 修复时间/故障次数
            BigDecimal averageRepairTime = repairTime.divide(faultNumber, 2, BigDecimal.ROUND_HALF_EVEN);
            //计算mtbf （总可利用时间-故障时间）/故障次数
            BigDecimal averageFaultIntervalTime;
            if(new BigDecimal(0).compareTo(faultNumber)==0){
               averageFaultIntervalTime = new BigDecimal("0.00").setScale(2, RoundingMode.HALF_UP);
            }else{
               averageFaultIntervalTime = (totalAvailableTime.subtract(faultTime)).divide(faultNumber, 2, BigDecimal.ROUND_HALF_EVEN);
            }
            //完好率 （统计天数*设备数量-故障天数）/（统计天数*设备数量）
            BigDecimal serviceabilityRate = ((totalDay.multiply(equipmentNumer)).subtract(repairDay)).divide((totalDay.multiply(equipmentNumer)), 2, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));
            //开动率  （总可利用时间-故障时间）/总可利用时间
            BigDecimal startRate = (totalAvailableTime.subtract(faultTime)).divide(totalAvailableTime, 2, BigDecimal.ROUND_HALF_EVEN).multiply(new BigDecimal(100));

            faultIntervalTime.setAverageRepairTime(averageRepairTime.toString());
            faultIntervalTime.setAverageFaultIntervalTime(averageFaultIntervalTime.toString());
            faultIntervalTime.setServiceabilityRate(serviceabilityRate+"%");
            faultIntervalTime.setStartRate(startRate+"%");
            faultIntervalTimeList.add(faultIntervalTime);
         }else{
            List<Map<String, Object>> mtbfTotalAvailableTime = faultIntervalTimeService.getCenterMTBFTotalAvailableTime(query);
            if(query.get("startTime") != "" && query.get("endTime") != ""){
               faultIntervalTime.setTotalAvailableTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
               faultIntervalTime.setNoFaultTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
               faultIntervalTime.setAverageFaultIntervalTime(mtbfTotalAvailableTime.get(0).get("totalAvailableTime").toString());
               faultIntervalTime.setAverageFaultIntervalTime("0.00");
            }else{
               faultIntervalTime.setTotalAvailableTime("0");
               faultIntervalTime.setNoFaultTime("0");
               faultIntervalTime.setAverageFaultIntervalTime("0");
               faultIntervalTime.setAverageFaultIntervalTime("0.00");
            }
            faultIntervalTime.setFaultTime("0");
            faultIntervalTime.setFaultNumber("0");
            faultIntervalTime.setAverageRepairTime("0");
            faultIntervalTime.setEquipmentNumer("0");
            faultIntervalTime.setAverageRepairTime("0.00");
            faultIntervalTime.setRepairTime("0");
            faultIntervalTime.setServiceabilityRate("0.00%");
            faultIntervalTime.setStartRate("0.00%");
            faultIntervalTime.setStartTime("0");
            faultIntervalTimeList.add(faultIntervalTime);
         }

@@ -464,4 +546,7 @@
   }





}