计算服务修改

cache/src/main/java/com/gyee/cache/config/GeneratorCodeConfig.java

@@ -49,17 +49,17 @@ public class GeneratorCodeConfig {
 
         // 数据源配置
         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.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.83.68.165:1521:gdsj");
-
         mpg.setDataSource(dsc);
+//        dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
+//        dsc.setUsername("gdprod");
+//        dsc.setPassword("gd123");
+//        dsc.setUrl("jdbc:oracle:thin:@10.83.68.165:1521:gdsj");
+//
+//        mpg.setDataSource(dsc);
 
 
 

cache/src/main/java/com/gyee/cache/controller/WpretimepointController.java

@@ -0,0 +1,20 @@
+package com.gyee.cache.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-04-18
+ */
+@RestController
+@RequestMapping("//wpretimepoint")
+public class WpretimepointController {
+
+}

cache/src/main/java/com/gyee/cache/controller/WtretimepointController.java

@@ -0,0 +1,20 @@
+package com.gyee.cache.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-04-18
+ */
+@RestController
+@RequestMapping("//wtretimepoint")
+public class WtretimepointController {
+
+}

cache/src/main/java/com/gyee/cache/init/CacheContext.java

@@ -63,7 +63,7 @@ public class CacheContext implements CommandLineRunner {
     public void run(String... args) throws Exception {
 
         Logger logger= LoggerFactory.getLogger(CacheContext.class);
-//        logger.info("----------------------缓存开始");
+//        logger.info("----------------------缓存old开始");
 //        wtls = windturbineService.list();
 //        List<Windturbinetestingpointai> wtplist = windturbinetestingpointai2Service.list();
 //        for (Windturbinetestingpointai pointai : wtplist) {
@@ -186,93 +186,93 @@ public class CacheContext implements CommandLineRunner {
 //            redisService.set("MPRD",s);
 //        }
 //        logger.info("----------------------MODELPOWERRD表结束");
-//
+//        logger.info("----------------------缓存old结束");
 //-------------------------------------------------------------------------------------------------------------------------------------------------------------
-//        logger.info("----------------------设备点开始");
-//        //缓存设备点
-//        redisService.remove("PRODUCT-WT");
-//        if (!redisService.hasKey("PRODUCT-WT")){
-//            Map<String,Map<String,Windturbinetestingpointnew>> wtaimap = new HashMap<>();
-//            List<Windturbine> windturbineList = windturbineService.list();
-//            windturbineList.stream().forEach(i->{
-//                Map<String,Windturbinetestingpointnew> codeaimap = new HashMap<>();
-//                QueryWrapper<Windturbinetestingpointnew> qw = new QueryWrapper<>();
-//                qw.eq("windturbineid",i.getId());
-//                List<Windturbinetestingpointnew> windturbinetestingpointai2List = windturbinetestingpointnewService.list(qw);
-//                windturbinetestingpointai2List.stream().forEach(x->{
-//                    codeaimap.put(x.getUniformcode(),x);
-//                });
-//                wtaimap.put(i.getId(),codeaimap);
-//            });
-//            String s = JSONObject.toJSONString(wtaimap);
-//            redisService.set("PRODUCT-WT",s);
-//        };
-//        logger.info("----------------------设备点结束");
-//        logger.info("----------------------线路点开始");
-//        //缓存线路点
-//        redisService.remove("PRODUCT-LN");
-//        if (!redisService.hasKey("PRODUCT-LN")){
-//            Map<String,Map<String, Windpowerstationpointnew>> lnaimap = new HashMap<>();
-//            List<Line> lineList = lineService.list();
-//            lineList.stream().forEach(i->{
-//                Map<String,Windpowerstationpointnew> codeaimap = new HashMap<>();
-//                QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
-//                qw.eq("windpowerstationid",i.getId());
-//                List<Windpowerstationpointnew> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-//                windpowerstationtestingpoint2List.stream().forEach(x->{
-//                    codeaimap.put(x.getUniformcode(),x);
-//                });
-//                lnaimap.put(i.getId(),codeaimap);
-//            });
-//            String s = JSONObject.toJSONString(lnaimap);
-//            redisService.set("PRODUCT-LN",s);
-//        };
-//        logger.info("----------------------线路点结束");
-//        logger.info("----------------------工程点开始");
-//        //缓存工程点
-//        redisService.remove("PRODUCT-PJ");
-//        if (!redisService.hasKey("PRODUCT-PJ")){
-//            Map<String,Map<String, Windpowerstationpointnew>> pjaimap = new HashMap<>();
-//            List<Project> projectList = projectService.list();
-//            projectList.stream().forEach(i->{
-//                Map<String,Windpowerstationpointnew> codeaimap = new HashMap<>();
-//                QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
-//                qw.eq("windpowerstationid",i.getId());
-//                List<Windpowerstationpointnew> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-//                windpowerstationtestingpoint2List.stream().forEach(x->{
-//                    codeaimap.put(x.getUniformcode(),x);
-//                });
-//                pjaimap.put(i.getId(),codeaimap);
-//            });
-//            String s = JSONObject.toJSONString(pjaimap);
-//            redisService.set("PRODUCT-PJ",s);
-//        };
-//        logger.info("----------------------工程点结束");
-//        logger.info("----------------------场站点开始");
-//        //缓存场站点
-//        redisService.remove("PRODUCT-WP");
-//        if (!redisService.hasKey("PRODUCT-WP")){
-//            Map<String,Map<String, Windpowerstationpointnew>> wpaimap = new HashMap<>();
-//            List<Windpowerstation> wpList = windpowerstationService.list();
-//            List<String> wpids = wpList.stream().map(i -> i.getId()).collect(Collectors.toList());
-//            wpids.add("0");
-//            wpids.add("-1");
-//            wpids.add("-2");
-//            wpids.stream().forEach(i->{
-//                Map<String, Windpowerstationpointnew> codeaimap = new HashMap<>();
-//                QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
-//                qw.eq("windpowerstationid",i);
-//                List<Windpowerstationpointnew> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-//                windpowerstationtestingpoint2List.stream().forEach(x->{
-//                    codeaimap.put(x.getUniformcode(),x);
-//                });
-//                wpaimap.put(i,codeaimap);
-//            });
-//            String s = JSONObject.toJSONString(wpaimap);
-//
-//            redisService.set("PRODUCT-WP",s);
-//        };
-//        logger.info("----------------------场站点结束");
+        logger.info("----------------------设备点开始");
+        //缓存设备点
+        redisService.remove("PRODUCT-WT");
+        if (!redisService.hasKey("PRODUCT-WT")){
+            Map<String,Map<String,Windturbinetestingpointnew>> wtaimap = new HashMap<>();
+            List<Windturbine> windturbineList = windturbineService.list();
+            windturbineList.stream().forEach(i->{
+                Map<String,Windturbinetestingpointnew> codeaimap = new HashMap<>();
+                QueryWrapper<Windturbinetestingpointnew> qw = new QueryWrapper<>();
+                qw.eq("windturbineid",i.getId());
+                List<Windturbinetestingpointnew> windturbinetestingpointai2List = windturbinetestingpointnewService.list(qw);
+                windturbinetestingpointai2List.stream().forEach(x->{
+                    codeaimap.put(x.getUniformcode(),x);
+                });
+                wtaimap.put(i.getId(),codeaimap);
+            });
+            String s = JSONObject.toJSONString(wtaimap);
+            redisService.set("PRODUCT-WT",s);
+        };
+        logger.info("----------------------设备点结束");
+        logger.info("----------------------线路点开始");
+        //缓存线路点
+        redisService.remove("PRODUCT-LN");
+        if (!redisService.hasKey("PRODUCT-LN")){
+            Map<String,Map<String, Windpowerstationpointnew>> lnaimap = new HashMap<>();
+            List<Line> lineList = lineService.list();
+            lineList.stream().forEach(i->{
+                Map<String,Windpowerstationpointnew> codeaimap = new HashMap<>();
+                QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
+                qw.eq("windpowerstationid",i.getId());
+                List<Windpowerstationpointnew> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+                windpowerstationtestingpoint2List.stream().forEach(x->{
+                    codeaimap.put(x.getUniformcode(),x);
+                });
+                lnaimap.put(i.getId(),codeaimap);
+            });
+            String s = JSONObject.toJSONString(lnaimap);
+            redisService.set("PRODUCT-LN",s);
+        };
+        logger.info("----------------------线路点结束");
+        logger.info("----------------------工程点开始");
+        //缓存工程点
+        redisService.remove("PRODUCT-PJ");
+        if (!redisService.hasKey("PRODUCT-PJ")){
+            Map<String,Map<String, Windpowerstationpointnew>> pjaimap = new HashMap<>();
+            List<Project> projectList = projectService.list();
+            projectList.stream().forEach(i->{
+                Map<String,Windpowerstationpointnew> codeaimap = new HashMap<>();
+                QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
+                qw.eq("windpowerstationid",i.getId());
+                List<Windpowerstationpointnew> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+                windpowerstationtestingpoint2List.stream().forEach(x->{
+                    codeaimap.put(x.getUniformcode(),x);
+                });
+                pjaimap.put(i.getId(),codeaimap);
+            });
+            String s = JSONObject.toJSONString(pjaimap);
+            redisService.set("PRODUCT-PJ",s);
+        };
+        logger.info("----------------------工程点结束");
+        logger.info("----------------------场站点开始");
+        //缓存场站点
+        redisService.remove("PRODUCT-WP");
+        if (!redisService.hasKey("PRODUCT-WP")){
+            Map<String,Map<String, Windpowerstationpointnew>> wpaimap = new HashMap<>();
+            List<Windpowerstation> wpList = windpowerstationService.list();
+            List<String> wpids = wpList.stream().map(i -> i.getId()).collect(Collectors.toList());
+            wpids.add("0");
+            wpids.add("-1");
+            wpids.add("-2");
+            wpids.stream().forEach(i->{
+                Map<String, Windpowerstationpointnew> codeaimap = new HashMap<>();
+                QueryWrapper<Windpowerstationpointnew> qw = new QueryWrapper<>();
+                qw.eq("windpowerstationid",i);
+                List<Windpowerstationpointnew> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+                windpowerstationtestingpoint2List.stream().forEach(x->{
+                    codeaimap.put(x.getUniformcode(),x);
+                });
+                wpaimap.put(i,codeaimap);
+            });
+            String s = JSONObject.toJSONString(wpaimap);
+
+            redisService.set("PRODUCT-WP",s);
+        };
+        logger.info("----------------------场站点结束");
 
 
         logger.info("--------------------------redisWT");
@@ -360,25 +360,32 @@ public class CacheContext implements CommandLineRunner {
 //        redisService.set("WZZT",JSONObject.toJSONString(wzztMap));
 
         logger.info("--------------------------redis十三种状态");
-        Map<String,Map<String,List<Windturbinestatusdi>>> sszztMap = new HashMap<>();
+        Map<String,List<Windturbinestatusdi>> sszztMap = new HashMap<>();
         List<Windturbinestatusdi> windturbinestatusdis = windturbinestatusdiService.list();
         windturbinestatusdis.stream().forEach(w->{
             if (sszztMap.containsKey(w.getWindturbineid())){
-                Map<String, List<Windturbinestatusdi>> stringListMap = sszztMap.get(w.getWindturbineid());
-                if (stringListMap.containsKey(w.getUniformcode())){
-                    stringListMap.get(w.getUniformcode()).add(w);
-                }else {
-                    List<Windturbinestatusdi> wdisList = new ArrayList<>();
-                    wdisList.add(w);
-                    stringListMap.put(w.getUniformcode(),wdisList);
-                }
+                sszztMap.get(w.getWindturbineid()).add(w);
             }else {
-                Map<String,List<Windturbinestatusdi>> map = new HashMap<>();
                 List<Windturbinestatusdi> wdisList = new ArrayList<>();
                 wdisList.add(w);
-                map.put(w.getUniformcode(),wdisList);
-                sszztMap.put(w.getWindturbineid(),map);
+                sszztMap.put(w.getWindturbineid(),wdisList);
             }
+//            if (sszztMap.containsKey(w.getWindturbineid())){
+//                Map<String, List<Windturbinestatusdi>> stringListMap = sszztMap.get(w.getWindturbineid());
+//                if (stringListMap.containsKey(w.getUniformcode())){
+//                    stringListMap.get(w.getUniformcode()).add(w);
+//                }else {
+//                    List<Windturbinestatusdi> wdisList = new ArrayList<>();
+//                    wdisList.add(w);
+//                    stringListMap.put(w.getUniformcode(),wdisList);
+//                }
+//            }else {
+//                Map<String,List<Windturbinestatusdi>> map = new HashMap<>();
+//                List<Windturbinestatusdi> wdisList = new ArrayList<>();
+//                wdisList.add(w);
+//                map.put(w.getUniformcode(),wdisList);
+//                sszztMap.put(w.getWindturbineid(),map);
+//            }
         });
         redisService.set("SSZZT",JSONObject.toJSONString(sszztMap));
 

cache/src/main/java/com/gyee/cache/mapper/auto/WpretimepointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.cache.mapper.auto;
+
+import com.gyee.cache.model.auto.Wpretimepoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-04-18
+ */
+public interface WpretimepointMapper extends BaseMapper<Wpretimepoint> {
+
+}

cache/src/main/java/com/gyee/cache/mapper/auto/WtretimepointMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.cache.mapper.auto;
+
+import com.gyee.cache.model.auto.Wtretimepoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-04-18
+ */
+public interface WtretimepointMapper extends BaseMapper<Wtretimepoint> {
+
+}

cache/src/main/java/com/gyee/cache/model/auto/Windpowerstationpointnew.java

@@ -1,5 +1,6 @@
 package com.gyee.cache.model.auto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,7 +23,7 @@ public class Windpowerstationpointnew extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId("ID")
+    @TableId(value = "ID",type = IdType.INPUT)
     private String id;
 
     @TableField("CODE")

cache/src/main/java/com/gyee/cache/model/auto/Windturbinetestingpointnew.java

@@ -1,5 +1,6 @@
 package com.gyee.cache.model.auto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,7 +23,7 @@ public class Windturbinetestingpointnew extends Model {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId("ID")
+    @TableId(value = "ID",type = IdType.INPUT)
     private String id;
 
     @TableField("CODE")

cache/src/main/java/com/gyee/cache/model/auto/Wpretimepoint.java

@@ -0,0 +1,34 @@
+package com.gyee.cache.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-04-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Wpretimepoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private String uniformcode;
+
+    @TableField("ORDERNUM")
+    private String ordernum;
+
+
+}

cache/src/main/java/com/gyee/cache/model/auto/Wtretimepoint.java

@@ -0,0 +1,32 @@
+package com.gyee.cache.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-04-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Wtretimepoint extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private String uniformcode;
+
+    private String ordernum;
+
+
+}

cache/src/main/java/com/gyee/cache/service/auto/IWpretimepointService.java

@@ -0,0 +1,16 @@
+package com.gyee.cache.service.auto;
+
+import com.gyee.cache.model.auto.Wpretimepoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-04-18
+ */
+public interface IWpretimepointService extends IService<Wpretimepoint> {
+
+}

cache/src/main/java/com/gyee/cache/service/auto/IWtretimepointService.java

@@ -0,0 +1,16 @@
+package com.gyee.cache.service.auto;
+
+import com.gyee.cache.model.auto.Wtretimepoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-04-18
+ */
+public interface IWtretimepointService extends IService<Wtretimepoint> {
+
+}

cache/src/main/java/com/gyee/cache/service/auto/impl/WpretimepointServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.cache.service.auto.impl;
+
+import com.gyee.cache.model.auto.Wpretimepoint;
+import com.gyee.cache.mapper.auto.WpretimepointMapper;
+import com.gyee.cache.service.auto.IWpretimepointService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-04-18
+ */
+@Service
+public class WpretimepointServiceImpl extends ServiceImpl<WpretimepointMapper, Wpretimepoint> implements IWpretimepointService {
+
+}

cache/src/main/java/com/gyee/cache/service/auto/impl/WtretimepointServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.cache.service.auto.impl;
+
+import com.gyee.cache.model.auto.Wtretimepoint;
+import com.gyee.cache.mapper.auto.WtretimepointMapper;
+import com.gyee.cache.service.auto.IWtretimepointService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-04-18
+ */
+@Service
+public class WtretimepointServiceImpl extends ServiceImpl<WtretimepointMapper, Wtretimepoint> implements IWtretimepointService {
+
+}

cache/src/main/resources/application-one.yml

@@ -0,0 +1,87 @@
+server:
+  port: 8044
+  servlet:
+    context-path: /
+
+
+spring:
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  #redis集群
+  redis:
+#    host: 49.4.50.80
+    host: 127.0.0.1
+    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:
+    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://10.81.3.151:5432/wisdom
+#    username: gdprod
+#    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
+  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
+
+
+

cache/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-#    active: jn
-    active: hb
+    active: one
+#    active: hb

cache/src/test/java/com/gyee/cache/CacheTest.java

@@ -0,0 +1,115 @@
+package com.gyee.cache;
+
+import com.gyee.cache.model.auto.*;
+import com.gyee.cache.service.auto.*;
+import com.gyee.common.util.CommonUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @ClassName : CacheTest
+ * @Author : xieshengjie
+ * @Date: 2022/4/18 9:52
+ * @Description :
+ */
+@SpringBootTest
+@RunWith(SpringRunner.class)
+@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
+public class CacheTest {
+    @Resource
+    private IWindpowerstationpointnewService windpowerstationpointnewService;
+    @Resource
+    private IWindturbinetestingpointnewService windturbinetestingpointnewService;
+    @Resource
+    private IWindturbineService windturbineService;
+    @Resource
+    private IWtretimepointService wtretimepointService;
+    @Resource
+    private IWpretimepointService wpretimepointService;
+    @Resource
+    private ILineService lineService;
+    @Resource
+    private IProjectService projectService;
+    @Test
+    public void test1(){
+        List<Windturbine> wtls = windturbineService.list();
+        List<Wtretimepoint> uniforms = wtretimepointService.list();
+        wtls.stream().forEach(wt->{
+            uniforms.stream().forEach(u->{
+                Windturbinetestingpointnew windturbinetestingpointnew = new Windturbinetestingpointnew();
+                String uuid = CommonUtils.getUUID();
+                windturbinetestingpointnew.setId(uuid);
+                //GJY01_GC
+//                GJYFJJSFW.SX_JN_GJYF_JS_P1_L1_007_CI0249
+                String[] pros = wt.getProjectid().split("_");
+                int pro = Integer.parseInt(pros[0].substring(pros[0].length() - 2));
+                String[] lines = wt.getLineid().split("_");
+                int line = Integer.parseInt(lines[0].substring(lines[0].length() - 2));
+                String[] fjs = wt.getId().split("_");
+                String code = "GJYFJJSFW.SX_JN_GJYF_JS_P"+pro+"_L"+line+"_"+fjs[1]+"_"+u.getCode()+u.getId();
+                windturbinetestingpointnew.setCode(code);
+                windturbinetestingpointnew.setName(wt.getCode()+u.getName());
+                windturbinetestingpointnew.setModel(wt.getModelid());
+                windturbinetestingpointnew.setModelid(wt.getModelid());
+                windturbinetestingpointnew.setWindturbineid(wt.getId());
+                windturbinetestingpointnew.setUniformcode(u.getUniformcode());
+                windturbinetestingpointnew.setWindpowerstationid(wt.getWindpowerstationid());
+                windturbinetestingpointnew.setRealtimeid("SXJN.JSFWGJYFJ");
+                windturbinetestingpointnewService.save(windturbinetestingpointnew);
+            });
+        });
+    }
+    @Test
+    public void test2(){
+        List<Line> lines = lineService.list();
+        List<Project> projects = projectService.list();
+        List<Wpretimepoint> uniforms = wpretimepointService.list();
+        uniforms.stream().forEach(u->{
+            lines.stream().forEach(l->{
+                Windpowerstationpointnew windpowerstationpointnew = new Windpowerstationpointnew();
+                windpowerstationpointnew.setId(CommonUtils.getUUID());
+//                GJYFCJSFW.SX_JN_GJYF_JS_XX_XX_XXX_CI0003
+                String[] linearray = l.getId().split("_");
+                int line = Integer.parseInt(linearray[0].substring(linearray[0].length() - 2));
+                String[] pros = l.getProjectid().split("_");
+                int pro = Integer.parseInt(pros[0].substring(pros[0].length() - 2));
+                String code = "GJYFCJSFW.SX_JN_GJYF_JS_P"+pro+"_L"+line+"_XXX_"+u.getCode()+u.getId();
+                windpowerstationpointnew.setCode(code);
+                windpowerstationpointnew.setName(l.getName()+u.getName());
+                windpowerstationpointnew.setUniformcode(u.getUniformcode());
+                windpowerstationpointnew.setWindpowerstationid(l.getId());
+                windpowerstationpointnew.setRealtimeid("SXJN.JSFWGJYFC");
+                windpowerstationpointnewService.save(windpowerstationpointnew);
+            });
+            projects.stream().forEach(p->{
+                Windpowerstationpointnew windpowerstationpointnew = new Windpowerstationpointnew();
+                windpowerstationpointnew.setId(CommonUtils.getUUID());
+                String[] pros = p.getId().split("_");
+                int pro = Integer.parseInt(pros[0].substring(pros[0].length() - 2));
+                String code = "GJYFCJSFW.SX_JN_GJYF_JS_P"+pro+"_XX_XXX_"+u.getCode()+u.getId();
+                windpowerstationpointnew.setCode(code);
+                windpowerstationpointnew.setName(p.getName()+u.getName());
+                windpowerstationpointnew.setUniformcode(u.getUniformcode());
+                windpowerstationpointnew.setWindpowerstationid(p.getId());
+                windpowerstationpointnew.setRealtimeid("SXJN.JSFWGJYFC");
+                windpowerstationpointnewService.save(windpowerstationpointnew);
+            });
+            Windpowerstationpointnew windpowerstationpointnew = new Windpowerstationpointnew();
+            windpowerstationpointnew.setId(CommonUtils.getUUID());
+            String code = "GJYFCJSFW.SX_JN_GJYF_JS_XX_XX_XXX_"+u.getCode()+u.getId();
+            windpowerstationpointnew.setCode(code);
+            windpowerstationpointnew.setName("高家堰风电场"+u.getName());
+            windpowerstationpointnew.setUniformcode(u.getUniformcode());
+            windpowerstationpointnew.setWindpowerstationid("GJY_FDC");
+            windpowerstationpointnew.setRealtimeid("SXJN.JSFWGJYFC");
+            windpowerstationpointnewService.save(windpowerstationpointnew);
+        });
+    }
+}

realtime/generation-service/pom.xml

@@ -81,8 +81,6 @@
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>
             <version>2.3.1-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/xxl-job-core-2.3.1-SNAPSHOT.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -92,6 +90,10 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
 
 
     </dependencies>

realtime/generation-service/src/main/java/com/gyee/generation/init/CacheContext.java

@@ -3,6 +3,7 @@ package com.gyee.generation.init;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.gyee.common.model.StringUtils;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.redis.RedisService;
@@ -39,6 +40,8 @@ public class CacheContext implements CommandLineRunner {
     @Resource
     private IEquipmentmodelService equipmentmodelService;
     @Resource
+    private IWindturbinestatusdiService windturbinestatusdiService;
+    @Resource
     private RedisService redisService;
     @Value("${runWindpowerstation}")
     private String runWindpowerstation;
@@ -62,7 +65,9 @@ public class CacheContext implements CommandLineRunner {
     public void run(String... args) throws Exception {
         logger.info("缓存开始------------------------------------------------------------");
         List<String> runWpids = Arrays.asList(runWindpowerstation.split(","));
+        logger.info(runWpids.get(0)+"------------------"+runWpids.size());
         wtls = windturbineService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationid())).collect(Collectors.toList());
+        logger.info(wtls.size()+"");
         wtls.forEach(wt->{
             String wtString = redisService.get(wt.getId());
             Map<String, Windturbinetestingpointnew> stringWindturbinetestingpointnewMap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Windturbinetestingpointnew>>() {
@@ -95,7 +100,7 @@ public class CacheContext implements CommandLineRunner {
 
         });
 
-        lines = lineService.list().stream().filter(i->runWpids.contains(proMap.get(i.getProjectid()).getWindpowerstationid())).collect(Collectors.toList());
+        lines = lineService.list().stream().filter(i-> StringUtils.isNotNull(proMap.get(i.getProjectid())) && runWpids.contains(proMap.get(i.getProjectid()).getWindpowerstationid())).collect(Collectors.toList());
         lines.stream().forEach(l->{
             if (prolinemap.containsKey(l.getProjectid())){
                 prolinemap.get(l.getProjectid()).add(l);
@@ -121,8 +126,10 @@ public class CacheContext implements CommandLineRunner {
             wppointmap.put(wp.getId(),stringMapMap);
         });
 
+
+
         String sszzt = redisService.get("SSZZT");
-        Map<String,List<Windturbinestatusdi>> statusMap = JSONObject.parseObject(sszzt, new TypeReference<Map<String,List<Windturbinestatusdi>>>() {
+         statusMap = JSONObject.parseObject(sszzt, new TypeReference<Map<String,List<Windturbinestatusdi>>>() {
         });
 
         List<Equipmentmodel> equipmentmodels = equipmentmodelService.list();

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

@@ -90,84 +90,91 @@ public class StatusService {
                         interruptionList.add(windturbinetestingpointnew.getCode());
                     }
                 });
-                Integer status = 2;
-                Integer mxstatus = 2;
+                Double status = 2.0;
+                Double mxstatus = 2.0;
                 try {
-                    List<PointData> interruptionRealData = edosUtil.getRealData(interruptionList);
-                    List<PointData> collect = interruptionRealData.stream().filter(i -> Math.abs(currentDate.getTime() - i.getPointTime()) / 1000 < Integer.parseInt(second)).collect(Collectors.toList());
-                    if (StringUtils.isEmpty(collect)){
-                        Integer ztmx = Integer.parseInt(edosUtil.getRealData(ztmxPoint).getPointValue());
-                        if (ztmx == 7 || ztmx == 9 || ztmx == 10 || ztmx == 11 || ztmx == 4 || ztmx == 5 ){     //手打状态
-                            mxstatus = ztmx;
-                        }
-                        if (clauStatusAi.contains(wt.getProjectid())){
-                            //多状态根据一个点来判断
-                            Optional<Windturbinestatusdi> first = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformcode().equals(Contant.AI422)).findFirst();
-                            if (first.isPresent()){
-                                Windturbinestatusdi windturbinestatusdi = first.get();
-                                //联合动力
-                                double pointValueInDouble = edosUtil.getRealData(windturbinestatusdi.getId()).getPointValueInDouble();
-                                switch ((int) pointValueInDouble){
-                                    case 0:
-                                        mxstatus = 12;
-                                        break;
-                                    case 1:
-                                        mxstatus = 6;
-                                        break;
-                                    case 2:
-                                        mxstatus = 8;
-                                        break;
-                                    case 3:
-                                        mxstatus = 0;
-                                        break;
-                                    case 4:
-                                    case 5:
-                                        mxstatus = 2;
-                                        break;
-                                    case 6:
-                                        mxstatus = 1;
+                    if (StringUtils.isEmpty(interruptionList)){
+                        mxstatus = 12.0;
+                        status = 3.0;
+                    }
+                    else {
+                        List<PointData> interruptionRealData = edosUtil.getRealData(interruptionList);
+                        List<PointData> collect = interruptionRealData.stream().filter(i -> Math.abs(currentDate.getTime() - i.getPointTime()) / 1000 > Integer.parseInt(second)).collect(Collectors.toList());
+                        if (StringUtils.isEmpty(collect)){
+                            Double ztmx = edosUtil.getRealData(ztmxPoint).getPointValueInDouble();
+                            if (ztmx == 7 || ztmx == 9 || ztmx == 10 || ztmx == 11 || ztmx == 4 || ztmx == 5 ){     //手打状态
+                                mxstatus = ztmx;
+                            }
+                            if (clauStatusAi.contains(wt.getProjectid())){
+                                //多状态根据一个点来判断
+                                Optional<Windturbinestatusdi> first = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformcode().equals(Contant.AI422)).findFirst();
+                                if (first.isPresent()){
+                                    Windturbinestatusdi windturbinestatusdi = first.get();
+                                    //联合动力
+                                    double pointValueInDouble = edosUtil.getRealData(windturbinestatusdi.getId()).getPointValueInDouble();
+                                    switch ((int) pointValueInDouble){
+                                        case 0:
+                                            mxstatus = 12.0;
+                                            break;
+                                        case 1:
+                                            mxstatus = 6.0;
+                                            break;
+                                        case 2:
+                                            mxstatus = 8.0;
+                                            break;
+                                        case 3:
+                                            mxstatus = 0.0;
+                                            break;
+                                        case 4:
+                                        case 5:
+                                            mxstatus = 2.0;
+                                            break;
+                                        case 6:
+                                            mxstatus = 1.0;
+                                            break;
+                                        default:
+                                            mxstatus = 2.0;
+                                    }
+                                }
+                            }
+                            if (clauStatusDi.contains(wt.getProjectid())){
+                                //每个状态一个状态点
+                                List<Windturbinestatusdi> windturbinestatusdis = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformcode().equals(Contant.MX000) || w.getUniformcode().equals(Contant.MX002) || w.getUniformcode().equals(Contant.MX006) || w.getUniformcode().equals(Contant.MX008)).collect(Collectors.toList());
+                                for(Windturbinestatusdi w : windturbinestatusdis){
+                                    PointData realData = edosUtil.getRealData(w.getId());
+                                    if (realData.getPointValueInDouble()==1){
+                                        mxstatus = Double.parseDouble(w.getTypeid());
                                         break;
-                                    default:
-                                        mxstatus = 2;
+                                    }
                                 }
                             }
-                        }
-                        if (clauStatusDi.contains(wt.getProjectid())){
-                            //每个状态一个状态点
-                            List<Windturbinestatusdi> windturbinestatusdis = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformcode().equals(Contant.MX000) || w.getUniformcode().equals(Contant.MX002) || w.getUniformcode().equals(Contant.MX006) || w.getUniformcode().equals(Contant.MX008)).collect(Collectors.toList());
-                            for(Windturbinestatusdi w : windturbinestatusdis){
-                                PointData realData = edosUtil.getRealData(w.getId());
-                                if (realData.getPointValueInDouble()==1){
-                                    mxstatus = Integer.parseInt(w.getTypeid());
-                                    break;
+                            if (mxstatus == 2){
+                                boolean isJcl = isJcl(wt, stringWindturbinetestingpointnewMap);
+                                if (isJcl){
+                                    mxstatus = 3.0;
                                 }
                             }
+                        }else{
+                            //离线
+                            mxstatus = 12.0;
                         }
-                        if (mxstatus == 2){
-                            boolean isJcl = isJcl(wt, stringWindturbinetestingpointnewMap);
-                            if (isJcl){
-                                mxstatus = 3;
-                            }
+                        if (mxstatus == 0 || mxstatus == 1){
+                            status = 0.0;
+                        }else if(mxstatus == 2 || mxstatus == 3){
+                            status = 1.0;
+                        }else if(mxstatus == 4 || mxstatus == 5){
+                            status = 5.0;
+                        }else if(mxstatus == 6 || mxstatus == 7){
+                            status = 2.0;
+                        }else if(mxstatus == 8 || mxstatus == 9){
+                            status = 4.0;
+                        }else if(mxstatus == 10 || mxstatus == 11){
+                            status = 2.0;
+                        }else if(mxstatus == 12){
+                            status = 3.0;
                         }
-                    }else{
-                        //离线
-                        mxstatus = 12;
-                    }
-                    if (mxstatus == 0 || mxstatus == 1){
-                        status = 0;
-                    }else if(mxstatus == 2 || mxstatus == 3){
-                        status = 1;
-                    }else if(mxstatus == 4 || mxstatus == 5){
-                        status = 5;
-                    }else if(mxstatus == 6 || mxstatus == 7){
-                        status = 2;
-                    }else if(mxstatus == 8 || mxstatus == 9){
-                        status = 4;
-                    }else if(mxstatus == 10 || mxstatus == 11){
-                        status = 2;
-                    }else if(mxstatus == 12){
-                        status = 6;
                     }
+
                     PointData ztmx = createPointData(ztmxPoint, mxstatus);
                     PointData fj5t = createPointData(fj5tPoint, status);
                     resultList.add(ztmx);
@@ -188,7 +195,7 @@ public class StatusService {
         List<PointData> resultList = new ArrayList<>();
         wpls.stream().forEach(wp->{
             List<Project> projects = wppromap.get(wp.getId());
-            Map<String, Windpowerstationpointnew> wpmap = linepointmap.get(wp.getId());
+            Map<String, Windpowerstationpointnew> wpmap = wppointmap.get(wp.getId());
             AtomicInteger wpdjnum = new AtomicInteger();
             AtomicInteger wptjnum = new AtomicInteger();
             AtomicInteger wpfdnum = new AtomicInteger();
@@ -212,7 +219,7 @@ public class StatusService {
             AtomicInteger wpyxts = new AtomicInteger();
             projects.stream().forEach(project->{
                 List<Line> lineList = prolinemap.get(project.getId());
-                Map<String, Windpowerstationpointnew> projectmap = linepointmap.get(project.getId());
+                Map<String, Windpowerstationpointnew> projectmap = propointmap.get(project.getId());
                 AtomicInteger prodjnum = new AtomicInteger();
                 AtomicInteger protjnum = new AtomicInteger();
                 AtomicInteger profdnum = new AtomicInteger();
@@ -642,7 +649,7 @@ public class StatusService {
         return isJcl;
     }
 
-    private PointData createPointData(Windturbinetestingpointnew ztmxPoint, Integer mxstatus) {
+    private PointData createPointData(Windturbinetestingpointnew ztmxPoint, Double mxstatus) {
         PointData pointData = new PointData();
         pointData.setEdnaId(ztmxPoint.getCode());
         pointData.setPointName(ztmxPoint.getName());

realtime/generation-service/src/main/java/com/gyee/generation/task/SaticScheduleTask.java

@@ -3,6 +3,7 @@ package com.gyee.generation.task;
 
 import com.gyee.common.util.DateUtils;
 import com.gyee.generation.service.GenerationService;
+import com.gyee.generation.service.StatusService;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.slf4j.Logger;
@@ -24,6 +25,8 @@ public class SaticScheduleTask {
 
     @Resource
     private GenerationService generationService;
+    @Resource
+    private StatusService statusService;
     //3.添加定时任务
     /**
      * 电计量实时计算计算（电量，上网，购网，场用）
@@ -37,9 +40,9 @@ public class SaticScheduleTask {
         XxlJobHelper.log("电计量实时调度程序执行开始!........");
 
         try {
-//                System.out.println(11111111);
-            generationService.saveGenerationDatas();
-                 } catch (Exception e) {
+            System.out.println(11111111);
+//            generationService.saveGenerationDatas();
+        } catch (Exception e) {
 
             e.printStackTrace();
         }
@@ -82,6 +85,21 @@ public class SaticScheduleTask {
         XxlJobHelper.log("电计量历史2调度任务处理完成!........");
     }
 
+    /**
+     * 实时状态计算
+     * 只执行一次（死循环）
+     */
+    @XxlJob("status-realtime")
+    public void status() throws Exception {
+        while(true){
+            XxlJobHelper.log("实时状态调度程序执行开始!........");
+            statusService.calculateStatus();
+            statusService.calculateStatusNumber();
+            XxlJobHelper.log("实时状态调度程序执行完成!........");
+        }
+
+    }
+
 
 
 }

realtime/generation-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -1081,7 +1081,7 @@ public class EdosUtil implements IEdosUtil {
         JSONObject jo = new JSONObject();
         jo.put("tagName", pd.getEdnaId());
         JSONObject joo = new JSONObject();
-        joo.put("ts", pd.getPointTime()*1000);
+        joo.put("ts", pd.getPointTime());
         joo.put("status", 0);
         joo.put("doubleValue", pd.getPointValueInDouble());
         jo.put("tsData", joo);

realtime/generation-service/src/main/resources/application-jn.yml

@@ -0,0 +1,113 @@
+server:
+  port: 7011
+  servlet:
+    context-path: /
+
+
+spring:
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  #redis集群
+  redis:
+    host: 10.81.3.155
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+#    cluster:
+#      #集群信息
+#      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
+#      #默认值是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://10.81.3.151:5432/wisdom
+    username: gdprod
+    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
+  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
+#db url
+db:
+  url: http://10.81.3.152:8011/ts
+#参与计算的场站
+runWindpowerstation: GJY_FDC
+#计算状态用ai或者di
+clauStatus:
+  ai:    #配置期次
+  di: GJY02_GC
+
+#判断数据终端
+second: 90
+#判断降出力
+AI134: 17.4    #叶轮转速给定
+AI178: 17.4    #转矩给定
+#AI443:容量
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -1,5 +1,5 @@
 # 场站，期次，线路电计量信息
 spring:
   profiles:
-    active: td
+    active: jn
 #    active: dev

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

@@ -1,5 +1,5 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://10.83.68.159:8175/xxl-job-admin
+xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
 
 ### xxl-job, access token
 xxl.job.accessToken=
@@ -10,9 +10,9 @@ xxl.job.executor.appname=generation-job
 xxl.job.executor.address=
 ### xxl-job executor server-info
 xxl.job.executor.ip=
-xxl.job.executor.port=9102
+xxl.job.executor.port=9101
 ### xxl-job executor log-path
-xxl.job.executor.logpath=d:\\jobs\\generation-job
+xxl.job.executor.logpath=E:\\jobs\\generation-job
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

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

@@ -2,6 +2,7 @@ package com.gyee.generation;
 
 import com.gyee.generation.service.AverageAndGeneratingService;
 import com.gyee.generation.service.GenerationService;
+import com.gyee.generation.service.StatusService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -25,10 +26,13 @@ public class GenerationTest {
     @Resource
     private GenerationService generationService;
     @Resource
+    private StatusService statusService;
+    @Resource
     private AverageAndGeneratingService averageAndGeneratingService;
     @Test
     public void test1() throws Exception {
 //        generationService.saveMeterpointValue("2022-03-25","2022-03-25");
-        averageAndGeneratingService.saveAvespeedAndAvepowerAndScada();
+//        averageAndGeneratingService.saveAvespeedAndAvepowerAndScada();
+        statusService.calculateStatus();
     }
 }