Skip to content

G
guns-vip
Commit c35575e7 by fengshuonan
Options

整理字典包装类

parent 889e4aea
Showing with 15 additions and 52 deletions
src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DeptDict.java
...@@ -28,10 +28,10 @@ public class DeptDict extends AbstractDictMap { ...@@ -28,10 +28,10 @@ public class DeptDict extends AbstractDictMap {
@Override @Override
public void init() { public void init() {
put("deptId", "部门名称"); put("deptId", "部门名称");
put("num", "部门排序"); put("sort", "部门排序");
put("pid", "上级名称"); put("pid", "上级名称");
put("simplename", "部门简称"); put("simpleName", "部门简称");
put("fullname", "部门全称"); put("fullName", "部门全称");
put("description", "备注"); put("description", "备注");
} }
......
src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/DictMap.java
...@@ -28,8 +28,10 @@ public class DictMap extends AbstractDictMap { ...@@ -28,8 +28,10 @@ public class DictMap extends AbstractDictMap {
@Override @Override
public void init() { public void init() {
put("dictId", "字典名称"); put("dictId", "字典名称");
put("dictName", "字典名称"); put("name", "字典名称");
put("dictValues", "字典内容"); put("code", "字典编码");
put("description", "字典描述");
put("sort", "排序");
} }
@Override @Override
......
src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/LogDict.java deleted 100644 → 0
/**
* Copyright 2018-2020 stylefeng & fengshuonan (https://gitee.com/stylefeng)
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.stylefeng.guns.core.common.constant.dictmap;
import cn.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
/**
* 日志的字典
*
* @author fengshuonan
* @date 2017-05-06 15:01
*/
public class LogDict extends AbstractDictMap {
@Override
public void init() {
put("description", "备注");
}
@Override
protected void initBeWrapped() {
}
}
src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/MenuDict.java
...@@ -28,18 +28,16 @@ public class MenuDict extends AbstractDictMap { ...@@ -28,18 +28,16 @@ public class MenuDict extends AbstractDictMap {
@Override @Override
public void init() { public void init() {
put("menuId", "菜单id"); put("menuId", "菜单id");
put("id", "菜单id");
put("code", "菜单编号"); put("code", "菜单编号");
put("pcode", "菜单父编号"); put("pcode", "菜单父编号");
put("name", "菜单名称"); put("name", "菜单名称");
put("icon", "菜单图标"); put("icon", "菜单图标");
put("url", "url地址"); put("url", "url地址");
put("num", "菜单排序号"); put("sort", "菜单排序号");
put("levels", "菜单层级"); put("levels", "菜单层级");
put("description", "备注"); put("description", "备注");
put("status", "菜单状态"); put("status", "菜单状态");
put("isopen", "是否打开"); put("openFlag", "是否打开");
put("", "");
} }
@Override @Override
......
src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/RoleDict.java
...@@ -28,10 +28,9 @@ public class RoleDict extends AbstractDictMap { ...@@ -28,10 +28,9 @@ public class RoleDict extends AbstractDictMap {
@Override @Override
public void init() { public void init() {
put("roleId", "角色名称"); put("roleId", "角色名称");
put("num", "角色排序"); put("sort", "角色排序");
put("pid", "角色的父级"); put("pid", "角色的父级");
put("name", "角色名称"); put("name", "角色名称");
put("deptId", "部门名称");
put("description", "备注"); put("description", "备注");
put("ids", "资源名称"); put("ids", "资源名称");
} }
......
src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/UserDict.java
...@@ -35,7 +35,7 @@ public class UserDict extends AbstractDictMap { ...@@ -35,7 +35,7 @@ public class UserDict extends AbstractDictMap {
put("sex", "性别"); put("sex", "性别");
put("email", "电子邮件"); put("email", "电子邮件");
put("phone", "电话"); put("phone", "电话");
put("roleid", "角色名称"); put("roleId", "角色名称");
put("deptId", "部门名称"); put("deptId", "部门名称");
put("roleIds", "角色名称集合"); put("roleIds", "角色名称集合");
} }
...@@ -44,7 +44,7 @@ public class UserDict extends AbstractDictMap { ...@@ -44,7 +44,7 @@ public class UserDict extends AbstractDictMap {
protected void initBeWrapped() { protected void initBeWrapped() {
putFieldWrapperMethodName("sex", "getSexName"); putFieldWrapperMethodName("sex", "getSexName");
putFieldWrapperMethodName("deptId", "getDeptName"); putFieldWrapperMethodName("deptId", "getDeptName");
putFieldWrapperMethodName("roleid", "getSingleRoleName"); putFieldWrapperMethodName("roleId", "getSingleRoleName");
putFieldWrapperMethodName("userId", "getUserAccountById"); putFieldWrapperMethodName("userId", "getUserAccountById");
putFieldWrapperMethodName("roleIds", "getRoleName"); putFieldWrapperMethodName("roleIds", "getRoleName");
} }
......
src/main/java/cn/stylefeng/guns/core/common/constant/dictmap/factory/DictFieldWarpperFactory.java
...@@ -37,8 +37,8 @@ public class DictFieldWarpperFactory { ...@@ -37,8 +37,8 @@ public class DictFieldWarpperFactory {
return method.invoke(constantFactory, parameter); return method.invoke(constantFactory, parameter);
} catch (Exception e) { } catch (Exception e) {
try { try {
Method method = IConstantFactory.class.getMethod(methodName, Integer.class); Method method = IConstantFactory.class.getMethod(methodName, Long.class);
return method.invoke(constantFactory, Integer.parseInt(parameter.toString())); return method.invoke(constantFactory, Long.parseLong(parameter.toString()));
} catch (Exception e1) { } catch (Exception e1) {
throw new ServiceException(BizExceptionEnum.ERROR_WRAPPER_FIELD); throw new ServiceException(BizExceptionEnum.ERROR_WRAPPER_FIELD);
} }
......
src/main/webapp/pages/modular/system/user/user_edit.html
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/user/user_edit.js"]}){ @layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/user/user_edit.js"]}){
<form id="userForm" lay-filter="userForm" class="layui-form model-form"> <form id="userForm" lay-filter="userForm" class="layui-form model-form">
<input name="userId" type="hidden"/> <input name="userId" type="hidden"/>
<input name="account" type="hidden"/>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">姓名<span style="color: red;">*</span></label> <label class="layui-form-label">姓名<span style="color: red;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment