|
@@ -165,10 +165,19 @@ public class PushCallback implements MqttCallbackExtended {
|
|
|
JSONArray jsonArray1 = (JSONArray) humi.get("data");
|
|
|
BigDecimal data1 = new BigDecimal(Integer.parseInt(jsonArray1.get(0).toString()));
|
|
|
BigDecimal humi2 = data1.divide(big);
|
|
|
+
|
|
|
+ Map ph = (Map) map.get("ph");
|
|
|
+ JSONArray jsonArrayPH = (JSONArray) ph.get("data");
|
|
|
+ BigDecimal dataPH = new BigDecimal(Integer.parseInt(jsonArrayPH.get(0).toString()));
|
|
|
+ BigDecimal ph2 = dataPH.divide(big);
|
|
|
+
|
|
|
EnvData envData = new EnvData();
|
|
|
envData.setCreateTime(new Date());
|
|
|
envData.setEnvTemp(temp2.toString());
|
|
|
envData.setEnvHum(humi2.toString());
|
|
|
+ //ph 值
|
|
|
+ envData.setOther1(ph2.toString());
|
|
|
+
|
|
|
envData.setUnitId(device.getUnitId());
|
|
|
envData.setFarmId(device.getFarmId());
|
|
|
IEnvDataService dataService = SpringUtil.getBean(IEnvDataService.class);
|