Merge remote-tracking branch 'origin/master'

realtime/generationXK-service/src/main/java/com/gyee/generation/GenerationMain.java

@@ -1,11 +1,14 @@
 package com.gyee.generation;
 
+import com.gyee.generation.service.ProEconStaOriginalService;
 import com.gyee.generation.service.initialpoint.InitialPointGoldenXkByEqEdosService;
 import com.gyee.generation.util.SpringUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import java.util.Date;
+
 /**
  * @ClassName : GenerationMain
  * @Author : xieshengjie
@@ -24,7 +27,17 @@ public class GenerationMain {
 //        cacheService.initRedisCache();
 //
 //
-        InitialPointGoldenXkByEqEdosService initialPointGoldenXkByEqEdosService= SpringUtils.getBean("initialPointGoldenXkByEqEdosService");
+
+//        ProEconStaOriginalService proEconStaOriginalService= SpringUtils.getBean("proEconStaOriginalService");
+//        System.out.println("开始生成风机报表指标统计。。。。。。");
+//        proEconStaOriginalService.calEquipmentInfoDay(new Date());
+//        System.out.println("结束生成风机报表指标统计。。。。。。");
+
+//        ProEconStaOriginalService proEconStaOriginalService= SpringUtils.getBean("proEconStaOriginalService");
+//         System.out.println("开始生成场站报表指标统计。。。。。。");
+//         proEconStaOriginalService.calEquipmentInfoDay(new Date());
+//         System.out.println("结束生成场站报表指标统计。。。。。。");
+//        InitialPointGoldenXkByEqEdosService initialPointGoldenXkByEqEdosService= SpringUtils.getBean("initialPointGoldenXkByEqEdosService");
 //
 //
 //

realtime/generationXK-service/src/main/java/com/gyee/generation/config/XxlJobConfig.java

@@ -1,70 +1,70 @@
-package com.gyee.generation.config;
-
-
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-
-/**
- * xxl-job config
- *
- * @author xuxueli 2017-04-28
- */
-
-
-@Configuration
-@PropertySource("classpath:xxl-job-executor.properties")
-//@PropertySource("classpath:xxl-job-executorWPXNY.properties")
-//@PropertySource("classpath:xxl-job-executorRG.properties")
-public class XxlJobConfig implements EnvironmentAware {
-    private Environment env;
-
-
-    @Override
-    public void setEnvironment(Environment environment) {
-        this.env=environment;
-    }
-
-    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
-
-
-
-    @Bean
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        logger.info(">>>>>>>>>>> xxl-job config init.");
-        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-        xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
-        xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
-        xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
-        xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
-        xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
-        xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));
-        xxlJobSpringExecutor.setLogPath(env.getProperty("xxl.job.executor.logpath"));
-        xxlJobSpringExecutor.setLogRetentionDays(Integer.parseInt(env.getProperty("xxl.job.executor.logretentiondays")));
-        return xxlJobSpringExecutor;
-    }
-
-    /**
-     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
-     *
-     *      1、引入依赖：
-     *          <dependency>
-     *             <groupId>org.springframework.cloud</groupId>
-     *             <artifactId>spring-cloud-commons</artifactId>
-     *             <version>${version}</version>
-     *         </dependency>
-     *
-     *      2、配置文件，或者容器启动变量
-     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
-     *
-     *      3、获取IP
-     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
-     */
-
-
-}
+//package com.gyee.generation.config;
+//
+//
+//import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.context.EnvironmentAware;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.PropertySource;
+//import org.springframework.core.env.Environment;
+//
+///**
+// * xxl-job config
+// *
+// * @author xuxueli 2017-04-28
+// */
+//
+//
+//@Configuration
+//@PropertySource("classpath:xxl-job-executor.properties")
+////@PropertySource("classpath:xxl-job-executorWPXNY.properties")
+////@PropertySource("classpath:xxl-job-executorRG.properties")
+//public class XxlJobConfig implements EnvironmentAware {
+//    private Environment env;
+//
+//
+//    @Override
+//    public void setEnvironment(Environment environment) {
+//        this.env=environment;
+//    }
+//
+//    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+//
+//
+//
+//    @Bean
+//    public XxlJobSpringExecutor xxlJobExecutor() {
+//        logger.info(">>>>>>>>>>> xxl-job config init.");
+//        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+//        xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
+//        xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
+//        xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
+//        xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
+//        xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
+//        xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));
+//        xxlJobSpringExecutor.setLogPath(env.getProperty("xxl.job.executor.logpath"));
+//        xxlJobSpringExecutor.setLogRetentionDays(Integer.parseInt(env.getProperty("xxl.job.executor.logretentiondays")));
+//        return xxlJobSpringExecutor;
+//    }
+//
+//    /**
+//     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+//     *
+//     *      1、引入依赖：
+//     *          <dependency>
+//     *             <groupId>org.springframework.cloud</groupId>
+//     *             <artifactId>spring-cloud-commons</artifactId>
+//     *             <version>${version}</version>
+//     *         </dependency>
+//     *
+//     *      2、配置文件，或者容器启动变量
+//     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+//     *
+//     *      3、获取IP
+//     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+//     */
+//
+//
+//}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconEqOriginalDayController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-eq-original-day")
+public class ProEconEqOriginalDayController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconEqOriginalIndexController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-eq-original-index")
+public class ProEconEqOriginalIndexController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconEqOriginalMonthController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-eq-original-month")
+public class ProEconEqOriginalMonthController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconEqOriginalYearController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-eq-original-year")
+public class ProEconEqOriginalYearController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconEqTargetController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-eq-target")
+public class ProEconEqTargetController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconStaOriginalDayController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-sta-original-day")
+public class ProEconStaOriginalDayController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconStaOriginalIndexController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-sta-original-index")
+public class ProEconStaOriginalIndexController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconStaOriginalMonthController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-sta-original-month")
+public class ProEconStaOriginalMonthController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconStaOriginalYearController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-sta-original-year")
+public class ProEconStaOriginalYearController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconStaTargetController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-sta-target")
+public class ProEconStaTargetController {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProEconTableBottomStatisticController.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@RestController
+@RequestMapping("//pro-econ-table-bottom-statistic")
+public class ProEconTableBottomStatisticController {
+
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,555 @@
+package com.gyee.generation.model.auto;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconEqOriginalDay extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 设备编号
+     */
+    private String windturbineId;
+
+    /**
+     * 设备名称
+     */
+    private String windturbineName;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 统计阶段
+     */
+    private String types;
+
+    /**
+     * SCADA发电量（千瓦时）
+     */
+    private Double target01;
+
+    /**
+     * 试运行SCADA发电量（千瓦时）
+     */
+    private Double target02;
+
+    /**
+     * 日最大风速
+     */
+    private Double target03;
+
+    /**
+     * 日最小风速
+     */
+    private Double target04;
+
+    /**
+     * 日最大功率
+     */
+    private Double target05;
+
+    /**
+     * 日最小功率
+     */
+    private Double target06;
+
+    /**
+     * 日平均功率
+     */
+    private Double target07;
+
+    /**
+     * 日平均风速
+     */
+    private Double target08;
+
+    /**
+     * 日设计理论发电量（千瓦时）
+     */
+    private Double target09;
+
+    /**
+     * 日实际理论发电量（千瓦时）
+     */
+    private Double target10;
+
+    /**
+     * 日智慧风电理论发电量（千瓦时）
+     */
+    private Double target11;
+
+    /**
+     * 风能利用率
+     */
+    private Double target12;
+
+    /**
+     * 损失电量（千瓦时）
+     */
+    private Double target13;
+
+    /**
+     * 故障损失时长（小时）
+     */
+    private Double target14;
+
+    /**
+     * 故障次数
+     */
+    private Double target15;
+
+    /**
+     * 故障损失电量
+     */
+    private Double target16;
+
+    /**
+     * 故障损失率
+     */
+    private Double target17;
+
+    /**
+     * 检修损失时长（小时）
+     */
+    private Double target18;
+
+    /**
+     * 检修次数
+     */
+    private Double target19;
+
+    /**
+     * 检修损失电量
+     */
+    private Double target20;
+
+    /**
+     * 检修损失率
+     */
+    private Double target21;
+
+    /**
+     * 性能损失时长（小时）
+     */
+    private Double target22;
+
+    /**
+     * 性能损失次数
+     */
+    private Double target23;
+
+    /**
+     * 性能损失电量
+     */
+    private Double target24;
+
+    /**
+     * 性能损失率
+     */
+    private Double target25;
+
+    /**
+     * 限电时长（小时）
+     */
+    private Double target26;
+
+    /**
+     * 限电次数
+     */
+    private Double target27;
+
+    /**
+     * 限电损失电量
+     */
+    private Double target28;
+
+    /**
+     * 限电损失率
+     */
+    private Double target29;
+
+    /**
+     * 弃风率
+     */
+    private Double target30;
+
+    /**
+     * 弃发比
+     */
+    private Double target31;
+
+    /**
+     * 受累损失时长（小时）
+     */
+    private Double target32;
+
+    /**
+     * 受累次数
+     */
+    private Double target33;
+
+    /**
+     * 受累损失电量
+     */
+    private Double target34;
+
+    /**
+     * 受累损失率
+     */
+    private Double target35;
+
+    /**
+     * 统计小时
+     */
+    private Double target36;
+
+    /**
+     * 切入次数
+     */
+    private Double target37;
+
+    /**
+     * 切出次数
+     */
+    private Double target38;
+
+    /**
+     * 平均切入风速
+     */
+    private Double target39;
+
+    /**
+     * 平均切出风速
+     */
+    private Double target40;
+
+    /**
+     * 最大切出风速
+     */
+    private Double target41;
+
+    /**
+     * 最小切入风速
+     */
+    private Double target42;
+
+    /**
+     * 额定功率
+     */
+    private Double target43;
+
+    /**
+     * 额定风速
+     */
+    private Double target44;
+
+    /**
+     * 设备利用小时
+     */
+    private Double target45;
+
+    /**
+     * 30分钟内故障消除次数
+     */
+    private Double target46;
+
+    /**
+     * 6小时内故障消除次数
+     */
+    private Double target47;
+
+    /**
+     * 12小时内故障消除次数
+     */
+    private Double target48;
+
+    /**
+     * 24小时内故障消除次数
+     */
+    private Double target49;
+
+    /**
+     * 72小时内故障消除次数
+     */
+    private Double target50;
+
+    /**
+     * 168小时内故障消除次数
+     */
+    private Double target51;
+
+    /**
+     * 168小时外故障消除次数
+     */
+    private Double target52;
+
+    /**
+     * 故障消缺总次数
+     */
+    private Double target53;
+
+    /**
+     * 日等效可利用系数
+     */
+    private Double target54;
+
+    /**
+     * 日设备可利用率
+     */
+    private Double target55;
+
+    /**
+     * 日负荷率
+     */
+    private Double target56;
+
+    /**
+     * 日功率一致性系数
+     */
+    private Double target57;
+
+    /**
+     * 日拟合优度
+     */
+    private Double target58;
+
+    /**
+     * 日曲线偏差率
+     */
+    private Double target59;
+
+    /**
+     * 故障消缺及时率
+     */
+    private Double target60;
+
+    /**
+     * 状态转换及时率
+     */
+    private Double target61;
+
+    /**
+     * 复位及时率
+     */
+    private Double target62;
+
+    /**
+     * 日MTBF
+     */
+    private Double target63;
+
+    /**
+     * 日MTTR
+     */
+    private Double target64;
+
+    /**
+     * 日MTTF
+     */
+    private Double target65;
+
+    /**
+     * 备用1
+     */
+    private Double target66;
+
+    /**
+     * 备用2
+     */
+    private Double target67;
+
+    /**
+     * 备用3
+     */
+    private Double target68;
+
+    /**
+     * 备用4
+     */
+    private Double target69;
+
+    /**
+     * 备用5
+     */
+    private Double target70;
+
+    /**
+     * 备用6
+     */
+    private Double target71;
+
+    /**
+     * 备用7
+     */
+    private Double target72;
+
+    /**
+     * 备用8
+     */
+    private Double target73;
+
+    /**
+     * 备用9
+     */
+    private Double target74;
+
+    /**
+     * 备用10
+     */
+    private Double target75;
+
+    /**
+     * 备用11
+     */
+    private Double target76;
+
+    /**
+     * 备用12
+     */
+    private Double target77;
+
+    /**
+     * 备用13
+     */
+    private Double target78;
+
+    /**
+     * 备用14
+     */
+    private Double target79;
+
+    /**
+     * 备用15
+     */
+    private Double target80;
+
+    /**
+     * 备用16
+     */
+    private Double target81;
+
+    /**
+     * 备用17
+     */
+    private Double target82;
+
+    /**
+     * 备用18
+     */
+    private Double target83;
+
+    /**
+     * 备用19
+     */
+    private Double target84;
+
+    /**
+     * 备用20
+     */
+    private Double target85;
+
+    /**
+     * 备用21
+     */
+    private Double target86;
+
+    /**
+     * 备用22
+     */
+    private Double target87;
+
+    /**
+     * 备用23
+     */
+    private Double target88;
+
+    /**
+     * 备用24
+     */
+    private Double target89;
+
+    /**
+     * 备用25
+     */
+    private Double target90;
+
+    /**
+     * 备用26
+     */
+    private Double target91;
+
+    /**
+     * 备用27
+     */
+    private Double target92;
+
+    /**
+     * 备用28
+     */
+    private Double target93;
+
+    /**
+     * 备用29
+     */
+    private Double target94;
+
+    /**
+     * 备用30
+     */
+    private Double target95;
+
+    /**
+     * 备用31
+     */
+    private Double target96;
+
+    /**
+     * 备用32
+     */
+    private Double target97;
+
+    /**
+     * 备用33
+     */
+    private Double target98;
+
+    /**
+     * 备用34
+     */
+    private Double target99;
+
+    /**
+     * 备用35
+     */
+    private Double target100;
+
+
+}

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

@@ -0,0 +1,75 @@
+package com.gyee.generation.model.auto;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconEqOriginalIndex extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 设备编号
+     */
+
+    private String windturbineId;
+
+    /**
+     * 设备名称
+     */
+    private String windturbineName;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 指标编号
+     */
+    private String targetid;
+
+    /**
+     * 指标名称
+     */
+    private String targetname;
+
+    /**
+     * 指标类型
+     */
+    private String targettype;
+
+    /**
+     * 计算值
+     */
+    private Double targetvalue;
+
+    /**
+     * 修正值
+     */
+    private Double targetvaluemod;
+
+
+}

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

