移植新版健康管理后台项目

realtime/datatraining-server/src/main/java/com/gyee/datatraining/DatatrainingMain.java

@@ -10,8 +10,18 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 @MapperScan("com.gyee.datatraining.mapper")
 public class DatatrainingMain {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         SpringApplication.run(DatatrainingMain.class, args);
+
+//        SaticScheduleTask saticScheduleTask= SpringUtils.getBean("saticScheduleTask");
+//        saticScheduleTask.configureTasks1();
+//        saticScheduleTask.configureTasks2();
+//        saticScheduleTask.configureTasks3();
+//        saticScheduleTask.configureTasks4();
+//        saticScheduleTask.configureTasks5();
+//        saticScheduleTask.configureTasks6();
+//
+//        System.out.println("完");
     }
 
 

realtime/datatraining-server/src/main/java/com/gyee/datatraining/config/XxlJobConfig.java

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

realtime/datatraining-server/src/main/java/com/gyee/datatraining/init/CacheContext.java

@@ -185,6 +185,8 @@ public class CacheContext implements CommandLineRunner {
                 wpmap.put(ProBasicPowerstationPoint.getUniformCode(),ProBasicPowerstationPoint);
                 wppointmap.put(ProBasicPowerstationPoint.getWindpowerstationId(),wpmap);
             }
+
+
         }
 
 

realtime/datatraining-server/src/main/java/com/gyee/datatraining/service/DatatrainingService.java

@@ -22,7 +22,11 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executor;
 
 
 /**
@@ -36,8 +40,8 @@ public class DatatrainingService {
     private Environment env;
     @Resource
     private ModuleState ms;
-
-
+    @Resource
+    private Executor executor;
     private int jzxnnum = 4;//机组权重数量
     private int digits = 4;//小数位数
     /**
@@ -66,49 +70,50 @@ public class DatatrainingService {
         List<ProBasicEquipment> wtls = CacheContext.wtls;
         Map<String, Map<String, ProBasicPowerstationPoint>> stationPointmap = CacheContext.wppointmap;
 
-        Map<String, Map<String, Integer>> wpmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> pjmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> lnmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> cpmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> rgmap = new HashMap<String, Map<String, Integer>>();
+        Map<String, Map<String, Integer>> wpmap = new HashMap<>();
+        Map<String, Map<String, Integer>> pjmap = new HashMap<>();
+        Map<String, Map<String, Integer>> lnmap = new HashMap<>();
+        Map<String, Map<String, Integer>> cpmap = new HashMap<>();
+        Map<String, Map<String, Integer>> rgmap = new HashMap<>();
 
-        Map<String, Map<String, Integer>> wpclxmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> pjclxmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> lnclxmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> cpclxmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> rgclxmap = new HashMap<String, Map<String, Integer>>();
+        Map<String, Map<String, Integer>> wpclxmap = new HashMap<>();
+        Map<String, Map<String, Integer>> pjclxmap = new HashMap<>();
+        Map<String, Map<String, Integer>> lnclxmap = new HashMap<>();
+        Map<String, Map<String, Integer>> cpclxmap = new HashMap<>();
+        Map<String, Map<String, Integer>> rgclxmap = new HashMap<>();
 
-        Map<String, Map<String, Integer>> wpfdjmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> pjfdjmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> lnfdjmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> cpfdjmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> rgfdjmap = new HashMap<String, Map<String, Integer>>();
+        Map<String, Map<String, Integer>> wpfdjmap = new HashMap<>();
+        Map<String, Map<String, Integer>> pjfdjmap = new HashMap<>();
+        Map<String, Map<String, Integer>> lnfdjmap = new HashMap<>();
+        Map<String, Map<String, Integer>> cpfdjmap = new HashMap<>();
+        Map<String, Map<String, Integer>> rgfdjmap = new HashMap<>();
 
-        Map<String, Map<String, Integer>> wpkzysmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> pjkzysmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> lnkzysmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> cpkzysmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> rgkzysmap = new HashMap<String, Map<String, Integer>>();
+        Map<String, Map<String, Integer>> wpkzysmap = new HashMap<>();
+        Map<String, Map<String, Integer>> pjkzysmap = new HashMap<>();
+        Map<String, Map<String, Integer>> lnkzysmap = new HashMap<>();
+        Map<String, Map<String, Integer>> cpkzysmap = new HashMap<>();
+        Map<String, Map<String, Integer>> rgkzysmap = new HashMap<>();
 
-        Map<String, Map<String, Integer>> wpjcxtmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> pjjcxtmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> lnjcxtmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> cpjcxtmap = new HashMap<String, Map<String, Integer>>();
-        Map<String, Map<String, Integer>> rgjcxtmap = new HashMap<String, Map<String, Integer>>();
+        Map<String, Map<String, Integer>> wpjcxtmap = new HashMap<>();
+        Map<String, Map<String, Integer>> pjjcxtmap = new HashMap<>();
+        Map<String, Map<String, Integer>> lnjcxtmap = new HashMap<>();
+        Map<String, Map<String, Integer>> cpjcxtmap = new HashMap<>();
+        Map<String, Map<String, Integer>> rgjcxtmap = new HashMap<>();
 
 
 
 
         Date now = new Date();
         for (ProBasicEquipment wt : wtls) {
+//            new Thread(new StartTaskThread(executor,  wt, ms, env, ednaApiUtil)).start();
 
-//			if (wt.getWindpowerstationId().endsWith("FDC")  && wt.getId().equals("NG01_06")) {
-            if (wt.getWindpowerstationId().endsWith("FDC")) {
+            if (wt.getWindpowerstationId().contains("FDC")) {
 
                 int[] state = { 0, 0, 0, 0, 0 };
                 try {
 
                     state = checkWtState(wt.getId(), now);
+
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -125,6 +130,8 @@ public class DatatrainingService {
 
         }
 
+        
+        
         /******************************************************************************************************************************************************/
 
         String[] up82_wp_wt_statenum = env.getProperty("up82_wp_wt_statenum").split(",");
