xsadasdsa

ipfcst/ipfcst-console/src/main/resources/application.yml

@@ -25,7 +25,7 @@ spring:
       # 数据源配置
       username: root
       password: '!QAZ2root'
-      url: jdbc:mysql://192.168.1.205:3306/ipfcst-znzx2?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://localhost:3306/ipfcst-znzx2?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
       driver-class-name: com.mysql.cj.jdbc.Driver
       # 初始化 最小 最大
       initial-size: 10

ipfcst/ipfcst-reportquery/src/main/frontend/main.js

@@ -206,7 +206,7 @@ Vue.prototype.$axios.interceptors.response.use(
     } else {
       const res = response.data
       // if the custom code is not 20000, it is judged as an error.
-      console.log(res.code)
+
       if (res.code !== 0) {
         Message({
           message: res.message || 'Error',

ipfcst/ipfcst-reportquery/src/main/frontend/views/datav/bottomEcharts.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-  <el-select v-model="efiType" placeholder="请选择类型" @change="changeStationCode">
+  <el-select v-model="efiType" placeholder="请选择类型" @change="getCompositeData">
     <el-option
       v-for="item in efiTypeList"
       :key="item.value"
@@ -215,7 +215,7 @@ export default {
         })
     },
     getCompositeData() {
-        this.$axios.get('/dashboard/getCompositeData').then(res => {
+        this.$axios.get('/dashboard/getCompositeData/'+ this.efiType).then(res => {
           if (res.data.displayKyLl === '1') {
             this.option.legend.data = ['超短期预测功率', '短期预测功率', '实际功率', '可用功率', '理论功率']
             this.option.color = [cc.cdq, cc.dq, cc.sj, cc.kygl, cc.llgl]

ipfcst/ipfcst-reportquery/src/main/frontend/views/datav/index.vue

@@ -643,15 +643,15 @@
       openDraw() {
         this.drawer = true
       },
-      // openQrcodeDrawer() {
-      //   this.qrcodeDrawer = true
-      //   this.qrtimer = new Date().getTime()
-      //   this.url = ''
-      // },
-      // colseQrcode() {
-      //   this.qrcodeDrawer = false
-      //   this.url = '/aboutus.png'
-      // },
+      openQrcodeDrawer() {
+        this.qrcodeDrawer = true
+        this.qrtimer = new Date().getTime()
+        this.url = ''
+      },
+      colseQrcode() {
+        this.qrcodeDrawer = false
+        this.url = '/aboutus.png'
+      },
       summaryAudioClick() {
         const that = this
         if (that.summaryAudioStatus == 'pause') {

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/DashboardService.java

@@ -424,7 +424,7 @@ public class DashboardService extends BaseService {
 //    analysisList.add(nwpAnalysisDto);
 
     // 短期一期
-    List<FileAnalysisRecord> dqList1 = fileAnalysisRecordList.stream().filter(w -> "DQ1".equals(w.getFileType())).collect(Collectors.toList());
+    List<FileAnalysisRecord> dqList1 = fileAnalysisRecordList.stream().filter(w -> "DQ".equals(w.getFileType())).collect(Collectors.toList());
     String dqStatus1 = "0";
     String dqTips1 = "";
     if (dqList1.size() > 0) {
@@ -436,13 +436,13 @@ public class DashboardService extends BaseService {
     }
 
     ChannelStatusDto dqAnalysisDto1 = new ChannelStatusDto();
-    dqAnalysisDto1.setChannelId("DQ1");
+    dqAnalysisDto1.setChannelId("DQ");
     dqAnalysisDto1.setChannelName("光伏短期文件");
     dqAnalysisDto1.setChannelStatus(dqStatus1);
     dqAnalysisDto1.setTips(dqTips1);
     analysisList.add(dqAnalysisDto1);
     // NWP一期
-    List<FileAnalysisRecord> nwpList1 = fileAnalysisRecordList.stream().filter(w -> "NWP1".equals(w.getFileType())).collect(Collectors.toList());
+    List<FileAnalysisRecord> nwpList1 = fileAnalysisRecordList.stream().filter(w -> "NWP".equals(w.getFileType())).collect(Collectors.toList());
     String nwpStatus1 = "0";
     String nwpTips1 = "";
     if (nwpList1.size() > 0) {
@@ -453,14 +453,14 @@ public class DashboardService extends BaseService {
       nwpTips1 = "今日未解析过光伏NWP文件";
     }
     ChannelStatusDto nwpAnalysisDto1 = new ChannelStatusDto();
-    nwpAnalysisDto1.setChannelId("NWP1");
+    nwpAnalysisDto1.setChannelId("NWP");
     nwpAnalysisDto1.setChannelName("光伏NWP文件");
     nwpAnalysisDto1.setChannelStatus(nwpStatus1);
     nwpAnalysisDto1.setTips(nwpTips1);
     analysisList.add(nwpAnalysisDto1);
 
     // 短期二期
-    List<FileAnalysisRecord> dqList2 = fileAnalysisRecordList.stream().filter(w -> "DQ2".equals(w.getFileType())).collect(Collectors.toList());
+    List<FileAnalysisRecord> dqList2 = fileAnalysisRecordList.stream().filter(w -> "DQ1".equals(w.getFileType())).collect(Collectors.toList());
     String dqStatus2 = "0";
     String dqTips2 = "";
     if (dqList2.size() > 0) {
@@ -472,13 +472,13 @@ public class DashboardService extends BaseService {
     }
 
     ChannelStatusDto dqAnalysisDto2 = new ChannelStatusDto();
-    dqAnalysisDto2.setChannelId("DQ2");
+    dqAnalysisDto2.setChannelId("DQ1");
     dqAnalysisDto2.setChannelName("风电短期文件");
     dqAnalysisDto2.setChannelStatus(dqStatus2);
     dqAnalysisDto2.setTips(dqTips2);
     analysisList.add(dqAnalysisDto2);
     // NWP二期
-    List<FileAnalysisRecord> nwpList2 = fileAnalysisRecordList.stream().filter(w -> "NWP2".equals(w.getFileType())).collect(Collectors.toList());
+    List<FileAnalysisRecord> nwpList2 = fileAnalysisRecordList.stream().filter(w -> "NWP1".equals(w.getFileType())).collect(Collectors.toList());
     String nwpStatus2 = "0";
     String nwpTips2 = "";
     if (nwpList2.size() > 0) {
@@ -489,7 +489,7 @@ public class DashboardService extends BaseService {
       nwpTips2 = "今日未解析过风电NWP文件";
     }
     ChannelStatusDto nwpAnalysisDto2 = new ChannelStatusDto();
-    nwpAnalysisDto2.setChannelId("NWP2");
+    nwpAnalysisDto2.setChannelId("NWP1");
     nwpAnalysisDto2.setChannelName("风电NWP文件");
     nwpAnalysisDto2.setChannelStatus(nwpStatus2);
     nwpAnalysisDto2.setTips(nwpTips2);

ipfcst/ipfcst-reportquery/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
       # 数据源配置
       username: root
       password: '!QAZ2root'
-      url: jdbc:mysql://192.168.1.205:3306/ipfcst-znzx2?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://localhost:3306/ipfcst-znzx2?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
       driver-class-name: com.mysql.cj.jdbc.Driver
       # 初始化 最小 最大
       initial-size: 5