@@ -0,0 +1,565 @@
+package com.gyee.generation.model.auto;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconEqOriginalMonth extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 设备编号
+     */
+    private String windturbineId;
+
+    /**
+     * 设备名称
+     */
+    private String windturbineName;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 年
+     */
+    private Integer year;
+
+    /**
+     * 月
+     */
+    private Integer month;
+
+    /**
+     * 统计阶段
+     */
+    private String types;
+
+    /**
+     * SCADA发电量（千瓦时）
+     */
+    private Double target01;
+
+    /**
+     * 试运行SCADA发电量（千瓦时）
+     */
+    private Double target02;
+
+    /**
+     * 最大风速
+     */
+    private Double target03;
+
+    /**
+     * 最小风速
+     */
+    private Double target04;
+
+    /**
+     * 最大功率
+     */
+    private Double target05;
+
+    /**
+     * 最小功率
+     */
+    private Double target06;
+
+    /**
+     * 平均功率
+     */
+    private Double target07;
+
+    /**
+     * 平均风速
+     */
+    private Double target08;
+
+    /**
+     * 设计理论发电量（千瓦时）
+     */
+    private Double target09;
+
+    /**
+     * 实际理论发电量（千瓦时）
+     */
+    private Double target10;
+
+    /**
+     * 智慧风电理论发电量（千瓦时）
+     */
+    private Double target11;
+
+    /**
+     * 风能利用率
+     */
+    private Double target12;
+
+    /**
+     * 损失电量（千瓦时）
+     */
+    private Double target13;
+
+    /**
+     * 故障损失时长（小时）
+     */
+    private Double target14;
+
+    /**
+     * 故障次数
+     */
+    private Double target15;
+
+    /**
+     * 故障损失电量
+     */
+    private Double target16;
+
+    /**
+     * 故障损失率
+     */
+    private Double target17;
+
+    /**
+     * 检修损失时长（小时）
+     */
+    private Double target18;
+
+    /**
+     * 检修次数
+     */
+    private Double target19;
+
+    /**
+     * 检修损失电量
+     */
+    private Double target20;
+
+    /**
+     * 检修损失率
+     */
+    private Double target21;
+
+    /**
+     * 性能损失时长（小时）
+     */
+    private Double target22;
+
+    /**
+     * 性能损失次数
+     */
+    private Double target23;
+
+    /**
+     * 性能损失电量
+     */
+    private Double target24;
+
+    /**
+     * 性能损失率
+     */
+    private Double target25;
+
+    /**
+     * 限电时长（小时）
+     */
+    private Double target26;
+
+    /**
+     * 限电次数
+     */
+    private Double target27;
+
+    /**
+     * 限电损失电量
+     */
+    private Double target28;
+
+    /**
+     * 限电损失率
+     */
+    private Double target29;
+
+    /**
+     * 弃风率
+     */
+    private Double target30;
+
+    /**
+     * 弃发比
+     */
+    private Double target31;
+
+    /**
+     * 受累损失时长（小时）
+     */
+    private Double target32;
+
+    /**
+     * 受累次数
+     */
+    private Double target33;
+
+    /**
+     * 受累损失电量
+     */
+    private Double target34;
+
+    /**
+     * 受累损失率
+     */
+    private Double target35;
+
+    /**
+     * 统计小时
+     */
+    private Double target36;
+
+    /**
+     * 切入次数
+     */
+    private Double target37;
+
+    /**
+     * 切出次数
+     */
+    private Double target38;
+
+    /**
+     * 平均切入风速
+     */
+    private Double target39;
+
+    /**
+     * 平均切出风速
+     */
+    private Double target40;
+
+    /**
+     * 最大切出风速
+     */
+    private Double target41;
+
+    /**
+     * 最小切入风速
+     */
+    private Double target42;
+
+    /**
+     * 额定功率
+     */
+    private Double target43;
+
+    /**
+     * 额定风速
+     */
+    private Double target44;
+
+    /**
+     * 设备利用小时
+     */
+    private Double target45;
+
+    /**
+     * 30分钟内故障消除次数
+     */
+    private Double target46;
+
+    /**
+     * 6小时内故障消除次数
+     */
+    private Double target47;
+
+    /**
+     * 12小时内故障消除次数
+     */
+    private Double target48;
+
+    /**
+     * 24小时内故障消除次数
+     */
+    private Double target49;
+
+    /**
+     * 72小时内故障消除次数
+     */
+    private Double target50;
+
+    /**
+     * 168小时内故障消除次数
+     */
+    private Double target51;
+
+    /**
+     * 168小时外故障消除次数
+     */
+    private Double target52;
+
+    /**
+     * 故障消缺总次数
+     */
+    private Double target53;
+
+    /**
+     * 等效可利用系数
+     */
+    private Double target54;
+
+    /**
+     * 设备可利用率
+     */
+    private Double target55;
+
+    /**
+     * 负荷率
+     */
+    private Double target56;
+
+    /**
+     * 功率一致性系数
+     */
+    private Double target57;
+
+    /**
+     * 拟合优度
+     */
+    private Double target58;
+
+    /**
+     * 曲线偏差率
+     */
+    private Double target59;
+
+    /**
+     * 故障消缺及时率
+     */
+    private Double target60;
+
+    /**
+     * 状态转换及时率
+     */
+    private Double target61;
+
+    /**
+     * 复位及时率
+     */
+    private Double target62;
+
+    /**
+     * 月MTBF
+     */
+    private Double target63;
+
+    /**
+     * 月MTTR
+     */
+    private Double target64;
+
+    /**
+     * 月MTTF
+     */
+    private Double target65;
+
+    /**
+     * 备用1
+     */
+    private Double target66;
+
+    /**
+     * 备用2
+     */
+    private Double target67;
+
+    /**
+     * 备用3
+     */
+    private Double target68;
+
+    /**
+     * 备用4
+     */
+    private Double target69;
+
+    /**
+     * 备用5
+     */
+    private Double target70;
+
+    /**
+     * 备用6
+     */
+    private Double target71;
+
+    /**
+     * 备用7
+     */
+    private Double target72;
+
+    /**
+     * 备用8
+     */
+    private Double target73;
+
+    /**
+     * 备用9
+     */
+    private Double target74;
+
+    /**
+     * 备用10
+     */
+    private Double target75;
+
+    /**
+     * 备用11
+     */
+    private Double target76;
+
+    /**
+     * 备用12
+     */
+    private Double target77;
+
+    /**
+     * 备用13
+     */
+    private Double target78;
+
+    /**
+     * 备用14
+     */
+    private Double target79;
+
+    /**
+     * 备用15
+     */
+    private Double target80;
+
+    /**
+     * 备用16
+     */
+    private Double target81;
+
+    /**
+     * 备用17
+     */
+    private Double target82;
+
+    /**
+     * 备用18
+     */
+    private Double target83;
+
+    /**
+     * 备用19
+     */
+    private Double target84;
+
+    /**
+     * 备用20
+     */
+    private Double target85;
+
+    /**
+     * 备用21
+     */
+    private Double target86;
+
+    /**
+     * 备用22
+     */
+    private Double target87;
+
+    /**
+     * 备用23
+     */
+    private Double target88;
+
+    /**
+     * 备用24
+     */
+    private Double target89;
+
+    /**
+     * 备用25
+     */
+    private Double target90;
+
+    /**
+     * 备用26
+     */
+    private Double target91;
+
+    /**
+     * 备用27
+     */
+    private Double target92;
+
+    /**
+     * 备用28
+     */
+    private Double target93;
+
+    /**
+     * 备用29
+     */
+    private Double target94;
+
+    /**
+     * 备用30
+     */
+    private Double target95;
+
+    /**
+     * 备用31
+     */
+    private Double target96;
+
+    /**
+     * 备用32
+     */
+    private Double target97;
+
+    /**
+     * 备用33
+     */
+    private Double target98;
+
+    /**
+     * 备用34
+     */
+    private Double target99;
+
+    /**
+     * 备用35
+     */
+    private Double target100;
+
+
+}

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

