经济运行项目提交

web/runeconomy-xk/pom.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>web</artifactId>
+        <groupId>com.gyee</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>runeconomy-xk</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.gyee</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.7</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--nacos 依赖-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.alibaba.cloud</groupId>-->
+        <!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-redis</artifactId>
+        </dependency>
+
+        <!-- 添加swagger2 -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-models</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>none</mainClass>     <!-- 取消查找本项目下的Main方法：为了解决Unable to find main class的问题 -->
+                    <classifier>execute</classifier>    <!-- 为了解决依赖模块找不到此模块中的类或属性 -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

@@ -0,0 +1,17 @@
+package com.gyee.runeconomy;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+@SpringBootApplication
+@MapperScan("com.gyee.runeconomy.mapper")
+public class RunEconomyApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(RunEconomyApplication.class, args);
+
+    }
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/config/CorsConfig.java

@@ -0,0 +1,26 @@
+package com.gyee.runeconomy.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @ClassName : CorsConfig
+ * @Author : xieshengjie
+ * @Date: 2021/6/28 20:00
+ * @Description :
+ */
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+
+    static final String[] ORIGINS = new String[]{"GET", "POST", "PUT", "DELETE"};  //请求方式
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**") //所有的当前站点的请求地址，都支持跨域访问
+                .allowedOrigins("*")// 所有的外部域都可跨域访问,这里注意2.4.0以后是allowedOriginPatterns，以前是allowedOrigins
+                .allowCredentials(true)  //是否支持跨域用户凭证
+                .allowedMethods(ORIGINS) //当前站点支持的跨域请求类型是什么
+                .maxAge(3600);  //超是时长，单位为秒。
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/config/GeneratorCodeConfig.java

