Merge remote-tracking branch 'origin/master'

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/config/GyeeConfig.java

@@ -52,6 +52,9 @@ public class GyeeConfig {
      **/
     @Value("${powerCurveFitting.fitting}")
     private String filePathFitting;
+    /** 配置文件路径 **/
+    @Value("${powerCurveFitting.file-path-power}")
+    private String filePathPower;
     /**
      * 数据压缩下载
      **/
@@ -61,6 +64,11 @@ public class GyeeConfig {
      **/
     private String points;
 
+    /**
+     * 数据是否离线执行
+     **/
+    private boolean offLine;
+
 //    public List<String> getPoints() {
 //        if (null == points) {
 //            return Collections.emptyList();
@@ -81,6 +89,14 @@ public class GyeeConfig {
         return codes;
     }
 
+    public String getFilePathPower() {
+        return jarF.getParentFile().getAbsolutePath() + File.separator + filePathPower;
+    }
+
+    public void setFilePathPower(String filePathPower) {
+        this.filePathPower = filePathPower;
+    }
+
     public String getFilePathPrepare() {
         return jarF.getParentFile().getAbsolutePath() + "\\" + filePathPrepare;
     }

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/controller/WindDirection/WindDirectionController.java

@@ -49,9 +49,9 @@ public class WindDirectionController {
      * @return
      */
     @GetMapping("/machine")
-    public JSONObject Deviationmachine(String wpid) throws Exception {
+    public JSONObject Deviationmachine(String wpid,int year) throws Exception {
 
-        Object o = windMachineService.machine(wpid);
+        Object o = windMachineService.machine(wpid,year);
         return JsonResult.successData(ResultCode.SUCCESS, o);
     }
 
@@ -61,9 +61,9 @@ public class WindDirectionController {
      * @return
      */
     @GetMapping("/weatherMachine")
-    public JSONObject weathermachine(String wpid) throws Exception {
+    public JSONObject weathermachine(String wpid,int year) throws Exception {
 
-        Object o = windMachineService.weathermachine(wpid);
+        Object o = windMachineService.weathermachine(wpid,year);
         return JsonResult.successData(ResultCode.SUCCESS, o);
     }
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/agc/AgcDeviateConfig.java

@@ -0,0 +1,22 @@
+package com.gyee.runeconomy.controller.agc;
+
+import lombok.Data;
+
+@Data
+public class AgcDeviateConfig {
+
+    private String id;
+    /**
+     * 装机容量
+     */
+    private float installedCapacity;
+    /**
+     * 场站名称
+     */
+    private String title;
+
+    private AiPoints power;
+
+    private AiPoints[] aiPoints;
+
+  }

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/agc/AgcDeviateController.java

@@ -0,0 +1,61 @@
+package com.gyee.runeconomy.controller.agc;
+
+
+import com.gyee.runeconomy.config.GyeeConfig;
+import com.gyee.runeconomy.service.agc.AgcDeviateService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 获取各个场站AGC偏差分析数据
+ */
+@RestController
+@RequestMapping("/agc")
+public class AgcDeviateController {
+    @Resource
+    private AgcDeviateService agcDeviateService;
+    @Resource
+    private GyeeConfig gyeeConfig;
+
+    /**
+     * 获取偏差信息
+     *
+     * @param startTs  开始时间
+     * @param endTs    结束时间
+     * @param id       场站id
+     * @param interval 时间间隔
+     * @return
+     */
+    @GetMapping("/deviate")
+    public Map<String, AgcDeviateTag> getData(@RequestParam(value = "startTs") long startTs,
+                                              @RequestParam(value = "endTs") long endTs,
+                                              @RequestParam(value = "id") String id,
+                                              @RequestParam(value = "interval", defaultValue = "60", required = false) int interval) {
+        List<AgcDeviateTag> ls = new ArrayList<>();
+        if (gyeeConfig.isOffLine()) {
+            ls = agcDeviateService.getAgcDeviateTags(id, startTs, endTs, interval);
+        } else {
+            ls = agcDeviateService.getAgcDeviateTags(id, startTs, endTs, interval);
+        }
+        return ls.stream().collect(Collectors.toMap(AgcDeviateTag::getName, f -> f));
+    }
+
+    /**
+     * 获取配置
+     *
+     * @return
+     */
+    @GetMapping("/config")
+    public Object getAgcConifg() {
+        return agcDeviateService.getConfig();
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/agc/AgcDeviateTag.java

@@ -0,0 +1,35 @@
+package com.gyee.runeconomy.controller.agc;
+
+import com.gyee.runeconomy.util.realtimesource.feign.TsDoubleTsData;
+
+import java.util.List;
+
+/**
+ * agc曲线偏差数据
+ */
+public class AgcDeviateTag {
+    /**
+     * 数据点名称
+     */
+    private String name;
+    /**
+     * 数据值列表
+     */
+    private List<TsDoubleTsData> values;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<TsDoubleTsData> getValues() {
+        return values;
+    }
+
+    public void setValues(List<TsDoubleTsData> values) {
+        this.values = values;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/agc/AiPoints.java

@@ -0,0 +1,56 @@
+package com.gyee.runeconomy.controller.agc;
+
+/**
+ * 从数据库的value里面取到需要的值
+ */
+public class AiPoints {
+
+    private String name;
+    /**
+     * 标签点
+     */
+    private String tag;
+    /**
+     * 倍率
+     */
+    private float multiplier;
+    /**
+     * 单位
+     */
+    private String unit;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        if (name == null) {
+            return;
+        }
+        this.name = name.replaceAll("：","");
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
+    public float getMultiplier() {
+        return multiplier;
+    }
+
+    public void setMultiplier(float multiplier) {
+        this.multiplier = multiplier;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/agc/FileService.java

@@ -0,0 +1,109 @@
+package com.gyee.runeconomy.controller.agc;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.lang.reflect.Type;
+
+/**
+ * 配置文件读取
+ *
+ * @author xysn
+ */
+@Component
+public class FileService {
+    /**
+     * 从json格式文件中获取对象
+     *
+     * @param path 文件路径
+     * @param type 对象类型
+     * @param <T>  泛型
+     * @return 返回对象
+     */
+    public <T> T getFromFile(String path, Type type) {
+        String str = getStringFormFile(path);
+        return JSON.parseObject(str, type);
+    }
+
+    /**
+     * 从json格式文件中获取对象
+     *
+     * @param path 文件路径
+     * @param type 对象类型
+     * @param <T>  泛型
+     * @return 返回对象
+     */
+    public <T> T getFromFile(String path, TypeReference<T> type) {
+        String str = getStringFormFile(path);
+        return JSON.parseObject(str, type);
+    }
+
+    /**
+     * 从文件中获取字符串
+     *
+     * @param path 路径
+     * @return 字符串
+     */
+    public String getStringFormFile(String path) {
+        BufferedReader bufferedReader = null;
+        File file = new File(path);
+        if (!file.exists()) {
+            return "";
+        }
+        try {
+            bufferedReader = new BufferedReader(new FileReader(file));
+            StringBuilder sb = new StringBuilder();
+            String s = null;
+            while ((s = bufferedReader.readLine()) != null) {
+                sb.append(s);
+            }
+            return sb.toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                assert bufferedReader != null;
+                bufferedReader.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return "";
+    }
+
+    /**
+     * 保存对象到文件中
+     *
+     * @param path 文件路径
+     * @param obj  要保存的对象
+     * @return 是否保存成功
+     */
+    public boolean saveObjectToFile(String path, Object obj) {
+        BufferedWriter bufferedWriter = null;
+        try {
+            File file = new File(path);
+            bufferedWriter = new BufferedWriter(new FileWriter(file));
+            String str = "";
+            if (obj instanceof String) {
+                str = obj.toString();
+            } else {
+                str = JSON.toJSONString(obj);
+            }
+            bufferedWriter.write(str);
+            bufferedWriter.flush();
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                assert bufferedWriter != null;
+                bufferedWriter.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return false;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/AgcDeviateModel.java

@@ -0,0 +1,93 @@
+package com.gyee.runeconomy.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import org.springframework.data.annotation.Id;
+
+//import javax.persistence.Column;
+//import javax.persistence.Id;
+
+@TableName("controlsettings")
+public class AgcDeviateModel extends Model<AgcDeviateModel> {
+    /**
+     * 唯一ID
+     */
+    @Id
+//    @Column(name = "ID")
+    private String id;
+    /**
+     * key
+     */
+//    @Column(name = "KEY")
+    private String key;
+    /**
+     * 时间戳
+     */
+//    @Column(name = "TIMESTAMP")
+    private Long timestamp;
+    /**
+     * 说明，描述
+     */
+//    @Column(name = "DESCRIPTION")
+    private String description;
+    /**
+     * 值
+     */
+//    @Column(name = "VALUE")
+    private String value;
+
+    /**
+     * 是否是备份
+     */
+//    @Column(name = "BACKUP")
+    private boolean backup;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public Long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public boolean getBackup() {
+        return backup;
+    }
+
+    public void setBackup(boolean backup) {
+        this.backup = backup;
+    }
+
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/feign/AdapterApi.java

@@ -1,6 +1,5 @@
 package com.gyee.runeconomy.feign;
 
-import com.gyee.common.model.PointData2;
 import com.gyee.runeconomy.model.PointData;
 import com.gyee.runeconomy.util.realtimesource.timeseries.DoubleStatData;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -53,7 +52,7 @@ public interface AdapterApi {
 //                                             @RequestParam("ts") long ts);
 
     @PostMapping("/history/section")
-    Map<String, PointData2> getHistorySection(URI baseUri, @RequestBody String tagNames,
+    Map<String, PointData> getHistorySection(URI baseUri, @RequestBody String tagNames,
                                               @RequestParam("ts") long ts);
 
     @GetMapping("/history/section2")

runeconomy-xk/src/main/java/com/gyee/runeconomy/init/CacheContext.java

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.config.GyeeConfig;
+import com.gyee.runeconomy.controller.agc.AgcDeviateConfig;
+import com.gyee.runeconomy.controller.agc.FileService;
 import com.gyee.runeconomy.model.TemperatureInfo;
 import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.service.auto.*;
@@ -16,6 +18,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.io.File;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAdjusters;
@@ -87,7 +90,8 @@ public class CacheContext implements CommandLineRunner {
 
     @Resource
     private ITemperatureinfoService iTemperatureinfoService;
-
+    @Resource
+    private FileService fileService;
 
     @Resource
     GyeeConfig config;
@@ -187,6 +191,11 @@ public class CacheContext implements CommandLineRunner {
 
     public static Map<String, List<ProBasicModelPower>> modelPowerDetailNewMap = new HashMap<>();
 
+    /**
+     * AGC信息缓存
+     */
+    public static Map<String, AgcDeviateConfig> agcDeviateConfigMap= new HashMap<>();
+    public static Map<String, List<String>> files = new HashMap<>();
 
     @Override
     public void run(String... args) throws Exception {
@@ -680,6 +689,7 @@ public class CacheContext implements CommandLineRunner {
 
         cacheNewModelPower();
         cacheNewPoints();
+        cacheAGC();
         initTemperatureInfo();
 
         logger.info("缓存结束------------------------------------------------------------");
@@ -697,7 +707,34 @@ public class CacheContext implements CommandLineRunner {
         wpls.stream().forEach(d -> list.addAll(proBasicEquipmentPointService.selectList(d.getId(), config.getPoints())));
         pointNewMap.putAll(list.stream().collect(Collectors.groupingBy(u -> u.getWindturbineId())));
     }
+    private void cacheAGC(){
+
+        AgcDeviateConfig[] adcs = fileService.getFromFile(config.getFilePathPower() + "agc_info_net.json", AgcDeviateConfig[].class);
+        initFiles();
+        for (AgcDeviateConfig adc : adcs) {
+            agcDeviateConfigMap.put(adc.getId(), adc);
+        }
+    }
 
+    private void initFiles() {
+        files = new HashMap<>();
+        File f = new File(config.getFilePathPower() );
+        File[] fs = f.listFiles();
+        for (File v : fs) {
+            if (v.isDirectory()) {
+                continue;
+            }
+            String[] nm = v.getName().split(",");
+            if (nm.length < 1) {
+                continue;
+            }
+            String name = nm[0];
+            if (!files.containsKey(name)) {
+                files.put(name, new ArrayList<>());
+            }
+            files.get(name).add(v.getPath());
+        }
+    }
     private void initTemperatureInfo() {
         Map<String, TemperatureInfo> tis = new HashMap<>();
 //        Map<String, StationStatus> ssm = getStationStatusMap();

runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/AgcDeviateMapper.java

@@ -0,0 +1,12 @@
+package com.gyee.runeconomy.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.runeconomy.dto.AgcDeviateModel;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface AgcDeviateMapper extends BaseMapper<AgcDeviateModel> {
+
+}

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/EarlyWarning/ApiClient.java

@@ -40,12 +40,12 @@ public class ApiClient {
     }
 
     public String getgzFromApi(String begin, String end, String alarmType,String stationid,String deviceid, String description,String modelId,
-                               String deviceType,String components, String alarmId, String isclose, String pageNum,String pageSize) {
+                               String deviceType,String components, String subcomponents,String alarmId, String isclose, String pageNum,String pageSize) {
         try {
             // 构建 URL
             String baseUrl = "http://10.220.1.5:6015/alarm/history/findAlarmlist";
             String charset = StandardCharsets.UTF_8.name();  // 获取字符集名称
-            String url = String.format("%s?begin=%s&end=%s&alarmType=%s&stationid=%s&deviceid=%s&description=%s&modelId=%s&deviceType=%s&components=%s&alarmId=%s&isclose=%s&pageNum=%s&pageSize=%s",
+            String url = String.format("%s?begin=%s&end=%s&alarmType=%s&stationid=%s&deviceid=%s&description=%s&modelId=%s&deviceType=%s&components=%s&subcomponents=%s&alarmId=%s&isclose=%s&pageNum=%s&pageSize=%s",
                     baseUrl,
                     URLEncoder.encode(begin, charset),
                     URLEncoder.encode(end, charset),
@@ -56,6 +56,7 @@ public class ApiClient {
                     URLEncoder.encode(modelId, charset),
                     URLEncoder.encode(deviceType, charset),
                     URLEncoder.encode(components, charset),
+                    URLEncoder.encode(subcomponents, charset),
                     URLEncoder.encode(alarmId, charset),
                     URLEncoder.encode(isclose, charset),
                     URLEncoder.encode(pageNum, charset),

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WindDirection/WindMachineService.java

@@ -25,9 +25,10 @@ public class WindMachineService {
     private IStationInfoDayService stationInfoDayService;
 
 
-    public Object machine(String wpid) throws Exception {
+    public Object machine(String wpid,int year) throws Exception {
         // 获取当前日期
         int currentYear = LocalDate.now().getYear();
+        currentYear = year;
 
         List<ProBasicEquipment> collect = CacheContext.wtls.stream()
                 .filter(wt -> wpid.equals(wt.getWindpowerstationId()))
@@ -168,9 +169,10 @@ public class WindMachineService {
      * @return
      * @throws Exception
      */
-    public Object weathermachine(String wpid) throws Exception {
+    public Object weathermachine(String wpid,int year) throws Exception {
         // 获取当前日期
         int currentYear = LocalDate.now().getYear();
+        currentYear= year;
 
         List<ProBasicEquipment> collect = CacheContext.wtls.stream()
                 .filter(wt -> wpid.equals(wt.getWindpowerstationId()))

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/agc/AgcDeviateService.java

@@ -0,0 +1,224 @@
+package com.gyee.runeconomy.service.agc;
+
+
+import cn.hutool.core.lang.TypeReference;
+import com.gyee.runeconomy.config.GyeeConfig;
+import com.gyee.runeconomy.controller.agc.AgcDeviateTag;
+import com.gyee.runeconomy.controller.agc.AiPoints;
+import com.gyee.runeconomy.controller.agc.FileService;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.util.realtimesource.feign.IDataAdapter;
+import com.gyee.runeconomy.util.realtimesource.feign.RemoteServiceBuilder;
+import com.gyee.runeconomy.util.realtimesource.feign.TsDoubleTsData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.system.ApplicationHome;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * 读取数据库配置文件
+ */
+@Order(0)
+@Component
+public class AgcDeviateService {
+
+    /**
+     * 是否是离线版本
+     */
+    private boolean isOffline;
+
+    /**
+     * 离线数据保存路径
+     */
+    private String filePathPower = "data\\power\\";
+
+    public File jarF = null;
+
+    {
+        ApplicationHome h = new ApplicationHome(getClass());
+        jarF = h.getSource();
+    }
+
+    /**
+     * 文件读写
+     */
+    private FileService fileService;
+
+
+    @Autowired
+    private GyeeConfig config;
+
+    @Resource
+    private IDataAdapter iDataAdapter;
+    @Autowired
+    private RemoteServiceBuilder remoteService;
+
+    /**
+     * 获取agc曲线偏差分析需要的数据
+     *
+     * @param id       场站ID
+     * @param startTs  开始时间戳
+     * @param endTs    结束时间戳
+     * @param interval 数据时间间隔
+     * @return 分析数据
+     */
+    public List<AgcDeviateTag> getAgcDeviateTags(String id, long startTs, long endTs, int interval) {
+        List<AgcDeviateTag> ladt = new ArrayList<>();
+        List<AiPoints> laps = getAiPoints(id);
+        if (laps == null) {
+            return ladt;
+        }
+        for (AiPoints ap : laps) {
+            AgcDeviateTag adt = new AgcDeviateTag();
+            adt.setName(ap.getName());
+            List<TsDoubleTsData> lpd = getPointData(ap, startTs, endTs, interval);
+            adt.setValues(lpd);
+            ladt.add(adt);
+        }
+        // 上限下限
+        List<AgcDeviateTag> upperLowerLimits = getUpperLowerLimits(ladt, id);
+        ladt.addAll(upperLowerLimits);
+        return ladt;
+    }
+
+    private List<TsDoubleTsData> getPointData(AiPoints ap, long startTs, long endTs, int interval) {
+        List<TsDoubleTsData> lpds = null;
+        if (ap.getTag().contains(",")) {
+            lpds = getMultiple(ap, startTs, endTs, interval);
+        } else {
+
+
+            if (ap.getTag().startsWith("NEM")) {
+                lpds = remoteService.taos().getHistorytsSnap(ap.getTag(), startTs, endTs, interval);
+            } else {
+                lpds = remoteService.adapterfd().getHistorytsSnap(ap.getTag(), startTs, endTs, interval);
+            }
+
+        }
+        if (ap.getMultiplier() != 1) {
+            for (TsDoubleTsData pd : lpds) {
+                pd.setDoubleValue(pd.getDoubleValue() * ap.getMultiplier());
+            }
+        }
+        return lpds;
+    }
+
+    /**
+     * 获取多个标签点数值
+     */
+    private List<TsDoubleTsData> getMultiple(AiPoints ap, long startTs, long endTs, int interval) {
+        String[] tags = ap.getTag().split(",");
+        boolean isFirst = true;
+        List<TsDoubleTsData> lpd = new ArrayList<>();
+        for (String tag : tags) {
+            if (tag.equals("")) {
+                continue;
+            }
+
+            List<TsDoubleTsData> vals = iDataAdapter.getHistorySnap(tag, startTs, endTs, interval);
+            for (int i = 0; i < vals.size(); ++i) {
+                if (isFirst) {
+                    lpd.addAll(vals);
+                    isFirst = false;
+                    break;
+                } else {
+                    TsDoubleTsData pd = lpd.get(i);
+                    pd.setDoubleValue(vals.get(i).getDoubleValue() + pd.getDoubleValue());
+                }
+            }
+        }
+        return lpd;
+    }
+
+    /**
+     * 获取上限下限
+     */
+    private List<AgcDeviateTag> getUpperLowerLimits(List<AgcDeviateTag> ladt, String id) {
+        // 装机容量
+        double capacity = getCapacity(id);
+        // 偏差
+        double deviation = capacity * 0.03;
+        // 有功设定
+        Optional<AgcDeviateTag> agcLimit = ladt.stream().filter(ad -> ad.getName().equals("有功设定限值")).findFirst();
+
+        List<AgcDeviateTag> la = new ArrayList<>();
+        if (!agcLimit.isPresent()) {
+            return la;
+        }
+        AgcDeviateTag adtUper = new AgcDeviateTag();
+        adtUper.setName("偏差上限");
+        adtUper.setValues(new ArrayList<>());
+        AgcDeviateTag adtLimt = new AgcDeviateTag();
+        adtLimt.setName("偏差下限");
+        adtLimt.setValues(new ArrayList<>());
+
+        for (TsDoubleTsData pd : agcLimit.get().getValues()) {
+            long ts = pd.getTs();
+            TsDoubleTsData pdUper = new TsDoubleTsData();
+            pdUper.setTs(ts);
+            pdUper.setDoubleValue(pd.getDoubleValue() * 1.03);
+            TsDoubleTsData pdLimt = new TsDoubleTsData();
+            pdLimt.setTs(ts);
+            pdLimt.setDoubleValue(pd.getDoubleValue() * 0.97);
+            adtUper.getValues().add(pdUper);
+            adtLimt.getValues().add(pdLimt);
+        }
+        la.add(adtUper);
+        la.add(adtLimt);
+        return la;
+    }
+
+
+    /**
+     * 根据ID获取agc配置信息
+     *
+     * @param id 场站ID
+     * @return 配置信息
+     */
+    private List<AiPoints> getAiPoints(String id) {
+        if (!CacheContext.agcDeviateConfigMap.containsKey(id)) {
+            return null;
+        }
+        AiPoints[] aiPoints = CacheContext.agcDeviateConfigMap.get(id).getAiPoints();
+        return Arrays.stream(aiPoints).filter(ap -> ap.getName().contains("功") && !ap.getName().contains("预测")).collect(Collectors.toList());
+    }
+
+    private double getCapacity(String id) {
+        if (!CacheContext.agcDeviateConfigMap.containsKey(id)) {
+            return 0;
+        }
+        return CacheContext.agcDeviateConfigMap.get(id).getInstalledCapacity();
+    }
+
+    /**
+     * 获取配置
+     *
+     * @return
+     */
+    public Object getConfig() {
+        return CacheContext.agcDeviateConfigMap;
+    }
+
+    public List<AgcDeviateTag> getAgcDeviateTagsOffline(String id, long startTs, long endTs, int interval) {
+        if (!CacheContext.files.containsKey(id)) {
+            return new ArrayList<>();
+        }
+        List<String> ls = CacheContext.files.get(id);
+
+        if (ls == null) {
+            return new ArrayList<>();
+        }
+
+        int ran = (int) (Math.random() * ls.size());
+        return fileService.getFromFile(ls.get(ran), new TypeReference<List<AgcDeviateTag>>() {
+        });
+    }
+}

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

@@ -16,5 +16,5 @@ import java.util.List;
 public interface IProEconAlarmTypeService extends IService<ProEconAlarmType> {
 
     List<ProEconAlarmType> bylist (String wtid);
-    List<ProEconAlarmType> bylists ();
+    List<ProEconAlarmType> bylists (String model);
 }

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

@@ -31,7 +31,6 @@ public class ProEconAlarmTypeServiceImpl extends ServiceImpl<ProEconAlarmTypeMap
         if (collect != null || collect.size() > 0) {
             model = collect.get(0).getModelId();
         }
-        model="alertrule_category";
         QueryWrapper<ProEconAlarmType> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(ProEconAlarmType::getCategory,model);
         List<ProEconAlarmType> proEconAlarmTypes = baseMapper.selectList(queryWrapper);
@@ -39,8 +38,10 @@ public class ProEconAlarmTypeServiceImpl extends ServiceImpl<ProEconAlarmTypeMap
     }
 
     @Override
-    public List<ProEconAlarmType> bylists() {
-        List<ProEconAlarmType> proEconAlarmTypes = baseMapper.selectList(null);
+    public List<ProEconAlarmType> bylists(String model) {
+        QueryWrapper<ProEconAlarmType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ProEconAlarmType::getCategory,model);
+        List<ProEconAlarmType> proEconAlarmTypes = baseMapper.selectList(queryWrapper);
         return proEconAlarmTypes;
     }
 }

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

@@ -1783,26 +1783,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));
                 }
             }
 
@@ -1841,26 +1848,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));
                     }
                 }
             }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/AlarmService.java

@@ -25,7 +25,7 @@ public class AlarmService {
 
     ApiClient client = new ApiClient();
 
-    public  List<PoliceVo.AlarmDetails> Alarm(String type,String wtid) throws Exception {
+    public List<PoliceVo.AlarmDetails> Alarm(String type, String wtid) throws Exception {
 
         Map<String, Object> map = new HashMap<>();
         // 获取当天零点时间
@@ -67,6 +67,7 @@ public class AlarmService {
                 "",
                 modelId,
                 "windturbine",
+                "",
                 type,
                 "",
                 "",
@@ -88,7 +89,7 @@ public class AlarmService {
                     list.add(alarm1);
                 }
             }
-        } catch (IOException e){
+        } catch (IOException e) {
             e.printStackTrace();
         }
         return list;
@@ -125,72 +126,76 @@ public class AlarmService {
             station = equipments.get(0).getWindpowerstationId();
         }
 
-        String zsresult = client.getgzFromApi(
-                startTime,
-                endTime,
-                "windturbine",
-                station,
-                wtid,
-                "",
-                modelId,
-                "windturbine",
-                "",
-                "",
-                "",
-                "1",
-                "1000"
-        );
-        // 解析所有类别预警数据
-        try {
-            // 调用parseJson方法解析JSON
-            PoliceVo policeVo = parseJson(zsresult);
-
-            if (policeVo != null) {
-
-                // 输出解析后的对象，检查内容
-                List<PoliceVo.AlarmDetails> alarmList1 = policeVo.getData().getLs();
-                for (PoliceVo.AlarmDetails alarm1 : alarmList1) {
-                    zslist.add(alarm1);
+        for (ProEconAlarmType p : bylist) {
+
+            String zsresult = client.getgzFromApi(
+                    startTime,
+                    endTime,
+                    "windturbine",
+                    station,
+                    wtid,
+                    "",
+                    modelId,
+                    "windturbine",
+                    "",
+                    p.getNemCode(),
+                    "",
+                    "",
+                    "1",
+                    "1000"
+            );
+            // 解析所有类别预警数据
+            try {
+                // 调用parseJson方法解析JSON
+                PoliceVo policeVo = parseJson(zsresult);
+
+                if (policeVo != null) {
+
+                    // 输出解析后的对象，检查内容
+                    List<PoliceVo.AlarmDetails> alarmList1 = policeVo.getData().getLs();
+                    for (PoliceVo.AlarmDetails alarm1 : alarmList1) {
+                        zslist.add(alarm1);
+                    }
                 }
+            } catch (IOException e) {
+                e.printStackTrace();
             }
-        } catch (IOException e){
-            e.printStackTrace();
-        }
-
-        List<ProEconAlarmType> bylists = proEconAlarmTypeService.bylists();
 
+//            // 创建一个 name 到 nemcode 的映射
+//            Map<String, String> nameToNemcodeMap = bylists.stream()
+//                    .collect(Collectors.toMap(
+//                            ProEconAlarmType::getNemCode,
+//                            ProEconAlarmType::getName,
+//                            (existing, replacement) -> existing // 保留已存在的值（第一个）
+//                    ));
+//
+//            // 创建一个新的 Map 存储替换后的结果
+//            Map<String, Long> updatedComponentCountMap = new HashMap<>();
+//
+//
+//            // 遍历 componentCountMap
+//            componentCountMap.forEach((key, value) -> {
+//                // 检查是否能匹配到 nemcode
+//                if (nameToNemcodeMap.containsKey(key)) {
+//                    // 如果匹配，使用 nemcode 替换 key
+//                    updatedComponentCountMap.put(nameToNemcodeMap.get(key), value);
+//                } else {
+//                    // 如果未匹配，保留原来的 key
+//                    updatedComponentCountMap.put("QT", value);
+//                }
+//            });
+        }
         Map<String, Long> componentCountMap = zslist.stream()
                 .collect(Collectors.groupingBy(
-                        PoliceVo.AlarmDetails::getComponents, // 分组条件：按照 components 字段
+                        PoliceVo.AlarmDetails::getSubcomponents, // 分组条件：按照 components 字段
                         Collectors.counting()                // 统计数量
                 ));
+            Long zscount = (long) zslist.size();
+            componentCountMap.put("zs", zscount);
+            map.put("data", bylist);
+            map.put("count", componentCountMap);
 
-        // 创建一个 name 到 nemcode 的映射
-        Map<String, String> nameToNemcodeMap = bylists.stream()
-                .collect(Collectors.toMap(
-                        ProEconAlarmType::getName,    // key: name 字段
-                        ProEconAlarmType::getNemCode // value: nemcode 字段
-                ));
 
-        // 创建一个新的 Map 存储替换后的结果
-        Map<String, Long> updatedComponentCountMap = new HashMap<>();
-
-
-        // 遍历 componentCountMap
-        componentCountMap.forEach((key, value) -> {
-            // 检查是否能匹配到 nemcode
-            if (nameToNemcodeMap.containsKey(key)) {
-                // 如果匹配，使用 nemcode 替换 key
-                updatedComponentCountMap.put(nameToNemcodeMap.get(key), value);
-            } else {
-                // 如果未匹配，保留原来的 key
-                updatedComponentCountMap.put(key, value);
-            }
-        });
-        Long zscount = (long) zslist.size();
-        updatedComponentCountMap.put("zs",zscount);
-        map.put("data",bylist);
-        map.put("count",updatedComponentCountMap);
         return map;
     }
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MatrixService.java

@@ -106,6 +106,7 @@ public class MatrixService {
         wpls.parallelStream().forEach(wp -> {
             List<MatrixVo> volist = new ArrayList<>();
             List<String> wpPoints = new ArrayList<>();
+            List<String> wpglPoints = new ArrayList<>();
             List<String> wtPoints = new ArrayList<>();
             List<String> wtmxPoints = new ArrayList<>();
             List<String> wtPoints1 = new ArrayList<>();
@@ -127,6 +128,7 @@ public class MatrixService {
             wpPoints.add(pointMap.get(ContantXk.SSZBZGL).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.SSZNHGLZS).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.SSZGL).getNemCode());
+            wpglPoints.add(pointMap.get(ContantXk.SSZLLGL).getNemCode());
 
             List<ProBasicEquipment> equipments = wpwtmap.get(wp.getId());
             equipments.stream().forEach(wt -> {
@@ -153,6 +155,7 @@ public class MatrixService {
                 List<PointData> wtRealdatas = edosUtil.getRealData(wtPoints);
                 List<PointData> wtmxRealdatas = edosUtil.getRealData(wtmxPoints);
                 List<PointData> wtRealdatas1 = edosUtil.getRealData(wtPoints1);
+                List<PointData> wpRealdatagl = edosUtil.getRealData(wpglPoints);
 //                List<PointData> wpRealdatas = edosUtil.getRealData(wpPoints);
 
 

runeconomy-xk/src/main/resources/application-nxf.yml

@@ -100,6 +100,8 @@ powerCurveFitting:
   prepare: prepare
   process: process
   fitting: fitting
+  # 功率曲线离线数据保存路径
+  file-path-power: data\power\
 
 #devtools:
 #  restart: