Merge remote-tracking branch 'origin/master'

common/src/main/java/com/gyee/common/vo/analysis/EnergyDailyVo.java

@@ -0,0 +1,41 @@
+package com.gyee.common.vo.analysis;
+
+import com.gyee.common.model.StringUtils;
+import lombok.Data;
+
+/**
+ * @ClassName : EnergyDailyVo
+ * @Author : xieshengjie
+ * @Date: 2022/2/21 9:55
+ * @Description :
+ */
+@Data
+public class EnergyDailyVo {
+
+    private String foreignkeyid;
+    private String foreignkeyname;
+    private String wpid;
+    private Double speed;
+    private Double rfdl;
+    private Double yljfdl;
+    private Double nljfdl;
+    private Double rswdl;
+    private Double yljswdl;
+    private Double nljswdl;
+    private Double zhcydl;
+    private Double yljzhcydl;
+    private Double scadarfdl;
+    private Double scadayljfdl;
+    private Double scadanljfdl;
+    private Double scadazhcydl;
+    private Double scadayljzhcydl;
+    private Double scadazhcydll;
+    private Double rxdssdl;
+    private Double yljxdssdl;
+    private Double nljxdssdl;
+    private Integer orderNo;
+    private Integer isWind;
+
+
+
+}

common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -36,6 +36,7 @@ com\gyee\common\util\RestTemplateUtil.class
 com\gyee\common\vo\benchmark\DataVo.class
 com\gyee\common\service\impl\WindturbineServiceImpl.class
 com\gyee\common\vo\targetdata\KkxzbfxVo.class
+com\gyee\common\vo\analysis\EnergyDailyVo.class
 com\gyee\common\CommonMain.class
 com\gyee\common\util\DoubleUtils.class
 com\gyee\common\util\RestTemplateUtil$SingletonRestTemplate.class

common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -37,6 +37,7 @@ D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\CopyUtils.jav
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\specific\SpecificTargetVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\AnalysisMainVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\RestTemplateUtil.java
+D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\EnergyDailyVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\WxsslVo.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\algorithm\LineParameters.java
 D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\DNAVal.java

realtime/meteorologicalcollection/src/main/java/com/gyee/meteorological/service/collection/CollectionService.java

@@ -37,22 +37,19 @@ public class CollectionService {
 
     public void saveMeteorologicalData(){
         List<Coordinate> coordinateList = CacheContext.coordinateList;
-        //开始时间
-        long startTime = System.currentTimeMillis();
 
         coordinateList.stream().forEach(c->{
             String[] models = model.split(",");
             Arrays.stream(models).forEach(m->{
+                long startTime = System.currentTimeMillis();
                String restUrl = url+m+"?lat="+c.getLat()+"&lon="+c.getLon()+"&units=metric&appid="+weatherkey;
                 String s = RestTemplateUtil.get(restUrl, null);
                 redisService.set((c.getForeignkeyid()+"_"+m).toUpperCase(),s);
-                log.info((c.getForeignkeyid()+"_"+m).toUpperCase()+"保存成功");
+                long endTime = System.currentTimeMillis();
+                log.info((c.getForeignkeyid()+"_"+m).toUpperCase()+"保存成功,用时"+ (endTime-startTime) + "毫秒,当前时间为"+DateUtils.parseLongToDate(endTime));
             });
         });
-        //结束时间
-        long endTime = System.currentTimeMillis();
-        redisService.set("test",(endTime-startTime) + "毫秒");
-        log.info("运行时间为："+ (endTime-startTime) + "毫秒,当前时间为"+DateUtils.parseLongToDate(endTime));
+
         ;
     }
 }

realtime/meteorologicalcollection/target/classes/application.yml

@@ -0,0 +1,98 @@
+server:
+  port: 7010
+  servlet:
+    context-path: /
+
+
+spring:
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  #redis集群
+  redis:
+    host: 123.60.213.70
+    port: 6379
+    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: gdnxfd123
+    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: oracle.jdbc.OracleDriver
+    #外网
+    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+    username: nxfdprod
+    password: gdnxfd123
+    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
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+logging:
+  level:
+    root: info
+    com.example: debug
+
+
+meteorological:
+  weatherkey: 3b66d35579770393051599f8d518df4a
+  model: weather,forecast,onecall
+  url: https://api.openweathermap.org/data/2.5/
+
+
+
+
+
+
+
+

realtime/meteorologicalcollection/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Mon Feb 21 09:23:07 CST 2022
+version=1.0-SNAPSHOT
+groupId=com.gyee
+artifactId=meteorologicalcollection

