From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev

---
 screen-common/src/main/java/com/moral/constant/Constants.java |  168 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 155 insertions(+), 13 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 00a8cc3..a49dc6a 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -65,9 +65,14 @@
     public static final String WEB_CHANNEL = "0";
 
     /*
-     * ������������������
+     * ������������������ web
      * */
     public static final String LOGIN_OPERTATE_TYPE = "0";
+
+    /*
+     * ������������������ app
+     * */
+    public static final String LOGIN_OPERTATE_APP = "1";
 
     /*
      * ������������������
@@ -114,15 +119,17 @@
      * */
     public static final String SYSTEM_DICT_TYPE_PURCHASER = "purchaser";
 
+    /**
+     * ������������������
+     */
+    public static final  String WU_RAN_LEI_XING = "contaminate";
+
+
+
     /*
      * ������������������������
      * */
     public static final String UN_ADJUST = "unadjust";
-
-    /*
-     * ���������������
-     * */
-    public static final String TRANSITION = "transition";
 
     /*
      * ���������������������
@@ -140,6 +147,16 @@
     public static final String SENSOR_CODE_VOCS = "a99054";
 
     /*
+     * ������������ code
+     * */
+    public static final String SENSOR_CODE_CURRENT_SPEED = "a01011";
+
+    /*
+     * ������������ code
+     * */
+    public static final String SENSOR_CODE_CURRENT_FLOW = "a40001";
+
+    /*
      * ������code
      * */
     public static final String SENSOR_CODE_TEMP = "a01001";
@@ -152,34 +169,159 @@
     /*
      * ������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 HOURLY_REPORT = "0";
+
+    /*
+     * ������
+     * */
+    public static final String DAILY_REPORT = "1";
+
+    /*
+     * ������
+     * */
+    public static final String WEEKLY_REPORT = "2";
+
+    /*
+     * ������
+     * */
+    public static final String MONTHLY_REPORT = "3";
+
+    /*
+     * ���������������������
+     * */
+    public static final String NORMAL_FLAG = "N";
+
+    public static final String EXCELLENT_WEATHER = "���";
+
+    public static final String GOOD_WEATHER = "���";
+
+    public static final String MILD_WEATHER = "������������";
+
+    public static final String MIDDLE_WEATHER = "������������";
+
+    public static final String SERIOUS_WEATHER = "������������";
+
+    public static final String SERVER_WEATHER = "������������";
+
+    public static final String EXCELLENT_WEATHER_CODE = "1";
+
+    public static final String GOOD_WEATHER_CODE = "2";
+
+    public static final String MILD_WEATHER_CODE = "3";
+
+    public static final String MIDDLE_WEATHER_CODE = "4";
+
+    public static final String SERIOUS_WEATHER_CODE = "5";
+
+    public static final String SERVER_WEATHER_CODE = "6";
+
+    /*
+     * ������������
+     * */
+    public static final String CITY_TYPE = "city";
+
+    /*
+     * ������������
+     * */
+    public static final String PROVINCE_TYPE = "province";
+
+    /*
+     * 28������������
+     * */
+    public static final String TWENTY_EIGHT_CITIES = "28";
+
+    /*
+     * ������������
+     * */
+    public static final String YOY = "yoy";
+
+    /*
+     * ������������
+     * */
+    public static final String MOM = "mom";
+
+    /*
+    * ���������������
+    * */
+    public static final String YEAR = "year";
+
+    /*
+    * ���������������
+    * */
+    public static final String MONTH = "month";
 }

--
Gitblit v1.8.0