@@ -0,0 +1,560 @@
+package com.gyee.generation.model.auto;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconEqOriginalYear extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 设备编号
+     */
+    private String windturbineId;
+
+    /**
+     * 设备名称
+     */
+    private String windturbineName;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 年
+     */
+    private Integer year;
+
+    /**
+     * 统计阶段
+     */
+    private String types;
+
+    /**
+     * SCADA发电量（千瓦时）
+     */
+    private Double target01;
+
+    /**
+     * 试运行SCADA发电量（千瓦时）
+     */
+    private Double target02;
+
+    /**
+     * 最大风速
+     */
+    private Double target03;
+
+    /**
+     * 最小风速
+     */
+    private Double target04;
+
+    /**
+     * 最大功率
+     */
+    private Double target05;
+
+    /**
+     * 最小功率
+     */
+    private Double target06;
+
+    /**
+     * 平均功率
+     */
+    private Double target07;
+
+    /**
+     * 平均风速
+     */
+    private Double target08;
+
+    /**
+     * 设计理论发电量（千瓦时）
+     */
+    private Double target09;
+
+    /**
+     * 实际理论发电量（千瓦时）
+     */
+    private Double target10;
+
+    /**
+     * 智慧风电理论发电量（千瓦时）
+     */
+    private Double target11;
+
+    /**
+     * 风能利用率
+     */
+    private Double target12;
+
+    /**
+     * 损失电量（千瓦时）
+     */
+    private Double target13;
+
+    /**
+     * 故障损失时长（小时）
+     */
+    private Double target14;
+
+    /**
+     * 故障次数
+     */
+    private Double target15;
+
+    /**
+     * 故障损失电量
+     */
+    private Double target16;
+
+    /**
+     * 故障损失率
+     */
+    private Double target17;
+
+    /**
+     * 检修损失时长（小时）
+     */
+    private Double target18;
+
+    /**
+     * 检修次数
+     */
+    private Double target19;
+
+    /**
+     * 检修损失电量
+     */
+    private Double target20;
+
+    /**
+     * 检修损失率
+     */
+    private Double target21;
+
+    /**
+     * 性能损失时长（小时）
+     */
+    private Double target22;
+
+    /**
+     * 性能损失次数
+     */
+    private Double target23;
+
+    /**
+     * 性能损失电量
+     */
+    private Double target24;
+
+    /**
+     * 性能损失率
+     */
+    private Double target25;
+
+    /**
+     * 限电时长（小时）
+     */
+    private Double target26;
+
+    /**
+     * 限电次数
+     */
+    private Double target27;
+
+    /**
+     * 限电损失电量
+     */
+    private Double target28;
+
+    /**
+     * 限电损失率
+     */
+    private Double target29;
+
+    /**
+     * 弃风率
+     */
+    private Double target30;
+
+    /**
+     * 弃发比
+     */
+    private Double target31;
+
+    /**
+     * 受累损失时长（小时）
+     */
+    private Double target32;
+
+    /**
+     * 受累次数
+     */
+    private Double target33;
+
+    /**
+     * 受累损失电量
+     */
+    private Double target34;
+
+    /**
+     * 受累损失率
+     */
+    private Double target35;
+
+    /**
+     * 统计小时
+     */
+    private Double target36;
+
+    /**
+     * 切入次数
+     */
+    private Double target37;
+
+    /**
+     * 切出次数
+     */
+    private Double target38;
+
+    /**
+     * 平均切入风速
+     */
+    private Double target39;
+
+    /**
+     * 平均切出风速
+     */
+    private Double target40;
+
+    /**
+     * 最大切出风速
+     */
+    private Double target41;
+
+    /**
+     * 最小切入风速
+     */
+    private Double target42;
+
+    /**
+     * 额定功率
+     */
+    private Double target43;
+
+    /**
+     * 额定风速
+     */
+    private Double target44;
+
+    /**
+     * 设备利用小时
+     */
+    private Double target45;
+
+    /**
+     * 30分钟内故障消除次数
+     */
+    private Double target46;
+
+    /**
+     * 6小时内故障消除次数
+     */
+    private Double target47;
+
+    /**
+     * 12小时内故障消除次数
+     */
+    private Double target48;
+
+    /**
+     * 24小时内故障消除次数
+     */
+    private Double target49;
+
+    /**
+     * 72小时内故障消除次数
+     */
+    private Double target50;
+
+    /**
+     * 168小时内故障消除次数
+     */
+    private Double target51;
+
+    /**
+     * 168小时外故障消除次数
+     */
+    private Double target52;
+
+    /**
+     * 故障消缺总次数
+     */
+    private Double target53;
+
+    /**
+     * 等效可利用系数
+     */
+    private Double target54;
+
+    /**
+     * 设备可利用率
+     */
+    private Double target55;
+
+    /**
+     * 负荷率
+     */
+    private Double target56;
+
+    /**
+     * 功率一致性系数
+     */
+    private Double target57;
+
+    /**
+     * 拟合优度
+     */
+    private Double target58;
+
+    /**
+     * 曲线偏差率
+     */
+    private Double target59;
+
+    /**
+     * 故障消缺及时率
+     */
+    private Double target60;
+
+    /**
+     * 状态转换及时率
+     */
+    private Double target61;
+
+    /**
+     * 复位及时率
+     */
+    private Double target62;
+
+    /**
+     * 年MTBF
+     */
+    private Double target63;
+
+    /**
+     * 年MTTR
+     */
+    private Double target64;
+
+    /**
+     * 年MTTF
+     */
+    private Double target65;
+
+    /**
+     * 备用1
+     */
+    private Double target66;
+
+    /**
+     * 备用2
+     */
+    private Double target67;
+
+    /**
+     * 备用3
+     */
+    private Double target68;
+
+    /**
+     * 备用4
+     */
+    private Double target69;
+
+    /**
+     * 备用5
+     */
+    private Double target70;
+
+    /**
+     * 备用6
+     */
+    private Double target71;
+
+    /**
+     * 备用7
+     */
+    private Double target72;
+
+    /**
+     * 备用8
+     */
+    private Double target73;
+
+    /**
+     * 备用9
+     */
+    private Double target74;
+
+    /**
+     * 备用10
+     */
+    private Double target75;
+
+    /**
+     * 备用11
+     */
+    private Double target76;
+
+    /**
+     * 备用12
+     */
+    private Double target77;
+
+    /**
+     * 备用13
+     */
+    private Double target78;
+
+    /**
+     * 备用14
+     */
+    private Double target79;
+
+    /**
+     * 备用15
+     */
+    private Double target80;
+
+    /**
+     * 备用16
+     */
+    private Double target81;
+
+    /**
+     * 备用17
+     */
+    private Double target82;
+
+    /**
+     * 备用18
+     */
+    private Double target83;
+
+    /**
+     * 备用19
+     */
+    private Double target84;
+
+    /**
+     * 备用20
+     */
+    private Double target85;
+
+    /**
+     * 备用21
+     */
+    private Double target86;
+
+    /**
+     * 备用22
+     */
+    private Double target87;
+
+    /**
+     * 备用23
+     */
+    private Double target88;
+
+    /**
+     * 备用24
+     */
+    private Double target89;
+
+    /**
+     * 备用25
+     */
+    private Double target90;
+
+    /**
+     * 备用26
+     */
+    private Double target91;
+
+    /**
+     * 备用27
+     */
+    private Double target92;
+
+    /**
+     * 备用28
+     */
+    private Double target93;
+
+    /**
+     * 备用29
+     */
+    private Double target94;
+
+    /**
+     * 备用30
+     */
+    private Double target95;
+
+    /**
+     * 备用31
+     */
+    private Double target96;
+
+    /**
+     * 备用32
+     */
+    private Double target97;
+
+    /**
+     * 备用33
+     */
+    private Double target98;
+
+    /**
+     * 备用34
+     */
+    private Double target99;
+
+    /**
+     * 备用35
+     */
+    private Double target100;
+
+
+}

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

@@ -0,0 +1,47 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconEqTarget extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 指标名称
+     */
+    private String targetname;
+
+    /**
+     * 指标类型
+     */
+    private String targettype;
+
+    /**
+     * 对应数据库表名
+     */
+    private String tablename;
+
+    /**
+     * 对应数据库字段
+     */
+    private String tablefiled;
+
+
+}

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

@@ -0,0 +1,555 @@
+package com.gyee.generation.model.auto;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconStaOriginalDay extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 场站、项目、线路等
+     */
+    private String location;
+
+    /**
+     * 场站、项目、线路等编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 场站、项目、线路等名称
+     */
+    private String foreignName;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 最大风速
+     */
+    private Double target01;
+
+    /**
+     * 最小风速
+     */
+    private Double target02;
+
+    /**
+     * 最大功率
+     */
+    private Double target03;
+
+    /**
+     * 最小功率
+     */
+    private Double target04;
+
+    /**
+     * 平均功率
+     */
+    private Double target05;
+
+    /**
+     * 平均风速
+     */
+    private Double target06;
+
+    /**
+     * 发电量
+     */
+    private Double target07;
+
+    /**
+     * 可用电量
+     */
+    private Double target08;
+
+    /**
+     * 理论发电量
+     */
+    private Double target09;
+
+    /**
+     * 故障损失电量
+     */
+    private Double target10;
+
+    /**
+     * 场内受累故障损失电量
+     */
+    private Double target11;
+
+    /**
+     * 检修损失电量
+     */
+    private Double target12;
+
+    /**
+     * 场内受累检修损失电量
+     */
+    private Double target13;
+
+    /**
+     * 待机损失电量
+     */
+    private Double target14;
+
+    /**
+     * 缺陷降出力损失电量
+     */
+    private Double target15;
+
+    /**
+     * 手动停机损失电量
+     */
+    private Double target16;
+
+    /**
+     * 性能损失电量
+     */
+    private Double target17;
+
+    /**
+     * 限电停机损失电量
+     */
+    private Double target18;
+
+    /**
+     * 限电降出力损失电量
+     */
+    private Double target19;
+
+    /**
+     * 场外受累电网损失电量
+     */
+    private Double target20;
+
+    /**
+     * 场外受累天气损失电量
+     */
+    private Double target21;
+
+    /**
+     * 故障小时（明细）
+     */
+    private Double target22;
+
+    /**
+     * 场内受累故障小时（明细）
+     */
+    private Double target23;
+
+    /**
+     * 检修小时（明细）
+     */
+    private Double target24;
+
+    /**
+     * 场内受累检修小时（明细）
+     */
+    private Double target25;
+
+    /**
+     * 待机小时（明细）
+     */
+    private Double target26;
+
+    /**
+     * 缺陷降出力小时（明细）
+     */
+    private Double target27;
+
+    /**
+     * 手动停机小时（明细）
+     */
+    private Double target28;
+
+    /**
+     * 性能小时（明细）
+     */
+    private Double target29;
+
+    /**
+     * 限电停机小时（明细）
+     */
+    private Double target30;
+
+    /**
+     * 限电降出力小时（明细）
+     */
+    private Double target31;
+
+    /**
+     * 场外受累电网小时（明细）
+     */
+    private Double target32;
+
+    /**
+     * 场外受累天气小时（明细）
+     */
+    private Double target33;
+
+    /**
+     * 离线小时（明细）
+     */
+    private Double target34;
+
+    /**
+     * 通讯中断小时（明细）
+     */
+    private Double target35;
+
+    /**
+     * 故障次数（明细）
+     */
+    private Double target36;
+
+    /**
+     * 场内受累故障次数（明细）
+     */
+    private Double target37;
+
+    /**
+     * 检修次数（明细）
+     */
+    private Double target38;
+
+    /**
+     * 场内受累检修次数（明细）
+     */
+    private Double target39;
+
+    /**
+     * 待机次数（明细）
+     */
+    private Double target40;
+
+    /**
+     * 缺陷降出力次数（明细）
+     */
+    private Double target41;
+
+    /**
+     * 手动停机次数（明细）
+     */
+    private Double target42;
+
+    /**
+     * 性能次数（明细）
+     */
+    private Double target43;
+
+    /**
+     * 限电停机次数（明细）
+     */
+    private Double target44;
+
+    /**
+     * 限电降出力次数（明细）
+     */
+    private Double target45;
+
+    /**
+     * 场外受累电网次数（明细）
+     */
+    private Double target46;
+
+    /**
+     * 场外受累天气次数（明细）
+     */
+    private Double target47;
+
+    /**
+     * 离线次数（明细）
+     */
+    private Double target48;
+
+    /**
+     * 通讯中断次数（明细）
+     */
+    private Double target49;
+
+    /**
+     * MTBF
+     */
+    private Double target50;
+
+    /**
+     * MTTR
+     */
+    private Double target51;
+
+    /**
+     * MTTF
+     */
+    private Double target52;
+
+    /**
+     * 复位及时率
+     */
+    private Double target53;
+
+    /**
+     * 状态转换及时率
+     */
+    private Double target54;
+
+    /**
+     * 故障消缺及时率
+     */
+    private Double target55;
+
+    /**
+     * 发电量(电表)
+     */
+    private Double target56;
+
+    /**
+     * 上网电量(电表)
+     */
+    private Double target57;
+
+    /**
+     * 工网购网电量(电表)
+     */
+    private Double target58;
+
+    /**
+     * 农网购网电量(电表)
+     */
+    private Double target59;
+
+    /**
+     * 综合场用电量(电表)
+     */
+    private Double target60;
+
+    /**
+     * 发电厂用电量(电表)
+     */
+    private Double target61;
+
+    /**
+     * 备用
+     */
+    private Double target62;
+
+    /**
+     * 备用
+     */
+    private Double target63;
+
+    /**
+     * 备用
+     */
+    private Double target64;
+
+    /**
+     * 备用
+     */
+    private Double target65;
+
+    /**
+     * 备用
+     */
+    private Double target66;
+
+    /**
+     * 备用
+     */
+    private Double target67;
+
+    /**
+     * 备用
+     */
+    private Double target68;
+
+    /**
+     * 备用
+     */
+    private Double target69;
+
+    /**
+     * 备用
+     */
+    private Double target70;
+
+    /**
+     * 备用
+     */
+    private Double target71;
+
+    /**
+     * 备用
+     */
+    private Double target72;
+
+    /**
+     * 备用
+     */
+    private Double target73;
+
+    /**
+     * 备用
+     */
+    private Double target74;
+
+    /**
+     * 备用
+     */
+    private Double target75;
+
+    /**
+     * 备用
+     */
+    private Double target76;
+
+    /**
+     * 备用
+     */
+    private Double target77;
+
+    /**
+     * 备用
+     */
+    private Double target78;
+
+    /**
+     * 备用
+     */
+    private Double target79;
+
+    /**
+     * 备用
+     */
+    private Double target80;
+
+    /**
+     * 备用
+     */
+    private Double target81;
+
+    /**
+     * 备用
+     */
+    private Double target82;
+
+    /**
+     * 备用
+     */
+    private Double target83;
+
+    /**
+     * 备用
+     */
+    private Double target84;
+
+    /**
+     * 备用
+     */
+    private Double target85;
+
+    /**
+     * 备用
+     */
+    private Double target86;
+
+    /**
+     * 备用
+     */
+    private Double target87;
+
+    /**
+     * 备用
+     */
+    private Double target88;
+
+    /**
+     * 备用
+     */
+    private Double target89;
+
+    /**
+     * 备用
+     */
+    private Double target90;
+
+    /**
+     * 备用
+     */
+    private Double target91;
+
+    /**
+     * 备用
+     */
+    private Double target92;
+
+    /**
+     * 备用
+     */
+    private Double target93;
+
+    /**
+     * 备用
+     */
+    private Double target94;
+
+    /**
+     * 备用
+     */
+    private Double target95;
+
+    /**
+     * 备用
+     */
+    private Double target96;
+
+    /**
+     * 备用
+     */
+    private Double target97;
+
+    /**
+     * 备用
+     */
+    private Double target98;
+
+    /**
+     * 备用
+     */
+    private Double target99;
+
+    /**
+     * 备用
+     */
+    private Double target100;
+
+
+}

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

@@ -0,0 +1,78 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconStaOriginalIndex extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 场站、项目、线路等
+     */
+    private String location;
+
+    /**
+     * 场站、项目、线路等编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 场站、项目、线路等名称
+     */
+    private String foreignName;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 指标编号
+     */
+    private String targetid;
+
+    /**
+     * 指标名称
+     */
+    private String targetname;
+
+    /**
+     * 指标类型
+     */
+    private String targettype;
+
+    /**
+     * 计算值
+     */
+    private Double targetvalue;
+
+    /**
+     * 修正值
+     */
+    private Double targetvaluemod;
+
+
+}

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

@@ -0,0 +1,565 @@
+package com.gyee.generation.model.auto;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconStaOriginalMonth extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 场站、项目、线路等
+     */
+    private String location;
+
+    /**
+     * 场站、项目、线路等编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 场站、项目、线路等名称
+     */
+    private String foreignName;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 年
+     */
+    private Integer year;
+
+    /**
+     * 月
+     */
+    private Integer month;
+
+    /**
+     * 最大风速
+     */
+    private Double target01;
+
+    /**
+     * 最小风速
+     */
+    private Double target02;
+
+    /**
+     * 最大功率
+     */
+    private Double target03;
+
+    /**
+     * 最小功率
+     */
+    private Double target04;
+
+    /**
+     * 平均功率
+     */
+    private Double target05;
+
+    /**
+     * 平均风速
+     */
+    private Double target06;
+
+    /**
+     * 发电量
+     */
+    private Double target07;
+
+    /**
+     * 可用电量
+     */
+    private Double target08;
+
+    /**
+     * 理论发电量
+     */
+    private Double target09;
+
+    /**
+     * 故障损失电量
+     */
+    private Double target10;
+
+    /**
+     * 场内受累故障损失电量
+     */
+    private Double target11;
+
+    /**
+     * 检修损失电量
+     */
+    private Double target12;
+
+    /**
+     * 场内受累检修损失电量
+     */
+    private Double target13;
+
+    /**
+     * 待机损失电量
+     */
+    private Double target14;
+
+    /**
+     * 缺陷降出力损失电量
+     */
+    private Double target15;
+
+    /**
+     * 手动停机损失电量
+     */
+    private Double target16;
+
+    /**
+     * 性能损失电量
+     */
+    private Double target17;
+
+    /**
+     * 限电停机损失电量
+     */
+    private Double target18;
+
+    /**
+     * 限电降出力损失电量
+     */
+    private Double target19;
+
+    /**
+     * 场外受累电网损失电量
+     */
+    private Double target20;
+
+    /**
+     * 场外受累天气损失电量
+     */
+    private Double target21;
+
+    /**
+     * 故障小时（明细）
+     */
+    private Double target22;
+
+    /**
+     * 场内受累故障小时（明细）
+     */
+    private Double target23;
+
+    /**
+     * 检修小时（明细）
+     */
+    private Double target24;
+
+    /**
+     * 场内受累检修小时（明细）
+     */
+    private Double target25;
+
+    /**
+     * 待机小时（明细）
+     */
+    private Double target26;
+
+    /**
+     * 缺陷降出力小时（明细）
+     */
+    private Double target27;
+
+    /**
+     * 手动停机小时（明细）
+     */
+    private Double target28;
+
+    /**
+     * 性能小时（明细）
+     */
+    private Double target29;
+
+    /**
+     * 限电停机小时（明细）
+     */
+    private Double target30;
+
+    /**
+     * 限电降出力小时（明细）
+     */
+    private Double target31;
+
+    /**
+     * 场外受累电网小时（明细）
+     */
+    private Double target32;
+
+    /**
+     * 场外受累天气小时（明细）
+     */
+    private Double target33;
+
+    /**
+     * 离线小时（明细）
+     */
+    private Double target34;
+
+    /**
+     * 通讯中断小时（明细）
+     */
+    private Double target35;
+
+    /**
+     * 故障次数（明细）
+     */
+    private Double target36;
+
+    /**
+     * 场内受累故障次数（明细）
+     */
+    private Double target37;
+
+    /**
+     * 检修次数（明细）
+     */
+    private Double target38;
+
+    /**
+     * 场内受累检修次数（明细）
+     */
+    private Double target39;
+
+    /**
+     * 待机次数（明细）
+     */
+    private Double target40;
+
+    /**
+     * 缺陷降出力次数（明细）
+     */
+    private Double target41;
+
+    /**
+     * 手动停机次数（明细）
+     */
+    private Double target42;
+
+    /**
+     * 性能次数（明细）
+     */
+    private Double target43;
+
+    /**
+     * 限电停机次数（明细）
+     */
+    private Double target44;
+
+    /**
+     * 限电降出力次数（明细）
+     */
+    private Double target45;
+
+    /**
+     * 场外受累电网次数（明细）
+     */
+    private Double target46;
+
+    /**
+     * 场外受累天气次数（明细）
+     */
+    private Double target47;
+
+    /**
+     * 离线次数（明细）
+     */
+    private Double target48;
+
+    /**
+     * 通讯中断次数（明细）
+     */
+    private Double target49;
+
+    /**
+     * MTBF
+     */
+    private Double target50;
+
+    /**
+     * MTTR
+     */
+    private Double target51;
+
+    /**
+     * MTTF
+     */
+    private Double target52;
+
+    /**
+     * 复位及时率
+     */
+    private Double target53;
+
+    /**
+     * 状态转换及时率
+     */
+    private Double target54;
+
+    /**
+     * 故障消缺及时率
+     */
+    private Double target55;
+
+    /**
+     * 发电量(电表)
+     */
+    private Double target56;
+
+    /**
+     * 上网电量(电表)
+     */
+    private Double target57;
+
+    /**
+     * 工网购网电量(电表)
+     */
+    private Double target58;
+
+    /**
+     * 农网购网电量(电表)
+     */
+    private Double target59;
+
+    /**
+     * 综合场用电量(电表)
+     */
+    private Double target60;
+
+    /**
+     * 发电厂用电量(电表)
+     */
+    private Double target61;
+
+    /**
+     * 备用
+     */
+    private Double target62;
+
+    /**
+     * 备用
+     */
+    private Double target63;
+
+    /**
+     * 备用
+     */
+    private Double target64;
+
+    /**
+     * 备用
+     */
+    private Double target65;
+
+    /**
+     * 备用
+     */
+    private Double target66;
+
+    /**
+     * 备用
+     */
+    private Double target67;
+
+    /**
+     * 备用
+     */
+    private Double target68;
+
+    /**
+     * 备用
+     */
+    private Double target69;
+
+    /**
+     * 备用
+     */
+    private Double target70;
+
+    /**
+     * 备用
+     */
+    private Double target71;
+
+    /**
+     * 备用
+     */
+    private Double target72;
+
+    /**
+     * 备用
+     */
+    private Double target73;
+
+    /**
+     * 备用
+     */
+    private Double target74;
+
+    /**
+     * 备用
+     */
+    private Double target75;
+
+    /**
+     * 备用
+     */
+    private Double target76;
+
+    /**
+     * 备用
+     */
+    private Double target77;
+
+    /**
+     * 备用
+     */
+    private Double target78;
+
+    /**
+     * 备用
+     */
+    private Double target79;
+
+    /**
+     * 备用
+     */
+    private Double target80;
+
+    /**
+     * 备用
+     */
+    private Double target81;
+
+    /**
+     * 备用
+     */
+    private Double target82;
+
+    /**
+     * 备用
+     */
+    private Double target83;
+
+    /**
+     * 备用
+     */
+    private Double target84;
+
+    /**
+     * 备用
+     */
+    private Double target85;
+
+    /**
+     * 备用
+     */
+    private Double target86;
+
+    /**
+     * 备用
+     */
+    private Double target87;
+
+    /**
+     * 备用
+     */
+    private Double target88;
+
+    /**
+     * 备用
+     */
+    private Double target89;
+
+    /**
+     * 备用
+     */
+    private Double target90;
+
+    /**
+     * 备用
+     */
+    private Double target91;
+
+    /**
+     * 备用
+     */
+    private Double target92;
+
+    /**
+     * 备用
+     */
+    private Double target93;
+
+    /**
+     * 备用
+     */
+    private Double target94;
+
+    /**
+     * 备用
+     */
+    private Double target95;
+
+    /**
+     * 备用
+     */
+    private Double target96;
+
+    /**
+     * 备用
+     */
+    private Double target97;
+
+    /**
+     * 备用
+     */
+    private Double target98;
+
+    /**
+     * 备用
+     */
+    private Double target99;
+
+    /**
+     * 备用
+     */
+    private Double target100;
+
+
+}

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