@@ -0,0 +1,149 @@
+package com.gyee.runeconomy.config;
+
+
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+
+import java.util.Scanner;
+
+/**
+ *@ClassName GeneratorCodeConfig
+ *@Description 自动生成mybatisplus的相关代码
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:26
+ *@Version 1.0
+ **/
+public class GeneratorCodeConfig {
+    public static String scanner(String tip) {
+        Scanner scanner = new Scanner(System.in);
+        StringBuilder help = new StringBuilder();
+        help.append("请输入" + tip + "：");
+        System.out.println(help.toString());
+        if (scanner.hasNext()) {
+            String ipt = scanner.next();
+            if (StringUtils.isNotEmpty(ipt)) {
+                return ipt;
+            }
+        }
+        throw new MybatisPlusException("请输入正确的" + tip + "！");
+    }
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        String projectPath = System.getProperty("user.dir");
+        gc.setOutputDir("D:\\workspace\\sis\\web\\runeconomy-xk\\src\\main\\java");
+        gc.setAuthor("wang");
+        gc.setOpen(false);
+        //实体属性 Swagger2 注解
+        gc.setSwagger2(false);
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        /*dsc.setUrl("jdbc:mysql://127.0.0.1:3306/test?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true");
+        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setUsername("root");
+        dsc.setPassword("root");
+        mpg.setDataSource(dsc);*/
+//        dsc.setDriverName("oracle.jdbc.driver.OracleDriver"); 注意大写
+//        dsc.setUsername("gdprod");
+//        dsc.setPassword("gd123");
+//        dsc.setUrl("jdbc:oracle:thin:@10.81.3.151:1521:gdsj");
+
+        dsc.setDriverName("org.postgresql.Driver");
+        dsc.setUsername("postgres");
+        dsc.setPassword("gd123");
+        dsc.setUrl("jdbc:postgresql://124.70.75.91:5432/jn_test");
+
+        mpg.setDataSource(dsc);
+
+
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+//        pc.setModuleName(scanner("模块名"));
+        pc.setParent("com.gyee.runeconomy");
+        pc.setEntity("model.auto");
+        pc.setMapper("mapper.auto");
+        pc.setService("service.auto");
+        pc.setServiceImpl("service.auto.impl");
+        mpg.setPackageInfo(pc);
+
+        // 自定义配置
+//        InjectionConfig cfg = new InjectionConfig() {
+//            @Override
+//            public void initMap() {
+//                // to do nothing
+//            }
+//        };
+
+        // 如果模板引擎是 freemarker
+//        String templatePath = "/templates/mapper.xml.ftl";
+        // 如果模板引擎是 velocity
+        // String templatePath = "/templates/mapper.xml.vm";
+
+        // 自定义输出配置
+//        List<FileOutConfig> focList = new ArrayList<>();
+        // 自定义配置会被优先输出
+//        focList.add(new FileOutConfig(templatePath) {
+//            @Override
+//            public String outputFile(TableInfo tableInfo) {
+//                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+//                return projectPath + "/src/main/resources/mapper/" + pc.getModuleName()
+//                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+//            }
+//        });
+        /*
+        cfg.setFileCreate(new IFileCreate() {
+            @Override
+            public boolean isCreate(ConfigBuilder configBuilder, FileType fileType, String filePath) {
+                // 判断自定义文件夹是否需要创建
+                checkDir("调用默认方法创建的目录");
+                return false;
+            }
+        });
+        */
+//        cfg.setFileOutConfigList(focList);
+//        mpg.setCfg(cfg);
+
+        // 配置模板
+        TemplateConfig templateConfig = new TemplateConfig();
+
+        // 配置自定义输出模板
+        //指定自定义模板路径，注意不要带上.ftl/.vm, 会根据使用的模板引擎自动识别
+        // templateConfig.setEntity("templates/entity2.java");
+        // templateConfig.setService();
+        // templateConfig.setController();
+
+        templateConfig.setXml(null);
+        mpg.setTemplate(templateConfig);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setSuperEntityClass("com.baomidou.mybatisplus.extension.activerecord.Model");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+
+        strategy.setEntityLombokModel(true);
+        // 公共父类
+//        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
+        // 写于父类中的公共字段
+//        strategy.setSuperEntityColumns("id");
+        strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setTablePrefix(pc.getModuleName() + "_");
+        mpg.setStrategy(strategy);
+        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
+        mpg.execute();
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/config/MybatisPlusConfig.java

@@ -0,0 +1,63 @@
+package com.gyee.runeconomy.config;
+
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
+import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Date;
+
+/**
+ *@ClassName MybatisPlusConfig
+ *@Description 配置分页插件
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:24
+ *@Version 1.0
+ **/
+@Configuration
+public class MybatisPlusConfig {
+    /**
+     * 分页插件
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+
+    /**
+     * @description:
+     * @author: xiruipeng 
+     * @date: 2022/9/16 15:08
+     * @param: []
+     * @return: com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor
+     **/
+    @Bean
+    public OptimisticLockerInterceptor optimisticLockerInterceptor(){
+        return new OptimisticLockerInterceptor();
+    }
+
+
+    /**
+     * 自定义主键生成：生成的 当前时间 + 随机数的格式
+     * @return
+     */
+    @Bean
+    public IdentifierGenerator idGenerator() {
+        return new IdentifierGenerator() {
+            @Override
+            public Number nextId(Object entity) {
+                return null;
+            }
+
+            @Override
+            public String nextUUID(Object entity) {
+                return DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN)+ IdUtil.simpleUUID();
+            }
+        };
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProBasicCompanyController.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 省公司表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-basic-company")
+public class ProBasicCompanyController {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProBasicEnergyGroupController.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 集团 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-basic-energy-group")
+public class ProBasicEnergyGroupController {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProBasicEquipmentController.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 风机&光伏 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-basic-equipment")
+public class ProBasicEquipmentController {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProBasicLineController.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 集电线路 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-basic-line")
+public class ProBasicLineController {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProBasicPowerstationController.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 场站表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-basic-powerstation")
+public class ProBasicPowerstationController {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProBasicProjectController.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 工程表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-basic-project")
+public class ProBasicProjectController {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProBasicRegionController.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 区域 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-basic-region")
+public class ProBasicRegionController {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProBasicSquareController.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 方阵 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-basic-square")
+public class ProBasicSquareController {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProBasicSubStationController.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 调度场站名称 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-basic-sub-station")
+public class ProBasicSubStationController {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconPointCodeController.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 指标查询表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-23
+ */
+@RestController
+@RequestMapping("//pro-econ-point-code")
+public class ProEconPointCodeController {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconPowerstationInfoDay1Controller.java

@@ -0,0 +1,54 @@
+package com.gyee.runeconomy.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.runeconomy.dto.R;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 场站五损电量 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-21
+ */
+@RestController
+@RequestMapping("//pro-econ-powerstation-info-day1")
+public class ProEconPowerstationInfoDay1Controller {
+
+
+    @Resource
+    private IProEconPowerstationInfoDay1Service proEconPowerstationInfoDay1Service;
+
+    /**
+     * 查询
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping(value = "/listByPage")
+    @ApiOperation(value = "省公司-列表", notes = "省公司-列表")
+    public R findList(@RequestParam(value = "pageNum", required = true) String pageNum,
+                      @RequestParam(value = "pageSize", required = true) String pageSize) {
+        IPage<ProEconPowerstationInfoDay1> list = proEconPowerstationInfoDay1Service.list(pageNum,pageSize);
+        if (null != list) {
+            return R.ok().data(list);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconPowerstationInfoDay2Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 场站五损时间 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-econ-powerstation-info-day2")
+public class ProEconPowerstationInfoDay2Controller {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconPowerstationInfoDay3Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 场站五损次数 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-econ-powerstation-info-day3")
+public class ProEconPowerstationInfoDay3Controller {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconPowerstationInfoDay4Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 场站三率mtbf 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-econ-powerstation-info-day4")
+public class ProEconPowerstationInfoDay4Controller {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconPowerstationInfoDay5Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 电表发电量 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-econ-powerstation-info-day5")
+public class ProEconPowerstationInfoDay5Controller {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconPowerstationInfoDay6Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 测风塔出线功率 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-econ-powerstation-info-day6")
+public class ProEconPowerstationInfoDay6Controller {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/ProEconPowerstationInfoDay7Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 离散率系统效率 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//pro-econ-powerstation-info-day7")
+public class ProEconPowerstationInfoDay7Controller {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/homepage/EconomyHomePageController.java

@@ -0,0 +1,66 @@
+package com.gyee.runeconomy.controller.homepage;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.runeconomy.dto.R;
+import com.gyee.runeconomy.dto.response.EconHomePagePointRateDTO;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.service.homepage.EconomyPointHomePageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 省公司表 前端控制器
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@RestController
+@RequestMapping("//economy")
+public class EconomyHomePageController {
+
+
+    @Autowired
+    private EconomyPointHomePageService economyPointHomePageService;
+
+
+    /**
+     * 经济运行首页指标
+     *
+     * @param regionId
+     * @param companyId
+     * @param windpowerstationId
+     * @param projectId
+     * @param lineId
+     * @param staType
+     * @param dateType
+     * @return
+     */
+    @GetMapping(value = "/home-page")
+    @ApiOperation(value = "经济运行-首页", notes = "经济运行-首页")
+    public R getEconomyPointHomePageInfo(@RequestParam(value = "regionId", required = false) String regionId,
+                                         @RequestParam(value = "companyId", required = false) String companyId,
+                                         @RequestParam(value = "windpowerstationId", required = false) String windpowerstationId,
+                                         @RequestParam(value = "projectId", required = false) String projectId,
+                                         @RequestParam(value = "lineId", required = false) String lineId,
+                                         @RequestParam(value = "staType", required = true) String staType,
+                                         @RequestParam(value = "dateType", required = true) String dateType) throws Exception {
+
+        EconHomePagePointRateDTO dto = economyPointHomePageService.getEconomyPointHomePageInfo(regionId, companyId, windpowerstationId, projectId, lineId, staType, dateType);
+        if (null != dto) {
+            return R.ok().data(dto);
+        } else {
+            return R.error().data("查询失败！");
+        }
+    }
+
+
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/R.java

@@ -0,0 +1,71 @@
+package com.gyee.runeconomy.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ClassName : R
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 16:59
+ * @Description : 结果集
+ */
+@Data
+public class R {
+    @ApiModelProperty(value = "是否成功")
+    private Boolean success;
+    @ApiModelProperty(value = "返回码")
+    private Integer code;
+    @ApiModelProperty(value = "返回消息")
+    private String message;
+    @ApiModelProperty(value = "总数量")
+    private Integer count;
+    @ApiModelProperty(value = "返回数据")
+    private Object data = new Object();
+    private R(){}
+    public static R ok(){
+        R r = new R();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setMessage("成功");
+        return r;
+    }
+    public static R ok(Integer count){
+        R r = new R();
+        r.setSuccess(true);
+        r.setCode(ResultCode.SUCCESS);
+        r.setMessage("成功");
+        r.setCount(count);
+        return r;
+    }
+    public static R error(){
+        R r = new R();
+        r.setSuccess(false);
+        r.setCode(ResultCode.ERROR);
+        r.setMessage("失败");
+        return r;
+    }
+    public R success(Boolean success){
+        this.setSuccess(success);
+        return this;
+    }
+    public R message(String message){
+        this.setMessage(message);
+        return this;
+    }
+    public R code(Integer code){
+        this.setCode(code);
+        return this;
+    }
+//    public R data(String key, Object value){
+//        this.data.put(key, value);
+//        return this;
+//    }
+//    public R data(Map<String, Object> map){
+//        this.setData(map);
+//        return this;
+//    }
+    public R data(Object value){
+        this.setData(value);
+        return this;
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/ResultCode.java

@@ -0,0 +1,12 @@
+package com.gyee.runeconomy.dto;
+
+/**
+ * @ClassName : ResultCode
+ * @Author : xieshengjie
+ * @Date: 2021/5/16 17:01
+ * @Description : 结果状态
+ */
+public class ResultCode {
+    public static Integer SUCCESS = 200;
+    public static Integer ERROR = 500;
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/ResultInfo.java

@@ -0,0 +1,87 @@
+package com.gyee.runeconomy.dto;
+
+import lombok.Data;
+
+/**
+ *@ClassName ResultInfo
+ *@Description 返回结果类统一封装
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:53
+ *@Version 1.0
+ **/
+@Data
+public class ResultInfo {
+    // 状态码
+    private Integer code;
+    // 消息
+    private String message;
+    // 数据对象
+    private Object result;
+
+    private Integer total;
+
+    /**
+     * 无参构造器
+     */
+    public ResultInfo() {
+        super();
+    }
+
+    public ResultInfo(Status status) {
+        super();
+        this.code = status.code;
+        this.message = status.message;
+    }
+
+    public ResultInfo result(Object result) {
+        this.result = result;
+        return this;
+    }
+
+    public ResultInfo message(String message) {
+        this.message = message;
+        return this;
+    }
+    public ResultInfo total(Integer total) {
+        this.total = total;
+        return this;
+    }
+
+    /**
+     * 只返回状态，状态码，消息
+     *
+     * @param code
+     * @param message
+     */
+    public ResultInfo(Integer code, String message) {
+        super();
+        this.code = code;
+        this.message = message;
+    }
+
+    /**
+     * 只返回状态，状态码，数据对象
+     *
+     * @param code
+     * @param result
+     */
+    public ResultInfo(Integer code, Object result) {
+        super();
+        this.code = code;
+        this.result = result;
+    }
+
+    /**
+     * 返回全部信息即状态，状态码，消息，数据对象
+     *
+     * @param code
+     * @param message
+     * @param result
+     */
+    public ResultInfo(Integer code, String message, Object result) {
+        super();
+        this.code = code;
+        this.message = message;
+        this.result = result;
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/Status.java

@@ -0,0 +1,42 @@
+package com.gyee.runeconomy.dto;
+/**
+ *@ClassName Status
+ *@Description 枚举类对象
+ *@Author 谢生杰
+ *@Date 2020/9/25 18:54
+ *@Version 1.0
+ **/
+public enum Status {
+    // 公共
+    SUCCESS(2000, "成功"),
+    UNKNOWN_ERROR(9998,"未知异常"),
+    SYSTEM_ERROR(9999, "系统异常"),
+
+
+    INSUFFICIENT_PERMISSION(4003, "权限不足"),
+
+    WARN(9000, "失败"),
+    REQUEST_PARAMETER_ERROR(1002, "请求参数错误"),
+
+
+
+    // 登录
+    LOGIN_EXPIRE(2001, "未登录或者登录失效"),
+    LOGIN_CODE_ERROR(2002, "登录验证码错误"),
+    LOGIN_ERROR(2003, "用户名不存在或密码错误"),
+    LOGIN_USER_STATUS_ERROR(2004, "用户状态不正确"),
+    LOGOUT_ERROR(2005, "退出失败，token不存在"),
+    LOGIN_USER_NOT_EXIST(2006, "该用户不存在"),
+    LOGIN_USER_EXIST(2007, "该用户已存在");
+
+
+
+
+    public int code;
+    public String message;
+
+    Status(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/response/EconHomePagePointRateDTO.java

@@ -0,0 +1,96 @@
+package com.gyee.runeconomy.dto.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 经济运行首页指标率响应类
+ */
+@Data
+public class EconHomePagePointRateDTO {
+
+//    curr
+//    ring
+//    with
+    /**
+     * 故障损失率
+     */
+    private BigDecimal currGzsll;
+    private BigDecimal ringGzslzzl;
+    private BigDecimal withGzslzzl;
+
+    /**
+     * 检修损失率
+     */
+    private BigDecimal currJxsll;
+    private BigDecimal ringJxslzzl;
+    private BigDecimal withJxslzzl;
+
+
+    /**
+     * 限电损失率
+     */
+    private BigDecimal currXdsll;
+    private BigDecimal ringXdslzzl;
+    private BigDecimal withXdslzzl;
+
+    /**
+     * 受累损失率
+     */
+    private BigDecimal currSlsll;
+    private BigDecimal ringSlslzzl;
+    private BigDecimal withSlslzzl;
+
+
+    /**
+     * 性能损失率
+     */
+    private BigDecimal currXNsll;
+    private BigDecimal ringXnslzzl;
+    private BigDecimal withXnslzzl;
+
+
+    /**
+     * 复位及时率
+     */
+    private BigDecimal currFwjsl;
+    private BigDecimal ringFwjszzl;
+    private BigDecimal withFwjszzl;
+
+    /**
+     * 状态转换率
+     */
+    private BigDecimal currZtzhl;
+    private BigDecimal ringZtzhzzl;
+    private BigDecimal withZtzhzzl;
+
+    /**
+     * 消缺及时率
+     */
+    private BigDecimal currXqjsl;
+    private BigDecimal ringXqjszzl;
+    private BigDecimal withXqjszzl;
+
+    /**
+     * 综合常用电率
+     */
+    private BigDecimal currZhcydl;
+    private BigDecimal ringZhcydzzl;
+    private BigDecimal withZhcydzzl;
+    /**
+     * 功率曲线符合率
+     */
+    private BigDecimal currGlqxfhl;
+    private BigDecimal ringGlqxfhzzl;
+    private BigDecimal withGlqxfhzzl;
+
+    /**
+     * 设备可利用率
+     */
+    private BigDecimal currSbklyl;
+    private BigDecimal ringSbklyzzl;
+    private BigDecimal withSbklyzzl;
+
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicCompanyMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 省公司表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProBasicCompanyMapper extends BaseMapper<ProBasicCompany> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicEnergyGroupMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicEnergyGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 集团 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProBasicEnergyGroupMapper extends BaseMapper<ProBasicEnergyGroup> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicEquipmentMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 风机&光伏 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProBasicEquipmentMapper extends BaseMapper<ProBasicEquipment> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicLineMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicLine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 集电线路 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProBasicLineMapper extends BaseMapper<ProBasicLine> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicPowerstationMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProBasicPowerstationMapper extends BaseMapper<ProBasicPowerstation> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicProjectMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicProject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 工程表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProBasicProjectMapper extends BaseMapper<ProBasicProject> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicRegionMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicRegion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 区域 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProBasicRegionMapper extends BaseMapper<ProBasicRegion> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicSquareMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicSquare;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 方阵 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProBasicSquareMapper extends BaseMapper<ProBasicSquare> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProBasicSubStationMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicSubStation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 调度场站名称 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProBasicSubStationMapper extends BaseMapper<ProBasicSubStation> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconPointCodeMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPointCode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 指标查询表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-23
+ */
+public interface ProEconPointCodeMapper extends BaseMapper<ProEconPointCode> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconPowerstationInfoDay1Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站五损电量 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-21
+ */
+public interface ProEconPowerstationInfoDay1Mapper extends BaseMapper<ProEconPowerstationInfoDay1> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconPowerstationInfoDay2Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站五损时间 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProEconPowerstationInfoDay2Mapper extends BaseMapper<ProEconPowerstationInfoDay2> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconPowerstationInfoDay3Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay3;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站五损次数 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProEconPowerstationInfoDay3Mapper extends BaseMapper<ProEconPowerstationInfoDay3> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconPowerstationInfoDay4Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay4;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 场站三率mtbf Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProEconPowerstationInfoDay4Mapper extends BaseMapper<ProEconPowerstationInfoDay4> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconPowerstationInfoDay5Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 电表发电量 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProEconPowerstationInfoDay5Mapper extends BaseMapper<ProEconPowerstationInfoDay5> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconPowerstationInfoDay6Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay6;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 测风塔出线功率 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProEconPowerstationInfoDay6Mapper extends BaseMapper<ProEconPowerstationInfoDay6> {
+
+}

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/ProEconPowerstationInfoDay7Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay7;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 离散率系统效率 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface ProEconPowerstationInfoDay7Mapper extends BaseMapper<ProEconPowerstationInfoDay7> {
+
+}

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

@@ -0,0 +1,183 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 省公司表
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicCompany extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风电装机容量
+     */
+    private BigDecimal windCapacity;
+
+    /**
+     * 风电容量单位
+     */
+    private String windCapacityUnit;
+
+    /**
+     * 风电装机数量海上
+     */
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
+     */
+    private Integer windQuantityLd;
+
+    /**
+     * 光伏装机容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 光伏容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 光伏装机数量集中
+     */
+    private Integer quantityJz;
+
+    /**
+     * 光伏装机数量组串
+     */
+    private Integer quantityZc;
+
+    /**
+     * 接入风电装机容量
+     */
+    private BigDecimal jrwindCapacity;
+
+    /**
+     * 接入风电容量单位
+     */
+    private String jrwindCapacityUnit;
+
+    /**
+     * 接入风电装机数量海上
+     */
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
+
+    /**
+     * 接入光伏装机容量
+     */
+    private BigDecimal jrCapacity;
+
+    /**
+     * 接入光伏容量单位
+     */
+    private String jrCapacityUnit;
+
+    /**
+     * 接入光伏装机数量集中
+     */
+    private Integer jrquantityJz;
+
+    /**
+     * 接入光伏装机数量组串
+     */
+    private Integer jrquantityZc;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 风电场站数量
+     */
+    private Integer windNumber;
+
+    /**
+     * 光伏场站数量
+     */
+    private Integer number;
+
+    /**
+     * 接入风电场站数量
+     */
+    private Integer jrWindNumber;
+
+    /**
+     * 接入光伏场站数量
+     */
+    private Integer jrNumber;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 集团编号
+     */
+    private String groupId;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

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

@@ -0,0 +1,178 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 集团
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicEnergyGroup extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 父编号
+     */
+    private String parentid;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风电装机容量
+     */
+    private BigDecimal windCapacity;
+
+    /**
+     * 风电容量单位
+     */
+    private String windCapacityUnit;
+
+    /**
+     * 风电装机数量海上
+     */
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
+     */
+    private Integer windQuantityLd;
+
+    /**
+     * 光伏装机容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 光伏容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 光伏装机数量集中
+     */
+    private Integer quantityJz;
+
+    /**
+     * 光伏装机数量组串
+     */
+    private Integer quantityZc;
+
+    /**
+     * 接入风电装机容量
+     */
+    private BigDecimal jrwindCapacity;
+
+    /**
+     * 接入风电容量单位
+     */
+    private String jrwindCapacityUnit;
+
+    /**
+     * 接入风电装机数量海上
+     */
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
+
+    /**
+     * 接入光伏装机容量
+     */
+    private BigDecimal jrCapacity;
+
+    /**
+     * 接入光伏容量单位
+     */
+    private String jrCapacityUnit;
+
+    /**
+     * 接入光伏装机数量集中
+     */
+    private Integer jrquantityJz;
+
+    /**
+     * 接入光伏装机数量组串
+     */
+    private Integer jrquantityZc;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 风电场站数量
+     */
+    private Integer windNumber;
+
+    /**
+     * 光伏场站数量
+     */
+    private Integer number;
+
+    /**
+     * 接入风电场站数量
+     */
+    private Integer jrWindNumber;
+
+    /**
+     * 接入光伏场站数量
+     */
+    private Integer jrNumber;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

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

@@ -0,0 +1,145 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 风机&光伏
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicEquipment extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 场站编号(冗余)
+     */
+    private String windpowerstationId;
+
+    /**
+     * 地球经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 地球纬度
+     */
+    private BigDecimal latitude;
+
+    /**
+     * 型号编号
+     */
+    private String modelId;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 首次并网时间
+     */
+    private LocalDate firstIntegratedTime;
+
+    /**
+     * 图片
+     */
+    private String photo;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 是否是标杆设备
+     */
+    private Integer isStandard;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 是否可用
+     */
+    private Integer isable;
+
+    /**
+     * 1：陆地；2：海上；3：集中；4：组串
+     */
+    private Integer equipmentCategory;
+
+    private String parentId;
+
+    private String squareId;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+    /**
+     * 排序
+     */
+    private Integer orderNum;
+
+    private String substationId;
+
+
+}

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

@@ -0,0 +1,93 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 集电线路
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicLine extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 装机容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 装机数量
+     */
+    private Integer quantity;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

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

@@ -0,0 +1,261 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 场站表
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicPowerstation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 电话
+     */
+    private String telephone;
+
+    /**
+     * 风电装机容量
+     */
+    private BigDecimal windCapacity;
+
+    /**
+     * 风电容量单位
+     */
+    private String windCapacityUnit;
+
+    /**
+     * 风电装机数量海上
+     */
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
+     */
+    private Integer windQuantityLd;
+
+    /**
+     * 光伏装机容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 光伏容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 光伏装机数量集中
+     */
+    private Integer quantityJz;
+
+    /**
+     * 光伏装机数量组串
+     */
+    private Integer quantityZc;
+
+    /**
+     * 接入风电装机容量
+     */
+    private BigDecimal jrwindCapacity;
+
+    /**
+     * 接入风电容量单位
+     */
+    private String jrwindCapacityUnit;
+
+    /**
+     * 接入风电装机数量海上
+     */
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
+
+    /**
+     * 接入光伏装机容量
+     */
+    private BigDecimal jrCapacity;
+
+    /**
+     * 接入光伏容量单位
+     */
+    private String jrCapacityUnit;
+
+    /**
+     * 接入光伏装机数量集中
+     */
+    private Integer jrquantityJz;
+
+    /**
+     * 接入光伏装机数量组串
+     */
+    private Integer jrquantityZc;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 地球经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 地球纬度
+     */
+    private BigDecimal latitude;
+
+    /**
+     * 图片
+     */
+    private String photo;
+
+    /**
+     * 系统厂家
+     */
+    private String systemManufact;
+
+    /**
+     * 场长
+     */
+    private String headfarm;
+
+    /**
+     * 场长电话
+     */
+    private String headfarmPhone;
+
+    /**
+     * 机型
+     */
+    private String model;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 海拔高度
+     */
+    private BigDecimal height;
+
+    /**
+     * 场站类型（-1：风电；-2：光伏）
+     */
+    private String windType;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 集团编号
+     */
+    private String groupId;
+
+    /**
+     * 是否可用（0：待建；1：投产）（0：不参与计算；1：参与计算）
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+    /**
+     * 核准容量
+     */
+    private BigDecimal appCapacity;
+
+    /**
+     * 在建容量
+     */
+    private BigDecimal conCapacity;
+
+    /**
+     * 并网容量
+     */
+    private BigDecimal gridCapacity;
+
+    private BigDecimal hoiCapacity;
+
+    /**
+     * 首批并网时间
+     */
+    private LocalDate firstGridTime;
+
+    /**
+     * 整场投运时间
+     */
+    private LocalDate wholeGridTime;
+
+    /**
+     * 测风塔数量
+     */
+    private Integer anemoNumber;
+
+    /**
+     * 升压站数量
+     */
+    private Integer stationNumber;
+
+
+}

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

@@ -0,0 +1,124 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 工程表
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicProject extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 装机容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 装机数量
+     */
+    private Integer quantity;
+
+    /**
+     * 机型
+     */
+    private String model;
+
+    /**
+     * 投产日期
+     */
+    private LocalDate commissionDate;
+
+    /**
+     * 主控电话
+     */
+    private String masterPhone;
+
+    /**
+     * 值长
+     */
+    private String shiftforeMan;
+
+    /**
+     * 值长电话
+     */
+    private String shiftforeManPhone;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 变电所ID
+     */
+    private String windsubStationId;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

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

@@ -0,0 +1,173 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 区域
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicRegion extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风电装机容量
+     */
+    private BigDecimal windCapacity;
+
+    /**
+     * 风电容量单位
+     */
+    private String windCapacityUnit;
+
+    /**
+     * 风电装机数量海上
+     */
+    private Integer windQuantityHs;
+
+    /**
+     * 风电装机数量陆地
+     */
+    private Integer windQuantityLd;
+
+    /**
+     * 光伏装机容量
+     */
+    private BigDecimal capacity;
+
+    /**
+     * 光伏容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 光伏装机数量集中
+     */
+    private Integer quantityJz;
+
+    /**
+     * 光伏装机数量组串
+     */
+    private Integer quantityZc;
+
+    /**
+     * 接入风电装机容量
+     */
+    private BigDecimal jrwindCapacity;
+
+    /**
+     * 接入风电容量单位
+     */
+    private String jrwindCapacityUnit;
+
+    /**
+     * 接入风电装机数量海上
+     */
+    private Integer jrwindQuantityHs;
+
+    /**
+     * 接入风电装机数量陆地
+     */
+    private Integer jrwindQuantityLd;
+
+    /**
+     * 接入光伏装机容量
+     */
+    private BigDecimal jrCapacity;
+
+    /**
+     * 接入光伏容量单位
+     */
+    private String jrCapacityUnit;
+
+    /**
+     * 接入光伏装机数量集中
+     */
+    private Integer jrquantityJz;
+
+    /**
+     * 接入光伏装机数量组串
+     */
+    private Integer jrquantityZc;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 风电场站数量
+     */
+    private Integer windNumber;
+
+    /**
+     * 光伏场站数量
+     */
+    private Integer number;
+
+    /**
+     * 接入风电场站数量
+     */
+    private Integer jrWindNumber;
+
+    /**
+     * 接入光伏场站数量
+     */
+    private Integer jrNumber;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

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

@@ -0,0 +1,87 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 方阵
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicSquare extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 风场编号(冗余)
+     */
+    private String windpowerstationId;
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 风电线编号
+     */
+    private String lineId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 接入类型
+     */
+    private String types;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

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

@@ -0,0 +1,80 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 调度场站名称
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicSubStation extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+    private BigDecimal capacity;
+
+
+}

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

@@ -0,0 +1,52 @@
+package com.gyee.runeconomy.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 指标查询表
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconPointCode extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String nemCode;
+
+    /**
+     * 说明
+     */
+    private String description;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 设备类型
+     */
+    private String equipmentType;
+
+    /**
+     * 测点类型
+     */
+    private String pointType;
+
+
+}

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

@@ -0,0 +1,434 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 场站五损电量
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconPowerstationInfoDay1 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 外键编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 日期
+     */
+    private LocalDate recordDate;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 项目编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
+     * 日最大风速
+     */
+    private BigDecimal rzdfs;
+
+    /**
+     * 日最小风速
+     */
+    private BigDecimal rzxfs;
+
+    /**
+     * 日最大功率
+     */
+    private BigDecimal rzdgl;
+
+    /**
+     * 日最小功率
+     */
+    private BigDecimal rzxgl;
+
+    /**
+     * 日平均功率
+     */
+    private BigDecimal rpjgl;
+
+    /**
+     * 日平均风速
+     */
+    private BigDecimal rpjfs;
+
+    /**
+     * 日发电量
+     */
+    private BigDecimal rfdl;
+
+    /**
+     * 日可用电量
+     */
+    private BigDecimal rkydl;
+
+    /**
+     * 日理论发电量
+     */
+    private BigDecimal rllfdl;
+
+    /**
+     * 日故障损失电量
+     */
+    private BigDecimal rgzssdl;
+
+    /**
+     * 日场内受累故障损失电量
+     */
+    private BigDecimal rcnslgzssdl;
+
+    /**
+     * 日检修损失电量
+     */
+    private BigDecimal rjxssdl;
+
+    /**
+     * 日场内受累检修损失电量
+     */
+    private BigDecimal rcnsljxssdl;
+
+    /**
+     * 日待机损失电量
+     */
+    private BigDecimal rdjssdl;
+
+    /**
+     * 日缺陷降出力损失电量
+     */
+    private BigDecimal rqxjclssdl;
+
+    /**
+     * 日手动停机损失电量
+     */
+    private BigDecimal rsdtjssdl;
+
+    /**
+     * 日性能损失电量
+     */
+    private BigDecimal rxnssdl;
+
+    /**
+     * 日限电停机损失电量
+     */
+    private BigDecimal rxdtjssdl;
+
+    /**
+     * 日限电降出力损失电量
+     */
+    private BigDecimal rxdjclssdl;
+
+    /**
+     * 日场外受累电网损失电量
+     */
+    private BigDecimal rcwsldwssdl;
+
+    /**
+     * 日场外受累天气损失电量
+     */
+    private BigDecimal rcwsltqssdl;
+
+    /**
+     * 日增发电量
+     */
+    private BigDecimal rzfdl;
+
+    /**
+     * 日欠发电量
+     */
+    private BigDecimal rqfdl;
+
+    /**
+     * 月最大风速
+     */
+    private BigDecimal yzdfs;
+
+    /**
+     * 月最小风速
+     */
+    private BigDecimal yzxfs;
+
+    /**
+     * 月最大功率
+     */
+    private BigDecimal yzdgl;
+
+    /**
+     * 月最小功率
+     */
+    private BigDecimal yzxgl;
+
+    /**
+     * 月平均功率
+     */
+    private BigDecimal ypjgl;
+
+    /**
+     * 月平均风速
+     */
+    private BigDecimal ypjfs;
+
+    /**
+     * 月发电量
+     */
+    private BigDecimal yfdl;
+
+    /**
+     * 月可用电量
+     */
+    private BigDecimal ykydl;
+
+    /**
+     * 月理论发电量
+     */
+    private BigDecimal yllfdl;
+
+    /**
+     * 月故障损失电量
+     */
+    private BigDecimal ygzssdl;
+
+    /**
+     * 月场内受累故障损失电量
+     */
+    private BigDecimal ycnslgzssdl;
+
+    /**
+     * 月检修损失电量
+     */
+    private BigDecimal yjxssdl;
+
+    /**
+     * 月场内受累检修损失电量
+     */
+    private BigDecimal ycnsljxssdl;
+
+    /**
+     * 月待机损失电量
+     */
+    private BigDecimal ydjssdl;
+
+    /**
+     * 月缺陷降出力损失电量
+     */
+    private BigDecimal yqxjclssdl;
+
+    /**
+     * 月手动停机损失电量
+     */
+    private BigDecimal ysdtjssdl;
+
+    /**
+     * 月性能损失电量
+     */
+    private BigDecimal yxnssdl;
+
+    /**
+     * 月限电停机损失电量
+     */
+    private BigDecimal yxdtjssdl;
+
+    /**
+     * 月限电降出力损失电量
+     */
+    private BigDecimal yxdjclssdl;
+
+    /**
+     * 月场外受累电网损失电量
+     */
+    private BigDecimal ycwsldwssdl;
+
+    /**
+     * 月场外受累天气损失电量
+     */
+    private BigDecimal ycwsltqssdl;
+
+    /**
+     * 月增发电量
+     */
+    private BigDecimal yzfdl;
+
+    /**
+     * 月欠发电量
+     */
+    private BigDecimal yqfdl;
+
+    /**
+     * 年最大风速
+     */
+    private BigDecimal nzdfs;
+
+    /**
+     * 年最小风速
+     */
+    private BigDecimal nzxfs;
+
+    /**
+     * 年最大功率
+     */
+    private BigDecimal nzdgl;
+
+    /**
+     * 年最小功率
+     */
+    private BigDecimal nzxgl;
+
+    /**
+     * 年平均功率
+     */
+    private BigDecimal npjgl;
+
+    /**
+     * 年平均风速
+     */
+    private BigDecimal npjfs;
+
+    /**
+     * 年发电量
+     */
+    private BigDecimal nfdl;
+
+    /**
+     * 年可用电量
+     */
+    private BigDecimal nkydl;
+
+    /**
+     * 年理论发电量
+     */
+    private BigDecimal nllfdl;
+
+    /**
+     * 年故障损失电量
+     */
+    private BigDecimal ngzssdl;
+
+    /**
+     * 年场内受累故障损失电量
+     */
+    private BigDecimal ncnslgzssdl;
+
+    /**
+     * 年检修损失电量
+     */
+    private BigDecimal njxssdl;
+
+    /**
+     * 年场内受累检修损失电量
+     */
+    private BigDecimal ncnsljxssdl;
+
+    /**
+     * 年待机损失电量
+     */
+    private BigDecimal ndjssdl;
+
+    /**
+     * 年缺陷降出力损失电量
+     */
+    private BigDecimal nqxjclssdl;
+
+    /**
+     * 年手动停机损失电量
+     */
+    private BigDecimal nsdtjssdl;
+
+    /**
+     * 年性能损失电量
+     */
+    private BigDecimal nxnssdl;
+
+    /**
+     * 年限电停机损失电量
+     */
+    private BigDecimal nxdtjssdl;
+
+    /**
+     * 年限电降出力损失电量
+     */
+    private BigDecimal nxdjclssdl;
+
+    /**
+     * 年场外受累电网损失电量
+     */
+    private BigDecimal ncwsldwssdl;
+
+    /**
+     * 年场外受累天气损失电量
+     */
+    private BigDecimal ncwsltqssdl;
+
+    /**
+     * 年增发电量
+     */
+    private BigDecimal nzfdl;
+
+    /**
+     * 年欠发电量
+     */
+    private BigDecimal nqfdl;
+
+    /**
+     * 日自耗电
+     */
+    private BigDecimal rzhd;
+
+    /**
+     * 月自耗电
+     */
+    private BigDecimal yzhd;
+
+    /**
+     * 年自耗电
+     */
+    private BigDecimal nzhd;
+
+
+}

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

@@ -0,0 +1,389 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 场站五损时间
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconPowerstationInfoDay2 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 外键编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 日期
+     */
+    private LocalDate recordDate;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 项目编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
+     * 日合计故障小时（明细）
+     */
+    private BigDecimal rhjgzxsmx;
+
+    /**
+     * 日合计场内受累故障小时（明细）
+     */
+    private BigDecimal rhjcnslgzxsmx;
+
+    /**
+     * 日合计检修小时（明细）
+     */
+    private BigDecimal rhjjxxsmx;
+
+    /**
+     * 日合计场内受累检修小时（明细）
+     */
+    private BigDecimal rhjcnsljxxsmx;
+
+    /**
+     * 日合计待机小时（明细）
+     */
+    private BigDecimal rhjdjxsmx;
+
+    /**
+     * 日合计缺陷降出力小时（明细）
+     */
+    private BigDecimal rhjqxjclxsmx;
+
+    /**
+     * 日合计手动停机小时（明细）
+     */
+    private BigDecimal rhjsdtjxsmx;
+
+    /**
+     * 日合计并网小时（明细）
+     */
+    private BigDecimal rhjbwxsmx;
+
+    /**
+     * 日合计限电停机小时（明细）
+     */
+    private BigDecimal rhjxdtjxsmx;
+
+    /**
+     * 日合计限电降出力小时（明细）
+     */
+    private BigDecimal rhjxdjclxsmx;
+
+    /**
+     * 日合计场外受累电网小时（明细）
+     */
+    private BigDecimal rhjcwsldwxsmx;
+
+    /**
+     * 日合计场外受累天气小时（明细）
+     */
+    private BigDecimal rhjcwsltqxsmx;
+
+    /**
+     * 日合计离线小时（明细）
+     */
+    private BigDecimal rhjlxxsmx;
+
+    /**
+     * 日合计通讯中断小时（明细）
+     */
+    private BigDecimal rhjtxzdxsmx;
+
+    /**
+     * 日合计待机小时
+     */
+    private BigDecimal rhjdjxs;
+
+    /**
+     * 日合计故障停机小时
+     */
+    private BigDecimal rhjgztjxs;
+
+    /**
+     * 日合计通讯中断小时
+     */
+    private BigDecimal rhjtxzdxs;
+
+    /**
+     * 日合计维护停机小时
+     */
+    private BigDecimal rhjjxtjxs;
+
+    /**
+     * 日合计限电小时
+     */
+    private BigDecimal rhjxdxs;
+
+    /**
+     * 日合计运行小时
+     */
+    private BigDecimal rhjyxxs;
+
+    /**
+     * 月合计故障小时（明细）
+     */
+    private BigDecimal yhjgzxsmx;
+
+    /**
+     * 月合计场内受累故障小时（明细）
+     */
+    private BigDecimal yhjcnslgzxsmx;
+
+    /**
+     * 月合计检修小时（明细）
+     */
+    private BigDecimal yhjjxxsmx;
+
+    /**
+     * 月合计场内受累检修小时（明细）
+     */
+    private BigDecimal yhjcnsljxxsmx;
+
+    /**
+     * 月合计待机小时（明细）
+     */
+    private BigDecimal yhjdjxsmx;
+
+    /**
+     * 月合计缺陷降出力小时（明细）
+     */
+    private BigDecimal yhjqxjclxsmx;
+
+    /**
+     * 月合计手动停机小时（明细）
+     */
+    private BigDecimal yhjsdtjxsmx;
+
+    /**
+     * 月合计并网小时（明细）
+     */
+    private BigDecimal yhjbwxsmx;
+
+    /**
+     * 月合计限电停机小时（明细）
+     */
+    private BigDecimal yhjxdtjxsmx;
+
+    /**
+     * 月合计限电降出力小时（明细）
+     */
+    private BigDecimal yhjxdjclxsmx;
+
+    /**
+     * 月合计场外受累电网小时（明细）
+     */
+    private BigDecimal yhjcwsldwxsmx;
+
+    /**
+     * 月合计场外受累天气小时（明细）
+     */
+    private BigDecimal yhjcwsltqxsmx;
+
+    /**
+     * 月合计离线小时（明细）
+     */
+    private BigDecimal yhjlxxsmx;
+
+    /**
+     * 月合计通讯中断小时（明细）
+     */
+    private BigDecimal yhjtxzdxsmx;
+
+    /**
+     * 月合计待机小时
+     */
+    private BigDecimal yhjdjxs;
+
+    /**
+     * 月合计故障停机小时
+     */
+    private BigDecimal yhjgztjxs;
+
+    /**
+     * 月合计通讯中断小时
+     */
+    private BigDecimal yhjtxzdxs;
+
+    /**
+     * 月合计维护停机小时
+     */
+    private BigDecimal yhjjxtjxs;
+
+    /**
+     * 月合计限电小时
+     */
+    private BigDecimal yhjxdxs;
+
+    /**
+     * 月合计运行小时
+     */
+    private BigDecimal yhjyxxs;
+
+    /**
+     * 年合计故障小时（明细）
+     */
+    private BigDecimal nhjgzxsmx;
+
+    /**
+     * 年合计场内受累故障小时（明细）
+     */
+    private BigDecimal nhjcnslgzxsmx;
+
+    /**
+     * 年合计检修小时（明细）
+     */
+    private BigDecimal nhjjxxsmx;
+
+    /**
+     * 年合计场内受累检修小时（明细）
+     */
+    private BigDecimal nhjcnsljxxsmx;
+
+    /**
+     * 年合计待机小时（明细）
+     */
+    private BigDecimal nhjdjxsmx;
+
+    /**
+     * 年合计缺陷降出力小时（明细）
+     */
+    private BigDecimal nhjqxjclxsmx;
+
+    /**
+     * 年合计手动停机小时（明细）
+     */
+    private BigDecimal nhjsdtjxsmx;
+
+    /**
+     * 年合计并网小时（明细）
+     */
+    private BigDecimal nhjbwxsmx;
+
+    /**
+     * 年合计限电停机小时（明细）
+     */
+    private BigDecimal nhjxdtjxsmx;
+
+    /**
+     * 年合计限电降出力小时（明细）
+     */
+    private BigDecimal nhjxdjclxsmx;
+
+    /**
+     * 年合计场外受累电网小时（明细）
+     */
+    private BigDecimal nhjcwsldwxsmx;
+
+    /**
+     * 年合计场外受累天气小时（明细）
+     */
+    private BigDecimal nhjcwsltqxsmx;
+
+    /**
+     * 年合计离线小时（明细）
+     */
+    private BigDecimal nhjlxxsmx;
+
+    /**
+     * 年合计通讯中断小时（明细）
+     */
+    private BigDecimal nhjtxzdxsmx;
+
+    /**
+     * 年合计待机小时
+     */
+    private BigDecimal nhjdjxs;
+
+    /**
+     * 年合计故障停机小时
+     */
+    private BigDecimal nhjgztjxs;
+
+    /**
+     * 年合计通讯中断小时
+     */
+    private BigDecimal nhjtxzdxs;
+
+    /**
+     * 年合计维护停机小时
+     */
+    private BigDecimal nhjjxtjxs;
+
+    /**
+     * 年合计限电小时
+     */
+    private BigDecimal nhjxdxs;
+
+    /**
+     * 年合计运行小时
+     */
+    private BigDecimal nhjyxxs;
+
+    /**
+     * 年合计受累小时
+     */
+    private BigDecimal nhjslxs;
+
+    /**
+     * 月合计受累小时
+     */
+    private BigDecimal yhjslxs;
+
+    /**
+     * 日合计受累小时
+     */
+    private BigDecimal rhjslxs;
+
+
+}

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

@@ -0,0 +1,389 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 场站五损次数
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconPowerstationInfoDay3 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 外键编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 日期
+     */
+    private LocalDate recordDate;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 项目编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
+     * 日合计故障次数（明细）
+     */
+    private BigDecimal rhjgzcsmx;
+
+    /**
+     * 日合计场内受累故障次数（明细）
+     */
+    private BigDecimal rhjcnslgzcsmx;
+
+    /**
+     * 日合计检修次数（明细）
+     */
+    private BigDecimal rhjjxcsmx;
+
+    /**
+     * 日合计场内受累检修次数（明细）
+     */
+    private BigDecimal rhjcnsljxcsmx;
+
+    /**
+     * 日合计待机次数（明细）
+     */
+    private BigDecimal rhjdjcsmx;
+
+    /**
+     * 日合计缺陷降出力次数（明细）
+     */
+    private BigDecimal rhjqxjclcsmx;
+
+    /**
+     * 日合计手动停机次数（明细）
+     */
+    private BigDecimal rhjsdtjcsmx;
+
+    /**
+     * 日合计并网次数（明细）
+     */
+    private BigDecimal rhjbwcsmx;
+
+    /**
+     * 日合计限电停机次数（明细）
+     */
+    private BigDecimal rhjxdtjcsmx;
+
+    /**
+     * 日合计限电降出力次数（明细）
+     */
+    private BigDecimal rhjxdjclcsmx;
+
+    /**
+     * 日合计场外受累电网次数（明细）
+     */
+    private BigDecimal rhjcwsldwcsmx;
+
+    /**
+     * 日合计场外受累天气次数（明细）
+     */
+    private BigDecimal rhjcwsltqcsmx;
+
+    /**
+     * 日合计离线次数（明细）
+     */
+    private BigDecimal rhjlxcsmx;
+
+    /**
+     * 日合计通讯中断次数（明细）
+     */
+    private BigDecimal rhjtxzdcsmx;
+
+    /**
+     * 日合计待机次数
+     */
+    private BigDecimal rhjdjcs;
+
+    /**
+     * 日合计故障停机次数
+     */
+    private BigDecimal rhjgztjcs;
+
+    /**
+     * 日合计通讯中断次数
+     */
+    private BigDecimal rhjtxzdcs;
+
+    /**
+     * 日合计检修停机次数
+     */
+    private BigDecimal rhjjxtjcs;
+
+    /**
+     * 日合计限电次数
+     */
+    private BigDecimal rhjxdcs;
+
+    /**
+     * 日合计运行次数
+     */
+    private BigDecimal rhjyxcs;
+
+    /**
+     * 月合计故障次数（明细）
+     */
+    private BigDecimal yhjgzcsmx;
+
+    /**
+     * 月合计场内受累故障次数（明细）
+     */
+    private BigDecimal yhjcnslgzcsmx;
+
+    /**
+     * 月合计检修次数（明细）
+     */
+    private BigDecimal yhjjxcsmx;
+
+    /**
+     * 月合计场内受累检修次数（明细）
+     */
+    private BigDecimal yhjcnsljxcsmx;
+
+    /**
+     * 月合计待机次数（明细）
+     */
+    private BigDecimal yhjdjcsmx;
+
+    /**
+     * 月合计缺陷降出力次数（明细）
+     */
+    private BigDecimal yhjqxjclcsmx;
+
+    /**
+     * 月合计手动停机次数（明细）
+     */
+    private BigDecimal yhjsdtjcsmx;
+
+    /**
+     * 月合计并网次数（明细）
+     */
+    private BigDecimal yhjbwcsmx;
+
+    /**
+     * 月合计限电停机次数（明细）
+     */
+    private BigDecimal yhjxdtjcsmx;
+
+    /**
+     * 月合计限电降出力次数（明细）
+     */
+    private BigDecimal yhjxdjclcsmx;
+
+    /**
+     * 月合计场外受累电网次数（明细）
+     */
+    private BigDecimal yhjcwsldwcsmx;
+
+    /**
+     * 月合计场外受累天气次数（明细）
+     */
+    private BigDecimal yhjcwsltqcsmx;
+
+    /**
+     * 月合计离线次数（明细）
+     */
+    private BigDecimal yhjlxcsmx;
+
+    /**
+     * 月合计通讯中断次数（明细）
+     */
+    private BigDecimal yhjtxzdcsmx;
+
+    /**
+     * 月合计待机次数
+     */
+    private BigDecimal yhjdjcs;
+
+    /**
+     * 月合计故障停机次数
+     */
+    private BigDecimal yhjgztjcs;
+
+    /**
+     * 月合计通讯中断次数
+     */
+    private BigDecimal yhjtxzdcs;
+
+    /**
+     * 月合计检修停机次数
+     */
+    private BigDecimal yhjjxtjcs;
+
+    /**
+     * 月合计限电次数
+     */
+    private BigDecimal yhjxdcs;
+
+    /**
+     * 月合计运行次数
+     */
+    private BigDecimal yhjyxcs;
+
+    /**
+     * 年合计故障次数（明细）
+     */
+    private BigDecimal nhjgzcsmx;
+
+    /**
+     * 年合计场内受累故障次数（明细）
+     */
+    private BigDecimal nhjcnslgzcsmx;
+
+    /**
+     * 年合计检修次数（明细）
+     */
+    private BigDecimal nhjjxcsmx;
+
+    /**
+     * 年合计场内受累检修次数（明细）
+     */
+    private BigDecimal nhjcnsljxcsmx;
+
+    /**
+     * 年合计待机次数（明细）
+     */
+    private BigDecimal nhjdjcsmx;
+
+    /**
+     * 年合计缺陷降出力次数（明细）
+     */
+    private BigDecimal nhjqxjclcsmx;
+
+    /**
+     * 年合计手动停机次数（明细）
+     */
+    private BigDecimal nhjsdtjcsmx;
+
+    /**
+     * 年合计并网次数（明细）
+     */
+    private BigDecimal nhjbwcsmx;
+
+    /**
+     * 年合计限电停机次数（明细）
+     */
+    private BigDecimal nhjxdtjcsmx;
+
+    /**
+     * 年合计限电降出力次数（明细）
+     */
+    private BigDecimal nhjxdjclcsmx;
+
+    /**
+     * 年合计场外受累电网次数（明细）
+     */
+    private BigDecimal nhjcwsldwcsmx;
+
+    /**
+     * 年合计场外受累天气次数（明细）
+     */
+    private BigDecimal nhjcwsltqcsmx;
+
+    /**
+     * 年合计离线次数（明细）
+     */
+    private BigDecimal nhjlxcsmx;
+
+    /**
+     * 年合计通讯中断次数（明细）
+     */
+    private BigDecimal nhjtxzdcsmx;
+
+    /**
+     * 年合计待机次数
+     */
+    private BigDecimal nhjdjcs;
+
+    /**
+     * 年合计故障停机次数
+     */
+    private BigDecimal nhjgztjcs;
+
+    /**
+     * 年合计通讯中断次数
+     */
+    private BigDecimal nhjtxzdcs;
+
+    /**
+     * 年合计检修停机次数
+     */
+    private BigDecimal nhjjxtjcs;
+
+    /**
+     * 年合计限电次数
+     */
+    private BigDecimal nhjxdcs;
+
+    /**
+     * 年合计运行次数
+     */
+    private BigDecimal nhjyxcs;
+
+    /**
+     * 日合计受累次数
+     */
+    private BigDecimal rhjslcs;
+
+    /**
+     * 月合计受累次数
+     */
+    private BigDecimal yhjslcs;
+
+    /**
+     * 年合计受累次数
+     */
+    private BigDecimal nhjslcs;
+
+
+}

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

@@ -0,0 +1,164 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 场站三率mtbf
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconPowerstationInfoDay4 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 外键编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 日期
+     */
+    private LocalDate recordDate;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 项目编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
+     * 日MTBF
+     */
+    private BigDecimal rmtbf;
+
+    /**
+     * 日MTTR
+     */
+    private BigDecimal rmttr;
+
+    /**
+     * 日MTTF
+     */
+    private BigDecimal rmttf;
+
+    /**
+     * 日复位及时率
+     */
+    private BigDecimal rfwjsl;
+
+    /**
+     * 日状态转换及时率
+     */
+    private BigDecimal rztzhjsl;
+
+    /**
+     * 日故障消缺及时率
+     */
+    private BigDecimal rgzxqjsl;
+
+    /**
+     * 月MTBF
+     */
+    private BigDecimal ymtbf;
+
+    /**
+     * 月MTTR
+     */
+    private BigDecimal ymttr;
+
+    /**
+     * 月MTTF
+     */
+    private BigDecimal ymttf;
+
+    /**
+     * 月复位及时率
+     */
+    private BigDecimal yfwjsl;
+
+    /**
+     * 月状态转换及时率
+     */
+    private BigDecimal yztzhjsl;
+
+    /**
+     * 月故障消缺及时率
+     */
+    private BigDecimal ygzxqjsl;
+
+    /**
+     * 年MTBF
+     */
+    private BigDecimal nmtbf;
+
+    /**
+     * 年MTTR
+     */
+    private BigDecimal nmttr;
+
+    /**
+     * 年MTTF
+     */
+    private BigDecimal nmttf;
+
+    /**
+     * 年复位及时率
+     */
+    private BigDecimal nfwjsl;
+
+    /**
+     * 年状态转换及时率
+     */
+    private BigDecimal nztzhjsl;
+
+    /**
+     * 年故障消缺及时率
+     */
+    private BigDecimal ngzxqjsl;
+
+
+}

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

@@ -0,0 +1,166 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 电表发电量
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconPowerstationInfoDay5 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 外键编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 项目编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
+     * 日发电量(电表)
+     */
+    private BigDecimal rfdldb;
+
+    /**
+     * 日上网电量(电表)
+     */
+    private BigDecimal rswdldb;
+
+    /**
+     * 日工网购网电量(电表)
+     */
+    private BigDecimal rgwgwdldb;
+
+    /**
+     * 日农网购网电量(电表)
+     */
+    private BigDecimal rnwgwdldb;
+
+    /**
+     * 日综合场用电量(电表)
+     */
+    private BigDecimal rzhcydldb;
+
+    /**
+     * 日发电厂用电量(电表)
+     */
+    private BigDecimal rfdcydldb;
+
+    /**
+     * 月发电量(电表)
+     */
+    private BigDecimal yfdldb;
+
+    /**
+     * 月上网电量(电表)
+     */
+    private BigDecimal yswdldb;
+
+    /**
+     * 月工网购网电量(电表)
+     */
+    private BigDecimal ygwgwdldb;
+
+    /**
+     * 月农网购网电量(电表)
+     */
+    private BigDecimal ynwgwdldb;
+
+    /**
+     * 月综合场用电量(电表)
+     */
+    private BigDecimal yzhcydldb;
+
+    /**
+     * 月发电厂用电量(电表)
+     */
+    private BigDecimal yfdcydldb;
+
+    /**
+     * 年发电量(电表)
+     */
+    private BigDecimal nfdldb;
+
+    /**
+     * 年上网电量(电表)
+     */
+    private BigDecimal nswdldb;
+
+    /**
+     * 年工网购网电量(电表)
+     */
+    private BigDecimal ngwgwdldb;
+
+    /**
+     * 年农网购网电量(电表)
+     */
+    private BigDecimal nnwgwdldb;
+
+    /**
+     * 年综合场用电量(电表)
+     */
+    private BigDecimal nzhcydldb;
+
+    /**
+     * 年发电厂用电量(电表)
+     */
+    private BigDecimal nfdcydldb;
+
+
+}

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

@@ -0,0 +1,164 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 测风塔出线功率
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconPowerstationInfoDay6 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 外键编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 日期
+     */
+    private LocalDate recordDate;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 项目编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
+     * 日最大风速（测风塔）
+     */
+    private BigDecimal rzdfscft;
+
+    /**
+     * 日最小风速（测风塔）
+     */
+    private BigDecimal rzxfscft;
+
+    /**
+     * 日最大功率（出线）
+     */
+    private BigDecimal rzdglcx;
+
+    /**
+     * 日最小功率（出线）
+     */
+    private BigDecimal rzxglcx;
+
+    /**
+     * 日平均功率（出线）
+     */
+    private BigDecimal rpjglcx;
+
+    /**
+     * 日平均风速（测风塔）
+     */
+    private BigDecimal rpjfscft;
+
+    /**
+     * 月最大风速（测风塔）
+     */
+    private BigDecimal yzdfscft;
+
+    /**
+     * 月最小风速（测风塔）
+     */
+    private BigDecimal yzxfscft;
+
+    /**
+     * 月最大功率（出线）
+     */
+    private BigDecimal yzdglcx;
+
+    /**
+     * 月最小功率（出线）
+     */
+    private BigDecimal yzxglcx;
+
+    /**
+     * 月平均功率（出线）
+     */
+    private BigDecimal ypjglcx;
+
+    /**
+     * 月平均风速（测风塔）
+     */
+    private BigDecimal ypjfscft;
+
+    /**
+     * 年最大风速（测风塔）
+     */
+    private BigDecimal nzdfscft;
+
+    /**
+     * 年最小风速（测风塔）
+     */
+    private BigDecimal nzxfscft;
+
+    /**
+     * 年最大功率（出线）
+     */
+    private BigDecimal nzdglcx;
+
+    /**
+     * 年最小功率（出线）
+     */
+    private BigDecimal nzxglcx;
+
+    /**
+     * 年平均功率（出线）
+     */
+    private BigDecimal npjglcx;
+
+    /**
+     * 年平均风速（测风塔）
+     */
+    private BigDecimal npjfscft;
+
+
+}

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

@@ -0,0 +1,119 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 离散率系统效率
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconPowerstationInfoDay7 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 外键编号
+     */
+    private String foreignKeyId;
+
+    /**
+     * 日期
+     */
+    private LocalDate recordDate;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 项目编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
+     * 日系统效率（PR）
+     */
+    private BigDecimal rxtxlpr;
+
+    /**
+     * 日离散率
+     */
+    private BigDecimal rlsl;
+
+    /**
+     * 日逆变器转换效率
+     */
+    private BigDecimal rnbqzhxl;
+
+    /**
+     * 月系统效率（PR）
+     */
+    private BigDecimal yxtxlpr;
+
+    /**
+     * 月离散率
+     */
+    private BigDecimal ylsl;
+
+    /**
+     * 月逆变器转换效率
+     */
+    private BigDecimal ynbqzhxl;
+
+    /**
+     * 年系统效率（PR）
+     */
+    private BigDecimal nxtxlpr;
+
+    /**
+     * 年离散率
+     */
+    private BigDecimal nlsl;
+
+    /**
+     * 年逆变器转换效率
+     */
+    private BigDecimal nnbqzhxl;
+
+
+}

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

@@ -0,0 +1,21 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicCompany;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 省公司表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicCompanyService extends IService<ProBasicCompany> {
+
+    BigDecimal getProBasicCompanyCapacity(String regionId, String  companyId);
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicEnergyGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 集团 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicEnergyGroupService extends IService<ProBasicEnergyGroup> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 风机&光伏 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicEquipmentService extends IService<ProBasicEquipment> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicLine;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 集电线路 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicLineService extends IService<ProBasicLine> {
+
+}

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

@@ -0,0 +1,29 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 场站表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicPowerstationService extends IService<ProBasicPowerstation> {
+
+    /**
+     * 获取场站信息列表
+     * @param regionId
+     * @param companyId
+     * @param windpowerstationId
+     * @return
+     */
+    List<ProBasicPowerstation> getProBasicPowerstationlist (String regionId,String  companyId, String windpowerstationId,String staType);
+
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicProject;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 工程表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicProjectService extends IService<ProBasicProject> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicRegion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 区域 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicRegionService extends IService<ProBasicRegion> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicSquare;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 方阵 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicSquareService extends IService<ProBasicSquare> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProBasicSubStation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 调度场站名称 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProBasicSubStationService extends IService<ProBasicSubStation> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPointCode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 指标查询表 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-23
+ */
+public interface IProEconPointCodeService extends IService<ProEconPointCode> {
+
+}

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

@@ -0,0 +1,36 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 场站五损电量 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-21
+ */
+public interface IProEconPowerstationInfoDay1Service extends IService<ProEconPowerstationInfoDay1> {
+
+    IPage<ProEconPowerstationInfoDay1> list(String pageNum, String pageSize);
+
+
+    /**
+     * 五损率
+     *
+     * @return
+     */
+    Map<String, ProEconPowerstationInfoDay1> getEconFiveLoss(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, Date date);
+
+    /** 场站电量统计 */
+    List<ProEconPowerstationInfoDay1> getEconFiveLosslist(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date);
+
+
+}

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

@@ -0,0 +1,23 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay2;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 场站五损时间 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProEconPowerstationInfoDay2Service extends IService<ProEconPowerstationInfoDay2> {
+
+    Map<String, ProEconPowerstationInfoDay2> getEconFiveLossTime(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date);
+
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay3;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 场站五损次数 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProEconPowerstationInfoDay3Service extends IService<ProEconPowerstationInfoDay3> {
+
+}

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

@@ -0,0 +1,33 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay4;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 场站三率mtbf 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProEconPowerstationInfoDay4Service extends IService<ProEconPowerstationInfoDay4> {
+
+
+    /**
+     * 获取三率
+     * @param regionId
+     * @param companyId
+     * @param windpowerstationId
+     * @param projectId
+     * @param lineId
+     * @param staType
+     * @param dateType
+     * @param date
+     * @return
+     */
+   Map<String, ProEconPowerstationInfoDay4> getEconThreeRate(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date);
+
+}

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

@@ -0,0 +1,26 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 电表发电量 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProEconPowerstationInfoDay5Service extends IService<ProEconPowerstationInfoDay5> {
+
+
+   Map<String ,ProEconPowerstationInfoDay5> getEconElectricQuantity(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date);
+
+
+
+   List<ProEconPowerstationInfoDay5> getEconZhcydldb(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date);
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay6;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 测风塔出线功率 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProEconPowerstationInfoDay6Service extends IService<ProEconPowerstationInfoDay6> {
+
+    Map<String, ProEconPowerstationInfoDay6> getEconPowerOfField(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date);
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.runeconomy.service.auto;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay7;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 离散率系统效率 服务类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+public interface IProEconPowerstationInfoDay7Service extends IService<ProEconPowerstationInfoDay7> {
+
+}

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

@@ -0,0 +1,50 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.model.auto.ProBasicCompany;
+import com.gyee.runeconomy.mapper.auto.ProBasicCompanyMapper;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.service.auto.IProBasicCompanyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 省公司表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicCompanyServiceImpl extends ServiceImpl<ProBasicCompanyMapper, ProBasicCompany> implements IProBasicCompanyService {
+
+    @Override
+    public  BigDecimal  getProBasicCompanyCapacity(String regionId, String companyId) {
+
+
+        QueryWrapper<ProBasicCompany> qw = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.lambda().eq(ProBasicCompany::getRegionId, regionId);
+        }
+        if (StringUtils.isNotEmpty(companyId)) {
+            qw.lambda().eq(ProBasicCompany::getId, companyId);
+        }
+
+
+        BigDecimal sumall = new BigDecimal("0.0000");
+
+        List<ProBasicCompany>  list = getBaseMapper().selectList(qw);
+        list.stream().forEach(i->{
+             sumall.add(i.getWindCapacity()).add(i.getCapacity());
+        });
+
+        return sumall;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.runeconomy.model.auto.ProBasicEnergyGroup;
+import com.gyee.runeconomy.mapper.auto.ProBasicEnergyGroupMapper;
+import com.gyee.runeconomy.service.auto.IProBasicEnergyGroupService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 集团 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicEnergyGroupServiceImpl extends ServiceImpl<ProBasicEnergyGroupMapper, ProBasicEnergyGroup> implements IProBasicEnergyGroupService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.gyee.runeconomy.mapper.auto.ProBasicEquipmentMapper;
+import com.gyee.runeconomy.service.auto.IProBasicEquipmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 风机&光伏 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentMapper, ProBasicEquipment> implements IProBasicEquipmentService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.runeconomy.model.auto.ProBasicLine;
+import com.gyee.runeconomy.mapper.auto.ProBasicLineMapper;
+import com.gyee.runeconomy.service.auto.IProBasicLineService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 集电线路 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicLineServiceImpl extends ServiceImpl<ProBasicLineMapper, ProBasicLine> implements IProBasicLineService {
+
+}

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

@@ -0,0 +1,53 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.common.model.StringUtils;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
+import com.gyee.runeconomy.mapper.auto.ProBasicPowerstationMapper;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.service.auto.IProBasicPowerstationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 场站表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerstationMapper, ProBasicPowerstation> implements IProBasicPowerstationService {
+
+    @Override
+    public List<ProBasicPowerstation> getProBasicPowerstationlist(String regionId, String companyId, String windpowerstationId, String staType) {
+
+        QueryWrapper<ProBasicPowerstation> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.lambda().eq(ProBasicPowerstation::getRegionId, regionId);
+        }
+        if (StringUtils.isNotEmpty(companyId)) {
+            qw.lambda().eq(ProBasicPowerstation::getCompanyId, companyId);
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.lambda().eq(ProBasicPowerstation::getId, windpowerstationId);
+        }
+
+        List<ProBasicPowerstation> list = baseMapper.selectList(qw);
+
+        if (StringUtils.isNotEmpty(staType) && staType.equals("-1")) {
+
+            List<ProBasicPowerstation> gcs = list.stream().filter(i -> i.getId().indexOf("FDC") >= 0).collect(Collectors.toList());
+        }
+        if (StringUtils.isNotEmpty(staType) && staType.equals("-2")) {
+
+            List<ProBasicPowerstation> gcs = list.stream().filter(i -> i.getId().indexOf("GDC") >= 0).collect(Collectors.toList());
+        }
+        return list;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.runeconomy.model.auto.ProBasicProject;
+import com.gyee.runeconomy.mapper.auto.ProBasicProjectMapper;
+import com.gyee.runeconomy.service.auto.IProBasicProjectService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 工程表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicProjectServiceImpl extends ServiceImpl<ProBasicProjectMapper, ProBasicProject> implements IProBasicProjectService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.runeconomy.model.auto.ProBasicRegion;
+import com.gyee.runeconomy.mapper.auto.ProBasicRegionMapper;
+import com.gyee.runeconomy.service.auto.IProBasicRegionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 区域 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper, ProBasicRegion> implements IProBasicRegionService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.runeconomy.model.auto.ProBasicSquare;
+import com.gyee.runeconomy.mapper.auto.ProBasicSquareMapper;
+import com.gyee.runeconomy.service.auto.IProBasicSquareService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 方阵 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicSquareServiceImpl extends ServiceImpl<ProBasicSquareMapper, ProBasicSquare> implements IProBasicSquareService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.runeconomy.model.auto.ProBasicSubStation;
+import com.gyee.runeconomy.mapper.auto.ProBasicSubStationMapper;
+import com.gyee.runeconomy.service.auto.IProBasicSubStationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 调度场站名称 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProBasicSubStationServiceImpl extends ServiceImpl<ProBasicSubStationMapper, ProBasicSubStation> implements IProBasicSubStationService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.runeconomy.model.auto.ProEconPointCode;
+import com.gyee.runeconomy.mapper.auto.ProEconPointCodeMapper;
+import com.gyee.runeconomy.service.auto.IProEconPointCodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 指标查询表 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-23
+ */
+@Service
+public class ProEconPointCodeServiceImpl extends ServiceImpl<ProEconPointCodeMapper, ProEconPointCode> implements IProEconPointCodeService {
+
+}

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

@@ -0,0 +1,155 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.DateUtils;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.mapper.auto.ProEconPowerstationInfoDay1Mapper;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+
+/**
+ * <p>
+ * 场站五损电量 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-21
+ */
+@Service
+public class ProEconPowerstationInfoDay1ServiceImpl extends ServiceImpl<ProEconPowerstationInfoDay1Mapper, ProEconPowerstationInfoDay1> implements IProEconPowerstationInfoDay1Service {
+
+
+    @Override
+    public IPage<ProEconPowerstationInfoDay1> list(String pageNum, String pageSize) {
+        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
+
+        Page<ProEconPowerstationInfoDay1> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<ProEconPowerstationInfoDay1> powerstationInfoDay1s = getBaseMapper().selectPage(page, qw);
+        return powerstationInfoDay1s;
+    }
+
+    @Override
+    public Map<String, ProEconPowerstationInfoDay1> getEconFiveLoss(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, Date date) {
+        Map<String, ProEconPowerstationInfoDay1> resultmap = new HashMap<>();
+
+        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
+        String location = "";
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getRegionId, regionId);
+            location = "rg";
+
+        }
+        if (StringUtils.isNotEmpty(companyId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getCompanyId, companyId);
+            location = "cp";
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getWindpowerstationId, windpowerstationId);
+            location = "wp";
+        }
+        if (StringUtils.isNotEmpty(projectId)) {
+
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getProjectId, projectId);
+            location = "pj";
+        }
+        if (StringUtils.isNotEmpty(lineId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getLineId, lineId);
+            location = "ln";
+        }
+        if (StringUtils.isNotEmpty(staType)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getForeignKeyId, staType);
+        }
+
+        if (StringUtils.isNotEmpty(location)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getLocation, location);
+        }
+
+        //当前数据
+        List<ProEconPowerstationInfoDay1> currlist = new ArrayList<>();
+        if (null !=date) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, date);
+            currlist = baseMapper.selectList(qw);
+            resultmap.put("currFiveInfo", currlist.size() > 0 ? currlist.get(0) : null);
+        }
+
+
+        //环比数据
+        List<ProEconPowerstationInfoDay1> ringlist = new ArrayList<>();
+        if (null !=date) {
+//            String ring = DateUtils.toDate1(DateUtils.addMonths(new Date(), -1));
+            Date ring = DateUtils.addMonths(new Date(), -1);
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, ring);
+            ringlist = baseMapper.selectList(qw);
+            resultmap.put("ringFiveInfo", ringlist.size() > 0 ? ringlist.get(0) : null);
+        }
+
+        //同比
+        List<ProEconPowerstationInfoDay1> withlist = new ArrayList<>();
+        if (null !=date) {
+            Date with = DateUtils.addYears(new Date(), -1);
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, with);
+            withlist = baseMapper.selectList(qw);
+            resultmap.put("withFiveInfo", withlist.size() > 0 ? withlist.get(0) : null);
+        }
+
+        return resultmap;
+    }
+
+    @Override
+    public List<ProEconPowerstationInfoDay1> getEconFiveLosslist(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date) {
+        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
+        String location = "";
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getRegionId, regionId);
+            location = "rg";
+
+        }
+        if (StringUtils.isNotEmpty(companyId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getCompanyId, companyId);
+            location = "cp";
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getWindpowerstationId, windpowerstationId);
+            location = "wp";
+        }
+        if (StringUtils.isNotEmpty(projectId)) {
+
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getProjectId, projectId);
+            location = "pj";
+        }
+        if (StringUtils.isNotEmpty(lineId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getLineId, lineId);
+            location = "ln";
+        }
+        if (StringUtils.isNotEmpty(staType)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getForeignKeyId, staType);
+        }
+
+        if (StringUtils.isNotEmpty(location)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay1::getLocation, location);
+        }
+
+        if (StringUtils.isNotEmpty(date)) {
+            String bingdate = DateUtils.toDate1(DateUtils.addDays(new Date(), -10));
+
+            qw.lambda().ge(ProEconPowerstationInfoDay1::getRecordDate, bingdate);
+            qw.lambda().le(ProEconPowerstationInfoDay1::getRecordDate, date);
+
+        }
+
+        List<ProEconPowerstationInfoDay1> list = baseMapper.selectList(qw);
+
+        return list;
+    }
+
+
+}

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

@@ -0,0 +1,90 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.DateUtils;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay2;
+import com.gyee.runeconomy.mapper.auto.ProEconPowerstationInfoDay2Mapper;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay2Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 场站五损时间 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProEconPowerstationInfoDay2ServiceImpl extends ServiceImpl<ProEconPowerstationInfoDay2Mapper, ProEconPowerstationInfoDay2> implements IProEconPowerstationInfoDay2Service {
+
+    @Override
+    public Map<String, ProEconPowerstationInfoDay2> getEconFiveLossTime(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date) {
+        Map<String, ProEconPowerstationInfoDay2> resultmap = new HashMap<>();
+
+        QueryWrapper<ProEconPowerstationInfoDay2> qw = new QueryWrapper<>();
+
+        String  location = "";
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay2::getRegionId, regionId);
+            location = "rg";
+
+        }
+        if (StringUtils.isNotEmpty(companyId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay2::getCompanyId, companyId);
+            location = "cp";
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay2::getWindpowerstationId, windpowerstationId);
+            location = "wp";
+        }
+        if (StringUtils.isNotEmpty(projectId)) {
+
+            qw.lambda().eq(ProEconPowerstationInfoDay2::getProjectId, projectId);
+            location = "pj";
+        }
+        if (StringUtils.isNotEmpty(lineId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay2::getLineId, lineId);
+            location = "ln";
+        }
+        if (StringUtils.isNotEmpty(staType)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay2::getForeignKeyId, staType);
+        }
+        if (StringUtils.isNotEmpty(location)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay2::getLocation, location);
+        }
+        //当前数据
+        List<ProEconPowerstationInfoDay2> currlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay2::getRecordDate, date);
+            currlist = getBaseMapper().selectList(qw);
+            resultmap.put("currTimeInfo",currlist.size()>0?currlist.get(0):null);
+        }
+
+
+        //环比数据
+        List<ProEconPowerstationInfoDay2> ringlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            String ring = DateUtils.toDate1(DateUtils.addMonths(new Date(), -1));
+            qw.lambda().eq(ProEconPowerstationInfoDay2::getRecordDate, ring);
+            ringlist = getBaseMapper().selectList(qw);
+            resultmap.put("ringTimeInfo",ringlist.size()>0?ringlist.get(0):null);
+        }
+
+        //同比
+        List<ProEconPowerstationInfoDay2> withlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            String with = DateUtils.toDate1(DateUtils.addYears(new Date(), -1));
+            qw.lambda().eq(ProEconPowerstationInfoDay2::getRecordDate, with);
+            withlist = getBaseMapper().selectList(qw);
+            resultmap.put("withTimeInfo",withlist.size()>0?withlist.get(0):null);
+        }
+
+        return resultmap;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay3;
+import com.gyee.runeconomy.mapper.auto.ProEconPowerstationInfoDay3Mapper;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay3Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场站五损次数 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProEconPowerstationInfoDay3ServiceImpl extends ServiceImpl<ProEconPowerstationInfoDay3Mapper, ProEconPowerstationInfoDay3> implements IProEconPowerstationInfoDay3Service {
+
+}

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

@@ -0,0 +1,93 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.DateUtils;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay1;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay2;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay4;
+import com.gyee.runeconomy.mapper.auto.ProEconPowerstationInfoDay4Mapper;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay4Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 场站三率mtbf 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProEconPowerstationInfoDay4ServiceImpl extends ServiceImpl<ProEconPowerstationInfoDay4Mapper, ProEconPowerstationInfoDay4> implements IProEconPowerstationInfoDay4Service {
+
+    @Override
+    public Map<String, ProEconPowerstationInfoDay4> getEconThreeRate(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date) {
+
+        Map<String, ProEconPowerstationInfoDay4> resultmap = new HashMap<>();
+
+        QueryWrapper<ProEconPowerstationInfoDay4> qw = new QueryWrapper<>();
+
+        String  location = "";
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay4::getRegionId, regionId);
+            location = "rg";
+
+        }
+        if (StringUtils.isNotEmpty(companyId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay4::getCompanyId, companyId);
+            location = "cp";
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay4::getWindpowerstationId, windpowerstationId);
+            location = "wp";
+        }
+        if (StringUtils.isNotEmpty(projectId)) {
+
+            qw.lambda().eq(ProEconPowerstationInfoDay4::getProjectId, projectId);
+            location = "pj";
+        }
+        if (StringUtils.isNotEmpty(lineId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay4::getLineId, lineId);
+            location = "ln";
+        }
+        if (StringUtils.isNotEmpty(staType)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay4::getForeignKeyId, staType);
+        }
+        if (StringUtils.isNotEmpty(location)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay4::getLocation, location);
+        }
+
+        //当前数据
+        List<ProEconPowerstationInfoDay4> currlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay4::getRecordDate, date);
+            currlist = getBaseMapper().selectList(qw);
+            resultmap.put("currThreeInfo",currlist.size()>0?currlist.get(0):null);
+        }
+
+
+        //环比数据
+        List<ProEconPowerstationInfoDay4> ringlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            String ring = DateUtils.toDate1(DateUtils.addMonths(new Date(), -1));
+            qw.lambda().eq(ProEconPowerstationInfoDay4::getRecordDate, ring);
+            ringlist = getBaseMapper().selectList(qw);
+            resultmap.put("ringThreeInfo",ringlist.size()>0?ringlist.get(0):null);
+        }
+
+        //同比
+        List<ProEconPowerstationInfoDay4> withlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            String with = DateUtils.toDate1(DateUtils.addYears(new Date(), -1));
+            qw.lambda().eq(ProEconPowerstationInfoDay4::getRecordDate, with);
+            withlist = getBaseMapper().selectList(qw);
+            resultmap.put("withThreeInfo",withlist.size()>0?withlist.get(0):null);
+        }
+
+        return resultmap;
+    }
+}

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

@@ -0,0 +1,143 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.DateUtils;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay4;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.gyee.runeconomy.mapper.auto.ProEconPowerstationInfoDay5Mapper;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay5Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * <p>
+ * 电表发电量 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProEconPowerstationInfoDay5ServiceImpl extends ServiceImpl<ProEconPowerstationInfoDay5Mapper, ProEconPowerstationInfoDay5> implements IProEconPowerstationInfoDay5Service {
+
+    @Override
+    public Map<String, ProEconPowerstationInfoDay5> getEconElectricQuantity(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date) {
+        Map<String, ProEconPowerstationInfoDay5> resultmap = new HashMap<>();
+
+        QueryWrapper<ProEconPowerstationInfoDay5> qw = new QueryWrapper<>();
+
+        String  location = "";
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getRegionId, regionId);
+            location = "rg";
+
+        }
+        if (StringUtils.isNotEmpty(companyId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getCompanyId, companyId);
+            location = "cp";
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getWindpowerstationId, windpowerstationId);
+            location = "wp";
+        }
+        if (StringUtils.isNotEmpty(projectId)) {
+
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getProjectId, projectId);
+            location = "pj";
+        }
+        if (StringUtils.isNotEmpty(lineId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getLineId, lineId);
+            location = "ln";
+        }
+        if (StringUtils.isNotEmpty(staType)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getForeignKeyId, staType);
+        }
+        if (StringUtils.isNotEmpty(location)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getLocation, location);
+        }
+
+        //当前数据
+        List<ProEconPowerstationInfoDay5> currlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getRecordDate, date);
+            currlist = getBaseMapper().selectList(qw);
+            resultmap.put("currDlInfo",currlist.size()>0?currlist.get(0):null);
+        }
+
+
+        //环比数据
+        List<ProEconPowerstationInfoDay5> ringlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            String ring = DateUtils.toDate1(DateUtils.addMonths(new Date(), -1));
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getRecordDate, ring);
+            ringlist = getBaseMapper().selectList(qw);
+            resultmap.put("ringDlInfo",ringlist.size()>0?ringlist.get(0):null);
+        }
+
+        //同比
+        List<ProEconPowerstationInfoDay5> withlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            String with = DateUtils.toDate1(DateUtils.addYears(new Date(), -1));
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getRecordDate, with);
+            withlist = getBaseMapper().selectList(qw);
+            resultmap.put("withDlInfo",withlist.size()>0?withlist.get(0):null);
+        }
+
+        return resultmap;
+    }
+
+    @Override
+    public List<ProEconPowerstationInfoDay5> getEconZhcydldb(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date) {
+
+        QueryWrapper<ProEconPowerstationInfoDay5> qw = new QueryWrapper<>();
+
+        String  location = "";
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getRegionId, regionId);
+            location = "rg";
+
+        }
+        if (StringUtils.isNotEmpty(companyId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getCompanyId, companyId);
+            location = "cp";
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getWindpowerstationId, windpowerstationId);
+            location = "wp";
+        }
+        if (StringUtils.isNotEmpty(projectId)) {
+
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getProjectId, projectId);
+            location = "pj";
+        }
+        if (StringUtils.isNotEmpty(lineId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getLineId, lineId);
+            location = "ln";
+        }
+        if (StringUtils.isNotEmpty(staType)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getForeignKeyId, staType);
+        }
+        if (StringUtils.isNotEmpty(location)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay5::getLocation, location);
+        }
+
+        if (StringUtils.isNotEmpty(date)) {
+            String bingdate = DateUtils.toDate1(DateUtils.addDays(new Date(), -7));
+
+            qw.lambda().ge(ProEconPowerstationInfoDay5::getRecordDate, bingdate);
+            qw.lambda().le(ProEconPowerstationInfoDay5::getRecordDate, date);
+
+        }
+
+        List<ProEconPowerstationInfoDay5> list = baseMapper.selectList(qw);
+
+        return list;
+    }
+
+
+}

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

