状态时间bug

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

@@ -10,7 +10,6 @@ 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.model.vo.PageMap;
 import com.gyee.power.fitting.service.IPhotovoltaicAnalysisService;
 import com.gyee.power.fitting.service.IStateCauseService;
 import com.gyee.power.fitting.service.ProBasicEquipmentService;
@@ -21,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -100,7 +100,7 @@ public class PhotovoltaicAnalysisController {
 //        Page<StateCause> page = new Page<>(pageNum, pageSize);
         scWrapper.select("equipment_id,event,sum(time)/3600 hour");
         scWrapper.eq("state_type", "8种状态").in("equipment_id", pageItems)
-                .gt("start_time", startTime).lt("end_time", endTime);
+                .ge("start_time", startTime).lt("end_time", endTime);
         ;
         scWrapper.groupBy("equipment_id,event");
         List<StateCause> causePage = stateCauseService.list(scWrapper);
@@ -133,7 +133,9 @@ public class PhotovoltaicAnalysisController {
             Device device = new Device();
             device.setStationId(scs.get(0).getStationId());
             device.setDeviceId(wt);
+            AtomicReference<Double> sum = new AtomicReference<>((double) 0);
             scs.forEach(sc -> {
+                sum.updateAndGet(v -> v + sc.getHour());
                 switch (sc.getEvent()) {
                     case 0:
                         device.setStandbyTime(sc.getHour());
@@ -158,11 +160,13 @@ public class PhotovoltaicAnalysisController {
                         break;
                 }
             });
+            device.setTotal(sum.get());
             deviceList.add(device);
         });
         return deviceList;
     }
 
+    //性能等级评估
     @GetMapping("/analysis")
     public JSONObject photovoltaicAnalysis(
             @RequestParam("stationId") String stationId,
@@ -200,4 +204,44 @@ public class PhotovoltaicAnalysisController {
         list.setRecords(list.getRecords().stream().peek(pa -> pa.setEquipmentId(collect.get(pa.getEquipmentId()))).collect(Collectors.toList()));
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }
+
+    //逆变器分析
+    @GetMapping("/analysis/inverter")
+    public JSONObject photovoltaicInverterAnalysis(
+            @RequestParam("stationId") String stationId,
+            @RequestParam("time") String time,
+            @RequestParam("timeType") String timeType,
+            @RequestParam("pageNum") int pageNum,
+            @RequestParam("pageSize") int pageSize) {
+
+        Date date, startDate, endDate;
+
+        if ("year".equals(timeType)) {
+            date = DateUtil.parse(time, "yyyy");
+            startDate = DateUtil.beginOfYear(date);
+            endDate = DateUtil.endOfYear(date);
+        } 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);
+        }
+
+        QueryWrapper<PhotovoltaicAnalysis> wrapper = new QueryWrapper<>();
+        wrapper.select("station_id,equipment_id,avg(scatter) scatter,avg(conversion_efficiency)" +
+                        " conversion_efficiency,sum(equivalent_generating_time) equivalent_generating_time," +
+                        "avg(device_availability) device_availability").between("data_date", startDate, endDate)
+                .eq("station_id", stationId)
+                .groupBy("station_id,equipment_id").orderByAsc("equipment_id");
+        Page<PhotovoltaicAnalysis> page = new Page<>(pageNum, pageSize);
+        Page<PhotovoltaicAnalysis> list = photovoltaicAnalysisService.page(page, wrapper);
+
+        Map<String, String> collect = proBasicEquipmentService.getWtNcMap("IN");
+
+        list.setRecords(list.getRecords().stream().peek(pa -> pa.setEquipmentId(collect.get(pa.getEquipmentId()))).collect(Collectors.toList()));
+        return JsonResult.successData(ResultCode.SUCCESS, list);
+    }
 }

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

@@ -1,6 +1,9 @@
 package com.gyee.power.fitting.dispersionanalysis;
 
 import cn.hutool.core.collection.CollUtil;
