From 8a1e35934f5ad3e3febe6168e8eb990a0cd9cadb Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Thu, 15 Jul 2021 11:55:04 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev --- screen-common/src/main/java/com/moral/constant/Constants.java | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 1 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 c7ae5cc..246e402 100644 --- a/screen-common/src/main/java/com/moral/constant/Constants.java +++ b/screen-common/src/main/java/com/moral/constant/Constants.java @@ -62,7 +62,7 @@ /* * ��������������� * */ - public static final Integer WEB_CHANNEL = 1; + public static final String WEB_CHANNEL = "0"; /* * ������������������ @@ -84,5 +84,97 @@ * */ public static final String DELETE_OPERATE_TYPE = "3"; + /* + * ��������������������������������������� + * */ + public static final String FORMULA_PLACEHOLDER = "{0}"; + + /* + * ������������������ + * */ + public static final String SYSTEM_DICT_TYPE_UNIT = "unit"; + + /* + * ������������������ + * */ + public static final String SYSTEM_DICT_TYPE_PROFESSION = "profession"; + + /* + * ������������������������ + * */ + public static final String SYSTEM_DICT_TYPE_TECH = "tech"; + + /* + * ��������������������������� + * */ + public static final String SYSTEM_DICT_TYPE_DETECTOR = "detector"; + + /* + * ��������������������� + * */ + public static final String SYSTEM_DICT_TYPE_PURCHASER = "purchaser"; + + /* + * ������������������������ + * */ + public static final String UN_ADJUST = "unadjust"; + + /* + * ��������������������� + * */ + public static final String DEVICE_STATE_OFFLINE = "0"; + + /* + * ������code + * */ + public static final String SENSOR_CODE_O3 = "a05024"; + + /* + * vocs code + * */ + public static final String SENSOR_CODE_VOCS = "a99054"; + + /* + * ������code + * */ + public static final String SENSOR_CODE_TEMP = "a01001"; + + /* + * ������code + * */ + public static final String SENSOR_CODE_WIND_DIR = "a01008"; + + /* + * ������code + * */ + public static final String SENSOR_CODE_WIND_SPEED = "a01008"; + + /* + * ������������code + * */ + public static final String SENSOR_CODE_CO= "a21005"; + + /* + * PM2.5 code + * */ + public static final String SENSOR_CODE_PM25= "a34004"; + + /* + * PM10 code + * */ + public static final String SENSOR_CODE_PM10= "a34002"; + + /* + * SO2 code + * */ + public static final String SENSOR_CODE_SO2= "a21026"; + + /* + * NO2 code + * */ + public static final String SENSOR_CODE_NO2= "a21004"; + + /** The Constant NULL_VALUE. */ + public static final String NULL_VALUE = "N/V"; } -- Gitblit v1.8.0