@@ -0,0 +1,92 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.DateUtils;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay5;
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay6;
+import com.gyee.runeconomy.mapper.auto.ProEconPowerstationInfoDay6Mapper;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay6Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 测风塔出线功率 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProEconPowerstationInfoDay6ServiceImpl extends ServiceImpl<ProEconPowerstationInfoDay6Mapper, ProEconPowerstationInfoDay6> implements IProEconPowerstationInfoDay6Service {
+
+    @Override
+    public Map<String, ProEconPowerstationInfoDay6> getEconPowerOfField(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType, String date) {
+        Map<String, ProEconPowerstationInfoDay6> resultmap = new HashMap<>();
+
+        QueryWrapper<ProEconPowerstationInfoDay6> qw = new QueryWrapper<>();
+
+        String  location = "";
+        if (StringUtils.isNotEmpty(regionId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay6::getRegionId, regionId);
+            location = "rg";
+
+        }
+        if (StringUtils.isNotEmpty(companyId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay6::getCompanyId, companyId);
+            location = "cp";
+        }
+        if (StringUtils.isNotEmpty(windpowerstationId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay6::getWindpowerstationId, windpowerstationId);
+            location = "wp";
+        }
+        if (StringUtils.isNotEmpty(projectId)) {
+
+            qw.lambda().eq(ProEconPowerstationInfoDay6::getProjectId, projectId);
+            location = "pj";
+        }
+        if (StringUtils.isNotEmpty(lineId)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay6::getLineId, lineId);
+            location = "ln";
+        }
+        if (StringUtils.isNotEmpty(staType)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay6::getForeignKeyId, staType);
+        }
+
+        if (StringUtils.isNotEmpty(location)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay6::getLocation, location);
+        }
+
+        //当前数据
+        List<ProEconPowerstationInfoDay6> currlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            qw.lambda().eq(ProEconPowerstationInfoDay6::getRecordDate, date);
+            currlist = getBaseMapper().selectList(qw);
+            resultmap.put("currGlInfo",currlist.size()>0?currlist.get(0):null);
+        }
+
+
+        //环比数据
+        List<ProEconPowerstationInfoDay6> ringlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            String ring = DateUtils.toDate1(DateUtils.addMonths(new Date(), -1));
+            qw.lambda().eq(ProEconPowerstationInfoDay6::getRecordDate, ring);
+            ringlist = getBaseMapper().selectList(qw);
+            resultmap.put("ringGlInfo",ringlist.size()>0?ringlist.get(0):null);
+        }
+
+        //同比
+        List<ProEconPowerstationInfoDay6> withlist = new ArrayList<>();
+        if (StringUtils.isNotEmpty(date)) {
+            String with = DateUtils.toDate1(DateUtils.addYears(new Date(), -1));
+            qw.lambda().eq(ProEconPowerstationInfoDay6::getRecordDate, with);
+            withlist = getBaseMapper().selectList(qw);
+            resultmap.put("withGlInfo",withlist.size()>0?withlist.get(0):null);
+        }
+
+        return resultmap;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.runeconomy.model.auto.ProEconPowerstationInfoDay7;
+import com.gyee.runeconomy.mapper.auto.ProEconPowerstationInfoDay7Mapper;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay7Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 离散率系统效率 服务实现类
+ * </p>
+ *
+ * @author wang
+ * @since 2022-11-22
+ */
+@Service
+public class ProEconPowerstationInfoDay7ServiceImpl extends ServiceImpl<ProEconPowerstationInfoDay7Mapper, ProEconPowerstationInfoDay7> implements IProEconPowerstationInfoDay7Service {
+
+}

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

