From d0d21e84b89b4e3b06294f2bb6b54d44a975be2d Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Mon, 4 Nov 2024 10:37:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dictionary/pojo/param/DictTypeParam.java | 12 ++++++------ .../system/menu/controller/MenuController.java | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictTypeParam.java b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictTypeParam.java index 6fd67b27..c5dcff9b 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictTypeParam.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictTypeParam.java @@ -36,16 +36,16 @@ public class DictTypeParam { @ApiModelProperty("开启等级：0-不开启；1-开启，默认不开启") -// @NotNull(message = SystemValidMessage.OPEN_LEVEL_NOT_NULL) -// @Min(value = 0, message = SystemValidMessage.OPEN_LEVEL_FORMAT_ERROR) -// @Max(value = 1, message = SystemValidMessage.OPEN_LEVEL_FORMAT_ERROR) + @NotNull(message = SystemValidMessage.OPEN_LEVEL_NOT_NULL) + @Min(value = 0, message = SystemValidMessage.OPEN_LEVEL_FORMAT_ERROR) + @Max(value = 1, message = SystemValidMessage.OPEN_LEVEL_FORMAT_ERROR) private Integer openLevel; @ApiModelProperty("开启算法描述：0-不开启；1-开启，默认不开启") -// @NotNull(message = SystemValidMessage.OPEN_DESCRIBE_NOT_NULL) -// @Min(value = 0, message = SystemValidMessage.OPEN_DESCRIBE_FORMAT_ERROR) -// @Max(value = 1, message = SystemValidMessage.OPEN_DESCRIBE_FORMAT_ERROR) + @NotNull(message = SystemValidMessage.OPEN_DESCRIBE_NOT_NULL) + @Min(value = 0, message = SystemValidMessage.OPEN_DESCRIBE_FORMAT_ERROR) + @Max(value = 1, message = SystemValidMessage.OPEN_DESCRIBE_FORMAT_ERROR) private Integer openDescribe; diff --git a/system/src/main/java/com/njcn/gather/system/menu/controller/MenuController.java b/system/src/main/java/com/njcn/gather/system/menu/controller/MenuController.java index 2c112524..027cf084 100644 --- a/system/src/main/java/com/njcn/gather/system/menu/controller/MenuController.java +++ b/system/src/main/java/com/njcn/gather/system/menu/controller/MenuController.java @@ -61,7 +61,8 @@ public class MenuController { MenuVO menuVO32 = getMenuVO("/system/dict","dict","/system/dictionary/dictType/index","DataAnalysis","数据字典"); MenuVO menuVO33 = getMenuVO("/system/template","template","/system/template/index","Memo","报告模板"); MenuVO menuVO34 = getMenuVO("/system/versionRegister","versionRegister","/system/versionRegister/index","SetUp","版本注册"); - menuVO3.setChildren(CollectionUtil.toList(menuVO31,menuVO32,menuVO33,menuVO34)); + MenuVO menuVO35 = getMenuVO("/system/dictPq","dictPq","/system/dictionary/dictPq/index","DataAnalysis","电能质量字典"); + menuVO3.setChildren(CollectionUtil.toList(menuVO31,menuVO32,menuVO33,menuVO34,menuVO35)); menuVOList.add(menuVO3); MenuVO menuVO4 = getMenuVO("/log","log","/log/index","TrendCharts","日志管理");