realtime/meteorologicalcollection/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,17 @@
+com\gyee\meteorological\config\RedisAutoConfiguration.class
+com\gyee\meteorological\service\collection\CollectionService.class
+com\gyee\meteorological\config\RedisConfig.class
+com\gyee\meteorological\init\CacheContext.class
+com\gyee\meteorological\controller\CoordinateController.class
+com\gyee\meteorological\config\GeneratorCodeConfig.class
+com\gyee\meteorological\service\impl\RedisServiceImpl.class
+com\gyee\meteorological\service\impl\RedisServiceImpl$1.class
+com\gyee\meteorological\service\auto\impl\CoordinateServiceImpl.class
+com\gyee\meteorological\mapper\auto\CoordinateMapper.class
+com\gyee\meteorological\task\SaticScheduleTask.class
+com\gyee\meteorological\service\impl\RedisServiceImpl$2.class
+com\gyee\meteorological\model\auto\Coordinate.class
+com\gyee\meteorological\service\auto\ICoordinateService.class
+com\gyee\meteorological\service\RedisService.class
+com\gyee\meteorological\service\impl\RedisServiceImpl$3.class
+com\gyee\meteorological\MeteorologicalMain.class

realtime/meteorologicalcollection/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,14 @@
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\config\RedisAutoConfiguration.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\service\impl\RedisServiceImpl.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\service\auto\impl\CoordinateServiceImpl.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\model\auto\Coordinate.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\mapper\auto\CoordinateMapper.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\MeteorologicalMain.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\task\SaticScheduleTask.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\service\RedisService.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\service\auto\ICoordinateService.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\config\GeneratorCodeConfig.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\service\collection\CollectionService.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\controller\CoordinateController.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\config\RedisConfig.java
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\main\java\com\gyee\meteorological\init\CacheContext.java

realtime/meteorologicalcollection/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -0,0 +1 @@
+com\gyee\meteorological\MeteorologicalTest.class

realtime/meteorologicalcollection/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -0,0 +1 @@
+D:\work\ideawork\sis\sis\realtime\meteorologicalcollection\src\test\java\com\gyee\meteorological\MeteorologicalTest.java

web/analysis-web-hb/src/main/java/com/gyee/analysis/controller/analysis/AnalysisNewController.java

@@ -4,6 +4,7 @@ import com.gyee.analysis.service.AnalysisNewService;
 import com.gyee.common.config.R;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.vo.analysis.AnalysisMainVo;
+import com.gyee.common.vo.analysis.EnergyDailyVo;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.beans.IntrospectionException;
@@ -123,4 +124,18 @@ public class AnalysisNewController {
         if (StringUtils.isNotEmpty(tjfxVo))
             analysisNewService.updateTjfx(tjfxVo);
     }