@@ -0,0 +1,560 @@
+package com.gyee.generation.model.auto;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconStaOriginalYear extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 场站、项目、线路等
+     */
+    private String location;
+
+    /**
+     * 场站、项目、线路等编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 场站、项目、线路等名称
+     */
+    private String foreignName;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 年
+     */
+    private Integer year;
+
+    /**
+     * 最大风速
+     */
+    private Double target01;
+
+    /**
+     * 最小风速
+     */
+    private Double target02;
+
+    /**
+     * 最大功率
+     */
+    private Double target03;
+
+    /**
+     * 最小功率
+     */
+    private Double target04;
+
+    /**
+     * 平均功率
+     */
+    private Double target05;
+
+    /**
+     * 平均风速
+     */
+    private Double target06;
+
+    /**
+     * 发电量
+     */
+    private Double target07;
+
+    /**
+     * 可用电量
+     */
+    private Double target08;
+
+    /**
+     * 理论发电量
+     */
+    private Double target09;
+
+    /**
+     * 故障损失电量
+     */
+    private Double target10;
+
+    /**
+     * 场内受累故障损失电量
+     */
+    private Double target11;
+
+    /**
+     * 检修损失电量
+     */
+    private Double target12;
+
+    /**
+     * 场内受累检修损失电量
+     */
+    private Double target13;
+
+    /**
+     * 待机损失电量
+     */
+    private Double target14;
+
+    /**
+     * 缺陷降出力损失电量
+     */
+    private Double target15;
+
+    /**
+     * 手动停机损失电量
+     */
+    private Double target16;
+
+    /**
+     * 性能损失电量
+     */
+    private Double target17;
+
+    /**
+     * 限电停机损失电量
+     */
+    private Double target18;
+
+    /**
+     * 限电降出力损失电量
+     */
+    private Double target19;
+
+    /**
+     * 场外受累电网损失电量
+     */
+    private Double target20;
+
+    /**
+     * 场外受累天气损失电量
+     */
+    private Double target21;
+
+    /**
+     * 故障小时（明细）
+     */
+    private Double target22;
+
+    /**
+     * 场内受累故障小时（明细）
+     */
+    private Double target23;
+
+    /**
+     * 检修小时（明细）
+     */
+    private Double target24;
+
+    /**
+     * 场内受累检修小时（明细）
+     */
+    private Double target25;
+
+    /**
+     * 待机小时（明细）
+     */
+    private Double target26;
+
+    /**
+     * 缺陷降出力小时（明细）
+     */
+    private Double target27;
+
+    /**
+     * 手动停机小时（明细）
+     */
+    private Double target28;
+
+    /**
+     * 性能小时（明细）
+     */
+    private Double target29;
+
+    /**
+     * 限电停机小时（明细）
+     */
+    private Double target30;
+
+    /**
+     * 限电降出力小时（明细）
+     */
+    private Double target31;
+
+    /**
+     * 场外受累电网小时（明细）
+     */
+    private Double target32;
+
+    /**
+     * 场外受累天气小时（明细）
+     */
+    private Double target33;
+
+    /**
+     * 离线小时（明细）
+     */
+    private Double target34;
+
+    /**
+     * 通讯中断小时（明细）
+     */
+    private Double target35;
+
+    /**
+     * 故障次数（明细）
+     */
+    private Double target36;
+
+    /**
+     * 场内受累故障次数（明细）
+     */
+    private Double target37;
+
+    /**
+     * 检修次数（明细）
+     */
+    private Double target38;
+
+    /**
+     * 场内受累检修次数（明细）
+     */
+    private Double target39;
+
+    /**
+     * 待机次数（明细）
+     */
+    private Double target40;
+
+    /**
+     * 缺陷降出力次数（明细）
+     */
+    private Double target41;
+
+    /**
+     * 手动停机次数（明细）
+     */
+    private Double target42;
+
+    /**
+     * 性能次数（明细）
+     */
+    private Double target43;
+
+    /**
+     * 限电停机次数（明细）
+     */
+    private Double target44;
+
+    /**
+     * 限电降出力次数（明细）
+     */
+    private Double target45;
+
+    /**
+     * 场外受累电网次数（明细）
+     */
+    private Double target46;
+
+    /**
+     * 场外受累天气次数（明细）
+     */
+    private Double target47;
+
+    /**
+     * 离线次数（明细）
+     */
+    private Double target48;
+
+    /**
+     * 通讯中断次数（明细）
+     */
+    private Double target49;
+
+    /**
+     * MTBF
+     */
+    private Double target50;
+
+    /**
+     * MTTR
+     */
+    private Double target51;
+
+    /**
+     * MTTF
+     */
+    private Double target52;
+
+    /**
+     * 复位及时率
+     */
+    private Double target53;
+
+    /**
+     * 状态转换及时率
+     */
+    private Double target54;
+
+    /**
+     * 故障消缺及时率
+     */
+    private Double target55;
+
+    /**
+     * 发电量(电表)
+     */
+    private Double target56;
+
+    /**
+     * 上网电量(电表)
+     */
+    private Double target57;
+
+    /**
+     * 工网购网电量(电表)
+     */
+    private Double target58;
+
+    /**
+     * 农网购网电量(电表)
+     */
+    private Double target59;
+
+    /**
+     * 综合场用电量(电表)
+     */
+    private Double target60;
+
+    /**
+     * 发电厂用电量(电表)
+     */
+    private Double target61;
+
+    /**
+     * 备用
+     */
+    private Double target62;
+
+    /**
+     * 备用
+     */
+    private Double target63;
+
+    /**
+     * 备用
+     */
+    private Double target64;
+
+    /**
+     * 备用
+     */
+    private Double target65;
+
+    /**
+     * 备用
+     */
+    private Double target66;
+
+    /**
+     * 备用
+     */
+    private Double target67;
+
+    /**
+     * 备用
+     */
+    private Double target68;
+
+    /**
+     * 备用
+     */
+    private Double target69;
+
+    /**
+     * 备用
+     */
+    private Double target70;
+
+    /**
+     * 备用
+     */
+    private Double target71;
+
+    /**
+     * 备用
+     */
+    private Double target72;
+
+    /**
+     * 备用
+     */
+    private Double target73;
+
+    /**
+     * 备用
+     */
+    private Double target74;
+
+    /**
+     * 备用
+     */
+    private Double target75;
+
+    /**
+     * 备用
+     */
+    private Double target76;
+
+    /**
+     * 备用
+     */
+    private Double target77;
+
+    /**
+     * 备用
+     */
+    private Double target78;
+
+    /**
+     * 备用
+     */
+    private Double target79;
+
+    /**
+     * 备用
+     */
+    private Double target80;
+
+    /**
+     * 备用
+     */
+    private Double target81;
+
+    /**
+     * 备用
+     */
+    private Double target82;
+
+    /**
+     * 备用
+     */
+    private Double target83;
+
+    /**
+     * 备用
+     */
+    private Double target84;
+
+    /**
+     * 备用
+     */
+    private Double target85;
+
+    /**
+     * 备用
+     */
+    private Double target86;
+
+    /**
+     * 备用
+     */
+    private Double target87;
+
+    /**
+     * 备用
+     */
+    private Double target88;
+
+    /**
+     * 备用
+     */
+    private Double target89;
+
+    /**
+     * 备用
+     */
+    private Double target90;
+
+    /**
+     * 备用
+     */
+    private Double target91;
+
+    /**
+     * 备用
+     */
+    private Double target92;
+
+    /**
+     * 备用
+     */
+    private Double target93;
+
+    /**
+     * 备用
+     */
+    private Double target94;
+
+    /**
+     * 备用
+     */
+    private Double target95;
+
+    /**
+     * 备用
+     */
+    private Double target96;
+
+    /**
+     * 备用
+     */
+    private Double target97;
+
+    /**
+     * 备用
+     */
+    private Double target98;
+
+    /**
+     * 备用
+     */
+    private Double target99;
+
+    /**
+     * 备用
+     */
+    private Double target100;
+
+
+}

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

@@ -0,0 +1,47 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconStaTarget extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 指标名称
+     */
+    private String targetname;
+
+    /**
+     * 指标类型
+     */
+    private String targettype;
+
+    /**
+     * 对应数据库表名
+     */
+    private String tablename;
+
+    /**
+     * 对应数据库字段
+     */
+    private String tablefiled;
+
+
+}

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

@@ -0,0 +1,71 @@
+package com.gyee.generation.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconTableBottomStatistic extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 电表值
+     */
+    private Double meterValue;
+
+    /**
+     * 修正值
+     */
+    private Double correctionValue;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconEqOriginalDay;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+public interface IProEconEqOriginalDayService extends IService<ProEconEqOriginalDay> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconEqOriginalIndex;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-22
+ */
+public interface IProEconEqOriginalIndexService extends IService<ProEconEqOriginalIndex> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconEqOriginalMonth;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+public interface IProEconEqOriginalMonthService extends IService<ProEconEqOriginalMonth> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconEqOriginalYear;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+public interface IProEconEqOriginalYearService extends IService<ProEconEqOriginalYear> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconEqTarget;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+public interface IProEconEqTargetService extends IService<ProEconEqTarget> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconStaOriginalDay;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+public interface IProEconStaOriginalDayService extends IService<ProEconStaOriginalDay> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconStaOriginalIndex;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-22
+ */
+public interface IProEconStaOriginalIndexService extends IService<ProEconStaOriginalIndex> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconStaOriginalMonth;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+public interface IProEconStaOriginalMonthService extends IService<ProEconStaOriginalMonth> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconStaOriginalYear;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+public interface IProEconStaOriginalYearService extends IService<ProEconStaOriginalYear> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconStaTarget;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+public interface IProEconStaTargetService extends IService<ProEconStaTarget> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconTableBottomStatistic;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+public interface IProEconTableBottomStatisticService extends IService<ProEconTableBottomStatistic> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconEqOriginalDay;
+import com.gyee.generation.mapper.auto.ProEconEqOriginalDayMapper;
+import com.gyee.generation.service.auto.IProEconEqOriginalDayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Service
+public class ProEconEqOriginalDayServiceImpl extends ServiceImpl<ProEconEqOriginalDayMapper, ProEconEqOriginalDay> implements IProEconEqOriginalDayService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconEqOriginalIndex;
+import com.gyee.generation.mapper.auto.ProEconEqOriginalIndexMapper;
+import com.gyee.generation.service.auto.IProEconEqOriginalIndexService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-22
+ */
+@Service
+public class ProEconEqOriginalIndexServiceImpl extends ServiceImpl<ProEconEqOriginalIndexMapper, ProEconEqOriginalIndex> implements IProEconEqOriginalIndexService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconEqOriginalMonth;
+import com.gyee.generation.mapper.auto.ProEconEqOriginalMonthMapper;
+import com.gyee.generation.service.auto.IProEconEqOriginalMonthService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Service
+public class ProEconEqOriginalMonthServiceImpl extends ServiceImpl<ProEconEqOriginalMonthMapper, ProEconEqOriginalMonth> implements IProEconEqOriginalMonthService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconEqOriginalYear;
+import com.gyee.generation.mapper.auto.ProEconEqOriginalYearMapper;
+import com.gyee.generation.service.auto.IProEconEqOriginalYearService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Service
+public class ProEconEqOriginalYearServiceImpl extends ServiceImpl<ProEconEqOriginalYearMapper, ProEconEqOriginalYear> implements IProEconEqOriginalYearService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconEqTarget;
+import com.gyee.generation.mapper.auto.ProEconEqTargetMapper;
+import com.gyee.generation.service.auto.IProEconEqTargetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Service
+public class ProEconEqTargetServiceImpl extends ServiceImpl<ProEconEqTargetMapper, ProEconEqTarget> implements IProEconEqTargetService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconStaOriginalDay;
+import com.gyee.generation.mapper.auto.ProEconStaOriginalDayMapper;
+import com.gyee.generation.service.auto.IProEconStaOriginalDayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Service
+public class ProEconStaOriginalDayServiceImpl extends ServiceImpl<ProEconStaOriginalDayMapper, ProEconStaOriginalDay> implements IProEconStaOriginalDayService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconStaOriginalIndex;
+import com.gyee.generation.mapper.auto.ProEconStaOriginalIndexMapper;
+import com.gyee.generation.service.auto.IProEconStaOriginalIndexService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-22
+ */
+@Service
+public class ProEconStaOriginalIndexServiceImpl extends ServiceImpl<ProEconStaOriginalIndexMapper, ProEconStaOriginalIndex> implements IProEconStaOriginalIndexService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconStaOriginalMonth;
+import com.gyee.generation.mapper.auto.ProEconStaOriginalMonthMapper;
+import com.gyee.generation.service.auto.IProEconStaOriginalMonthService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Service
+public class ProEconStaOriginalMonthServiceImpl extends ServiceImpl<ProEconStaOriginalMonthMapper, ProEconStaOriginalMonth> implements IProEconStaOriginalMonthService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconStaOriginalYear;
+import com.gyee.generation.mapper.auto.ProEconStaOriginalYearMapper;
+import com.gyee.generation.service.auto.IProEconStaOriginalYearService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Service
+public class ProEconStaOriginalYearServiceImpl extends ServiceImpl<ProEconStaOriginalYearMapper, ProEconStaOriginalYear> implements IProEconStaOriginalYearService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconStaTarget;
+import com.gyee.generation.mapper.auto.ProEconStaTargetMapper;
+import com.gyee.generation.service.auto.IProEconStaTargetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Service
+public class ProEconStaTargetServiceImpl extends ServiceImpl<ProEconStaTargetMapper, ProEconStaTarget> implements IProEconStaTargetService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconTableBottomStatistic;
+import com.gyee.generation.mapper.auto.ProEconTableBottomStatisticMapper;
+import com.gyee.generation.service.auto.IProEconTableBottomStatisticService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2023-02-21
+ */
+@Service
+public class ProEconTableBottomStatisticServiceImpl extends ServiceImpl<ProEconTableBottomStatisticMapper, ProEconTableBottomStatistic> implements IProEconTableBottomStatisticService {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/CycleCalculationService.java

@@ -32,7 +32,7 @@ public class CycleCalculationService {
 
         Date currentDate = DateUtils.getCurrentDate();
 
-        Date date = DateUtils.addSeconds(currentDate, -1);
+        Date date = DateUtils.addMinutes(currentDate, -5);
         Date date15age = DateUtils.addMinutes(currentDate, -15);
 
         Date samedayZero = DateUtils.getSamedayZero();
@@ -297,7 +297,7 @@ public class CycleCalculationService {
                 double nzsdl = 0;
 
 
-                if (currentDate.getTime()>samedayZero.getTime() && currentDate.getTime()<=samedayZeroAdd15.getTime()){
+                if (date.getTime()>samedayZero.getTime() && date.getTime()<=samedayZeroAdd15.getTime()){
                     rpjfs = dataMap.get("pjfs");
                     rpjgl = dataMap.get("pjgl");
                     rkydl = dataMap.get("kydl");
@@ -365,7 +365,7 @@ public class CycleCalculationService {
                         rzfdl = Math.abs(temp);
                     }
                 }
-                if (currentDate.getTime()>monthFirstZero.getTime() && currentDate.getTime()<=monthFirstZeroAdd15.getTime()){
+                if (date.getTime()>monthFirstZero.getTime() && date.getTime()<=monthFirstZeroAdd15.getTime()){
                     ypjfs = dataMap.get("pjfs");
                     ypjgl = dataMap.get("pjgl");
                     ykydl = dataMap.get("kydl");
@@ -435,7 +435,7 @@ public class CycleCalculationService {
                         yzfdl = Math.abs(temp);
                     }
                 }
-                if (currentDate.getTime()>yearFirstZero.getTime() && currentDate.getTime()<=yearFirstZeroAdd15.getTime()){
+                if (date.getTime()>yearFirstZero.getTime() && date.getTime()<=yearFirstZeroAdd15.getTime()){
                     npjfs = dataMap.get("pjfs");
                     npjgl = dataMap.get("pjgl");
                     nkydl = dataMap.get("kydl");

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/StatusService.java

@@ -88,6 +88,7 @@ public class StatusService {
             Map<String, ProBasicPowerstationPoint> stringProBasicPowerstationPointMap = subwppointmap.get(sub.getId());
 
             ProBasicPowerstationPoint agcPoint = stringProBasicPowerstationPointMap.get(ContantXk.TPOINT_WP_AGC);
+
             ProBasicPowerstationPoint cxglPoint = stringProBasicPowerstationPointMap.get(ContantXk.TPOINT_WP_CXGL);
             ProBasicPowerstationPoint xdztPoint = stringProBasicPowerstationPointMap.get(ContantXk.TPOINT_WP_XDZT);
             ProBasicPowerstationPoint zsglPoint = stringProBasicPowerstationPointMap.get(ContantXk.TPOINT_WP_ZSGL);
@@ -166,6 +167,7 @@ public class StatusService {
                 }
             }
             double xdValue = 0;
+
             if (b){
                 xdValue = 1;
                 //判断风机是否限电
@@ -216,9 +218,11 @@ public class StatusService {
 
                 });
             }
-
-            resultList.add(PointUtil.createPointData(currentDate,xdValue,xdztPoint.getNemCode(),xdztPoint.getName()));
-
+            if (agcPoint.getNemCode().equals("INITIAL")){
+                resultList.add(PointUtil.createPointData(currentDate,0,xdztPoint.getNemCode(),xdztPoint.getName()));
+            }else{
+                resultList.add(PointUtil.createPointData(currentDate,xdValue,xdztPoint.getNemCode(),xdztPoint.getName()));
+            }
         });
         edosUtil.sendMultiPoint(resultList);
     }

realtime/generationXK-service/src/main/resources/application-hf.yml

@@ -34,7 +34,8 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://10.0.118.76:5432/IMS_NEM?rewriteBatchedStatements=true
+#    url: jdbc:postgresql://10.0.118.76:5432/IMS_NEM?rewriteBatchedStatements=true
+    url: jdbc:postgresql://localhost:5432/IMS_NEM
     username: postgres
     password: gd123
     #    url: jdbc:postgresql://124.70.75.91:5432/jn_test?rewriteBatchedStatements=true

realtime/generationXK-service/src/main/resources/application-xny.yml

@@ -83,8 +83,8 @@ mybatis-plus:
       logic-delete-value: 0
 logging:
   level:
-    root: info
-    com.example: debug
+    root: error
+    com.example: error
 #db url
 db:
   url: http://10.153.172.65:8011/ts
@@ -94,7 +94,7 @@ db:
 #runWindpowerstation: SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_GHTZ_HZJ_GDC_STA
 #runWindpowerstation: HNX_SXNY_FRS_FDC_STA,HNX_SXNY_HJL_FDC_STA,HNX_SXNY_FL_FDC_STA
 #runWindpowerstation: SDL_SXNY_FXFC_FDC_STA,SDL_SXNY_JNSS_FDC_STA,SDL_SXNY_WFBH_FDC_STA,SDL_SXNY_PLHS_FDC_STA,SDL_SXNY_JNCQ_FDC_STA,SDL_SXNY_LQJS_FDC_STA,SDL_SXNY_ZYXD_FDC_STA,SDL_SXNY_ZYFS_FDC_STA,SDL_SXNY_LYJN_FDC_STA
-runWindpowerstation: SDL_SXNY_JNSS_FDC_STA
+runWindpowerstation: SDL_SXNY_ZYXD_FDC_STA
 #判断数据终端
 second: 1800
 #判断降出力

realtime/generationXK-service/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: xny
+    active: hf
 #    active: yun
 
 #    active: td

realtime/generationXK-service/src/main/resources/xxl-job-executor.properties

@@ -19,7 +19,7 @@ xxl.job.executor.port=9201
 #xxl.job.executor.port=9202
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=E:\\jobs\\generationWP-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

realtime/generationXK-service/src/main/resources/xxl-job-executorRG.properties

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9202
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=C:\\jobs\\generationRG-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

realtime/generationXK-service/src/main/resources/xxl-job-executorWPGD.properties

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9301
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=C:\\jobs\\generationWPGD-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

realtime/generationXK-service/src/main/resources/xxl-job-executorWPGH.properties

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9303
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=C:\\jobs\\generationWPGH-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

realtime/generationXK-service/src/main/resources/xxl-job-executorWPLY.properties

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9302
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=C:\\jobs\\generationWPLY-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

realtime/generationXK-service/src/main/resources/xxl-job-executorWPXNY.properties

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9304
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=C:\\jobs\\generationWPXNY-job
+xxl.job.executor.logpath=/data/nem/computeEngine/logs
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

web/consumer-hb/src/main/java/com/gyee/consumer/controller/monitor/GenreSetPushController.java

@@ -245,4 +245,14 @@ public class GenreSetPushController {
         return ajax;
     }
 
+    @GetMapping(value = "/Powercurve24")
+    @ApiOperation(value = "24小时功率曲线", notes = "24小时功率曲线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query")})
+    @ResponseBody
+    public AjaxResult Powercurve24(@RequestParam("wpId") String wpId) throws Exception {
+        AjaxResult ajax= genreSetPushService.Powercurve24(wpId);
+        return ajax;
+    }
+
 }

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/monitor/GenreSetPushServiceFallbackFactory.java