@@ -0,0 +1,822 @@
+package com.gyee.runeconomy.service.homepage;
+
+
+import com.gyee.common.util.DateUtils;
+import com.gyee.runeconomy.dto.response.EconHomePagePointRateDTO;
+import com.gyee.runeconomy.model.auto.*;
+import com.gyee.runeconomy.service.auto.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 经济运行首页服务类
+ */
+@Service
+public class EconomyPointHomePageService {
+
+
+    @Autowired
+    private IProEconPowerstationInfoDay1Service proEconPowerstationInfoDay1Service;//场站五损电量
+
+    @Autowired
+    private IProEconPowerstationInfoDay2Service proEconPowerstationInfoDay2Service;//场站五损时间
+
+    @Autowired
+    private IProEconPowerstationInfoDay4Service proEconPowerstationInfoDay4Service;//场站三率mtbf
+
+    @Autowired
+    private IProEconPowerstationInfoDay5Service proEconPowerstationInfoDay5Service;//电表发电量
+
+    @Autowired
+    private IProEconPowerstationInfoDay6Service proEconPowerstationInfoDay6Service;//测风塔出线功率
+
+    @Autowired
+    private IProBasicCompanyService proBasicCompanyService;
+
+    private IProBasicPowerstationService proBasicPowerstationService;
+
+    /**
+     * 指标率相应类
+     */
+    private EconHomePagePointRateDTO dto = new EconHomePagePointRateDTO();
+    /**
+     * 五损
+     */
+    private Map<String, ProEconPowerstationInfoDay1> wsmap = new HashMap<>();
+    /**
+     * 三率
+     */
+    private Map<String, ProEconPowerstationInfoDay4> slmap = new HashMap<>();
+    /**
+     * 电量
+     */
+    private Map<String, ProEconPowerstationInfoDay5> dlmap = new HashMap<>();
+    /**
+     * 功率
+     */
+    private Map<String, ProEconPowerstationInfoDay6> glmap = new HashMap<>();
+    /**
+     * 五损时间
+     */
+    private Map<String, ProEconPowerstationInfoDay2> wstimemap = new HashMap<>();
+
+
+    /** 综合场用电率  */
+    private List<ProEconPowerstationInfoDay5> zhcydllist = new ArrayList<>();
+
+    /** 电量统计分析 */
+    private List<ProEconPowerstationInfoDay1> dltjfxlist = new ArrayList<>();
+
+    private BigDecimal capacity = null;
+
+    private Map<String,BigDecimal> wsdlfx = null;//五损电量分析
+
+    private Map<String,BigDecimal> zhcydl = null;//综合场用电率
+
+    private List<Map<String,BigDecimal>> dltjfxList = null;//电量统计分析
+
+
+
+    /**
+     * 装机容量
+     */
+
+    /**
+     * 经济运行首页聚合方法
+     *
+     * @param regionId
+     * @param companyId
+     * @param windpowerstationId
+     * @param projectId
+     * @param lineId
+     * @param staType
+     * @param dateType
+     * @return
+     */
+    public EconHomePagePointRateDTO getEconomyPointHomePageInfo(String regionId, String companyId, String windpowerstationId, String projectId, String lineId, String staType, String dateType) throws ParseException {
+        //获取当前时间
+        String date = DateUtils.toDate1(new Date());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date3 =  sdf.parse(date);
+
+
+
+        /** 五损 */
+        wsmap = proEconPowerstationInfoDay1Service.getEconFiveLoss(regionId, companyId, windpowerstationId, projectId, lineId, staType, dateType, date3);
+
+        /** 三率 */
+        slmap = proEconPowerstationInfoDay4Service.getEconThreeRate(regionId, companyId, windpowerstationId, projectId, lineId, staType, dateType, date);
+
+        /** 综合场用电量 */
+        dlmap = proEconPowerstationInfoDay5Service.getEconElectricQuantity(regionId, companyId, windpowerstationId, projectId, lineId, staType, dateType, date);
+
+        /** 场功率 */
+        glmap = proEconPowerstationInfoDay6Service.getEconPowerOfField(regionId, companyId, windpowerstationId, projectId, lineId, staType, dateType, date);
+
+        /**  五损时间 */
+        wstimemap = proEconPowerstationInfoDay2Service.getEconFiveLossTime(regionId, companyId, windpowerstationId, projectId, lineId, staType, dateType, date);
+
+        //装机容量
+        capacity = proBasicCompanyService.getProBasicCompanyCapacity(regionId, companyId);
+        //综合场用电量、
+        zhcydllist =  proEconPowerstationInfoDay5Service.getEconZhcydldb(regionId, companyId, windpowerstationId, projectId, lineId, staType, dateType, date);
+
+        //电量统计分析
+        dltjfxlist = proEconPowerstationInfoDay1Service.getEconFiveLosslist(regionId, companyId, windpowerstationId, projectId, lineId, staType, dateType, date);
+
+
+        /**  场站信息 */
+        List<ProBasicPowerstation> powerstationList =  proBasicPowerstationService.getProBasicPowerstationlist(regionId,companyId,windpowerstationId,staType);
+        wsdlfx = new HashMap<>();//五损电量分析
+        zhcydl= new HashMap<>();//综合场用电率
+        dltjfxList = new ArrayList<>();//电量统计分析
+        switch (dateType) {
+
+            case "r":
+                currFiveInfo();
+                currThreeRateInfo();
+                currOtherInfo();
+                currFiveDlFx();
+                currZhcydl();
+                currDltjfx();
+
+
+                break;
+            case "y":
+                monthFiveInfo();
+                monthThreeRateInfo();
+                monthOtherInfo();
+                monthFiveDlFx();
+                monthZhcydl();
+                monthDltjfx();
+
+
+                break;
+            case "n":
+                yearFiveInfo();
+                yearThreeRateInfo();
+                yearOtherInfo();
+                yearFiveDlFx();
+                yearZhcydl();
+                yearDltjfx();
+
+                break;
+
+        }
+
+        return dto;
+    }
+
+
+    /**
+     * 电量统计分析
+     */
+
+    private void currDltjfx() {
+
+        dltjfxlist.stream().forEach(i -> {
+            Map<String, BigDecimal> m = new HashMap<>();
+            m.put("fdl", i.getRfdl()); //发电量
+            m.put("sldl", i.getRcwsldwssdl().add(i.getRcwsltqssdl()));  //受累
+            m.put("jxdl", i.getRjxssdl()); //检修
+            m.put("xddl", i.getRxdtjssdl().add(i.getRxdjclssdl()));//限电
+            m.put("fgzdl", i.getRgzssdl());      //故障
+            m.put("xndl", i.getRxnssdl());//性能
+            dltjfxList.add(m);
+        });
+    }
+
+    private void monthDltjfx() {
+        dltjfxlist.stream().forEach(i -> {
+            Map<String, BigDecimal> m = new HashMap<>();
+            m.put("fdl", i.getYfdl()); //发电量
+            m.put("sldl", i.getYcwsldwssdl().add(i.getRcwsltqssdl()));  //受累
+            m.put("jxdl", i.getYjxssdl()); //检修
+            m.put("xddl", i.getYxdtjssdl().add(i.getRxdjclssdl()));//限电
+            m.put("fgzdl", i.getYgzssdl());      //故障
+            m.put("xndl", i.getYxnssdl());//性能
+            dltjfxList.add(m);
+        });
+    }
+
+    private void yearDltjfx() {
+        dltjfxlist.stream().forEach(i -> {
+            Map<String, BigDecimal> m = new HashMap<>();
+            m.put("fdl", i.getNfdl()); //发电量
+            m.put("sldl", i.getNcwsldwssdl().add(i.getRcwsltqssdl()));  //受累
+            m.put("jxdl", i.getNjxssdl()); //检修
+            m.put("xddl", i.getNxdtjssdl().add(i.getRxdjclssdl()));//限电
+            m.put("fgzdl", i.getNgzssdl());      //故障
+            m.put("xndl", i.getNxnssdl());//性能
+            dltjfxList.add(m);
+        });
+    }
+
+
+
+
+    /**综合厂用电率 */
+    private void currZhcydl(){
+        zhcydllist.stream().forEach(i->{
+            zhcydl.put(DateUtils.toDate1(i.getRecordDate()),i.getRzhcydldb().divide(i.getRfdldb(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        });
+    }
+
+    private void monthZhcydl(){
+        zhcydllist.stream().forEach(i->{
+            zhcydl.put(DateUtils.toDate1(i.getRecordDate()),i.getYzhcydldb().divide(i.getYfdldb(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        });
+    }
+
+    private void yearZhcydl(){
+        zhcydllist.stream().forEach(i->{
+            zhcydl.put(DateUtils.toDate1(i.getRecordDate()),i.getNzhcydldb().divide(i.getNfdldb(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        });
+    }
+
+
+    /** 损失电量分析*/
+    private void currFiveDlFx() {
+        ProEconPowerstationInfoDay1 fiveInfo = wsmap.get("currFiveInfo");
+
+        //发电量
+        wsdlfx.put("fdl", fiveInfo.getRfdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //受累
+        wsdlfx.put("sldl", (fiveInfo.getRcwsldwssdl().add(fiveInfo.getRcwsltqssdl())).divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //检修
+        wsdlfx.put("jxdl", fiveInfo.getRjxssdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //限电
+        wsdlfx.put("xddl", (fiveInfo.getRxdtjssdl().add(fiveInfo.getRxdjclssdl())).divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //故障
+        wsdlfx.put("fgzdl", fiveInfo.getRgzssdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //性能
+        wsdlfx.put("xndl", fiveInfo.getRxnssdl().divide(fiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+
+    }
+    private void monthFiveDlFx() {
+        ProEconPowerstationInfoDay1 fiveInfo = wsmap.get("currFiveInfo");
+        //发电量
+        wsdlfx.put("fdl", fiveInfo.getYfdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //受累
+        wsdlfx.put("sldl", (fiveInfo.getYcwsldwssdl().add(fiveInfo.getYcwsltqssdl())).divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //检修
+        wsdlfx.put("jxdl", fiveInfo.getYjxssdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //限电
+        wsdlfx.put("xddl", (fiveInfo.getYxdtjssdl().add(fiveInfo.getYxdjclssdl())).divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //故障
+        wsdlfx.put("fgzdl", fiveInfo.getYgzssdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //性能
+        wsdlfx.put("xndl", fiveInfo.getYxnssdl().divide(fiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+
+    }
+
+    private void yearFiveDlFx() {
+        ProEconPowerstationInfoDay1 fiveInfo = wsmap.get("currFiveInfo");
+        //发电量
+        wsdlfx.put("fdl", fiveInfo.getNfdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //受累
+        wsdlfx.put("sldl", (fiveInfo.getNcwsldwssdl().add(fiveInfo.getNcwsltqssdl())).divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //检修
+        wsdlfx.put("jxdl", fiveInfo.getNjxssdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //限电
+        wsdlfx.put("xddl", (fiveInfo.getNxdtjssdl().add(fiveInfo.getNxdjclssdl())).divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //故障
+        wsdlfx.put("fgzdl", fiveInfo.getNgzssdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+        //性能
+        wsdlfx.put("xndl", fiveInfo.getNxnssdl().divide(fiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+    }
+
+
+
+
+    /**
+     * 五损经济指标
+     */
+    private void currFiveInfo() {
+        ProEconPowerstationInfoDay1 currFiveInfo = wsmap.get("currFiveInfo");
+        ProEconPowerstationInfoDay1 ringFiveInfo = wsmap.get("ringFiveInfo");
+        ProEconPowerstationInfoDay1 withFiveInfo = wsmap.get("withFiveInfo");
+
+        if (null != currFiveInfo) {
+            BigDecimal currgzsll = currFiveInfo.getRgzssdl().divide(currFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currjxsll = currFiveInfo.getRjxssdl().divide(currFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currxdsll = (currFiveInfo.getRxdtjssdl().add(currFiveInfo.getRxdjclssdl())).divide(currFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currslsll = (currFiveInfo.getRcnslgzssdl().add(currFiveInfo.getRcnsljxssdl())).divide(currFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currxnsll = currFiveInfo.getRxnssdl().divide(currFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+            dto.setCurrGzsll(currgzsll);
+            dto.setCurrGzsll(currjxsll);
+            dto.setCurrGzsll(currxdsll);
+            dto.setCurrGzsll(currslsll);
+            dto.setCurrGzsll(currxnsll);
+
+
+            if (null != ringFiveInfo) {
+                BigDecimal ringgzsll = ringFiveInfo.getRgzssdl().divide(ringFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringjxsll = ringFiveInfo.getRjxssdl().divide(ringFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxdsll = (ringFiveInfo.getRxdtjssdl().add(ringFiveInfo.getRxdjclssdl())).divide(ringFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringslsll = (ringFiveInfo.getRcnslgzssdl().add(ringFiveInfo.getRcnsljxssdl())).divide(ringFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxnsll = ringFiveInfo.getRxnssdl().divide(ringFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                BigDecimal ringGzslzzl = currgzsll.subtract(ringgzsll).divide(ringgzsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringjxslzzl = currjxsll.subtract(ringjxsll).divide(ringjxsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxdslzzl = currxdsll.subtract(ringxdsll).divide(ringxdsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringslslzzl = currslsll.subtract(ringslsll).divide(ringslsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxnslzzl = currxnsll.subtract(ringxnsll).divide(ringxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                dto.setRingGzslzzl(ringGzslzzl);
+                dto.setRingGzslzzl(ringjxslzzl);
+                dto.setRingGzslzzl(ringxdslzzl);
+                dto.setRingGzslzzl(ringslslzzl);
+                dto.setRingGzslzzl(ringxnslzzl);
+
+            }
+
+            if (null != withFiveInfo) {
+                BigDecimal withgzsll = withFiveInfo.getRgzssdl().divide(withFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withjxsll = withFiveInfo.getRjxssdl().divide(withFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxdsll = (withFiveInfo.getRxdtjssdl().add(withFiveInfo.getRxdjclssdl())).divide(withFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withslsll = (withFiveInfo.getRcnslgzssdl().add(withFiveInfo.getRcnsljxssdl())).divide(withFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxnsll = withFiveInfo.getRxnssdl().divide(withFiveInfo.getRllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                BigDecimal withGzslzzl = currgzsll.subtract(withgzsll).divide(withgzsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withjxslzzl = currjxsll.subtract(withjxsll).divide(withjxsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxdslzzl = currxdsll.subtract(withxdsll).divide(withxdsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withslslzzl = currslsll.subtract(withslsll).divide(withslsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxnslzzl = currxnsll.subtract(withxnsll).divide(withxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                dto.setWithGzslzzl(withGzslzzl);
+                dto.setWithGzslzzl(withjxslzzl);
+                dto.setWithGzslzzl(withxdslzzl);
+                dto.setWithGzslzzl(withslslzzl);
+                dto.setWithGzslzzl(withxnslzzl);
+            }
+        }
+
+
+    }
+
+    private void monthFiveInfo() {
+        ProEconPowerstationInfoDay1 currFiveInfo = wsmap.get("currFiveInfo");
+        ProEconPowerstationInfoDay1 ringFiveInfo = wsmap.get("ringFiveInfo");
+        ProEconPowerstationInfoDay1 withFiveInfo = wsmap.get("withFiveInfo");
+
+        if (null != currFiveInfo) {
+            BigDecimal currgzsll = currFiveInfo.getYgzssdl().divide(currFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currjxsll = currFiveInfo.getYjxssdl().divide(currFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currxdsll = (currFiveInfo.getYxdtjssdl().add(currFiveInfo.getYxdjclssdl())).divide(currFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currslsll = (currFiveInfo.getYcnslgzssdl().add(currFiveInfo.getYcnsljxssdl())).divide(currFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currxnsll = currFiveInfo.getYxnssdl().divide(currFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+            dto.setCurrGzsll(currgzsll);
+            dto.setCurrGzsll(currjxsll);
+            dto.setCurrGzsll(currxdsll);
+            dto.setCurrGzsll(currslsll);
+            dto.setCurrGzsll(currxnsll);
+
+
+            if (null != ringFiveInfo) {
+                BigDecimal ringgzsll = ringFiveInfo.getYgzssdl().divide(ringFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringjxsll = ringFiveInfo.getYjxssdl().divide(ringFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxdsll = (ringFiveInfo.getYxdtjssdl().add(ringFiveInfo.getYxdjclssdl())).divide(ringFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringslsll = (ringFiveInfo.getYcnslgzssdl().add(ringFiveInfo.getYcnsljxssdl())).divide(ringFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxnsll = ringFiveInfo.getYxnssdl().divide(ringFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                BigDecimal ringGzslzzl = currgzsll.subtract(ringgzsll).divide(ringgzsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringjxslzzl = currjxsll.subtract(ringjxsll).divide(ringjxsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxdslzzl = currxdsll.subtract(ringxdsll).divide(ringxdsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringslslzzl = currslsll.subtract(ringslsll).divide(ringslsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxnslzzl = currxnsll.subtract(ringxnsll).divide(ringxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                dto.setRingGzslzzl(ringGzslzzl);
+                dto.setRingGzslzzl(ringjxslzzl);
+                dto.setRingGzslzzl(ringxdslzzl);
+                dto.setRingGzslzzl(ringslslzzl);
+                dto.setRingGzslzzl(ringxnslzzl);
+
+            }
+
+            if (null != withFiveInfo) {
+                BigDecimal withgzsll = withFiveInfo.getYgzssdl().divide(withFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withjxsll = withFiveInfo.getYjxssdl().divide(withFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxdsll = (withFiveInfo.getYxdtjssdl().add(withFiveInfo.getYxdjclssdl())).divide(withFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withslsll = (withFiveInfo.getYcnslgzssdl().add(withFiveInfo.getYcnsljxssdl())).divide(withFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxnsll = withFiveInfo.getYxnssdl().divide(withFiveInfo.getYllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                BigDecimal withGzslzzl = currgzsll.subtract(withgzsll).divide(withgzsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withjxslzzl = currjxsll.subtract(withjxsll).divide(withjxsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxdslzzl = currxdsll.subtract(withxdsll).divide(withxdsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withslslzzl = currslsll.subtract(withslsll).divide(withslsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxnslzzl = currxnsll.subtract(withxnsll).divide(withxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                dto.setWithGzslzzl(withGzslzzl);
+                dto.setWithGzslzzl(withjxslzzl);
+                dto.setWithGzslzzl(withxdslzzl);
+                dto.setWithGzslzzl(withslslzzl);
+                dto.setWithGzslzzl(withxnslzzl);
+            }
+
+        }
+
+    }
+
+    private void yearFiveInfo() {
+
+        ProEconPowerstationInfoDay1 currFiveInfo = wsmap.get("currFiveInfo");
+        ProEconPowerstationInfoDay1 ringFiveInfo = wsmap.get("ringFiveInfo");
+        ProEconPowerstationInfoDay1 withFiveInfo = wsmap.get("withFiveInfo");
+
+        if (null != currFiveInfo) {
+            BigDecimal currgzsll = currFiveInfo.getNgzssdl().divide(currFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currjxsll = currFiveInfo.getNjxssdl().divide(currFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currxdsll = (currFiveInfo.getNxdtjssdl().add(currFiveInfo.getNxdjclssdl())).divide(currFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currslsll = (currFiveInfo.getNcnslgzssdl().add(currFiveInfo.getNcnsljxssdl())).divide(currFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            BigDecimal currxnsll = currFiveInfo.getNxnssdl().divide(currFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+            dto.setCurrGzsll(currgzsll);
+            dto.setCurrGzsll(currjxsll);
+            dto.setCurrGzsll(currxdsll);
+            dto.setCurrGzsll(currslsll);
+            dto.setCurrGzsll(currxnsll);
+
+
+            if (null != ringFiveInfo) {
+                BigDecimal ringgzsll = ringFiveInfo.getNgzssdl().divide(ringFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringjxsll = ringFiveInfo.getNjxssdl().divide(ringFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxdsll = (ringFiveInfo.getNxdtjssdl().add(ringFiveInfo.getNxdjclssdl())).divide(ringFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringslsll = (ringFiveInfo.getNcnslgzssdl().add(ringFiveInfo.getNcnsljxssdl())).divide(ringFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxnsll = ringFiveInfo.getNxnssdl().divide(ringFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                BigDecimal ringGzslzzl = currgzsll.subtract(ringgzsll).divide(ringgzsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringjxslzzl = currjxsll.subtract(ringjxsll).divide(ringjxsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxdslzzl = currxdsll.subtract(ringxdsll).divide(ringxdsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringslslzzl = currslsll.subtract(ringslsll).divide(ringslsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringxnslzzl = currxnsll.subtract(ringxnsll).divide(ringxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                dto.setRingGzslzzl(ringGzslzzl);
+                dto.setRingGzslzzl(ringjxslzzl);
+                dto.setRingGzslzzl(ringxdslzzl);
+                dto.setRingGzslzzl(ringslslzzl);
+                dto.setRingGzslzzl(ringxnslzzl);
+
+            }
+
+            if (null != withFiveInfo) {
+                BigDecimal withgzsll = withFiveInfo.getNgzssdl().divide(withFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withjxsll = withFiveInfo.getNjxssdl().divide(withFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxdsll = (withFiveInfo.getNxdtjssdl().add(withFiveInfo.getNxdjclssdl())).divide(withFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withslsll = (withFiveInfo.getNcnslgzssdl().add(withFiveInfo.getNcnsljxssdl())).divide(withFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxnsll = withFiveInfo.getNxnssdl().divide(withFiveInfo.getNllfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                BigDecimal withGzslzzl = currgzsll.subtract(withgzsll).divide(withgzsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withjxslzzl = currjxsll.subtract(withjxsll).divide(withjxsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxdslzzl = currxdsll.subtract(withxdsll).divide(withxdsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withslslzzl = currslsll.subtract(withslsll).divide(withslsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withxnslzzl = currxnsll.subtract(withxnsll).divide(withxnsll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+
+                dto.setWithGzslzzl(withGzslzzl);
+                dto.setWithGzslzzl(withjxslzzl);
+                dto.setWithGzslzzl(withxdslzzl);
+                dto.setWithGzslzzl(withslslzzl);
+                dto.setWithGzslzzl(withxnslzzl);
+            }
+
+        }
+
+
+    }
+
+    /**
+     * 三率经济指标
+     */
+    private void currThreeRateInfo() {
+        ProEconPowerstationInfoDay4 currThreeInfo = slmap.get("currThreeInfo");
+        ProEconPowerstationInfoDay4 ringThreeInfo = slmap.get("ringThreeInfo");
+        ProEconPowerstationInfoDay4 withThreeInfo = slmap.get("withThreeInfo");
+
+        if (null != currThreeInfo) {
+
+            dto.setCurrFwjsl(currThreeInfo.getRfwjsl());
+            dto.setCurrZtzhl(currThreeInfo.getRztzhjsl());
+            dto.setCurrXqjsl(currThreeInfo.getRgzxqjsl());
+
+
+            if (null != ringThreeInfo) {
+
+                dto.setRingFwjszzl((currThreeInfo.getRfwjsl().subtract(ringThreeInfo.getRfwjsl())).divide(ringThreeInfo.getRfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setRingZtzhzzl((currThreeInfo.getRztzhjsl().subtract(ringThreeInfo.getRztzhjsl())).divide(ringThreeInfo.getRztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setRingXqjszzl((currThreeInfo.getRgzxqjsl().subtract(ringThreeInfo.getRgzxqjsl())).divide(ringThreeInfo.getRgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+
+            }
+
+            if (null != withThreeInfo) {
+
+                dto.setWithFwjszzl((currThreeInfo.getRfwjsl().subtract(withThreeInfo.getRfwjsl())).divide(withThreeInfo.getRfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setWithZtzhzzl((currThreeInfo.getRztzhjsl().subtract(withThreeInfo.getRztzhjsl())).divide(withThreeInfo.getRztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setWithXqjszzl((currThreeInfo.getRgzxqjsl().subtract(withThreeInfo.getRgzxqjsl())).divide(withThreeInfo.getRgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+
+            }
+
+        }
+
+
+    }
+
+    private void monthThreeRateInfo() {
+        ProEconPowerstationInfoDay4 currThreeInfo = slmap.get("currThreeInfo");
+        ProEconPowerstationInfoDay4 ringThreeInfo = slmap.get("ringThreeInfo");
+        ProEconPowerstationInfoDay4 withThreeInfo = slmap.get("withThreeInfo");
+
+        if (null != currThreeInfo) {
+
+            dto.setCurrFwjsl(currThreeInfo.getYfwjsl());
+            dto.setCurrZtzhl(currThreeInfo.getYztzhjsl());
+            dto.setCurrXqjsl(currThreeInfo.getYgzxqjsl());
+
+
+            if (null != ringThreeInfo) {
+
+                dto.setRingFwjszzl((currThreeInfo.getYfwjsl().subtract(ringThreeInfo.getYfwjsl())).divide(ringThreeInfo.getYfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setRingZtzhzzl((currThreeInfo.getYztzhjsl().subtract(ringThreeInfo.getYztzhjsl())).divide(ringThreeInfo.getYztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setRingXqjszzl((currThreeInfo.getYgzxqjsl().subtract(ringThreeInfo.getYgzxqjsl())).divide(ringThreeInfo.getYgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+
+            }
+
+            if (null != withThreeInfo) {
+
+                dto.setWithFwjszzl((currThreeInfo.getYfwjsl().subtract(withThreeInfo.getYfwjsl())).divide(withThreeInfo.getYfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setWithZtzhzzl((currThreeInfo.getYztzhjsl().subtract(withThreeInfo.getYztzhjsl())).divide(withThreeInfo.getYztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setWithXqjszzl((currThreeInfo.getYgzxqjsl().subtract(withThreeInfo.getYgzxqjsl())).divide(withThreeInfo.getYgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+
+            }
+
+        }
+
+    }
+
+    private void yearThreeRateInfo() {
+        ProEconPowerstationInfoDay4 currThreeInfo = slmap.get("currThreeInfo");
+        ProEconPowerstationInfoDay4 ringThreeInfo = slmap.get("ringThreeInfo");
+        ProEconPowerstationInfoDay4 withThreeInfo = slmap.get("withThreeInfo");
+
+        if (null != currThreeInfo) {
+
+            dto.setCurrFwjsl(currThreeInfo.getNfwjsl());
+            dto.setCurrZtzhl(currThreeInfo.getNztzhjsl());
+            dto.setCurrXqjsl(currThreeInfo.getNgzxqjsl());
+
+
+            if (null != ringThreeInfo) {
+
+                dto.setRingFwjszzl((currThreeInfo.getNfwjsl().subtract(ringThreeInfo.getNfwjsl())).divide(ringThreeInfo.getNfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setRingZtzhzzl((currThreeInfo.getNztzhjsl().subtract(ringThreeInfo.getNztzhjsl())).divide(ringThreeInfo.getNztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setRingXqjszzl((currThreeInfo.getNgzxqjsl().subtract(ringThreeInfo.getNgzxqjsl())).divide(ringThreeInfo.getNgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+
+            }
+
+            if (null != withThreeInfo) {
+
+                dto.setWithFwjszzl((currThreeInfo.getNfwjsl().subtract(withThreeInfo.getNfwjsl())).divide(withThreeInfo.getNfwjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setWithZtzhzzl((currThreeInfo.getNztzhjsl().subtract(withThreeInfo.getNztzhjsl())).divide(withThreeInfo.getNztzhjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+                dto.setWithXqjszzl((currThreeInfo.getNgzxqjsl().subtract(withThreeInfo.getNgzxqjsl())).divide(withThreeInfo.getNgzxqjsl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")));
+
+            }
+
+        }
+
+    }
+
+
+    /**
+     * 其它经济指标
+     */
+    private void currOtherInfo() {
+
+        ProEconPowerstationInfoDay1 currFiveInfo = wsmap.get("currFiveInfo");
+        ProEconPowerstationInfoDay1 ringFiveInfo = wsmap.get("ringFiveInfo");
+        ProEconPowerstationInfoDay1 withFiveInfo = wsmap.get("withFiveInfo");
+
+        ProEconPowerstationInfoDay5 currDlInfo = dlmap.get("currDlInfo");
+        ProEconPowerstationInfoDay5 ringDlInfo = dlmap.get("ringDlInfo");
+        ProEconPowerstationInfoDay5 withDlInfo = dlmap.get("withDlInfo");
+
+        ProEconPowerstationInfoDay6 currGlInfo = glmap.get("currGlInfo");
+        ProEconPowerstationInfoDay6 ringGlInfo = glmap.get("ringGlInfo");
+        ProEconPowerstationInfoDay6 withGlInfo = glmap.get("withGlInfo");
+
+        ProEconPowerstationInfoDay2 currTimeInfo = wstimemap.get("currTimeInfo");
+        ProEconPowerstationInfoDay2 ringTimeInfo = wstimemap.get("ringTimeInfo");
+        ProEconPowerstationInfoDay2 withTimeInfo = wstimemap.get("withTimeInfo");
+
+        if (null != currFiveInfo && null != currDlInfo) {
+
+            BigDecimal currZhcydl = currDlInfo.getRzhcydldb().divide(currFiveInfo.getRfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            dto.setCurrZhcydl(currZhcydl);
+
+            if (null != ringFiveInfo && null != ringDlInfo) {
+                BigDecimal ringZhcydl = ringDlInfo.getRzhcydldb().divide(ringFiveInfo.getRfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringZhcydzzl = (currZhcydl.subtract(ringZhcydl)).divide(ringZhcydl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingZhcydzzl(ringZhcydzzl);
+            }
+
+            if (null != withFiveInfo && null != withDlInfo) {
+                BigDecimal withZhcydl = ringDlInfo.getRzhcydldb().divide(ringFiveInfo.getRfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withZhcydzzl = (currZhcydl.subtract(withZhcydl)).divide(withZhcydl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setWithZhcydzzl(withZhcydzzl);
+            }
+
+        }
+
+        if (null != currGlInfo) {
+            BigDecimal currGlqxfhl = currGlInfo.getRpjglcx().divide(capacity, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            dto.setCurrGlqxfhl(currGlqxfhl);
+            if (null != ringGlInfo) {
+                BigDecimal ringGlqxfhl = ringGlInfo.getRpjglcx().divide(capacity, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringGlqxfhzzl = (currGlqxfhl.subtract(ringGlqxfhl)).divide(ringGlqxfhl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingGlqxfhzzl(ringGlqxfhzzl);
+            }
+            if (null != withGlInfo) {
+                BigDecimal withGlqxfhl = withGlInfo.getRpjglcx().divide(capacity, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withGlqxfhzzl = (currGlqxfhl.subtract(withGlqxfhl)).divide(withGlqxfhl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setWithGlqxfhzzl(withGlqxfhzzl);
+            }
+        }
+
+
+        if (null != currTimeInfo) {
+
+            int currhours = DateUtils.hoursDiff(DateUtils.getStartOfDay(new Date()), new Date());
+            BigDecimal currhours2 = new BigDecimal(0.00).valueOf((int) currhours);
+            BigDecimal currSbklyl = currhours2.subtract((currTimeInfo.getRhjgzxsmx().add(currTimeInfo.getRhjjxtjxs()))).divide(currhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            dto.setCurrSbklyl(currSbklyl);
+            if (null != ringTimeInfo) {
+
+                int ringhours = DateUtils.hoursDiff(DateUtils.getMonthFirstZero(), new Date());
+                BigDecimal ringhours2 = new BigDecimal(0.00).valueOf((int) ringhours);
+                BigDecimal ringSbklyl = ringhours2.subtract((ringTimeInfo.getRhjgzxsmx().add(ringTimeInfo.getRhjjxtjxs()))).divide(ringhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringSbklyzzl = (currSbklyl.subtract(ringSbklyl)).divide(ringSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingSbklyzzl(ringSbklyzzl);
+            }
+            if (null != withTimeInfo) {
+
+                int withhours = DateUtils.hoursDiff(DateUtils.getMonthFirstZero(), new Date());
+                BigDecimal withhours2 = new BigDecimal(0.00).valueOf((int) withhours);
+                BigDecimal withSbklyl = withhours2.subtract((withTimeInfo.getRhjgzxsmx().add(withTimeInfo.getRhjjxtjxs()))).divide(withhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withSbklyzzl = (currSbklyl.subtract(withSbklyl)).divide(withSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingSbklyzzl(withSbklyzzl);
+
+            }
+        }
+
+
+    }
+
+    private void monthOtherInfo() {
+
+        ProEconPowerstationInfoDay1 currFiveInfo = wsmap.get("currFiveInfo");
+        ProEconPowerstationInfoDay1 ringFiveInfo = wsmap.get("ringFiveInfo");
+        ProEconPowerstationInfoDay1 withFiveInfo = wsmap.get("withFiveInfo");
+
+        ProEconPowerstationInfoDay5 currDlInfo = dlmap.get("currDlInfo");
+        ProEconPowerstationInfoDay5 ringDlInfo = dlmap.get("ringDlInfo");
+        ProEconPowerstationInfoDay5 withDlInfo = dlmap.get("withDlInfo");
+
+        ProEconPowerstationInfoDay6 currGlInfo = glmap.get("currGlInfo");
+        ProEconPowerstationInfoDay6 ringGlInfo = glmap.get("ringGlInfo");
+        ProEconPowerstationInfoDay6 withGlInfo = glmap.get("withGlInfo");
+
+        ProEconPowerstationInfoDay2 currTimeInfo = wstimemap.get("currTimeInfo");
+        ProEconPowerstationInfoDay2 ringTimeInfo = wstimemap.get("ringTimeInfo");
+        ProEconPowerstationInfoDay2 withTimeInfo = wstimemap.get("withTimeInfo");
+
+        if (null != currFiveInfo && null != currDlInfo) {
+
+            BigDecimal currZhcydl = currDlInfo.getYzhcydldb().divide(currFiveInfo.getYfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            dto.setCurrZhcydl(currZhcydl);
+
+            if (null != ringFiveInfo && null != ringDlInfo) {
+                BigDecimal ringZhcydl = ringDlInfo.getYzhcydldb().divide(ringFiveInfo.getYfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringZhcydzzl = (currZhcydl.subtract(ringZhcydl)).divide(ringZhcydl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingZhcydzzl(ringZhcydzzl);
+            }
+
+            if (null != withFiveInfo && null != withDlInfo) {
+                BigDecimal withZhcydl = ringDlInfo.getYzhcydldb().divide(ringFiveInfo.getYfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withZhcydzzl = (currZhcydl.subtract(withZhcydl)).divide(withZhcydl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setWithZhcydzzl(withZhcydzzl);
+            }
+
+        }
+
+        if (null != currTimeInfo) {
+
+            int currhours = DateUtils.hoursDiff(DateUtils.getStartOfDay(new Date()), new Date());
+            BigDecimal currhours2 = new BigDecimal(0.00).valueOf((int) currhours);
+            BigDecimal currSbklyl = currhours2.subtract((currTimeInfo.getYhjgzxsmx().add(currTimeInfo.getYhjjxtjxs()))).divide(currhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            dto.setCurrSbklyl(currSbklyl);
+            if (null != ringTimeInfo) {
+
+                int ringhours = DateUtils.hoursDiff(DateUtils.getMonthFirstZero(), new Date());
+                BigDecimal ringhours2 = new BigDecimal(0.00).valueOf((int) ringhours);
+                BigDecimal ringSbklyl = ringhours2.subtract((ringTimeInfo.getYhjgzxsmx().add(ringTimeInfo.getYhjjxtjxs()))).divide(ringhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringSbklyzzl = (currSbklyl.subtract(ringSbklyl)).divide(ringSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingSbklyzzl(ringSbklyzzl);
+            }
+            if (null != withTimeInfo) {
+
+                int withhours = DateUtils.hoursDiff(DateUtils.getMonthFirstZero(), new Date());
+                BigDecimal withhours2 = new BigDecimal(0.00).valueOf((int) withhours);
+                BigDecimal withSbklyl = withhours2.subtract((withTimeInfo.getYhjgzxsmx().add(withTimeInfo.getYhjjxtjxs()))).divide(withhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withSbklyzzl = (currSbklyl.subtract(withSbklyl)).divide(withSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingSbklyzzl(withSbklyzzl);
+
+            }
+        }
+
+    }
+
+    private void yearOtherInfo() {
+
+        ProEconPowerstationInfoDay1 currFiveInfo = wsmap.get("currFiveInfo");
+        ProEconPowerstationInfoDay1 ringFiveInfo = wsmap.get("ringFiveInfo");
+        ProEconPowerstationInfoDay1 withFiveInfo = wsmap.get("withFiveInfo");
+
+        ProEconPowerstationInfoDay5 currDlInfo = dlmap.get("currDlInfo");
+        ProEconPowerstationInfoDay5 ringDlInfo = dlmap.get("ringDlInfo");
+        ProEconPowerstationInfoDay5 withDlInfo = dlmap.get("withDlInfo");
+
+        ProEconPowerstationInfoDay6 currGlInfo = glmap.get("currGlInfo");
+        ProEconPowerstationInfoDay6 ringGlInfo = glmap.get("ringGlInfo");
+        ProEconPowerstationInfoDay6 withGlInfo = glmap.get("withGlInfo");
+
+        ProEconPowerstationInfoDay2 currTimeInfo = wstimemap.get("currTimeInfo");
+        ProEconPowerstationInfoDay2 ringTimeInfo = wstimemap.get("ringTimeInfo");
+        ProEconPowerstationInfoDay2 withTimeInfo = wstimemap.get("withTimeInfo");
+
+        if (null != currFiveInfo && null != currDlInfo) {
+
+            BigDecimal currZhcydl = currDlInfo.getNzhcydldb().divide(currFiveInfo.getNfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            dto.setCurrZhcydl(currZhcydl);
+
+            if (null != ringFiveInfo && null != ringDlInfo) {
+                BigDecimal ringZhcydl = ringDlInfo.getNzhcydldb().divide(ringFiveInfo.getNfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringZhcydzzl = (currZhcydl.subtract(ringZhcydl)).divide(ringZhcydl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingZhcydzzl(ringZhcydzzl);
+            }
+
+            if (null != withFiveInfo && null != withDlInfo) {
+                BigDecimal withZhcydl = ringDlInfo.getNzhcydldb().divide(ringFiveInfo.getNfdl(), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withZhcydzzl = (currZhcydl.subtract(withZhcydl)).divide(withZhcydl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setWithZhcydzzl(withZhcydzzl);
+            }
+        }
+
+        if (null != currGlInfo) {
+            BigDecimal currGlqxfhl = currGlInfo.getNpjglcx().divide(capacity, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            dto.setCurrGlqxfhl(currGlqxfhl);
+            if (null != ringGlInfo) {
+                BigDecimal ringGlqxfhl = ringGlInfo.getNpjglcx().divide(capacity, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringGlqxfhzzl = (currGlqxfhl.subtract(ringGlqxfhl)).divide(ringGlqxfhl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingGlqxfhzzl(ringGlqxfhzzl);
+            }
+            if (null != withGlInfo) {
+                BigDecimal withGlqxfhl = withGlInfo.getNpjglcx().divide(capacity, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withGlqxfhzzl = (currGlqxfhl.subtract(withGlqxfhl)).divide(withGlqxfhl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setWithGlqxfhzzl(withGlqxfhzzl);
+            }
+        }
+
+
+        if (null != currTimeInfo) {
+
+            int currhours = DateUtils.hoursDiff(DateUtils.getStartOfDay(new Date()), new Date());
+            BigDecimal currhours2 = new BigDecimal(0).valueOf((int) currhours);
+            BigDecimal currSbklyl = currhours2.subtract((currTimeInfo.getNhjgzxsmx().add(currTimeInfo.getNhjjxtjxs()))).divide(currhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+            dto.setCurrSbklyl(currSbklyl);
+            if (null != ringTimeInfo) {
+
+                int ringhours = DateUtils.hoursDiff(DateUtils.getMonthFirstZero(), new Date());
+                BigDecimal ringhours2 = new BigDecimal(0).valueOf((int) ringhours);
+                BigDecimal ringSbklyl = ringhours2.subtract((ringTimeInfo.getNhjgzxsmx().add(ringTimeInfo.getNhjjxtjxs()))).divide(ringhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal ringSbklyzzl = (currSbklyl.subtract(ringSbklyl)).divide(ringSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingSbklyzzl(ringSbklyzzl);
+            }
+            if (null != withTimeInfo) {
+
+                int withhours = DateUtils.hoursDiff(DateUtils.getMonthFirstZero(), new Date());
+                BigDecimal withhours2 = new BigDecimal(0).valueOf((int) withhours);
+                BigDecimal withSbklyl = withhours2.subtract((withTimeInfo.getNhjgzxsmx().add(withTimeInfo.getNhjjxtjxs()))).divide(withhours2, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                BigDecimal withSbklyzzl = (currSbklyl.subtract(withSbklyl)).divide(withSbklyl, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100"));
+                dto.setRingSbklyzzl(withSbklyzzl);
+
+            }
+        }
+    }
+
+
+}

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

@@ -0,0 +1,110 @@
+server:
+  port: 7020
+  servlet:
+    context-path: /
+
+spring:
+  application:
+    name: run-economy
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+#  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 10.81.3.155:8848
+#        #指定yaml格式的配置
+#        file-extension: yaml
+#        cluster-name: master
+#      username: nacos
+#      password: nacos
+#  #redis集群
+  redis:
+    host: 124.70.18.168
+    port: 6379
+    password: gdnxfd123
+    timeout: 100000
+#    #    集群环境打开下面注释，单机不需要打开
+#    #    cluster:
+#    #      集群信息
+#    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
+#    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+#    #      maxRedirects: 3
+#    password:
+#    application:
+#      name: test
+#    jedis:
+#      pool:
+#        max-active: 8
+#        min-idle: 0
+#        max-idle: 8
+#        max-wait: -1
+#    database: 0
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: org.postgresql.Driver
+#    url: jdbc:postgresql://192.168.11.248:5432/IMS_NEM_SD #IMS_NEM_SD
+#    username: postgres
+#    password: postgres
+#华为云测试地址
+    url: jdbc:postgresql://124.70.75.91:5432/jn_test #IMS_NEM_SD
+    username: postgres
+    password: gd123
+
+    oracle-schema=:
+    #    type: com.alibaba.druid.pool.DruidDataSource
+    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
+    #    username: root
+    #    password: root
+    #    driver-class-name: com.mysql.jdbc.Driver
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      #id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+      #table-prefix: t_
+      id-type: assign_uuid
+  #配置类型别名对应的包
+  type-aliases-package: com.gyee.backconfig.model.auto
+  #用于扫描通用枚举包
+  type-enums-package: com.gyee.backconfig.config
+logging:
+  level:
+    root: info
+    com.example: debug
+
+
+
+

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

@@ -0,0 +1,4 @@
+spring:
+  profiles:
+#    active: jn
+    active: test