+
+
+    @GetMapping("/energyDaily")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R  energyDaily(
+            @RequestParam(value = "theday",required = true)String theday) {
+        Map<String, List<EnergyDailyVo>> resultMap = analysisNewService.energyDaily(theday);
+        if (StringUtils.isNotNull(resultMap)) {
+            return R.ok((long) resultMap.size()).data(resultMap);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
 }

web/analysis-web-hb/src/main/java/com/gyee/analysis/model/auto/Windpowerstation.java

@@ -75,7 +75,7 @@ public class Windpowerstation extends Model {
     private String model;
 
     @TableField("ORDERNUM")
-    private BigDecimal ordernum;
+    private Integer ordernum;
 
     @TableField("ALTITUDE")
     private BigDecimal altitude;

web/analysis-web-hb/src/main/java/com/gyee/analysis/service/AnalysisNewService.java

@@ -15,6 +15,7 @@ import com.gyee.common.util.DoubleUtils;
 import com.gyee.common.vo.analysis.AnalysisMainVo;
 import com.gyee.common.vo.analysis.AnalysisSubVo;
 import com.gyee.common.vo.analysis.DeskObject;
+import com.gyee.common.vo.analysis.EnergyDailyVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -749,4 +750,119 @@ public class AnalysisNewService {
         }
         return true;
     }
+
+    /**
+     * 新能源日报
+     * @param theday
+     * @return
+     */
+    public Map<String,List<EnergyDailyVo>> energyDaily(String theday) {
+        List<EnergyDailyVo> resultList = new ArrayList<>();
+        List<Windpowerstation> stations = CacheContext.stations;
+        Map<String, Windpowerstation> wpmaps = CacheContext.wpmaps;
+        Map<String, Project> projectMap = CacheContext.projectMap;
+        Date date = DateUtils.parseDate(theday);
+        Map<String,Object> queryMap = new HashMap<>();
+        queryMap.put("recorddate",date);
+        List<Analysissubprojectwindcan> prolist = analysissubprojectwindcanService.listByMap(queryMap);
+        List<Analysissubstationwind> windlist = analysissubstationwindService.listByMap(queryMap);
+
+        QueryWrapper<Analysissubprojectwindcan> yproquery = new QueryWrapper<>();
+        Date monthFirst = DateUtils.getMonthFirst(date);
+        yproquery.ge("recorddate",monthFirst).le("recorddate",date);
+        List<Analysissubprojectwindcan> yprolist = analysissubprojectwindcanService.list(yproquery);
+
+        QueryWrapper<Analysissubprojectwindcan> nproquery = new QueryWrapper<>();
+        Date yearFirst = DateUtils.getYearFirst(DateUtils.getYear(date));
+        nproquery.ge("recorddate",yearFirst).le("recorddate",date);
+        List<Analysissubprojectwindcan> nprolist = analysissubprojectwindcanService.list(nproquery);
+
+
+        QueryWrapper<Analysissubprojectwindcan> ywindquery = new QueryWrapper<>();
+        yproquery.ge("recorddate",monthFirst).le("recorddate",date);
+        List<Analysissubprojectwindcan> ywindlist = analysissubprojectwindcanService.list(ywindquery);
+
+        QueryWrapper<Analysissubprojectwindcan> nwindquery = new QueryWrapper<>();
+        nproquery.ge("recorddate",yearFirst).le("recorddate",date);
+        List<Analysissubprojectwindcan> nwindlist = analysissubprojectwindcanService.list(nwindquery);
+
+        int orderNum = 0;
+        prolist.stream().forEach(p->{
+            EnergyDailyVo vo = new EnergyDailyVo();
+            vo.setForeignkeyid(p.getProjectid());
+            vo.setForeignkeyname(projectMap.get(p.getProjectid()).getName());
+            vo.setWpid(p.getWpid());
+            vo.setSpeed(p.getQpjfx());
+            vo.setRfdl(p.getFdl());
+            vo.setRswdl(p.getSwdl());
+            vo.setZhcydl(p.getZhcydl());
+            vo.setScadarfdl(p.getFdlscada());
+            vo.setScadazhcydl(p.getZhcydlscada());
+            vo.setScadazhcydll(p.getZhcydllscada());
+            vo.setRxdssdl(p.getXddl());
+            vo.setYljxdssdl(yprolist.stream().filter(i -> i.getXddl() != null && i.getProjectid().equals(p.getProjectid())).mapToDouble(j -> j.getXddl()).sum());
+            vo.setYljfdl(yprolist.stream().filter(i -> i.getFdl() != null && i.getProjectid().equals(p.getProjectid())).mapToDouble(j -> j.getFdl()).sum());
+            vo.setYljswdl(yprolist.stream().filter(i -> i.getSwdl() != null && i.getProjectid().equals(p.getProjectid())).mapToDouble(j -> j.getSwdl()).sum());
+            vo.setScadayljfdl(yprolist.stream().filter(i -> i.getFdlscada() != null && i.getProjectid().equals(p.getProjectid())).mapToDouble(j -> j.getFdlscada()).sum());
+            double ygwdl = yprolist.stream().filter(i -> i.getGwdl() != null && i.getProjectid().equals(p.getProjectid())).mapToDouble(j -> j.getGwdl()).sum();
+            vo.setYljzhcydl(vo.getYljfdl()+ygwdl-vo.getYljswdl());
+            vo.setScadayljzhcydl(vo.getScadayljfdl()+ygwdl-vo.getYljswdl());
+            vo.setNljswdl(nprolist.stream().filter(i -> i.getSwdl() != null && i.getProjectid().equals(p.getProjectid())).mapToDouble(j -> j.getSwdl()).sum());
+            vo.setNljfdl(nprolist.stream().filter(i -> i.getFdl() != null && i.getProjectid().equals(p.getProjectid())).mapToDouble(j -> j.getFdl()).sum());
+            vo.setNljxdssdl(nprolist.stream().filter(i -> i.getXddl() != null && i.getProjectid().equals(p.getProjectid())).mapToDouble(j -> j.getXddl()).sum());
+            vo.setScadanljfdl(nprolist.stream().filter(i -> i.getFdlscada() != null && i.getProjectid().equals(p.getProjectid())).mapToDouble(j -> j.getFdlscada()).sum());
+            vo.setOrderNo(projectMap.get(p.getProjectid()).getOrdernum());
+            vo.setIsWind(0);
+            resultList.add(vo);
+        });
+
+        windlist.stream().forEach(w->{
+            EnergyDailyVo vo = new EnergyDailyVo();
+            vo.setForeignkeyid(w.getWpid());
+            vo.setForeignkeyname(wpmaps.get(w.getWpid()).getName());
+            vo.setWpid(vo.getForeignkeyid());
+            vo.setSpeed(w.getQpjfx());
+            vo.setRfdl(w.getFdl());
+            vo.setRswdl(w.getSwdl());
+            vo.setZhcydl(w.getZhcydl());
+            vo.setScadarfdl(w.getFdlscada());
+            vo.setScadazhcydl(w.getZhcydlscada());
+            vo.setScadazhcydll(w.getZhcydllscada());
+            vo.setRxdssdl(w.getXddl());
+            vo.setYljxdssdl(ywindlist.stream().filter(i -> i.getXddl() != null && i.getProjectid().equals(w.getWpid())).mapToDouble(j -> j.getXddl()).sum());
+            vo.setYljfdl(ywindlist.stream().filter(i -> i.getFdl() != null && i.getProjectid().equals(w.getWpid())).mapToDouble(j -> j.getFdl()).sum());
+            vo.setYljswdl(ywindlist.stream().filter(i -> i.getSwdl() != null && i.getProjectid().equals(w.getWpid())).mapToDouble(j -> j.getSwdl()).sum());
+            vo.setScadayljfdl(ywindlist.stream().filter(i -> i.getFdlscada() != null && i.getProjectid().equals(w.getWpid())).mapToDouble(j -> j.getFdlscada()).sum());
+            double ygwdl = ywindlist.stream().filter(i -> i.getGwdl() != null && i.getProjectid().equals(w.getWpid())).mapToDouble(j -> j.getGwdl()).sum();
+            vo.setYljzhcydl(vo.getYljfdl()+ygwdl-vo.getYljswdl());
+            vo.setScadayljzhcydl(vo.getScadayljfdl()+ygwdl-vo.getYljswdl());
+            vo.setNljswdl(nwindlist.stream().filter(i -> i.getSwdl() != null && i.getProjectid().equals(w.getWpid())).mapToDouble(j -> j.getSwdl()).sum());
+            vo.setNljfdl(nwindlist.stream().filter(i -> i.getFdl() != null && i.getProjectid().equals(w.getWpid())).mapToDouble(j -> j.getFdl()).sum());
+            vo.setNljxdssdl(nwindlist.stream().filter(i -> i.getXddl() != null && i.getProjectid().equals(w.getWpid())).mapToDouble(j -> j.getXddl()).sum());
+            vo.setScadanljfdl(nwindlist.stream().filter(i -> i.getFdlscada() != null && i.getProjectid().equals(w.getWpid())).mapToDouble(j -> j.getFdlscada()).sum());
+            vo.setOrderNo(wpmaps.get(w.getWpid()).getOrdernum());
+            vo.setIsWind(1);
+            resultList.add(vo);
+        });
+        Map<String, List<EnergyDailyVo>> resultMap = new HashMap<>();
+        List<Windpowerstation> wplist = stations.stream().sorted(Comparator.comparing(Windpowerstation::getOrdernum)).collect(Collectors.toList());
+        resultList.stream().forEach(i->{
+            wplist.stream().forEach(w->{
+                if (w.getId().equals(i.getWpid())){
+                    if (resultMap.containsKey(w.getId())){
+                        resultMap.get(w.getId()).add(i);
+                    }else {
+                        List<EnergyDailyVo> list = new ArrayList<>();
+                        list.add(i);
+                        resultMap.put(w.getId(),list);
+                    }
+                }
+
+            });
+        });
+        return resultMap;
+
+
+
+    }
 }

web/consumer/src/main/java/com/gyee/consumer/controller/analysis/AnalysisController.java

@@ -3,6 +3,7 @@ package com.gyee.consumer.controller.analysis;
 import com.gyee.common.config.R;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.vo.analysis.AnalysisMainVo;
+import com.gyee.common.vo.analysis.EnergyDailyVo;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
@@ -99,4 +100,10 @@ public class AnalysisController {
         restTemplate.postForObject(ANALYSIS_URL+"/analysisplus/tjfxupdate",tjfxVo,null);
     }
 
+    @GetMapping("/consumer/analysisplus/energyDaily")
+    public R  energyDaily(
+            @RequestParam(value = "theday",required = true)String theday) {
+        return restTemplate.getForObject(ANALYSIS_URL+"/analysisplus/energyDaily?theday="+theday,R.class);
+    }
+
 }