js 增加层高 增加备份数据 数据筛选上下限问题 统计查询时间范围取值问题修改 项目修改 测风塔180入库问题修改

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

@@ -0,0 +1,68 @@
+package com.jiayue.biz.domain;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+/**
+ * 原始数据
+ */
+@Data
+public class ProphaseAnemometryDataOrg {
+    /**
+     * 时间戳
+     **/
+    private Timestamp ts;
+    /**
+     * 风速瞬时值（m/s）
+     **/
+    private Float wsInst;
+    /**
+     * 风速最大值（m/s）
+     **/
+    private Float wsMax;
+    /**
+     * 风速最小值（m/s）
+     **/
+    private Float wsMin;
+    /**
+     * 风速平均值（m/s）
+     **/
+    private Float wsAve;
+    /**
+     * 风速阵风（m/s）
+     **/
+    private Float wsGust;
+    /**
+     * 风速标准差（m/s）
+     **/
+    private Float wsSta;
+    /**
+     * 风向瞬时值（°）
+     **/
+    private Float wdInst;
+    /**
+     * 风向最大值（°）
+     **/
+    private Float wdMax;
+    /**
+     * 风向最小值（°）
+     **/
+    private Float wdMin;
+    /**
+     * 风向平均值（°）
+     **/
+    private Float wdAve;
+    /**
+     * 风向标准差（°）
+     **/
+    private Float wdSta;
+    /**
+     * 设备ID
+     **/
+    private String equipmentId;
+    /**
+     * 层高
+     **/
+    private String layerHeight;
+}

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

@@ -0,0 +1,84 @@
+package com.jiayue.biz.domain;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+/**
+ * 原始数据
+ */
+@Data
+public class ProphaseWeatherDataOrg {
+    /**
+     * 时间戳
+     **/
+    private Timestamp ts;
+    /**
+     * 温度瞬时值（℃）
+     **/
+    private Float tInst;
+    /**
+     * 温度最大值（℃）
+     **/
+    private Float tMax;
+    /**
+     * 温度最小值（℃）
+     **/
+    private Float tMin;
+    /**
+     * 温度平均值（℃）
+     **/
+    private Float tAve;
+    /**
+     * 温度标准差（℃）
+     **/
+    private Float tSta;
+    /**
+     * 湿度瞬时值（%）
+     **/
+    private Float rhInst;
+    /**
+     * 湿度最大值（%）
+     **/
+    private Float rhMax;
+    /**
+     * 湿度最小值（%）
+     **/
+    private Float rhMin;
+    /**
+     * 湿度平均值（%）
+     **/
+    private Float rhAve;
+    /**
+     * 湿度标准差（%）
+     **/
+    private Float rhSta;
+    /**
+     * 气压瞬时值（hPa）
+     **/
+    private Float paInst;
+    /**
+     * 气压最大值（hPa）
+     **/
+    private Float paMax;
+    /**
+     * 气压最小值（hPa）
+     **/
+    private Float paMin;
+    /**
+     * 气压平均值（hPa）
+     **/
+    private Float paAve;
+    /**
+     * 气压标准差（hPa）
+     **/
+    private Float paSta;
+    /**
+     * 空气密度（Kg/m³）
+     **/
+    private Float airDensity;
+    /**
+     * 设备ID
+     **/
+    private String equipmentId;
+}

