From d7b233b6ed1793255adee6ed1e0cbe950e6c7e9f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Sep 2021 13:30:28 +0800
Subject: [PATCH] 5分钟数据统计bug
---
screen-common/src/main/java/com/moral/constant/Constants.java | 82 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 12 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/Constants.java b/screen-common/src/main/java/com/moral/constant/Constants.java
index 116acc7..b780f74 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -120,11 +120,6 @@
public static final String UN_ADJUST = "unadjust";
/*
- * ���������������������
- * */
- public static final String TRANSITION = "transition";
-
- /*
* ���������������������
* */
public static final String DEVICE_STATE_OFFLINE = "0";
@@ -152,34 +147,97 @@
/*
* ������code
* */
- public static final String SENSOR_CODE_WIND_SPEED = "a01008";
+ public static final String SENSOR_CODE_WIND_SPEED = "a01007";
/*
* ������������code
* */
- public static final String SENSOR_CODE_CO= "a21005";
+ public static final String SENSOR_CODE_CO = "a21005";
/*
* PM2.5 code
* */
- public static final String SENSOR_CODE_PM25= "a34004";
+ public static final String SENSOR_CODE_PM25 = "a34004";
/*
* PM10 code
* */
- public static final String SENSOR_CODE_PM10= "a34002";
+ public static final String SENSOR_CODE_PM10 = "a34002";
/*
* SO2 code
* */
- public static final String SENSOR_CODE_SO2= "a21026";
+ public static final String SENSOR_CODE_SO2 = "a21026";
/*
* NO2 code
* */
- public static final String SENSOR_CODE_NO2= "a21004";
+ public static final String SENSOR_CODE_NO2 = "a21004";
- /** The Constant NULL_VALUE. */
+ /*
+ * ������ code
+ * */
+ public static final String SENSOR_CODE_LON = "flylon";
+
+ /*
+ * ������ code
+ * */
+ public static final String SENSOR_CODE_LAT = "flylat";
+
+ /**
+ * The Constant NULL_VALUE.
+ */
public static final String NULL_VALUE = "N/V";
+ /*
+ * ������������������������,������
+ * */
+ public static final String MARKER_BIT_TRUE = "N";
+
+ /*
+ * ������������������������,���������������
+ * */
+ public static final String MARKER_BIT_FALSE = "H";
+
+ /*
+ * ������������������������������������������key������
+ * */
+ public static final String MARKER_BIT_KEY = "Flag";
+
+ /*
+ * ������������������������
+ * */
+ public static final String SENSOR_CODE_SPECIAL_BATCH = "PORRST";
+
+ /*
+ * ������������������������������
+ * */
+ public static final String SPECIAL_DEVICE_CRUISER = "0";
+
+ /*
+ * ������������������������������
+ * */
+ public static final String SPECIAL_DEVICE_UAV = "1";
+
+ /*
+ * ������
+ * */
+ public static final String HOURYLYREPORT = "0";
+
+ /*
+ * ������
+ * */
+ public static final String DAILYREPORT = "1";
+
+ /*
+ * ������
+ * */
+ public static final String WEEKLYREPORT = "2";
+
+ /*
+ * ������
+ * */
+ public static final String MONTHLYREPORT = "3";
+
+
}
--
Gitblit v1.8.0