From 18cbf19b00b29c66197fd4a10ce983cc36c26499 Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Fri, 14 May 2021 09:28:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=B8=BA=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E5=BE=80=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=85=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/logistics/service/HttpService.java | 72 ++++++++++---------
 1 file changed, 39 insertions(+), 33 deletions(-)

diff --git a/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java b/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java
index 4278513c..d486e52d 100644
--- a/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java
+++ b/logistics/src/main/java/com/ccsens/logistics/service/HttpService.java
@@ -71,41 +71,47 @@ public class HttpService implements IHttpService{
             for (int i = 0; i < dataArray.size(); i++) {
                 LogisticsEnvironmentRecord environmentRecord = new LogisticsEnvironmentRecord();
                 JSONObject oneObject = dataArray.getJSONObject(i);
-                environmentRecord.setEquipmentNum(oneObject.getString("deviceAddr"));
-                environmentRecord.setRecordTime(System.currentTimeMillis());
-
-                JSONArray realTimeData = oneObject.getJSONArray("realTimeData");
-                for (int j = 0; j < realTimeData.size(); j++) {
-                    JSONObject realData = realTimeData.getJSONObject(j);
-                    switch (realData.getString("dataName")){
-                        case Constant.TEMP :
-                            environmentRecord.setId(snowflake.nextId());
-                            environmentRecord.setNumType((byte)1);
-                            environmentRecord.setNumValue(new BigDecimal(realData.getString("dataValue")));
-                            environmentRecord.setIsAlarm(realData.getBoolean("isAlarm") ? (byte) 1 : (byte) 0);
-                            break;
-                        case Constant.HUMIDITY:
-                            environmentRecord.setId(snowflake.nextId());
-                            environmentRecord.setNumType((byte)0);
-                            environmentRecord.setNumValue(new BigDecimal(realData.getString("dataValue")));
-                            environmentRecord.setIsAlarm(realData.getBoolean("isAlarm") ? (byte) 1 : (byte) 0);
-                            break;
-                        case Constant.WATER_OUT:
-                            environmentRecord.setId(snowflake.nextId());
-                            environmentRecord.setNumType((byte)2);
-                            if(Constant.HAVE_WATER.equals(realData.getString("dataValue"))){
-                                environmentRecord.setNumValue(new BigDecimal(100));
-                                environmentRecord.setIsAlarm((byte)1);
-                            }else{
-                                environmentRecord.setNumValue(new BigDecimal(0));
-                                environmentRecord.setIsAlarm((byte)0);
-                            }
-                            break;
-                        default:
-                            break;
+                //获取设备运行状态 0未运行，1离线，2在线
+                Integer deviceStatus = oneObject.getInteger("deviceStatus");
+                //如果设备为在线状态 将数据存入到数据库
+                if (2 == deviceStatus){
+                    environmentRecord.setEquipmentNum(oneObject.getString("deviceAddr"));
+                    environmentRecord.setRecordTime(System.currentTimeMillis());
+
+                    JSONArray realTimeData = oneObject.getJSONArray("realTimeData");
+                    for (int j = 0; j < realTimeData.size(); j++) {
+                        JSONObject realData = realTimeData.getJSONObject(j);
+                        switch (realData.getString("dataName")){
+                            case Constant.TEMP :
+                                environmentRecord.setId(snowflake.nextId());
+                                environmentRecord.setNumType((byte)1);
+                                environmentRecord.setNumValue(new BigDecimal(realData.getString("dataValue")));
+                                environmentRecord.setIsAlarm(realData.getBoolean("isAlarm") ? (byte) 1 : (byte) 0);
+                                break;
+                            case Constant.HUMIDITY:
+                                environmentRecord.setId(snowflake.nextId());
+                                environmentRecord.setNumType((byte)0);
+                                environmentRecord.setNumValue(new BigDecimal(realData.getString("dataValue")));
+                                environmentRecord.setIsAlarm(realData.getBoolean("isAlarm") ? (byte) 1 : (byte) 0);
+                                break;
+                            case Constant.WATER_OUT:
+                                environmentRecord.setId(snowflake.nextId());
+                                environmentRecord.setNumType((byte)2);
+                                if(Constant.HAVE_WATER.equals(realData.getString("dataValue"))){
+                                    environmentRecord.setNumValue(new BigDecimal(100));
+                                    environmentRecord.setIsAlarm((byte)1);
+                                }else{
+                                    environmentRecord.setNumValue(new BigDecimal(0));
+                                    environmentRecord.setIsAlarm((byte)0);
+                                }
+                                break;
+                            default:
+                                break;
+                        }
+                        environmentRecordDao.insertSelective(environmentRecord);
                     }
-                    environmentRecordDao.insertSelective(environmentRecord);
                 }
+
             }
 
         }catch (Exception e){