neim-biz/src/main/java/com/jiayue/biz/job/AirDensityJob.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -61,8 +62,13 @@ public class AirDensityJob {
         List<StatisticsSituation> statisticsSituations = statisticsSituationService.list();
         // 设备属性信息
         List<EquipmentAttribute> equipmentAttributeList = equipmentAttributeService.list();
+        SimpleDateFormat sdf = new SimpleDateFormat("d");
         //前7天
         Date startDate = DateTimeUtil.getDayStartTime(new Date().getTime() - 60 * 60 * 24 * 1000 * 8);
+        //如果为月初的前7天 取 月初时间 并且排除掉月初
+        if (Integer.parseInt(sdf.format(new Date())) <= 7 && !sdf.format(new Date()).equals("1")) {
+            startDate = DateUtil.beginOfMonth(new Date());
+        }
         //前一天23点59分
         Date endDate = DateTimeUtil.getDayLastTime(DateUtil.yesterday().getTime());
         //传入时间的月初
@@ -74,11 +80,11 @@ public class AirDensityJob {
             Date startTime = startMonthDate;
             WindTowerCalculationData lastData = windTowerCalculationDataService.getLastDataCalculation(windTowerInfo.getEquipmentNo());
             List<Entity> lastRealData = prophaseWeatherDataService.getLastData(windTowerInfo.getEquipmentNo());
-            if (lastData != null && lastRealData != null){
+            if (lastData != null && lastRealData != null) {
                 Timestamp timestamp = (Timestamp) lastRealData.get(0).get("last (ts)");
                 long lastTime = DateUtil.endOfDay(lastData.getTime()).getTime();
                 long realTime = DateUtil.endOfDay(new Date(timestamp.getTime())).getTime();
-                if(lastTime == realTime){
+                if (lastTime == realTime) {
                     continue;
                 }
                 if (realTime - lastTime >= 60 * 60 * 24 * 1000 * 8) {
@@ -86,7 +92,7 @@ public class AirDensityJob {
                 }
 
             }
-            if(sevenDate.getTime() < startMonthDate.getTime()){
+            if (sevenDate.getTime() < startMonthDate.getTime()) {
                 startTime = sevenDate;
             }
 
@@ -125,7 +131,7 @@ public class AirDensityJob {
             ArrayList<WindTowerCalculationData> turList = windTowerCalculationDataService.turbulenceDay(sevenDate, endDate, windTowerInfo.getEquipmentNo(), equipmentAttributeList, windTowerInfoList, windTowerCalculationDataList);
             dataList.addAll(turList);
             //日平均风切变
-            ArrayList<WindTowerCalculationData> windShearDay = windTowerCalculationDataService.shearDay(sevenDate, endDate, windTowerInfo.getEquipmentNo(), windTowerCalculationDataList, equipmentAttributeList, windTowerInfoList,prophaseAnemometryDataList);
+            ArrayList<WindTowerCalculationData> windShearDay = windTowerCalculationDataService.shearDay(sevenDate, endDate, windTowerInfo.getEquipmentNo(), windTowerCalculationDataList, equipmentAttributeList, windTowerInfoList, prophaseAnemometryDataList);
             dataList.addAll(windShearDay);
             //日平均风功率密度
             ArrayList<WindTowerCalculationData> wpdDayList = windTowerCalculationDataService.wpdDay(sevenDate, endDate, windTowerInfo.getEquipmentNo(), windTowerCalculationDataList, equipmentAttributeList, windTowerInfoList);
@@ -152,7 +158,7 @@ public class AirDensityJob {
                     ArrayList<WindTowerCalculationData> wsMaxMonth = windTowerCalculationDataService.wsMaxMonth(DateTimeUtil.beginOfMonth(new Date(l)), DateTimeUtil.endOfMonth(new Date(l)), windTowerInfo.getEquipmentNo(), prophaseAnemometryDataList, equipmentAttributeList, windTowerInfoList);
                     dataList.addAll(wsMaxMonth);
                     //月平均风切变
-                    ArrayList<WindTowerCalculationData> shearMonth = windTowerCalculationDataService.shearMonth(DateTimeUtil.beginOfMonth(new Date(l)), DateTimeUtil.endOfMonth(new Date(l)), windTowerInfo.getEquipmentNo(), windTowerCalculationDataList, equipmentAttributeList, windTowerInfoList,prophaseAnemometryDataList);
+                    ArrayList<WindTowerCalculationData> shearMonth = windTowerCalculationDataService.shearMonth(DateTimeUtil.beginOfMonth(new Date(l)), DateTimeUtil.endOfMonth(new Date(l)), windTowerInfo.getEquipmentNo(), windTowerCalculationDataList, equipmentAttributeList, windTowerInfoList, prophaseAnemometryDataList);
                     dataList.addAll(shearMonth);
                     //月平均风速标差
                     ArrayList<WindTowerCalculationData> staMonth = windTowerCalculationDataService.staMonth(DateTimeUtil.beginOfMonth(new Date(l)), DateTimeUtil.endOfMonth(new Date(l)), windTowerInfo.getEquipmentNo(), prophaseAnemometryDataList, equipmentAttributeList, windTowerInfoList);
@@ -193,7 +199,7 @@ public class AirDensityJob {
                 ArrayList<WindTowerCalculationData> wsMaxMonth = windTowerCalculationDataService.wsMaxMonth(startMonthDate, endMonthDate, windTowerInfo.getEquipmentNo(), prophaseAnemometryDataList, equipmentAttributeList, windTowerInfoList);
                 dataList.addAll(wsMaxMonth);
                 //月平均风切变
-                ArrayList<WindTowerCalculationData> shearMonth = windTowerCalculationDataService.shearMonth(startMonthDate, endMonthDate, windTowerInfo.getEquipmentNo(), windTowerCalculationDataList, equipmentAttributeList, windTowerInfoList,prophaseAnemometryDataList);
+                ArrayList<WindTowerCalculationData> shearMonth = windTowerCalculationDataService.shearMonth(startMonthDate, endMonthDate, windTowerInfo.getEquipmentNo(), windTowerCalculationDataList, equipmentAttributeList, windTowerInfoList, prophaseAnemometryDataList);
                 dataList.addAll(shearMonth);
                 //月平均风速标差
                 ArrayList<WindTowerCalculationData> staMonth = windTowerCalculationDataService.staMonth(startMonthDate, endMonthDate, windTowerInfo.getEquipmentNo(), prophaseAnemometryDataList, equipmentAttributeList, windTowerInfoList);
@@ -214,7 +220,7 @@ public class AirDensityJob {
 
     //存储杨总数据 TODO 缺少TD Engine 逻辑
     public void saveJsonY() {
-        String s = apiHDY.jsonY(DateUtil.format(new Date(),"yyyyMMdd"));
+        String s = apiHDY.jsonY(DateUtil.format(new Date(), "yyyyMMdd"));
         List<StationInfo> stationInfos = stationInfoService.selectStationInfo();
         for (StationInfo stationInfo : stationInfos) {
             JSONObject jsonObject = JSONUtil.parseObj(s);

neim-biz/src/main/java/com/jiayue/biz/mapper/ProphaseAnemometryDataOrgMapper.java

@@ -0,0 +1,16 @@
+package com.jiayue.biz.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.biz.domain.ProphaseAnemometryData;
+import com.jiayue.biz.domain.ProphaseAnemometryDataOrg;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+
+@DS("tdengine")
+public interface ProphaseAnemometryDataOrgMapper extends BaseMapper<ProphaseAnemometryDataOrg> {
+
+    @Insert("INSERT INTO anemometry_org_${equipmentId}_${layerHeight} USING prophase_anemometry_data_org TAGS(#{equipmentId}, #{layerHeight}) VALUES(#{ts}, #{wsInst}, #{wsMax}, #{wsMin}, #{wsAve}, #{wsGust}, #{wsSta}, #{wdInst}, #{wdMax}, #{wdMin}, #{wdAve}, #{wdSta})")
+    int insertOneWithNew(ProphaseAnemometryData one);
+
+}

neim-biz/src/main/java/com/jiayue/biz/mapper/ProphaseWeatherDataOrgMapper.java

@@ -0,0 +1,24 @@
+package com.jiayue.biz.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.biz.domain.ProphaseWeatherData;
+import com.jiayue.biz.domain.ProphaseWeatherDataOrg;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@DS("tdengine")
+public interface ProphaseWeatherDataOrgMapper extends BaseMapper<ProphaseWeatherDataOrg> {
+
+    @Insert("<script>" +
+            "insert into weather_org_${equipmentId} USING prophase_weather_data_org TAGS(${equipmentId}) values " +
+            "<foreach collection='prophaseWeatherDataList' item='p' separator=','> " +
+            "(#{p.ts},#{p.tInst},#{p.tMax},#{p.tMin},#{p.tAve},#{p.tSta},#{p.rhInst},#{p.rhMax},#{p.rhMin},#{p.rhAve},#{p.rhSta},#{p.paInst},#{p.paMax},#{p.paMin},#{p.paAve},#{p.paSta},#{p.airDensity}) " +
+            "</foreach> " +
+            "</script>")
+    int insertSplice(@Param("prophaseWeatherDataList") List<ProphaseWeatherData> prophaseWeatherDataList, @Param("equipmentId") String equipmentId);
+
+}

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

@@ -670,6 +670,7 @@ public class AnalysisDataImpl {
         Map<String, String> map = new HashMap<>();
         String[] fileNames = file.getName().split("_");
         CheckDataRecode.map.clear();
+        String eqId = file.getName().split("_")[0];
         //把表格里的数据转换成属性+层高方便解析入库
         for (Object object : objects) {
             //时间
@@ -679,7 +680,7 @@ public class AnalysisDataImpl {
             }
             //todo 通道15解析出来有问题 临时做法
             Object obj = object;
-            if (object.toString().contains("Ch15") && object.toString().contains("0.00")) {
+            if (object.toString().contains("Ch15") && object.toString().contains("0.00") && eqId.equals("006180")) {
                 object = object.toString().replace("0.00", "10.00");
             }
 
@@ -707,7 +708,7 @@ public class AnalysisDataImpl {
         List<Map<String, Object>> allData = reader.readAll();
         //数据筛选
         List<Map<String, Object>> filterData = new CheckDataRecode().checkValue(allData, type);
-        String eqId = file.getName().split("_")[0];
+
         String eTime = file.getName().split("_")[1];
         windTowerDataParentTableService.packageData(filterData, eqId, eTime, type, "");
         reader.close();

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

@@ -72,11 +72,11 @@ public class CheckDataRecode {
                         int min;
                         int change;
                         if (key.contains("Sta") || key.contains("sta")) {
-                            max = 3;
+                            max = 6;
                             min = 0;
                             change = 1;
                         } else {
-                            max = 35;
+                            max = 40;
                             min = 0;
                             change = 20;
                         }
@@ -213,7 +213,7 @@ public class CheckDataRecode {
         //风速
         if (name.contains("ws")) {
             //最大值和平均值需要筛选
-            if (name.contains("Max") || name.contains("Ave") || name.contains("max") || name.contains("ave")) {
+            if (name.contains("Max") || name.contains("Ave") || name.contains("max") || name.contains("ave") || name.contains("Sta")) {
                 if (isOverMax(name, value, max)) {
                     return FakeDataRecord.IrrationalDataType.OverMax;
                 }

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

@@ -8,11 +8,16 @@ import com.jiayue.biz.domain.ProphaseAnemometryData;
 import com.jiayue.biz.mapper.ProphaseAnemometryDataMapper;
 import com.jiayue.biz.service.ProphaseAnemometryDataService;
 import lombok.AllArgsConstructor;
+import lombok.SneakyThrows;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Service;
 
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -49,7 +54,7 @@ public class ProphaseAnemometryDataServiceImpl extends ServiceImpl<ProphaseAnemo
 
     //查询所有数据
     public List<ProphaseAnemometryData> selectAll(String equipmentId, Timestamp startTime, Timestamp endTime) {
-        return this.filterData(baseMapper.selectAll(equipmentId, startTime, endTime));
+        return baseMapper.selectAll(equipmentId, startTime, endTime);
     }
 
     //所有层高风速风向平均值
@@ -59,7 +64,8 @@ public class ProphaseAnemometryDataServiceImpl extends ServiceImpl<ProphaseAnemo
 
     //查询所有层高风速以及风速标差
     public List<ProphaseAnemometryData> selectAveAndSta(String equipmentId, Timestamp startTime, Timestamp endTime) {
-        return this.filterData(baseMapper.selectAveAndSta(equipmentId, startTime, endTime));
+        List<ProphaseAnemometryData> prophaseAnemometryData = baseMapper.selectAveAndSta(equipmentId, startTime, endTime);
+        return prophaseAnemometryData.stream().filter(p -> (p.getWsAve() != null && p.getWsAve() != -99) && (p.getWsSta() != null && p.getWsSta() != -99)).collect(Collectors.toList());
     }
 
     //查询所有层高风速
@@ -91,7 +97,10 @@ public class ProphaseAnemometryDataServiceImpl extends ServiceImpl<ProphaseAnemo
     //过滤
     public List<ProphaseAnemometryData> filterData(List<ProphaseAnemometryData> prophaseAnemometryData) {
 
-        return prophaseAnemometryData.stream().filter(p -> p.getWsAve() != null && p.getWsAve() < 35).collect(Collectors.toList());
+        return prophaseAnemometryData.stream().filter(p -> p.getWsAve() != null && p.getWsAve() != -99).collect(Collectors.toList());
+
     }
 
+
+
 }

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

@@ -377,7 +377,7 @@ public class RealTimeDisplayServiceImpl implements RealTimeDisplayService {
      */
     public List<Map<String, Object>> getStartTimeAndEndTime() {
         List<Map<String, Object>> list = new ArrayList<>();
-        List<WindTowerInfo> windTowerInfoList = windTowerInfoService.lambdaQuery().eq(WindTowerInfo::getType,"1").list();
+        List<WindTowerInfo> windTowerInfoList = windTowerInfoService.lambdaQuery().eq(WindTowerInfo::getType, "1").list();
         for (WindTowerInfo windTowerInfo : windTowerInfoList) {
             HashMap<String, Object> hashMap = new HashMap<>();
             //获取最后一条数据
@@ -511,7 +511,7 @@ public class RealTimeDisplayServiceImpl implements RealTimeDisplayService {
             for (ProphaseWeatherData prophaseWeatherDatum : prophaseWeatherData) {
                 List<ProphaseAnemometryData> anemometryData = prophaseAnemometryData.stream().filter(p -> p.getTs().getTime() == prophaseWeatherDatum.getTs().getTime()).collect(Collectors.toList());
                 if (anemometryData.size() > 0) {
-                    tenMinuteWpdSum = tenMinuteWpdSum.add(CalculationUtil.getWpdCalculate(CalculationUtil.getBigDecimal(prophaseWeatherDatum.getAirDensity()),CalculationUtil.getBigDecimal(anemometryData.get(0).getWsAve())));
+                    tenMinuteWpdSum = tenMinuteWpdSum.add(CalculationUtil.getWpdCalculate(CalculationUtil.getBigDecimal(prophaseWeatherDatum.getAirDensity()), CalculationUtil.getBigDecimal(anemometryData.get(0).getWsAve())));
                     tenMinuteWsSum = tenMinuteWsSum.add(BigDecimal.valueOf(anemometryData.get(0).getWsAve()));
                 }
             }
@@ -695,7 +695,7 @@ public class RealTimeDisplayServiceImpl implements RealTimeDisplayService {
      * @param eqId
      * @param height
      */
-    public List<Map<String, Object>> getWindShear(Long startTime, Long endTime, String eqId, String height,String heightMin) {
+    public List<Map<String, Object>> getWindShear(Long startTime, Long endTime, String eqId, String height, String heightMin) {
         List<ProphaseAnemometryData> anemometryData = prophaseAnemometryDataService.selectWdAveAndWdAveAndWsSta(eqId, new Timestamp(startTime), new Timestamp(endTime));
 //        String[] heights = windTowerInfoService.getByEquipmentNo(eqId).get(0).getHeights().split(",");
 //        ArrayList<String> heightAll = new ArrayList<>(Arrays.asList(heights));

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

@@ -83,7 +83,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
      */
     public ArrayList<WindTowerCalculationData> calculateWindPowerDensity(Long startTime, Long endTime, String eqNo, List<ProphaseAnemometryData> prophaseAnemometryDataList, List<ProphaseWeatherData> prophaseWeatherDataList, List<EquipmentAttribute> equipmentAttributeList, List<WindTowerCalculationData> windTowerCalculationDataList) {
         //获取对应测风塔数据
-        List<ProphaseAnemometryData> anemometryDataList = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startTime && p.getTs().getTime() <= endTime).collect(Collectors.toList());
+        List<ProphaseAnemometryData> anemometryDataList = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startTime && p.getTs().getTime() <= endTime && p.getWsAve() != null && p.getWsAve() != -99).collect(Collectors.toList());
         List<ProphaseWeatherData> weatherDataList = prophaseWeatherDataList.stream().filter(p -> p.getTs().getTime() >= startTime && p.getTs().getTime() <= endTime).collect(Collectors.toList());
         long hour = 3600000L;
         List<WindTowerInfo> windTowerInfos = windTowerInfoService.lambdaQuery().eq(WindTowerInfo::getEquipmentNo, eqNo).list();
@@ -193,7 +193,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
                     .map(p -> CalculationUtil.getBattery(BigDecimal.valueOf(p.getWsAve()))).reduce(BigDecimal.ZERO, BigDecimal::add);
 
             //日发电量
-            if(batterySum.compareTo(BigDecimal.ZERO) != 0){
+            if (batterySum.compareTo(BigDecimal.ZERO) != 0) {
                 batterySum = batterySum.divide(BigDecimal.valueOf(6 * 1000), 2, RoundingMode.HALF_UP);
 
                 WindTowerCalculationData windTowerCalculationData = new WindTowerCalculationData();
@@ -1216,7 +1216,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
 //        List<Map<String, Object>> collects = mapList.stream().filter(w -> Long.parseLong(w.get("time").toString()) >= startTime.getTime()
 //                && Long.parseLong(w.get("time").toString()) <= endTime.getTime() && w.get("equipment_id").equals(equipmentId)).collect(Collectors.toList());
 
-        List<ProphaseAnemometryData> collect = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startTime.getTime() && p.getTs().getTime() <= endTime.getTime()).collect(Collectors.toList());
+    List<ProphaseAnemometryData> collect = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startTime.getTime() && p.getTs().getTime() <= endTime.getTime() && p.getWsMax() != null && p.getWsMax() != -99).collect(Collectors.toList());
 
         //获取所有层高
         String[] height = windTowerInfoList.stream().filter(w -> w.getEquipmentNo().equals(equipmentId)).collect(Collectors.toList()).get(0).getHeights().split(",");
@@ -1557,6 +1557,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
         long endHour = endTime.getTime();
         long Hour = 86400000;
         String[] heights = windTowerInfoList.stream().filter(w -> w.getEquipmentNo().equals(equipmentId)).collect(Collectors.toList()).get(0).getHeights().split(",");
+        prophaseAnemometryDataList = prophaseAnemometryDataList.stream().filter(p -> p.getWsSta() != null && p.getWsSta() != -99).collect(Collectors.toList());
         try {
             for (String h : heights) {
                 //获取对应层高的属性
@@ -1710,12 +1711,12 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
      * @param equipmentId 设备id
      * @return
      */
-    public ArrayList<WindTowerCalculationData> shearDay(Date startTime, Date endTime, String equipmentId, List<WindTowerCalculationData> windTowerCalculationDataList, List<EquipmentAttribute> equipmentAttributeList, List<WindTowerInfo> windTowerInfoList,List<ProphaseAnemometryData> prophaseAnemometryDataList) {
+    public ArrayList<WindTowerCalculationData> shearDay(Date startTime, Date endTime, String equipmentId, List<WindTowerCalculationData> windTowerCalculationDataList, List<EquipmentAttribute> equipmentAttributeList, List<WindTowerInfo> windTowerInfoList, List<ProphaseAnemometryData> prophaseAnemometryDataList) {
         long startHour = startTime.getTime();
         long endHour = endTime.getTime();
         long dayTime = 86400000L;
         String[] heights = windTowerInfoList.get(0).getHeights().split(",");
-
+        prophaseAnemometryDataList = prophaseAnemometryDataList.stream().filter(p -> p.getWsAve() != null && p.getWsAve() != -99).collect(Collectors.toList());
         ArrayList<WindTowerCalculationData> list = new ArrayList<>();
         try {
             //获取日综合风切变
@@ -1761,7 +1762,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
      * @param equipmentId 设备id
      * @return
      */
-    public ArrayList<WindTowerCalculationData> shearMonth(Date startTime, Date endTime, String equipmentId, List<WindTowerCalculationData> windTowerCalculationDataList, List<EquipmentAttribute> equipmentAttributeList, List<WindTowerInfo> windTowerInfoList,List<ProphaseAnemometryData> prophaseAnemometryDataList) {
+    public ArrayList<WindTowerCalculationData> shearMonth(Date startTime, Date endTime, String equipmentId, List<WindTowerCalculationData> windTowerCalculationDataList, List<EquipmentAttribute> equipmentAttributeList, List<WindTowerInfo> windTowerInfoList, List<ProphaseAnemometryData> prophaseAnemometryDataList) {
         //时间-1防止0点数据查不到
         Date startHour = new Date(startTime.getTime() - 1);
         //获取时间段所有统计数据
@@ -1950,7 +1951,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
         String[] heights = windTowerInfoList.get(0).getHeights().split(",");
         ArrayList<WindTowerCalculationData> listAll = new ArrayList<>();
         //时间段内所有风数据
-        List<ProphaseAnemometryData> prophaseAnemometryData = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startTime.getTime() && p.getTs().getTime() <= endTime.getTime()).collect(Collectors.toList());
+        List<ProphaseAnemometryData> prophaseAnemometryData = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startTime.getTime() && p.getTs().getTime() <= endTime.getTime() && p.getWsAve() != null && p.getWsAve() != -99).collect(Collectors.toList());
         EquipmentAttribute equipmentAttribute = equipmentAttributeService.lambdaQuery().eq(EquipmentAttribute::getFieldName, windShearFiledName).list().get(0);
         //删除综合风切变
         removeByStartTimeBetweenAndEquipmentIdAndEbId(startTime, endTime, equipmentId, equipmentAttribute.getId());
@@ -1958,7 +1959,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
             for (long start1 = startHour; start1 <= endHour; start1 = start1 + 3600000) {
                 //开始时间--->start1  结束时间---->start2
                 long start2 = start1 + 3600000L;
-                BigDecimal total = BigDecimal.ZERO;
 
                 long finalStart = start1;
                 List<ProphaseAnemometryData> collect = prophaseAnemometryData.stream().filter(p -> p.getTs().getTime() >= finalStart && p.getTs().getTime() < start2).collect(Collectors.toList());
@@ -1988,14 +1988,14 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
     /**
      * 根据 时间，层高，设备id 查询风切变数据
      *
-     * @param startTime   开始时间
+     * @param startTime 开始时间
      * @param endTime   结束时间
-     * @param height 层高
-     * @param eqId   设备id
+     * @param height    层高
+     * @param eqId      设备id
      * @return map: 一天一条
      */
     @Override
-    public List<Map<String, Object>> getWindShearByEqidAndAverageAndTime(Long startTime,Long endTime, String height, String eqId) {
+    public List<Map<String, Object>> getWindShearByEqidAndAverageAndTime(Long startTime, Long endTime, String height, String eqId) {
         List<Map<String, Object>> list = new ArrayList<>();
         List<Map<String, Object>> tableList = new ArrayList<>();
         Map<String, Object> map = new TreeMap<>();
@@ -2282,7 +2282,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
     public ArrayList<WindTowerCalculationData> staMonth(Date startTime, Date endTime, String equipmentId, List<ProphaseAnemometryData> prophaseAnemometryDataList, List<EquipmentAttribute> equipmentAttributeList, List<WindTowerInfo> windTowerInfoList) {
         //时间-1防止0点数据查不到
         Date startHour = new Date(startTime.getTime() - 1);
-        List<ProphaseAnemometryData> collect = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startTime.getTime() && p.getTs().getTime() <= endTime.getTime()).collect(Collectors.toList());
+        List<ProphaseAnemometryData> collect = prophaseAnemometryDataList.stream().filter(p -> p.getTs().getTime() >= startTime.getTime() && p.getTs().getTime() <= endTime.getTime() && p.getWsSta() != null && p.getWsSta() != -99).collect(Collectors.toList());
 
         ArrayList<WindTowerCalculationData> windTowerCalculationDataList = new ArrayList<>();
         String h = windTowerInfoList.stream().filter(w -> w.getEquipmentNo().equals(equipmentId)).collect(Collectors.toList()).get(0).getHeights();

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

@@ -105,8 +105,23 @@ public class WindTowerDataParentTableServiceImpl extends ServiceImpl<WindTowerDa
 
         try {
             //所有数据
-            for (String height : heightAll) {
-                for (Map<String, Object> m : allData) {
+            for (Map<String, Object> m : allData) {
+                for (String height : heightAll) {
+                if(m.get("time").toString().contains("4:50")){
+                    System.out.println("height = " + m);
+                }
+
+                    //异常数据赋值为-99
+                    if (m.get("abnormalType") != null) {
+                        if (m.get("abnormalType").toString().contains(",")) {
+                            String[] abnormalTypes = m.get("abnormalType").toString().split(",");
+                            for (String abnormalType : abnormalTypes) {
+                                m.put(abnormalType, -99f);
+                            }
+                        } else {
+                            m.put(m.get("abnormalType").toString(), -99f);
+                        }
+                    }
                     ProphaseAnemometryData one = new ProphaseAnemometryData();
                     //组装子表数据
                     one.setWsAve(m.get("wsAve_" + height) == null ? null : CalculationUtil.getBigDecimal(m.get("wsAve_" + height)).setScale(2, RoundingMode.HALF_UP).floatValue());
@@ -139,9 +154,8 @@ public class WindTowerDataParentTableServiceImpl extends ServiceImpl<WindTowerDa
 
 //                log.error("prophaseAnemometryDataArrayList = " + JSONUtil.toJsonPrettyStr(prophaseAnemometryDataArrayList));
 //                prophaseAnemometryDataMapper.insertSplice(prophaseAnemometryDataArrayList, equipmentId, height);
-            }
 
-            for (Map<String, Object> m : allData) {
+
                 ProphaseWeatherData prophaseAnemometryPublicData = new ProphaseWeatherData();
                 if (m.get("paMax") != null)
                     //kpa转hpa
@@ -190,6 +204,7 @@ public class WindTowerDataParentTableServiceImpl extends ServiceImpl<WindTowerDa
                 prophaseAnemometryPublicDataArrayList.add(prophaseAnemometryPublicData);
 
             }
+
 //            log.error("prophaseAnemometryPublicDataArrayList = " + JSONUtil.toJsonPrettyStr(prophaseAnemometryPublicDataArrayList));
             prophaseWeatherDataService.insertSplice(prophaseAnemometryPublicDataArrayList, equipmentId);
         } catch (Exception e) {
@@ -652,13 +667,10 @@ public class WindTowerDataParentTableServiceImpl extends ServiceImpl<WindTowerDa
         Timestamp startTime = new Timestamp(timeBegin.getTime());
         Timestamp endTime = new Timestamp(timeEnd.getTime());
         HashSet<String> heightSet = new HashSet<>();
-        LambdaQueryWrapper<ProphaseAnemometryData> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(ProphaseAnemometryData::getEquipmentId, equipmentId);
-        lambdaQueryWrapper.between(ProphaseAnemometryData::getTs, startTime, endTime);
         //获取测风塔数据
         List<WindTowerInfo> list = windTowerInfoService.lambdaQuery().eq(WindTowerInfo::getEquipmentNo, equipmentId).list();
         List<Map<String, Object>> mapList = new ArrayList<>();
-        List<ProphaseAnemometryData> prophaseAnemometryPublicData = prophaseAnemometryDataService.list(lambdaQueryWrapper);
+        List<ProphaseAnemometryData> prophaseAnemometryPublicData = prophaseAnemometryDataService.selectAll(equipmentId, startTime, endTime);
         List<ProphaseWeatherData> prophaseAnemometryPublicDataList = prophaseWeatherDataService.selectPublicData(equipmentId, startTime, endTime);
 
         String heights = list.get(0).getHeights();
@@ -667,44 +679,43 @@ public class WindTowerDataParentTableServiceImpl extends ServiceImpl<WindTowerDa
         heightSet.addAll(Arrays.asList(heights.split(",")));
         heightSet.addAll(Arrays.asList(wdHeights.split(",")));
         //组装数据
-        System.out.println("cn.hutool.core.date.DateUtil.date() = " + cn.hutool.core.date.DateUtil.date());
         for (ProphaseWeatherData anemometryPublicData : prophaseAnemometryPublicDataList) {
             HashMap<String, Object> dataMap = new HashMap<>();
             List<ProphaseAnemometryData> prophaseAnemometryData = prophaseAnemometryPublicData.stream().filter(p -> p.getTs().getTime() == anemometryPublicData.getTs().getTime()).collect(Collectors.toList());
             dataMap.put("time", anemometryPublicData.getTs().getTime());
-            dataMap.put("t_ave", anemometryPublicData.getTAve());
-            dataMap.put("t_max", anemometryPublicData.getTMax());
-            dataMap.put("t_min", anemometryPublicData.getTMin());
-            dataMap.put("t_sta", anemometryPublicData.getTSta());
-            dataMap.put("t_inst", anemometryPublicData.getTInst());
+            dataMap.put("tAve", anemometryPublicData.getTAve());
+            dataMap.put("tMax", anemometryPublicData.getTMax());
+            dataMap.put("tMin", anemometryPublicData.getTMin());
+            dataMap.put("tSta", anemometryPublicData.getTSta());
+            dataMap.put("tInst", anemometryPublicData.getTInst());
 
 
-            dataMap.put("rh_ave", anemometryPublicData.getRhAve());
-            dataMap.put("rh_max", anemometryPublicData.getRhMax());
-            dataMap.put("rh_min", anemometryPublicData.getRhMin());
-            dataMap.put("rh_sta", anemometryPublicData.getRhSta());
-            dataMap.put("rh_inst", anemometryPublicData.getRhInst());
+            dataMap.put("rhAve", anemometryPublicData.getRhAve());
+            dataMap.put("rhMax", anemometryPublicData.getRhMax());
+            dataMap.put("rhMin", anemometryPublicData.getRhMin());
+            dataMap.put("rhSta", anemometryPublicData.getRhSta());
+            dataMap.put("rhInst", anemometryPublicData.getRhInst());
 
-            dataMap.put("pa_ave", anemometryPublicData.getPaAve());
-            dataMap.put("pa_max", anemometryPublicData.getPaMax());
-            dataMap.put("pa_min", anemometryPublicData.getPaMin());
-            dataMap.put("pa_sta", anemometryPublicData.getPaSta());
-            dataMap.put("pa_inst", anemometryPublicData.getPaInst());
+            dataMap.put("paAve", anemometryPublicData.getPaAve());
+            dataMap.put("paMax", anemometryPublicData.getPaMax());
+            dataMap.put("paMin", anemometryPublicData.getPaMin());
+            dataMap.put("paSta", anemometryPublicData.getPaSta());
+            dataMap.put("paInst", anemometryPublicData.getPaInst());
 
-            dataMap.put("air_density", anemometryPublicData.getAirDensity());
+            dataMap.put("airdensity", anemometryPublicData.getAirDensity());
 
             if (prophaseAnemometryData.size() > 0) {
                 for (ProphaseAnemometryData prophaseAnemometryDatum : prophaseAnemometryData) {
-                    dataMap.put("ws_ave" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWsAve());
-                    dataMap.put("ws_max" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWsMax());
-                    dataMap.put("ws_min" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWsMin());
-                    dataMap.put("ws_sta" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWsSta());
-                    dataMap.put("ws_inst" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWsInst());
-                    dataMap.put("wd_ave" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWdAve());
-                    dataMap.put("wd_max" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWdMax());
-                    dataMap.put("wd_min" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWdMin());
-                    dataMap.put("wd_sta" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWdSta());
-                    dataMap.put("wd_inst" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWdInst());
+                    dataMap.put("wsAve_" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWsAve());
+                    dataMap.put("wsMax_" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWsMax());
+                    dataMap.put("wsMin_" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWsMin());
+                    dataMap.put("wsSta_" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWsSta());
+                    dataMap.put("wsInst_" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWsInst());
+                    dataMap.put("wdAve_" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWdAve());
+                    dataMap.put("wdMax_" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWdMax());
+                    dataMap.put("wdMin_" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWdMin());
+                    dataMap.put("wdSta_" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWdSta());
+                    dataMap.put("wdInst_" + prophaseAnemometryDatum.getLayerHeight(), prophaseAnemometryDatum.getWdInst());
 
                 }
             }
@@ -712,7 +723,6 @@ public class WindTowerDataParentTableServiceImpl extends ServiceImpl<WindTowerDa
             Map<String, Object> collect = dataMap.entrySet().stream().filter(h -> h.getValue() != null).collect(Collectors.toMap(Map.Entry::getKey, h -> h.getValue()));
             mapList.add(collect);
         }
-        System.out.println("cn.hutool.core.date.DateUtil.date() = " + cn.hutool.core.date.DateUtil.date());
         return mapList;
     }
 
@@ -840,7 +850,7 @@ public class WindTowerDataParentTableServiceImpl extends ServiceImpl<WindTowerDa
                     if (time >= startTime && time <= endTime) {
                         return file;
                     }
-                }else if(name.contains(".elog")){
+                } else if (name.contains(".elog")) {
                     String[] elogNameTime = name.split("_");
                     long time = DateUtil.parse(elogNameTime[1], "yyyyMMdd").getTime();
                     if (time >= startTime && time <= endTime) {

neim-ui/src/api/biz/dataQuery/defaultOption.js

@@ -2,1079 +2,1078 @@ export default {
   fieldList: [
     {
       label: "设备主键ID",
-      key: "equipment_id"
+      key: "equipmentId"
     }, {
       label: "时间",
       key: "time"
     },{
-      label: "200A米风向瞬时值",
-      key: "wd_inst200A"
+      label: "_200A米风向瞬时值",
+      key: "wdInst_200A"
     }, {
-      label: "200A米风向最大值",
-      key: "wd_max200A"
+      label: "_200A米风向最大值",
+      key: "wdMax_200A"
     }, {
-      label: "200A米风向最小值",
-      key: "wd_min200A"
+      label: "_200A米风向最小值",
+      key: "wdMin_200A"
     }, {
-      label: "200A米风向平均值",
-      key: "wd_ave200A"
+      label: "_200A米风向平均值",
+      key: "wdAve_200A"
     }, {
-      label: "200A米风向标准偏差",
-      key: "wd_sta200A"
+      label: "_200A米风向标准偏差",
+      key: "wdSta_200A"
     }, {
-      label: "200A米风速瞬时值",
-      key: "ws_inst200A"
+      label: "_200A米风速瞬时值",
+      key: "wsInst_200A"
     }, {
-      label: "200A米风速最大值",
-      key: "ws_max200A"
+      label: "_200A米风速最大值",
+      key: "wsMax_200A"
     }, {
-      label: "200A米风速最小值",
-      key: "ws_min200A"
+      label: "_200A米风速最小值",
+      key: "wsMin_200A"
     }, {
-      label: "200A米风速平均值",
-      key: "ws_ave200A"
+      label: "_200A米风速平均值",
+      key: "wsAve_200A"
     }, {
-      label: "200A米风速标准偏差",
-      key: "ws_sta200A"
+      label: "_200A米风速标准偏差",
+      key: "wsSta_200A"
     },{
       label: "200米风向瞬时值",
-      key: "wd_inst200"
+      key: "wdInst_200"
     }, {
       label: "200米风向最大值",
-      key: "wd_max200"
+      key: "wdMax_200"
     }, {
       label: "200米风向最小值",
-      key: "wd_min200"
+      key: "wdMin_200"
     }, {
       label: "200米风向平均值",
-      key: "wd_ave200"
+      key: "wdAve_200"
     }, {
       label: "200米风向标准偏差",
-      key: "wd_sta200"
+      key: "wdSta_200"
     }, {
       label: "200米风速瞬时值",
-      key: "ws_inst200"
+      key: "wsInst_200"
     }, {
       label: "200米风速最大值",
-      key: "ws_max200"
+      key: "wsMax_200"
     }, {
       label: "200米风速最小值",
-      key: "ws_min200"
+      key: "wsMin_200"
     }, {
       label: "200米风速平均值",
-      key: "ws_ave200"
+      key: "wsAve_200"
     }, {
       label: "200米风速标准偏差",
-      key: "ws_sta200"
+      key: "wsSta_200"
     },{
-      label: "190A米风向瞬时值",
-      key: "wd_inst190A"
+      label: "_190A风向瞬时值",
+      key: "wdInst_190A"
     }, {
-      label: "190A米风向最大值",
-      key: "wd_max190A"
+      label: "_190A风向最大值",
+      key: "wdMax_190A"
     }, {
-      label: "190A米风向最小值",
-      key: "wd_min190A"
+      label: "_190A风向最小值",
+      key: "wdMin_190A"
     }, {
-      label: "190A米风向平均值",
-      key: "wd_ave190A"
+      label: "_190A风向平均值",
+      key: "wdAve_190A"
     }, {
-      label: "190A米风向标准偏差",
-      key: "wd_sta190A"
+      label: "_190A风向标准偏差",
+      key: "wdSta_190A"
     }, {
-      label: "190A米风速瞬时值",
-      key: "ws_inst190A"
+      label: "_190A风速瞬时值",
+      key: "wsInst_190A"
     }, {
-      label: "190A米风速最大值",
-      key: "ws_max190A"
+      label: "_190A风速最大值",
+      key: "wsMax_190A"
     }, {
-      label: "190A米风速最小值",
-      key: "ws_min190A"
+      label: "_190A风速最小值",
+      key: "wsMin_190A"
     }, {
-      label: "190A米风速平均值",
-      key: "ws_ave190A"
+      label: "_190A风速平均值",
+      key: "wsAve_190A"
     }, {
-      label: "190A米风速标准偏差",
-      key: "ws_sta190A"
+      label: "_190A风速标准偏差",
+      key: "wsSta_190A"
     },{
       label: "190米风向瞬时值",
-      key: "wd_inst190"
+      key: "wdInst_190"
     }, {
       label: "190米风向最大值",
-      key: "wd_max190"
+      key: "wdMax_190"
     }, {
       label: "190米风向最小值",
-      key: "wd_min190"
+      key: "wdMin_190"
     }, {
       label: "190米风向平均值",
-      key: "wd_ave190"
+      key: "wdAve_190"
     }, {
       label: "190米风向标准偏差",
-      key: "wd_sta190"
+      key: "wdSta_190"
     }, {
       label: "190米风速瞬时值",
-      key: "ws_inst190"
+      key: "wsInst_190"
     }, {
       label: "190米风速最大值",
-      key: "ws_max190"
+      key: "wsMax_190"
     }, {
       label: "190米风速最小值",
-      key: "ws_min190"
+      key: "wsMin_190"
     }, {
       label: "190米风速平均值",
-      key: "ws_ave190"
+      key: "wsAve_190"
     }, {
       label: "190米风速标准偏差",
-      key: "ws_sta190"
+      key: "wsSta_190"
     },{
-      label: "180A米风向瞬时值",
-      key: "wd_inst180A"
+      label: "_180A米风向瞬时值",
+      key: "wdInst_180A"
     }, {
-      label: "180A米风向最大值",
-      key: "wd_max180A"
+      label: "_180A米风向最大值",
+      key: "wdMax_180A"
     }, {
-      label: "180A米风向最小值",
-      key: "wd_min180A"
+      label: "_180A米风向最小值",
+      key: "wdMin_180A"
     }, {
-      label: "180A米风向平均值",
-      key: "wd_ave180A"
+      label: "_180A米风向平均值",
+      key: "wdAve_180A"
     }, {
-      label: "180A米风向标准偏差",
-      key: "wd_sta180A"
+      label: "_180A米风向标准偏差",
+      key: "wdSta_180A"
     }, {
-      label: "180A米风速瞬时值",
-      key: "ws_inst180A"
+      label: "_180A米风速瞬时值",
+      key: "wsInst_180A"
     }, {
-      label: "180A米风速最大值",
-      key: "ws_max180A"
+      label: "_180A米风速最大值",
+      key: "wsMax_180A"
     }, {
-      label: "180A米风速最小值",
-      key: "ws_min180A"
+      label: "_180A米风速最小值",
+      key: "wsMin_180A"
     }, {
-      label: "180A米风速平均值",
-      key: "ws_ave180A"
+      label: "_180A米风速平均值",
+      key: "wsAve_180A"
     }, {
-      label: "180A米风速标准偏差",
-      key: "ws_sta180A"
+      label: "_180A米风速标准偏差",
+      key: "wsSta_180A"
     },{
       label: "180米风向瞬时值",
-      key: "wd_inst180"
+      key: "wdInst_180"
     }, {
       label: "180米风向最大值",
-      key: "wd_max180"
+      key: "wdMax_180"
     }, {
       label: "180米风向最小值",
-      key: "wd_min180"
+      key: "wdMin_180"
     }, {
       label: "180米风向平均值",
-      key: "wd_ave180"
+      key: "wdAve_180"
     }, {
       label: "180米风向标准偏差",
-      key: "wd_sta180"
+      key: "wdSta_180"
     }, {
       label: "180米风速瞬时值",
-      key: "ws_inst180"
+      key: "wsInst_180"
     }, {
       label: "180米风速最大值",
-      key: "ws_max180"
+      key: "wsMax_180"
     }, {
       label: "180米风速最小值",
-      key: "ws_min180"
+      key: "wsMin_180"
     }, {
       label: "180米风速平均值",
-      key: "ws_ave180"
+      key: "wsAve_180"
     }, {
       label: "180米风速标准偏差",
-      key: "ws_sta180"
+      key: "wsSta_180"
     },{
-      label: "170A米风向瞬时值",
-      key: "wd_inst170A"
+      label: "_170A米风向瞬时值",
+      key: "wdInst__170A"
     }, {
-      label: "170A米风向最大值",
-      key: "wd_max170A"
+      label: "_170A米风向最大值",
+      key: "wdMax__170A"
     }, {
-      label: "170A米风向最小值",
-      key: "wd_min170A"
+      label: "_170A米风向最小值",
+      key: "wdMin__170A"
     }, {
-      label: "170A米风向平均值",
-      key: "wd_ave170A"
+      label: "_170A米风向平均值",
+      key: "wdAve__170A"
     }, {
-      label: "170A米风向标准偏差",
-      key: "wd_sta170A"
+      label: "_170A米风向标准偏差",
+      key: "wdSta__170A"
     }, {
-      label: "170A米风速瞬时值",
-      key: "ws_inst170A"
+      label: "_170A米风速瞬时值",
+      key: "wsInst__170A"
     }, {
-      label: "170A米风速最大值",
-      key: "ws_max170A"
+      label: "_170A米风速最大值",
+      key: "wsMax__170A"
     }, {
-      label: "170A米风速最小值",
-      key: "ws_min170A"
+      label: "_170A米风速最小值",
+      key: "wsMin__170A"
     }, {
-      label: "170A米风速平均值",
-      key: "ws_ave170A"
+      label: "_170A米风速平均值",
+      key: "wsAve__170A"
     }, {
-      label: "170A米风速标准偏差",
-      key: "ws_sta170A"
+      label: "_170A米风速标准偏差",
+      key: "wsSta__170A"
     },{
       label: "170米风向瞬时值",
-      key: "wd_inst170"
+      key: "wdInst_170"
     }, {
       label: "170米风向最大值",
-      key: "wd_max170"
+      key: "wdMax_170"
     }, {
       label: "170米风向最小值",
-      key: "wd_min170"
+      key: "wdMin_170"
     }, {
       label: "170米风向平均值",
-      key: "wd_ave170"
+      key: "wdAve_170"
     }, {
       label: "170米风向标准偏差",
-      key: "wd_sta170"
+      key: "wdSta_170"
     }, {
       label: "170米风速瞬时值",
-      key: "ws_inst170"
+      key: "wsInst_170"
     }, {
       label: "170米风速最大值",
-      key: "ws_max170"
+      key: "wsMax_170"
     }, {
       label: "170米风速最小值",
-      key: "ws_min170"
+      key: "wsMin_170"
     }, {
       label: "170米风速平均值",
-      key: "ws_ave170"
+      key: "wsAve_170"
     }, {
       label: "170米风速标准偏差",
-      key: "ws_sta170"
+      key: "wsSta_170"
     },{
-      label: "160A米风向瞬时值",
-      key: "wd_inst160A"
+      label: "_160A米风向瞬时值",
+      key: "wdInst__160A"
     }, {
-      label: "160A米风向最大值",
-      key: "wd_max160A"
+      label: "_160A米风向最大值",
+      key: "wdMax__160A"
     }, {
-      label: "160A米风向最小值",
-      key: "wd_min160A"
+      label: "_160A米风向最小值",
+      key: "wdMin__160A"
     }, {
-      label: "160A米风向平均值",
-      key: "wd_ave160A"
+      label: "_160A米风向平均值",
+      key: "wdAve__160A"
     }, {
-      label: "160A米风向标准偏差",
-      key: "wd_sta160A"
+      label: "_160A米风向标准偏差",
+      key: "wdSta__160A"
     }, {
-      label: "160A米风速瞬时值",
-      key: "ws_inst160A"
+      label: "_160A米风速瞬时值",
+      key: "wsInst__160A"
     }, {
-      label: "160A米风速最大值",
-      key: "ws_max160A"
+      label: "_160A米风速最大值",
+      key: "wsMax__160A"
     }, {
-      label: "160A米风速最小值",
-      key: "ws_min160A"
+      label: "_160A米风速最小值",
+      key: "wsMin__160A"
     }, {
-      label: "160A米风速平均值",
-      key: "ws_ave160A"
+      label: "_160A米风速平均值",
+      key: "wsAve__160A"
     }, {
-      label: "160A米风速标准偏差",
-      key: "ws_sta160A"
+      label: "_160A米风速标准偏差",
+      key: "wsSta__160A"
     },{
       label: "160米风向瞬时值",
-      key: "wd_inst160"
+      key: "wdInst_160"
     }, {
       label: "160米风向最大值",
-      key: "wd_max160"
+      key: "wdMax_160"
     }, {
       label: "160米风向最小值",
-      key: "wd_min160"
+      key: "wdMin_160"
     }, {
       label: "160米风向平均值",
-      key: "wd_ave160"
+      key: "wdAve_160"
     }, {
       label: "160米风向标准偏差",
-      key: "wd_sta160"
+      key: "wdSta_160"
     }, {
       label: "160米风速瞬时值",
-      key: "ws_inst160"
+      key: "wsInst_160"
     }, {
       label: "160米风速最大值",
-      key: "ws_max160"
+      key: "wsMax_160"
     }, {
       label: "160米风速最小值",
-      key: "ws_min160"
+      key: "wsMin_160"
     }, {
       label: "160米风速平均值",
-      key: "ws_ave160"
+      key: "wsAve_160"
     }, {
       label: "160米风速标准偏差",
-      key: "ws_sta160"
-    },
-    {
+      key: "wsSta_160"
+    }, {
       label: "150米风向瞬时值",
-      key: "wd_inst150"
+      key: "wdInst_150"
     }, {
       label: "150米风向最大值",
-      key: "wd_max150"
+      key: "wdMax_150"
     }, {
       label: "150米风向最小值",
-      key: "wd_min150"
+      key: "wdMin_150"
     }, {
       label: "150米风向平均值",
-      key: "wd_ave150"
+      key: "wdAve_150"
     }, {
       label: "150米风向标准偏差",
-      key: "wd_sta150"
+      key: "wdSta_150"
     }, {
       label: "150米风速瞬时值",
-      key: "ws_inst150"
+      key: "wsInst_150"
     }, {
       label: "150米风速最大值",
-      key: "ws_max150"
+      key: "wsMax_150"
     }, {
       label: "150米风速最小值",
-      key: "ws_min150"
+      key: "wsMin_150"
     }, {
       label: "150米风速平均值",
-      key: "ws_ave150"
+      key: "wsAve_150"
     }, {
       label: "150米风速标准偏差",
-      key: "ws_sta150"
+      key: "wsSta_150"
     }, {
       label: "150A米风向瞬时值",
-      key: "wd_inst150A"
+      key: "wdInst_150A"
     }, {
       label: "150A米风向最大值",
-      key: "wd_max150A"
+      key: "wdMax_150A"
     }, {
       label: "150A米风向最小值",
-      key: "wd_min150A"
+      key: "wdMin_150A"
     }, {
       label: "150A米风向平均值",
-      key: "wd_ave150A"
+      key: "wdAve_150A"
     }, {
       label: "150A米风向标准偏差",
-      key: "wd_sta150A"
+      key: "wdSta_150A"
     }, {
       label: "150A米风速瞬时值",
-      key: "ws_inst150A"
+      key: "wsInst_150A"
     }, {
       label: "150A米风速最大值",
-      key: "ws_max150A"
+      key: "wsMax_150A"
     }, {
       label: "150A米风速最小值",
-      key: "ws_min150A"
+      key: "wsMin_150A"
     }, {
       label: "150A米风速平均值",
-      key: "ws_ave150A"
+      key: "wsAve_150A"
     }, {
       label: "150A米风速标准偏差",
-      key: "ws_sta150A"
+      key: "wsSta_150A"
     }, {
       label: "140米风向瞬时值",
-      key: "wd_inst140"
+      key: "wdInst_140"
     }, {
       label: "140米风向最大值",
-      key: "wd_max140"
+      key: "wdMax_140"
     }, {
       label: "140米风向最小值",
-      key: "wd_min140"
+      key: "wdMin_140"
     }, {
       label: "140米风向平均值",
-      key: "wd_ave140"
+      key: "wdAve_140"
     }, {
       label: "140米风向标准偏差",
-      key: "wd_sta140"
+      key: "wdSta_140"
     }, {
       label: "140米风速瞬时值",
-      key: "ws_inst140"
+      key: "wsInst_140"
     }, {
       label: "140米风速最大值",
-      key: "ws_max140"
+      key: "wsMax_140"
     }, {
       label: "140米风速最小值",
-      key: "ws_min140"
+      key: "wsMin_140"
     }, {
       label: "140米风速平均值",
-      key: "ws_ave140"
+      key: "wsAve_140"
     }, {
       label: "140米风速标准偏差",
-      key: "ws_sta140"
+      key: "wsSta_140"
     }, {
       label: "140A米风向瞬时值",
-      key: "wd_inst140A"
+      key: "wdInst_140A"
     }, {
       label: "140A米风向最大值",
-      key: "wd_max140A"
+      key: "wdMax_140A"
     }, {
       label: "140A米风向最小值",
-      key: "wd_min140A"
+      key: "wdMin_140A"
     }, {
       label: "140A米风向平均值",
-      key: "wd_ave140A"
+      key: "wdAve_140A"
     }, {
       label: "140A米风向标准偏差",
-      key: "wd_sta140A"
+      key: "wdSta_140A"
     }, {
       label: "140A米风速瞬时值",
-      key: "ws_inst140A"
+      key: "wsInst_140A"
     }, {
       label: "140A米风速最大值",
-      key: "ws_max140A"
+      key: "wsMax_140A"
     }, {
       label: "140A米风速最小值",
-      key: "ws_min140A"
+      key: "wsMin_140A"
     }, {
       label: "140A米风速平均值",
-      key: "ws_ave140A"
+      key: "wsAve_140A"
     }, {
       label: "140A米风速标准偏差",
-      key: "ws_sta140A"
+      key: "wsSta_140A"
     }, {
       label: "120米风速瞬时值",
-      key: "ws_inst120"
+      key: "wsInst_120"
     }, {
       label: "120米风速最大值",
-      key: "ws_max120"
+      key: "wsMax_120"
     }, {
       label: "120米风速最小值",
-      key: "ws_min120"
+      key: "wsMin_120"
     }, {
       label: "120米风速平均值",
-      key: "ws_ave120"
+      key: "wsAve_120"
     }, {
       label: "120米风速标准偏差",
-      key: "ws_sta120"
+      key: "wsSta_120"
     }, {
       label: "120米风向瞬时值",
-      key: "wd_inst120"
+      key: "wdInst_120"
     }, {
       label: "120米风向最大值",
-      key: "wd_max120"
+      key: "wdMax_120"
     }, {
       label: "120米风向最小值",
-      key: "wd_min120"
+      key: "wdMin_120"
     }, {
       label: "120米风向平均值",
-      key: "wd_ave120"
+      key: "wdAve_120"
     }, {
       label: "120米风向标准偏差",
-      key: "wd_sta120"
+      key: "wdSta_120"
     }, {
       label: "120A米风速瞬时值",
-      key: "ws_inst120A"
+      key: "wsInst_120A"
     }, {
       label: "120A米风速最大值",
-      key: "ws_max120A"
+      key: "wsMax_120A"
     }, {
       label: "120A米风速最小值",
-      key: "ws_min120A"
+      key: "wsMin_120A"
     }, {
       label: "120A米风速平均值",
-      key: "ws_ave120A"
+      key: "wsAve_120A"
     }, {
       label: "120A米风速标准偏差",
-      key: "ws_sta120A"
+      key: "wsSta_120A"
     }, {
       label: "120A米风向瞬时值",
-      key: "wd_inst120A"
+      key: "wdInst_120A"
     }, {
       label: "120A米风向最大值",
-      key: "wd_max120A"
+      key: "wdMax_120A"
     }, {
       label: "120A米风向最小值",
-      key: "wd_min120A"
+      key: "wdMin_120A"
     }, {
       label: "120A米风向平均值",
-      key: "wd_ave120A"
+      key: "wdAve_120A"
     }, {
       label: "120A米风向标准偏差",
-      key: "wd_sta120A"
+      key: "wdSta_120A"
     }, {
       label: "110米风速瞬时值",
-      key: "ws_inst110"
+      key: "wsInst_110"
     }, {
       label: "110米风速最大值",
-      key: "ws_max110"
+      key: "wsMax_110"
     }, {
       label: "110米风速最小值",
-      key: "ws_min110"
+      key: "wsMin_110"
     }, {
       label: "110米风速平均值",
-      key: "ws_ave110"
+      key: "wsAve_110"
     }, {
       label: "110米风速标准偏差",
-      key: "ws_sta110"
+      key: "wsSta_110"
     }, {
       label: "110米风向瞬时值",
-      key: "wd_inst110"
+      key: "wdInst_110"
     }, {
       label: "110米风向最大值",
-      key: "wd_max110"
+      key: "wdMax_110"
     }, {
       label: "110米风向最小值",
-      key: "wd_min110"
+      key: "wdMin_110"
     }, {
       label: "110米风向平均值",
-      key: "wd_ave110"
+      key: "wdAve_110"
     }, {
       label: "110米风向标准偏差",
-      key: "wd_sta110"
+      key: "wdSta_110"
     }, {
       label: "110A米风速瞬时值",
-      key: "ws_inst110A"
+      key: "wsInst_110A"
     }, {
       label: "110A米风速最大值",
-      key: "ws_max110A"
+      key: "wsMax_110A"
     }, {
       label: "110A米风速最小值",
-      key: "ws_min110A"
+      key: "wsMin_110A"
     }, {
       label: "110A米风速平均值",
-      key: "ws_ave110A"
+      key: "wsAve_110A"
     }, {
       label: "110A米风速标准偏差",
-      key: "ws_sta110A"
+      key: "wsSta_110A"
     }, {
       label: "110A米风向瞬时值",
-      key: "wd_inst110A"
+      key: "wdInst_110A"
     }, {
       label: "110A米风向最大值",
-      key: "wd_max110A"
+      key: "wdMax_110A"
     }, {
       label: "110A米风向最小值",
-      key: "wd_min110A"
+      key: "wdMin_110A"
     }, {
       label: "110A米风向平均值",
-      key: "wd_ave110A"
+      key: "wdAve_110A"
     }, {
       label: "110A米风向标准偏差",
-      key: "wd_sta110A"
+      key: "wdSta_110A"
     }, {
       label: "100米风速瞬时值",
-      key: "ws_inst100"
+      key: "wsInst_100"
     }, {
       label: "100米风速最大值",
-      key: "ws_max100"
+      key: "wsMax_100"
     }, {
       label: "100米风速最小值",
-      key: "ws_min100"
+      key: "wsMin_100"
     }, {
       label: "100米风速平均值",
-      key: "ws_ave100"
+      key: "wsAve_100"
     }, {
       label: "100米风速标准偏差",
-      key: "ws_sta100"
+      key: "wsSta_100"
     }, {
       label: "100米风向瞬时值",
-      key: "wd_inst100"
+      key: "wdInst_100"
     }, {
       label: "100米风向最大值",
-      key: "wd_max100"
+      key: "wdMax_100"
     }, {
       label: "100米风向最小值",
-      key: "wd_min100"
+      key: "wdMin_100"
     }, {
       label: "100米风向平均值",
-      key: "wd_ave100"
+      key: "wdAve_100"
     }, {
       label: "100米风向标准偏差",
-      key: "wd_sta100"
+      key: "wdSta_100"
     }, {
       label: "100A米风速瞬时值",
-      key: "ws_inst100A"
+      key: "wsInst_100A"
     }, {
       label: "100A米风速最大值",
-      key: "ws_max100A"
+      key: "wsMax_100A"
     }, {
       label: "100A米风速最小值",
-      key: "ws_min100A"
+      key: "wsMin_100A"
     }, {
       label: "100A米风速平均值",
-      key: "ws_ave100A"
+      key: "wsAve_100A"
     }, {
       label: "100A米风速标准偏差",
-      key: "ws_sta100A"
+      key: "wsSta_100A"
     }, {
       label: "100A米风向瞬时值",
-      key: "wd_inst100A"
+      key: "wdInst_100A"
     }, {
       label: "100A米风向最大值",
-      key: "wd_max100A"
+      key: "wdMax_100A"
     }, {
       label: "100A米风向最小值",
-      key: "wd_min100A"
+      key: "wdMin_100A"
     }, {
       label: "100A米风向平均值",
-      key: "wd_ave100A"
+      key: "wdAve_100A"
     }, {
       label: "100A米风向标准偏差",
-      key: "wd_sta100A"
+      key: "wdSta_100A"
     }, {
       label: "90米风速瞬时值",
-      key: "ws_inst90"
+      key: "wsInst_90"
     }, {
       label: "90米风速最大值",
-      key: "ws_max90"
+      key: "wsMax_90"
     }, {
       label: "90米风速最小值",
-      key: "ws_min90"
+      key: "wsMin_90"
     }, {
       label: "90米风速平均值",
-      key: "ws_ave90"
+      key: "wsAve_90"
     }, {
       label: "90米风速标准偏差",
-      key: "ws_sta90"
+      key: "wsSta_90"
     }, {
       label: "90米风向瞬时值",
-      key: "wd_inst90"
+      key: "wdInst_90"
     }, {
       label: "90米风向最大值",
-      key: "wd_max90"
+      key: "wdMax_90"
     }, {
       label: "90米风向最小值",
-      key: "wd_min90"
+      key: "wdMin_90"
     }, {
       label: "90米风向平均值",
-      key: "wd_ave90"
+      key: "wdAve_90"
     }, {
       label: "90米风向标准偏差",
-      key: "wd_sta90"
+      key: "wdSta_90"
     }, {
       label: "90A米风速瞬时值",
-      key: "ws_inst90A"
+      key: "wsInst_90A"
     }, {
       label: "90A米风速最大值",
-      key: "ws_max90A"
+      key: "wsMax_90A"
     }, {
       label: "90A米风速最小值",
-      key: "ws_min90A"
+      key: "wsMin_90A"
     }, {
       label: "90A米风速平均值",
-      key: "ws_ave90A"
+      key: "wsAve_90A"
     }, {
       label: "90A米风速标准偏差",
-      key: "ws_sta90A"
+      key: "wsSta_90A"
     }, {
       label: "90A米风向瞬时值",
-      key: "wd_inst90A"
+      key: "wdInst_90A"
     }, {
       label: "90A米风向最大值",
-      key: "wd_max90A"
+      key: "wdMax_90A"
     }, {
       label: "90A米风向最小值",
-      key: "wd_min90A"
+      key: "wdMin_90A"
     }, {
       label: "90A米风向平均值",
-      key: "wd_ave90A"
+      key: "wdAve_90A"
     }, {
       label: "90A米风向标准偏差",
-      key: "wd_sta90A"
+      key: "wdSta_90A"
     }, {
       label: "80米风速瞬时值",
-      key: "ws_inst80"
+      key: "wsInst_80"
     }, {
       label: "80米风速最大值",
-      key: "ws_max80"
+      key: "wsMax_80"
     }, {
       label: "80米风速最小值",
-      key: "ws_min80"
+      key: "wsMin_80"
     }, {
       label: "80米风速平均值",
-      key: "ws_ave80"
+      key: "wsAve_80"
     }, {
       label: "80米风速标准偏差",
-      key: "ws_sta80"
+      key: "wsSta_80"
     }, {
       label: "80米风向瞬时值",
-      key: "wd_inst80"
+      key: "wdInst_80"
     }, {
       label: "80米风向最大值",
-      key: "wd_max80"
+      key: "wdMax_80"
     }, {
       label: "80米风向最小值",
-      key: "wd_min80"
+      key: "wdMin_80"
     }, {
       label: "80米风向平均值",
-      key: "wd_ave80"
+      key: "wdAve_80"
     }, {
       label: "80米风向标准偏差",
-      key: "wd_sta80"
+      key: "wdSta_80"
     }, {
       label: "80A米风速瞬时值",
-      key: "ws_inst80A"
+      key: "wsInst_80A"
     }, {
       label: "80A米风速最大值",
-      key: "ws_max80A"
+      key: "wsMax_80A"
     }, {
       label: "80A米风速最小值",
-      key: "ws_min80A"
+      key: "wsMin_80A"
     }, {
       label: "80A米风速平均值",
-      key: "ws_ave80A"
+      key: "wsAve_80A"
     }, {
       label: "80A米风速标准偏差",
-      key: "ws_sta80A"
+      key: "wsSta_80A"
     }, {
       label: "80A米风向瞬时值",
-      key: "wd_inst80A"
+      key: "wdInst_80A"
     }, {
       label: "80A米风向最大值",
-      key: "wd_max80A"
+      key: "wdMax_80A"
     }, {
       label: "80A米风向最小值",
-      key: "wd_min80A"
+      key: "wdMin_80A"
     }, {
       label: "80A米风向平均值",
-      key: "wd_ave80A"
+      key: "wdAve_80A"
     }, {
       label: "80A米风向标准偏差",
-      key: "wd_sta80A"
+      key: "wdSta_80A"
     }, {
       label: "70米风速瞬时值",
-      key: "ws_inst70"
+      key: "wsInst_70"
     }, {
       label: "70米风速最大值",
-      key: "ws_max70"
+      key: "wsMax_70"
     }, {
       label: "70米风速最小值",
-      key: "ws_min70"
+      key: "wsMin_70"
     }, {
       label: "70米风速平均值",
-      key: "ws_ave70"
+      key: "wsAve_70"
     }, {
       label: "70米风速标准偏差",
-      key: "ws_sta70"
+      key: "wsSta_70"
     }, {
       label: "70米风向瞬时值",
-      key: "wd_inst70"
+      key: "wdInst_70"
     }, {
       label: "70米风向最大值",
-      key: "wd_max70"
+      key: "wdMax_70"
     }, {
       label: "70米风向最小值",
-      key: "wd_min70"
+      key: "wdMin_70"
     }, {
       label: "70米风向平均值",
-      key: "wd_ave70"
+      key: "wdAve_70"
     }, {
       label: "70米风向标准偏差",
-      key: "wd_sta70"
+      key: "wdSta_70"
     }, {
       label: "70A米风速瞬时值",
-      key: "ws_inst70A"
+      key: "wsInst_70A"
     }, {
       label: "70A米风速最大值",
-      key: "ws_max70A"
+      key: "wsMax_70A"
     }, {
       label: "70A米风速最小值",
-      key: "ws_min70A"
+      key: "wsMin_70A"
     }, {
       label: "70A米风速平均值",
-      key: "ws_ave70A"
+      key: "wsAve_70A"
     }, {
       label: "70A米风速标准偏差",
-      key: "ws_sta70A"
+      key: "wsSta_70A"
     }, {
       label: "70A米风向瞬时值",
-      key: "wd_inst70A"
+      key: "wdInst_70A"
     }, {
       label: "70A米风向最大值",
-      key: "wd_max70A"
+      key: "wdMax_70A"
     }, {
       label: "70A米风向最小值",
-      key: "wd_min70A"
+      key: "wdMin_70A"
     }, {
       label: "70A米风向平均值",
-      key: "wd_ave70A"
+      key: "wdAve_70A"
     }, {
       label: "70A米风向标准偏差",
-      key: "wd_sta70A"
+      key: "wdSta_70A"
     }, {
       label: "60米风速瞬时值",
-      key: "ws_inst60"
+      key: "wsInst_60"
     }, {
       label: "60米风速最大值",
-      key: "ws_max60"
+      key: "wsMax_60"
     }, {
       label: "60米风速最小值",
-      key: "ws_min60"
+      key: "wsMin_60"
     }, {
       label: "60米风速平均值",
-      key: "ws_ave60"
+      key: "wsAve_60"
     }, {
       label: "60米风速标准偏差",
-      key: "ws_sta60"
+      key: "wsSta_60"
     }, {
       label: "60米风向瞬时值",
-      key: "wd_inst60"
+      key: "wdInst_60"
     }, {
       label: "60米风向最大值",
-      key: "wd_max60"
+      key: "wdMax_60"
     }, {
       label: "60米风向最小值",
-      key: "wd_min60"
+      key: "wdMin_60"
     }, {
       label: "60米风向平均值",
-      key: "wd_ave60"
+      key: "wdAve_60"
     }, {
       label: "60米风向标准偏差",
-      key: "wd_sta60"
+      key: "wdSta_60"
     }, {
       label: "60A米风速瞬时值",
-      key: "ws_inst60A"
+      key: "wsInst_60A"
     }, {
       label: "60A米风速最大值",
-      key: "ws_max60A"
+      key: "wsMax_60A"
     }, {
       label: "60A米风速最小值",
-      key: "ws_min60A"
+      key: "wsMin_60A"
     }, {
       label: "60A米风速平均值",
-      key: "ws_ave60A"
+      key: "wsAve_60A"
     }, {
       label: "60A米风速标准偏差",
-      key: "ws_sta60A"
+      key: "wsSta_60A"
     }, {
       label: "60A米风向瞬时值",
-      key: "wd_inst60A"
+      key: "wdInst_60A"
     }, {
       label: "60A米风向最大值",
-      key: "wd_max60A"
+      key: "wdMax_60A"
     }, {
       label: "60A米风向最小值",
-      key: "wd_min60A"
+      key: "wdMin_60A"
     }, {
       label: "60A米风向平均值",
-      key: "wd_ave60A"
+      key: "wdAve_60A"
     }, {
       label: "60A米风向标准偏差",
-      key: "wd_sta60A"
+      key: "wdSta_60A"
     }, {
       label: "50米风速瞬时值",
-      key: "ws_inst50"
+      key: "wsInst_50"
     }, {
       label: "50米风速最大值",
-      key: "ws_max50"
+      key: "wsMax_50"
     }, {
       label: "50米风速最小值",
-      key: "ws_min50"
+      key: "wsMin_50"
     }, {
       label: "50米风速平均值",
-      key: "ws_ave50"
+      key: "wsAve_50"
     }, {
       label: "50米风速标准偏差",
-      key: "ws_sta50"
+      key: "wsSta_50"
     }, {
       label: "50米风向瞬时值",
-      key: "wd_inst50"
+      key: "wdInst_50"
     }, {
       label: "50米风向最大值",
-      key: "wd_max50"
+      key: "wdMax_50"
     }, {
       label: "50米风向最小值",
-      key: "wd_min50"
+      key: "wdMin_50"
     }, {
       label: "50米风向平均值",
-      key: "wd_ave50"
+      key: "wdAve_50"
     }, {
       label: "50米风向标准偏差",
-      key: "wd_sta50"
+      key: "wdSta_50"
     }, {
       label: "50A米风速瞬时值",
-      key: "ws_inst50A"
+      key: "wsInst_50A"
     }, {
       label: "50A米风速最大值",
-      key: "ws_max50A"
+      key: "wsMax_50A"
     }, {
       label: "50A米风速最小值",
-      key: "ws_min50A"
+      key: "wsMin_50A"
     }, {
       label: "50A米风速平均值",
-      key: "ws_ave50A"
+      key: "wsAve_50A"
     }, {
       label: "50A米风速标准偏差",
-      key: "ws_sta50A"
+      key: "wsSta_50A"
     }, {
       label: "50A米风向瞬时值",
-      key: "wd_inst50A"
+      key: "wdInst_50A"
     }, {
       label: "50A米风向最大值",
-      key: "wd_max50A"
+      key: "wdMax_50A"
     }, {
       label: "50A米风向最小值",
-      key: "wd_min50A"
+      key: "wdMin_50A"
     }, {
       label: "50A米风向平均值",
-      key: "wd_ave50A"
+      key: "wdAve_50A"
     }, {
       label: "50A米风向标准偏差",
-      key: "wd_sta50A"
+      key: "wdSta_50A"
     }, {
       label: "30米风速瞬时值",
-      key: "ws_inst30"
+      key: "wsInst_30"
     }, {
       label: "30米风速最大值",
-      key: "ws_max30"
+      key: "wsMax_30"
     }, {
       label: "30米风速最小值",
-      key: "ws_min30"
+      key: "wsMin_30"
     }, {
       label: "30米风速平均值",
-      key: "ws_ave30"
+      key: "wsAve_30"
     }, {
       label: "30米风速标准偏差",
-      key: "ws_sta30"
+      key: "wsSta_30"
     }, {
       label: "30米风向瞬时值",
-      key: "wd_inst30"
+      key: "wdInst_30"
     }, {
       label: "30米风向最大值",
-      key: "wd_max30"
+      key: "wdMax_30"
     }, {
       label: "30米风向最小值",
-      key: "wd_min30"
+      key: "wdMin_30"
     }, {
       label: "30米风向平均值",
-      key: "wd_ave30"
+      key: "wdAve_30"
     }, {
       label: "30米风向标准偏差",
-      key: "wd_sta30"
+      key: "wdSta_30"
     }, {
       label: "30A米风速瞬时值",
-      key: "ws_inst30A"
+      key: "wsInst_30A"
     }, {
       label: "30A米风速最大值",
-      key: "ws_max30A"
+      key: "wsMax_30A"
     }, {
       label: "30A米风速最小值",
-      key: "ws_min30A"
+      key: "wsMin_30A"
     }, {
       label: "30A米风速平均值",
-      key: "ws_ave30A"
+      key: "wsAve_30A"
     }, {
       label: "30A米风速标准偏差",
-      key: "ws_sta30A"
+      key: "wsSta_30A"
     }, {
       label: "30A米风向瞬时值",
-      key: "wd_inst30A"
+      key: "wdInst_30A"
     }, {
       label: "30A米风向最大值",
-      key: "wd_max30A"
+      key: "wdMax_30A"
     }, {
       label: "30A米风向最小值",
-      key: "wd_min30A"
+      key: "wdMin_30A"
     }, {
       label: "30A米风向平均值",
-      key: "wd_ave30A"
+      key: "wdAve_30A"
     }, {
       label: "30A米风向标准偏差",
-      key: "wd_sta30A"
+      key: "wdSta_30A"
     }, {
       label: "10米风速瞬时值",
-      key: "ws_inst10"
+      key: "wsInst_10"
     }, {
       label: "10米风速最大值",
-      key: "ws_max10"
+      key: "wsMax_10"
     }, {
       label: "10米风速最小值",
-      key: "ws_min10"
+      key: "wsMin_10"
     }, {
       label: "10米风速平均值",
-      key: "ws_ave10"
+      key: "wsAve_10"
     }, {
       label: "10米风速标准偏差",
-      key: "ws_sta10"
+      key: "wsSta_10"
     }, {
       label: "10米风向瞬时值",
-      key: "wd_inst10"
+      key: "wdInst_10"
     }, {
       label: "10米风向最大值",
-      key: "wd_max10"
+      key: "wdMax_10"
     }, {
       label: "10米风向最小值",
-      key: "wd_min10"
+      key: "wdMin_10"
     }, {
       label: "10米风向平均值",
-      key: "wd_ave10"
+      key: "wdAve_10"
     }, {
       label: "10米风向标准偏差",
-      key: "wd_sta10"
+      key: "wdSta_10"
     }, {
       label: "10A米风速瞬时值",
-      key: "ws_inst10A"
+      key: "wsInst_10A"
     }, {
       label: "10A米风速最大值",
-      key: "ws_max10A"
+      key: "wsMax_10A"
     }, {
       label: "10A米风速最小值",
-      key: "ws_min10A"
+      key: "wsMin_10A"
     }, {
       label: "10A米风速平均值",
-      key: "ws_ave10A"
+      key: "wsAve_10A"
     }, {
       label: "10A米风速标准偏差",
-      key: "ws_sta10A"
+      key: "wsSta_10A"
     }, {
       label: "10A米风向瞬时值",
-      key: "wd_inst10A"
+      key: "wdInst_10A"
     }, {
       label: "10A米风向最大值",
-      key: "wd_max10A"
+      key: "wdMax_10A"
     }, {
       label: "10A米风向最小值",
-      key: "wd_min10A"
+      key: "wdMin_10A"
     }, {
       label: "10A米风向平均值",
-      key: "wd_ave10A"
+      key: "wdAve_10A"
     }, {
       label: "10A米风向标准偏差",
-      key: "wd_sta10A"
+      key: "wdSta_10A"
     }, {
       label: "温度瞬时值",
-      key: "t_inst"
+      key: "tInst"
     }, {
       label: "温度最大值",
-      key: "t_max"
+      key: "tMax"
     }, {
       label: "温度最小值",
-      key: "t_min"
+      key: "tMin"
     }, {
       label: "温度平均值",
-      key: "t_ave"
+      key: "tAve"
     }, {
       label: "温度标准差",
-      key: "t_sta"
+      key: "tSta"
     }, {
       label: "湿度瞬时值",
-      key: "rh_inst"
+      key: "rhInst"
     }, {
       label: "湿度最大值",
-      key: "rh_max"
+      key: "rhMax"
     }, {
       label: "湿度最小值",
-      key: "rh_min"
+      key: "rhMin"
     }, {
       label: "湿度平均值",
-      key: "rh_ave"
+      key: "rhAve"
     }, {
       label: "湿度标准偏差",
-      key: "rh_sta"
+      key: "rhSta"
     }, {
       label: "气压瞬时值",
-      key: "pa_inst"
+      key: "paInst"
     }, {
       label: "气压最大值",
-      key: "pa_max"
+      key: "paMax"
     }, {
       label: "气压最小值",
-      key: "pa_min"
+      key: "paMin"
     }, {
       label: "气压平均值",
-      key: "pa_ave"
+      key: "paAve"
     }, {
       label: "气压标准偏差",
-      key: "pa_sta"
+      key: "paSta"
     }, {
       label: "空气密度",
-      key: "air_density"
+      key: "airDensity"
     }
   ],
   allHeightOptions: [

neim-ui/src/views/largeScreenPage/Subpage/preProjectResources.vue

@@ -27,7 +27,7 @@
           <div class="rightTopContent">
             <div class="contentBox">
               <span class="numberBox">{{ pInfo.initiatedNum }}</span>
-              <span class="textBox">已发起的项目</span>
+              <span class="textBox">前期立项</span>
             </div>
             <div class="contentBox">
               <span class="numberBox">{{ pInfo.approvalNum }}</span>
@@ -152,10 +152,10 @@ export default {
       time: '',
       dialogShow: false,
       pInfo: {
-        initiatedNum: '31',//已发起项目数目
-        approvalNum: '5',//已完成核准项目数目
+        initiatedNum: '32',//已发起项目数目
+        approvalNum: '6',//已完成核准项目数目
         buildNum: '4',//正在实施项目数目
-        electricNum: '1',//投产发电项目数目
+        electricNum: '3',//投产发电项目数目
       },
 
       //一类项目列表