refactor(data-adapter): 优化数据获取逻辑

- 新增 mqttMap 接口，返回 MqttCache 中的点数据
-优化 getLatestData 方法，增加对未获取到的数据进行历史数据查询的逻辑
- 新增 getHistorySection 方法，用于查询指定时间范围内的历史数据

refactor(runeconomy-xk): 重构经济运行分析相关代码

- 优化 BenchmarkingService 中的数据处理逻辑，使用 double 类型替代 BigDecimal
-重构 EconomyPointHomePageService 中的统计计算方法，提高性能
- 新增 ProEconEquipmentInfoDayTopServiceImpl 中的数据处理方法，整合涡轮机信息
- 更新 SingleAnalysisController，增加单机分析功能- 修改 TurbineInfoDay 模型，将 BigDecimal 类型改为 Double

data-adapter/src/main/java/com/gyee/dataadapter/controller/AdapterController.java

@@ -1,6 +1,7 @@
 package com.gyee.dataadapter.controller;
 
 import com.alibaba.druid.sql.visitor.functions.If;
+import com.gyee.dataadapter.cache.MqttCache;
 import com.gyee.dataadapter.entity.DoubleStatData;
 import com.gyee.dataadapter.entity.PointData;
 import com.gyee.dataadapter.entity.PointInfo;
@@ -33,6 +34,10 @@ public class AdapterController {
         return dataClient.getTotalData(start, end, sampleType, sampleRate, paths, pageIndex, pageSize, isDesc);
     }
 
+    @GetMapping(value = "/mqttMap")
+    public Map<String, PointData> mqttMap() {
+        return MqttCache.subData2;
+    }
 
     @GetMapping(value = "/latest/list")
     public Map<String, PointInfo> latest(@RequestParam(value = "paths") String paths) {

data-adapter/src/main/java/com/gyee/dataadapter/service/TsDataService.java

@@ -40,7 +40,25 @@ public class TsDataService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        Map<String, PointData> data2 = adapterService.getLatestData2(nxFgs.get(false));
+        List<String> strings = nxFgs.get(false);
+        Map<String, PointData> data2 = adapterService.getLatestData2(strings);
+        List<String> strings2 = new ArrayList<>();
+        if(strings != null){
+            for (String string : strings) {
+                if(!data2.containsKey(string)){
+                    strings2.add(string);
+                }
+            }
+        }
+        if(!strings2.isEmpty()){
+            int k=1;
+            Map<String, PointData> dataMap;
+            do{
+                dataMap = getHistorySection(new Date(), strings2.stream().collect(Collectors.joining(",")),k*12);
+                k++;
+            }while (k<20 && dataMap.isEmpty());
+            latest.putAll(dataMap);
+        }
         latest.putAll(data2);
         return latest;
     }
@@ -174,4 +192,29 @@ public class TsDataService {
             return new HashMap<>();
         }
     }
+
+    public Map<String, PointData> getHistorySection(Date time, String tagNames,int hour) {
+        Map<String, PointData> result = new HashMap<>();
+        if(StrUtil.isBlank(tagNames)) return result;
+        Map<Boolean, List<String>> nxFgs = Arrays.stream(tagNames.split(",")).collect(
+                Collectors.groupingBy(tn -> tn.toUpperCase().startsWith("NX_FGS_")));
+        try {
+            Map<String, PointData> latest = historyDao.getHistorySection(time, nxFgs.get(true));
+            result.putAll(latest);
+            List<String> strings = nxFgs.get(false);
+            if (CollUtil.isEmpty(strings)) return result;
+            for (String tagName : strings) {
+                //Date start, Date end, Integer sampleType, Integer sampleRate, String paths,
+                //                                String pageIndex, String pageSize, Boolean isDesc
+                DateTime time0 = DateUtil.offsetHour(time, -hour);
+                List<PointData> pdsMap = adapterService.getPointData(time0, time, 0, 600, tagName,"1","1",true);
+                if (CollUtil.isNotEmpty(pdsMap)) result.put(tagName, pdsMap.get(0));
+            }
+            return result;
+        } catch (Exception e) {
+            log.error("Section");
+            log.error(e.getMessage());
+            return new HashMap<>();
+        }
+    }
 }