+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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.power.fitting.common.feign.RemoteServiceBuilder;
@@ -40,116 +43,132 @@ public class CalculateTask {
         Map<String, ProBasicEquipmentPoint> mxztMap = proBasicEquipmentPointService.getEquipmentMapByUniformcode("MXZT");
         //获取最新更新时间
         QueryWrapper<StateCause> scWrapper = new QueryWrapper<>();
-        scWrapper.select("equipment_id,last_row(end_time) end_time").groupBy("equipment_id");
-        List<StateCause> scList = stateCauseService.list(scWrapper);
-        Map<String, StateCause> stateCauseMap;
-        if (scList.isEmpty()) {
-            stateCauseMap = new HashMap<>();
-        } else {
-            stateCauseMap = scList.stream().collect(Collectors.toMap(StateCause::getEquipmentId, Function.identity()));
-        }
+        scWrapper.select("equipment_id,last_row(end_time) end_time");
+        StateCause sc = stateCauseService.getOne(scWrapper);
+        DateRange dateRange = getDateRange(sc);
+        if (dateRange == null) return;
 
-        String equipmentId, tbName;
-        long starttime, endtime = DateUtil.date().getTime();
         List<StateCause> stateCauseList = new ArrayList<>();
-
-        for (ProBasicEquipment equipment : equipmentList) {
-            equipmentId = equipment.getId();
-            StateCause stateCause = stateCauseMap.get(equipmentId);
-            if (stateCause == null) {
-                starttime = DateUtil.yesterday().getTime();
-            } else {
-                starttime = stateCause.getEndTime() != null ? stateCause.getEndTime() - 6000 : DateUtil.yesterday().getTime();
-            }
-            List<TsDoubleData> datas8 = getDatas(sbztMap.get(equipmentId).getNemCode(), starttime, endtime);
-
-            tbName = equipmentId + "_SC_CI08";
-            if (CollUtil.isNotEmpty(datas8)) {
-                TsDoubleData remove = datas8.remove(0);
-                long ts0 = remove != null ? remove.getTs() : starttime;
-                long ts1;
-                int doubleValue0 = remove != null ? (int) remove.getDoubleValue() : 7;
-                int doubleValue1;
-                for (TsDoubleData data : datas8) {
-                    ts1 = data.getTs();
-                    doubleValue1 = (int) data.getDoubleValue();
-                    if (doubleValue1 == doubleValue0) continue;
-
-                    //0待机, 1运行, 2故障, 3检修, 4限电, 5受累, 6离线
-                    if (doubleValue1 == 1) {
-                        stateCauseList.add(new StateCause(tbName, 1, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 2) {
-                        stateCauseList.add(new StateCause(tbName, 2, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 3) {
-                        stateCauseList.add(new StateCause(tbName, 3, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 4) {
-                        stateCauseList.add(new StateCause(tbName, 4, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 5) {
-                        stateCauseList.add(new StateCause(tbName, 5, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 6) {
-                        stateCauseList.add(new StateCause(tbName, 6, ts1, ts0, ts0 - ts1));
-                    } else {
-                        stateCauseList.add(new StateCause(tbName, 0, ts1, ts0, ts0 - ts1));
+        long starttime, endtime;
+        for (DateTime time : dateRange) {
+            starttime = time.getTime();
+            endtime = DateUtil.endOfDay(time).getTime();
+
+            String equipmentId, tbName;
+            for (ProBasicEquipment equipment : equipmentList) {
+                equipmentId = equipment.getId();
+
+                tbName = equipmentId + "_SC_CI08";
+                List<TsDoubleData> datas8 = getDatas(sbztMap.get(equipmentId).getNemCode(), starttime, endtime);
+
+                if (CollUtil.isNotEmpty(datas8)) {
+
+                    long ts0 = endtime;
+                    long ts1;
+                    int doubleValue0 = (int) datas8.get(0).getDoubleValue();
+                    int doubleValue1 = 0;
+                    for (TsDoubleData data : datas8) {
+                        ts1 = data.getTs();
+                        doubleValue1 = (int) data.getDoubleValue();
+                        if (doubleValue1 == doubleValue0) continue;
+
+                        //0待机, 1运行, 2故障, 3检修, 4限电, 5受累, 6离线
+                        if (doubleValue1 == 1) {
+                            stateCauseList.add(new StateCause(tbName, 1, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 2) {
+                            stateCauseList.add(new StateCause(tbName, 2, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 3) {
+                            stateCauseList.add(new StateCause(tbName, 3, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 4) {
+                            stateCauseList.add(new StateCause(tbName, 4, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 5) {
+                            stateCauseList.add(new StateCause(tbName, 5, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 6) {
+                            stateCauseList.add(new StateCause(tbName, 6, ts1, ts0, ts0 - ts1));
+                        } else {
+                            stateCauseList.add(new StateCause(tbName, 0, ts1, ts0, ts0 - ts1));
+                        }
+                        ts0 = ts1;
+                        doubleValue0 = doubleValue1;
                     }
-                    if (ts1 <= starttime) break;
-                    ts0 = ts1;
-                    doubleValue0 = doubleValue1;
-
+                    if (ts0 > starttime) {
+                        stateCauseList.add(new StateCause(tbName, doubleValue1, starttime, ts0, ts0 - starttime));
+                    }
+                }else {
+                    System.out.println(equipmentId+":8种状态："+sbztMap.get(equipmentId).getNemCode());
                 }
-            }
-
-            List<TsDoubleData> datas14 = getDatas(mxztMap.get(equipmentId).getNemCode(), starttime, endtime);
 
-            tbName = equipmentId + "_SC_CI14";
-            if (CollUtil.isNotEmpty(datas14)) {
-                TsDoubleData remove = datas14.remove(0);
-                long ts0 = remove != null ? remove.getTs() : starttime;
-                long ts1;
-                int doubleValue0 = remove != null ? (int) remove.getDoubleValue() : 7;
-                int doubleValue1;
-                for (TsDoubleData data : datas14) {
-                    ts1 = data.getTs();
-                    doubleValue1 = (int) data.getDoubleValue();
-                    if (doubleValue1 == doubleValue0) continue;
-
-                    //0待机, 1手动停机, 2正常发电, 3发电降出力, 4故障, 5故障受累, 6检修, 7检修受累, 8限电降出力, 9限电停机, 10电网受累, 11环境受累, 12通讯中断, 13设备离线
-                    if (doubleValue1 == 1) {
-                        stateCauseList.add(new StateCause(tbName, 1, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 2) {
-                        stateCauseList.add(new StateCause(tbName, 2, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 3) {
-                        stateCauseList.add(new StateCause(tbName, 3, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 4) {
-                        stateCauseList.add(new StateCause(tbName, 4, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 5) {
-                        stateCauseList.add(new StateCause(tbName, 5, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 6) {
-                        stateCauseList.add(new StateCause(tbName, 6, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 7) {
-                        stateCauseList.add(new StateCause(tbName, 7, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 8) {
-                        stateCauseList.add(new StateCause(tbName, 8, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 9) {
-                        stateCauseList.add(new StateCause(tbName, 9, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 10) {
-                        stateCauseList.add(new StateCause(tbName, 10, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 11) {
-                        stateCauseList.add(new StateCause(tbName, 11, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 12) {
-                        stateCauseList.add(new StateCause(tbName, 12, ts1, ts0, ts0 - ts1));
-                    } else if (doubleValue1 == 13) {
-                        stateCauseList.add(new StateCause(tbName, 13, ts1, ts0, ts0 - ts1));
-                    } else {
-                        stateCauseList.add(new StateCause(tbName, 0, ts1, ts0, ts0 - ts1));
+                tbName = equipmentId + "_SC_CI14";
+                List<TsDoubleData> datas14 = getDatas(mxztMap.get(equipmentId).getNemCode(), starttime, endtime);
+
+                if (CollUtil.isNotEmpty(datas14)) {
+
+                    long ts0 = endtime;
+                    long ts1;
+                    int doubleValue0 = (int) datas14.get(0).getDoubleValue();
+                    int doubleValue1 = 0;
+                    for (TsDoubleData data : datas14) {
+                        ts1 = data.getTs();
+                        doubleValue1 = (int) data.getDoubleValue();
+                        if (doubleValue1 == doubleValue0) continue;
+
+                        //0待机, 1手动停机, 2正常发电, 3发电降出力, 4故障, 5故障受累, 6检修, 7检修受累, 8限电降出力, 9限电停机, 10电网受累, 11环境受累, 12通讯中断, 13设备离线
+                        if (doubleValue1 == 1) {
+                            stateCauseList.add(new StateCause(tbName, 1, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 2) {
+                            stateCauseList.add(new StateCause(tbName, 2, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 3) {
+                            stateCauseList.add(new StateCause(tbName, 3, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 4) {
+                            stateCauseList.add(new StateCause(tbName, 4, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 5) {
+                            stateCauseList.add(new StateCause(tbName, 5, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 6) {
+                            stateCauseList.add(new StateCause(tbName, 6, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 7) {
+                            stateCauseList.add(new StateCause(tbName, 7, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 8) {
+                            stateCauseList.add(new StateCause(tbName, 8, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 9) {
+                            stateCauseList.add(new StateCause(tbName, 9, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 10) {
+                            stateCauseList.add(new StateCause(tbName, 10, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 11) {
+                            stateCauseList.add(new StateCause(tbName, 11, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 12) {
+                            stateCauseList.add(new StateCause(tbName, 12, ts1, ts0, ts0 - ts1));
+                        } else if (doubleValue1 == 13) {
+                            stateCauseList.add(new StateCause(tbName, 13, ts1, ts0, ts0 - ts1));
+                        } else {
+                            stateCauseList.add(new StateCause(tbName, 0, ts1, ts0, ts0 - ts1));
+                        }
+                        ts0 = ts1;
+                        doubleValue0 = doubleValue1;
                     }
-                    if (ts1 <= starttime) break;
-                    ts0 = ts1;
-                    doubleValue0 = doubleValue1;
+                    if (ts0 > starttime) {
+                        stateCauseList.add(new StateCause(tbName, doubleValue1, starttime, ts0, ts0 - starttime));
+                    }
+                }else {
+                    System.out.println(equipmentId+":14种状态："+sbztMap.get(equipmentId).getNemCode());
                 }
+
             }
         }
+
         int i = stateCauseService.saveBatch(stateCauseList);
-        System.out.println("计算完成"+i);
+        System.out.println("计算完成" + i);
+    }
+
+    private DateRange getDateRange(StateCause sc) {
+        DateTime startTime;
+        DateTime endTime = DateUtil.beginOfDay(DateUtil.yesterday());
+        if (sc == null) {
+            startTime = endTime;
+        } else {
+            startTime = DateUtil.offsetDay(DateUtil.beginOfDay(DateUtil.date(sc.getEndTime())), 1);
+            if (startTime.isAfter(endTime)) return null;
+        }
+        return DateUtil.range(startTime, endTime, DateField.DAY_OF_YEAR);
     }
 
     private List<TsDoubleData> getDatas(String nemCode, long starttime, long endtime) {

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

@@ -14,6 +14,7 @@ public class Device {
     private Double powerLimitTime;//4限电
     private Double stressedTime;//5受累
     private Double offlineTime;//6离线
+    private Double total;
 
     public Double getStandbyTime() {
         if (standbyTime==null) {