若依微服务2.0.3

修改金瑞铭以下问题:
1、Web新增设备-无法新增已删除的设备编号
2、告警规则设置无生效
3、模型显示问题,将模型某项数据设置为不显示无生效
dev
xins 7 months ago
parent 1a202e65e6
commit 98357fdf5a

@ -81,6 +81,9 @@ public class HwDictConstants {
public static final String DEVICE_MODE_STATUS_NORMAL = "1";//设备模型正常状态 public static final String DEVICE_MODE_STATUS_NORMAL = "1";//设备模型正常状态
public static final String DEVICE_MODE_STATUS_DELETED = "9";//设备模型删除状态 public static final String DEVICE_MODE_STATUS_DELETED = "9";//设备模型删除状态
public static final String DEVICE_MODE_FUNCTION_DISPLAY_FLAG_NO = "0";//设备模型功能显示标识,不显示
public static final String SCENE_DEFAULT_FLAG_YES = "1";//场景是否默认标识:是 public static final String SCENE_DEFAULT_FLAG_YES = "1";//场景是否默认标识:是
public static final String SCENE_DEFAULT_FLAG_NO = "0";//场景是否默认标识:否 public static final String SCENE_DEFAULT_FLAG_NO = "0";//场景是否默认标识:否

@ -76,12 +76,13 @@ public class TdEngineConstants {
*/ */
public static final List<String> ABNDON_FUNCTION_IDENTIFIERS = Arrays.asList("ts","value1","type"); public static final List<String> ABNDON_FUNCTION_IDENTIFIERS = Arrays.asList("ts","value1","type");
public static final String DEFAULT_FIRST_FIELD_NAME_DISPLAY = "时间";//timestamp格式首字段的显示名称
public static final Map<String, String> DEVICE_DATA_COLUMN_MAP = new HashMap<String, String>(); public static final Map<String, String> DEVICE_DATA_COLUMN_MAP = new HashMap<String, String>();
static { static {
DEVICE_DATA_COLUMN_MAP.put(ST_TAG_DEVICECODE, "设备编号"); DEVICE_DATA_COLUMN_MAP.put(ST_TAG_DEVICECODE, "设备编号");
DEVICE_DATA_COLUMN_MAP.put(ST_TAG_DEVICENAME, "设备名称"); DEVICE_DATA_COLUMN_MAP.put(ST_TAG_DEVICENAME, "设备名称");
DEVICE_DATA_COLUMN_MAP.put(DEFAULT_FIRST_FIELD_NAME, "时间"); DEVICE_DATA_COLUMN_MAP.put(DEFAULT_FIRST_FIELD_NAME, DEFAULT_FIRST_FIELD_NAME_DISPLAY);
} }
/** /**

Loading…
Cancel
Save