data-adapter/src/main/java/com/gyee/dataadapter/service/impl/AdapterServiceImpl.java

@@ -234,7 +234,7 @@ public class AdapterServiceImpl implements IAdapterService {
         if (CollUtil.isEmpty(tagNames)) return map;
         for (String path : tagNames) {
             PointData pd = MqttCache.subData2.get(path);
-            map.put(path, pd);
+            if(pd!=null)  map.put(path, pd);
         }
         return map;
     }

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/SingleAnalysisController.java

@@ -1,13 +1,19 @@
 package com.gyee.runeconomy.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.runeconomy.dto.AjaxResult;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultCode;
 import com.gyee.runeconomy.dto.ResultMsg;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDayTop;
+import com.gyee.runeconomy.model.auto.TurbineInfoDay;
 import com.gyee.runeconomy.model.vo.SingleAnalysisVo;
+import com.gyee.runeconomy.service.auto.ITurbineInfoDayService;
 import com.gyee.runeconomy.service.singleanalysis.SingleAnalysisService;
 import com.gyee.runeconomy.util.DateUtils;
 import com.gyee.runeconomy.util.StringUtils;
@@ -23,6 +29,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/singleanalysis")
@@ -31,6 +39,8 @@ public class SingleAnalysisController {
 
     @Resource
     private SingleAnalysisService singleAnalysisService;
+    @Resource
+    private ITurbineInfoDayService turbineInfoDayService;
 
     @PostMapping("/singleanalysisMain")
     @ResponseBody
@@ -45,6 +55,64 @@ public class SingleAnalysisController {
             @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
 
     public R singleanalysisMain(Integer pageNum, Integer pageSize, String cmId, String type, String wpId, String year, String month) throws Exception {
+        Map<String, Object> map = new HashMap<>();
+        if (StringUtils.empty(year) && StringUtils.empty(month)) return R.data(ResultMsg.ok(map));
+
+        Calendar cal = Calendar.getInstance();
+        int newyear = cal.get(Calendar.YEAR);
+        int newmonth = cal.get(Calendar.MONTH) + 1;
+        Date recordDate = null;
+        if (Integer.valueOf(year) == newyear && Integer.valueOf(month) == newmonth) {
+            cal.add(Calendar.DAY_OF_MONTH, -1);
+            recordDate = DateUtils.truncate(cal.getTime());
+        } else {
+            cal.set(Calendar.YEAR, Integer.valueOf(year));
+            cal.set(Calendar.MONTH, Integer.valueOf(month) - 1);
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+            recordDate = DateUtils.truncate(cal.getTime());
+        }
+
+        map = singleAnalysisService.SingleAnalysisList(pageNum, pageSize, cmId, type, wpId, recordDate);
+
+        List<SingleAnalysisVo> subList = (List<SingleAnalysisVo>) map.get("values");
+        QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
+        qw.lambda().eq(TurbineInfoDay::getStationId, wpId).eq(TurbineInfoDay::getRecordDate, recordDate).orderByAsc(TurbineInfoDay::getTurbineId);
+        IPage<TurbineInfoDay> page = new Page<>(pageNum, pageSize);
+        IPage<TurbineInfoDay> page1 = turbineInfoDayService.page(page, qw);
+        Map<String, TurbineInfoDay> dayMap = page1.getRecords().stream().collect(Collectors.toMap(TurbineInfoDay::getTurbineId, Function.identity()));
+        subList.forEach(sav->{
+            TurbineInfoDay day = dayMap.get(sav.getWindturbineid());
+            sav.setFdl(day.getRfdl());
+            sav.setFs(day.getPjfs());
+            sav.setGzss(day.getGzss());
+            sav.setJxss(day.getJhjxss());
+            sav.setXdss(day.getXdss());
+            sav.setXnss(day.getXnss());
+            sav.setSlss(day.getSlss());
+            sav.setLlfdl(day.getLlfdl());
+            sav.setGzxs(day.getGzMin()/60);
+            sav.setJxxs(day.getJxMin()/60);
+            sav.setTjxs(day.getTjMin()/60);
+            sav.setYxxs(day.getYxMin()/60);
+            sav.setDjxs(day.getDjMin()/60);
+            sav.setLyxs(day.getLyxs());
+            sav.setSbklyl(day.getKlyl());
+            //                    "dxklyxs": 26.0,
+            //                    "rlxs": 384.0,
+            sav.setXfqr(day.getXfqrfs());
+            sav.setGlyzxxs(day.getGlyzxxs());
+            sav.setYxfss(day.getYxfss());
+            //                    "xfqrhgl": 24.14,
+            //                    "fjrl": 2000.0,
+            sav.setJfpl(day.getJfpl());
+            sav.setJfpl(day.getJfpl());
+        });
+
+        return R.data(ResultMsg.ok(map));
+
+    }
+
+    public R singleanalysisMain_bf(Integer pageNum, Integer pageSize, String cmId, String type, String wpId, String year, String month) throws Exception {
 
         Map<String, Object> map = new HashMap<>();
         List<SingleAnalysisVo> vos = new ArrayList<>();

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -30,19 +29,19 @@ public class TurbineInfoDay implements Serializable {
     private String lineId;
     private String turbineId;
     private Date recordDate;
-    private BigDecimal rfdl;
-    private BigDecimal jhjxss;
-    private BigDecimal fjhjxss;
-    private BigDecimal xdss;
-    private BigDecimal slss;
-    private BigDecimal xnss;
+    private Double rfdl;
+    private Double jhjxss;
+    private Double fjhjxss;
+    private Double xdss;
+    private Double slss;
+    private Double xnss;
     private Double llfdl;
     private Double pjfs;
     private Double edfs;
     private Double xfqrfs;
     private Double hjwd;
-    private BigDecimal djss;
-    private BigDecimal gzss;
+    private Double djss;
+    private Double gzss;
     private Double djMin;
     private Double tjMin;
     private Double yxMin;

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -11,17 +11,17 @@ import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.mapper.auto.ProEconEquipmentInfoDayTopMapper;
 import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
 import com.gyee.runeconomy.model.auto.ProEconEquipmentInfoDayTop;
+import com.gyee.runeconomy.model.auto.TurbineInfoDay;
 import com.gyee.runeconomy.service.TokenService;
 import com.gyee.runeconomy.service.auto.IProEconEquipmentInfoDayTopService;
+import com.gyee.runeconomy.service.auto.ITurbineInfoDayService;
 import org.springframework.stereotype.Service;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
 import java.time.Year;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -40,10 +40,52 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
     private TokenService tokenService;
     @Resource
     private ProEconEquipmentInfoDayTopMapper proEconEquipmentInfoDayTopMapper;
+    @Resource
+    private ITurbineInfoDayService turbineInfoDayService;
 
     @Override
     public IPage<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList(String companyId, String windpowerstationId, Integer types, String staType, String date, Integer pageNum, Integer pageSize) {
 
+        IPage<TurbineInfoDay> andList = getTopAndList(windpowerstationId, date, pageNum, pageSize);
+        IPage<ProEconEquipmentInfoDayTop> resultPage = getEquipmentInfoDayTopList_bf(companyId, windpowerstationId, types, staType, date, pageNum, pageSize);
+        resultPage.setRecords(turbs2equipmentidt(resultPage.getRecords(),andList.getRecords()));
+        return resultPage;
+    }
+
+    private List<ProEconEquipmentInfoDayTop> turbs2equipmentidt(List<ProEconEquipmentInfoDayTop> peeidtRecords, List<TurbineInfoDay> tidRecords) {
+        if (peeidtRecords == null || peeidtRecords.isEmpty() || tidRecords == null || tidRecords.isEmpty()) return Collections.emptyList();
+        Map<String, TurbineInfoDay> dayMap = tidRecords.stream().collect(Collectors.toMap(TurbineInfoDay::getTurbineId, Function.identity()));
+        peeidtRecords.forEach(peeidt->{
+            TurbineInfoDay day = dayMap.get(peeidt.getWindturbineId());
+            //"dayfdl": 10.96,
+            peeidt.setDayfdl(day.getRfdl());
+            peeidt.setDayllfdl(day.getLlfdl());
+            peeidt.setDayfs(day.getPjfs());
+            //                    "daygl": 359.37,平均功率
+            peeidt.setDaygzssdl(day.getGzss());
+            peeidt.setDayxdssdl(day.getXdss());
+            peeidt.setDaywhssdl(day.getFjhjxss());
+            peeidt.setDayxnssdl(day.getXnss());
+            peeidt.setDaylyxs(day.getLyxs());
+            peeidt.setDaysbklyl(day.getKlyl());
+            //                    "daydxkyxs": 100.0,等效可用系数
+            peeidt.setDayyxfss(day.getYxfss());
+            peeidt.setDayjfpl(day.getJfpl());
+            peeidt.setDayglyzxxs(day.getGlyzxxs());
+        });
+        return peeidtRecords;
+    }
+
+    public IPage<TurbineInfoDay> getTopAndList(String windpowerstationId, String date, Integer pageNum, Integer pageSize) {
+        QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
+        qw.lambda().eq(TurbineInfoDay::getStationId, windpowerstationId)
+                .eq(TurbineInfoDay::getRecordDate, DateUtils.parseDate(date)).orderByAsc(TurbineInfoDay::getTurbineId);
+        IPage<TurbineInfoDay> page = new Page<>(pageNum, pageSize);
+        turbineInfoDayService.page(page, qw);
+        return page;
+    }
+    public IPage<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopList_bf(String companyId, String windpowerstationId, Integer types, String staType, String date, Integer pageNum, Integer pageSize) {
+
         QueryWrapper<ProEconEquipmentInfoDayTop> qw = new QueryWrapper<>();
         Page<ProEconEquipmentInfoDayTop> page = new Page<>(pageNum, pageSize);
         LocalDate today = LocalDate.now();
@@ -134,8 +176,46 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
         return resultPage;
     }
 
+    public List<TurbineInfoDay> getTopAndList(String windturbineId, String beginDate, String endDate) {
+        QueryWrapper<TurbineInfoDay> qw = new QueryWrapper<>();
+        qw.lambda().eq(TurbineInfoDay::getTurbineId, windturbineId).orderByAsc(TurbineInfoDay::getRecordDate)
+                .between(TurbineInfoDay::getRecordDate, DateUtils.parseDate(beginDate), DateUtils.parseDate(endDate));
+        List<TurbineInfoDay> list = turbineInfoDayService.list(qw);
+        return list;
+    }
+
     @Override
     public List<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopHistoryList(String windturbineId, Integer types, String beginDate, String endDate) {
+        List<ProEconEquipmentInfoDayTop> listBf = getEquipmentInfoDayTopHistoryList_bf(windturbineId, types, beginDate, endDate);
+        List<TurbineInfoDay> andList = getTopAndList(windturbineId, beginDate, endDate);
+        return turbs2equipmentidt2(listBf, andList);
+    }
+
+    private List<ProEconEquipmentInfoDayTop> turbs2equipmentidt2(List<ProEconEquipmentInfoDayTop> peeidtRecords, List<TurbineInfoDay> tidRecords) {
+        if (peeidtRecords == null || peeidtRecords.isEmpty() || tidRecords == null || tidRecords.isEmpty()) return Collections.emptyList();
+        Map<Date, TurbineInfoDay> dayMap = tidRecords.stream().collect(Collectors.toMap(TurbineInfoDay::getRecordDate, Function.identity()));
+        peeidtRecords.forEach(peeidt->{
+            TurbineInfoDay day = dayMap.get(peeidt.getRecordDate());
+            //"dayfdl": 10.96,
+            peeidt.setDayfdl(day.getRfdl());
+            peeidt.setDayllfdl(day.getLlfdl());
+            peeidt.setDayfs(day.getPjfs());
+            //                    "daygl": 359.37,平均功率
+            peeidt.setDaygzssdl(day.getGzss());
+            peeidt.setDayxdssdl(day.getXdss());
+            peeidt.setDaywhssdl(day.getFjhjxss());
+            peeidt.setDayxnssdl(day.getXnss());
+            peeidt.setDaylyxs(day.getLyxs());
+            peeidt.setDaysbklyl(day.getKlyl());
+            //                    "daydxkyxs": 100.0,等效可用系数
+            peeidt.setDayyxfss(day.getYxfss());
+            peeidt.setDayjfpl(day.getJfpl());
+            peeidt.setDayglyzxxs(day.getGlyzxxs());
+        });
+        return peeidtRecords;
+    }
+
+    public List<ProEconEquipmentInfoDayTop> getEquipmentInfoDayTopHistoryList_bf(String windturbineId, Integer types, String beginDate, String endDate) {
 
         QueryWrapper<ProEconEquipmentInfoDayTop> qw = new QueryWrapper<>();
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -895,7 +895,7 @@ public class BenchmarkingService {
 
             vo.setFdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getRfdl()))/1000, 2));
             vo.setLlfdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getLlfdl()))/1000, 2));
