From 0b1a5f35c2b703379deaf1f29eac902070b03f1c Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Thu, 31 Oct 2024 14:53:58 +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/auth/controller/AuthController.java | 4 ++-- .../dictionary/controller/DictTypeController.java | 2 -- .../dictionary/pojo/param/DictDataParam.java | 2 +- .../dictionary/pojo/param/DictTypeParam.java | 14 +++++++------- .../service/impl/DictDataServiceImpl.java | 2 +- .../service/impl/DictTypeServiceImpl.java | 2 +- .../system/menu/controller/ButtonController.java | 2 +- .../system/menu/controller/MenuController.java | 4 ++-- .../pojo/constant/SystemValidMessage.java | 2 +- .../pojo/enums/SystemResponseEnum.java | 2 +- 10 files changed, 17 insertions(+), 19 deletions(-) rename system/src/main/java/com/njcn/gather/system/{dictionary => }/pojo/constant/SystemValidMessage.java (97%) rename system/src/main/java/com/njcn/gather/system/{dictionary => }/pojo/enums/SystemResponseEnum.java (98%) diff --git a/system/src/main/java/com/njcn/gather/system/auth/controller/AuthController.java b/system/src/main/java/com/njcn/gather/system/auth/controller/AuthController.java index 47f6365e..06d14a75 100644 --- a/system/src/main/java/com/njcn/gather/system/auth/controller/AuthController.java +++ b/system/src/main/java/com/njcn/gather/system/auth/controller/AuthController.java @@ -18,7 +18,7 @@ public class AuthController { token.setAccessToken("bqddxxwqmfncffacvbpkuxvwvqrhln"); HttpResult result = new HttpResult<>(); result.setMessage("成功"); - result.setCode("200"); + result.setCode("A0000"); result.setData(token); return result; } @@ -27,7 +27,7 @@ public class AuthController { public HttpResult logout() { HttpResult result = new HttpResult<>(); result.setMessage("成功"); - result.setCode("200"); + result.setCode("A0000"); result.setData("退出成功"); return result; } diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTypeController.java b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTypeController.java index 836a5843..0a990b70 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTypeController.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/controller/DictTypeController.java @@ -1,7 +1,6 @@ package com.njcn.gather.system.dictionary.controller; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,7 +15,6 @@ import com.njcn.gather.system.dictionary.pojo.param.DictTypeParam; import com.njcn.gather.system.dictionary.pojo.po.DictType; import com.njcn.gather.system.dictionary.service.IDictTypeService; import com.njcn.web.controller.BaseController; -import com.njcn.web.pojo.dto.SimpleTreeDTO; import com.njcn.web.utils.HttpResultUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictDataParam.java b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictDataParam.java index e72bc135..ebb10b17 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictDataParam.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictDataParam.java @@ -1,7 +1,7 @@ package com.njcn.gather.system.dictionary.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.gather.system.dictionary.pojo.constant.SystemValidMessage; +import com.njcn.gather.system.pojo.constant.SystemValidMessage; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; 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 a8d4b58f..11db9dc8 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 @@ -1,7 +1,7 @@ package com.njcn.gather.system.dictionary.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.gather.system.dictionary.pojo.constant.SystemValidMessage; +import com.njcn.gather.system.pojo.constant.SystemValidMessage; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -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/dictionary/service/impl/DictDataServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java index dd0b7a68..1ea45578 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java @@ -13,7 +13,7 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.db.mybatisplus.constant.DbConstant; import com.njcn.gather.system.dictionary.mapper.DictDataMapper; import com.njcn.gather.system.dictionary.pojo.dto.DictDataCache; -import com.njcn.gather.system.dictionary.pojo.enums.SystemResponseEnum; +import com.njcn.gather.system.pojo.enums.SystemResponseEnum; import com.njcn.gather.system.dictionary.pojo.param.DictDataParam; import com.njcn.gather.system.dictionary.pojo.po.DictData; import com.njcn.gather.system.dictionary.pojo.po.DictType; diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java index c1fcf89f..04ba9d49 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java @@ -11,7 +11,7 @@ import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.db.mybatisplus.constant.DbConstant; import com.njcn.gather.system.dictionary.mapper.DictTypeMapper; -import com.njcn.gather.system.dictionary.pojo.enums.SystemResponseEnum; +import com.njcn.gather.system.pojo.enums.SystemResponseEnum; import com.njcn.gather.system.dictionary.pojo.param.DictTypeParam; import com.njcn.gather.system.dictionary.pojo.po.DictType; import com.njcn.gather.system.dictionary.service.IDictTypeService; diff --git a/system/src/main/java/com/njcn/gather/system/menu/controller/ButtonController.java b/system/src/main/java/com/njcn/gather/system/menu/controller/ButtonController.java index 86bf6577..a90816ae 100644 --- a/system/src/main/java/com/njcn/gather/system/menu/controller/ButtonController.java +++ b/system/src/main/java/com/njcn/gather/system/menu/controller/ButtonController.java @@ -16,7 +16,7 @@ public class ButtonController { ButtonVO buttonVO = new ButtonVO(); HttpResult result = new HttpResult<>(); result.setMessage("成功"); - result.setCode("200"); + result.setCode("A0000"); result.setData(buttonVO); return result; } 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 796615ea..2c112524 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 @@ -58,7 +58,7 @@ public class MenuController { MenuVO menuVO3 = getMenuVORedirect("/system","system","/system/base","Tools","系统配置"); MenuVO menuVO31 = getMenuVO("/system/base","base","/system/base/index","UserFilled","通用配置"); - MenuVO menuVO32 = getMenuVO("/system/dict","dict","/system/dict/index","DataAnalysis","数据字典"); + 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)); @@ -82,7 +82,7 @@ public class MenuController { HttpResult> result = new HttpResult<>(); result.setData(menuVOList); - result.setCode("200"); + result.setCode("A0000"); result.setMessage("成功"); return result; } diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/constant/SystemValidMessage.java b/system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java similarity index 97% rename from system/src/main/java/com/njcn/gather/system/dictionary/pojo/constant/SystemValidMessage.java rename to system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java index b64a66d7..19ebaf41 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/constant/SystemValidMessage.java +++ b/system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java @@ -1,4 +1,4 @@ -package com.njcn.gather.system.dictionary.pojo.constant; +package com.njcn.gather.system.pojo.constant; /** * @author hongawen diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/enums/SystemResponseEnum.java b/system/src/main/java/com/njcn/gather/system/pojo/enums/SystemResponseEnum.java similarity index 98% rename from system/src/main/java/com/njcn/gather/system/dictionary/pojo/enums/SystemResponseEnum.java rename to system/src/main/java/com/njcn/gather/system/pojo/enums/SystemResponseEnum.java index 57ab0248..0c82600d 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/enums/SystemResponseEnum.java +++ b/system/src/main/java/com/njcn/gather/system/pojo/enums/SystemResponseEnum.java @@ -1,4 +1,4 @@ -package com.njcn.gather.system.dictionary.pojo.enums; +package com.njcn.gather.system.pojo.enums; import lombok.Getter;