优化sql，驾驶舱

energy-manage-service/src/main/java/com/energy/manage/service/constant/client/skf/SkfClientConstants.java

@@ -5,7 +5,7 @@ package com.energy.manage.service.constant.client.skf;
  */
 public interface SkfClientConstants {
 
-    String SKF_REQUEST_PATH = "http://192.168.50.242:5000";
+    String SKF_REQUEST_PATH = "http://192.168.50.242:13050";
 
     String SKF_TOKEN_GRANT_TYPE = "password";
 

energy-manage-service/src/main/java/com/energy/manage/service/controller/system/SysTestController.java

@@ -72,6 +72,7 @@ public class SysTestController {
 	public void vibrationData() {
 
 //        vibrationService.extractSkfPointData();
+        log.info("233333");
 
         vibrationService.extracTwindGeneratorSkfPointData();
 

energy-manage-service/src/main/java/com/energy/manage/service/service/vibration/impl/VibrationServiceImpl.java

@@ -53,7 +53,7 @@ public class VibrationServiceImpl implements VibrationService {
 
     private final String dateFormatter = "MM-dd";
 
-    private String dynamicMeasurementsUrl = "http://192.168.50.242:5000/v1/points/{}/dynamicMeasurements";
+    private String dynamicMeasurementsUrl = "http://192.168.50.242:13050/v1/points/{}/dynamicMeasurements";
 
     private ZoneId shanghaiZone = ZoneId.of("Asia/Shanghai");
 
@@ -62,8 +62,8 @@ public class VibrationServiceImpl implements VibrationService {
     @Value("${skf.data.path}")
     private String skfDataPath;
 
-    //    @Value("${skf.data.condition}")
-    private String condition = "七台河数据2";
+    @Value("${skf.data.condition}")
+    private String condition;
 
     @Override
     public void extractSkfPointData() {
@@ -140,7 +140,7 @@ public class VibrationServiceImpl implements VibrationService {
                     continue;
                 }
                 // 是否包含当前风场
-                if (fieldHierarchyListVo.getName().contains("七台河数据2")) {
+//                if (fieldHierarchyListVo.getName().contains(this.condition)) {
                     //风机,特殊情况需要单独处理（风机到部件到具体测点有可能少一层部件）需要根据不同风场进行单独处理,风机直接获取测点id,跳过部件
                     engine:
                     for (HierarchyListVo engineHierarchyListVo : fieldHierarchyListVo.getChildren()) {
@@ -171,10 +171,9 @@ public class VibrationServiceImpl implements VibrationService {
                             dynamicMeasurementsConvertData(dynamicMeasurementsList, dataPath, fileNamePrefix);
                         }
 
-
                     }
 
-                }
+//                }
 
             }
             log.info(" >>> skf接口处理完毕 <<<");

energy-manage-service/src/main/java/com/energy/manage/service/task/SkfVibrationDataTask.java

@@ -31,7 +31,9 @@ public class SkfVibrationDataTask {
         // 获取昨天的时间
         String yesterdayDate = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern(dateTimeFormatter));
 
-        vibrationService.extractSkfPointData();
+        // vibrationService.extractSkfPointData();
+
+        vibrationService.extracTwindGeneratorSkfPointData();
 
         log.info(getCurrentDateTim() + "结束抽取skf测点数据 ");
     }

energy-manage-service/src/main/resources/application.properties

@@ -36,3 +36,7 @@ logging.level.com.energy.manage.service.mappers= debug
 #=============================banner配置=======================================
 #banner路径
 spring.banner.location=classpath:banner/banner.txt
+
+#=============================skf数据服务器地址配置=============================
+skf.data.path = /Users/shiyue/Downloads/skf_data
+skf.data.condition = 乾安风电场

energy-manage-service/src/main/resources/bootstrap.properties

@@ -3,9 +3,9 @@ spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
 spring.cloud.nacos.config.namespace = 79c42a7a-2c7d-4dcf-8a2c-b334271e2191
 spring.cloud.nacos.config.name=application.properties
 spring.cloud.nacos.config.group = @profiles.active@
-#spring.cloud.nacos.config.extension-configs[0].data-id=analysis_type_config.properties
-#spring.cloud.nacos.config.extension-configs[0].group=DEFAULT_GROUP
-#spring.cloud.nacos.config.extension-configs[0].refresh=true
+spring.cloud.nacos.config.extension-configs[0].data-id=analysis_type_config.properties
+spring.cloud.nacos.config.extension-configs[0].group=DEFAULT_GROUP
+spring.cloud.nacos.config.extension-configs[0].refresh=true
 
 
 #============================mybatis配置=========================================

energy-manage-service/src/test/java/client/SkfClientWebTest.java

@@ -194,4 +194,7 @@ public class SkfClientWebTest {
         }
     }
 
+
+
+
 }