曲线偏差率分析指标计算调整

generationXK-service/pom.xml

@@ -69,6 +69,18 @@
             <version>1.2.17</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-core</artifactId>
+            <version>11.8</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/io.github.openfeign/feign-jackson -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-jackson</artifactId>
+            <version>11.8</version>
+        </dependency>
         <!-- ********************** plugin ********************** -->
         <!-- groovy-all -->
         <dependency>

generationXK-service/src/main/java/com/gyee/generation/config/FiveLoss/AnnotationTool.java

@@ -0,0 +1,81 @@
+package com.gyee.generation.config.FiveLoss;
+
+
+import com.gyee.generation.config.speed.Desc;
+
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 注解工具类，提供解析注解的方法
+ */
+public class AnnotationTool {
+
+    /**
+     * 获取打了Desc注解的字典属性列表
+     * 该方法用于从给定的Class<T>对象中获取所有带有Desc注解的字段，并将这些字段的信息封装到FixedVo对象中，然后返回一个包含这些FixedVo对象的列表
+     * @return 字典属性列表
+     */
+    public static <T> List<FixedVo> getFixedVoList(Class<T> c) {
+        if (c == null) {
+            return Collections.emptyList();
+        }
+        try {
+            T cls = c.newInstance();
+            Field[] fields = c.getDeclaredFields();
+            List<FixedVo> fixedVoList = new LinkedList<>();
+            for (Field field : fields) {
+                //使私有对象可以访问
+                field.setAccessible(true);
+                //检查字段是否有Desc注解
+                Desc desc = field.getAnnotation(Desc.class);
+                if (desc != null) {
+                    FixedVo vo = new FixedVo();
+                    vo.setKey(String.valueOf(field.get(cls)));
+                    vo.setName(field.getName());
+                    vo.setDes(desc.des());
+                    vo.setUniformCode(desc.uniformCode());
+                    vo.setRemark(desc.remark());
+                    fixedVoList.add(vo);
+                }
+            }
+            return fixedVoList;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Collections.emptyList();
+    }
+
+    /**
+     * 通过反射获取值
+     * @param object
+     * @return
+     */
+    public static List<FixedVo> getValueList(Object object) {
+        if (object == null) {
+            return Collections.emptyList();
+        }
+        try {
+            Field[] fields = object.getClass().getDeclaredFields();
+            List<FixedVo> fixedVoList = new LinkedList<>();
+            for (Field field : fields) {
+                //使私有对象可以访问
+                field.setAccessible(true);
+                Desc desc = field.getAnnotation(Desc.class);
+                if (desc != null) {
+                    FixedVo vo = new FixedVo();
+                    Object o = field.get(object);
+                    vo.setKey(String.valueOf(o));
+                    vo.setRemark(desc.remark());
+                    fixedVoList.add(vo);
+                }
+            }
+            return fixedVoList;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Collections.emptyList();
+    }
+}

generationXK-service/src/main/java/com/gyee/generation/config/FiveLoss/FixedVo.java

@@ -0,0 +1,28 @@
+package com.gyee.generation.config.FiveLoss;
+
+import lombok.Data;
+
+/**
+ * 与注解属性对应的类 @Desc
+ */
+@Data
+public class FixedVo {
+
+    public String key;
+    public String name;
+    public String des;
+    public String uniformCode;
+    public String remark;
+
+
+    @Override
+    public String toString() {
+        return "FixedVo{" +
+                "key='" + key + '\'' +
+                ", name='" + name + '\'' +
+                ", des='" + des + '\'' +
+                ", uniformCode='" + uniformCode + '\'' +
+                ", remark='" + remark + '\'' +
+                '}';
+    }
+}

generationXK-service/src/main/java/com/gyee/generation/config/FiveLoss/TableTitle.java

@@ -0,0 +1,18 @@
+package com.gyee.generation.config.FiveLoss;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 和 PowerPointData / PowerFittingPoint 对应
+ * 主要给前端表格提供对应标题
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TableTitle {
+
+    private String key;
+    private String des;
+}

generationXK-service/src/main/java/com/gyee/generation/config/feign/FeignsBuilder.java

@@ -0,0 +1,34 @@
+package com.gyee.generation.config.feign;
+
+
+import feign.Feign;
+import feign.Request;
+import feign.Retryer;
+import feign.jackson.JacksonDecoder;
+import feign.jackson.JacksonEncoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.Resource;
+
+
+/**
+ * @author xysn
+ */
+
+@Configuration
+public class FeignsBuilder {
+
+    @Resource
+    private GyeeConfig config;
+
+    @Bean
+    public IDataAdapter dataAdapter() {
+        return Feign.builder()
+                .encoder(new JacksonEncoder())
+                .decoder(new JacksonDecoder())
+                .options(new Request.Options(1000, 100000))
+                .retryer(new Retryer.Default(5000, 5000, 3))
+                .target(IDataAdapter.class, config.getAdapterfdUrl());
+    }
+}

generationXK-service/src/main/java/com/gyee/generation/config/feign/GyeeConfig.java

@@ -0,0 +1,57 @@
+package com.gyee.generation.config.feign;
+
+import com.gyee.generation.config.FiveLoss.AnnotationTool;
+import com.gyee.generation.config.FiveLoss.FixedVo;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.system.ApplicationHome;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "gyee")
+public class GyeeConfig {
+
+    public File jarF = null;
+
+    {
+        ApplicationHome h = new ApplicationHome(getClass());
+        jarF = h.getSource();
+    }
+
+    /**
+     * 数据适配器网址
+     **/
+    @Value("${db.url1}")
+    private String AdapterfdUrl;
+    @Value("${db.url1}")
+    private String AdaptergfUrl;
+    @Value("${db.url1}")
+    private String TaosUrl;
+
+    /**
+     * 数据压缩下载
+     **/
+    private String filePathDownload;
+    /**
+     * 功率曲线拟合测点
+     **/
+    private String points;
+
+//    public List<String> getPoints() {
+//        if (null == points) {
+//            return Collections.emptyList();
+//        } else {
+//            return Arrays.asList(points.split(","));
+//        }
+//    }
+
+
+
+}

generationXK-service/src/main/java/com/gyee/generation/config/feign/IAdapterService.java

@@ -0,0 +1,76 @@
+package com.gyee.generation.config.feign;
+
+import com.gyee.common.model.PointData;
+import feign.Headers;
+import feign.Param;
+import feign.RequestLine;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IAdapterService {
+
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @RequestLine("GET /latest?keys={points}")
+    Map<String, TsDoubleData> getLatest(@Param("points") String points);
+
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @RequestLine("GET /history/snap?tagName={tagName}&startTs={startTs}&endTs={endTs}&interval={interval}")
+    List<TsDoubleData> getHistorySnap(
+            @Param("tagName") String tagName,
+            @Param("startTs") long startTs,
+            @Param("endTs") long endTs,
+            @Param("interval") Integer interval
+    );
+
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @RequestLine("GET /history/raw?tagName={tagName}&startTs={startTs}&endTs={endTs}")
+    List<TsDoubleData> getRawValuesByKey(
+            @Param("tagName") String tagName,
+            @Param("startTs") long startTs,
+            @Param("endTs") long endTs
+    );
+
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @RequestLine("GET /history/section?tagNames={tagNames}&ts={ts}")
+    Map<String, TsDoubleData> getHistorySection(
+            @Param("tagNames") String tagNames,
+            @Param("ts") long ts
+    );
+
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @RequestLine("GET /history/stats?tagName={tagName}&startTs={startTs}&endTs={endTs}&interval={interval}&type={type}")
+    List<PointData>  getHistoryStats(
+            @Param("tagName") String tagName,
+            @Param("startTs") long startTs,
+            @Param("endTs") long endTs,
+            @Param("interval") Integer interval,
+            @Param("type") Integer type
+    );
+
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @RequestLine("GET /history/stat2?tagName={tagName}&startTs={startTs}&endTs={endTs}")
+    Map<String, TsDoubleData> getHistoryStat(
+            @Param("tagName") String tagName,
+            @Param("startTs") long startTs,
+            @Param("endTs") long endTs
+    );
+
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @RequestLine("GET /history/snap?tagName={tagName}&startTs={startTs}&endTs={endTs}&interval={interval}")
+    List<PointData> getSnapValuesByKey(
+            @Param("tagName") String tagName,
+            @Param("startTs") long startTs,
+            @Param("endTs") long endTs,
+            @Param("interval") int interval
+    );
+
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @RequestLine("GET /history/snap?tagName={tagName}&startTs={startTs}&endTs={endTs}&interval={interval}")
+    List<TsDoubleTsData> getHistorytsSnap(
+            @Param("tagName") String tagName,
+            @Param("startTs") long startTs,
+            @Param("endTs") long endTs,
+            @Param("interval") Integer interval
+    );
+}

generationXK-service/src/main/java/com/gyee/generation/config/feign/IDataAdapter.java

@@ -0,0 +1,33 @@
+package com.gyee.generation.config.feign;
+
+
+import com.gyee.common.model.PointData;
+import feign.Headers;
+import feign.Param;
+import feign.RequestLine;
+
+import java.util.List;
+
+/**
+ * DataAdapter数据请求
+ */
+public interface IDataAdapter {
+    /**
+     * 获取等间隔历史数据
+     *
+     * @param tagName  测点名称
+     * @param startTs  开始时间
+     * @param endTs    结束时间
+     * @param interval 数据间隔
+     * @return 历史数据
+     */
+    @RequestLine("GET /history/snap?tagName={tagName}&startTs={startTs}&endTs={endTs}&interval={interval}")
+    List<PointData> getSnapValuesByKey(@Param(value = "tagName") String tagName, @Param(value = "startTs") long startTs,
+                                       @Param(value = "endTs") long endTs, @Param(value = "interval") int interval);
+
+    @Headers({"Content-Type: application/json", "Accept: application/json"})
+    @RequestLine("GET /history/snap?tagName={tagName}&startTs={startTs}&endTs={endTs}&interval={interval}")
+    List<TsDoubleTsData> getHistorySnap(@Param(value = "tagName") String tagName, @Param(value = "startTs") long startTs,
+                                        @Param(value = "endTs") long endTs, @Param(value = "interval") Integer interval);
+}
+

generationXK-service/src/main/java/com/gyee/generation/config/feign/RemoteServiceBuilder.java

@@ -0,0 +1,51 @@
+package com.gyee.generation.config.feign;
+
+
+import feign.Feign;
+import feign.Request;
+import feign.Retryer;
+import feign.jackson.JacksonDecoder;
+import feign.jackson.JacksonEncoder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+
+@Slf4j
+@Component
+public class RemoteServiceBuilder {
+
+    @Resource
+    private GyeeConfig config;
+
+    @Bean
+    public IAdapterService adapterfd() {
+        return Feign.builder()
+                .encoder(new JacksonEncoder())
+                .decoder(new JacksonDecoder())
+                .options(new Request.Options(5000, 600000))
+                .retryer(new Retryer.Default(10000, 10000, 3))
+                .target(IAdapterService.class, config.getAdapterfdUrl());
+    }
+
+    public IAdapterService adaptergf() {
+        return Feign.builder()
+                .encoder(new JacksonEncoder())
+                .decoder(new JacksonDecoder())
+                .options(new Request.Options(5000, 600000))
+                .retryer(new Retryer.Default(10000, 10000, 3))
+                .target(IAdapterService.class, config.getAdaptergfUrl());
+    }
+
+
+    public IAdapterService taos() {
+        return Feign.builder()
+                .encoder(new JacksonEncoder())
+                .decoder(new JacksonDecoder())
+                .options(new Request.Options(5000, 600000))
+                .retryer(new Retryer.Default(10000, 10000, 3))
+                .target(IAdapterService.class, config.getTaosUrl());
+    }
+}

generationXK-service/src/main/java/com/gyee/generation/config/feign/TsDoubleData.java

@@ -0,0 +1,52 @@
+package com.gyee.generation.config.feign;
+
+// 数据适配器取数对应的类
+public class TsDoubleData {
+
+    private long ts;
+    private int status;
+    private double doubleValue;
+    private long longValue;
+
+    public long getLongValue() {
+        return longValue;
+    }
+
+    public void setLongValue(long longValue) {
+        this.longValue = longValue;
+    }
+
+    public TsDoubleData(long ts, double doubleValue) {
+        this.ts = ts;
+        this.doubleValue = doubleValue;
+    }
+
+    public TsDoubleData() {
+    }
+
+    public long getTs() {
+        return ts;
+    }
+
+    public void setTs(long ts) {
+        this.ts = ts;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public double getDoubleValue() {
+//        BigDecimal bg = new BigDecimal(doubleValue);
+//        double v = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+        return doubleValue;
+    }
+
+    public void setDoubleValue(double doubleValue) {
+        this.doubleValue = doubleValue;
+    }
+}

generationXK-service/src/main/java/com/gyee/generation/config/feign/TsDoubleTsData.java

@@ -0,0 +1,35 @@
+package com.gyee.generation.config.feign;
+
+/**
+ * 测点数据
+ */
+public class TsDoubleTsData {
+    /**
+     * 时间戳
+     */
+    private long ts;
+    /**
+     * 数据
+     */
+    private double doubleValue;
+
+    public long getTs() {
+        return ts;
+    }
+
+    public void setTs(long ts) {
+        this.ts = ts;
+    }
+
+    public double getValue() {
+        return doubleValue;
+    }
+
+    public double getDoubleValue() {
+        return doubleValue;
+    }
+
+    public void setDoubleValue(double doubleValue) {
+        this.doubleValue = doubleValue;
+    }
+}

generationXK-service/src/main/java/com/gyee/generation/config/speed/Desc.java

@@ -0,0 +1,22 @@
+package com.gyee.generation.config.speed;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * 配置通过注解
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Desc {
+
+    String des();
+
+    String uniformCode() default "";
+
+    String remark() default "";
+
+}

generationXK-service/src/main/java/com/gyee/generation/mapper/auto/TurbineInfoMinMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.TurbineInfoMin;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2024-12-16
+ */
+public interface TurbineInfoMinMapper extends BaseMapper<TurbineInfoMin> {
+
+}

generationXK-service/src/main/java/com/gyee/generation/model/auto/TurbineInfoMin.java

@@ -0,0 +1,48 @@
+package com.gyee.generation.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2024-12-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TurbineInfoMin extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private String stationId;
+
+    private String projectId;
+
+    private String lineId;
+
+    private String turbineId;
+
+    private LocalDateTime recordDate;
+
+    private double pjfs;
+
+    private double pjgl;
+
+    private double llgl;
+
+    private double kygl;
+
+    private double dqycgl;
+
+    private double cdqycgl;
+
+
+}

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

@@ -2,33 +2,30 @@ package com.gyee.generation.service;
 
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
+import com.gyee.generation.config.feign.RemoteServiceBuilder;
+import com.gyee.generation.config.feign.TsDoubleData;
 import com.gyee.generation.init.CacheContext;
-import com.gyee.generation.model.auto.ProBasicEquipment;
-import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
-import com.gyee.generation.model.auto.ProEconActivePowerData;
-import com.gyee.generation.model.auto.ProEconWtPowerCurveFitting;
+import com.gyee.generation.model.auto.*;
 import com.gyee.generation.model.vo.StatData;
 import com.gyee.generation.model.vo.WpType;
 import com.gyee.generation.service.auto.IProEconWtPowerCurveFittingService;
+import com.gyee.generation.service.auto.ITurbineInfoMinService;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.StringUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 public class CoefficientService {
 
-    //
-    //    private static final Logger logger = LoggerFactory.getLogger(CoefficientService.class);
     @Resource
-    private IEdosUtil edosUtil;
-    @Resource
-    private IProEconWtPowerCurveFittingService proEconWtPowerCurveFittingService;
-
+    private ITurbineInfoMinService turbineInfoMinService;
 
     public Map<String, Map<String, Double>> coefficient(String wtId, Date currentDate) throws Exception {
 
@@ -42,44 +39,32 @@ public class CoefficientService {
         Date monthbeginDate = c.getTime();
         c.set(Calendar.MONTH, 0);
         Date yearbeginDate = c.getTime();
-
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String beginDateString = sdf.format(beginDate);
+        String monthbeginDateString = sdf.format(monthbeginDate);
+        String yearbeginDateString = sdf.format(yearbeginDate);
 
         Date endDate = currentDate;
+        String endDateString = sdf.format(endDate);
 
         Map<String, Map<String, Double>> resultmap = new HashMap<>();
 
         ProBasicEquipment wt = CacheContext.wtmap.get(wtId);
 
-        //        //遍历所有风机ID
-        //        for (ProBasicEquipment wt : wtls) {
 
         //****************************************年功率一致性统计********************************************************************/
         List<ProEconActivePowerData> yearList;
 
         List<ProEconActivePowerData> queryYear = new ArrayList<>();
 
-        Map<String, ProBasicEquipmentPoint> wtpointmap = CacheContext.wtpAimap.get(wt.getId());
-        ProBasicEquipmentPoint fspoint = wtpointmap.get(ContantXk.CJ_SSFS);
-        List<PointData> fsls = edosUtil.getHistStat(fspoint.getNemCode(), yearbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L * 6, StatData.AVG.getValue());
-
-        ProBasicEquipmentPoint glpoint = wtpointmap.get(ContantXk.CJ_SSGL);
-        List<PointData> glls = edosUtil.getHistStat(glpoint.getNemCode(), yearbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L * 6, StatData.AVG.getValue());
-
-        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
-            for (int i = 0; i < fsls.size(); i++) {
-                PointData fspd = fsls.get(i);
-                PointData glpd = fsls.get(i);
-                ProEconActivePowerData po = new ProEconActivePowerData();
-                po.setWindturbineId(wt.getId());
-                po.setModelId(wt.getModelId());
-                po.setWindpowerstationId(wt.getWindpowerstationId());
-                po.setFrequency(fsls.size());
-                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
-                po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
-                queryYear.add(po);
-            }
-        }
-
+        ProEconActivePowerData po1 = new ProEconActivePowerData();
+        po1.setWindturbineId(wt.getId());
+        po1.setModelId(wt.getModelId());
+        po1.setWindpowerstationId(wt.getWindpowerstationId());
+        po1.setFrequency(1);
+        po1.setSpeed(StringUtils.round(1, 2));
+        po1.setPower(StringUtils.round(1, 2));
+        queryYear.add(po1);
 
         yearList = calCoefficient(queryYear, wt);
 
@@ -88,23 +73,34 @@ public class CoefficientService {
         List<ProEconActivePowerData> monthList;
         List<ProEconActivePowerData> queryMonth = new ArrayList<>();
 
-
-        fsls = edosUtil.getHistStat(fspoint.getNemCode(), monthbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L, StatData.AVG.getValue());
-        glls = edosUtil.getHistStat(glpoint.getNemCode(), monthbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L, StatData.AVG.getValue());
-
-        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
-            for (int i = 0; i < fsls.size(); i++) {
-                PointData fspd = fsls.get(i);
-                PointData glpd = fsls.get(i);
-                ProEconActivePowerData po = new ProEconActivePowerData();
-                po.setWindturbineId(wt.getId());
-                po.setModelId(wt.getModelId());
-                po.setWindpowerstationId(wt.getWindpowerstationId());
-                po.setFrequency(fsls.size());
-                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
-                po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
-                queryMonth.add(po);
-            }
+        List<TurbineInfoMin> infoMins = turbineInfoMinService.selectByTurbineId(wt.getId(), monthbeginDateString, beginDateString);
+        // 使用 Stream API 按小时分组并计算平均风速和累加pjgl
+        Map<String, List<TurbineInfoMin>> groupedByHour = infoMins.stream()
+                .collect(Collectors.groupingBy(info -> info.getRecordDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH"))));
+
+        // 计算每小时的平均pjfs和累加pjgl
+        for (Map.Entry<String, List<TurbineInfoMin>> entry : groupedByHour.entrySet()) {
+            String hour = entry.getKey();
+            List<TurbineInfoMin> hourData = entry.getValue();
+
+            // 计算每小时的平均风速 (pjfs) 和 累加pjgl
+            double avgPjfs = hourData.stream()
+                    .mapToDouble(TurbineInfoMin::getPjfs)  // 假设有getPjfs方法
+                    .average()
+                    .orElse(0);
+
+            double totalPjgl = hourData.stream()
+                    .mapToDouble(TurbineInfoMin::getPjgl)  // 假设有getPjgl方法
+                    .sum();
+
+            ProEconActivePowerData po = new ProEconActivePowerData();
+            po.setWindturbineId(wt.getId());
+            po.setModelId(wt.getModelId());
+            po.setWindpowerstationId(wt.getWindpowerstationId());
+            po.setFrequency(groupedByHour.size());
+            po.setSpeed(StringUtils.round(avgPjfs, 2));
+            po.setPower(StringUtils.round(totalPjgl, 2));
+            queryMonth.add(po);
         }
 
 
@@ -119,23 +115,34 @@ public class CoefficientService {
 
         List<ProEconActivePowerData> queryDay = new ArrayList<>();
 
-
-        fsls = edosUtil.getHistStat(fspoint.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
-        glls = edosUtil.getHistStat(glpoint.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
-
-        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
-            for (int i = 0; i < fsls.size(); i++) {
-                PointData fspd = fsls.get(i);
-                PointData glpd = fsls.get(i);
-                ProEconActivePowerData po = new ProEconActivePowerData();
-                po.setWindturbineId(wt.getId());
-                po.setModelId(wt.getModelId());
-                po.setWindpowerstationId(wt.getWindpowerstationId());
-                po.setFrequency(fsls.size());
-                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
-                po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
-                queryDay.add(po);
-            }
+        List<TurbineInfoMin> dayinfoMins = turbineInfoMinService.selectByTurbineId(wt.getId(), beginDateString, endDateString);
+        // 使用 Stream API 按小时分组并计算平均风速和累加pjgl
+        Map<String, List<TurbineInfoMin>> daygroupedByHour = dayinfoMins.stream()
+                .collect(Collectors.groupingBy(info -> info.getRecordDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH"))));
+
+        // 计算每小时的平均pjfs和累加pjgl
+        for (Map.Entry<String, List<TurbineInfoMin>> entry : daygroupedByHour.entrySet()) {
+            String hour = entry.getKey();
+            List<TurbineInfoMin> hourData = entry.getValue();
+
+            // 计算每小时的平均风速 (pjfs) 和 累加pjgl
+            double avgPjfs = hourData.stream()
+                    .mapToDouble(TurbineInfoMin::getPjfs)  // 假设有getPjfs方法
+                    .average()
+                    .orElse(0);
+
+            double totalPjgl = hourData.stream()
+                    .mapToDouble(TurbineInfoMin::getPjgl)  // 假设有getPjgl方法
+                    .sum();
+
+            ProEconActivePowerData po = new ProEconActivePowerData();
+            po.setWindturbineId(wt.getId());
+            po.setModelId(wt.getModelId());
+            po.setWindpowerstationId(wt.getWindpowerstationId());
+            po.setFrequency(groupedByHour.size());
+            po.setSpeed(StringUtils.round(avgPjfs, 2));
+            po.setPower(StringUtils.round(totalPjgl, 2));
+            queryDay.add(po);
         }
         dayList = calCoefficient(queryDay, wt);
 
@@ -150,9 +157,6 @@ public class CoefficientService {
         tempmap.put("day", resultDay);
         resultmap.put(wt.getId(), tempmap);
 
-        //        }
-
-
         return resultmap;
     }
 

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

@@ -0,0 +1,332 @@
+package com.gyee.generation.service;
+
+import com.gyee.common.contant.ContantXk;
+import com.gyee.common.model.PointData;
+import com.gyee.generation.config.feign.RemoteServiceBuilder;
+import com.gyee.generation.init.CacheContext;
+import com.gyee.generation.model.auto.*;
+import com.gyee.generation.model.vo.StatData;
+import com.gyee.generation.model.vo.WpType;
+import com.gyee.generation.service.auto.IProEconWtPowerCurveFittingService;
+import com.gyee.generation.service.auto.ITurbineInfoMinService;
+import com.gyee.generation.util.DateUtils;
+import com.gyee.generation.util.StringUtils;
+import com.gyee.generation.util.realtimesource.IEdosUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class CoefficientXgService {
+
+
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private ITurbineInfoMinService turbineInfoMinService;
+
+    public Map<String, Map<String, Double>> coefficient(String wtId, Date currentDate) throws Exception {
+        Date beginDate = DateUtils.addDays(currentDate, -1);
+
+
+        Calendar c = Calendar.getInstance();
+        c.setTime(beginDate);
+
+        c.set(Calendar.DAY_OF_MONTH, 1);
+        Date monthbeginDate = c.getTime();
+        c.set(Calendar.MONTH, 0);
+        Date yearbeginDate = c.getTime();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String beginDateString = sdf.format(beginDate);
+        String monthbeginDateString = sdf.format(monthbeginDate);
+        String yearbeginDateString = sdf.format(yearbeginDate);
+
+        Date endDate = currentDate;
+        String endDateString = sdf.format(endDate);
+
+        Map<String, Map<String, Double>> resultmap = new HashMap<>();
+
+        ProBasicEquipment wt = CacheContext.wtmap.get(wtId);
+
+        //        //遍历所有风机ID
+        //        for (ProBasicEquipment wt : wtls) {
+
+        //****************************************年功率一致性统计********************************************************************/
+        List<ProEconActivePowerData> yearList;
+
+        List<ProEconActivePowerData> queryYear = new ArrayList<>();
+
+        Map<String, ProBasicEquipmentPoint> wtpointmap = CacheContext.wtpAimap.get(wt.getId());
+        ProBasicEquipmentPoint fspoint = wtpointmap.get(ContantXk.CJ_SSFS);
+//        List<PointData> fsls = edosUtil.getHistStat(fspoint.getNemCode(), yearbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L * 6, StatData.AVG.getValue());
+//
+//        List<PointData> historyStats = remoteService.adapterfd().getHistoryStats(fspoint.getNemCode(), yearbeginDate.getTime(), endDate.getTime(), 21600, 4);
+        ProBasicEquipmentPoint glpoint = wtpointmap.get(ContantXk.CJ_SSGL);
+//        List<PointData> glls = edosUtil.getHistStat(glpoint.getNemCode(), yearbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L * 6, StatData.AVG.getValue());
+//
+//        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
+//            for (int i = 0; i < fsls.size(); i++) {
+//                PointData fspd = fsls.get(i);
+//                PointData glpd = fsls.get(i);
+        ProEconActivePowerData po1 = new ProEconActivePowerData();
+        po1.setWindturbineId(wt.getId());
+        po1.setModelId(wt.getModelId());
+        po1.setWindpowerstationId(wt.getWindpowerstationId());
+        po1.setFrequency(1);
+        po1.setSpeed(StringUtils.round(1, 2));
+        po1.setPower(StringUtils.round(1, 2));
+        queryYear.add(po1);
+//            }
+//        }
+
+
+        yearList = calCoefficient(queryYear, wt);
+
+        //****************************************月功率一致性统计********************************************************************/
+
+        List<ProEconActivePowerData> monthList;
+        List<ProEconActivePowerData> queryMonth = new ArrayList<>();
+
+        List<TurbineInfoMin> infoMins = turbineInfoMinService.selectByTurbineId(wt.getId(), monthbeginDateString, beginDateString);
+        // 使用 Stream API 按小时分组并计算平均风速和累加pjgl
+        Map<String, List<TurbineInfoMin>> groupedByHour = infoMins.stream()
+                .collect(Collectors.groupingBy(info -> info.getRecordDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH"))));
+
+        // 计算每小时的平均pjfs和累加pjgl
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        for (Map.Entry<String, List<TurbineInfoMin>> entry : groupedByHour.entrySet()) {
+            String hour = entry.getKey();
+            List<TurbineInfoMin> hourData = entry.getValue();
+
+            // 计算每小时的平均风速 (pjfs) 和 累加pjgl
+            double avgPjfs = hourData.stream()
+                    .mapToDouble(TurbineInfoMin::getPjfs)  // 假设有getPjfs方法
+                    .average()
+                    .orElse(0);
+
+            double totalPjgl = hourData.stream()
+                    .mapToDouble(TurbineInfoMin::getPjgl)  // 假设有getPjgl方法
+                    .sum();
+
+            // 将每小时的结果存入一个 Map
+            Map<String, Object> aggregates = new HashMap<>();
+            aggregates.put("avgPjfs", avgPjfs);
+            aggregates.put("totalPjgl", totalPjgl);
+
+            result.put(hour, aggregates);
+        }
+//        List<PointData>qfsls = edosUtil.getHistStat(fspoint.getNemCode(), monthbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L, StatData.AVG.getValue());
+////        List<PointData>glls = edosUtil.getHistStat(glpoint.getNemCode(), monthbeginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L, StatData.AVG.getValue());
+//        int i1 = 60 * 60;
+//        List<PointData> fsls = remoteService.adapterfd().getHistoryStats(fspoint.getNemCode(), monthbeginDate.getTime(), endDate.getTime(), i1, 4);
+//        List<PointData> glls = remoteService.adapterfd().getHistoryStats(glpoint.getNemCode(), monthbeginDate.getTime(), endDate.getTime(), i1, 4);
+        List<PointData> fsls = null;
+        List<PointData> glls = null;
+        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
+            for (int i = 0; i < fsls.size(); i++) {
+                PointData fspd = fsls.get(i);
+                PointData glpd = fsls.get(i);
+                ProEconActivePowerData po = new ProEconActivePowerData();
+                po.setWindturbineId(wt.getId());
+                po.setModelId(wt.getModelId());
+                po.setWindpowerstationId(wt.getWindpowerstationId());
+                po.setFrequency(fsls.size());
+                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
+                po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
+                queryMonth.add(po);
+            }
+        }
+
+
+        monthList = calCoefficient(queryMonth, wt);
+
+
+        //*****************************************日功率一致性统计********************************************************************/
+
+
+        List<ProEconActivePowerData> dayList;
+
+
+        List<ProEconActivePowerData> queryDay = new ArrayList<>();
+
+        List<TurbineInfoMin> dayinfoMins = turbineInfoMinService.selectByTurbineId(wt.getId(), beginDateString, endDateString);
+
+        fsls = edosUtil.getHistStat(fspoint.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
+        glls = edosUtil.getHistStat(glpoint.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
+
+        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
+            for (int i = 0; i < fsls.size(); i++) {
+                PointData fspd = fsls.get(i);
+                PointData glpd = fsls.get(i);
+                ProEconActivePowerData po = new ProEconActivePowerData();
+                po.setWindturbineId(wt.getId());
+                po.setModelId(wt.getModelId());
+                po.setWindpowerstationId(wt.getWindpowerstationId());
+                po.setFrequency(fsls.size());
+                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
+                po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
+                queryDay.add(po);
+            }
+        }
+        dayList = calCoefficient(queryDay, wt);
+
+
+        Double resultYear = coefficient(yearList, currentDate, wt.getId());
+        Double resultMonth = coefficient(monthList, currentDate, wt.getId());
+        Double resultDay = coefficient(dayList, currentDate, wt.getId());
+
+        Map<String, Double> tempmap = new HashMap<>();
+        tempmap.put("year", resultYear);
+        tempmap.put("month", resultMonth);
+        tempmap.put("day", resultDay);
+        resultmap.put(wt.getId(), tempmap);
+
+        //        }
+
+
+        return resultmap;
+    }
+
+
+    private List<ProEconActivePowerData> calCoefficient(List<ProEconActivePowerData> query, ProBasicEquipment wt) {
+
+
+        Map<Double, List<ProEconActivePowerData>> apdataYearMap = query.stream().collect(Collectors.groupingBy(ProEconActivePowerData::getSpeed));
+
+
+        Map<Double, Double> speedAndPowerYearMap = new HashMap<>();
+        apdataYearMap.forEach((key, value) -> {
+            DoubleSummaryStatistics summaryStatistics = value.stream().mapToDouble(ProEconActivePowerData::getPower).summaryStatistics();
+            speedAndPowerYearMap.put(key, summaryStatistics.getAverage());
+        });
+
+        List<ProEconActivePowerData> yearList = new ArrayList<>();
+
+
+        speedAndPowerYearMap.forEach((key, value) -> {
+
+            ProEconActivePowerData activepowerdata = new ProEconActivePowerData();
+            activepowerdata.setWindturbineId(wt.getId());
+            activepowerdata.setSpeed(key);
+            activepowerdata.setPower(value);
+            activepowerdata.setFrequency(1);
+            activepowerdata.setModelId(wt.getModelId());
+
+            yearList.add(activepowerdata);
+        });
+
+        return yearList;
+
+    }
+
+
+    //功率一致性系数
+    private Double coefficient(List<ProEconActivePowerData> dataList, Date currentDate, String windturbineId) {
+        double result = 0.0;
+        double count = 0.0;
+
+        if (dataList != null && dataList.size() != 0) {
+
+
+            Calendar c = Calendar.getInstance();
+            c.setTime(currentDate);
+
+            //            QueryWrapper<ProEconWtPowerCurveFitting> queryWrapper = new QueryWrapper<>();
+            //            queryWrapper.eq("windturbine_id",windturbineId);
+            //            powerList = proEconWtPowerCurveFittingService.list(queryWrapper);
+
+
+            Map<Double, ProEconWtPowerCurveFitting> curveFittingPowerMap = null;
+            if (CacheContext.curveFittingPowerMap.containsKey(windturbineId)) {
+                curveFittingPowerMap = CacheContext.curveFittingPowerMap.get(windturbineId);
+
+            }
+
+            for (ProEconActivePowerData data : dataList) {
+                Double p1 = data.getPower();
+                Double speed = data.getSpeed();
+                //                if (speed < 3 || speed > 25) {
+                //                    continue;
+                //                }
+
+                if (CacheContext.wtmap.containsKey(windturbineId)) {
+                    ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
+
+                    if (wt.getWindpowerstationId().contains(WpType.GDC.id)) {
+                        speed /= 100;
+                        speed = StringUtils.round(speed, 2);
+                        speed *= 100;
+
+                        speed = StringUtils.round(speed, 2);
+                    } else {
+                        speed = StringUtils.round(speed, 2);
+                    }
+                }
+
+
+                if (CacheContext.theoreticalPowerMap.containsKey(data.getModelId())) {
+                    if (CacheContext.theoreticalPowerMap.get(data.getModelId()).size() > 0) {
+                        if (CacheContext.theoreticalPowerMap.get(data.getModelId()).containsKey(speed)) {
+                            Double p = CacheContext.theoreticalPowerMap.get(data.getModelId()).get(speed).getEnsurePower();
+
+
+                            if (p != 0) {
+                                for (int i = 0; i < data.getFrequency(); i++) {
+                                    result += Math.abs((p - p1) / p);
+                                    count += 1;
+                                }
+                            }
+                        }
+                    } else {
+                        if (null != curveFittingPowerMap && curveFittingPowerMap.containsKey(speed)) {
+                            double optimalPower = curveFittingPowerMap.get(speed).getOptimalPower();
+
+                            if (optimalPower != 0) {
+                                for (int i = 0; i < data.getFrequency(); i++) {
+                                    result += Math.abs((optimalPower - p1) / optimalPower);
+                                    count += 1;
+                                }
+                            }
+
+                        } else {
+
+
+                            DoubleSummaryStatistics summaryStatistics = curveFittingPowerMap.entrySet()
+                                    .stream()
+                                    .collect(Collectors.summarizingDouble(Map.Entry::getKey));
+                            double max = summaryStatistics.getMax();
+                            if (speed > max) {
+
+                                double actualPower = curveFittingPowerMap.get(speed).getActualPower();
+
+                                if (actualPower != 0.0) {
+
+                                    for (int i = 0; i < data.getFrequency(); i++) {
+                                        result += Math.abs((actualPower - p1) / actualPower);
+                                        count += 1;
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                }
+
+            }
+            if (count != 0)
+                result = result / count * 100;
+            else
+                result = 100.0;
+        }
+
+        return result;
+
+    }
+}
+
+

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

@@ -3,6 +3,9 @@ package com.gyee.generation.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
+import com.gyee.generation.config.feign.RemoteServiceBuilder;
+import com.gyee.generation.config.feign.TsDoubleData;
+import com.gyee.generation.feign.AdapterApi;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.model.vo.StatusValue;
@@ -21,6 +24,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.net.URI;
 import java.util.*;
 import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
@@ -36,9 +40,8 @@ public class InputOrOutPutService {
     private IProEconInOrOutSpeedTotalService proEconInOrOutSpeedTotalService;
     @Resource
     private IProEconInputOrOutputSpeedService proEconInputOrOutputSpeedService;
-
     @Resource
-    private IAdapterService iAdapterService;
+    private RemoteServiceBuilder remoteService;
 
     @Resource
     private Executor executor;
@@ -47,7 +50,13 @@ public class InputOrOutPutService {
 
     private static Map<String, Double> statusRanngMap;
 
+    @Resource
+    private AdapterApi adapter;
+
 
+    public URI goldenUri() {
+        return URI.create("http://10.220.1.8:8011/ts");
+    }
     public void initialInputOrOutputSpeed() {
         statusRanngMap = new HashMap<>();
         List<ProBasicEquipment> wtls = new ArrayList<>();
@@ -66,7 +75,7 @@ public class InputOrOutPutService {
 
             Map<String, ProBasicEquipmentPoint> pointmap = CacheContext.wtpAimap.get(wt.getId());
 
-            ProBasicEquipmentPoint mxzt = pointmap.get(ContantXk.SBZT);
+            ProBasicEquipmentPoint mxzt = pointmap.get(ContantXk.MXZT);
             mxztls.add(mxzt.getNemCode());
             mxzts = String.join(",", mxztls);
             ProBasicEquipmentPoint ssfs = pointmap.get(ContantXk.CJ_SSFS);
@@ -74,18 +83,21 @@ public class InputOrOutPutService {
         }
 
         try {
-                        List<PointData> mxztvaluels = edosUtil.getRealData(mxztls);
+//                        List<PointData> mxztvaluels = edosUtil.getRealData(mxztls);
+            String ztpoints = String.join(",", mxztls);
+            Map<String, TsDoubleData> mxztvaluels = remoteService.adapterfd().getLatest(ztpoints);
+            List<TsDoubleData> mxztValueList = new ArrayList<>(mxztvaluels.values());
             //Map<String, PointInfo> mxztvaluelsMap = iAdapterService.getLatestData(mxzts);
             //List<PointInfo> mxztvaluels = null;
             //if (null != mxztvaluelsMap && mxztvaluelsMap.size() != 0) {
             //    mxztvaluels = (List<PointInfo>) mxztvaluelsMap.values();
             //}
-            if (null != mxztvaluels && mxztvaluels.size() == wtls.size()) {
+            if (null != mxztValueList && mxztValueList.size() == wtls.size()) {
                 for (int i = 0; i < wtls.size(); i++) {
 
                     ProBasicEquipment wt = wtls.get(i);
                     //                    statusRanngMap.put(wt.getId(), mxztvaluels.get(i).getPointValueInDouble());
-                    statusRanngMap.put(wt.getId(), (Double) mxztvaluels.get(i).getPointValueInDouble());
+                    statusRanngMap.put(wt.getId(), (Double) mxztValueList.get(i).getDoubleValue());
                 }
             }
 
@@ -142,26 +154,33 @@ public class InputOrOutPutService {
 
             Map<String, ProBasicEquipmentPoint> pointmap = CacheContext.wtpAimap.get(wt.getId());
 
-            ProBasicEquipmentPoint mxzt = pointmap.get(ContantXk.SBZT);
+            ProBasicEquipmentPoint mxzt = pointmap.get(ContantXk.MXZT);
             mxztls.add(mxzt.getNemCode());
             ProBasicEquipmentPoint ssfs = pointmap.get(ContantXk.CJ_SSFS);
             ssfsls.add(ssfs.getNemCode());
         }
 
+        String ztpoints = String.join(",", mxztls);
+        String fspoints = String.join(",", ssfsls);
+        Map<String, TsDoubleData> mxztvaluels = remoteService.adapterfd().getLatest(ztpoints);
+        Map<String, TsDoubleData> ssfsvaluels = remoteService.adapterfd().getLatest(fspoints);
+        // 将 Map 的值转换为 List
+        List<TsDoubleData> mxztValueList = new ArrayList<>(mxztvaluels.values());
+        List<TsDoubleData> ssfsValueList = new ArrayList<>(ssfsvaluels.values());
 
-        List<PointData> mxztvaluels = edosUtil.getRealData(mxztls);
-        List<PointData> ssfsvaluels = edosUtil.getRealData(ssfsls);
+//        List<PointData> mxztvaluels = edosUtil.getRealData(mxztls);
+//        List<PointData> ssfsvaluels = edosUtil.getRealData(ssfsls);
 
-        if (ssfsvaluels.size() == mxztvaluels.size() && ssfsvaluels.size() == wtls.size()) {
+        if (ssfsValueList.size() == mxztValueList.size() && ssfsValueList.size() == wtls.size()) {
             for (int i = 0; i < wtls.size(); i++) {
 
 
                 ProBasicEquipment wt = wtls.get(i);
-                double status = StringUtils.round(mxztvaluels.get(i).getPointValueInDouble(), 0);
+                double status = StringUtils.round(mxztValueList.get(i).getDoubleValue(), 0);
                 if (null != statusRanngMap) {
                     double lastStatus = StringUtils.round(statusRanngMap.get(wt.getId()), 0);
 
-                    PointData ssfspo = ssfsvaluels.get(i);
+                    TsDoubleData ssfspo = ssfsValueList.get(i);
                     //     切入切出风速
                     if (lastStatus == StatusValue.DJ.getCode() && status == StatusValue.YX.getCode()) {
                         ProEconInputOrOutputSpeed input = new ProEconInputOrOutputSpeed();
@@ -174,7 +193,7 @@ public class InputOrOutPutService {
                         input.setInputOrOutput(1);
 
 
-                        input.setSpeed(StringUtils.round(ssfspo.getPointValueInDouble(), 2));
+                        input.setSpeed(StringUtils.round(ssfspo.getDoubleValue(), 2));
 
 
                         //                    if(statusMap.containsKey(wt.getId()))
@@ -200,7 +219,7 @@ public class InputOrOutPutService {
                         input.setRecordDate(DateUtils.truncate(new Date()));
                         input.setInputOrOutput(0);
 
-                        input.setSpeed(StringUtils.round(ssfspo.getPointValueInDouble(), 2));
+                        input.setSpeed(StringUtils.round(ssfspo.getDoubleValue(), 2));
 
                         //                    if(statusMap.containsKey(wt.getId()))
                         //                    {

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

@@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
+import com.gyee.generation.config.feign.RemoteServiceBuilder;
+import com.gyee.generation.config.feign.TsDoubleData;
+import com.gyee.generation.feign.AdapterApi;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.model.vo.*;
@@ -20,6 +23,8 @@ import org.springframework.beans.factory.annotation.Value;
 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;
 
@@ -30,6 +35,15 @@ public class PowerCurveFittingByTimeService {
     @Resource
     private IEdosUtil edosUtil;
 
+    @Resource
+    private RemoteServiceBuilder remoteService;
+
+    @Resource
+    private AdapterApi  adapterApi;
+    public URI goldenUri() {
+        return URI.create("http://10.220.1.8:8011/ts");
+    }
+
     @Value("${curvefitting.dimension}")
     private Integer dimension;
     @Value("${curvefitting.scale}")
@@ -335,6 +349,13 @@ public class PowerCurveFittingByTimeService {
         //        proEconCurveFittingMainService.saveBatch(mainls);
     }
 
+    /**
+     * 月曲线偏差
+     * @param recordDate
+     * @param type
+     * @param wpId
+     * @throws Exception
+     */
     public void cureFittingMonth(Date recordDate, String type, String wpId) throws Exception {
         //日期变为下一天
         Date end = DateUtils.addDays(DateUtils.truncate(recordDate), 1);
@@ -399,11 +420,11 @@ public class PowerCurveFittingByTimeService {
             String pointIdFS;
             if (wt.getWindpowerstationId().contains(WpType.GDC.id)) {   //测风塔70米风速
 
-                if (windturbinetestingpointnewMap.containsKey(ContantXk.FCCFTFS70)) {
-                    ProBasicEquipmentPoint point = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS70);
+                if (windturbinetestingpointnewMap.containsKey(ContantXk.FCCFTFS90)) {
+                    ProBasicEquipmentPoint point = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS90);
 
                     if (StringUtils.notEmp(point.getNemCode()) && !point.getNemCode().equals(initialcode)) {
-                        pointIdFS = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS70).getNemCode();
+                        pointIdFS = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS90).getNemCode();
                     } else {
                         pointIdFS = windturbinetestingpointnewMap.get(ContantXk.CJ_SSFS).getNemCode();
                     }
@@ -573,7 +594,7 @@ public class PowerCurveFittingByTimeService {
             cfmmonth.setStandardDeviationRate(DeviationRateUtil.calculateDeviationRate(windMap.get(key).getYsjglPoints(), monthStandardPoints, modelpower));
 
             mainls.add(cfmmonth);
-            // proEconCurveFittMonthMainService.save(cfmmonth);
+//             proEconCurveFittMonthMainService.save(cfmmonth);
 
             //*********************************************当月曲线偏差记录**********************************************************/
             List<ProEconCurveFittMonthSub> subls = new ArrayList<>();
@@ -602,7 +623,7 @@ public class PowerCurveFittingByTimeService {
             if (!templs.isEmpty()) {
                 proEconCurveFittMonthSubService.saveBatch(templs);
             }
-            //            proEconCurveFittMonthSubService.saveBatch(subls);
+//                        proEconCurveFittMonthSubService.saveBatch(subls);
             insertPoints(stringyear, stringmonth, windMap.get(key).getYsjglPoints(), windMap.get(key).getYzyglPoints(), key);
 
             if (type.equals("1")) {
@@ -610,7 +631,7 @@ public class PowerCurveFittingByTimeService {
             }
 
             logger.info(key + "月曲线偏差率完成！");
-            //            logger.info(String.format("{1}:更新sqlserver数据库记录数：{0}", z, new Date()));
+//                        logger.info(String.format("{1}:更新sqlserver数据库记录数：{0}", z, new Date()));
 
 
         }
@@ -627,7 +648,7 @@ public class PowerCurveFittingByTimeService {
         if (!templs.isEmpty()) {
             proEconCurveFittMonthMainService.saveBatch(templs);
         }
-        //        proEconCurveFittMonthMainService.saveBatch(mainls);
+//                proEconCurveFittMonthMainService.saveBatch(mainls);
 
         logger.info("曲线保存完成！");
     }
@@ -694,11 +715,11 @@ public class PowerCurveFittingByTimeService {
             String pointIdFS;
             if (wt.getWindpowerstationId().contains(WpType.GDC.id)) {   //测风塔70米风速
 
-                if (windturbinetestingpointnewMap.containsKey(ContantXk.FCCFTFS70)) {
-                    ProBasicEquipmentPoint point = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS70);
+                if (windturbinetestingpointnewMap.containsKey(ContantXk.FCCFTFS90)) {
+                    ProBasicEquipmentPoint point = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS90);
 
                     if (StringUtils.notEmp(point.getNemCode()) && !point.getNemCode().equals(initialcode)) {
-                        pointIdFS = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS70).getNemCode();
+                        pointIdFS = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS90).getNemCode();
                     } else {
                         pointIdFS = windturbinetestingpointnewMap.get(ContantXk.CJ_SSFS).getNemCode();
                     }
@@ -1673,7 +1694,7 @@ public class PowerCurveFittingByTimeService {
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
         Map<String, ProBasicEquipmentPoint> wtpointmap = wtpAimap.get(windturbineId);
-        String qfzt = wtpointmap.get(ContantXk.LSQFZT).getNemCode();
+        String qfzt = wtpointmap.get(ContantXk.SSQFZT).getNemCode();
 
         if (end.after(begin)) {
             if (StringUtils.notEmp(pointIdGL) && StringUtils.notEmp(pointIdFS)) {
@@ -1682,6 +1703,44 @@ public class PowerCurveFittingByTimeService {
                 List<PointData> ztpointstemp = edosUtil.getHistoryDatasSnap(pointIdZT, begin.getTime() / 1000, end.getTime() / 1000, null, 60 * 10L);
                 List<PointData> qfzttemp = edosUtil.getHistoryDatasSnap(qfzt, begin.getTime() / 1000, end.getTime() / 1000, null, 60 * 10L);
 
+                Integer interval = 60 * 10;
+//                List<TsDoubleData> aglpointstemp = remoteService.adapterfd().getHistorySnap(pointIdGL, begin.getTime(), end.getTime(), interval);
+//                List<TsDoubleData> fspointstemp = remoteService.adapterfd().getHistorySnap(pointIdFS, begin.getTime(), end.getTime(), interval);
+//                List<TsDoubleData> aztpointstemp = remoteService.adapterfd().getHistorySnap(pointIdZT, begin.getTime(), end.getTime(), interval);
+//                List<TsDoubleData> qfzttemp = remoteService.adapterfd().getHistorySnap(qfzt, begin.getTime(), end.getTime(), interval);
+                fspointstemp.sort(Comparator.comparingLong(PointData::getPointTime));
+                glpointstemp.sort(Comparator.comparingLong(PointData::getPointTime));
+                // 删除最后一条数据
+                if (!fspointstemp.isEmpty()) {
+                    fspointstemp.remove(fspointstemp.size() - 1);  // 删除最后一条数据
+                }
+                // 删除最后一条数据
+                if (!glpointstemp.isEmpty()) {
+                    glpointstemp.remove(glpointstemp.size() - 1);  // 删除最后一条数据
+                }
+//                // 创建一个新的 List 来存储格式化后的时间字符串
+//                List<String> formattedTimes = new ArrayList<>();
+//                List<String> formattedTimes1 = new ArrayList<>();
+//
+//                // 遍历列表并转换时间戳
+//                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                 sdf.setTimeZone(TimeZone.getDefault());
+//
+//                for (PointData pointData : ztpointstemp) {
+//                    // 格式化时间戳
+//                    String formattedTime = sdf.format(new Date(pointData.getPointTime()));
+//
+//                    // 将格式化后的时间添加到新的 List 中
+//                    formattedTimes.add(formattedTime);
+//                }
+//
+//                for (PointData pointData : fspointstemp) {
+//                    // 格式化时间戳
+//                    String formattedTime1 = sdf.format(new Date(pointData.getPointTime()));
+//
+//                    // 将格式化后的时间添加到新的 List 中
+//                    formattedTimes1.add(formattedTime1);
+//                }
 
                 List<PointData> glpoints = new ArrayList<>();
                 List<PointData> fspoints = new ArrayList<>();

generationXK-service/src/main/java/com/gyee/generation/service/auto/ITurbineInfoMinService.java

@@ -0,0 +1,19 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.TurbineInfoMin;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2024-12-16
+ */
+public interface ITurbineInfoMinService extends IService<TurbineInfoMin> {
+
+    List<TurbineInfoMin> selectByTurbineId(String turbineId , String kssj, String jssj);
+}

generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/TurbineInfoMinServiceImpl.java

@@ -0,0 +1,41 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.generation.model.auto.TurbineInfoMin;
+import com.gyee.generation.mapper.auto.TurbineInfoMinMapper;
+import com.gyee.generation.service.auto.ITurbineInfoMinService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2024-12-16
+ */
+@Service
+public class TurbineInfoMinServiceImpl extends ServiceImpl<TurbineInfoMinMapper, TurbineInfoMin> implements ITurbineInfoMinService {
+
+    @Override
+    public List<TurbineInfoMin> selectByTurbineId(String turbineId, String kssj, String jssj) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime startDate = LocalDateTime.parse(kssj, formatter);
+        LocalDateTime endDate = LocalDateTime.parse(jssj, formatter);
+
+        QueryWrapper<TurbineInfoMin> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().ge(TurbineInfoMin::getRecordDate, startDate)
+                .le(TurbineInfoMin::getRecordDate, endDate);
+
+        // 获取数据
+        List<TurbineInfoMin> infoMins = baseMapper.selectList(queryWrapper);
+        return infoMins;
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.gyee.generation.task;
+
+import com.gyee.generation.service.PowerCurveFittingByTimeService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@Component
+public class AnalysisTask {
+    @Resource
+    private PowerCurveFittingByTimeService powerCurveFittingByTimeService;
+
+    //每日0点02-月曲线偏差
+    @Scheduled(cron = "0 02 0 * * ?")
+    public void yqxpc() throws Exception {
+        Date date=new Date();
+        powerCurveFittingByTimeService.cureFittingDay(date, "NX_FGS_HA_FDC_STA");
+        powerCurveFittingByTimeService.cureFittingMonth(date,"0",null);
+        powerCurveFittingByTimeService.cureFittingYear(date, "NX_FGS_HA_FDC_STA");
+        System.out.println("月曲线偏差运行完成");
+    }
+}

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

@@ -591,9 +591,9 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 
 
         Map<String, ProBasicEquipmentPoint> aimap = wtpAimap.get(wt.getId());
-        if (aimap.containsKey(ContantXk.SBZT)) {
+        if (aimap.containsKey(ContantXk.MXZT)) {
 
-            ProBasicEquipmentPoint point = aimap.get(ContantXk.SBZT);
+            ProBasicEquipmentPoint point = aimap.get(ContantXk.MXZT);
             //按照分钟时间进行统计状态快照值
             List<PointData> pointls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
             if (!pointls.isEmpty()) {

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

@@ -569,9 +569,9 @@ public class EquipmentInfo3ThreadPool implements Callable<String>, Serializable
 
 
         Map<String, ProBasicEquipmentPoint> aimap = wtpAimap.get(wt.getId());
-        if (aimap.containsKey(ContantXk.SBZT)) {
+        if (aimap.containsKey(ContantXk.MXZT)) {
 
-            ProBasicEquipmentPoint point = aimap.get(ContantXk.SBZT);
+            ProBasicEquipmentPoint point = aimap.get(ContantXk.MXZT);
             //按照分钟时间进行统计状态快照值
             List<PointData> pointls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
             if (!pointls.isEmpty()) {

generationXK-service/src/test/java/com/gyee/generation/GenerationTest.java

@@ -1,16 +1,19 @@
 package com.gyee.generation;
 
-import com.gyee.generation.service.AnalysisNewService;
-import com.gyee.generation.service.PVSystemEfficiencyCalculator;
+import com.gyee.generation.service.*;
 import com.gyee.generation.service.StationPower.StationPowerService;
 import com.gyee.generation.service.initalcache.CacheService;
 import com.gyee.generation.service.realtimelibrary.*;
+import com.xxl.job.core.context.XxlJobHelper;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
+import java.util.Date;
 
 /**
  * @ClassName : GenerationTest
@@ -19,7 +22,8 @@ import javax.annotation.Resource;
  * @Description :
  */
 @SpringBootTest
-@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
+@RunWith(SpringRunner.class)
+@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 public class GenerationTest {
     @Resource
     private CacheService cacheService;
@@ -50,6 +54,19 @@ public class GenerationTest {
     @Resource
     private AnalysisNewService analysisNewService;
 
+    @Resource
+    private PowerCurveFittingByTimeService powerCurveFittingByTimeService;
+    @Resource
+    private InputOrOutPutService inputOrOutPutService;
+    @Resource
+    private WindturbineGoodnessService windturbineGoodnessService;
+    @Resource
+    private EquipmentInfo3Service equipmentInfo3Service;
+    @Resource
+    private EquipmentInfo2Service equipmentInfo2Service;
+    @Resource
+    private EquipmentInfo4Service equipmentInfo4Service;
+
     @Test
     public void test1() throws Exception {
         cacheService.initRedisCache();
@@ -105,11 +122,35 @@ public class GenerationTest {
         //        stationPowerService.predictedPower();
 
 
-        calculator.planvalue();
+//        calculator.planvalue();
+//
+//        analysisNewService.companys();
+//        analysisNewService.saveWindProject();
+        Date date=new Date();
+//
+//        XxlJobHelper.log("切入切出状态切换记录调度程序执行开始!........");
+        inputOrOutPutService.inputOrOutputSpeed(new Date());
+//        XxlJobHelper.log("切入切出状态切换记录调度任务处理完成!........");
+
+//        XxlJobHelper.log("功率一致性系数和拟合优度统计调度程序执行开始!........");
+//        windturbineGoodnessService.calWindturbineGoodness(new Date());
+//        XxlJobHelper.log("功率一致性系数和拟合优度统计调度任务处理完成!........");
+
+        XxlJobHelper.log("设备指标2调度程序执行开始!........");
+//        equipmentInfo2Service.calEquipmentInfoDay(date);
+        XxlJobHelper.log("设备指标2调度程序执行完成!........");
+
+        XxlJobHelper.log("设备指标3调度程序执行开始!........");
+//        equipmentInfo3Service.calEquipmentInfoDay(date);
+        XxlJobHelper.log("设备指标3调度程序执行完成!........");
 
-        analysisNewService.companys();
-        analysisNewService.saveWindProject();
+        XxlJobHelper.log("设备指标4调度程序执行开始!........");
+//        equipmentInfo4Service.calEquipmentInfoDay(date);
+        XxlJobHelper.log("设备指标4调度程序执行完成!........");
 
+//        powerCurveFittingByTimeService.cureFittingDay(date, "NX_FGS_HA_FDC_STA");
+//        powerCurveFittingByTimeService.cureFittingMonth(date,"0",null);
+//        powerCurveFittingByTimeService.cureFittingYear(date, "NX_FGS_HA_FDC_STA");
 
     }
 }