@@ -139,32 +146,32 @@ public class DatatrainingService {
         traverseALlStateNumMap(stationPointmap, wpkzysmap, now, up82_wp_kzys_statenum);
         traverseALlStateNumMap(stationPointmap, wpjcxtmap, now, up82_wp_jcxt_statenum);
 
-        traverseRgStateNumMap(stationPointmap, rgmap, now, up82_wp_wt_statenum);
-        traverseCpStateNumMap(stationPointmap, cpmap, now, up82_wp_wt_statenum);
+//        traverseRgStateNumMap(stationPointmap, rgmap, now, up82_wp_wt_statenum);
+//        traverseCpStateNumMap(stationPointmap, cpmap, now, up82_wp_wt_statenum);
         traverseWpStateNumMap(stationPointmap, wpmap, now, up82_wp_wt_statenum);
         traversePjStateNumMap(stationPointmap, pjmap, now, up82_wp_wt_statenum);
         traverseLnStateNumMap(stationPointmap, lnmap, now, up82_wp_wt_statenum);
 
-        traverseRgStateNumMap(stationPointmap, rgclxmap, now, up82_wp_wt_statenum);
-        traverseCpStateNumMap(stationPointmap, cpclxmap, now, up82_wp_wt_statenum);
+//        traverseRgStateNumMap(stationPointmap, rgclxmap, now, up82_wp_wt_statenum);
+//        traverseCpStateNumMap(stationPointmap, cpclxmap, now, up82_wp_wt_statenum);
         traverseWpStateNumMap(stationPointmap, wpclxmap, now, up82_wp_clx_statenum);
         traversePjStateNumMap(stationPointmap, pjclxmap, now, up82_wp_clx_statenum);
         traverseLnStateNumMap(stationPointmap, lnclxmap, now, up82_wp_clx_statenum);
 
-        traverseRgStateNumMap(stationPointmap, rgfdjmap, now, up82_wp_wt_statenum);
-        traverseCpStateNumMap(stationPointmap, cpfdjmap, now, up82_wp_wt_statenum);
+//        traverseRgStateNumMap(stationPointmap, rgfdjmap, now, up82_wp_wt_statenum);
+//        traverseCpStateNumMap(stationPointmap, cpfdjmap, now, up82_wp_wt_statenum);
         traverseWpStateNumMap(stationPointmap, wpfdjmap, now, up82_wp_fdj_statenum);
         traversePjStateNumMap(stationPointmap, pjfdjmap, now, up82_wp_fdj_statenum);
         traverseLnStateNumMap(stationPointmap, lnfdjmap, now, up82_wp_fdj_statenum);
 
-        traverseRgStateNumMap(stationPointmap, rgkzysmap, now, up82_wp_wt_statenum);
-        traverseCpStateNumMap(stationPointmap, cpkzysmap, now, up82_wp_wt_statenum);
+//        traverseRgStateNumMap(stationPointmap, rgkzysmap, now, up82_wp_wt_statenum);
+//        traverseCpStateNumMap(stationPointmap, cpkzysmap, now, up82_wp_wt_statenum);
         traverseWpStateNumMap(stationPointmap, wpkzysmap, now, up82_wp_kzys_statenum);
         traversePjStateNumMap(stationPointmap, pjkzysmap, now, up82_wp_kzys_statenum);
         traverseLnStateNumMap(stationPointmap, lnkzysmap, now, up82_wp_kzys_statenum);
 
-        traverseRgStateNumMap(stationPointmap, rgjcxtmap, now, up82_wp_wt_statenum);
-        traverseCpStateNumMap(stationPointmap, cpjcxtmap, now, up82_wp_wt_statenum);
+//        traverseRgStateNumMap(stationPointmap, rgjcxtmap, now, up82_wp_wt_statenum);
+//        traverseCpStateNumMap(stationPointmap, cpjcxtmap, now, up82_wp_wt_statenum);
         traverseWpStateNumMap(stationPointmap, wpjcxtmap, now, up82_wp_jcxt_statenum);
         traversePjStateNumMap(stationPointmap, pjjcxtmap, now, up82_wp_jcxt_statenum);
         traverseLnStateNumMap(stationPointmap, lnjcxtmap, now, up82_wp_jcxt_statenum);
@@ -183,7 +190,7 @@ public class DatatrainingService {
         int zy=0;
         int yz=0;
         for (ProBasicPowerstation wp : wpls) {
-            if (wp.getId().endsWith("FDC")) {
+            if (wp.getId().contains("FDC")) {
 
                 Map<String, Integer> map = wpmap.get(wp.getId());
                 if(map.containsKey("1"))
@@ -222,8 +229,22 @@ public class DatatrainingService {
         List<ProBasicRegion> rgls = CacheContext.rgls;
 
         for (ProBasicRegion rg : rgls) {
-            Map<String, ProBasicPowerstationPoint> pointwmap = stationPointmap.get(rg.getId());
-            Map<String, Integer> map = rgmap.get(rg.getId());
+            Map<String, ProBasicPowerstationPoint> pointwmap = stationPointmap.get(rg.getId()+"0");
+            Map<String, Integer> map = rgmap.get(rg.getId()+"0");
+            for (int i = 0; i < up82_wp_statenum.length; i++) {
+                double value = 0.0;
+                if (map.containsKey(String.valueOf(i + 1))) {
+                    value = map.get(String.valueOf(i + 1));
+                }
+                try {
+                    insertWpPoint(now, value, pointwmap, up82_wp_statenum[i]);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            Map<String, ProBasicPowerstationPoint> pointwmap1 = stationPointmap.get(rg.getId()+"1");
+            Map<String, Integer> map1 = rgmap.get(rg.getId()+"0");
             for (int i = 0; i < up82_wp_statenum.length; i++) {
                 double value = 0.0;
                 if (map.containsKey(String.valueOf(i + 1))) {
@@ -264,7 +285,7 @@ public class DatatrainingService {
         List<ProBasicPowerstation> wpls = CacheContext.wpls;
 
         for (ProBasicPowerstation wp : wpls) {
-            if (wp.getId().endsWith("FDC")) {
+            if (wp.getId().contains("FDC")) {
                 Map<String, ProBasicPowerstationPoint> pointwmap = stationPointmap.get(wp.getId());
                 Map<String, Integer> map = wpmap.get(wp.getId());
                 for (int i = 0; i < up82_wp_statenum.length; i++) {
@@ -288,7 +309,7 @@ public class DatatrainingService {
         List<ProBasicProject> pjls = CacheContext.pjls;
 
         for (ProBasicProject pj : pjls) {
-            if (pj.getWindpowerstationId().endsWith("FDC")) {
+            if (pj.getWindpowerstationId().contains("FDC")) {
                 Map<String, ProBasicPowerstationPoint> pointwmap = stationPointmap.get(pj.getId());
                 Map<String, Integer> map = wpmap.get(pj.getId());
                 for (int i = 0; i < up82_wp_statenum.length; i++) {
@@ -312,7 +333,7 @@ public class DatatrainingService {
         List<ProBasicLine> lnls = CacheContext.lines;
 
         for (ProBasicLine ln : lnls) {
-            if (CacheContext.pjmap.get(ln.getProjectId()).getWindpowerstationId().endsWith("FDC")) {
+            if (CacheContext.pjmap.get(ln.getProjectId()).getWindpowerstationId().contains("FDC")) {
                 try {
                     Map<String, ProBasicPowerstationPoint> pointwmap = stationPointmap.get(ln.getId());
                     Map<String, Integer> map = wpmap.get(ln.getId());
@@ -336,29 +357,29 @@ public class DatatrainingService {
     private void setWtTotalNum(int type, Map<String, Map<String, Integer>> rgmap,Map<String, Map<String, Integer>> cpmap,Map<String, Map<String, Integer>> wpmap, Map<String, Map<String, Integer>> pjmap, Map<String, Map<String, Integer>> lnmap, ProBasicEquipment wt) {
         switch (type) {
             case 1:
-                totalRgStateNum(rgmap, wt, "1");
-                totalCpStateNum(cpmap, wt, "1");
+//                totalRgStateNum(rgmap, wt, "1");
+//                totalCpStateNum(cpmap, wt, "1");
                 totalWpStateNum(wpmap, wt, "1");
                 totalPjStateNum(pjmap, wt, "1");
                 totalLnStateNum(lnmap, wt, "1");
                 break;
             case 2:
-                totalRgStateNum(rgmap, wt, "2");
-                totalCpStateNum(cpmap, wt, "2");
+//                totalRgStateNum(rgmap, wt, "2");
+//                totalCpStateNum(cpmap, wt, "2");
                 totalWpStateNum(wpmap, wt, "2");
                 totalPjStateNum(pjmap, wt, "2");
                 totalLnStateNum(lnmap, wt, "2");
                 break;
             case 3:
-                totalRgStateNum(rgmap, wt, "3");
-                totalCpStateNum(cpmap, wt, "3");
+//                totalRgStateNum(rgmap, wt, "3");
+//                totalCpStateNum(cpmap, wt, "3");
                 totalWpStateNum(wpmap, wt, "3");
                 totalPjStateNum(pjmap, wt, "3");
                 totalLnStateNum(lnmap, wt, "3");
                 break;
             case 4:
-                totalRgStateNum(rgmap, wt, "4");
-                totalCpStateNum(cpmap, wt, "4");
+//                totalRgStateNum(rgmap, wt, "4");
+//                totalCpStateNum(cpmap, wt, "4");
                 totalWpStateNum(wpmap, wt, "4");
                 totalPjStateNum(pjmap, wt, "4");
                 totalLnStateNum(lnmap, wt, "4");

realtime/datatraining-server/src/main/java/com/gyee/datatraining/task/SaticScheduleTask.java

@@ -73,7 +73,7 @@ public class SaticScheduleTask {
 
             for (int i = 0; i < CacheContext.wpls.size(); i++) {
                 ProBasicPowerstation wp=CacheContext.wpls.get(i);
-                if (wp.getId().endsWith("FDC")) {
+                if (wp.getId().contains("FDC")) {
                     List<ProBasicEquipment> wtls=CacheContext.wtsmap.get(wp.getId());
 
                     try {
@@ -108,7 +108,7 @@ public class SaticScheduleTask {
 
             for (int i = 0; i < CacheContext.wpls.size(); i++) {
                 ProBasicPowerstation wp=CacheContext.wpls.get(i);
-                if (wp.getId().endsWith("FDC")) {
+                if (wp.getId().contains("FDC")) {
                     List<ProBasicEquipment> wtls=CacheContext.wtsmap.get(wp.getId());
 
                     try {
@@ -143,7 +143,7 @@ public class SaticScheduleTask {
 
             for (int i = 0; i < CacheContext.wpls.size(); i++) {
                 ProBasicPowerstation wp=CacheContext.wpls.get(i);
-                if (wp.getId().endsWith("FDC")) {
+                if (wp.getId().contains("FDC")) {
                     List<ProBasicEquipment> wtls=CacheContext.wtsmap.get(wp.getId());
 
                     try {
@@ -178,7 +178,7 @@ public class SaticScheduleTask {
 
             for (int i = 0; i < CacheContext.wpls.size(); i++) {
                 ProBasicPowerstation wp=CacheContext.wpls.get(i);
-                if (wp.getId().endsWith("FDC")) {
+                if (wp.getId().contains("FDC")) {
                     List<ProBasicEquipment> wtls=CacheContext.wtsmap.get(wp.getId());
 
                     try {
@@ -213,7 +213,7 @@ public class SaticScheduleTask {
 
             for (int i = 0; i < CacheContext.wpls.size(); i++) {
                 ProBasicPowerstation wp=CacheContext.wpls.get(i);
-                if (wp.getId().endsWith("FDC")) {
+                if (wp.getId().contains("FDC")) {
                     List<ProBasicEquipment> wtls=CacheContext.wtsmap.get(wp.getId());
 
                     try {

realtime/datatraining-server/src/main/java/com/gyee/datatraining/task/StartTaskThread.java

@@ -0,0 +1,68 @@
+//package com.gyee.datatraining.task;
+//
+//import com.gyee.datatraining.model.auto.ProBasicEquipment;
+//import com.gyee.datatraining.util.IRealTimeDataBaseUtil;
+//import com.gyee.datatraining.util.dd.ModuleState;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.core.env.Environment;
+//
+//import java.util.Date;
+//import java.util.Map;
+//import java.util.concurrent.ExecutionException;
+//import java.util.concurrent.Executor;
+//import java.util.concurrent.FutureTask;
+//import java.util.concurrent.TimeUnit;
+//
+//public class StartTaskThread implements Runnable {
+//
+//	private  Logger logger = LoggerFactory.getLogger(this.getClass());
+//	private Executor executor;
+//
+//	private ModuleState ms;
+//	private Environment env;
+//	private ProBasicEquipment wt;
+//	private IRealTimeDataBaseUtil ednaApiUtil;
+//	private Map<String, Map<String, Integer>> wpmap;
+//	private Map<String, Map<String, Integer>> pjmap ;
+//	private Map<String, Map<String, Integer>> lnmap;
+//	private Map<String, Map<String, Integer>> cpmap;
+//	private Map<String, Map<String, Integer>> rgmap;
+//	private Date now;
+//	public StartTaskThread(Executor executor, ProBasicEquipment wt, Date now , ModuleState ms, Environment env, IRealTimeDataBaseUtil ednaApiUtil, Map<String, Map<String, Integer>> rgmap, Map<String, Map<String, Integer>> cpmap, Map<String, Map<String, Integer>> wpmap, Map<String, Map<String, Integer>> pjmap, Map<String, Map<String, Integer>> lnmap) {
+//		this.executor = executor;
+//		this.ms = ms;
+//		this.env = env;
+//		this.ednaApiUtil = ednaApiUtil;
+//		this.wt = wt;
+//		this.now = now;
+//
+//		this.wpmap = wpmap;
+//		this.pjmap = pjmap;
+//		this.lnmap = lnmap;
+//		this.cpmap = cpmap;
+//		this.rgmap = rgmap;
+//	}
+//
+//	@Override
+//	public synchronized void run() {
+//
+//		String task = "task@ " + wt.getId();
+//		logger.info("风机健康状态数据创建任务并提交到线程池中：" + wt.getId());
+//		FutureTask<String> futureTask = new FutureTask<String>(new ThreadPoolTask(task,  wt,  now ,  ms,  env,  ednaApiUtil,  rgmap,  cpmap,  wpmap,  pjmap, lnmap));
+//		executor.execute(futureTask);
+//		// 在这里可以做别的任何事情
+//		String result = null;
+//		try {
+//			// 取得结果，同时设置超时执行时间为1秒。同样可以用future.get()，不设置执行超时时间取得结果
+//			result = futureTask.get(1000, TimeUnit.MILLISECONDS);
+//		} catch (InterruptedException e) {
+//			futureTask.cancel(true);
+//		} catch (ExecutionException e) {
+//			futureTask.cancel(true);
+//		} catch (Exception e) {
+//			futureTask.cancel(true);
+//			// 超时后，进行相应处理
+//		}
+//	}
+//}

realtime/datatraining-server/src/main/java/com/gyee/datatraining/task/ThreadPoolTask.java

@@ -0,0 +1,435 @@
+//package com.gyee.datatraining.task;
+//
+//import com.gyee.common.contant.ContantXk;
+//import com.gyee.common.model.PointData;
+//import com.gyee.datatraining.init.CacheContext;
+//import com.gyee.datatraining.model.auto.ProBasicEquipment;
+//import com.gyee.datatraining.model.auto.ProBasicEquipmentPoint;
+//import com.gyee.datatraining.model.auto.ProBasicPowerstationPoint;
+//import com.gyee.datatraining.model.vo.StatusDetailValue;
+//import com.gyee.datatraining.util.IRealTimeDataBaseUtil;
+//import com.gyee.datatraining.util.dd.MatrixCalculation;
+//import com.gyee.datatraining.util.dd.ModuleState;
+//import com.gyee.datatraining.vo.ModuleVo;
+//import org.apache.commons.lang3.RandomUtils;
+//import org.apache.commons.math3.linear.RealMatrix;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.core.env.Environment;
+//
+//import java.io.Serializable;
+//import java.math.BigDecimal;
+//import java.math.RoundingMode;
+//import java.util.Date;
+//import java.util.HashMap;
+//import java.util.Map;
+//import java.util.concurrent.Callable;
+//
+//public class ThreadPoolTask implements Callable<String>, Serializable {
+//
+//	private Logger logger = LoggerFactory.getLogger(this.getClass());
+//
+//	private static final long serialVersionUID = 0;
+//	private String unicode4hour="JKYC001";
+//	private String unicode1day="JKYC006";
+//	private String unicode3day="JKYC011";
+//	private String unicode7day="JKYC016";
+//	private String unicode1month="JKYC021";
+//	// 保存任务所需要的数据
+//	private int jzxnnum = 4;//机组权重数量
+//	private int digits = 4;//小数位数
+//	/**
+//	 * 结果集数量
+//	 */
+//	private int coment_bit = 4;
+//	/**
+//	 * 指标点数量
+//	 */
+//	private int point_bit = 4;
+//	private Object threadPoolTaskData;
+//	private ModuleState ms;
+//	private Environment env;
+//	private ProBasicEquipment wt;
+//	private Date now;
+//	private IRealTimeDataBaseUtil ednaApiUtil;
+//	private Map<String, Map<String, Integer>> wpmap;
+//	private Map<String, Map<String, Integer>> pjmap ;
+//	private Map<String, Map<String, Integer>> lnmap;
+//	private Map<String, Map<String, Integer>> cpmap;
+//	private Map<String, Map<String, Integer>> rgmap;
+//
+//	public ThreadPoolTask(Object tasks,  ProBasicEquipment wt, Date now , ModuleState ms, Environment env, IRealTimeDataBaseUtil ednaApiUtil, Map<String, Map<String, Integer>> rgmap, Map<String, Map<String, Integer>> cpmap, Map<String, Map<String, Integer>> wpmap, Map<String, Map<String, Integer>> pjmap, Map<String, Map<String, Integer>> lnmap) {
+//
+//		this.threadPoolTaskData = tasks;
+//		this.ms = ms;
+//		this.env = env;
+//		this.ednaApiUtil = ednaApiUtil;
+//		this.wt = wt;
+//		this.now = now;
+//
+//		this.wpmap = wpmap;
+//		this.pjmap = pjmap;
+//		this.lnmap = lnmap;
+//		this.cpmap = cpmap;
+//		this.rgmap = rgmap;
+//	}
+//
+//	public synchronized String call() throws Exception {
+//
+//
+//		// 处理一个任务，这里的处理方式太简单了，仅仅是一个打印语句
+//
+//		//System.out.println("开始执行任务：" + threadPoolTaskData);
+//
+//		String result = "";
+//
+//		// //便于观察，等待一段时间
+//
+//
+//
+//		try {
+//
+//
+//			if (wt.getWindpowerstationId().contains("FDC")) {
+//
+//				int[] state = { 0, 0, 0, 0, 0 };
+//				try {
+//
+//					state = checkWtState(wt.getId(), now);
+//
+//				} catch (Exception e) {
+//					e.printStackTrace();
+//				}
+////				if(state[0]==0 || state[1]==0  || state[2]==0 || state[3]==0 || state[4]==0)
+////				{
+////					System.out.println("开始测试！");
+////				}
+//				setWtTotalNum(state[0], rgclxmap,cpclxmap,wpclxmap, pjclxmap, lnclxmap, wt);
+//				setWtTotalNum(state[1], rgfdjmap,cpfdjmap,wpfdjmap, pjfdjmap, lnfdjmap, wt);
+//				setWtTotalNum(state[2], rgkzysmap,cpkzysmap,wpkzysmap, pjkzysmap, lnkzysmap, wt);
+//				setWtTotalNum(state[3], rgjcxtmap,cpjcxtmap,wpjcxtmap, pjjcxtmap, lnjcxtmap, wt);
+//				setWtTotalNum(state[4], rgmap,cpmap,wpmap, pjmap, lnmap, wt);
+//			}
+//
+//		}
+//
+//		} catch (Exception e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		threadPoolTaskData = null;
+//
+//		return result;
+//
+//	}
+//
+//	private int[] checkWtState(String wtId, Date now) throws Exception {
+//
+//		Map<String, ProBasicEquipmentPoint> wtpAimap = CacheContext.wtpAimap.get(wtId);
+//		int[] state = new int[5];
+////        /**
+////         * 检查部件健康情况
+////         */
+////        List<Double> ls = new ArrayList<Double>();
+//
+//
+//		ModuleVo clxvo = ms.checkPartState(wtId, "up82_part_clx", "up82_type_clx", "up82_weight_clx", "up82_clx_rules", "up82_condition_lsd", "up82_params_lsd1", "up82_params_lsd2", "up82_params_lsd3", "up82_params_lsd4", now);
+//		ModuleVo fdjvo = ms.checkPartState(wtId, "up82_part_fdj", "up82_type_fdj", "up82_weight_fdj", "up82_fdj_rules", "up82_condition_lsd", "up82_params_lsd1", "up82_params_lsd2", "up82_params_lsd3", "up82_params_lsd4", now);
+//		ModuleVo kzysvo = ms.checkPartState(wtId, "up82_part_kzys", "up82_type_kzys", "up82_weight_kzys", "up82_kzys_rules", "up82_condition_lsd", "up82_params_lsd1", "up82_params_lsd2", "up82_params_lsd3", "up82_params_lsd4", now);
+//		ModuleVo jcxtvo = ms.checkPartState(wtId, "up82_part_jcxt", "up82_type_jcxt", "up82_weight_jcxt", "up82_jcxt_rules", "up82_condition_lsd", "up82_params_lsd1", "up82_params_lsd2", "up82_params_lsd3", "up82_params_lsd4", now);
+//
+//		state[0] = clxvo.getModuleState();
+//		state[1] = fdjvo.getModuleState();
+//		state[2] = kzysvo.getModuleState();
+//		state[3] = jcxtvo.getModuleState();
+//		double wtscore=100.0;
+//
+//		if(state[0]==0 || state[1]==0 || state[2]==0 || state[3]==0)
+//		{
+//			state[4]=0;
+//
+//			wtscore= getStateValue(state[4]);
+//		}else if(state[0]==4 || state[1]==4 || state[2]==4 || state[3]==4)
+//		{
+//			state[4]=4;
+//
+//			wtscore= getStateValue(state[4]);
+//		}else if(state[0]==3 || state[1]==3 || state[2]==3 || state[3]==3)
+//		{
+//			state[4]=3;
+//
+//
+//			wtscore= getStateValue(state[4]);
+//		}else if(state[0]==2 || state[1]==2 || state[2]==2 || state[3]==2)
+//		{
+//			state[4]=2;
+//
+//			wtscore= getStateValue(state[4]);
+//		}else if(state[0]==1 || state[1]==1 || state[2]==1 || state[3]==1)
+//		{
+//
+//
+//			String[] up82_weight_jzxn = env.getProperty("up82_weight_jzxn").split(",");
+//			double[] drr = new double[jzxnnum];
+//			for (int i = 0; i < up82_weight_jzxn.length; i++) {
+//				drr[i] = Double.valueOf(up82_weight_jzxn[i]);
+//			}
+//			double cwarr[][] = new double[1][coment_bit];
+//			cwarr[0] = drr;
+//
+//			double msarr[][] = new double[point_bit][coment_bit];
+//
+//			double[] clxrr = new double[clxvo.getModuleResult().size()];
+//			double[] fdjrr = new double[fdjvo.getModuleResult().size()];
+//			double[] kzysrr = new double[kzysvo.getModuleResult().size()];
+//			double[] jcxtrr = new double[jcxtvo.getModuleResult().size()];
+//
+//			for (int i = 0; i < clxrr.length; i++) {
+//				clxrr[i] = clxvo.getModuleResult().get(i);
+//				fdjrr[i] = fdjvo.getModuleResult().get(i);
+//				kzysrr[i] = kzysvo.getModuleResult().get(i);
+//				jcxtrr[i] = jcxtvo.getModuleResult().get(i);
+//			}
+//			msarr[0] = clxrr;
+//			msarr[1] = fdjrr;
+//			msarr[2] = kzysrr;
+//			msarr[3] = jcxtrr;
+//
+//			MatrixCalculation mc = new MatrixCalculation();
+//
+//			RealMatrix matrix1 = mc.createMatrix(cwarr);
+//			RealMatrix matrix2 = mc.createMatrix(msarr);
+//
+//			RealMatrix rmresult = matrix1.multiply(matrix2);
+//
+//
+//			double value = rmresult.getEntry(0, 0);
+//			state[4] = 1;
+//			for (int i = 0; i < rmresult.getColumnDimension(); i++) {
+//				//double temp = rmresult.getEntry(0, i);
+//				double temp = rmresult.getEntry(0, i)<1?rmresult.getEntry(0, i):1;
+//				if (temp > value) {
+//					value = temp;
+//					state[4] = i + 1;
+//				}
+//
+//			}
+//
+//			wtscore= getStateValue(state[4]);
+//
+//
+//		}
+//
+//		if(CacheContext.wtpAimap.containsKey(wtId))
+//		{
+//			Map<String, ProBasicEquipmentPoint> pointmap = CacheContext.wtpAimap.get(wtId);
+//			ProBasicEquipmentPoint point= pointmap.get(ContantXk.MXZT);
+//			Double zt = ednaApiUtil.getRealData(point).getPointValueInDouble();
+//
+//			if(zt.equals(StatusDetailValue.GZ.getCode()) || zt.equals(StatusDetailValue.JX.getCode()))
+//			{
+//
+//
+//				state[4]=4;
+//				wtscore= getStateValue(state[4]);
+//
+//				if(clxvo.getModuleState()==1 && fdjvo.getModuleState()==1  &&
+//						kzysvo.getModuleState()==1  && jcxtvo.getModuleState()==1)
+//				{
+//					int clxstate= RandomUtils.nextInt(2, 4);
+//					int fdjstate=RandomUtils.nextInt(2, 4);
+//					int kzysstate=RandomUtils.nextInt(2, 4);
+//					int jcstate=RandomUtils.nextInt(2, 4);
+//
+//					clxvo.setModuleState(clxstate);
+//					fdjvo.setModuleState(fdjstate);
+//					kzysvo.setModuleState(kzysstate);
+//					jcxtvo.setModuleState(jcstate);
+//
+//				}
+//
+//			}
+//		}
+//
+//
+//		/**
+//		 * 齿轮箱 发电机 控制因素 机舱系统 机组性能
+//		 */
+//		String up82_part_state_clx = env.getProperty("up82_part_state_clx");
+//		String up82_part_state_fdj = env.getProperty("up82_part_state_fdj");
+//		String up82_part_state_kzys = env.getProperty("up82_part_state_kzys");
+//		String up82_part_state_jcxt = env.getProperty("up82_part_state_jcxt");
+//		String up82_part_state_fj = env.getProperty("up82_part_state_fj");
+//
+//		String up82_part_state_clx_value = env.getProperty("up82_part_state_clx_value");
+//		String up82_part_state_fdj_value = env.getProperty("up82_part_state_fdj_value");
+//		String up82_part_state_kzys_value = env.getProperty("up82_part_state_kzys_value");
+//		String up82_part_state_jcxt_value = env.getProperty("up82_part_state_jcxt_value");
+//		String up82_part_state_fj_value = env.getProperty("up82_part_state_fj_value");
+//
+//		insertWtPoint(now, clxvo.getModuleState(), wtpAimap, up82_part_state_clx);
+//		insertWtPoint(now, fdjvo.getModuleState(), wtpAimap, up82_part_state_fdj);
+//		insertWtPoint(now, kzysvo.getModuleState(), wtpAimap, up82_part_state_kzys);
+//		insertWtPoint(now, jcxtvo.getModuleState(), wtpAimap, up82_part_state_jcxt);
+//		insertWtPoint(now, state[4], wtpAimap, up82_part_state_fj);
+//
+//		insertWtPoint(now, getStateValue(clxvo.getModuleState()), wtpAimap, up82_part_state_clx_value);
+//		insertWtPoint(now, getStateValue(fdjvo.getModuleState()), wtpAimap, up82_part_state_fdj_value);
+//		insertWtPoint(now, getStateValue(kzysvo.getModuleState()), wtpAimap, up82_part_state_kzys_value);
+//		insertWtPoint(now, getStateValue(jcxtvo.getModuleState()), wtpAimap, up82_part_state_jcxt_value);
+//		//insertWtPoint(now, getStateValue(ls), wtpAimap, up82_part_state_fj_value);
+//		insertWtPoint(now, wtscore, wtpAimap, up82_part_state_fj_value);
+//		return state;
+//	}
+//
+//	private void insertWtPoint(Date now, double value, Map<String, ProBasicEquipmentPoint> wtpAimap, String up82_part_state_clx) throws Exception {
+//
+//		try{
+//			if (wtpAimap.containsKey(up82_part_state_clx)) {
+//				ProBasicEquipmentPoint ai = wtpAimap.get(up82_part_state_clx);
+//				PointData point = new PointData();
+//				point.setEdnaId(ai.getNemCode());
+////                if(value==0)
+////                {
+////                    value=1;
+////                }
+//				point.setPointValueInDouble(value);
+//				point.setPointTime(new BigDecimal(now.getTime()).divide(new BigDecimal(1000), 0, RoundingMode.HALF_EVEN).longValue());
+//				ednaApiUtil.sendSinglePoint(point);
+//			}
+//		}
+//		catch (Exception e)
+//		{
+//			System.out.println(e.getMessage());
+//		}
+//	}
+//
+//	private void insertWpPoint(Date now, double value, Map<String, ProBasicPowerstationPoint> wpmap, String unicode) throws Exception {
+//		if (wpmap!=null && unicode!=null && wpmap.containsKey(unicode)) {
+//			ProBasicPowerstationPoint ai = wpmap.get(unicode);
+//			PointData point = new PointData();
+//			point.setEdnaId(ai.getNemCode());
+////            if(value==0)
+////            {
+////                value=1;
+////            }
+//			point.setPointValueInDouble(value);
+//			point.setPointTime(new BigDecimal(now.getTime()).divide(new BigDecimal(1000), 0, RoundingMode.HALF_EVEN).longValue());
+//			ednaApiUtil.sendSinglePoint(point);
+//		}
+//	}
+//
+//	private double getStateValue(int state) {
+//
+//		if(state==0)
+//		{
+//			return 0.0;
+//
+//		}else if(state==1)
+//		{
+//			return RandomUtils.nextDouble(75.0, 95.0);
+//
+//		}else   if(state==2)
+//		{
+//			return RandomUtils.nextDouble(50.0, 74.99);
+//		}else   if(state==3)
+//		{
+//			return  RandomUtils.nextDouble(25.0, 49.99);
+//		}else   if(state==4)
+//		{
+//			return RandomUtils.nextDouble(0.0, 24.99);
+//		}
+//
+//		return 0.0;
+//	}
+//
+//	private void setWtTotalNum(int type, Map<String, Map<String, Integer>> rgmap,Map<String, Map<String, Integer>> cpmap,Map<String, Map<String, Integer>> wpmap, Map<String, Map<String, Integer>> pjmap, Map<String, Map<String, Integer>> lnmap, ProBasicEquipment wt) {
+//		switch (type) {
+//			case 1:
+////                totalRgStateNum(rgmap, wt, "1");
+////                totalCpStateNum(cpmap, wt, "1");
+//				totalWpStateNum(wpmap, wt, "1");
+//				totalPjStateNum(pjmap, wt, "1");
+//				totalLnStateNum(lnmap, wt, "1");
+//				break;
+//			case 2:
+////                totalRgStateNum(rgmap, wt, "2");
+////                totalCpStateNum(cpmap, wt, "2");
+//				totalWpStateNum(wpmap, wt, "2");
+//				totalPjStateNum(pjmap, wt, "2");
+//				totalLnStateNum(lnmap, wt, "2");
+//				break;
+//			case 3:
+////                totalRgStateNum(rgmap, wt, "3");
+////                totalCpStateNum(cpmap, wt, "3");
+//				totalWpStateNum(wpmap, wt, "3");
+//				totalPjStateNum(pjmap, wt, "3");
+//				totalLnStateNum(lnmap, wt, "3");
+//				break;
+//			case 4:
+////				totalRgStateNum(rgmap, wt, "4");
+////				totalCpStateNum(cpmap, wt, "4");
+//				totalWpStateNum(wpmap, wt, "4");
+//				totalPjStateNum(pjmap, wt, "4");
+//				totalLnStateNum(lnmap, wt, "4");
+//				break;
+//			default:
+//				break;
+//		}
+//	}
+//
+//	private void totalWpStateNum(Map<String, Map<String, Integer>> wpmap, ProBasicEquipment wt, String type) {
+//		if (wpmap.containsKey(wt.getWindpowerstationId())) {
+//			Map<String, Integer> map = wpmap.get(wt.getWindpowerstationId());
+//			if (map.containsKey(type)) {
+//				int temp = map.get(type);
+//				temp++;
+//				map.put(type, temp);
+//			} else {
+//				map.put(type, 1);
+//			}
+//
+//			wpmap.put(wt.getWindpowerstationId(), map);
+//		} else {
+//			Map<String, Integer> map = new HashMap<String, Integer>();
+//			map.put(type, 1);
+//			wpmap.put(wt.getWindpowerstationId(), map);
+//		}
+//	}
+//
+//	private void totalPjStateNum(Map<String, Map<String, Integer>> pjmap, ProBasicEquipment wt, String type) {
+//		if (pjmap.containsKey(wt.getProjectId())) {
+//			Map<String, Integer> map = pjmap.get(wt.getProjectId());
+//			if (map.containsKey(type)) {
+//				int temp = map.get(type);
+//				temp++;
+//				map.put(type, temp);
+//			} else {
+//				map.put(type, 1);
+//			}
+//			pjmap.put(wt.getProjectId(), map);
+//		} else {
+//			Map<String, Integer> map = new HashMap<String, Integer>();
+//			map.put(type, 1);
+//			pjmap.put(wt.getProjectId(), map);
+//		}
+//	}
+//
+//	private void totalLnStateNum(Map<String, Map<String, Integer>> lnmap, ProBasicEquipment wt, String type) {
+//		if (lnmap.containsKey(wt.getLineId())) {
+//			Map<String, Integer> map = lnmap.get(wt.getLineId());
+//			if (map.containsKey(type)) {
+//				int temp = map.get(type);
+//				temp++;
+//				map.put(type, temp);
+//			} else {
+//				map.put(type, 1);
+//			}
+//			lnmap.put(wt.getLineId(), map);
+//		} else {
+//			Map<String, Integer> map = new HashMap<String, Integer>();
+//			map.put(type, 1);
+//			lnmap.put(wt.getLineId(), map);
+//		}
+//	}
+//}

realtime/datatraining-server/src/main/java/com/gyee/datatraining/util/dd/ModuleState.java

@@ -167,9 +167,9 @@ public class ModuleState {
 //				result.add(0.0);
 //				result.add(1.0);
 //			}
-            System.out.println("状态判定正常完成！");
+//            System.out.println("状态判定正常完成！");
         }else{
-           System.out.println("loadDataVc读取数据异常！");
+//           System.out.println("loadDataVc读取数据异常！");
             state=0;
             result=new ArrayList<Double>();
             result.add(0.0);
@@ -245,9 +245,9 @@ public class ModuleState {
         ModuleVo vo = getModuleValue(wtIdls, code, typels, cwdls, rules, msvo,now);
 
         if (StringUtils.notEmp(vo)) {
-            logger.info("状态值" + vo.getModuleState());
-
-            logger.info("结果值是：" );
+//            logger.info("状态值" + vo.getModuleState());
+//
+//            logger.info("结果值是：" );
 
             StringBuilder sb=new StringBuilder();
             for(int i=0;i<vo.getModuleResult().size();i++)
@@ -259,7 +259,7 @@ public class ModuleState {
                     sb.append(StringUtils.round(vo.getModuleResult().get(i), digits)).append(",");
                 }
             }
-            logger.info(String.valueOf(sb));
+//            logger.info(String.valueOf(sb));
         }
 
         return vo;

realtime/datatraining-server/src/main/resources/application-jn.yml

@@ -1,8 +1,8 @@
 # 项目相关配置
 gyee:
   #实时数据库Url
-  baseurl: http://10.81.3.155:8011/ts
-  healthurl: http://10.81.3.155:8011/ts
+  baseurl: http://10.81.3.160:8011/ts
+  healthurl: http://10.81.3.160:8011/ts
   #实时数据库选择
   realtimedataBase: mongodb #数据查询模式 golden、hwy
   initialcode: INITIAL
@@ -75,7 +75,7 @@ logging:
     com.example: debug
 
 edos:
-  baseURL: http://10.0.118.155:8011/ts
+  baseURL: http://10.0.118.152:8098/ts
 
 
 

realtime/datatraining-server/src/main/resources/xxl-job-executor.properties

@@ -5,12 +5,12 @@ xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
 xxl.job.accessToken=
 
 ### xxl-job executor appname
-xxl.job.executor.appname=datatraining-job
+xxl.job.executor.appname=datatraining-job-new
 ### xxl-job executor registry-address: default use address to registry , otherwise use ip:port if address is null
 xxl.job.executor.address=
 ### xxl-job executor server-info
 xxl.job.executor.ip=
-xxl.job.executor.port=9111
+xxl.job.executor.port=9117
 ### xxl-job executor log-path
 xxl.job.executor.logpath=d:\\jobs\\datatraining-job
 ### xxl-job executor log-retention-days