Merge remote-tracking branch 'origin/master'

# Conflicts:
#	wrdep-biz/src/main/java/com/jiayue/biz/service/impl/EmailImpl.java

wrdep-biz/src/main/java/com/jiayue/biz/service/impl/EmailImpl.java

@@ -506,7 +506,7 @@ public class EmailImpl extends ServiceImpl<EmailMapper, Email> implements EmailS
                                 log.error("该测风塔没有配置密码");
                             } else {
                                 String password = w.getPassword();
-                                String cmd = "\"D:\\NRG\\SymDR\\SDR.exe\"" + " /z " + password + " " + f.getPath();
+                                String cmd = "\"C:\\NRG\\SymDR\\SDR.exe\"" + " /z " + password + " " + f.getPath();
                                 Process ipconfig = runtime.exec(cmd);
                                 ipconfig.waitFor();
                                 InputStream inputStream = ipconfig.getInputStream();
@@ -539,7 +539,7 @@ public class EmailImpl extends ServiceImpl<EmailMapper, Email> implements EmailS
                     String[] id = f.getName().split("_");
                     //根据编号过滤
                     List<WindTowerInfo> windTowerInfoList = windTowerInfoService.getByEquipmentNo(id[0]);
-                    windTowerInfoType(id[0],windTowerInfoList);
+                    windTowerInfoType(id[0], windTowerInfoList);
                     //如果有   有可能会有编号相同 但是记录仪编号不同的情况 不解析看不到记录仪编号 所以只能用相同编号的测风塔密码解析
                     //如果是从邮件里读到的塔新增的话是没有数据密码的 所以需要人为的手动配置密码
                     for (WindTowerInfo w : windTowerInfoList) {
@@ -548,7 +548,7 @@ public class EmailImpl extends ServiceImpl<EmailMapper, Email> implements EmailS
                                 log.error(w.getEquipmentNo() + "测风塔没有配置数据密码");
                             } else {
                                 String[] s = new String[]{
-                                        "\"D:\\Program Files (x86)\\Renewable NRG Systems\\SymPRO Desktop\\SymPRODesktop.exe\"",
+                                        "\"C:\\Program Files (x86)\\Renewable NRG Systems\\SymPRO Desktop\\SymPRODesktop.exe\"",
                                         "/cmd", "convert", "/file", f.getPath(),
                                         "/pass", w.getPassword(), "/type", "\"meas\"", "/outputdir", "\"D:\\out\\new\""
                                 };

wrdep-biz/src/main/resources/application-prod.yml

@@ -19,9 +19,9 @@ spring:
       primary: mysql #设置默认的数据源或者数据源组,默认值即为master
       datasource:
         mysql:
-          url: jdbc:mysql://localhost:3306/wrdep_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://127.0.0.1:3306/wrdep_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: '!QAZ2root'
+          password: 'eDYlNXLZGDz0ovpg'
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.alibaba.druid.pool.DruidDataSource
           druid:
@@ -66,9 +66,8 @@ spring:
                 config:
                   multi-statement-allow: true
         tdengine:
-          url: jdbc:TAOS://localhost:6030/nerp_db
+          url: jdbc:TAOS://127.0.0.1:6030/nerp_db
           username: root
-          #          password: 123456
           password: "!QAZ2root"
           driver-class-name: com.taosdata.jdbc.TSDBDriver
           type: com.alibaba.druid.pool.DruidDataSource
@@ -84,7 +83,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    password: jiayue
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:

wrdep-ui/src/views/largeScreenPage/components/wdPowerCharts.vue

@@ -100,14 +100,7 @@ export default {
         } else {
           height = this.config.number[0]
         }
-        let xiangmu2WindTower = "202101034,202101047,202101055,202301008,202301016,202101029,202101009"
-        if(xiangmu2WindTower.includes( cftNo)){
-          if(Number(height)>130){
-            height="130";
-          }
-        }
-        console.log("====================")
-        console.log(height)
+
         getRoseChats({equipmentId: cftNo, height: height, month: month}).then(res => {
           // console.log(res.data)
           let windPowerEchartsData = res.data.windPowerEchars