Merge remote-tracking branch 'origin/master'

cpp-admin/src/main/java/com/cpp/web/controller/stationDataQuery/WeatherStationStatusDataController.java

@@ -81,6 +81,8 @@ public class WeatherStationStatusDataController {
         List<BigDecimal> globalRList = new ArrayList<>();
         List<BigDecimal> directRList = new ArrayList<>();
         List<BigDecimal> diffuseRList = new ArrayList<>();
+        List<BigDecimal> psList = new ArrayList<>();
+        List<BigDecimal> rhList = new ArrayList<>();
         Long momentTime = 5 * 60 * 1000L;
         for (Long tempTime = startTime; tempTime <= endTime; tempTime = tempTime + momentTime) {
             // 设置时间
@@ -97,11 +99,20 @@ public class WeatherStationStatusDataController {
                 // 散辐射
                 BigDecimal diffuseR = weatherStationStatusData.getDiffuseR();
                 diffuseRList.add(diffuseR);
+
+                // 湿度
+                BigDecimal rh = weatherStationStatusData.getRh();
+                rhList.add(rh);
+                // 压强
+                BigDecimal p = weatherStationStatusData.getP();
+                psList.add(p);
             }
             else{
                 globalRList.add(null);
                 directRList.add(null);
                 diffuseRList.add(null);
+                psList.add(null);
+                rhList.add(null);
             }
         }
         Map<String, List<BigDecimal>> radiationDataMap = new HashMap<>();
@@ -109,11 +120,16 @@ public class WeatherStationStatusDataController {
         radiationDataMap.put("directRs", directRList);
         radiationDataMap.put("diffuseRs", diffuseRList);
 
+        // 湿度、压强
+        Map<String, List<BigDecimal>> sdDataMap = new HashMap<>();
+        sdDataMap.put("ps", psList);
+        sdDataMap.put("rhs", rhList);
 
         Map<String, Object> returnMap = new HashMap<>();
         returnMap.put("tableList", talbeList);
         returnMap.put("timeList", timeList);
         returnMap.put("radiationData", radiationDataMap);
+        returnMap.put("sdData", sdDataMap);
 
         return R.ok(returnMap);