-            vo.setJxssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getJhjxss().add(i.getFjhjxss())))/1000 , 2));
+            vo.setJxssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getJhjxss()+i.getFjhjxss()))/1000 , 2));
             vo.setGzssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getGzss()))/1000,2));
             vo.setXdssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getXdss()))/1000, 2));
             vo.setSlssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getSlss()))/1000, 2));
@@ -1545,9 +1545,9 @@ public class BenchmarkingService {
             }
             vo.setFdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getRfdl())), 2));
             vo.setLlfdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getLlfdl())), 2));
-            vo.setJxssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getJhjxss().add(i.getFjhjxss()))), 2));
+            vo.setJxssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getJhjxss()+i.getFjhjxss())), 2));
             vo.setGzssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getGzss())), 2));
-            vo.setXdssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getXdss().add(i.getDjss()))), 2));
+            vo.setXdssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getXdss()+i.getDjss())), 2));
             vo.setSlssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getSlss())), 2));
             vo.setXnssdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getXnss())), 2));
             vo.setZssdl(DoubleUtils.keepPrecision(vo.getGzssdl() + vo.getJxssdl() + vo.getXdssdl() + vo.getXnssdl() + vo.getSlssdl(), 2));

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

@@ -1769,26 +1769,33 @@ public class EconomyPointHomePageService {
             String text = year1 + "-" + mon;
             for (ValueVo vv : vexdl) {
                 if (vv.getText().equals(text)) {
-                    BigDecimal bxdl = day1s2.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add);
-                    vv.setValue(BigDecimal.valueOf(bxdl.doubleValue() / 1000));
+                    //BigDecimal bxdl = day1s2.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    double bxdl = day1s2.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
+                    vv.setValue(BigDecimal.valueOf(bxdl / 1000));
                 }
             }
             for (ValueVo vv : vessdl) {
                 if (vv.getText().equals(text)) {
-                    BigDecimal bssdl = day1s2.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add)
-                            .add(day1s2.stream().map(TurbineInfoDay::getJhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
-                                    .add(day1s2.stream().map(TurbineInfoDay::getFjhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
-                                            .add(day1s2.stream().map(TurbineInfoDay::getSlss).reduce(BigDecimal.ZERO, BigDecimal::add))
-                                            .add(day1s2.stream().map(TurbineInfoDay::getXnss).reduce(BigDecimal.ZERO, BigDecimal::add))
-                                            .add(day1s2.stream().map(TurbineInfoDay::getDjss).reduce(BigDecimal.ZERO, BigDecimal::add))
-                                            .add(day1s2.stream().map(TurbineInfoDay::getGzss).reduce(BigDecimal.ZERO, BigDecimal::add))));
-                    vv.setValue(BigDecimal.valueOf(bssdl.doubleValue() / 1000));
+                    //BigDecimal bssdl = day1s2.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                    //        .add(day1s2.stream().map(TurbineInfoDay::getJhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                    //                .add(day1s2.stream().map(TurbineInfoDay::getFjhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                    //                        .add(day1s2.stream().map(TurbineInfoDay::getSlss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                    //                        .add(day1s2.stream().map(TurbineInfoDay::getXnss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                    //                        .add(day1s2.stream().map(TurbineInfoDay::getDjss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                    //                        .add(day1s2.stream().map(TurbineInfoDay::getGzss).reduce(BigDecimal.ZERO, BigDecimal::add))));
+                    double xd = day1s2.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
+                    double fjh = day1s2.stream().mapToDouble(TurbineInfoDay::getFjhjxss).sum();
+                    double jh = day1s2.stream().mapToDouble(TurbineInfoDay::getJhjxss).sum();
+                    double xn = day1s2.stream().mapToDouble(TurbineInfoDay::getXnss).sum();
+
+                    vv.setValue(BigDecimal.valueOf((xd + fjh + jh + xn) / 1000));
                 }
             }
             for (ValueVo vv : vefdl) {
                 if (vv.getText().equals(text)) {
-                    BigDecimal bfdl = day1s2.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add);
-                    vv.setValue(BigDecimal.valueOf(bfdl.doubleValue() / 1000));
+                    //BigDecimal bfdl = day1s2.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    double bfdl = day1s2.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
+                    vv.setValue(BigDecimal.valueOf(bfdl / 1000));
                 }
             }
 
