微调
This commit is contained in:
@@ -18,7 +18,7 @@ public class AuthController {
|
|||||||
token.setAccessToken("bqddxxwqmfncffacvbpkuxvwvqrhln");
|
token.setAccessToken("bqddxxwqmfncffacvbpkuxvwvqrhln");
|
||||||
HttpResult<Token> result = new HttpResult<>();
|
HttpResult<Token> result = new HttpResult<>();
|
||||||
result.setMessage("成功");
|
result.setMessage("成功");
|
||||||
result.setCode("200");
|
result.setCode("A0000");
|
||||||
result.setData(token);
|
result.setData(token);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -27,7 +27,7 @@ public class AuthController {
|
|||||||
public HttpResult<String> logout() {
|
public HttpResult<String> logout() {
|
||||||
HttpResult<String> result = new HttpResult<>();
|
HttpResult<String> result = new HttpResult<>();
|
||||||
result.setMessage("成功");
|
result.setMessage("成功");
|
||||||
result.setCode("200");
|
result.setCode("A0000");
|
||||||
result.setData("退出成功");
|
result.setData("退出成功");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package com.njcn.gather.system.dictionary.controller;
|
package com.njcn.gather.system.dictionary.controller;
|
||||||
|
|
||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
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.pojo.po.DictType;
|
||||||
import com.njcn.gather.system.dictionary.service.IDictTypeService;
|
import com.njcn.gather.system.dictionary.service.IDictTypeService;
|
||||||
import com.njcn.web.controller.BaseController;
|
import com.njcn.web.controller.BaseController;
|
||||||
import com.njcn.web.pojo.dto.SimpleTreeDTO;
|
|
||||||
import com.njcn.web.utils.HttpResultUtil;
|
import com.njcn.web.utils.HttpResultUtil;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.njcn.gather.system.dictionary.pojo.param;
|
package com.njcn.gather.system.dictionary.pojo.param;
|
||||||
|
|
||||||
import com.njcn.common.pojo.constant.PatternRegex;
|
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 com.njcn.web.pojo.param.BaseParam;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.njcn.gather.system.dictionary.pojo.param;
|
package com.njcn.gather.system.dictionary.pojo.param;
|
||||||
|
|
||||||
import com.njcn.common.pojo.constant.PatternRegex;
|
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 com.njcn.web.pojo.param.BaseParam;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -36,16 +36,16 @@ public class DictTypeParam {
|
|||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("开启等级:0-不开启;1-开启,默认不开启")
|
@ApiModelProperty("开启等级:0-不开启;1-开启,默认不开启")
|
||||||
@NotNull(message = SystemValidMessage.OPEN_LEVEL_NOT_NULL)
|
// @NotNull(message = SystemValidMessage.OPEN_LEVEL_NOT_NULL)
|
||||||
@Min(value = 0, message = SystemValidMessage.OPEN_LEVEL_FORMAT_ERROR)
|
// @Min(value = 0, message = SystemValidMessage.OPEN_LEVEL_FORMAT_ERROR)
|
||||||
@Max(value = 1, message = SystemValidMessage.OPEN_LEVEL_FORMAT_ERROR)
|
// @Max(value = 1, message = SystemValidMessage.OPEN_LEVEL_FORMAT_ERROR)
|
||||||
private Integer openLevel;
|
private Integer openLevel;
|
||||||
|
|
||||||
|
|
||||||
@ApiModelProperty("开启算法描述:0-不开启;1-开启,默认不开启")
|
@ApiModelProperty("开启算法描述:0-不开启;1-开启,默认不开启")
|
||||||
@NotNull(message = SystemValidMessage.OPEN_DESCRIBE_NOT_NULL)
|
// @NotNull(message = SystemValidMessage.OPEN_DESCRIBE_NOT_NULL)
|
||||||
@Min(value = 0, message = SystemValidMessage.OPEN_DESCRIBE_FORMAT_ERROR)
|
// @Min(value = 0, message = SystemValidMessage.OPEN_DESCRIBE_FORMAT_ERROR)
|
||||||
@Max(value = 1, message = SystemValidMessage.OPEN_DESCRIBE_FORMAT_ERROR)
|
// @Max(value = 1, message = SystemValidMessage.OPEN_DESCRIBE_FORMAT_ERROR)
|
||||||
private Integer openDescribe;
|
private Integer openDescribe;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import com.njcn.common.pojo.exception.BusinessException;
|
|||||||
import com.njcn.db.mybatisplus.constant.DbConstant;
|
import com.njcn.db.mybatisplus.constant.DbConstant;
|
||||||
import com.njcn.gather.system.dictionary.mapper.DictDataMapper;
|
import com.njcn.gather.system.dictionary.mapper.DictDataMapper;
|
||||||
import com.njcn.gather.system.dictionary.pojo.dto.DictDataCache;
|
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.param.DictDataParam;
|
||||||
import com.njcn.gather.system.dictionary.pojo.po.DictData;
|
import com.njcn.gather.system.dictionary.pojo.po.DictData;
|
||||||
import com.njcn.gather.system.dictionary.pojo.po.DictType;
|
import com.njcn.gather.system.dictionary.pojo.po.DictType;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import com.njcn.common.pojo.enums.common.DataStateEnum;
|
|||||||
import com.njcn.common.pojo.exception.BusinessException;
|
import com.njcn.common.pojo.exception.BusinessException;
|
||||||
import com.njcn.db.mybatisplus.constant.DbConstant;
|
import com.njcn.db.mybatisplus.constant.DbConstant;
|
||||||
import com.njcn.gather.system.dictionary.mapper.DictTypeMapper;
|
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.param.DictTypeParam;
|
||||||
import com.njcn.gather.system.dictionary.pojo.po.DictType;
|
import com.njcn.gather.system.dictionary.pojo.po.DictType;
|
||||||
import com.njcn.gather.system.dictionary.service.IDictTypeService;
|
import com.njcn.gather.system.dictionary.service.IDictTypeService;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ public class ButtonController {
|
|||||||
ButtonVO buttonVO = new ButtonVO();
|
ButtonVO buttonVO = new ButtonVO();
|
||||||
HttpResult<ButtonVO> result = new HttpResult<>();
|
HttpResult<ButtonVO> result = new HttpResult<>();
|
||||||
result.setMessage("成功");
|
result.setMessage("成功");
|
||||||
result.setCode("200");
|
result.setCode("A0000");
|
||||||
result.setData(buttonVO);
|
result.setData(buttonVO);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public class MenuController {
|
|||||||
|
|
||||||
MenuVO menuVO3 = getMenuVORedirect("/system","system","/system/base","Tools","系统配置");
|
MenuVO menuVO3 = getMenuVORedirect("/system","system","/system/base","Tools","系统配置");
|
||||||
MenuVO menuVO31 = getMenuVO("/system/base","base","/system/base/index","UserFilled","通用配置");
|
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 menuVO33 = getMenuVO("/system/template","template","/system/template/index","Memo","报告模板");
|
||||||
MenuVO menuVO34 = getMenuVO("/system/versionRegister","versionRegister","/system/versionRegister/index","SetUp","版本注册");
|
MenuVO menuVO34 = getMenuVO("/system/versionRegister","versionRegister","/system/versionRegister/index","SetUp","版本注册");
|
||||||
menuVO3.setChildren(CollectionUtil.toList(menuVO31,menuVO32,menuVO33,menuVO34));
|
menuVO3.setChildren(CollectionUtil.toList(menuVO31,menuVO32,menuVO33,menuVO34));
|
||||||
@@ -82,7 +82,7 @@ public class MenuController {
|
|||||||
|
|
||||||
HttpResult<List<MenuVO>> result = new HttpResult<>();
|
HttpResult<List<MenuVO>> result = new HttpResult<>();
|
||||||
result.setData(menuVOList);
|
result.setData(menuVOList);
|
||||||
result.setCode("200");
|
result.setCode("A0000");
|
||||||
result.setMessage("成功");
|
result.setMessage("成功");
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.njcn.gather.system.dictionary.pojo.constant;
|
package com.njcn.gather.system.pojo.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author hongawen
|
* @author hongawen
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.njcn.gather.system.dictionary.pojo.enums;
|
package com.njcn.gather.system.pojo.enums;
|
||||||
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
Reference in New Issue
Block a user