风速点表页面布局修改，查询条件修改

ipfcst/ipfcst-reportquery/src/main/frontend/views/parameterConfiguration/WindSpeedPointInfo/index.vue

@@ -54,20 +54,21 @@
                       size="small"
             ></el-input>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="3">
             所属行
             <el-input type="text"
                       v-model="belong"
                       placeholder="请输入所属行"
                       prefix-icon="el-icon-search"
                       clearable
-                      style="max-width: 180px;"
+                      style="max-width: 140px;"
                       size="small"
             ></el-input>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="5" >
             <el-button type="primary" size="small" :loading="loading" @click="findBySomeConditions">查询</el-button>
-            <el-button type="primary" size="small" @click="insertEvent">新增</el-button>
+            <el-button type="primary" size="small" :loading="loading" @click="clearInput">清空</el-button>
+            <el-button type="primary" size="small" :loading="loading" @click="insertEvent">新增</el-button>
             <el-upload
               ref="upload"
               name="file"
@@ -75,10 +76,12 @@
               class="link-block"
               action=""
               :show-file-list = false
+              :loading = loading
             >
-              <el-button size="small" type="primary" >导入</el-button>
+              <el-button size="small" type="primary" :loading="loading" style="margin:0 10px;">导入</el-button>
             </el-upload>
-            <el-button size="small" type="primary" @click="exportToExcel">导出</el-button>
+            <el-button size="small" type="primary" :loading="loading" @click="exportToExcel">导出</el-button>
+
           </el-col>
         </el-row>
       </div>
@@ -364,6 +367,13 @@ export default {
         this.tableData = res.data.content
         this.total = res.data.totalElements
       })
+    },
+    clearInput() {
+      this.fanNumber = ''
+      this.wind = ''
+      this.speed = ''
+      this.unitBelongs = ''
+      this.belong = ''
     }
   },
   mounted() {

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

@@ -1,5 +1,6 @@
 package com.jiayue.ipfcst.service;
 
+import cn.hutool.core.convert.Convert;
 import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.data.entity.FanUnitInfo;
 import com.jiayue.ipfcst.common.data.entity.WindSpeedPointInfo;
@@ -137,7 +138,7 @@ public class WindSpeedPointInfoService {
     Specification<WindSpeedPointInfo> specification = this.specificationBySomeConditions(nFanNumber, wind, speed, unitBelongs, belong);
     Pageable pageable = PageRequest.of(page - 1, size);
     Page<WindSpeedPointInfo> windSpeedPointInfos = windSpeedPointInfoRepository.findAll(specification, pageable);
-    return windSpeedPointInfos;
+     return windSpeedPointInfos;
   }
 
 
@@ -164,7 +165,7 @@ public class WindSpeedPointInfoService {
    * @param belong
    * @return
    */
-  Specification<WindSpeedPointInfo> specificationBySomeConditions(final String fanNumber,final String wind,
+  Specification<WindSpeedPointInfo>  specificationBySomeConditions(final String fanNumber,final String wind,
                                                                   final String speed, final String unitBelongs,
                                                                   final String belong) {
     return (Specification<WindSpeedPointInfo>) (root, criteriaQuery, cb) -> {
@@ -182,7 +183,7 @@ public class WindSpeedPointInfoService {
 
       // 风速查询
       if (!speed.equals("null")) {
-        predicates.add(cb.equal(root.get("speed"), speed));
+        predicates.add(cb.equal(root.get("speed"), Convert.toFloat(speed)));
       }
 
       // 所属机组