@@ -1827,26 +1834,33 @@ public class EconomyPointHomePageService {
                 String text = year1 + "-" + mon2;
                 for (ValueVo vv : vxdl2) {
                     if (vv.getText().equals(text)) {
-                        BigDecimal bxdl2 = day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        vv.setValue(BigDecimal.valueOf(bxdl2.doubleValue() / 1000));
+                        //BigDecimal bxdl2 = day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add);
+                        double bxdl2 = day1s4.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
+                        vv.setValue(BigDecimal.valueOf(bxdl2 / 1000));
                     }
                 }
                 for (ValueVo vv : vssdl2) {
                     if (vv.getText().equals(text)) {
-                        BigDecimal bssl2 = day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add)
-                                .add(day1s4.stream().map(TurbineInfoDay::getJhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
-                                        .add(day1s4.stream().map(TurbineInfoDay::getFjhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
-                                                .add(day1s4.stream().map(TurbineInfoDay::getSlss).reduce(BigDecimal.ZERO, BigDecimal::add))
-                                                .add(day1s4.stream().map(TurbineInfoDay::getXnss).reduce(BigDecimal.ZERO, BigDecimal::add))
-                                                .add(day1s4.stream().map(TurbineInfoDay::getDjss).reduce(BigDecimal.ZERO, BigDecimal::add))
-                                                .add(day1s4.stream().map(TurbineInfoDay::getGzss).reduce(BigDecimal.ZERO, BigDecimal::add))));
-                        vv.setValue(BigDecimal.valueOf(bssl2.doubleValue() / 1000));
+                        //BigDecimal bssl2 = day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                        //        .add(day1s4.stream().map(TurbineInfoDay::getJhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                        //                .add(day1s4.stream().map(TurbineInfoDay::getFjhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                        //                        .add(day1s4.stream().map(TurbineInfoDay::getSlss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                        //                        .add(day1s4.stream().map(TurbineInfoDay::getXnss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                        //                        .add(day1s4.stream().map(TurbineInfoDay::getDjss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                        //                        .add(day1s4.stream().map(TurbineInfoDay::getGzss).reduce(BigDecimal.ZERO, BigDecimal::add))));
+
+                        double xd = day1s4.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
+                        double fjh = day1s4.stream().mapToDouble(TurbineInfoDay::getFjhjxss).sum();
+                        double jh = day1s4.stream().mapToDouble(TurbineInfoDay::getJhjxss).sum();
+                        double xn = day1s4.stream().mapToDouble(TurbineInfoDay::getXnss).sum();
+                        vv.setValue(BigDecimal.valueOf((xd + fjh + jh + xn) / 1000));
                     }
                 }
                 for (ValueVo vv : vfdl2) {
                     if (vv.getText().equals(text)) {
-                        BigDecimal bfl2 = day1s4.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        vv.setValue(BigDecimal.valueOf(bfl2.doubleValue() / 1000));
+                        //BigDecimal bfl2 = day1s4.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add);
+                        double bfl2 = day1s4.stream().mapToDouble(TurbineInfoDay::getXdss).sum();
+                        vv.setValue(BigDecimal.valueOf(bfl2 / 1000));
                     }
                 }
             }