现场调试更改：1.屏蔽删除塔时同时删除表 2.修复计算风向玫瑰图事数据未过滤-99 引起的数据异常，有小数 3.在测风塔下来选项添加模糊搜索

neim-biz/src/main/java/com/jiayue/biz/domain/WindTowerInfo.java

@@ -126,6 +126,6 @@ public class WindTowerInfo implements Serializable {
     /**
      *测风塔附属于
      */
-    private Date  createTime;
+    private String  createTime;
 
 }

neim-biz/src/main/java/com/jiayue/biz/service/impl/RealTimeDisplayServiceImpl.java

@@ -769,7 +769,9 @@ public class RealTimeDisplayServiceImpl implements RealTimeDisplayService {
         List<Map<String, Object>> list = new ArrayList<>();
         for (WindDirectionEnum value : WindDirectionEnum.values()) {
             Map<String, Object> map = new HashMap<>();
-            List<ProphaseAnemometryData> heightAndWindDirectionEnum = CalculationUtil.getForHeightAndWindDirectionEnum(prophaseAnemometryDataList, value);
+            List<ProphaseAnemometryData> heightAndWindDirectionOrg = CalculationUtil.getForHeightAndWindDirectionEnum(prophaseAnemometryDataList, value);
+            //过滤数据中的-99
+            List<ProphaseAnemometryData> heightAndWindDirectionEnum = heightAndWindDirectionOrg.stream().filter(p->p.getWsAve()!=-99 && p.getWsSta()!=-99).collect(Collectors.toList());
             //总风速
             double wsSum = heightAndWindDirectionEnum.stream().mapToDouble(ProphaseAnemometryData::getWsAve).sum();
             //总方差

neim-biz/src/main/java/com/jiayue/biz/service/impl/WindTowerCalculationDataServiceImpl.java

@@ -1959,27 +1959,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
             BigDecimal sum = BigDecimal.ZERO;
             BigDecimal avgShear = BigDecimal.ZERO;
             if (!windTowerCalculationDataList.isEmpty()) {
-//                //月平均风切变数据放入map返回，key为整- 小时:00
-//                long hour = 3600000L;
-//                Date systemDate = new Date();
-//                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
-//                //获取昨日开始和结束时间
-//                long startTime = DateMomentUtil.getDayStartTime(DateUtils.addDays(systemDate, -1).getTime());
-//                long endTime = startTime + 86399000;
-//                // 一个月或多个月数据 按照24小时分割
-//                for (long hourStr = startTime; hourStr <= endTime; hourStr += hour) {
-//                    Map<String, Object> tableMap = new TreeMap<>();
-//                    String finalTime = simpleDateFormat.format(hourStr);
-//                    List<BigDecimal> collect = windTowerCalculationDataList.stream().filter(w -> simpleDateFormat.format(w.getTime()).equals(finalTime) &&
-//                            w.getValue().compareTo(new BigDecimal(-99)) != 0).map(WindTowerCalculationData::getValue).collect(Collectors.toList());
-//                    BigDecimal avg = BigDecimal.ZERO;
-//                    if (!collect.isEmpty()) {
-//                        avg = collect.stream().reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(collect.size()), 4, RoundingMode.HALF_UP);
-//                    }
-//                    tableMap.put("time", finalTime + ":00");
-//                    tableMap.put("windShear", avg);
-//                    tableList.add(tableMap);
-//                }
 
                 for (WindTowerCalculationData windTowerCalculationData : windTowerCalculationDataList) {
                     Map<String, Object> tableMap = new TreeMap<>();

neim-biz/src/main/java/com/jiayue/biz/service/impl/WindTowerInfoServiceImpl.java

@@ -83,12 +83,12 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
      * @return
      */
     public boolean deleteWindTowerInfo(List<String> ids) {
-        for (String id : ids) {
+       /* for (String id : ids) {
             WindTowerInfo w = this.getById(id);
             baseMapper.deleteTable("wind_tower_data_child_table_" + w.getEquipmentNo());
             baseMapper.deleteCalculationTable("wind_tower_calculation_data_" + w.getEquipmentNo());
             baseMapper.deleteParentTable("wind_tower_data_parent_table_" + w.getEquipmentNo());
-        }
+        }*/
         return this.removeByIds(ids);
     }
 
@@ -172,7 +172,7 @@ public class WindTowerInfoServiceImpl extends ServiceImpl<WindTowerInfoMapper, W
         Map<String, String> map;
 
         SortListUtil<WindTowerInfo> sortList = new SortListUtil<WindTowerInfo>();
-        sortList.Sort(windTowerInfos, "getCreateTime", "a");
+        sortList.Sort(windTowerInfos, "getCreateTime", "desc");
         for (WindTowerInfo w : windTowerInfos) {
             map = new HashMap<>();
             map.put("value", w.getEquipmentNo());

neim-ui/src/views/dataManagement/analysisLog/index.vue

@@ -13,7 +13,7 @@
       </div>
       <div class="conditionTwo">
         <span>测风塔：</span>
-        <el-select v-model="cftId" placeholder="请选择">
+        <el-select v-model="cftId" filterable placeholder="请选择">
           <el-option
             v-for="item in startDateAndEndDate"
             :key="item.value"

neim-ui/src/views/dataManagement/dataIntegrity/index.vue

@@ -3,7 +3,7 @@
     <div class="seachCondition">
       <div class="conditionOne">
         <span>测风塔：</span>
-        <el-select v-model="cftId" placeholder="请选择">
+        <el-select v-model="cftId" filterable placeholder="请选择">
           <el-option
             v-for="item in startDateAndEndDate"
             :key="item.value"

neim-ui/src/views/dataManagement/dataRecalculation/index.vue

@@ -3,7 +3,7 @@
     <div class="seachBox">
       <div class="conditionOne">
         <span>测风塔：</span>
-        <el-select v-model="cftId" clearable placeholder="请选择">
+        <el-select v-model="cftId" filterable clearable placeholder="请选择">
           <el-option
             v-for="item in cftData"
             :key="item.equipmentNo"

neim-ui/src/views/dataQuery/windTowerStatusData/index.vue

@@ -23,7 +23,7 @@
                     :value="item.equipmentNo">
                   </el-option>
                 </el-select>-->
-        <el-select v-model="eqId" placeholder="请选择" @change="changeEquipment">
+        <el-select v-model="eqId" filterable placeholder="请选择" @change="changeEquipment">
           <el-option
             v-for="item in startDateAndEndDate"
             :key="item.value"

neim-ui/src/views/resourceAssessment/index.vue

@@ -9,7 +9,7 @@
     <div class="condition">
       <div class="conditionOne">
         <span>测风塔：</span>
-        <el-select v-model="cftId" placeholder="请选择" @change="changeCft" size="small" style="width: 170px">
+        <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft" size="small" style="width: 170px">
           <el-option
             v-for="item in startDateAndEndDate"
             :key="item.value"

neim-ui/src/views/statistical/airDensity/index.vue

@@ -4,7 +4,7 @@
       <div class="seachBox">
         <div class="conditionOne">
           <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择">
+          <el-select v-model="cftId" filterable placeholder="请选择">
             <el-option
               v-for="item in startDateAndEndDate"
               :key="item.value"

neim-ui/src/views/statistical/gumbel/index.vue

@@ -4,7 +4,7 @@
       <div class="seachBox">
         <div class="conditionOne">
           <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+          <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
             <el-option
               v-for="item in startDateAndEndDate"
               :key="item.value"

neim-ui/src/views/statistical/shear/index.vue

@@ -4,7 +4,7 @@
       <div class="seachBox">
         <div class="conditionOne">
           <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+          <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
             <el-option
               v-for="item in startDateAndEndDate"
               :key="item.value"

neim-ui/src/views/statistical/statisticsWs/index.vue

@@ -4,7 +4,7 @@
       <div class="seachBox">
         <div class="conditionOne">
           <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+          <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
             <el-option
               v-for="item in startDateAndEndDate"
               :key="item.value"

neim-ui/src/views/statistical/turIntensity/index.vue

@@ -4,7 +4,7 @@
       <div class="seachBox">
         <div class="conditionOne">
           <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+          <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
             <el-option
               v-for="item in startDateAndEndDate"
               :key="item.value"

neim-ui/src/views/statistical/windResources/index.vue

@@ -4,7 +4,7 @@
       <div class="seachBox">
         <div class="conditionOne">
         <span>测风塔：</span>
-        <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+        <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
           <el-option
             v-for="item in startDateAndEndDate"
             :key="item.value"

neim-ui/src/views/statistical/windpowerDensity/index.vue

@@ -5,7 +5,7 @@
         <div class="conditionOne">
 
           <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+          <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
             <el-option
               v-for="item in startDateAndEndDate"
               :key="item.value"

neim-ui/src/views/windResources/airDensity/index.vue

@@ -3,7 +3,7 @@
     <div class="seachBox">
       <div class="conditionOne">
         <span>测风塔：</span>
-        <el-select v-model="cftId" placeholder="请选择" @change="getDataTime(cftId)">
+        <el-select v-model="cftId" filterable placeholder="请选择" @change="getDataTime(cftId)">
           <el-option
             v-for="item in startDateAndEndDate"
             :key="item.value"

neim-ui/src/views/windResources/turIntensity/index.vue

@@ -4,7 +4,7 @@
       <div class="seachBox">
         <div class="conditionOne">
           <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+          <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
             <el-option
               v-for="item in startDateAndEndDate"
               :key="item.value"

neim-ui/src/views/windResources/windCondition/index.vue

@@ -3,7 +3,7 @@
     <div class="seachBox">
       <div class="conditionOne">
         <span>测风塔：</span>
-        <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+        <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
           <el-option
             v-for="item in startDateAndEndDate"
             :key="item.value"

neim-ui/src/views/windResources/windRose/index.vue

@@ -4,7 +4,7 @@
       <div class="seachBox">
         <div class="conditionOne">
           <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+          <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
             <el-option
               v-for="item in startDateAndEndDate"
               :key="item.value"

neim-ui/src/views/windResources/windShear/index.vue

@@ -3,7 +3,7 @@
     <div class="seachBox">
       <div class="conditionOne">
         <span>测风塔：</span>
-        <el-select v-model="cftId" placeholder="请选择" @change="changeCft(cftId)">
+        <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft(cftId)">
           <el-option
             v-for="item in startDateAndEndDate"
             :key="item.value"

neim-ui/src/views/windResources/windSpeedCurve/index.vue

@@ -4,7 +4,7 @@
       <div class="seachBox">
         <div class="conditionOne">
           <span>测风塔：</span>
-          <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+          <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
             <el-option
               v-for="item in startDateAndEndDate"
               :key="item.value"

neim-ui/src/views/windResources/wsFrequency/index.vue

@@ -3,7 +3,7 @@
     <div class="seachBox">
       <div class="conditionOne">
         <span>测风塔：</span>
-        <el-select v-model="cftId" placeholder="请选择" @change="changeCft">
+        <el-select v-model="cftId" filterable placeholder="请选择" @change="changeCft">
           <el-option
             v-for="item in startDateAndEndDate"
             :key="item.value"