简柏林 / thingskit · Commits

Commit 5c924391742639a741b37d1f344738082b83e698

Authored by xp.Huang
2 parents 7b95a7a4 2cfae2b5

Merge branch 'master_dev' into 'master' 

chore: 将错误码按顺序排列

See merge request yunteng/thingskit!273
Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
@@ -108,15 +108,15 @@ public enum ErrorMessage { @@ -108,15 +108,15 @@ public enum ErrorMessage {
108 HIKVISION_GET_URL_ERROR(400083,"海康威视视API调用获取URL失败！！"), 108 HIKVISION_GET_URL_ERROR(400083,"海康威视视API调用获取URL失败！！"),
109 HIKVISION_API_ERROR(400084,"海康威视视频预览API调用失败【%s】，错误码【%s】"), 109 HIKVISION_API_ERROR(400084,"海康威视视频预览API调用失败【%s】，错误码【%s】"),
110 RESET_PASSWORD_SUCCESS(400085,"重置成功，请使用默认密码登录"), 110 RESET_PASSWORD_SUCCESS(400085,"重置成功，请使用默认密码登录"),
  111 + MESSAGE_TEMPLATE_DELETED(400086,"消息模板不存在！"),
  112 + NEED_MAIN_PARAMETER(400087, "缺少必要参数【%s】"),
  113 + REGISTER_VALUE_IS_NONE(400088, "寄存器值不能为空"),
  114 + GATE_WAY_DEVICE_HAS_SENSOR(400089, "网关设备【%s】有下挂网关子设备"),
  115 + MESSAGE_TEMPLATE_USING_CONFIG(400090,"消息配置正在被消息模板【%s】使用"),
  116 + INVALID_PARAMETER_IMPORT(400091, "网关子设备产品中不允许导入服务，事件类的物模型"),
  117 + GET_DEVICE_lIST_ERROR(400092, "请先在组态编辑页面绑定产品"),
111 HAVE_NO_PERMISSION(500002,"没有修改权限"), 118 HAVE_NO_PERMISSION(500002,"没有修改权限"),
112 - MESSAGE_TEMPLATE_DELETED(400020,"消息模板不存在！"),  
113 - NEED_MAIN_PARAMETER(400021, "缺少必要参数【%s】"),  
114 - REGISTER_VALUE_IS_NONE(400022, "寄存器值不能为空"),  
115 - GATE_WAY_DEVICE_HAS_SENSOR(400023, "网关设备【%s】有下挂网关子设备"),  
116 - NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置"),  
117 - MESSAGE_TEMPLATE_USING_CONFIG(500004,"消息配置正在被消息模板【%s】使用"),  
118 - INVALID_PARAMETER_IMPORT(400068, "网关子设备产品中不允许导入服务，事件类的物模型"),  
119 - GET_DEVICE_lIST_ERROR(400070, "请先在组态编辑页面绑定产品"); 119 + NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置");
120 private final int code; 120 private final int code;
121 private String message; 121 private String message;
122 122