Selaa lähdekoodia

转速不再作为单独测点

wzl 6 kuukautta sitten
vanhempi
commit
139b4c66eb

+ 3 - 0
src/main/java/com/dskj/znzn/transData/web/waveData/entity/WaveData.java

@@ -31,6 +31,9 @@ public class WaveData implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date timeStamp;
 
+    @ApiModelProperty("转速")
+    private Float rotationalSpeed;
+
     @ApiModelProperty("分析频率")
     private String samplingFrequency;
 

+ 2 - 1
src/main/java/com/dskj/znzn/transData/web/waveData/service/impl/WaveDataServiceImpl.java

@@ -22,7 +22,8 @@ public class WaveDataServiceImpl extends ServiceImpl<WaveDataMapper, WaveData> i
         if (inData.getWindCode().contains(" ")) {
             throw new BusinessException("风场参数异常");
         } else {
-            return this.waveDataMapper.getMesureData(inData.getWindCode() + "_wave", inData.getWindTurbineNumberList(), inData.getStartTime(), inData.getEndTime(), inData.getMesureNameList());
+            return this.waveDataMapper.getMesureData(inData.getWindCode() + "_wave",
+                    inData.getWindTurbineNumberList(), inData.getStartTime(), inData.getEndTime(), inData.getMesureNameList());
         }
     }
 

+ 0 - 7
src/main/resources/application-dev.yml

@@ -23,12 +23,5 @@ spring:
     database: 1
 
 
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-token:
-  secretKey: nflafam/sndbuoe;0f34i20jrte;t0osnfs.nls
-
 logging:
   config: classpath:logback-dev.xml

+ 0 - 8
src/main/resources/application-prod.yml

@@ -12,14 +12,6 @@ knife4j:
     password: znzn_prod
 
 
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-token:
-  secretKey: jdj29lke8092-34204wdfnih8723309l;l;lf;wrwhgiq2nkhyisndfoupern
-
-
 spring:
   datasource:
     url: jdbc:mysql://192.168.50.235:30306/energy_data_prod?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useSSL=false

+ 5 - 0
src/main/resources/application.yml

@@ -26,3 +26,8 @@ spring:
       validation-query: SELECT 'x'
 
 
+
+logging:
+  level:
+    com.dskj.znzn.transData.web.transConf.mapper: debug
+    com.dskj.znzn.transData.web.waveData.mapper: debug