@@ -74,6 +74,11 @@ public class GenreSetPushServiceFallbackFactory implements FallbackFactory<Genre
             }
 
             @Override
+            public AjaxResult Powercurve24(String wpId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
             public AjaxResult findBasicDataInfo_fcmap(@RequestParam("id") String id) throws Exception{
                 return  AjaxResult.error(throwable.getMessage());
             }

web/consumer-hb/src/main/java/com/gyee/consumer/service/monitor/GenreSetPushService.java

@@ -69,4 +69,7 @@ public interface GenreSetPushService {
 
     @GetMapping("/genreset/Stationinformation")
     public AjaxResult  Stationinformation(@RequestParam("wpId")String wpId);
+
+    @GetMapping("/genreset/Powercurve24")
+    public AjaxResult  Powercurve24(@RequestParam("wpId")String wpId) throws Exception;
 }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -171,6 +171,8 @@ public class InitialRunner implements CommandLineRunner {
     public static Map<String, Map<String, WindTurbineTestingPointaiyj>> wtpAiyjmap = new HashMap<String, Map<String, WindTurbineTestingPointaiyj>>();// 风电机测点AI表--针对风机预警
     public static Map<String, Map<String, Object>> appendYcglMap = new HashMap<String, Map<String, Object>>();// 预测功率追加
 
+    public static Map<String, List<Windpowerstation>> wpmapls = new HashMap<String, List<Windpowerstation>>();
+
     /***********************************************光伏初始化*************************************************************/
     public static Map<String,Square> sqmap = new HashMap<String, Square>();
 
@@ -498,6 +500,17 @@ public class InitialRunner implements CommandLineRunner {
                 }
 
 
+                if(wpmapls.containsKey(wp.getId()))
+                {
+                    List<Windpowerstation> ls=wpmapls.get(wp.getId());
+                    ls.add(wp);
+                    wpmapls.put(wp.getId(),ls);
+                }else {
+                    List<Windpowerstation> ls=new ArrayList<>();
+                    ls.add(wp);
+                    wpmapls.put(wp.getId(),ls);
+                }
+
                 if(re_wpmap.containsKey(wp.getCompanyid()+QS))
                 {
                     List<Windpowerstation> ls=re_wpmap.get(wp.getCompanyid()+QS);

web/monitor-web-sxjn/src/main/java/com/gyee/frame/controller/monitor/GenreSetPushController.java

@@ -5,9 +5,11 @@ import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.custom.DataVo;
+import com.gyee.frame.model.custom.PowercurveVo;
 import com.gyee.frame.service.ForecastwindspeedService;
 import com.gyee.frame.service.WindpowerstationPGService;
 import com.gyee.frame.service.websocket.*;
+import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -27,7 +29,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/genreset")
-@Api(value = "驾驶舱" ,tags =  "驾驶舱")
+@Api(value = "驾驶舱", tags = "驾驶舱")
 public class GenreSetPushController {
 
     @Resource
@@ -62,12 +64,12 @@ public class GenreSetPushController {
     public AjaxResult getAgcValues() throws Exception {
 
 
-        List<Map<String, Object>> vos=  new ArrayList<>();
+        List<Map<String, Object>> vos = new ArrayList<>();
 
 
-        vos=agcService.getAgcValues();
+        vos = agcService.getAgcValues();
 
-        if (null!=vos){
+        if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, vos);
@@ -78,22 +80,21 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
 
-            map=genreSetPushService.findBasicDataInfo(id);
+            map = genreSetPushService.findBasicDataInfo(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -102,25 +103,23 @@ public class GenreSetPushController {
     }
 
 
-
     @GetMapping("/findBasicDataInfo_fcmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_fcmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_fcmap(id);
+            map = genreSetPushService.findBasicDataInfo_fcmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -132,21 +131,20 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo_mxztmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_mxztmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_mxztmap(id);
+            map = genreSetPushService.findBasicDataInfo_mxztmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -158,21 +156,20 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo_jczbmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_jczbmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_jczbmap(id);
+            map = genreSetPushService.findBasicDataInfo_jczbmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -184,21 +181,20 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo_tqmap_xtmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_tqmap_xtmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_tqmap_xtmap(id);
+            map = genreSetPushService.findBasicDataInfo_tqmap_xtmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -210,21 +206,20 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo_wxssmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_wxssmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_wxssmap(id);
+            map = genreSetPushService.findBasicDataInfo_wxssmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -235,21 +230,20 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo_gxkmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_gxkmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_gxkmap(id);
+            map = genreSetPushService.findBasicDataInfo_gxkmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -260,21 +254,20 @@ public class GenreSetPushController {
     @GetMapping("/findPowerInfo")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱功率曲线图和电量柱状图信息", notes = "获取驾驶舱功率曲线图和电量柱状图信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findPowerInfo(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findPowerInfo(id);
+            map = genreSetPushService.findPowerInfo(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -294,10 +287,10 @@ public class GenreSetPushController {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName) ) {
+        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
             if (InitialRunner.wpmap.containsKey(id)) {
 
@@ -314,7 +307,7 @@ public class GenreSetPushController {
         }
 
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -335,11 +328,11 @@ public class GenreSetPushController {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName) ) {
+        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName)) {
 
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
             if (InitialRunner.wpmap.containsKey(id)) {
 
@@ -356,7 +349,7 @@ public class GenreSetPushController {
         }
 
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -376,10 +369,10 @@ public class GenreSetPushController {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName) ) {
+        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
             if (InitialRunner.wpmap.containsKey(id)) {
 
@@ -396,8 +389,7 @@ public class GenreSetPushController {
         }
 
 
-
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -416,11 +408,11 @@ public class GenreSetPushController {
 
 
         List<DataVo> vos = new ArrayList<DataVo>();
-        if (StringUtils.notEmp(id)  ) {
+        if (StringUtils.notEmp(id)) {
 
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
             if (InitialRunner.wpmap.containsKey(id)) {
 
@@ -437,8 +429,7 @@ public class GenreSetPushController {
         }
 
 
-
-        if (null!=vos){
+        if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, vos);
@@ -458,16 +449,16 @@ public class GenreSetPushController {
 
         if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-            id=QY+id;
+            id = QY + id;
         }
         List<Object> vos = new ArrayList<Object>();
         //       Map<String, List> vos = new HashMap<String, List>();
 
-        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName) ) {
-            vos = realPowerPushService.findGLDetail(id,targetName);
+        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName)) {
+            vos = realPowerPushService.findGLDetail(id, targetName);
         }
 
-        if (null!=vos){
+        if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, vos);
@@ -508,14 +499,14 @@ public class GenreSetPushController {
 
         if (wpId.equals(QS) || wpId.equals(FD) || wpId.equals(GF)) {
 
-            wpId=QY+wpId;
+            wpId = QY + wpId;
         }
-        Map<String,Object> retValue = new HashMap<String, Object>();
-        if (StringUtils.notEmp(wpId) ) {
+        Map<String, Object> retValue = new HashMap<String, Object>();
+        if (StringUtils.notEmp(wpId)) {
             retValue = genreSetPushService.getWeatherRealDay5Info(wpId);
         }
 
-        if (null!=retValue){
+        if (null != retValue) {
             return AjaxResult.successData(AjaxStatus.success.code, retValue);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, retValue);
@@ -533,18 +524,18 @@ public class GenreSetPushController {
 
         if (wpId.equals(QS) || wpId.equals(FD) || wpId.equals(GF)) {
 
-            wpId=QY+wpId;
+            wpId = QY + wpId;
         }
-        Map<String,Object> map=new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         List<DataVo> retValue = new ArrayList<>();
-        List<String> datels=new ArrayList<>();
+        List<String> datels = new ArrayList<>();
 
         retValue = forecastwindspeedService.getForecastwindspeedInfo(wpId);
         datels = forecastwindspeedService.getDayInfo();
 
-        map.put("retValue",retValue);
-        map.put("datels",datels);
-        if (null!=map){
+        map.put("retValue", retValue);
+        map.put("datels", datels);
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -558,12 +549,13 @@ public class GenreSetPushController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R wtls() {
         List<Map> resultList = windpowerstationPGService.hso();
-        if (null != resultList){
+        if (null != resultList) {
             return R.ok().data(resultList);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
     }
+
     @GetMapping("/Stationinformation")
     @ResponseBody
     @ApiOperation(value = "场站容量信息", notes = "场站容量信息")
@@ -574,11 +566,31 @@ public class GenreSetPushController {
 
         Map m = genreSetPushService.Stationinformation(wpId);
 
-        if (null!=m){
+        if (null != m) {
             return AjaxResult.successData(AjaxStatus.success.code, m);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, m);
         }
 
     }
+
+    @GetMapping("/Powercurve24")
+    @ResponseBody
+    @ApiOperation(value = "24小时功率曲线", notes = "24小时功率曲线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult Powercurve24(String wpId) throws Exception {
+
+        List<PowercurveVo> resultList = new ArrayList<>();
+        if (StringUtils.notEmp(wpId)) {
+            resultList = genreSetPushService.Powercurve24(wpId);
+        }
+
+        if (resultList != null) {
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
+        }
+
+    }
 }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/custom/PowercurveVo.java

@@ -0,0 +1,63 @@
+package com.gyee.frame.model.custom;
+
+public class PowercurveVo {
+    private Double yfgl;
+
+    private Double sjgl;
+
+    private Double ssfs;
+
+    private Double bzgl;
+
+    private Integer hours;
+
+    private String name;
+
+    public Double getYfgl() {
+        return yfgl;
+    }
+
+    public void setYfgl(Double yfgl) {
+        this.yfgl = yfgl;
+    }
+
+    public Double getSjgl() {
+        return sjgl;
+    }
+
+    public void setSjgl(Double sjgl) {
+        this.sjgl = sjgl;
+    }
+
+    public Double getSsfs() {
+        return ssfs;
+    }
+
+    public void setSsfs(Double ssfs) {
+        this.ssfs = ssfs;
+    }
+
+    public Double getBzgl() {
+        return bzgl;
+    }
+
+    public void setBzgl(Double bzgl) {
+        this.bzgl = bzgl;
+    }
+
+    public Integer getHours() {
+        return hours;
+    }
+
+    public void setHours(Integer hours) {
+        this.hours = hours;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -5,10 +5,7 @@ import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.*;
-import com.gyee.frame.model.custom.DNAVal;
-import com.gyee.frame.model.custom.DataVo;
-import com.gyee.frame.model.custom.MatrixVo;
-import com.gyee.frame.model.custom.PointData;
+import com.gyee.frame.model.custom.*;
 import com.gyee.frame.service.*;
 import com.gyee.frame.service.photovolatic.PhotovoltaicTestingPointNewService;
 import com.gyee.frame.service.weather.WeatherDay5Service;
@@ -19,6 +16,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
@@ -1733,6 +1731,10 @@ public class GenreSetPushService {
                 //初始化场站信息
 
                 List<Windpowerstation> wplist = new ArrayList<>();
+//
+//                if (InitialRunner.wpmapls.containsKey(id)) {
+//                    wplist = InitialRunner.wpmapls.get(id);
+//                }
 
                 if (InitialRunner.re_wpmap.containsKey(id)) {
                     wplist = InitialRunner.re_wpmap.get(id);
@@ -4337,20 +4339,20 @@ public class GenreSetPushService {
             for (ProjectPG p : projectPGs) {
                 Map qcls = new LinkedHashMap();
                 i++;
-                qcls.put("id",i);
-                qcls.put("name",p.getName()); //name : GJY01_GC
-                qcls.put("value",  p.getCapacity());//value :45
+                qcls.put("id", i);
+                qcls.put("name", p.getName()); //name : GJY01_GC
+                qcls.put("value", p.getCapacity());//value :45
                 linenum = linenum + InitialRunner.pjlnpgmap.get(p.getId()).size();
                 qc.add(qcls);
             }
 
             czxx.put("linenum", linenum);
             czxx.put("fjts", windpowerstationPG.getQuantity());//风机台数
-            czxx.put("issue",qc);
+            czxx.put("issue", qc);
             return czxx;
         } catch (Exception e) {
             e.printStackTrace();
-            logger.error("异常",e);
+            logger.error("异常", e);
             return null;
         }
 
@@ -4418,6 +4420,80 @@ public class GenreSetPushService {
 //        return list;
     }
 
+    //24小时功率曲线
+    public List<PowercurveVo> Powercurve24(String wpId) throws Exception {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        Date beginDate = com.gyee.common.util.DateUtils.getSamedayZero();   //当日零点
+        Date endDate = com.gyee.common.util.DateUtils.getCurrentDate();   //当前时间
+        List<PowercurveVo> vos = new ArrayList<PowercurveVo>();
+//        if (InitialRunner.wpmapls.containsKey(wpId) || InitialRunner.pjsmap.containsKey(wpId) || InitialRunner.lnsmap.containsKey(wpId)) {
+
+            //初始化场站信息
+            List<Windpowerstation> wplist = new ArrayList<>();
+            List<Project> projects = new ArrayList<>();
+            List<Line> lines = new ArrayList<>();
+
+            if (InitialRunner.wpmapls.containsKey(wpId)) {
+                wplist = InitialRunner.wpmapls.get(wpId);
+            } else {
+                if (InitialRunner.pjsmap.containsKey(wpId)){
+                    projects = InitialRunner.pjsmap.get(wpId);
+                }else {
+                    if (InitialRunner.lnsmap.containsKey(wpId)){
+                        lines = InitialRunner.lnsmap.get(wpId);
+                    }
+                }
+            }
+
+            for (int i = 0; i < 24; i++) {
+                PowercurveVo vo = new PowercurveVo();
+                vo.setYfgl(0.0); //应发功率
+                vo.setSjgl(0.0); //实际功率
+                vo.setSsfs(0.0); //实时风速
+                vo.setBzgl(0.0); //保证功率
+                vo.setHours(i);  //时间戳
+                vo.setName(wpId);
+                vos.add(vo);
+            }
+
+            Windpowerstationpointnew yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_ZZSGL);
+            Windpowerstationpointnew sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+            Windpowerstationpointnew ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+            Windpowerstationpointnew bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.ZBZGL);
+
+            List<PointData> yfglls = realApiUtil.getHistoryDatasSnap(yfgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp1 = 0;
+            for (int i = 0; i < yfglls.size(); i++) {
+                temp1 = yfglls.get(i).getPointValueInDouble();
+                vos.get(i).setYfgl(StringUtils.round(temp1, 2));
+            }
+
+            List<PointData> sjglls = realApiUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp2 = 0;
+            for (int i = 0; i < sjglls.size(); i++) {
+                temp2 = sjglls.get(i).getPointValueInDouble();
+                vos.get(i).setSjgl(StringUtils.round(temp2, 2));
+            }
+
+            List<PointData> ssfsls = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp3 = 0;
+            for (int i = 0; i < ssfsls.size(); i++) {
+                temp3 = ssfsls.get(i).getPointValueInDouble();
+                vos.get(i).setSsfs(StringUtils.round(temp3, 2));
+            }
+            List<PointData> bzglls = realApiUtil.getHistoryDatasSnap(bzgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp4 = 0;
+            for (int i = 0; i < bzglls.size(); i++) {
+                temp4 = bzglls.get(i).getPointValueInDouble();
+                vos.get(i).setBzgl(StringUtils.round(temp4, 2));
+
+            }
+//        }
+        return vos;
+        }
+
 
 }
 

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

@@ -163,7 +163,8 @@ public class WpInfoPushService {
             if (!jczblist.isEmpty() && jczblist.size() == jczbls.size()) {
                 //实际功率
                 sjgl = MathUtil.twoBit(jczblist.get(0).getPointValueInDouble());
-                vo.setGl(sjgl);
+                BigDecimal a2 = new BigDecimal(sjgl).divide(new BigDecimal(10000),3, BigDecimal.ROUND_HALF_UP);
+                vo.setGl(a2.doubleValue());
                 //jczbmap.put("sjgl", sjgl);
                 //日发电量
                 double fdl = MathUtil.twoBit(jczblist.get(1).getPointValueInDouble());
@@ -649,8 +650,10 @@ public class WpInfoPushService {
 
                 //wxssmap.put("rslssdl", rslssdl);
                 vo.setSlss(rslssdl);
-                vo.setLlfdl(MathUtil.twoBit(scadafdl + rjxssdl + rgzssdl + rqfssdl + rxdssdl + rslssdl)/10000);
+//                vo.setLlfdl(MathUtil.twoBit(scadafdl + rjxssdl + rgzssdl + rqfssdl + rxdssdl + rslssdl)/10000);
 
+                BigDecimal b3 = new BigDecimal(scadafdl+rjxssdl + rgzssdl + rqfssdl + rxdssdl + rslssdl).divide(new BigDecimal(10000),2, BigDecimal.ROUND_HALF_UP);
+                vo.setLlfdl(b3.doubleValue());
             } else {
 
                 wxssmap.put("rjxsl", 0.0);

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -719,7 +719,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -756,7 +756,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -866,7 +866,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -903,7 +903,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -1012,7 +1012,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1049,7 +1049,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
 
@@ -1159,7 +1159,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1196,7 +1196,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -1305,7 +1305,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1342,7 +1342,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -1451,7 +1451,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1488,7 +1488,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -1597,7 +1597,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1635,7 +1635,7 @@ public class SpecificService {
             });
         }
 
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
         return resultendList;
     }
 
@@ -1743,7 +1743,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1780,7 +1780,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -1889,7 +1889,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -1926,7 +1926,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -2035,7 +2035,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -2072,7 +2072,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -2181,7 +2181,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -2218,7 +2218,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -2328,7 +2328,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -2365,7 +2365,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }
@@ -2474,7 +2474,7 @@ public class SpecificService {
             wpids.stream().forEach(wpid->{
                 SpecificTarget vo = new SpecificTarget();
                 vo.setWpid(wpid);
-                int orderNum = 0;
+                int orderNum = 100;
                 if(wpid.contains("_ZGS")){
                     vo.setWpname(CacheContext.cpmap.get(companys).getAname());
                 }else if(wpid.contains("_RGN")){
@@ -2511,7 +2511,7 @@ public class SpecificService {
                 resultendList.add(vo);
             });
         }
-        SortUtils.sort(resultendList,"orderNum",SortUtils.DESC);
+        SortUtils.sort(resultendList,"orderNum",SortUtils.ASC);
 
         return resultendList;
     }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/util/realtimesource/EdosUtil.java

@@ -28,7 +28,7 @@ import java.util.*;
 public class EdosUtil implements IEdosUtil {
 
     private RestTemplate restTemplate =new RestTemplate();
-    @Value("${gyee.adapter-url}")
+    @Value("${db.url}")
     private String baseURL;
 
     @Value("${initialcode}")

web/runeconomy-xk/src/main/resources/application-yun.yml

@@ -110,4 +110,3 @@ db:
   #url: http://192.168.11.250:8011/ts
 
   #url: http://192.168.11.250:8011/ts
-runWindpowerstation: SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_GHTZ_HZJ_GDC_STA