Merge remote-tracking branch 'origin/master'

power-fitting-JN/src/main/java/com.gyee.power.fitting/controller/gf/PhotovoltaicAnalysisController.java

@@ -1,20 +1,23 @@
 package com.gyee.power.fitting.controller.gf;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateRange;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.power.fitting.common.result.JsonResult;
 import com.gyee.power.fitting.common.result.ResultCode;
 import com.gyee.power.fitting.dispersionanalysis.InverterPowerAnalysis2;
-import com.gyee.power.fitting.model.Device;
-import com.gyee.power.fitting.model.PhotovoltaicAnalysis;
-import com.gyee.power.fitting.model.ProBasicEquipment;
-import com.gyee.power.fitting.model.StateCause;
+import com.gyee.power.fitting.dispersionanalysis.ReliabilityCalculator;
+import com.gyee.power.fitting.model.*;
 import com.gyee.power.fitting.service.IPhotovoltaicAnalysisService;
 import com.gyee.power.fitting.service.IStateCauseService;
 import com.gyee.power.fitting.service.ProBasicEquipmentService;
+import com.gyee.power.fitting.service.ProBasicPowerstationService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -23,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -45,6 +49,10 @@ public class PhotovoltaicAnalysisController {
     private IStateCauseService stateCauseService;
     @Resource
     private InverterPowerAnalysis2 inverterPowerAnalysis;
+    @Resource
+    private ProBasicPowerstationService powerstationService;
+    @Resource
+    private ReliabilityCalculator reliabilityCalculator;
 
     //状态转换
     @GetMapping("/state_transition")
@@ -69,7 +77,7 @@ public class PhotovoltaicAnalysisController {
                 .ge("start_time", startTime).lt("end_time", endTime)
                 .orderByAsc("equipment_id,start_time");
         List<StateCause> list = stateCauseService.list(scWrapper);
-        Map<String, List<StateCause>> listMap = list.stream().peek(sc -> sc.setEquipmentId(stringMap.get(sc.getEquipmentId()))).collect(Collectors.groupingBy(StateCause::getEquipmentId,LinkedHashMap::new,Collectors.toList()));
+        Map<String, List<StateCause>> listMap = list.stream().peek(sc -> sc.setEquipmentId(stringMap.get(sc.getEquipmentId()))).collect(Collectors.groupingBy(StateCause::getEquipmentId, LinkedHashMap::new, Collectors.toList()));
 //        PageMap<StateCause> stateCauses = (PageMap<StateCause>) stateCauseService.page(page, scWrapper);
 
 //        stateCauses.setRecordMap(stateCauses.getRecords().stream().collect(Collectors.groupingBy(StateCause::getEquipmentId)));
@@ -108,7 +116,7 @@ public class PhotovoltaicAnalysisController {
                 .ge("start_time", startTime).lt("end_time", endTime);
         scWrapper.groupBy("equipment_id,event").orderByAsc("equipment_id");
         List<StateCause> causePage = stateCauseService.list(scWrapper);
-        Map<String, List<StateCause>> listMap = causePage.stream().peek(sc -> sc.setEquipmentId(stringMap.get(sc.getEquipmentId()))).collect(Collectors.groupingBy(StateCause::getEquipmentId,LinkedHashMap::new,Collectors.toList()));
+        Map<String, List<StateCause>> listMap = causePage.stream().peek(sc -> sc.setEquipmentId(stringMap.get(sc.getEquipmentId()))).collect(Collectors.groupingBy(StateCause::getEquipmentId, LinkedHashMap::new, Collectors.toList()));
         List<Device> deviceList = statecauses2Devices(listMap);
         /*PageMap<StateCause> pageMap = new PageMap<>();
         pageMap.
@@ -131,6 +139,132 @@ public class PhotovoltaicAnalysisController {
         return JsonResult.successData(ResultCode.SUCCESS, map);
     }
 
+    //MTBF&MTTR
+    @GetMapping("/mtbf_mttr")
+    public JSONObject getMtbfAndMttr(
+            @RequestParam(value = "companyId", required = false) String companyId,
+            @RequestParam(value = "stationId", required = false) String stationId,
+            @RequestParam("time") String time,
+            @RequestParam("type") String type,
+            @RequestParam("timeType") String timeType,
+            @RequestParam(value = "pageNum", required = false) Integer pageNum,
+            @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+
+        Date date, startDate, endDate;
+        DateRange range = null;
+        if ("year".equals(timeType)) {
+            date = DateUtil.parse(time, "yyyy");
+            startDate = DateUtil.beginOfYear(date);
+            endDate = DateUtil.endOfYear(date);
+            range = DateUtil.range(startDate, endDate, DateField.MONTH);
+        } else if ("month".equals(timeType)) {
+            date = DateUtil.parse(time, "yyyy-MM");
+            startDate = DateUtil.beginOfMonth(date);
+            endDate = DateUtil.endOfMonth(date);
+        } else {
+            date = DateUtil.parse(time);
+            startDate = DateUtil.beginOfDay(date);
+            endDate = DateUtil.endOfDay(date);
+        }
+
+        Map<String, ProBasicPowerstation> stationMap = powerstationService.getCacheList(companyId, type)
+                .stream().collect(Collectors.toMap(ProBasicPowerstation::getId, Function.identity()));
+        List<MtbfAndMttr> mttrs = new ArrayList<>();
+        List<MtbfAndMttr> mtbfs = new ArrayList<>();
+        for (String stId : stationMap.keySet()) {
+            MtbfAndMttr mt = new MtbfAndMttr();
+            mt.setStationId(stId);
+            mt.setStationName(stationMap.get(stId).getName());
+            mttrs.add(mt);
+            MtbfAndMttr mt2 = new MtbfAndMttr();
+            mt2.setStationId(stId);
+            mt2.setStationName(stationMap.get(stId).getName());
+            mtbfs.add(mt2);
+        }
+        Map<String, MtbfAndMttr> mttrMap = mttrs.stream().collect(Collectors.toMap(MtbfAndMttr::getStationId, Function.identity()));
+        Map<String, MtbfAndMttr> mtbfMap = mtbfs.stream().collect(Collectors.toMap(MtbfAndMttr::getStationId, Function.identity()));
+
+        for (DateTime dateTime : range) {
+            DateTime endOfMonth = DateUtil.endOfMonth(dateTime);
+
+            //故障
+            QueryWrapper<StateCause> gzWrapper = new QueryWrapper<>();
+            gzWrapper.select("station_id,count(*) time");
+            gzWrapper.eq("state_type", "8种状态").in("station_id", stationMap.keySet())
+                    .eq("event", 2)
+                    .ge("start_time", dateTime).lt("end_time", endOfMonth);
+            gzWrapper.groupBy("station_id");
+//            List<StateCause> gzlist = ;
+            Map<String, StateCause> gzMap = stateCauseService.list(gzWrapper)
+                    .stream().collect(Collectors.toMap(StateCause::getStationId, Function.identity()));
+
+            //维修
+            QueryWrapper<StateCause> wxWrapper = new QueryWrapper<>();
+            wxWrapper.select("station_id,sum(time)/3600 hour,count(*) time");
+            wxWrapper.eq("state_type", "8种状态").in("station_id", stationMap.keySet())
+                    .eq("event", 3)
+                    .ge("start_time", dateTime).lt("end_time", endOfMonth);
+            wxWrapper.groupBy("station_id");
+//            List<StateCause> wxlist = ;
+            Map<String, StateCause> wxMap = stateCauseService.list(wxWrapper)
+                    .stream().collect(Collectors.toMap(StateCause::getStationId, Function.identity()));
+
+            for (String stId : stationMap.keySet()) {
+                StateCause wx = wxMap.get(stId);
+                double wxh = 0, wxt = 0;
+                if (wx != null) {
+                    wxh = wx.getHour();
+                    wxt = wx.getTime();
+                }
+                double mttr = reliabilityCalculator.calculateMTTR(wxh, (int) wxt);
+                double l = (endOfMonth.getTime() - dateTime.getTime()) / 3600000.0;
+                double mtbf = reliabilityCalculator.calculateMTBF(l, gzMap.get(stId)==null?0: gzMap.get(stId).getTime().intValue());
+                if (DateUtil.month(dateTime) == 0) {
+                    mttrMap.get(stId).setCurrentMonth01(mttr);
+                    mtbfMap.get(stId).setCurrentMonth01(mtbf);
+                } else if (DateUtil.month(dateTime) == 1) {
+                    mttrMap.get(stId).setCurrentMonth02(mttr);
+                    mtbfMap.get(stId).setCurrentMonth02(mtbf);
+                } else if (DateUtil.month(dateTime) == 2) {
+                    mttrMap.get(stId).setCurrentMonth03(mttr);
+                    mtbfMap.get(stId).setCurrentMonth03(mtbf);
+                } else if (DateUtil.month(dateTime) == 3) {
+                    mttrMap.get(stId).setCurrentMonth04(mttr);
+                    mtbfMap.get(stId).setCurrentMonth04(mtbf);
+                } else if (DateUtil.month(dateTime) == 4) {
+                    mttrMap.get(stId).setCurrentMonth05(mttr);
+                    mtbfMap.get(stId).setCurrentMonth05(mtbf);
+                } else if (DateUtil.month(dateTime) == 5) {
+                    mttrMap.get(stId).setCurrentMonth06(mttr);
+                    mtbfMap.get(stId).setCurrentMonth06(mtbf);
+                } else if (DateUtil.month(dateTime) == 6) {
+                    mttrMap.get(stId).setCurrentMonth07(mttr);
+                    mtbfMap.get(stId).setCurrentMonth07(mtbf);
+                } else if (DateUtil.month(dateTime) == 7) {
+                    mttrMap.get(stId).setCurrentMonth08(mttr);
+                    mtbfMap.get(stId).setCurrentMonth08(mtbf);
+                } else if (DateUtil.month(dateTime) == 8) {
+                    mttrMap.get(stId).setCurrentMonth09(mttr);
+                    mtbfMap.get(stId).setCurrentMonth09(mtbf);
+                } else if (DateUtil.month(dateTime) == 9) {
+                    mttrMap.get(stId).setCurrentMonth10(mttr);
+                    mtbfMap.get(stId).setCurrentMonth10(mtbf);
+                } else if (DateUtil.month(dateTime) == 10) {
+                    mttrMap.get(stId).setCurrentMonth11(mttr);
+                    mtbfMap.get(stId).setCurrentMonth11(mtbf);
+                } else if (DateUtil.month(dateTime) == 11) {
+                    mttrMap.get(stId).setCurrentMonth12(mttr);
+                    mtbfMap.get(stId).setCurrentMonth12(mtbf);
+                }
+            }
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("MTBF", mtbfs);
+        map.put("MTTR", mttrs);
+
+        return JsonResult.successData(ResultCode.SUCCESS, map);
+    }
+
     private List<Device> statecauses2Devices(Map<String, List<StateCause>> listMap) {
         List<Device> deviceList = new ArrayList<>();
         listMap.forEach((wt, scs) -> {
@@ -164,7 +298,7 @@ public class PhotovoltaicAnalysisController {
                         break;
                 }
             });
-            device.setTotal(NumberUtil.round(sum.get(),2).doubleValue());
+            device.setTotal(NumberUtil.round(sum.get(), 2).doubleValue());
             deviceList.add(device);
         });
         return deviceList;
@@ -247,7 +381,7 @@ public class PhotovoltaicAnalysisController {
 
         list.setRecords(list.getRecords().stream().peek(pa -> {
             pa.setEquipmentId(collect.get(pa.getEquipmentId()));
-            pa.setScatterStatus(inverterPowerAnalysis.analyzeInverterStatus(pa.getScatter(),pa.getAveragePower()));
+            pa.setScatterStatus(inverterPowerAnalysis.analyzeInverterStatus(pa.getScatter(), pa.getAveragePower()));
         }).collect(Collectors.toList()));
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }

power-fitting-JN/src/main/java/com.gyee.power.fitting/dispersionanalysis/CalculateTask.java

@@ -48,7 +48,6 @@ public class CalculateTask {
         DateRange dateRange = getDateRange(sc);
         if (dateRange == null) return;
 
-        List<StateCause> stateCauseList = new ArrayList<>();
         long starttime, endtime;
         for (DateTime time : dateRange) {
             starttime = time.getTime();
@@ -56,6 +55,7 @@ public class CalculateTask {
 
             String equipmentId, tbName;
             for (ProBasicEquipment equipment : equipmentList) {
+                List<StateCause> stateCauseList = new ArrayList<>();
                 equipmentId = equipment.getId();
 
                 tbName = equipmentId + "_SC_CI08";
@@ -152,11 +152,12 @@ public class CalculateTask {
                     System.out.println(equipmentId+":14种状态："+sbztMap.get(equipmentId).getNemCode());
                 }
 
+                int i = stateCauseService.saveBatch(stateCauseList);
+                System.out.println("计算完成:" + i+"条，" + DateUtil.formatDate(time));
             }
+
         }
 
-        int i = stateCauseService.saveBatch(stateCauseList);
-        System.out.println("计算完成" + i);
     }
 
     private DateRange getDateRange(StateCause sc) {

power-fitting-JN/src/main/java/com.gyee.power.fitting/dispersionanalysis/ReliabilityCalculator.java

@@ -0,0 +1,44 @@
+package com.gyee.power.fitting.dispersionanalysis;
+
+import cn.hutool.core.util.NumberUtil;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ReliabilityCalculator {
+//    MTBF（Mean Time Between Failures）和MTTR（Mean Time To Repair）是两个关键的可靠性参数，用于评估系统、
+//    设备或组件的可用性和可维护性。它们通常用于预测设备故障和维护需求。
+//    MTBF（平均无故障时间）表示两次故障之间的平均时间，通常以小时为单位。MTBF的计算方法是：
+//    MTBF = 累积工作时间 / 故障次数
+//    MTTR（平均维修时间）表示修复设备或系统所需的平均时间，通常以小时为单位。MTTR的计算方法是：
+//    MTTR = 总维修时间 / 维修次数
+    public double calculateMTBF(double totalOperatingTime, int numberOfFailures) {
+        if (numberOfFailures == 0) {
+            return Double.POSITIVE_INFINITY; // 无故障发生，MTBF为正无穷
+        }
+        return NumberUtil.round(totalOperatingTime / numberOfFailures,2).doubleValue();
+    }
+
+    public double calculateMTTR(double totalRepairTime, int numberOfRepairs) {
+        if (numberOfRepairs == 0) {
+            return 0.0; // 无维修发生，MTTR为0
+        }
+        return NumberUtil.round(totalRepairTime / numberOfRepairs,2).doubleValue();
+    }
+
+    public static void main(String[] args) {
+        ReliabilityCalculator calculator = new ReliabilityCalculator();
+
+        // 示例数据
+        double totalOperatingTime = 5000.0; // 累积工作时间，单位：小时
+        int numberOfFailures = 5; // 故障次数
+
+        double totalRepairTime = 20.0; // 总维修时间，单位：小时
+        int numberOfRepairs = 4; // 维修次数
+
+        double mtbf = calculator.calculateMTBF(totalOperatingTime, numberOfFailures);
+        double mttr = calculator.calculateMTTR(totalRepairTime, numberOfRepairs);
+
+        System.out.println("MTBF: " + mtbf + " 小时");
+        System.out.println("MTTR: " + mttr + " 小时");
+    }
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/MtbfAndMttr.java

@@ -0,0 +1,33 @@
+package com.gyee.power.fitting.model;
+
+import lombok.Data;
+
+@Data
+public class MtbfAndMttr {
+    private String stationId;
+    private String stationName;
+    private double currentMonth01;
+    private double sameMonthLastYear01;
+    private double currentMonth02;
+    private double sameMonthLastYear02;
+    private double currentMonth03;
+    private double sameMonthLastYear03;
+    private double currentMonth04;
+    private double sameMonthLastYear04;
+    private double currentMonth05;
+    private double sameMonthLastYear05;
+    private double currentMonth06;
+    private double sameMonthLastYear06;
+    private double currentMonth07;
+    private double sameMonthLastYear07;
+    private double currentMonth08;
+    private double sameMonthLastYear08;
+    private double currentMonth09;
+    private double sameMonthLastYear09;
+    private double currentMonth10;
+    private double sameMonthLastYear10;
+    private double currentMonth11;
+    private double sameMonthLastYear11;
+    private double currentMonth12;
+    private double sameMonthLastYear12;
+}

power-fitting-JN/src/main/java/com.gyee.power.fitting/model/custom/FjjxbVo.java

@@ -3,31 +3,27 @@ package com.gyee.power.fitting.model.custom;
 import com.gyee.power.fitting.model.anno.Desc;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
-
 @Data
 public class FjjxbVo {
 
     private String id;
     @Desc(des = "名称")
     private String name;
-    @Desc(des = "理论发电量(万kWh)")
+    @Desc(des = "理论发电量(kWh)")
     private double llfdl;
-    @Desc(des = "实际发电量(万kWh)")
+    @Desc(des = "实际发电量(kWh)")
     private double sjfdl;
     @Desc(des = "平均风速(m/s)")
     private double speed;
-    @Desc(des = "计划检修(万kWh)")
+    @Desc(des = "计划检修(kWh)")
     private double fjhjx;
-    @Desc(des = "非计划检修(万kWh)")
+    @Desc(des = "非计划检修(kWh)")
     private double jhjx;
-    @Desc(des = "受累(万kWh)")
+    @Desc(des = "受累(kWh)")
     private double sl;
-    @Desc(des = "限电(万kWh)")
+    @Desc(des = "限电(kWh)")
     private double xd;
-    @Desc(des = "性能(万kWh)")
+    @Desc(des = "性能(kWh)")
     private double xn;
     @Desc(des = "风能利用率(%)")
     private double fnlly;

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/ProBasicPowerstationService.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface ProBasicPowerstationService extends IService<ProBasicPowerstation> {
 
     List<ProBasicPowerstation> selectList();
+
+    List<ProBasicPowerstation> getCacheList(String companyid, String type);
 }

power-fitting-JN/src/main/java/com.gyee.power.fitting/service/impl/ProBasicPowerstationServiceImpl.java

@@ -1,10 +1,13 @@
 package com.gyee.power.fitting.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.power.fitting.common.base.ExcludeQueryWrapper;
 import com.gyee.power.fitting.model.ProBasicPowerstation;
 import com.gyee.power.fitting.mapper.ProBasicPowerstationMapper;
 import com.gyee.power.fitting.service.ProBasicPowerstationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -35,4 +38,15 @@ public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerst
 
         return list;
     }
+
+    @Override
+    @Cacheable("getStationCacheList")
+    public List<ProBasicPowerstation> getCacheList(String companyid, String type) {
+        QueryWrapper<ProBasicPowerstation> wrapper = new QueryWrapper<>();
+//        场站类型(-1为风电)(-2为光伏)
+        wrapper.eq(StrUtil.isNotBlank(companyid), "company_id", companyid);
+        wrapper.eq(StrUtil.isNotBlank(type), "wind_type", type);
+        wrapper.orderByAsc("order_num");
+        return baseMapper.selectList(wrapper);
+    }
 }