报表写入

generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo5Service.java

@@ -356,16 +356,19 @@ public class EquipmentInfo5Service {
                 for (int i = 0; i < w; i++) {
 
                     double status = statusDataList.get(i).getPointValueInDouble();
-                    double speed = speedDataList.get(i).getPointValueInDouble();
+//                    double speed = speedDataList.get(i).getPointValueInDouble();
+                    double speed = speedDataList.get(w-i).getPointValueInDouble();
                     if (i == 0) {
-                        begin = new Date(speedDataList.get(i).getPointTime());
+//                        begin = new Date(speedDataList.get(i).getPointTime());
+                        begin = new Date(speedDataList.get(w-i).getPointTime());
                         laststatus = status;
                     }
 
                     if (speed <= 3.0) {
                         if (laststatus != status && (status == stateDescription1.get(3.0) || status == stateDescription2.get(3.0))) {
 
-                            Date end = new Date(speedDataList.get(i).getPointTime());
+//                            Date end = new Date(speedDataList.get(i).getPointTime());
+                            Date end = new Date(speedDataList.get(w-i).getPointTime());
                             double zhcs = DateUtils.hoursDiff2(begin, end);
                             if (zhcs < 0.25)//5分钟
                             {
@@ -427,7 +430,8 @@ public class EquipmentInfo5Service {
                         if (laststatus != status &&
                                 (status == stateDescription1.get(3.5) || status == stateDescription2.get(3.5))) {
 
-                            Date end = new Date(speedDataList.get(i).getPointTime());
+//                            Date end = new Date(speedDataList.get(i).getPointTime());
+                            Date end = new Date(speedDataList.get(w-i).getPointTime());
                             double zhcs = DateUtils.hoursDiff2(begin, end);
                             if (zhcs < 0.25)//5分钟
                             {
@@ -491,7 +495,8 @@ public class EquipmentInfo5Service {
                         if (laststatus != status &&
                                 (status == stateDescription1.get(4.0) || status == stateDescription2.get(4.0))) {
 
-                            Date end = new Date(speedDataList.get(i).getPointTime());
+//                            Date end = new Date(speedDataList.get(i).getPointTime());
+                            Date end = new Date(speedDataList.get(w-i).getPointTime());
                             double zhcs = DateUtils.hoursDiff2(begin, end);
                             if (zhcs < 0.25)//5分钟
                             {

generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java

@@ -1499,7 +1499,7 @@ public class WindPowerInfo1Service {
 
     public void writeReportHistory2(Date date) throws Exception {
 //        String[] dateTime = {"2024-12-13 01:00:00", "2024-12-13 05:00:00", "2024-12-13 09:00:00","2024-12-13 13:00:00", "2024-12-13 17:00:00", "2024-12-13 21:00:00"};
-        String[] dateTime = {"2024-11-07 21:00:00"};
+        String[] dateTime = {"2024-12-27 01:00:00", "2024-12-27 05:00:00", "2024-12-27 09:00:00","2024-12-27 13:00:00", "2024-12-27 17:00:00", "2024-12-27 21:00:00"};
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         String[] split = repInfo2.split(",");
@@ -1507,17 +1507,15 @@ public class WindPowerInfo1Service {
         for (String s : dateTime) {
             Date date1 = simpleDateFormat.parse(s);
             long timestamp = date1.getTime();
-//            for (long i = timestamp; i < 1735033631000L; i += 86400000) {
+            for (long i = timestamp; i < 1736287200000L; i += 86400000) {
             List<StationInfoHour> shs = new ArrayList<>();
             for (String l : ls) {
-//                    Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, i);
                 Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, timestamp);
                 if (null == historySection || historySection.isEmpty()) {
                     return;
                 }
                 StationInfoHour sh = new StationInfoHour();
-//                    sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(i),ZoneId.systemDefault()));
-                sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()));
+                sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(i), ZoneId.systemDefault()));
                 sh.setWpid("NX_FGS_HA_FDC_STA");
                 sh.setMeterId(l);
                 sh.setMeterName(l);
@@ -1532,7 +1530,7 @@ public class WindPowerInfo1Service {
                 e.printStackTrace();
             }
         }
-//        }
+        }
 
     }
 
@@ -1544,7 +1542,7 @@ public class WindPowerInfo1Service {
         List<ProEconEquipmentInfoJs> jss = new ArrayList<>();
         LocalDate now = LocalDate.now();
         QueryWrapper<ProEconEquipmentInfoJs> qw2 = new QueryWrapper<>();
-        qw2.lambda().eq(ProEconEquipmentInfoJs::getRecordDate, now);
+        qw2.lambda().eq(ProEconEquipmentInfoJs::getRecordDate, now).eq(ProEconEquipmentInfoJs::getMeterId, "AI0001");
         List<ProEconEquipmentInfoJs> projss = iProEconEquipmentInfoJsService.list(qw2);
         if (null != projss && !projss.isEmpty()) {
             List<String> meter = projss.stream().map(ProEconEquipmentInfoJs::getMeterId).collect(Collectors.toList());
@@ -1557,7 +1555,7 @@ public class WindPowerInfo1Service {
             ProEconEquipmentInfoJs js = new ProEconEquipmentInfoJs();
             js.setRecordDate(now);
             js.setWpid(backfill.getStation());
-            js.setMeterId(backfill.getCode());
+            js.setMeterId("AI0001");
             js.setMeterName(backfill.getCode());
             jss.add(js);
         }
@@ -1571,6 +1569,42 @@ public class WindPowerInfo1Service {
     }
 
 
+    public void writeReportHistory3(Date date) throws Exception {
+        QueryWrapper<ProBaseBackfill> qw = new QueryWrapper<>();
+        qw.lambda().eq(ProBaseBackfill::getType, "AI0001");
+        List<ProBaseBackfill> backfills = iProBaseBackfillService.list(qw);
+        List<ProEconEquipmentInfoJs> jss = new ArrayList<>();
+        String[] dateTime = { "2025-01-09"};
+        for (String s : dateTime) {
+            LocalDate now = LocalDate.parse(s);
+            QueryWrapper<ProEconEquipmentInfoJs> qw2 = new QueryWrapper<>();
+            qw2.lambda().eq(ProEconEquipmentInfoJs::getRecordDate, now).eq(ProEconEquipmentInfoJs::getMeterId, "AI0001");
+            List<ProEconEquipmentInfoJs> projss = iProEconEquipmentInfoJsService.list(qw2);
+            if (null != projss && !projss.isEmpty()) {
+                List<String> meter = projss.stream().map(ProEconEquipmentInfoJs::getMeterId).collect(Collectors.toList());
+                backfills = backfills.stream().filter(bf -> !meter.contains(bf.getCode())).collect(Collectors.toList());
+            }
+            if (null == backfills || backfills.isEmpty()) {
+                return;
+            }
+            for (ProBaseBackfill backfill : backfills) {
+                ProEconEquipmentInfoJs js = new ProEconEquipmentInfoJs();
+                js.setRecordDate(now);
+                js.setWpid(backfill.getStation());
+                js.setMeterId("AI0001");
+                js.setMeterName(backfill.getCode());
+                jss.add(js);
+            }
+            try {
+                boolean b = iProEconEquipmentInfoJsService.saveBatch(jss);
+                System.out.println(b);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
 }
 
 

generationXK-service/src/main/java/com/gyee/generation/task/SaticSchedulePgTask.java

@@ -1780,7 +1780,7 @@ public class SaticSchedulePgTask {
 
         Date date = new Date();
         windPowerInfo1Service.writeReport3(date);
-
+//        windPowerInfo1Service.writeReportHistory3(date);
     }
 
 }

generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -18,6 +18,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.*;
 
 /**
@@ -749,7 +751,6 @@ public class EdosUtil implements IEdosUtil {
             // 发起POST请求
             ResponseEntity<JSONObject> resp = restTemplate.exchange(url,HttpMethod.POST,requestEntity,JSONObject.class);
             JSONObject jsonObject = resp.getBody();
-
             if (jsonObject != null&&!jsonObject.isEmpty()) {
                 //对结果进行有序返回
                 int len = pointids.size();
@@ -773,7 +774,7 @@ public class EdosUtil implements IEdosUtil {
                     // 获得key
                     String key = sIterator.next();
                     PointData pointData = pointDataHashMap.get(key);
-                    if (pointData == null)
+                    if (pointData == null||null==pointData.getPointTime())
                         continue;
                     // 根据key获得value, value也可以是JSONObject,JSONArray,使用对应的参数接收即可
                     JSONObject jsonData = jsonObject.getJSONObject(key);

runeconomy-xk/pom.xml

@@ -190,6 +190,25 @@
             <version>2.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>2.2.3.RELEASE</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/io.github.openfeign/feign-httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>11.10</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.3</version>
+        </dependency>
+
+
     </dependencies>
     <build>
         <plugins>

runeconomy-xk/src/main/java/com/gyee/RunEconomyApplication.java

@@ -6,6 +6,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.system.ApplicationHome;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -17,6 +18,7 @@ import java.net.UnknownHostException;
 @Log4j2
 @SpringBootApplication
 @EnableScheduling
+@EnableFeignClients
 @MapperScan("com.gyee.runeconomy.mapper")
 public class RunEconomyApplication {
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/Windresourceanalysis/WindresourceanalysisController.java

@@ -8,6 +8,7 @@ import com.gyee.runeconomy.dto.pewpVo;
 import com.gyee.runeconomy.dto.result.JsonResult;
 import com.gyee.runeconomy.dto.result.ResultCode;
 import com.gyee.runeconomy.service.Windresourceanalysis.WindresourceanalysisService;
+import com.gyee.runeconomy.service.Windresourceanalysis.WindresourceanalysisService2;
 import com.gyee.runeconomy.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -30,6 +31,9 @@ public class WindresourceanalysisController {
     @Resource
     private WindresourceanalysisService windresourceanalysisService;
 
+    @Resource
+    private WindresourceanalysisService2 windresourceanalysisService2;
+
     @GetMapping("/fdanalysis")
     @ResponseBody
     @ApiOperation(value = "pr分析", notes = "pr分析")
@@ -129,7 +133,8 @@ public class WindresourceanalysisController {
     @ResponseBody
     public JSONObject fsRoses(String wpid, @RequestParam(value = "mode", required = false) Integer mode, String Data) throws Exception {
         mode = mode == null ? 0 : mode;
-        Object o = windresourceanalysisService.fxRoses(wpid, mode, Data);
+//        Object o = windresourceanalysisService.fxRoses(wpid, mode, Data);
+        Object o = windresourceanalysisService2.fxRoses(wpid, mode, Data);
         return JsonResult.successData(ResultCode.SUCCESS, o);
     }
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/PointData.java

@@ -0,0 +1,120 @@
+package com.gyee.runeconomy.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.gyee.runeconomy.util.realtimesource.timeseries.TsDataType;
+
+import java.util.Date;
+
+/**
+ * 测点数据
+ */
+public class PointData {
+    /**
+     * 时间戳
+     */
+    private long ts;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date time;
+    private String tagName;
+    /**
+     * 数据
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+//    @JsonSetter(nulls = Nulls.SKIP)
+    private Double doubleValue;
+    /**
+     * Boolean 数据
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+//    @JsonSetter(nulls = Nulls.SKIP)
+    private Boolean booleanValue;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+//    @JsonSetter(nulls = Nulls.SKIP)
+    private Long longValue;
+
+    public PointData() {
+    }
+
+    public PointData(Date time, double doubleValue) {
+        this.time = time;
+        this.doubleValue = doubleValue;
+    }
+
+    public long getTs() {
+        if (ts == 0 && time != null) {
+            return time.getTime();
+        }
+        return ts;
+    }
+
+    public void setTs(long ts) {
+        this.ts = ts;
+    }
+
+    @JsonIgnore
+    public TsDataType getDataType() {
+        if (booleanValue != null && booleanValue) {
+            return TsDataType.BOOLEAN;
+        } else if (longValue != null && longValue != 0) {
+            return TsDataType.LONG;
+        }
+        return TsDataType.DOUBLE;
+    }
+
+    public Boolean getBooleanValue() {
+        return booleanValue;
+    }
+
+    public Boolean isBooleanValue() {
+        return booleanValue;
+    }
+
+    public void setBooleanValue(boolean booleanValue) {
+        this.booleanValue = booleanValue;
+    }
+
+    public Long getLongValue() {
+        return longValue;
+    }
+
+    public void setLongValue(long longValue) {
+        this.longValue = longValue;
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public String getTagName() {
+        return tagName;
+    }
+
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
+
+    public Double getDoubleValue() {
+        return doubleValue;
+    }
+
+    public void setDoubleValue(double doubleValue) {
+        this.doubleValue = doubleValue;
+    }
+
+    @JsonIgnore
+    public Double getValue() {
+        if (booleanValue != null && booleanValue) {
+            return 1.0;
+        } else if (longValue != null && longValue != 0) {
+            doubleValue = Double.valueOf(longValue);
+        }
+        return doubleValue;
+    }
+
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/TurbineInfoDay.java

@@ -1,30 +1,23 @@
 package com.gyee.runeconomy.model.auto;
 
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author author
- * @since 2024-11-18
+ * @author gfhd
+ * @since 2024-05-29
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 @TableName("turbine_info_day")
 public class TurbineInfoDay implements Serializable {
 
@@ -32,165 +25,44 @@ public class TurbineInfoDay implements Serializable {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
-    @TableField("station_id")
     private String stationId;
-
-    @TableField("project_id")
     private String projectId;
-
-    @TableField("line_id")
     private String lineId;
-
-    @TableField("turbine_id")
     private String turbineId;
-
-    @TableField("record_date")
     private Date recordDate;
-
-    @TableField("rfdl")
     private BigDecimal rfdl;
-
-    /**
-     * 计划检修损失
-     */
-    @TableField("jhjxss")
     private BigDecimal jhjxss;
-
-    /**
-     * 非计划检修损失
-     */
-    @TableField("fjhjxss")
     private BigDecimal fjhjxss;
-
-    /**
-     * 限电损失
-     */
-    @TableField("xdss")
     private BigDecimal xdss;
-
-    /**
-     * 受累损失
-     */
-    @TableField("slss")
     private BigDecimal slss;
-
-    /**
-     * 性能损失
-     */
-    @TableField("xnss")
     private BigDecimal xnss;
-
-    /**
-     * 理论发电量
-     */
-    @TableField("llfdl")
-    private BigDecimal llfdl;
-
-    @TableField("pjfs")
-    private BigDecimal pjfs;
-
-    /**
-     * 额定风速
-     */
-    @TableField("edfs")
-    private BigDecimal edfs;
-
-    /**
-     * 小风切入风速
-     */
-    @TableField("xfqrfs")
-    private BigDecimal xfqrfs;
-
-    @TableField("hjwd")
-    private BigDecimal hjwd;
-
-    /**
-     * 待机损失
-     */
-    @TableField("djss")
+    private Double llfdl;
+    private Double pjfs;
+    private Double edfs;
+    private Double xfqrfs;
+    private Double hjwd;
     private BigDecimal djss;
-
-    /**
-     * 故障损失
-     */
-    @TableField("gzss")
     private BigDecimal gzss;
-
-    /**
-     * 待机分钟
-     */
-    @TableField("dj_min")
-    private BigDecimal djMin;
-
-    /**
-     * 停机分钟
-     */
-    @TableField("tj_min")
-    private BigDecimal tjMin;
-
-    /**
-     * 运行分钟
-     */
-    @TableField("yx_min")
-    private BigDecimal yxMin;
-
-    /**
-     * 故障分钟
-     */
-    @TableField("gz_min")
-    private BigDecimal gzMin;
-
-    /**
-     * 检修分钟
-     */
-    @TableField("jx_min")
-    private BigDecimal jxMin;
-
-    /**
-     * 限电分钟
-     */
-    @TableField("xd_min")
-    private BigDecimal xdMin;
-
-    /**
-     * 离线分钟
-     */
-    @TableField("lx_min")
-    private BigDecimal lxMin;
-
-    /**
-     * 待机次数
-     */
-    @TableField("djcs")
-    private Integer djcs;
-
-    @TableField("tjcs")
+    private Double djMin;
+    private Double tjMin;
+    private Double yxMin;
+    private Double gzMin;
+    private Double jxMin;
+    private Double xdMin;
+    private Double lxMin;
+    private Long djcs;
     private Integer tjcs;
-
-    @TableField("yxcs")
-    private Integer yxcs;
-
-    @TableField("gzcs")
-    private Integer gzcs;
-
-    @TableField("jxcs")
-    private Integer jxcs;
-
-    @TableField("xdcs")
-    private Integer xdcs;
-
-    @TableField("lxcs")
-    private Integer lxcs;
-
-    @TableField("fx")
-    private BigDecimal fx;
-
-    @TableField("yxfss")
-    private BigDecimal yxfss;
-
-
-    @TableField("jfpl")
-    private BigDecimal jfpl;
-
+    private Long yxcs;
+    private Long gzcs;
+    private Long jxcs;
+    private Long xdcs;
+    private Long lxcs;
+    private Double jfpl;
+    private Double glyzxxs;
+    private Double fx;
+    private Double yxfss;
+    private Double lyxs;
+    private Double klyl;
+    private Double fnlyl;
+    private Double bll;
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Windresourceanalysis/WindresourceanalysisService2.java

@@ -0,0 +1,190 @@
+package com.gyee.runeconomy.service.Windresourceanalysis;
+
+import com.gyee.common.contant.ContantXk;
+import com.gyee.runeconomy.dto.WindspeedVo;
+import com.gyee.runeconomy.dto.speed.PowerPointData;
+import com.gyee.runeconomy.dto.speed.WindDirectionALG;
+import com.gyee.runeconomy.feign.AdapterApi;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.PointData;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
+import com.gyee.runeconomy.model.auto.ProBasicWeatherStation;
+import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
+import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.net.URI;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class WindresourceanalysisService2 {
+
+    @Resource
+    private IProEconPowerstationInfoDay1Service proEconPowerstationInfoDay1Service;
+
+    @Resource
+    private IProBasicPowerstationPointService proBasicPowerstationPointService;
+
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private AdapterApi adapterApi;
+
+    public URI goldenUri() {
+        return URI.create("http://10.220.1.8:8011/ts");
+    }
+
+
+
+    /**
+     * 风向玫瑰图\风向频率玫瑰图
+     *
+     * @param wpid 预处理数据的id
+     * @param mode 0:单台风机  1:多台风机合并
+     * @return
+     */
+    public Object fxRoses(String wpid, int mode, String Data) throws Exception {
+
+        List<ProBasicWeatherStation> wplsf = CacheContext.weawpls.stream().filter(w -> w.getWindpowerstationId().equals(wpid)).collect(Collectors.toList());
+
+        //转换时间为Date类型
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = sdf.parse(Data);
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+
+        Date startTime = calendar.getTime();
+
+        Calendar calendar1 = Calendar.getInstance();
+        calendar1.setTime(date);
+
+        // 获取当前日期
+        Calendar today = Calendar.getInstance();
+        today.set(Calendar.HOUR_OF_DAY, 0);
+        today.set(Calendar.MINUTE, 0);
+        today.set(Calendar.SECOND, 0);
+
+        // 判断是否是当天
+        if (calendar1.get(Calendar.YEAR) == today.get(Calendar.YEAR) &&
+                calendar1.get(Calendar.DAY_OF_YEAR) == today.get(Calendar.DAY_OF_YEAR)) {
+            // 当天，设置endTime为当前时间
+            Date now = new Date();
+            calendar1.setTime(now);
+        } else {
+            // 非当天，设置endTime为传入的date的23:59:59
+            calendar1.set(Calendar.HOUR_OF_DAY, 23);
+            calendar1.set(Calendar.MINUTE, 59);
+            calendar1.set(Calendar.SECOND, 59);
+        }
+        Date endTime = calendar1.getTime();
+
+        ProBasicPowerstationPoint pjfs = null;
+        ProBasicPowerstationPoint pjfx = null;
+
+        List<WindspeedVo> vos = new ArrayList<>();
+
+        for (ProBasicWeatherStation ww : wplsf) {
+            if (ww.getId().contains("GJYF02")) continue;
+
+            pjfs = proBasicPowerstationPointService.getPowerstationPoint(ww.getId(), ContantXk.FCCFTFS70);
+            pjfx = proBasicPowerstationPointService.getPowerstationPoint(ww.getId(), ContantXk.FCCFTFX70);
+
+            List<ProBasicPowerstation> collect = CacheContext.wplsf.stream().filter(c -> c.getId().equals(ww.getWindpowerstationId())).collect(Collectors.toList());
+
+            if (pjfs.getNemCode() != null && !pjfs.getNemCode().equals("INITIAL")) {
+
+                List<PointData> pjfsls = adapterApi.getHistorySnap(goldenUri(), pjfs.getNemCode(), startTime.getTime(), endTime.getTime(), 900);
+                List<PointData> pjfxls = adapterApi.getHistorySnap(goldenUri(), pjfx.getNemCode(), startTime.getTime(), endTime.getTime(), 900);
+                double temp1 = 0;
+                for (int i = 0; i < pjfsls.size(); i++) {
+                    WindspeedVo vo = new WindspeedVo();
+                    temp1 = pjfsls.get(i).getDoubleValue();
+                    vo.setWpid(ww.getId());
+                    vo.setHours(pjfsls.get(i).getTs());
+                    vo.setPjfs(temp1);
+                    vos.add(vo);
+                }
+
+                if (pjfxls != null && pjfxls.size() > 1) {
+                    vos.stream().forEach(i -> {
+                        Optional<PointData> optional = pjfxls.stream()
+                                .filter(j -> j.getTime().equals(i.getHours()))
+                                .findFirst();
+                        if (optional.isPresent()) {
+                            PointData tqinfoday = optional.get();
+                            i.setPjfx(tqinfoday.getDoubleValue());
+                        }
+                    });
+                }
+            }
+
+        }
+
+        List<Object> result = new ArrayList<>();
+        if (mode == 0) {
+
+            Map<String, Object> map = new HashMap<>();
+            List<PowerPointData> ls = new ArrayList<>();
+            for (WindspeedVo v : vos) {
+                PowerPointData data = new PowerPointData();
+                data.setFx(v.getPjfx());
+                data.setSpeed(v.getPjfs());
+                ls.add(data);
+            }
+            map.put("wt", wpid);
+            map.put("roses", WindDirectionALG.fxRoses(ls));
+            map.put("count", WindDirectionALG.fxCountRoses(ls));
+            //                map.put("radar", WindDirectionALG.fxRadarRoses(ls));
+            //                map.put("frequency", WindDirectionALG.windDeviationPoint(ls));
+            result.add(map);
+
+        }
+        if (mode == 1) {
+            List<PowerPointData> ls = new ArrayList<>();
+            for (WindspeedVo obj : vos)
+                ls.addAll(csvParse(obj));
+            Map<String, Object> map = new HashMap<>();
+            map.put("wt", "merge");
+            map.put("roses", WindDirectionALG.fxRoses(ls));
+            map.put("count", WindDirectionALG.fxCountRoses(ls));
+            //            map.put("radar", WindDirectionALG.fxRadarRoses(ls));
+            //            map.put("frequency", WindDirectionALG.windDeviationPoint(ls));
+            result.add(map);
+        }
+
+        return result;
+    }
+
+    /**
+     * csv 文件解析成对象
+     *
+     * @param obj
+     * @return
+     */
+    private List<PowerPointData> csvParse(WindspeedVo obj) {
+        List<PowerPointData> ls = new ArrayList<>();
+        //        List<String> content = FileUtil.readFile(obj.getPath(), true);
+        //        for (int i = 1; i < content.size(); i++){
+        //            String[] split = content.get(i).split(",");
+        PowerPointData data = new PowerPointData();
+        //            if (data.getSpeed() < 0 || data.getPower() < 0)
+        //                continue;
+        data.setWtId(obj.getWpid());
+        data.setFx(obj.getPjfx());
+        data.setSpeed(obj.getPjfs());
+        ls.add(data);
+        //        }
+        return ls;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -144,6 +144,8 @@ public class EconomyPointHomePageService {
     private BigDecimal nllfdlCal = null;
     private LocalDate lastCalDate;
 
+    private Map<LocalDate, BigDecimal> fnlyl = new HashMap<>();
+
 
     /**
      * 经济运行首页聚合方法
@@ -1570,270 +1572,13 @@ public class EconomyPointHomePageService {
     }
 
 
-//    public Map<String, Object> getGeneratingCapacity2(String companyId) {
-//        Map<String, Object> allmap = new HashMap<>();
-//        List<GeneratingCapacityVo> ls = new ArrayList<>();
-//        LocalDate now = LocalDate.now();
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-//        qw.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, now)
-//                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> day1s = proEconPowerstationInfoDay1Service.list(qw);
-//        for (ProEconPowerstationInfoDay1 day1 : day1s) {
-//            GeneratingCapacityVo rfdl = new GeneratingCapacityVo();
-//            rfdl.setName("日发电量");
-//            rfdl.setValue(day1.getRfdl());
-//            rfdl.setTotal(day1.getRllfdl());
-//            BigDecimal rbfb = (day1.getRfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getRllfdl().compareTo(BigDecimal.ZERO) == 0)
-//                    ? BigDecimal.ZERO
-//                    : day1.getRllfdl().divide(day1.getRfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-//            rfdl.setBfb(rbfb);
-//            rfdl.setBfb(rbfb);
-//            ls.add(rfdl);
-//
-//            GeneratingCapacityVo yfdl = new GeneratingCapacityVo();
-//            yfdl.setName("月发电量");
-//            yfdl.setValue(day1.getYfdl());
-//            yfdl.setTotal(day1.getYllfdl());
-//            BigDecimal ybfb = (day1.getYfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getYllfdl().compareTo(BigDecimal.ZERO) == 0)
-//                    ? BigDecimal.ZERO
-//                    : day1.getYllfdl().divide(day1.getYfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-//            rfdl.setBfb(rbfb);
-//            yfdl.setBfb(ybfb);
-//            ls.add(yfdl);
-//
-//            GeneratingCapacityVo nfdl = new GeneratingCapacityVo();
-//            nfdl.setName("年发电量");
-//            nfdl.setValue(day1.getNfdl().divide(new BigDecimal(1000)));
-//            nfdl.setTotal(day1.getNllfdl().divide(new BigDecimal(1000)));
-//            BigDecimal nbfb = (day1.getNfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getNllfdl().compareTo(BigDecimal.ZERO) == 0)
-//                    ? BigDecimal.ZERO
-//                    : day1.getNllfdl().divide(day1.getNfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-//            rfdl.setBfb(rbfb);
-//            nfdl.setBfb(nbfb);
-//            ls.add(nfdl);
-//
-//            Map<String, Object> zbtqdb = new HashMap<>();
-//            List<ColumnVo> ls1 = new ArrayList<>();
-//            ColumnVo cl1 = new ColumnVo();
-//            cl1.setName("指标名称");
-//            cl1.setField("wtId");
-//            ColumnVo cl2 = new ColumnVo();
-//            cl2.setName(String.valueOf(LocalDate.now().getYear()));
-//            cl2.setField("recodedate");
-//            ColumnVo cl3 = new ColumnVo();
-//            cl3.setName(String.valueOf(LocalDate.now().getYear() - 1));
-//            cl3.setField("recodedate2");
-//            ColumnVo cl4 = new ColumnVo();
-//            cl4.setName("涨跌%");
-//            cl4.setField("operation");
-//            ls1.add(cl1);
-//            ls1.add(cl2);
-//            ls1.add(cl3);
-//            ls1.add(cl4);
-//
-//            List<ComparetqVo> ls2 = new ArrayList<>();
-//            ComparetqVo cv = new ComparetqVo();
-//            cv.setWtId("发电量");
-//            cv.setRecodedate(String.valueOf(day1.getNfdl().divide(new BigDecimal(1000))));
-//            cv.setRecodedate2(String.valueOf(0));
-//            cv.setOperation("100");
-//            ComparetqVo cv1 = new ComparetqVo();
-//            cv1.setWtId("上网电量");
-//            cv1.setRecodedate(String.valueOf(0.00));
-//            cv1.setRecodedate2(String.valueOf(0));
-//            cv1.setOperation("0");
-//            ComparetqVo cv2 = new ComparetqVo();
-//            cv2.setWtId("网购电量");
-//            cv2.setRecodedate(String.valueOf(0.00));
-//            cv2.setRecodedate2(String.valueOf(0));
-//            cv2.setOperation("0");
-//            ComparetqVo cv3 = new ComparetqVo();
-//            cv3.setWtId("损失电量");
-//            cv3.setRecodedate(String.valueOf(0.00));
-//            cv3.setRecodedate2(String.valueOf(0));
-//            cv3.setOperation("0");
-//            ComparetqVo cv4 = new ComparetqVo();
-//            cv4.setWtId("场用电量");
-//            cv4.setRecodedate(String.valueOf(0.00));
-//            cv4.setRecodedate2(String.valueOf(0));
-//            cv4.setOperation("0");
-//            ls2.add(cv);
-//            ls2.add(cv1);
-//            ls2.add(cv2);
-//            ls2.add(cv3);
-//            ls2.add(cv4);
-//
-//            zbtqdb.put("column", ls1);
-//            zbtqdb.put("data", ls2);
-//            allmap.put("fdl", ls);
-//            allmap.put("zbtqdb", zbtqdb);
-//        }
-//
-//        return allmap;
-//    }
-
-
-//    public Map<String, Object> getHomeRight(String companyId) {
-//        Map<String, Object> allmap = new HashMap<>();
-//        LocalDate now = LocalDate.now();
-//        Date currentDate = DateUtils.getCurrentDate();
-//        Date monthFirst = DateUtils.getMonthFirst(currentDate);
-//        double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-//        qw.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, now)
-//                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> day1s = proEconPowerstationInfoDay1Service.list(qw);
-//        Map<String, Object> sbklyl = new HashMap<>();
-//        for (ProEconPowerstationInfoDay1 day1 : day1s) {
-//            Map<String, Object> zbtqdb = new HashMap<>();
-//            String[] title = {"排名", "名称", "风能利用率%", "去年同期%", "涨跌%"};
-//            List<ColumnVo> ls1 = getTitle(title);
-//            String[] title2 = {"排名", "名称", "设备利用率%", "去年同期%", "涨跌%"};
-//            List<ColumnVo> ls3 = getTitle(title2);
-//            List<HomeRightVo> ls2 = new ArrayList<>();
-//            HomeRightVo hv = new HomeRightVo();
-//            hv.setIndex("1");
-//            hv.setName("惠安风场");
-//            BigDecimal fnlyl = (day1.getNfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getNllfdl().compareTo(BigDecimal.ZERO) == 0)
-//                    ? BigDecimal.ZERO
-//                    : day1.getNfdl().divide(day1.getNllfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-//            hv.setFnlyl(String.valueOf(fnlyl));
-//            hv.setYearTq("0");
-//            hv.setOperation(String.valueOf(fnlyl));
-//            ls2.add(hv);
-//
-//            zbtqdb.put("column", ls1);
-//            zbtqdb.put("data", ls2);
-//            sbklyl.put("column", ls3);
-//            allmap.put("fnlyl", zbtqdb);
-//
-//        }
-//
-//        QueryWrapper<ProEconPowerstationInfoDay2> qw2 = new QueryWrapper<>();
-//        qw2.lambda().eq(ProEconPowerstationInfoDay2::getRecordDate, now)
-//                .eq(ProEconPowerstationInfoDay2::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay2> list = iProEconPowerstationInfoDay2Service.list(qw2);
-//        for (ProEconPowerstationInfoDay2 day2 : list) {
-//            List<HomeRightVo> ls3 = new ArrayList<>();
-//            HomeRightVo hv2 = new HomeRightVo();
-//            hv2.setIndex("1");
-//            hv2.setName("惠安风场");
-//            BigDecimal hoursDiffDecimal = BigDecimal.valueOf(hoursDiff);
-//            BigDecimal result = hoursDiffDecimal.subtract(day2.getNhjgztjxs()).subtract(day2.getNhjjxtjxs());
-//            BigDecimal ysbklyl = result.divide(hoursDiffDecimal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
-//            hv2.setFnlyl(String.valueOf(ysbklyl));
-//            hv2.setYearTq("0");
-//            hv2.setOperation(String.valueOf(ysbklyl));
-//            ls3.add(hv2);
-//            sbklyl.put("data", ls3);
-//            allmap.put("sbklyl", sbklyl);
-//        }
-//
-//        Map<String, Object> lgxzkh = new HashMap<>();
-//        String[] title = {"排名", "名称", "考核分数", "去年同期%", "涨跌%"};
-//        List<ColumnVo> ls1 = getTitle(title);
-//        List<HomeRightVo> ls2 = new ArrayList<>();
-//        HomeRightVo hv = new HomeRightVo();
-//        hv.setIndex("1");
-//        hv.setName("惠安风场");
-//        hv.setFnlyl("98");
-//        hv.setYearTq("0");
-//        hv.setOperation("100");
-//        ls2.add(hv);
-//
-//        lgxzkh.put("column", ls1);
-//        lgxzkh.put("data", ls2);
-//        allmap.put("lgxzkh", lgxzkh);
-//
-//        return allmap;
-//
-//    }
-
-//    public Map<String, Object> getHomeRight(String companyId) {
-//        Map<String, Object> allmap = new HashMap<>();
-//        LocalDate now = LocalDate.now();
-//        Date currentDate = DateUtils.getCurrentDate();
-//        Date monthFirst = DateUtils.getMonthFirst(currentDate);
-//        double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-//        qw.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, now)
-//                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> day1s = proEconPowerstationInfoDay1Service.list(qw);
-//        Map<String, Object> sbklyl = new HashMap<>();
-//        for (ProEconPowerstationInfoDay1 day1 : day1s) {
-//            Map<String, Object> zbtqdb = new HashMap<>();
-//            String[] title = {"排名", "名称", "风能利用率%", "去年同期%", "涨跌%"};
-//            List<ColumnVo> ls1 = getTitle(title);
-//            String[] title2 = {"排名", "名称", "设备利用率%", "去年同期%", "涨跌%"};
-//            List<ColumnVo> ls3 = getTitle(title2);
-//            List<HomeRightVo> ls2 = new ArrayList<>();
-//            HomeRightVo hv = new HomeRightVo();
-//            hv.setIndex("1");
-//            hv.setName("惠安风场");
-//            BigDecimal fnlyl = (day1.getNfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getNllfdl().compareTo(BigDecimal.ZERO) == 0)
-//                    ? BigDecimal.ZERO
-//                    : day1.getNfdl().divide(day1.getNllfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-//            hv.setFnlyl(String.valueOf(fnlyl));
-//            hv.setYearTq("0");
-//            hv.setOperation(String.valueOf(fnlyl));
-//            ls2.add(hv);
-//
-//            zbtqdb.put("column", ls1);
-//            zbtqdb.put("data", ls2);
-//            sbklyl.put("column", ls3);
-//            allmap.put("fnlyl", zbtqdb);
-//
-//        }
-//
-//        QueryWrapper<ProEconPowerstationInfoDay2> qw2 = new QueryWrapper<>();
-//        qw2.lambda().eq(ProEconPowerstationInfoDay2::getRecordDate, now)
-//                .eq(ProEconPowerstationInfoDay2::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay2> list = iProEconPowerstationInfoDay2Service.list(qw2);
-//        for (ProEconPowerstationInfoDay2 day2 : list) {
-//            List<HomeRightVo> ls3 = new ArrayList<>();
-//            HomeRightVo hv2 = new HomeRightVo();
-//            hv2.setIndex("1");
-//            hv2.setName("惠安风场");
-//            BigDecimal hoursDiffDecimal = BigDecimal.valueOf(hoursDiff);
-//            BigDecimal result = hoursDiffDecimal.subtract(day2.getNhjgztjxs()).subtract(day2.getNhjjxtjxs());
-//            BigDecimal ysbklyl = result.divide(hoursDiffDecimal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
-//            hv2.setFnlyl(String.valueOf(ysbklyl));
-//            hv2.setYearTq("0");
-//            hv2.setOperation(String.valueOf(ysbklyl));
-//            ls3.add(hv2);
-//            sbklyl.put("data", ls3);
-//            allmap.put("sbklyl", sbklyl);
-//        }
-//
-//        Map<String, Object> lgxzkh = new HashMap<>();
-//        String[] title = {"排名", "名称", "考核分数", "去年同期%", "涨跌%"};
-//        List<ColumnVo> ls1 = getTitle(title);
-//        List<HomeRightVo> ls2 = new ArrayList<>();
-//        HomeRightVo hv = new HomeRightVo();
-//        hv.setIndex("1");
-//        hv.setName("惠安风场");
-//        hv.setFnlyl("98");
-//        hv.setYearTq("0");
-//        hv.setOperation("100");
-//        ls2.add(hv);
-//
-//        lgxzkh.put("column", ls1);
-//        lgxzkh.put("data", ls2);
-//        allmap.put("lgxzkh", lgxzkh);
-//
-//        return allmap;
-//
-//    }
-
-
     public Map<String, Object> getHomeRight(String companyId) {
         Map<String, Object> allmap = new HashMap<>();
-        LocalDate now = LocalDate.now();
-        Date currentDate = DateUtils.getCurrentDate();
-        Date monthFirst = DateUtils.getMonthFirst(currentDate);
-        double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
         Map<String, Object> sbklyl = new HashMap<>();
-        GeneratingCapacityVo genCap = generatingCapacity15min.get("年发电量");
+        LocalDate nowStart = LocalDate.now().with(TemporalAdjusters.firstDayOfYear());
+        LocalDate nowEnd = LocalDate.now();
+        LocalDate lastYearStartDate = LocalDate.now().minusYears(1).with(TemporalAdjusters.firstDayOfYear());
+        LocalDate lastYearEndDate = LocalDate.now().minusYears(1).atStartOfDay().toLocalDate();
 
         Map<String, Object> zbtqdb = new HashMap<>();
         String[] title = {"排名", "名称", "风能利用率%", "去年同期%", "涨跌%"};
@@ -1843,11 +1588,32 @@ public class EconomyPointHomePageService {
         List<HomeRightVo> ls2 = new ArrayList<>();
         HomeRightVo hv = new HomeRightVo();
         hv.setIndex("1");
-        hv.setName("惠安风场");
-        Double fnlyl = calDivide(genCap.getValue(), genCap.getTotal());
-        hv.setFnlyl(String.valueOf(fnlyl));
-        hv.setYearTq("0");
-        hv.setOperation(String.valueOf(fnlyl));
+        hv.setName(CacheContext.wplsf.get(0).getName());
+
+        List<TurbineInfoDay> currentResults1 = getFnlyl("*", nowStart, nowEnd);
+        if (null == currentResults1 || currentResults1.isEmpty()) {
+            hv.setFnlyl("0.00");
+        } else {
+            List<TurbineInfoDay> currentResults = getFnlyl("AVG(fnlyl) AS fnlyl", nowStart, nowEnd);
+            hv.setFnlyl(String.format("%.2f", currentResults.get(0).getFnlyl()));
+        }
+        List<TurbineInfoDay> lastYearResults1 = getFnlyl("*", lastYearStartDate, lastYearEndDate);
+        if (null == lastYearResults1 || lastYearResults1.isEmpty()) {
+            hv.setYearTq("0.00");
+        } else {
+            List<TurbineInfoDay> lastYearResults = getFnlyl("AVG(fnlyl) AS fnlyl", lastYearStartDate, lastYearEndDate);
+            hv.setYearTq(String.format("%.2f", lastYearResults.get(0).getFnlyl()));
+        }
+        if (Double.parseDouble(hv.getFnlyl()) == 0 && Double.parseDouble(hv.getYearTq()) == 0) {
+            hv.setOperation("0.00");
+        } else if (Double.parseDouble(hv.getYearTq()) == 0) {
+            hv.setOperation("100");
+        } else if (Double.parseDouble(hv.getFnlyl()) == 0) {
+            hv.setOperation("-100");
+        } else {
+            Double operation = calDivide(Double.parseDouble(hv.getFnlyl()) - Double.parseDouble(hv.getYearTq()), Double.valueOf(hv.getYearTq()));
+            hv.setOperation(String.valueOf(operation));
+        }
         ls2.add(hv);
 
         zbtqdb.put("column", ls1);
@@ -1855,27 +1621,50 @@ public class EconomyPointHomePageService {
         sbklyl.put("column", ls3);
         allmap.put("fnlyl", zbtqdb);
 
-        QueryWrapper<ProEconPowerstationInfoDay2> qw2 = new QueryWrapper<>();
-        qw2.lambda().eq(ProEconPowerstationInfoDay2::getRecordDate, now)
-                .eq(ProEconPowerstationInfoDay2::getForeignKeyId, companyId);
-        List<ProEconPowerstationInfoDay2> list = iProEconPowerstationInfoDay2Service.list(qw2);
-        for (ProEconPowerstationInfoDay2 day2 : list) {
-            List<HomeRightVo> ls4 = new ArrayList<>();
-            HomeRightVo hv2 = new HomeRightVo();
-            hv2.setIndex("1");
-            hv2.setName("惠安风场");
-            BigDecimal hoursDiffDecimal = BigDecimal.valueOf(hoursDiff);
-            BigDecimal result = hoursDiffDecimal.subtract(day2.getNhjgztjxs()).subtract(day2.getNhjjxtjxs());
-            BigDecimal ysbklyl = result.divide(hoursDiffDecimal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
-            hv2.setFnlyl(String.valueOf(ysbklyl));
-            hv2.setYearTq("0");
-            hv2.setOperation(String.valueOf(ysbklyl));
-            ls4.add(hv2);
-            sbklyl.put("data", ls4);
-            allmap.put("sbklyl", sbklyl);
+        List<HomeRightVo> ls4 = new ArrayList<>();
+        HomeRightVo hv2 = new HomeRightVo();
+        hv2.setIndex("1");
+        hv2.setName(CacheContext.wplsf.get(0).getName());
+
+        List<TurbineInfoDay> currentSbResults1 = getFnlyl("*", nowStart, nowEnd);
+        if (null == currentSbResults1 || currentSbResults1.isEmpty()) {
+            hv2.setFnlyl("0.00");
+        } else {
+            List<TurbineInfoDay> currentSbResults = getFnlyl("AVG(klyl) AS klyl", nowStart, nowEnd);
+            hv2.setFnlyl(String.format("%.2f", currentSbResults.get(0).getKlyl()));
         }
+        List<TurbineInfoDay> lastYearQwSb1 = getFnlyl("*", lastYearStartDate, lastYearEndDate);
+        if (null == lastYearQwSb1 || lastYearQwSb1.isEmpty()) {
+            hv2.setYearTq("0.00");
+        } else {
+            List<TurbineInfoDay> lastYearQwSb = getFnlyl("AVG(klyl) AS klyl", lastYearStartDate, lastYearEndDate);
+            hv2.setYearTq(String.format("%.2f", lastYearQwSb.get(0).getKlyl()));
+        }
+        if (Double.parseDouble(hv2.getFnlyl()) == 0 && Double.parseDouble(hv2.getYearTq()) == 0) {
+            hv2.setOperation("0.00");
+        } else if (Double.parseDouble(hv2.getYearTq()) == 0) {
+            hv2.setOperation("100");
+        } else if (Double.parseDouble(hv2.getFnlyl()) == 0) {
+            hv2.setOperation("-100");
+        } else {
+            Double aDouble1 = calDivide(Double.parseDouble(hv2.getFnlyl()) - Double.parseDouble(hv2.getYearTq()), Double.valueOf(hv2.getYearTq()));
+            hv2.setOperation(String.valueOf(aDouble1));
+        }
+        ls4.add(hv2);
+        sbklyl.put("data", ls4);
+        allmap.put("sbklyl", sbklyl);
+
         return allmap;
+    }
+
 
+    private List<TurbineInfoDay> getFnlyl(String select, LocalDate start, LocalDate end) {
+        QueryWrapper<TurbineInfoDay> currentQw = new QueryWrapper<>();
+        currentQw.clear();
+        currentQw.select(select)
+                .ge("record_date", start)
+                .lt("record_date", end);
+        return iTurbineInfoDayService.list(currentQw);
     }
 
 
@@ -1895,392 +1684,30 @@ public class EconomyPointHomePageService {
     }
 
 
-//    public Map<String, Object> getHomeMiddle(String companyId) throws ParseException {
-//        LocalDate currentDate = LocalDate.now();
-//        Integer month = LocalDate.now().getMonthValue();
-//        int year = LocalDate.now().getYear();
-//        Map<String, Object> allmap = new HashMap<>();
-//        PlanDataVo pd = new PlanDataVo();
-//        List<ProBasicProjectPlan> list = iProBasicProjectPlanService.list();
-//
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw1 = new QueryWrapper<>();
-//        qw1.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, currentDate)
-//                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> days1 = proEconPowerstationInfoDay1Service.list(qw1);
-//
-//        LocalDate startOfWeek = currentDate.with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY));// 本周周一日期
-//        LocalDate endOfWeek = currentDate.with(TemporalAdjusters.nextOrSame(java.time.DayOfWeek.SUNDAY));
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-//        qw.lambda().between(ProEconPowerstationInfoDay1::getRecordDate, startOfWeek, endOfWeek)
-//                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> day1s = proEconPowerstationInfoDay1Service.list(qw);
-//        if (null == day1s || day1s.isEmpty()) {
-//            pd.setZfdlsj(0.00);
-//            pd.setYfdlsj(0.00);
-//            pd.setNfdlsj(0.00);
-//            return allmap;
-//        }
-//
-//        List<ProBasicProjectPlan> pp = list.stream()
-//                .filter(ls -> String.valueOf(month).equals(ls.getMonth())
-//                        && ls.getYear().equals(String.valueOf(year)) && ls.getProjectId().equals(companyId))
-//                .collect(Collectors.toList());
-//        if (null == pp || pp.isEmpty()) {
-//            return allmap;
-//        }
-//        pd.setZfdljh(pp.get(0).getGeneratingCapacity() / 4);
-//        double sum = day1s.stream().map(ProEconPowerstationInfoDay1::getRfdl).mapToDouble(BigDecimal::doubleValue).sum();
-//        pd.setZfdlsj(sum);
-//        Double zjd = calDivide(pd.getZfdlsj(), pd.getZfdljh());
-//        pd.setZjd(zjd * 100);
-//        pd.setZwcl(zjd);
-//        pd.setYfdljh(pp.get(0).getGeneratingCapacity());
-//        pd.setYfdlsj(days1.get(0).getYfdl().doubleValue());
-//        Double yjd = calDivide(pd.getYfdlsj(), pd.getYfdljh());
-//        pd.setYjd(yjd * 100);
-//        pd.setYwcl(yjd);
-//
-//        List<ProBasicProjectPlan> pp2 = list.stream()
-//                .filter(ls -> ls.getYear().equals(String.valueOf(year)) && ls.getProjectId().equals(companyId) && ls.getMonth() == null)
-//                .collect(Collectors.toList());
-//        pd.setNfdljh(pp2.get(0).getGeneratingCapacity());
-//        pd.setNfdlsj(days1.get(0).getNfdl().doubleValue() / 1000);
-//        Double njd = calDivide(pd.getNfdlsj() / 1000, pd.getNfdljh());
-//        pd.setNjd(njd * 100);
-//        pd.setNwcl(njd);
-//        allmap.put("planData", pd);
-//
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw2 = new QueryWrapper<>();
-//        qw2.lambda().eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> days3 = proEconPowerstationInfoDay1Service.list(qw2);
-//
-//        Map<Date, List<ProEconPowerstationInfoDay1>> date = days3.stream().collect(Collectors.groupingBy(ProEconPowerstationInfoDay1::getRecordDate));
-//        Set<Integer> year2 = new TreeSet<>();
-//        for (Date date1 : date.keySet()) {
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date1);
-//            int year3 = calendar.get(Calendar.YEAR);
-//            year2.add(year3);
-//        }
-//        int yy = year2.iterator().next();
-//        String start = yy + "-01-01";
-//        String end = yy + "-12-31";
-//        String start2 = yy - 1 + "-01-01";
-//        String end2 = yy - 1 + "-12-31";
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-//        Date start1 = sdf.parse(start);
-//        Date end1 = sdf.parse(end);
-//        Date start3 = sdf.parse(start2);
-//        Date end3 = sdf.parse(end2);
-//        List<ProEconPowerstationInfoDay1> thisYear = days3.stream().filter(rec -> rec.getRecordDate().after(start1) && rec.getRecordDate().before(end1)).collect(Collectors.toList());
-//        List<ProEconPowerstationInfoDay1> lastYear = days3.stream().filter(rec -> rec.getRecordDate().after(start3) && rec.getRecordDate().before(end3)).collect(Collectors.toList());
-//        Map<Integer, List<ProEconPowerstationInfoDay1>> day1sMap = thisYear.stream().collect(Collectors.groupingBy(record -> record.getRecordDate().getMonth() + 1));
-//        List<PowertrendVo> xdl = new ArrayList<>();
-//        List<PowertrendVo> ssdl = new ArrayList<>();
-//        List<PowertrendVo> fdl = new ArrayList<>();
-//        PowertrendVo ptxdl = new PowertrendVo();
-//        PowertrendVo ptssdl = new PowertrendVo();
-//        PowertrendVo ptfdl = new PowertrendVo();
-//        ptxdl.setTitle("限电量");
-//        ptssdl.setTitle("损失电量");
-//        ptfdl.setTitle("发电量");
-//        ptxdl.setYAxisIndex(0);
-//        ptssdl.setYAxisIndex(0);
-//        ptfdl.setYAxisIndex(0);
-//        List<ValueVo> vexdl = value(year, month);
-//        List<ValueVo> vessdl = value(year, month);
-//        List<ValueVo> vefdl = value(year, month);
-//        for (Integer mon : day1sMap.keySet()) {
-//            List<ProEconPowerstationInfoDay1> day1s1 = day1sMap.get(mon);
-//            List<ProEconPowerstationInfoDay1> day1s2 = day1s1.stream().sorted(Comparator.comparing(ProEconPowerstationInfoDay1::getRecordDate).reversed()).collect(Collectors.toList());
-//            LocalDate localDate = day1s2.get(0).getRecordDate().toInstant().atZone(ZoneOffset.UTC).toLocalDate();
-//            int year1 = localDate.getYear();
-//            String text = year1 + "-" + mon;
-//            for (ValueVo vv : vexdl) {
-//                if (vv.getText().equals(text)) {
-//                    vv.setValue(day1s2.get(0).getYxdjclssdl().add(day1s2.get(0).getYxdtjssdl()));
-//                }
-//            }
-//            for (ValueVo vv : vessdl) {
-//                if (vv.getText().equals(text)) {
-//                    vv.setValue(day1s2.get(0).getYgzssdl().add(day1s2.get(0).getYcnslgzssdl().add(day1s2.get(0).getYjxssdl().add(day1s2.get(0).getYcnsljxssdl()
-//                            .add(day1s2.get(0).getYdjssdl().add(day1s2.get(0).getYqxjclssdl().add(day1s2.get(0).getYsdtjssdl().add(day1s2.get(0).getYxnssdl()
-//                                    .add(day1s2.get(0).getYxdtjssdl().add(day1s2.get(0).getYxdjclssdl().add(day1s2.get(0).getYcwsldwssdl().add(day1s2.get(0).getYcwsltqssdl()))))))))))));
-//                }
-//            }
-//            for (ValueVo vv : vefdl) {
-//                if (vv.getText().equals(text)) {
-//                    vv.setValue(day1s2.get(0).getYfdl());
-//                }
-//            }
-//
-//        }
-//        ptxdl.setValue(vexdl);
-//        ptssdl.setValue(vessdl);
-//        ptfdl.setValue(vefdl);
-//        xdl.add(ptxdl);
-//        ssdl.add(ptssdl);
-//        fdl.add(ptfdl);
-//
-//        PowertrendVo ptxdl2 = new PowertrendVo();
-//        PowertrendVo ptssdl2 = new PowertrendVo();
-//        PowertrendVo ptfdl2 = new PowertrendVo();
-//        ptxdl2.setTitle("去年同期限电量");
-//        ptssdl2.setTitle("去年同期损失电量");
-//        ptfdl2.setTitle("去年同期发电量");
-//        ptxdl.setYAxisIndex(0);
-//        ptssdl.setYAxisIndex(0);
-//        ptfdl.setYAxisIndex(0);
-//        if (null == lastYear || lastYear.isEmpty()) {
-//            List<ValueVo> value = value(year - 1, month);
-//            ptxdl2.setValue(value);
-//            ptssdl2.setValue(value);
-//            ptfdl2.setValue(value);
-//        } else {
-//            List<ValueVo> vxdl2 = new ArrayList<>();
-//            List<ValueVo> vssdl2 = new ArrayList<>();
-//            List<ValueVo> vfdl2 = new ArrayList<>();
-//            Map<Integer, List<ProEconPowerstationInfoDay1>> day1sMap2 = lastYear.stream().collect(Collectors.groupingBy(record -> record.getRecordDate().getMonth() + 1));
-//            for (Integer mon2 : day1sMap2.keySet()) {
-//                List<ProEconPowerstationInfoDay1> day1s3 = day1sMap2.get(mon2);
-//                List<ProEconPowerstationInfoDay1> day1s4 = day1s3.stream().sorted(Comparator.comparing(ProEconPowerstationInfoDay1::getRecordDate).reversed()).collect(Collectors.toList());
-//                LocalDate localDate = day1s3.get(0).getRecordDate().toInstant().atZone(ZoneOffset.UTC).toLocalDate();
-//                int year1 = localDate.getYear();
-//                String text = year1 + "-" + mon2;
-//                ValueVo vexdl2 = new ValueVo();
-//                ValueVo vessdl2 = new ValueVo();
-//                ValueVo vefdl2 = new ValueVo();
-//                vexdl2.setText(text);
-//                vessdl2.setText(text);
-//                vefdl2.setText(text);
-//                vexdl2.setValue(day1s4.get(0).getYxdjclssdl().add(day1s4.get(0).getYxdtjssdl()));
-//                vessdl2.setValue(day1s4.get(0).getYgzssdl().add(day1s4.get(0).getYcnslgzssdl().add(day1s4.get(0).getYjxssdl().add(day1s4.get(0).getYcnsljxssdl()
-//                        .add(day1s4.get(0).getYdjssdl().add(day1s4.get(0).getYqxjclssdl().add(day1s4.get(0).getYsdtjssdl().add(day1s4.get(0).getYxnssdl()
-//                                .add(day1s4.get(0).getYxdtjssdl().add(day1s4.get(0).getYxdjclssdl().add(day1s4.get(0).getYcwsldwssdl().add(day1s4.get(0).getYcwsltqssdl()))))))))))));
-//                vefdl2.setValue(day1s4.get(0).getYfdl());
-//                vxdl2.add(vexdl2);
-//                vssdl2.add(vessdl2);
-//                vfdl2.add(vefdl2);
-//            }
-//            ptxdl2.setValue(vxdl2);
-//            ptssdl2.setValue(vssdl2);
-//            ptxdl2.setValue(vfdl2);
-//        }
-//        xdl.add(ptxdl2);
-//        ssdl.add(ptssdl2);
-//        fdl.add(ptfdl2);
-//
-//        allmap.put("Powertrend", xdl);
-//        allmap.put("Powerloss", ssdl);
-//        allmap.put("Powersend", fdl);
-//        return allmap;
-//    }
-
-
-//    public Map<String, Object> getHomeMiddle(String companyId) throws ParseException {
-//        LocalDate currentDate = LocalDate.now();
-//        Integer month = LocalDate.now().getMonthValue();
-//        int year = LocalDate.now().getYear();
-//        Map<String, Object> allmap = new HashMap<>();
-//        PlanDataVo pd = new PlanDataVo();
-//        List<ProBasicProjectPlan> list = iProBasicProjectPlanService.list();
-//
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw1 = new QueryWrapper<>();
-//        qw1.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, currentDate)
-//                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> days1 = proEconPowerstationInfoDay1Service.list(qw1);
-//
-//        LocalDate startOfWeek = currentDate.with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY));// 本周周一日期
-//        LocalDate endOfWeek = currentDate.with(TemporalAdjusters.nextOrSame(java.time.DayOfWeek.SUNDAY));
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-//        qw.lambda().between(ProEconPowerstationInfoDay1::getRecordDate, startOfWeek, endOfWeek)
-//                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> day1s = proEconPowerstationInfoDay1Service.list(qw);
-//        if (null == day1s || day1s.isEmpty()) {
-//            pd.setZfdlsj(0.00);
-//            pd.setYfdlsj(0.00);
-//            pd.setNfdlsj(0.00);
-//            return allmap;
-//        }
-//
-//        List<ProBasicProjectPlan> pp = list.stream()
-//                .filter(ls -> String.valueOf(month).equals(ls.getMonth())
-//                        && ls.getYear().equals(String.valueOf(year)) && ls.getProjectId().equals(companyId))
-//                .collect(Collectors.toList());
-//        if (null == pp || pp.isEmpty()) {
-//            return allmap;
-//        }
-//        pd.setZfdljh(pp.get(0).getGeneratingCapacity() / 4);
-//        double sum = day1s.stream().map(ProEconPowerstationInfoDay1::getRfdl).mapToDouble(BigDecimal::doubleValue).sum();
-//        pd.setZfdlsj(sum);
-//        Double zjd = calDivide(pd.getZfdlsj(), pd.getZfdljh());
-//        pd.setZjd(zjd * 100);
-//        pd.setZwcl(zjd);
-//        pd.setYfdljh(pp.get(0).getGeneratingCapacity());
-//        pd.setYfdlsj(days1.get(0).getYfdl().doubleValue());
-//        Double yjd = calDivide(pd.getYfdlsj(), pd.getYfdljh());
-//        pd.setYjd(yjd * 100);
-//        pd.setYwcl(yjd);
-//
-//        List<ProBasicProjectPlan> pp2 = list.stream()
-//                .filter(ls -> ls.getYear().equals(String.valueOf(year)) && ls.getProjectId().equals(companyId) && ls.getMonth() == null)
-//                .collect(Collectors.toList());
-//        pd.setNfdljh(pp2.get(0).getGeneratingCapacity());
-//        pd.setNfdlsj(days1.get(0).getNfdl().doubleValue() / 1000);
-//        Double njd = calDivide(pd.getNfdlsj() / 1000, pd.getNfdljh());
-//        pd.setNjd(njd * 100);
-//        pd.setNwcl(njd);
-//        allmap.put("planData", pd);
-//
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw2 = new QueryWrapper<>();
-//        qw2.lambda().eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> days3 = proEconPowerstationInfoDay1Service.list(qw2);
-//
-//        Map<Date, List<ProEconPowerstationInfoDay1>> date = days3.stream().collect(Collectors.groupingBy(ProEconPowerstationInfoDay1::getRecordDate));
-//        Set<Integer> year2 = new TreeSet<>();
-//        for (Date date1 : date.keySet()) {
-//            Calendar calendar = Calendar.getInstance();
-//            calendar.setTime(date1);
-//            int year3 = calendar.get(Calendar.YEAR);
-//            year2.add(year3);
-//        }
-//        int yy = year2.iterator().next();
-//        String start = yy + "-01-01";
-//        String end = yy + "-12-31";
-//        String start2 = yy - 1 + "-01-01";
-//        String end2 = yy - 1 + "-12-31";
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-//        Date start1 = sdf.parse(start);
-//        Date end1 = sdf.parse(end);
-//        Date start3 = sdf.parse(start2);
-//        Date end3 = sdf.parse(end2);
-//        List<ProEconPowerstationInfoDay1> thisYear = days3.stream().filter(rec -> rec.getRecordDate().after(start1) && rec.getRecordDate().before(end1)).collect(Collectors.toList());
-//        List<ProEconPowerstationInfoDay1> lastYear = days3.stream().filter(rec -> rec.getRecordDate().after(start3) && rec.getRecordDate().before(end3)).collect(Collectors.toList());
-//        Map<Integer, List<ProEconPowerstationInfoDay1>> day1sMap = thisYear.stream().collect(Collectors.groupingBy(record -> record.getRecordDate().getMonth() + 1));
-//        List<PowertrendVo> xdl = new ArrayList<>();
-//        List<PowertrendVo> ssdl = new ArrayList<>();
-//        List<PowertrendVo> fdl = new ArrayList<>();
-//        PowertrendVo ptxdl = new PowertrendVo();
-//        PowertrendVo ptssdl = new PowertrendVo();
-//        PowertrendVo ptfdl = new PowertrendVo();
-//        ptxdl.setTitle("限电量");
-//        ptssdl.setTitle("损失电量");
-//        ptfdl.setTitle("发电量");
-//        ptxdl.setYAxisIndex(0);
-//        ptssdl.setYAxisIndex(0);
-//        ptfdl.setYAxisIndex(0);
-//        List<ValueVo> vexdl = value(year, month);
-//        List<ValueVo> vessdl = value(year, month);
-//        List<ValueVo> vefdl = value(year, month);
-//        for (Integer mon : day1sMap.keySet()) {
-//            List<ProEconPowerstationInfoDay1> day1s1 = day1sMap.get(mon);
-//            List<ProEconPowerstationInfoDay1> day1s2 = day1s1.stream().sorted(Comparator.comparing(ProEconPowerstationInfoDay1::getRecordDate).reversed()).collect(Collectors.toList());
-//            LocalDate localDate = day1s2.get(0).getRecordDate().toInstant().atZone(ZoneOffset.UTC).toLocalDate();
-//            int year1 = localDate.getYear();
-//            String text = year1 + "-" + mon;
-//            for (ValueVo vv : vexdl) {
-//                if (vv.getText().equals(text)) {
-//                    vv.setValue(day1s2.get(0).getYxdjclssdl().add(day1s2.get(0).getYxdtjssdl()));
-//                }
-//            }
-//            for (ValueVo vv : vessdl) {
-//                if (vv.getText().equals(text)) {
-//                    vv.setValue(day1s2.get(0).getYgzssdl().add(day1s2.get(0).getYcnslgzssdl().add(day1s2.get(0).getYjxssdl().add(day1s2.get(0).getYcnsljxssdl()
-//                            .add(day1s2.get(0).getYdjssdl().add(day1s2.get(0).getYqxjclssdl().add(day1s2.get(0).getYsdtjssdl().add(day1s2.get(0).getYxnssdl()
-//                                    .add(day1s2.get(0).getYxdtjssdl().add(day1s2.get(0).getYxdjclssdl().add(day1s2.get(0).getYcwsldwssdl().add(day1s2.get(0).getYcwsltqssdl()))))))))))));
-//                }
-//            }
-//            for (ValueVo vv : vefdl) {
-//                if (vv.getText().equals(text)) {
-//                    vv.setValue(day1s2.get(0).getYfdl());
-//                }
-//            }
-//
-//        }
-//        ptxdl.setValue(vexdl);
-//        ptssdl.setValue(vessdl);
-//        ptfdl.setValue(vefdl);
-//        xdl.add(ptxdl);
-//        ssdl.add(ptssdl);
-//        fdl.add(ptfdl);
-//
-//        PowertrendVo ptxdl2 = new PowertrendVo();
-//        PowertrendVo ptssdl2 = new PowertrendVo();
-//        PowertrendVo ptfdl2 = new PowertrendVo();
-//        ptxdl2.setTitle("去年同期限电量");
-//        ptssdl2.setTitle("去年同期损失电量");
-//        ptfdl2.setTitle("去年同期发电量");
-//        ptxdl.setYAxisIndex(0);
-//        ptssdl.setYAxisIndex(0);
-//        ptfdl.setYAxisIndex(0);
-//        if (null == lastYear || lastYear.isEmpty()) {
-//            List<ValueVo> value = value(year - 1, month);
-//            ptxdl2.setValue(value);
-//            ptssdl2.setValue(value);
-//            ptfdl2.setValue(value);
-//        } else {
-//            List<ValueVo> vxdl2 = new ArrayList<>();
-//            List<ValueVo> vssdl2 = new ArrayList<>();
-//            List<ValueVo> vfdl2 = new ArrayList<>();
-//            Map<Integer, List<ProEconPowerstationInfoDay1>> day1sMap2 = lastYear.stream().collect(Collectors.groupingBy(record -> record.getRecordDate().getMonth() + 1));
-//            for (Integer mon2 : day1sMap2.keySet()) {
-//                List<ProEconPowerstationInfoDay1> day1s3 = day1sMap2.get(mon2);
-//                List<ProEconPowerstationInfoDay1> day1s4 = day1s3.stream().sorted(Comparator.comparing(ProEconPowerstationInfoDay1::getRecordDate).reversed()).collect(Collectors.toList());
-//                LocalDate localDate = day1s3.get(0).getRecordDate().toInstant().atZone(ZoneOffset.UTC).toLocalDate();
-//                int year1 = localDate.getYear();
-//                String text = year1 + "-" + mon2;
-//                ValueVo vexdl2 = new ValueVo();
-//                ValueVo vessdl2 = new ValueVo();
-//                ValueVo vefdl2 = new ValueVo();
-//                vexdl2.setText(text);
-//                vessdl2.setText(text);
-//                vefdl2.setText(text);
-//                vexdl2.setValue(day1s4.get(0).getYxdjclssdl().add(day1s4.get(0).getYxdtjssdl()));
-//                vessdl2.setValue(day1s4.get(0).getYgzssdl().add(day1s4.get(0).getYcnslgzssdl().add(day1s4.get(0).getYjxssdl().add(day1s4.get(0).getYcnsljxssdl()
-//                        .add(day1s4.get(0).getYdjssdl().add(day1s4.get(0).getYqxjclssdl().add(day1s4.get(0).getYsdtjssdl().add(day1s4.get(0).getYxnssdl()
-//                                .add(day1s4.get(0).getYxdtjssdl().add(day1s4.get(0).getYxdjclssdl().add(day1s4.get(0).getYcwsldwssdl().add(day1s4.get(0).getYcwsltqssdl()))))))))))));
-//                vefdl2.setValue(day1s4.get(0).getYfdl());
-//                vxdl2.add(vexdl2);
-//                vssdl2.add(vessdl2);
-//                vfdl2.add(vefdl2);
-//            }
-//            ptxdl2.setValue(vxdl2);
-//            ptssdl2.setValue(vssdl2);
-//            ptxdl2.setValue(vfdl2);
-//        }
-//        xdl.add(ptxdl2);
-//        ssdl.add(ptssdl2);
-//        fdl.add(ptfdl2);
-//
-//        allmap.put("Powertrend", xdl);
-//        allmap.put("Powerloss", ssdl);
-//        allmap.put("Powersend", fdl);
-//        return allmap;
-//    }
-
-
     public Map<String, Object> getHomeMiddle(String companyId) throws ParseException {
         Integer month = LocalDate.now().getMonthValue();
         int year = LocalDate.now().getYear();
         Map<String, Object> allmap = new HashMap<>();
         PlanDataVo pd = new PlanDataVo();
+        pd.setZfdlsj(weekFdlCal.add(new BigDecimal(generatingCapacity15min.get("日发电量").getValue())).doubleValue());
+        pd.setYfdlsj(yfdlCal.add(new BigDecimal(generatingCapacity15min.get("月发电量").getValue())).doubleValue());
+        pd.setNfdlsj(nfdlCal.add(new BigDecimal(generatingCapacity15min.get("年发电量").getValue())).doubleValue());
         //计划发电量
         List<ProBasicProjectPlan> list = iProBasicProjectPlanService.list();
-
         List<ProBasicProjectPlan> pp = list.stream()
                 .filter(ls -> String.valueOf(month).equals(ls.getMonth())
                         && ls.getYear().equals(String.valueOf(year)) && ls.getProjectId().equals(companyId))
                 .collect(Collectors.toList());
         if (pp.isEmpty()) {
-            return allmap;
+            pd.setZfdljh(0.0);
+            pd.setYfdljh(0.0);
+        } else {
+            pd.setZfdljh(pp.get(0).getGeneratingCapacity() / 4);
+            pd.setYfdljh(pp.get(0).getGeneratingCapacity());
         }
-        pd.setZfdljh(pp.get(0).getGeneratingCapacity() / 4);
-        pd.setZfdlsj(weekFdlCal.add(new BigDecimal(generatingCapacity15min.get("日发电量").getValue())).doubleValue());
         Double zjd = calDivide(pd.getZfdlsj(), pd.getZfdljh());
         pd.setZjd(zjd * 100);
         pd.setZwcl(zjd);
-        pd.setYfdljh(pp.get(0).getGeneratingCapacity());
-        pd.setYfdlsj(yfdlCal.add(new BigDecimal(generatingCapacity15min.get("日发电量").getValue())).doubleValue());
         Double yjd = calDivide(pd.getYfdlsj(), pd.getYfdljh());
         pd.setYjd(yjd * 100);
         pd.setYwcl(yjd);
@@ -2288,8 +1715,11 @@ public class EconomyPointHomePageService {
         List<ProBasicProjectPlan> pp2 = list.stream()
                 .filter(ls -> ls.getYear().equals(String.valueOf(year)) && ls.getProjectId().equals(companyId) && ls.getMonth() == null)
                 .collect(Collectors.toList());
-        pd.setNfdljh(pp2.get(0).getGeneratingCapacity());
-        pd.setNfdlsj(nfdlCal.add(new BigDecimal(generatingCapacity15min.get("日发电量").getValue())).doubleValue());
+        if (pp2.isEmpty()) {
+            pd.setNfdljh(0.0);
+        } else {
+            pd.setNfdljh(pp2.get(0).getGeneratingCapacity());
+        }
         Double njd = calDivide(pd.getNfdlsj(), pd.getNfdljh());
         pd.setNjd(njd * 100);
         pd.setNwcl(njd);
@@ -2379,9 +1809,9 @@ public class EconomyPointHomePageService {
             ptssdl2.setValue(value);
             ptfdl2.setValue(value);
         } else {
-            List<ValueVo> vxdl2 = new ArrayList<>();
-            List<ValueVo> vssdl2 = new ArrayList<>();
-            List<ValueVo> vfdl2 = new ArrayList<>();
+            List<ValueVo> vxdl2 = value(year, 12);
+            List<ValueVo> vssdl2 = value(year, 12);
+            List<ValueVo> vfdl2 = value(year, 12);
             Map<Integer, List<TurbineInfoDay>> day1sMap2 = lastYear.stream().collect(Collectors.groupingBy(record -> record.getRecordDate().getMonth() + 1));
             for (Integer mon2 : day1sMap2.keySet()) {
                 List<TurbineInfoDay> day1s3 = day1sMap2.get(mon2);
@@ -2410,7 +1840,7 @@ public class EconomyPointHomePageService {
             }
             ptxdl2.setValue(vxdl2);
             ptssdl2.setValue(vssdl2);
-            ptxdl2.setValue(vfdl2);
+            ptfdl2.setValue(vfdl2);
         }
         xdl.add(ptxdl2);
         ssdl.add(ptssdl2);
@@ -2453,110 +1883,6 @@ public class EconomyPointHomePageService {
     }
 
 
-//    public Map<String, Object> getGeneratingCapacity(String companyId) {
-//        Map<String, Object> allmap = new HashMap<>();
-//        List<GeneratingCapacityVo> ls = new ArrayList<>();
-//        LocalDate now = LocalDate.now();
-//        LocalDate tomorrow = LocalDate.now().plusDays(1);
-//        QueryWrapper<StationInfoMin> qw = new QueryWrapper<>();
-//        qw.lambda().between(StationInfoMin::getRecordDate, now,tomorrow)
-//                .eq(StationInfoMin::getStationId, companyId)
-//                .orderByDesc(StationInfoMin::getRecordDate);
-//        List<StationInfoMin> day1s = iStationInfoMinService.list(qw);
-//        StationInfoMin day1 = day1s.get(0);
-//        GeneratingCapacityVo rfdl = new GeneratingCapacityVo();
-//            rfdl.setName("日发电量");
-////            rfdl.setValue(day1.getRfdl());
-////            rfdl.setTotal(day1.getRllfdl());
-////            Double rbfb = (day1.getRfdl()== 0 || day1.getRllfdl() == 0)
-////                    ? 0.0
-////                    : calDivide(day1.getRllfdl(), day1.getRfdl());
-////            rfdl.setBfb(rbfb);
-//            ls.add(rfdl);
-//
-//            GeneratingCapacityVo yfdl = new GeneratingCapacityVo();
-//            yfdl.setName("月发电量");
-////            yfdl.setValue(day1.getYfdl());
-////            yfdl.setTotal(day1.getYllfdl());
-////            BigDecimal ybfb = (day1.getYfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getYllfdl().compareTo(BigDecimal.ZERO) == 0)
-////                    ? BigDecimal.ZERO
-////                    : day1.getYllfdl().divide(day1.getYfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-////            rfdl.setBfb(rbfb);
-////            yfdl.setBfb(ybfb);
-////            ls.add(yfdl);
-////
-////            GeneratingCapacityVo nfdl = new GeneratingCapacityVo();
-////            nfdl.setName("年发电量");
-////            nfdl.setValue(day1.getNfdl().divide(new BigDecimal(1000)));
-////            nfdl.setTotal(day1.getNllfdl().divide(new BigDecimal(1000)));
-////            BigDecimal nbfb = (day1.getNfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getNllfdl().compareTo(BigDecimal.ZERO) == 0)
-////                    ? BigDecimal.ZERO
-////                    : day1.getNllfdl().divide(day1.getNfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-////            rfdl.setBfb(rbfb);
-////            nfdl.setBfb(nbfb);
-////            ls.add(nfdl);
-////
-////            Map<String, Object> zbtqdb = new HashMap<>();
-////            List<ColumnVo> ls1 = new ArrayList<>();
-////            ColumnVo cl1 = new ColumnVo();
-////            cl1.setName("指标名称");
-////            cl1.setField("wtId");
-////            ColumnVo cl2 = new ColumnVo();
-////            cl2.setName(String.valueOf(LocalDate.now().getYear()));
-////            cl2.setField("recodedate");
-////            ColumnVo cl3 = new ColumnVo();
-////            cl3.setName(String.valueOf(LocalDate.now().getYear() - 1));
-////            cl3.setField("recodedate2");
-////            ColumnVo cl4 = new ColumnVo();
-////            cl4.setName("涨跌%");
-////            cl4.setField("operation");
-////            ls1.add(cl1);
-////            ls1.add(cl2);
-////            ls1.add(cl3);
-////            ls1.add(cl4);
-////
-////            List<ComparetqVo> ls2 = new ArrayList<>();
-////            ComparetqVo cv = new ComparetqVo();
-////            cv.setWtId("发电量");
-////            cv.setRecodedate(String.valueOf(day1.getNfdl().divide(new BigDecimal(1000))));
-////            cv.setRecodedate2(String.valueOf(0));
-////            cv.setOperation("100");
-////            ComparetqVo cv1 = new ComparetqVo();
-////            cv1.setWtId("上网电量");
-////            cv1.setRecodedate(String.valueOf(0.00));
-////            cv1.setRecodedate2(String.valueOf(0));
-////            cv1.setOperation("0");
-////            ComparetqVo cv2 = new ComparetqVo();
-////            cv2.setWtId("网购电量");
-////            cv2.setRecodedate(String.valueOf(0.00));
-////            cv2.setRecodedate2(String.valueOf(0));
-////            cv2.setOperation("0");
-////            ComparetqVo cv3 = new ComparetqVo();
-////            cv3.setWtId("损失电量");
-////            cv3.setRecodedate(String.valueOf(0.00));
-////            cv3.setRecodedate2(String.valueOf(0));
-////            cv3.setOperation("0");
-////            ComparetqVo cv4 = new ComparetqVo();
-////            cv4.setWtId("场用电量");
-////            cv4.setRecodedate(String.valueOf(0.00));
-////            cv4.setRecodedate2(String.valueOf(0));
-////            cv4.setOperation("0");
-////            ls2.add(cv);
-////            ls2.add(cv1);
-////            ls2.add(cv2);
-////            ls2.add(cv3);
-////            ls2.add(cv4);
-////
-////            zbtqdb.put("column", ls1);
-////            zbtqdb.put("data", ls2);
-////            allmap.put("fdl", ls);
-////            allmap.put("zbtqdb", zbtqdb);
-//
-//
-//        return allmap;
-//    }
-
-
     public Map<String, Object> getGeneratingCapacity(String companyId) {
         Map<String, Object> allmap = new HashMap<>();
         QueryWrapper<StationInfoMin> qw = new QueryWrapper<>();
@@ -2725,16 +2051,12 @@ public class EconomyPointHomePageService {
     }
 
 
+    /**
+     * 缓存月、年发电量
+     */
     private void calFdl() {
-        LocalDate currentDate = LocalDate.now();
-//        int year = currentDate.getYear();
-//        int month = currentDate.getMonthValue();
         DecimalFormat df = new DecimalFormat("#.##");
         QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
-//        currentqw.select("station_id,MAX(record_date) AS record_date,SUM(rfdl) AS rfdl,sum(llfdl) as llfdl")
-//                .apply("to_char(record_date,'yyyy-MM') = {0}", year + "-" + String.format("%02d", month))
-//                .like("station_id", "_FDC_")
-//                .groupBy("to_char(record_date,'yyyy-MM'),station_id");
         currentqw.select("station_id,SUM(rfdl) AS rfdl,sum(llfdl) as llfdl")
                 .ge("record_date", LocalDate.now().with(TemporalAdjusters.firstDayOfYear())) // 大于等于今年的第一天
                 .lt("record_date", LocalDate.now().atStartOfDay().toLocalDate()) // 小于今天0点的日期
@@ -2744,11 +2066,6 @@ public class EconomyPointHomePageService {
         yfdlCal = new BigDecimal(df.format(monthData.get(0).getRfdl()));
         yllfdlCal = new BigDecimal(df.format(monthData.get(0).getLlfdl()));
         currentqw.clear();
-//        currentqw.select("station_id,MAX(record_date) AS record_date,SUM(rfdl) AS rfdl,sum(llfdl) as llfdl")
-//                .ge("record_date", LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).minusMonths(1)) // 大于等于上个月的第一天
-//                .lt("record_date", LocalDate.now().with(TemporalAdjusters.firstDayOfMonth())) // 小于本月的第一天
-//                .like("station_id", "_FDC_%") // 模糊查询 station_id
-//                .groupBy("station_id");
         currentqw.select("station_id,MAX(record_date) AS record_date,SUM(rfdl) AS rfdl,SUM(llfdl) as llfdl")
                 .ge("record_date", LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()))  // 大于等于本月的第一天
                 .lt("record_date", LocalDate.now().plusDays(1).atStartOfDay().toLocalDate())  // 小于明天0点的日期

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/threerate/ThreeRateService.java

@@ -139,20 +139,30 @@ public class ThreeRateService {
         List<ProEconFaultLiminatedefects> faulteliminatedefectsList = proEconFaultLiminatedefectsService.list(qw);
         AtomicReference<Long> gzCount = new AtomicReference<>((long) 0);
         AtomicReference<Long> xqCount = new AtomicReference<>((long) 0);
-        faulteliminatedefectsList.stream().forEach(i -> {
-            gzCount.updateAndGet(v -> new Long((long) (v + i.getFaultCount())));
-            xqCount.updateAndGet(v -> new Long((long) (v + i.getRightCount())));
+        if (null == faulteliminatedefectsList || faulteliminatedefectsList.isEmpty()) {
             QxjslDTO vo = new QxjslDTO();
+            vo.setOrdernum(0);
+            vo.setWpid("惠安风电");
+            vo.setGzCount(0L);
+            vo.setXqCount(0L);
+            vo.setXqjsl(0.0);
+            resultList.add(vo);
+        }else {
+            faulteliminatedefectsList.stream().forEach(i -> {
+                gzCount.updateAndGet(v -> new Long((long) (v + i.getFaultCount())));
+                xqCount.updateAndGet(v -> new Long((long) (v + i.getRightCount())));
+                QxjslDTO vo = new QxjslDTO();
 
-            vo.setOrdernum(station.get(i.getWindpowerstationId()));
+                vo.setOrdernum(station.get(i.getWindpowerstationId()));
 
 
-            vo.setWpid(CacheContext.wpmap.get(i.getWindpowerstationId()).getName());
-            vo.setGzCount(i.getFaultCount().longValue());
-            vo.setXqCount(i.getRightCount().longValue());
-            vo.setXqjsl(i.getFaultCount() != 0 ? DoubleUtils.getRoundingNum(((double) (i.getRightCount()) / (double) (i.getFaultCount()) * 100.0), 2) : 0.0);
-            resultList.add(vo);
-        });
+                vo.setWpid(CacheContext.wpmap.get(i.getWindpowerstationId()).getName());
+                vo.setGzCount(i.getFaultCount().longValue());
+                vo.setXqCount(i.getRightCount().longValue());
+                vo.setXqjsl(i.getFaultCount() != 0 ? DoubleUtils.getRoundingNum(((double) (i.getRightCount()) / (double) (i.getFaultCount()) * 100.0), 2) : 0.0);
+                resultList.add(vo);
+            });
+        }
         QxjslDTO vo = new QxjslDTO();
         vo.setWpid("合计");
 
@@ -163,7 +173,7 @@ public class ThreeRateService {
         vo.setGzCount(gzCount.get());
         vo.setXqCount(xqCount.get());
         vo.setXqjsl(gzCount.get() != 0 ? DoubleUtils.getRoundingNum(((double) (xqCount.get()) / (double) (gzCount.get()) * 100.0), 2) : 0.0);
-
+        resultList.add(vo);
         SortUtils.sort(resultList, "ordernum", SortUtils.ASC);