sftp相关字段调整

cpp-admin/src/main/java/com/cpp/web/domain/station/ElectricField.java

@@ -72,7 +72,7 @@ public class ElectricField extends BaseCppEntity {
      */
     @ApiModelProperty(value = "ftp通道id")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private Long ftpChanelId;
+    private Long sftpChanelId;
 
 
 
@@ -81,5 +81,13 @@ public class ElectricField extends BaseCppEntity {
      */
 //    @Enumerated(EnumType.STRING)
     @ApiModelProperty(value = "ftp扫描路径")
-    private String ftpUrl;
+    private String sftpUrl;
+
+
+    /**
+     * ftp备份路径
+     */
+//    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "ftp备份路径")
+    private String sftpBackupUrl;
 }

cpp-admin/src/main/java/com/cpp/web/service/datafactory/SftpFileParsing.java

@@ -83,7 +83,7 @@ public class SftpFileParsing {
             List<ElectricField> electricFields = electricFieldService.list();
             for (SftpChannel channel : channels) {
 
-                List<ElectricField> channelElectricFields = electricFields.stream().filter(e -> e.getFtpChanelId() != null && e.getFtpChanelId().equals(channel.getId())).collect(Collectors.toList());
+                List<ElectricField> channelElectricFields = electricFields.stream().filter(e -> e.getSftpChanelId() != null && e.getSftpChanelId().equals(channel.getId())).collect(Collectors.toList());
 
                 if (channelElectricFields.size() > 0) {
                     executeSftpParsing(channel, parsingTypes, electricFields);
@@ -115,7 +115,7 @@ public class SftpFileParsing {
             parsingInterface.activationParsingConf();//初始化解析配置
             for (ElectricField electricField : channelElectricFields) {
 
-                String ftpUrl = electricField.getFtpUrl();
+                String ftpUrl = electricField.getSftpUrl();
                 List<String> fileNames = sftp.ls(ftpUrl).stream().filter(f -> f.contains(parsingType.getFileName())).collect(Collectors.toList());
                 if (fileNames.size() > 0) {
                     for (String fileName : fileNames) {

cpp-ui/src/views/abnormalAlarm/index.vue

@@ -58,6 +58,7 @@
         class="mytable-style"
         auto-resize
         border
+        height="770px"
         resizable
         export-config
         highlight-current-row
@@ -123,7 +124,7 @@ export default {
       dateTime: [new Date(new Date().toLocaleDateString()).getTime(), new Date(new Date().toLocaleDateString()).getTime() + 60 * 60 * 24 * 1000 - 5 * 1000 * 60],
       total: 0,
       sortOrder: 'asc',
-      pageSize: 10,
+      pageSize: 15,
       currentPage: 1,
       stationList: [],
       stationCode: [],

cpp-ui/src/views/cloudDataQuery/index.vue

@@ -49,6 +49,7 @@
             auto-resize
             border
             resizable
+            height="770px"
             highlight-current-row
             show-overflow
             :data="tableData.slice((currentPage-1)*pageSize,currentPage*pageSize)"
@@ -67,14 +68,14 @@
             :current-page.sync="currentPage"
             :page-size.sync="pageSize"
             :total="total"
-            :page-sizes=[10,50,100]
+            :page-sizes=[15,50,100]
             :layouts="['PrevJump', 'PrevPage','JumpNumber', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']"
             @page-change="handlePageChange"
           >
           </vxe-pager>
         </el-tab-pane>
         <el-tab-pane label="图表" name="second">
-          <div v-loading="loading" style="float:left;width: 95%;height: 550px" id="zhxCharts"></div>
+          <div v-loading="loading" style="float:left;width: 100%;height:  800px" id="zhxCharts"></div>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -95,7 +96,7 @@ export default {
       dateTime: [new Date(new Date().toLocaleDateString()).getTime(), new Date(new Date().toLocaleDateString()).getTime() + (60 * 60 * 24 * 1000) - 1],
       total: 0,
       sortOrder: 'asc',
-      pageSize: 10,
+      pageSize: 15,
       currentPage: 1,
       stationList: [],
       stationCode: [],
@@ -745,10 +746,10 @@ export default {
 
         this.fromHead.forEach((item) => {
 
-          if(item.field != 'time'){
+          if (item.field != 'time') {
             zhMap[item.title] = []
           }
-          if (item.field == 'wsHubHeight'){
+          if (item.field == 'wsHubHeight') {
             stationType = 'E2'
           }
         });
@@ -757,9 +758,9 @@ export default {
         let timeList = []
         this.tableData.forEach((item) => {
           this.fromHead.forEach((item1) => {
-            if(item1.title != '时间'){
+            if (item1.title != '时间') {
               zhMap[item1.title].push(item[item1.field])
-            }else {
+            } else {
               timeList.push(item[item1.field])
             }
           });
@@ -946,15 +947,11 @@ export default {
     },
     points() {
       let points = []
-      if (this.forecastType == 'dq') {
-        for (let i = 1; i < 11; i++) {
-          points.push({label: i + "", value: i})
-        }
-      } else {
-        for (let i = 1; i < 17; i++) {
-          points.push({label: i + "", value: i})
-        }
+
+      for (let i = 1; i < 11; i++) {
+        points.push({label: i + "", value: i})
       }
+
       return points
     }
   },

cpp-ui/src/views/configManager/electricField/index.vue

@@ -80,6 +80,7 @@
         <vxe-table-column field="provinceEnum" title="省份" :formatter="provinceEnumFormat"></vxe-table-column>
         <vxe-table-column field="ftpChanelId" title="ftpt通道名称" :formatter="ftpChanelIdFormat"></vxe-table-column>
         <vxe-table-column field="ftpUrl" title="ftp扫描路径"></vxe-table-column>
+        <vxe-table-column field="ftpBackupUrl" title="ftp备份路径"></vxe-table-column>
       </vxe-table>
       <vxe-pager
         background
@@ -154,7 +155,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="ftp通道名称">
-                <el-select v-model="form.ftpChanelId" placeholder="请选择" style="width: 100%" clearable
+                <el-select v-model="form.sftpChanelId" placeholder="请选择" style="width: 100%" clearable
                            @change="ftpChannelChange" popper-class="cpp-popper">
                   <el-option
                     v-for="item in this.sftpChannelList"
@@ -168,11 +169,20 @@
           </el-row>
           <el-row class="mb4">
             <el-col :span="24">
-              <el-form-item label="ftp扫描路径">
-                <el-input style="width: 100%" v-model="form.ftpUrl" maxlength="50"/>
+              <el-form-item label="sftp扫描路径">
+                <el-input style="width: 100%" v-model="form.sftpUrl" maxlength="50"/>
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row class="mb4">
+            <el-col :span="24">
+              <el-form-item label="sftp备份路径">
+                <el-input style="width: 100%" v-model="form.sftpBackupUrl" maxlength="50"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="commitChannel">确 定</el-button>
@@ -199,8 +209,9 @@ export default {
         longitude: '',
         latitude: '',
         provinceEnum: '',
-        ftpChanelId: '',
-        ftpUrl: '',
+        sftpChanelId: '',
+        sftpUrl: '',
+        sftpBackupUrl: ''
       },
       title: "",
       // 是否显示弹出层

cpp-ui/src/views/statistics/stationAccuracy/index.vue

@@ -127,10 +127,6 @@ export default {
         {
           label: "单点偏差率累加(cap*%)",
           field: "deviationSum"
-        },
-        {
-          label: "提前多久预测",
-          field: "forecastHowLongAgo"
         }
       ],
       pcChart: null,
@@ -254,7 +250,7 @@ export default {
         this.tableData.forEach(t => {
           times.push(t.time)
           zqlDatas.push(t.accuracy.replace("%", ""))
-          pcDatas.push(t.deviationSum)
+          pcDatas.push(t.deviationSum.replace("%", ""))
         })
 
         this.pcDraw(times, pcDatas)