1.数据查看字段显示对应调整

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

@@ -4,15 +4,12 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.db.Entity;
 import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jiayue.biz.conf.RequestDataHelper;
 import com.jiayue.biz.domain.*;
-import com.jiayue.biz.mapper.ProphaseAnemometryDataMapper;
-import com.jiayue.biz.mapper.ProphaseWeatherDataMapper;
 import com.jiayue.biz.mapper.WindTowerDataParentTableMapper;
 import com.jiayue.biz.service.*;
 import com.jiayue.biz.util.CalculationUtil;
@@ -696,39 +693,39 @@ public class WindTowerDataParentTableServiceImpl extends ServiceImpl<WindTowerDa
             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());
 
                 }
             }