Merge branch 'master' of http://192.168.101.10:13000/boman/boman-framwork

boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysDept.java

@@ -19,7 +19,7 @@ public class SysDept extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 部门ID */
-    private Long deptId;
+    private Long id;
 
     /** 父部门ID */
     private Long parentId;
@@ -54,14 +54,12 @@ public class SysDept extends BaseEntity
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
-    public Long getDeptId()
-    {
-        return deptId;
+    public Long getId() {
+        return id;
     }
 
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     public Long getParentId()
@@ -183,7 +181,7 @@ public class SysDept extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deptId", getDeptId())
+            .append("id", getId())
             .append("parentId", getParentId())
             .append("ancestors", getAncestors())
             .append("deptName", getDeptName())

boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysOperLog.java

@@ -17,7 +17,7 @@ public class SysOperLog extends BaseEntity
 
     /** 日志主键 */
     @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
-    private Long operId;
+    private Long id;
 
     /** 操作模块 */
     @Excel(name = "操作模块")
@@ -79,14 +79,14 @@ public class SysOperLog extends BaseEntity
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;
 
-    public Long getOperId()
+    public Long getid()
     {
-        return operId;
+        return id;
     }
 
-    public void setOperId(Long operId)
+    public void setid(Long id)
     {
-        this.operId = operId;
+        this.id = id;
     }
 
     public String getTitle()

boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysRole.java

@@ -8,6 +8,8 @@ import com.boman.common.core.annotation.Excel;
 import com.boman.common.core.annotation.Excel.ColumnType;
 import com.boman.common.core.web.domain.BaseEntity;
 
+import java.util.Arrays;
+
 /**
  * 角色表 sys_role
  * 
@@ -19,7 +21,7 @@ public class SysRole extends BaseEntity
 
     /** 角色ID */
     @Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
-    private Long roleId;
+    private Long id;
 
     /** 角色名称 */
     @Excel(name = "角色名称")
@@ -64,29 +66,29 @@ public class SysRole extends BaseEntity
 
     }
 
-    public SysRole(Long roleId)
+    public SysRole(Long id)
     {
-        this.roleId = roleId;
+        this.id = id;
     }
 
-    public Long getRoleId()
+    public Long getId()
     {
-        return roleId;
+        return id;
     }
 
-    public void setRoleId(Long roleId)
+    public void setId(Long id)
     {
-        this.roleId = roleId;
+        this.id = id;
     }
 
     public boolean isAdmin()
     {
-        return isAdmin(this.roleId);
+        return isAdmin(this.id);
     }
 
-    public static boolean isAdmin(Long roleId)
+    public static boolean isAdmin(Long id)
     {
-        return roleId != null && 1L == roleId;
+        return id != null && 1L == id;
     }
 
     @NotBlank(message = "角色名称不能为空")
@@ -203,23 +205,22 @@ public class SysRole extends BaseEntity
     {
         this.deptIds = deptIds;
     }
-    
+
+    @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("roleName", getRoleName())
-            .append("roleKey", getRoleKey())
-            .append("roleSort", getRoleSort())
-            .append("dataScope", getDataScope())
-            .append("menuCheckStrictly", isMenuCheckStrictly())
-            .append("deptCheckStrictly", isDeptCheckStrictly())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "SysRole{" +
+                "id=" + id +
+                ", roleName='" + roleName + '\'' +
+                ", roleKey='" + roleKey + '\'' +
+                ", roleSort='" + roleSort + '\'' +
+                ", dataScope='" + dataScope + '\'' +
+                ", menuCheckStrictly=" + menuCheckStrictly +
+                ", deptCheckStrictly=" + deptCheckStrictly +
+                ", status='" + status + '\'' +
+                ", delFlag='" + delFlag + '\'' +
+                ", flag=" + flag +
+                ", menuIds=" + Arrays.toString(menuIds) +
+                ", deptIds=" + Arrays.toString(deptIds) +
+                '}';
     }
 }

boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysUser.java

@@ -25,7 +25,7 @@ public class SysUser extends BaseEntity
 
     /** 用户ID */
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
-    private Long userId;
+    private Long id;
 
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
@@ -96,29 +96,29 @@ public class SysUser extends BaseEntity
 
     }
 
-    public SysUser(Long userId)
+    public SysUser(Long id)
     {
-        this.userId = userId;
+        this.id = id;
     }
 
-    public Long getUserId()
+    public Long getId()
     {
-        return userId;
+        return id;
     }
 
-    public void setUserId(Long userId)
+    public void setId(Long id)
     {
-        this.userId = userId;
+        this.id = id;
     }
 
     public boolean isAdmin()
     {
-        return isAdmin(this.userId);
+        return isAdmin(this.id);
     }
 
-    public static boolean isAdmin(Long userId)
+    public static boolean isAdmin(Long id)
     {
-        return userId != null && 1L == userId;
+        return id != null && 1L == id;
     }
 
     public Long getDeptId()
@@ -301,7 +301,7 @@ public class SysUser extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
+            .append("id", getId())
             .append("deptId", getDeptId())
             .append("userName", getUserName())
             .append("nickName", getNickName())

boman-common/boman-common-core/src/main/java/com/boman/common/core/web/domain/AjaxResult.java

@@ -159,4 +159,12 @@ public class AjaxResult extends HashMap<String, Object>
     {
         return new AjaxResult(code, msg, null);
     }
+
+    public static boolean checkSuccess(AjaxResult ajaxResult){
+        return null != ajaxResult && HttpStatus.SUCCESS == ((int) ajaxResult.get(CODE_TAG));
+    }
+
+    public static boolean checkFail(AjaxResult ajaxResult){
+        return !checkSuccess(ajaxResult);
+    }
 }

boman-common/boman-common-datascope/src/main/java/com/boman/common/datascope/aspect/DataScopeAspect.java

@@ -117,7 +117,7 @@ public class DataScopeAspect
             {
                 sqlString.append(StringUtils.format(
                         " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
-                        role.getRoleId()));
+                        role.getId()));
             }
             else if (DATA_SCOPE_DEPT.equals(dataScope))
             {
@@ -133,7 +133,7 @@ public class DataScopeAspect
             {
                 if (StringUtils.isNotBlank(userAlias))
                 {
-                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getId()));
                 }
                 else
                 {

boman-modules/boman-gen/src/main/java/com/boman/gen/controller/MyController.java

@@ -77,4 +77,23 @@ public class MyController extends BaseController {
     }
 
 
+    /**手动更新redis缓存表数据
+    * @Description
+    * @author tjf
+    * @Date 2021/3/29
+    */
+    public AjaxResult updateRedisTable(){
+        //获取所有的表和表字段,更新到redis中
+        List<GenTable> tableList = genTableService.selectGenTableList(new GenTable());
+        if (null == tableList || tableList.isEmpty()) {
+            return AjaxResult.error("当前没有可更新数据");
+        }
+        List<Long> tableIdList = tableList.stream().map(GenTable::getTableId).collect(Collectors.toList());
+        List<GenTableColumn> genTableColumns = genTableColumnService.listByTableIdList(tableIdList);
+        if (null == genTableColumns || genTableColumns.isEmpty()) {
+            return AjaxResult.error("当前没有可更新数据");
+        }
+        packTableAndInsertToRedis(tableList, genTableColumns);
+        return AjaxResult.success();
+    }
 }

boman-modules/boman-system/src/main/java/com/boman/system/common/ApplicationContextHandle.java

@@ -1,43 +0,0 @@
-package com.boman.system.common;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 15:27
- **/
-public class ApplicationContextHandle implements ApplicationContextAware {
-
-    private static ApplicationContext applicationContext;
-
-    public ApplicationContextHandle() {
-    }
-
-    public static Object getBean(String name) throws BeansException {
-        return applicationContext.getBean(name);
-    }
-
-    public static ApplicationContext getApplicationContext() {
-        return applicationContext;
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        if (ApplicationContextHandle.applicationContext == null) {
-            ApplicationContextHandle.applicationContext = applicationContext;
-        }
-
-        System.out.println("========ApplicationContext配置成功,在普通类可以通过调用SpringUtils.getAppContext()获取applicationContext对象,applicationContext=" + ApplicationContextHandle.applicationContext + "========");
-    }
-
-    public static <T> T getBean(Class<T> clazz) {
-        return getApplicationContext().getBean(clazz);
-    }
-
-    public static <T> T getBean(String name, Class<T> clazz) {
-        return getApplicationContext().getBean(name, clazz);
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/BaseFilter.java

@@ -1,23 +0,0 @@
-package com.boman.system.common;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 11:02
- **/
-public class BaseFilter {
-
-    private static final Logger log = LoggerFactory.getLogger(BaseFilter.class);
-
-    public BaseFilter() {
-    }
-
-    public void before(TableServiceContext context, MainTableRecord row) {
-    }
-
-    public void after(TableServiceContext context, MainTableRecord row) {
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/BaseTableService.java

@@ -1,80 +0,0 @@
-package com.boman.system.common;
-
-import com.boman.system.service.impl.BaseSaveService;
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 10:30
- **/
-public abstract class BaseTableService  implements TableService{
-
-
-    @Autowired
-    @Qualifier("baseSaveService-one")
-    private BaseSaveService baseSaveService;
-    @Getter
-    private String tableName;
-
-    private boolean isInitialized;
-
-    public BaseTableService() {
-    }
-
-    protected BaseTableService(String tableName) {
-        this.tableName = tableName;
-        isInitialized = false;
-    }
-
-    @Override
-    public final void configure(TableServiceContext context) {
-        if (!isInitialized) {
-            doConfigure(context);
-            isInitialized = true;
-        }
-    }
-
-    protected void doConfigure(TableServiceContext context) {
-        //每个业务可以在自己所在的自定义服务实现内部调整下自己的上下文（针对validators/filters的调整）
-        //本方法一个表只会执行一次才对
-    }
-
-    @Override
-    public RowResult executeAction(TableServiceContext context, MainTableRecord row) {
-        LOGGER.debug("action====>" + context.getActionName());
-        return baseSaveService.insertRow(context, row, context.getCurrentTime());
-
-
-//        switch (context.getActionName()) {
-//            case Constants.ACTION_SAVE:
-//                switch (row.getAction()) {
-//                    case INSERT:
-//                        return baseSaveService.insertRow(context, row, context.getCurrentTime());
-//                    case UPDATE:
-//                        //return baseSaveService.updateRow(context, row, context.getCurrentTime());
-//                    default:
-//                }
-//                throw new NDSException("不应该执行到这里吧！");
-//            case Constants.ACTION_DELETE:
-//                //return baseDelService.delete(context, row);
-//            case Constants.ACTION_VOID:
-//                //return baseVoidService.execute(context, row);
-//            case Constants.ACTION_SUBMIT:
-//                //return baseSubmitService.isFlow(context, row);
-//            case Constants.ACTION_UNSUBMIT:
-//                //return baseUnSubmitService.execute(context, row);
-//
-//            default:
-////            default:
-////                return RowResult.error("未知动作：" + context.getActionName());
-//        }
-//        return RowResult.ok(context.getLocale());
-
-//        return RowResult.ok("");
-    }
-
-
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/BusinessResult.java

@@ -1,307 +0,0 @@
-package com.boman.system.common;
-
-import com.alibaba.fastjson.JSONObject;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 13:51
- **/
-public class BusinessResult implements Serializable {
-    private static final long serialVersionUID = 5882709765648149444L;
-    private Long objId;
-    private List<BusinessResult.Error> errors;
-    private BusinessResult.ExtAttr extAttr;
-    private JSONObject notice;
-
-    public BusinessResult() {
-    }
-
-    public BusinessResult(Long objId) {
-        this.objId = objId;
-    }
-
-    public BusinessResult(Long objId, List<BusinessResult.Error> error) {
-        this.objId = objId;
-        this.errors = error;
-    }
-
-    public void putErrorItem(Long id, Integer code, String message) {
-        if (this.errors == null) {
-            this.errors = new ArrayList();
-        }
-
-        this.errors.add(new BusinessResult.Error(id, code, message));
-    }
-
-    public Long getObjId() {
-        return this.objId;
-    }
-
-    public List<BusinessResult.Error> getErrors() {
-        return this.errors;
-    }
-
-    public BusinessResult.ExtAttr getExtAttr() {
-        return this.extAttr;
-    }
-
-    public JSONObject getNotice() {
-        return this.notice;
-    }
-
-    public void setObjId(final Long objId) {
-        this.objId = objId;
-    }
-
-    public void setErrors(final List<BusinessResult.Error> errors) {
-        this.errors = errors;
-    }
-
-    public void setExtAttr(final BusinessResult.ExtAttr extAttr) {
-        this.extAttr = extAttr;
-    }
-
-    public void setNotice(final JSONObject notice) {
-        this.notice = notice;
-    }
-
-    public boolean equals(final Object o) {
-        if (o == this) {
-            return true;
-        } else if (!(o instanceof BusinessResult)) {
-            return false;
-        } else {
-            BusinessResult other = (BusinessResult)o;
-            if (!other.canEqual(this)) {
-                return false;
-            } else {
-                label59: {
-                    Object this$objId = this.getObjId();
-                    Object other$objId = other.getObjId();
-                    if (this$objId == null) {
-                        if (other$objId == null) {
-                            break label59;
-                        }
-                    } else if (this$objId.equals(other$objId)) {
-                        break label59;
-                    }
-
-                    return false;
-                }
-
-                Object this$errors = this.getErrors();
-                Object other$errors = other.getErrors();
-                if (this$errors == null) {
-                    if (other$errors != null) {
-                        return false;
-                    }
-                } else if (!this$errors.equals(other$errors)) {
-                    return false;
-                }
-
-                Object this$extAttr = this.getExtAttr();
-                Object other$extAttr = other.getExtAttr();
-                if (this$extAttr == null) {
-                    if (other$extAttr != null) {
-                        return false;
-                    }
-                } else if (!this$extAttr.equals(other$extAttr)) {
-                    return false;
-                }
-
-                Object this$notice = this.getNotice();
-                Object other$notice = other.getNotice();
-                if (this$notice == null) {
-                    return other$notice == null;
-                } else return this$notice.equals(other$notice);
-            }
-        }
-    }
-
-    protected boolean canEqual(final Object other) {
-        return other instanceof BusinessResult;
-    }
-
-    @Override
-    public int hashCode() {
-        boolean PRIME = true;
-        int result = 1;
-        Object $objId = this.getObjId();
-        result = result * 59 + ($objId == null ? 43 : $objId.hashCode());
-        Object $errors = this.getErrors();
-        result = result * 59 + ($errors == null ? 43 : $errors.hashCode());
-        Object $extAttr = this.getExtAttr();
-        result = result * 59 + ($extAttr == null ? 43 : $extAttr.hashCode());
-        Object $notice = this.getNotice();
-        result = result * 59 + ($notice == null ? 43 : $notice.hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "BusinessResult(objId=" + this.getObjId() + ", errors=" + this.getErrors() + ", extAttr=" + this.getExtAttr() + ", notice=" + this.getNotice() + ")";
-    }
-
-    public static class Error {
-        private Long id;
-        private Integer code;
-        private String message;
-
-        public Error() {
-        }
-
-        public Error(Long id, Integer code, String message) {
-            this.id = id;
-            this.code = code;
-            this.message = message;
-        }
-
-        public Long getId() {
-            return this.id;
-        }
-
-        public Integer getCode() {
-            return this.code;
-        }
-
-        public String getMessage() {
-            return this.message;
-        }
-
-        public void setId(final Long id) {
-            this.id = id;
-        }
-
-        public void setCode(final Integer code) {
-            this.code = code;
-        }
-
-        public void setMessage(final String message) {
-            this.message = message;
-        }
-
-        public boolean equals(final Object o) {
-            if (o == this) {
-                return true;
-            } else if (!(o instanceof BusinessResult.Error)) {
-                return false;
-            } else {
-                BusinessResult.Error other = (BusinessResult.Error)o;
-                if (!other.canEqual(this)) {
-                    return false;
-                } else {
-                    label47: {
-                        Object this$id = this.getId();
-                        Object other$id = other.getId();
-                        if (this$id == null) {
-                            if (other$id == null) {
-                                break label47;
-                            }
-                        } else if (this$id.equals(other$id)) {
-                            break label47;
-                        }
-
-                        return false;
-                    }
-
-                    Object this$code = this.getCode();
-                    Object other$code = other.getCode();
-                    if (this$code == null) {
-                        if (other$code != null) {
-                            return false;
-                        }
-                    } else if (!this$code.equals(other$code)) {
-                        return false;
-                    }
-
-                    Object this$message = this.getMessage();
-                    Object other$message = other.getMessage();
-                    if (this$message == null) {
-                        return other$message == null;
-                    } else return this$message.equals(other$message);
-                }
-            }
-        }
-
-        protected boolean canEqual(final Object other) {
-            return other instanceof BusinessResult.Error;
-        }
-
-        public int hashCode() {
-            boolean PRIME = true;
-            int result = 1;
-            Object $id = this.getId();
-            result = result * 59 + ($id == null ? 43 : $id.hashCode());
-            Object $code = this.getCode();
-            result = result * 59 + ($code == null ? 43 : $code.hashCode());
-            Object $message = this.getMessage();
-            result = result * 59 + ($message == null ? 43 : $message.hashCode());
-            return result;
-        }
-
-        @Override
-        public String toString() {
-            return "BusinessResult.Error(id=" + this.getId() + ", code=" + this.getCode() + ", message=" + this.getMessage() + ")";
-        }
-    }
-
-    public static class ExtAttr {
-        private Integer msgType;
-
-        public ExtAttr() {
-        }
-
-        public ExtAttr(Integer msgType) {
-            this.msgType = msgType;
-        }
-
-        public Integer getMsgType() {
-            return this.msgType;
-        }
-
-        public void setMsgType(final Integer msgType) {
-            this.msgType = msgType;
-        }
-
-        public boolean equals(final Object o) {
-            if (o == this) {
-                return true;
-            } else if (!(o instanceof BusinessResult.ExtAttr)) {
-                return false;
-            } else {
-                BusinessResult.ExtAttr other = (BusinessResult.ExtAttr)o;
-                if (!other.canEqual(this)) {
-                    return false;
-                } else {
-                    Object this$msgType = this.getMsgType();
-                    Object other$msgType = other.getMsgType();
-                    if (this$msgType == null) {
-                        return other$msgType == null;
-                    } else return this$msgType.equals(other$msgType);
-                }
-            }
-        }
-
-        protected boolean canEqual(final Object other) {
-            return other instanceof BusinessResult.ExtAttr;
-        }
-
-        public int hashCode() {
-            boolean PRIME = true;
-            int result = 1;
-            Object $msgType = this.getMsgType();
-            result = result * 59 + ($msgType == null ? 43 : $msgType.hashCode());
-            return result;
-        }
-
-        @Override
-        public String toString() {
-            return "BusinessResult.ExtAttr(msgType=" + this.getMsgType() + ")";
-        }
-    }
-}
-

boman-modules/boman-system/src/main/java/com/boman/system/common/Column.java

@@ -1,190 +0,0 @@
-package com.boman.system.common;
-
-import java.io.Serializable;
-import java.util.Locale;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 16:16
- **/
-public interface Column extends Serializable {
-
-    int NUMBER = 0;
-    int DATE = 1;
-    int STRING = 2;
-    int DATENUMBER = 3;
-    int TIME = 4;
-    int OTHER = 9;
-    int ADD = 0;
-    int MODIFY = 1;
-    int QUERY_LIST = 2;
-    int QUERY_SUBLIST = 3;
-    int QUERY_OBJECT = 4;
-    int PRINT_LIST = 5;
-    int PRINT_SUBLIST = 6;
-    int PRINT_OBJECT = 7;
-    int MASK_CREATE_SHOW = 0;
-    int MASK_CREATE_EDIT = 1;
-    int MASK_MODIFIY_SHOW = 2;
-    int MASK_MODIFY_EDIT = 3;
-    int MASK_QUERY_LIST = 4;
-    int MASK_QUERY_SUBLIST = 5;
-    int MASK_QUERY_OBJECTVIEW = 6;
-    int MASK_PRINT_LIST = 7;
-    int MASK_PRINT_SUBLIST = 8;
-    int MASK_PRINT_OBJECTVIEW = 9;
-    int ON_DELETE_NOACTION = 0;
-    int ON_DELETE_SETNULL = 1;
-    int ON_DELETE_CASCADE = 2;
-
-//    boolean isAlternateKey();
-//
-//    boolean isAlternateKey2();
-//
-//    boolean isDisplayKey();
-//
-//    String getComment();
-//
-//    String getShowcomment();
-//
-//    Boolean getIsorder();
-//
-//    Boolean getShowtitle();
-//
-//    Boolean getRowspan();
-//
-//    String getLimitValueGroupName();
-//
-//    boolean isShowable(int action);
-//
-//    boolean isMaskSet(int maskPosition);
-//
-//    boolean isMaskequls(int maskPosition);
-//
-//    boolean isModifiable(int action);
-//
-//    boolean isNullable();
-//
-//    boolean isValueLimited();
-
-//    PairTable getValues(Locale locale);
-//
-//    int getLength();
-//
-//    int getScale();
-//
-//    int getStatSize();
-//
-//    Table getReferenceTable();
-//
-//    Column getReferenceColumn();
-//
-//    Table getReferenceTable(boolean tryDateNumberAsFK, TableManager tm);
-//
-//    Column getReferenceColumn(boolean tryDateNumberAsFK, TableManager tm);
-//
-//    int getDisplayOrder();
-//
-//    String getValueInterpeter();
-//
-//    Object getUIConstructor();
-//
-//    int getId();
-//
-//    String getName();
-//
-//    String getDescription(Locale locale);
-//
-//    int getSQLType();
-//
-//    int getType();
-//
-//    Table getTable();
-//
-//    String getLimit();
-//
-//    String getMoney();
-//
-//    boolean getModifiable();
-//
-//    String getObtainManner();
-//
-//    String getDefaultValue();
-//
-//    String getDefaultValue(boolean eval);
-//
-//    String getReferenceColumnName();
-//
-//    String getTableColumnName();
-//
-//    Table getObjectTable();
-//
-//    String getRegExpression();
-//
-//    Properties getProperties();
-//
-//    String getErrorMessage();
-//
-//    boolean isVirtual();
-//
-//    boolean isComputed();
-//
-//    String getSubTotalMethod();
-//
-//    String getSubTotalDesc();
-//
-//    String getFilter();
-//
-//    DisplaySetting getDisplaySetting();
-//
-//    String getSequenceHead();
-//
-//    boolean isFilteredByWildcard();
-//
-//    List getReferenceColumnsInWildcardFilter();
-//
-//    boolean isColumnLink(TableManager tm);
-//
-//    ColumnLink getColumnLink(TableManager tm) throws QueryException;
-//
-//    Object getUIAlerter();
-//
-//    boolean isUpperCase();
-//
-//    boolean isIndexed();
-//
-//    boolean isAutoComplete();
-//
-//    int getSecurityGrade();
-//
-//    /** @deprecated */
-//    @Deprecated
-//    int getOnDeleteAction();
-//
-//    JSONObject toJSONSimpleObject() throws JSONException;
-//
-//    JSONObject toJSONObject(Locale locale) throws JSONException;
-//
-//    JSONObject getJSONProps();
-//
-//    String getFkdisplay();
-//
-//    String getQuerydefval();
-//
-//    LimitvalueGroup getLimitvalueGroup();
-//
-//    String getSearchtype();
-//
-//    boolean getIsremote();
-//
-//    String getSearchmodel();
-//
-//    String getCommentstp();
-//
-//    Boolean getIsagfilter();
-//
-//    String getAgfilter();
-//
-//    ColumnMeta getColumnMeta();
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/ColumnImpl.java

@@ -1,962 +0,0 @@
-package com.boman.system.common;
-
-import com.alibaba.fastjson.JSONException;
-import com.alibaba.fastjson.JSONObject;
-import io.seata.rm.datasource.sql.struct.ColumnMeta;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-import java.util.regex.Pattern;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 16:17
- **/
-public class ColumnImpl implements Column {
-    private static final Logger log = LoggerFactory.getLogger(ColumnImpl.class);
-    private static final long serialVersionUID = -5809782578272943999L;
-    private static Pattern msgKeyPattern = Pattern.compile("\\p{Punct}");
-    private static Pattern spaceKeyPattern = Pattern.compile(" ");
-    private int id = -1;
-    private String name;
-    private String description;
-    private String description2 = null;
-    private boolean isNullable;
-    private String limit = null;
-    private String money = null;
-    private boolean modifiable;
-    private String obtainManner;
-    private String defaultValue;
-    private String refColumnName;
-    private String tableColumnName;
-    private Table objectTable;
-    private String regExpression;
-    private String errorMessage;
-    private String comment = null;
-    private String filter;
-//    private DisplaySetting displaySetting;
-    private boolean isUpperCase;
-    private int sqltype;
-    private int type;
-    private boolean isAlternateKey;
-    private boolean isAlternateKey2;
-    private boolean isDisplayKey;
-    private String mask;
-    private boolean isValueLimited;
-//    private PairTable values = null;
-    private int length;
-    private Table rTable = null;
-    private Column rColumn = null;
-    private Table table = null;
-    private int displayOrder;
-    private String valueInterpreter = null;
-    private boolean isVirtual = false;
-    private String sumMethod = null;
-    private String sumMethodDesc = "";
-    private int scale = 0;
-    private String sequenceHead = null;
-    private String command = null;
-    private String valueGroupName;
-    private boolean isIndexed = false;
-    private int onDeleteAction = 0;
-    private int statSize = -1;
-    private boolean isFilteredByWildcard = false;
-    private List referenceColumnsInWildcardFilter = null;
-    private Properties props = null;
-    private boolean isAutoComplete = false;
-    private JSONObject jsonProps = null;
-    private String strProps = null;
-    private String showcomment;
-    private int securityGrade = 0;
-    private Boolean showtitle;
-    private boolean isorder = false;
-    private String fkdisplay = null;
-    private String querydefval = null;
-//    private LimitvalueGroup limitvalueGroup;
-    private String searchtype;
-    private Boolean isremote;
-    private String searchmodel;
-    private String commentstp;
-    private Boolean isagfilter;
-    private String agfilter;
-    private boolean isRowspan = false;
-    private Locale defaultlocal = new Locale("zh", "CN");
-    private ColumnMeta columnMeta;
-
-//    public ColumnMeta getColumnMeta() {
-//        return this.columnMeta;
-//    }
-//
-//    public void setColumnMeta(ColumnMeta columnMeta) {
-//        this.columnMeta = columnMeta;
-//    }
-//
-//    public ColumnImpl() {
-//    }
-//
-//    public ColumnImpl(int id, Table table, String columnName, String desc, int sqltype, boolean isNull) {
-//        this.id = id;
-//        this.table = table;
-//        this.name = columnName;
-//        this.description = desc;
-//        this.sqltype = sqltype;
-//        this.type = toGrossType(sqltype);
-//        this.isNullable = isNull;
-//        this.isVirtual = this.checkVirtual();
-//    }
-//
-//    public static int toGrossType(int type) {
-//        byte jType;
-//        switch(type) {
-//            case 1:
-//            case 12:
-//            case 13:
-//            case 22:
-//            case 24:
-//            case 25:
-//                jType = 2;
-//                break;
-//            case 2:
-//            case 3:
-//            case 4:
-//            case 5:
-//            case 6:
-//            case 7:
-//            case 8:
-//            case 9:
-//            case 10:
-//            case 16:
-//                jType = 0;
-//                break;
-//            case 11:
-//            case 14:
-//                jType = 1;
-//                break;
-//            case 15:
-//                jType = 4;
-//                break;
-//            case 17:
-//            case 18:
-//            case 19:
-//            case 20:
-//            case 21:
-//            default:
-//                jType = 9;
-//                break;
-//            case 23:
-//                jType = 3;
-//        }
-//
-//        return jType;
-//    }
-//
-//    public void setIsIndexed(boolean b) {
-//        this.isIndexed = b;
-//    }
-//
-//    public boolean isFilteredByWildcard() {
-//        return this.isFilteredByWildcard;
-//    }
-//
-//    public final Properties getProperties() {
-//        return this.props;
-//    }
-//
-//    public boolean isIndexed() {
-//        return this.isIndexed;
-//    }
-//
-//    public boolean isAutoComplete() {
-//        return this.isAutoComplete;
-//    }
-//
-//    public boolean setIsAutoComplete(boolean b) {
-//        return this.isAutoComplete = b;
-//    }
-//
-//    /** @deprecated */
-//    @Deprecated
-//    public int getOnDeleteAction() {
-//        return this.onDeleteAction;
-//    }
-//
-//    /** @deprecated */
-//    @Deprecated
-//    public void setOnDeleteAction(String s) {
-//        if ("SETNULL".equalsIgnoreCase(s)) {
-//            this.onDeleteAction = 1;
-//        } else if ("CASCADE".equalsIgnoreCase(s)) {
-//            this.onDeleteAction = 2;
-//        }
-//
-//    }
-//
-//    public void setIsNullable(boolean n) {
-//        this.isNullable = n;
-//    }
-//
-//    public String getLimitValueGroupName() {
-//        return this.valueGroupName;
-//    }
-//
-//    public int getScale() {
-//        return this.scale;
-//    }
-//
-//    public void setScale(int scale) {
-//        this.scale = scale;
-//    }
-//
-//    private boolean checkVirtual() {
-//        char[] cs = this.name.toCharArray();
-//
-//        for(int i = 0; i < cs.length; ++i) {
-//            if ((cs[i] < '0' || cs[i] > '9') && cs[i] != '_' && cs[i] != '-' && (cs[i] < 'a' || cs[i] > 'z') && (cs[i] < 'A' || cs[i] > 'Z')) {
-//                return true;
-//            }
-//        }
-//
-//        return false;
-//    }
-//
-//    public int getStatSize() {
-//        return this.statSize;
-//    }
-//
-//    public void setStatSize(int size) {
-//        this.statSize = size;
-//    }
-//
-//    public String getComment() {
-//        return this.comment;
-//    }
-//
-//    public void setComment(String s) {
-//        this.comment = s;
-//    }
-//
-//    public void setIsAlternateKey(boolean ak) {
-//        this.isAlternateKey = ak;
-//    }
-//
-//    public void setIsAlternateKey2(boolean ak2) {
-//        this.isAlternateKey2 = ak2;
-//    }
-//
-//    public void setIsDisplayKey(boolean dk) {
-//        this.isDisplayKey = dk;
-//    }
-//
-//    public boolean isDisplayKey() {
-//        return this.isDisplayKey;
-//    }
-//
-//    public void setMask(String mask) {
-//        this.mask = mask;
-//    }
-//
-//    public void setIsValueLimited(boolean limit) {
-//        this.isValueLimited = limit;
-//    }
-//
-//    public void setValues(String valueGroupName, PairTable vs, Locale locale) {
-//        this.valueGroupName = valueGroupName.toLowerCase();
-//        if (this.values == null) {
-//            this.values = new PairTable();
-//        }
-//
-//        this.values.put(locale, vs);
-//    }
-//
-//    public void setValueInterpreter(String interpreter) {
-//        if (interpreter == null) {
-//            this.valueInterpreter = null;
-//        } else {
-//            this.valueInterpreter = interpreter;
-//        }
-//    }
-//
-//    public boolean isAlternateKey() {
-//        return this.isAlternateKey;
-//    }
-//
-//    public boolean isAlternateKey2() {
-//        return this.isAlternateKey2;
-//    }
-//
-//    public boolean isNullable() {
-//        return this.isNullable || this.displaySetting.getObjectType() == 5;
-//    }
-//
-//    public boolean isMaskSet(int maskPosition) {
-//        if (maskPosition >= 0 && maskPosition < this.mask.length()) {
-//            try {
-//                return this.mask.charAt(maskPosition) == '1';
-//            } catch (IndexOutOfBoundsException var3) {
-//                throw new IllegalArgumentException("mask position out of range:" + maskPosition + ",mask:" + this.mask);
-//            }
-//        } else {
-//            return false;
-//        }
-//    }
-//
-//    public boolean isMaskequls(int maskPosition) {
-//        if (maskPosition >= 0 && maskPosition < this.mask.length()) {
-//            try {
-//                return this.mask.equals(Tools.replaceCharAt("0000000000", maskPosition, '1'));
-//            } catch (IndexOutOfBoundsException var3) {
-//                throw new IllegalArgumentException("mask position out of range:" + maskPosition + ",mask:" + this.mask);
-//            }
-//        } else {
-//            return false;
-//        }
-//    }
-//
-//    public boolean isShowable(int action) {
-//        char c = true;
-//        char c;
-//        switch(action) {
-//            case 0:
-//                c = this.mask.charAt(0);
-//                break;
-//            case 1:
-//                c = this.mask.charAt(2);
-//                break;
-//            case 2:
-//                c = this.mask.charAt(4);
-//                break;
-//            case 3:
-//                c = this.mask.charAt(5);
-//                break;
-//            case 4:
-//                c = this.mask.charAt(6);
-//                break;
-//            case 5:
-//                c = this.mask.charAt(7);
-//                break;
-//            case 6:
-//                c = this.mask.charAt(8);
-//                break;
-//            case 7:
-//                c = this.mask.charAt(9);
-//                break;
-//            default:
-//                throw new IllegalArgumentException("action is not valid:" + action);
-//        }
-//
-//        return c == '1';
-//    }
-//
-//    public boolean isModifiable(int action) {
-//        char c = true;
-//        char c;
-//        switch(action) {
-//            case 0:
-//                c = this.mask.charAt(1);
-//                break;
-//            case 1:
-//                c = this.mask.charAt(3);
-//                break;
-//            case 2:
-//                c = this.mask.charAt(1);
-//                break;
-//            case 3:
-//                c = this.mask.charAt(3);
-//                break;
-//            case 4:
-//                c = '0';
-//                break;
-//            default:
-//                throw new IllegalArgumentException("action is not valid:" + action);
-//        }
-//
-//        return c == '1';
-//    }
-//
-//    public boolean isValueLimited() {
-//        return this.isValueLimited;
-//    }
-//
-//    public PairTable getValues(Locale locale) {
-//        if (this.values == null) {
-//            return null;
-//        } else {
-//            PairTable pt = (PairTable)this.values.get(locale);
-//            if (pt == null) {
-//                pt = new PairTable();
-//                Iterator it = this.getValues(this.defaultlocal).keys();
-//
-//                while(it.hasNext()) {
-//                    Object value = it.next();
-//                    pt.put(value, Resources.getMessage("lmt_" + this.valueGroupName + "_" + value, new Object[0]).toLowerCase());
-//                }
-//
-//                this.values.put(locale, pt);
-//            }
-//
-//            return pt;
-//        }
-//    }
-//
-//    public int getLength() {
-//        return this.length;
-//    }
-//
-//    public void setLength(int leng) {
-//        this.length = leng;
-//    }
-//
-//    public Table getReferenceTable() {
-//        return this.rTable;
-//    }
-//
-//    public void setReferenceTable(Table rt) {
-//        this.rTable = rt;
-//    }
-//
-//    public Column getReferenceColumn() {
-//        return this.rColumn;
-//    }
-//
-//    public void setReferenceColumn(Column rc) {
-//        this.rColumn = rc;
-//    }
-//
-//    public Table getReferenceTable(boolean tryDateNumberAsFK, TableManager tm) {
-//        if (this.rTable != null) {
-//            return this.rTable;
-//        } else {
-//            return tryDateNumberAsFK && this.type == 3 ? tm.getDateTable() : null;
-//        }
-//    }
-//
-//    public Column getReferenceColumn(boolean tryDateNumberAsFK, TableManager tm) {
-//        if (this.rColumn != null) {
-//            return this.rColumn;
-//        } else {
-//            if (tryDateNumberAsFK && this.type == 3) {
-//                Table tb = tm.getDateTable();
-//                if (tb != null) {
-//                    return tb.getPrimaryKey();
-//                }
-//            }
-//
-//            return null;
-//        }
-//    }
-//
-//    public int getDisplayOrder() {
-//        return this.displayOrder;
-//    }
-//
-//    public void setDisplayOrder(int order) {
-//        this.displayOrder = order;
-//    }
-//
-//    public String getValueInterpeter() {
-//        return this.valueInterpreter;
-//    }
-//
-//    public int getId() {
-//        return this.id;
-//    }
-//
-//    public String getName() {
-//        return this.name;
-//    }
-//
-//    public String getDescription() {
-//        return this.description;
-//    }
-//
-//    public String getDescription(Locale locale) {
-//        try {
-//            return Resources.getMessage("adcolumn_" + this.id, locale, new Object[]{this.description});
-//        } catch (MissingResourceException var3) {
-//            return this.description;
-//        }
-//    }
-//
-//    public void setDescription(String desc) {
-//        this.description = desc;
-//    }
-//
-//    private String toMessageKey(String s) {
-//        return spaceKeyPattern.matcher(msgKeyPattern.matcher(s).replaceAll("_")).replaceAll("");
-//    }
-//
-//    public void setDescription2(String desc2) {
-//        this.description2 = desc2;
-//    }
-//
-//    public int getSQLType() {
-//        return this.sqltype;
-//    }
-//
-//    public void setSQLType(int sqlType) {
-//        this.sqltype = sqlType;
-//        this.type = toGrossType(this.sqltype);
-//    }
-//
-//    public int getType() {
-//        return this.type;
-//    }
-//
-//    public Table getTable() {
-//        return this.table;
-//    }
-//
-//    public int hashCode() {
-//        return this.id;
-//    }
-//
-//    public boolean equals(Object c) {
-//        return c instanceof Column && ((Column)c).getId() == this.id;
-//    }
-//
-//    public String toString() {
-//        return this.table.toString() + "." + this.name;
-//    }
-//
-//    public void clone(Object obj) {
-//        if (!(obj instanceof ColumnImpl)) {
-//            throw new IllegalArgumentException("Not a ColumnImpl");
-//        } else {
-//            ColumnImpl ci = (ColumnImpl)obj;
-//            this.description = ci.description;
-//            this.description2 = ci.description2;
-//            this.displayOrder = ci.displayOrder;
-//            this.id = ci.id;
-//            this.isAlternateKey = ci.isAlternateKey;
-//            this.isAlternateKey2 = ci.isAlternateKey2;
-//            this.mask = ci.mask;
-//            this.isValueLimited = ci.isValueLimited;
-//            this.length = ci.length;
-//            this.name = ci.name;
-//            this.rTable = ci.rTable;
-//            this.sqltype = ci.sqltype;
-//            this.table = ci.table;
-//            this.type = ci.type;
-//            this.valueInterpreter = ci.valueInterpreter;
-//            this.values = ci.values;
-//            this.obtainManner = ci.obtainManner;
-//            this.modifiable = ci.modifiable;
-//            this.refColumnName = ci.refColumnName;
-//            this.tableColumnName = ci.tableColumnName;
-//            this.objectTable = ci.objectTable;
-//            this.jsonProps = ci.jsonProps;
-//        }
-//    }
-//
-//    public String getLimit() {
-//        return this.limit;
-//    }
-//
-//    public void setLimit(String limit) {
-//        this.limit = limit;
-//    }
-//
-//    public String getMoney() {
-//        return this.money;
-//    }
-//
-//    public void setMoney(String money) {
-//        this.money = money;
-//    }
-//
-//    public boolean getModifiable() {
-//        return this.modifiable;
-//    }
-//
-//    public void setModifiable(boolean modifiable) {
-//        this.modifiable = modifiable;
-//    }
-//
-//    public String getObtainManner() {
-//        return this.obtainManner;
-//    }
-//
-//    public void setObtainManner(String obtainManner) {
-//        this.obtainManner = obtainManner;
-//    }
-//
-//    public String getDefaultValue() {
-//        return this.getDefaultValue(true);
-//    }
-//
-//    public void setDefaultValue(String defaultValue) {
-//        this.defaultValue = defaultValue;
-//    }
-//
-//    public String getDefaultValue(boolean eval) {
-//        if (eval && this.defaultValue != null && "=".equals(this.defaultValue.substring(0, 1))) {
-//        }
-//
-//        return this.defaultValue;
-//    }
-//
-//    public String getReferenceColumnName() {
-//        return this.refColumnName;
-//    }
-//
-//    public void setReferenceColumnName(String columnName) {
-//        this.refColumnName = columnName;
-//    }
-//
-//    public String getTableColumnName() {
-//        return this.tableColumnName;
-//    }
-//
-//    public void setTableColumnName(String columnName) {
-//        this.tableColumnName = columnName;
-//    }
-//
-//    public Table getObjectTable() {
-//        return this.objectTable;
-//    }
-//
-//    public void setObjectTable(Table objectTable) {
-//        this.objectTable = objectTable;
-//    }
-//
-//    public void setRegExpresion(String regExpression) {
-//        if (Validator.isNotNull(regExpression)) {
-//            if (this.displaySetting == null) {
-//                throw new NDSRuntimeException("Must call setDisplaySetting before setRegExpresion for Column");
-//            }
-//
-//            if (this.displaySetting.getObjectType() == 12) {
-//                try {
-//                    JSONObject jo = JSONObject.parseObject(regExpression);
-//                    this.props = new Properties();
-//                    Iterator var3 = jo.keySet().iterator();
-//
-//                    while(var3.hasNext()) {
-//                        String key = (String)var3.next();
-//                        this.props.setProperty(key, jo.getString(key));
-//                    }
-//                } catch (Throwable var5) {
-//                    throw new NDSRuntimeException("Could not load regExpression as json object:" + var5, var5);
-//                }
-//            } else {
-//                this.regExpression = regExpression;
-//            }
-//        }
-//
-//    }
-//
-//    public String getRegExpression() {
-//        return this.regExpression;
-//    }
-//
-//    public String getErrorMessage() {
-//        return this.errorMessage;
-//    }
-//
-//    public void setErrorMessage(String errorMessage) {
-//        this.errorMessage = errorMessage;
-//    }
-//
-//    public boolean isVirtual() {
-//        return this.isVirtual;
-//    }
-//
-//    public String getSubTotalMethod() {
-//        return this.sumMethod;
-//    }
-//
-//    public void setSubTotalMethod(String method) {
-//        this.sumMethod = method;
-//    }
-//
-//    public String getSubTotalDesc() {
-//        return this.sumMethodDesc;
-//    }
-//
-//    void setIsFilteredByWildcard(boolean b) {
-//        this.isFilteredByWildcard = b;
-//    }
-//
-//    public List getReferenceColumnsInWildcardFilter() {
-//        return this.referenceColumnsInWildcardFilter;
-//    }
-//
-//    public void setReferenceColumnsInWildcardFilter(List columns) {
-//        this.referenceColumnsInWildcardFilter = columns;
-//    }
-//
-//    public String getFilter() {
-//        return this.filter;
-//    }
-//
-//    public void setFilter(String filter) {
-//        this.filter = filter;
-//        if (Validator.isNotNull(filter) && (this.getReferenceTable() != null || this.getDisplaySetting().getObjectType() == 12) && filter.indexOf(64) > -1) {
-//            this.isFilteredByWildcard = true;
-//        }
-//
-//    }
-//
-//    public DisplaySetting getDisplaySetting() {
-//        return this.displaySetting;
-//    }
-//
-//    public void setDisplaySetting(DisplaySetting setting) {
-//        this.displaySetting = setting;
-//    }
-//
-//    public String getSequenceHead() {
-//        return this.sequenceHead;
-//    }
-//
-//    public void setSequenceHead(String s) {
-//        this.sequenceHead = s;
-//    }
-//
-//    public boolean isColumnLink(TableManager tm) {
-//        if (this.name.indexOf(";") > -1) {
-//            try {
-//                this.getColumnLink(tm);
-//                return true;
-//            } catch (Exception var3) {
-//                return false;
-//            }
-//        } else {
-//            return false;
-//        }
-//    }
-//
-//    public ColumnLink getColumnLink(TableManager tm) throws QueryException {
-//        return new ColumnLink(this.table.getName() + "." + this.name, tm);
-//    }
-//
-//    public Object getUIConstructor() {
-//        Object uiConstructor = null;
-//        if (this.getDisplaySetting().getObjectType() == 10) {
-//            if (Validator.isNull(this.getValueInterpeter())) {
-//                throw new NDSRuntimeException("Not found interpreter of button column " + this);
-//            }
-//
-//            try {
-//                uiConstructor = ApplicationContextHandle.getBean(this.getValueInterpeter());
-//            } catch (Exception var5) {
-//                try {
-//                    uiConstructor = ApplicationContextHandle.getBean(InstanceUtil.getClass(this.getValueInterpeter()));
-//                } catch (Exception var4) {
-//                    log.debug("Found error in get ui constructor:" + var4);
-//                }
-//            }
-//        }
-//
-//        return uiConstructor;
-//    }
-//
-//    public Object getUIAlerter() {
-//        Object uiAlerter = null;
-//        if (Validator.isNotNull(this.getValueInterpeter())) {
-//            try {
-//                uiAlerter = ApplicationContextHandle.getBean(this.getValueInterpeter());
-//            } catch (Exception var5) {
-//                try {
-//                    uiAlerter = ApplicationContextHandle.getBean(InstanceUtil.getClass(this.getValueInterpeter()));
-//                } catch (Exception var4) {
-//                    log.debug("Found error in get ui alerter:" + var4);
-//                }
-//            }
-//        }
-//
-//        return uiAlerter;
-//    }
-//
-//    public void setIsUpperCase(boolean b) {
-//        this.isUpperCase = b;
-//    }
-//
-//    public boolean isUpperCase() {
-//        return this.isUpperCase;
-//    }
-//
-//    public int getSecurityGrade() {
-//        return this.securityGrade;
-//    }
-//
-//    public JSONObject toJSONSimpleObject() throws JSONException {
-//        JSONObject jo = new JSONObject();
-//        jo.put("id", this.id);
-//        jo.put("description", this.getDescription());
-//        jo.put("isNullable", this.isNullable);
-//        jo.put("refColumnId", this.getReferenceColumn() == null ? -1 : this.getReferenceColumn().getId());
-//        if (this.getReferenceColumn() != null) {
-//            jo.put("refTableAK", this.getReferenceTable().getAlternateKey().toJSONSimpleObject());
-//        }
-//
-//        jo.put("mask", this.mask);
-//        jo.put("isValueLimited", this.isValueLimited);
-//        jo.put("type", this.type);
-//        return jo;
-//    }
-//
-//    public JSONObject toJSONObject(Locale locale) throws JSONException {
-//        JSONObject jo = new JSONObject();
-//        jo.put("id", this.id);
-//        jo.put("name", this.name);
-//        jo.put("description", this.getDescription());
-//        jo.put("isNullable", this.isNullable);
-//        jo.put("obtainManner", this.obtainManner);
-//        jo.put("defaultValue", this.defaultValue);
-//        jo.put("refColumnId", this.getReferenceColumn() == null ? -1 : this.getReferenceColumn().getId());
-//        if (this.getReferenceColumn() != null) {
-//            jo.put("refTableAK", this.getReferenceTable().getAlternateKey().toJSONObject(locale));
-//        }
-//
-//        jo.put("refTableId", this.getReferenceTable() == null ? -1 : this.getReferenceTable().getId());
-//        jo.put("isAlternateKey", this.isAlternateKey);
-//        jo.put("mask", this.mask);
-//        jo.put("isValueLimited", this.isValueLimited);
-//        jo.put("values", this.values);
-//        jo.put("isUpperCase", this.isUpperCase);
-//        jo.put("filter", this.filter);
-//        jo.put("displaySetting", this.displaySetting.getObjectTypeString());
-//        jo.put("type", this.type);
-//        jo.put("length", this.length);
-//        jo.put("scale", this.scale);
-//        jo.put("valueInterpreter", this.valueInterpreter);
-//        jo.put("table", this.table.getId());
-//        jo.put("isVirtual", this.isVirtual);
-//        jo.put("isIndexed", this.isIndexed);
-//        jo.put("isAutoComplete", this.isAutoComplete);
-//        jo.put("props", this.jsonProps);
-//        return jo;
-//    }
-//
-//    public JSONObject getJSONProps() {
-//        return this.jsonProps;
-//    }
-//
-//    public void setJSONProps(JSONObject jo) {
-//        this.jsonProps = jo;
-//        if (jo != null) {
-//            this.securityGrade = jo.getIntValue("sgrade");
-//        }
-//
-//    }
-//
-//    public String getStrProps() {
-//        if (this.jsonProps == null) {
-//            this.jsonProps = new JSONObject();
-//        }
-//
-//        return this.jsonProps.toString();
-//    }
-//
-//    public String getShowcomment() {
-//        return this.showcomment;
-//    }
-//
-//    public Boolean getIsorder() {
-//        return this.isorder;
-//    }
-//
-//    public void setIsorder(Boolean isorder) {
-//        this.isorder = isorder;
-//    }
-//
-//    public void setShowcomment(String shcomment) {
-//        this.showcomment = shcomment;
-//    }
-//
-//    public Boolean getShowtitle() {
-//        return this.showtitle;
-//    }
-//
-//    public void setShowtitle(Boolean ishowtite) {
-//        this.showtitle = ishowtite;
-//    }
-//
-//    public Boolean getRowspan() {
-//        return this.isRowspan;
-//    }
-//
-//    public void setRowspan(Boolean isRowspan) {
-//        this.isRowspan = isRowspan;
-//    }
-//
-//    public String getFkdisplay() {
-//        return this.fkdisplay;
-//    }
-//
-//    public void setFkdisplay(String fkdisplay) {
-//        this.fkdisplay = fkdisplay;
-//    }
-//
-//    public String getQuerydefval() {
-//        return this.querydefval;
-//    }
-//
-//    public void setQuerydefval(String querydefval) {
-//        this.querydefval = querydefval;
-//    }
-//
-//    public boolean isComputed() {
-//        return "computed".equals(this.obtainManner);
-//    }
-//
-//    public LimitvalueGroup getLimitvalueGroup() {
-//        return this.limitvalueGroup;
-//    }
-//
-//    public void setLimitvalueGroup(LimitvalueGroup limitvalueGroup) {
-//        this.limitvalueGroup = limitvalueGroup;
-//    }
-//
-//    public String getSearchtype() {
-//        return this.searchtype;
-//    }
-//
-//    public void setSearchtype(String searchtype) {
-//        this.searchtype = searchtype;
-//    }
-//
-//    public boolean getIsremote() {
-//        return this.isremote;
-//    }
-//
-//    public void setIsremote(Boolean isremote) {
-//        this.isremote = isremote;
-//    }
-//
-//    public String getSearchmodel() {
-//        return this.searchmodel;
-//    }
-//
-//    public void setSearchmodel(String searchmodel) {
-//        this.searchmodel = searchmodel;
-//    }
-//
-//    public String getCommentstp() {
-//        return Tools.nvl(this.commentstp, "list");
-//    }
-//
-//    public void setCommentstp(String commentstp) {
-//        this.commentstp = commentstp;
-//    }
-//
-//    public Boolean getIsagfilter() {
-//        return this.isagfilter;
-//    }
-//
-//    public void setIsagfilter(Boolean isagfilter) {
-//        this.isagfilter = isagfilter;
-//    }
-//
-//    public String getAgfilter() {
-//        return this.agfilter;
-//    }
-//
-//    public void setAgfilter(String agfilter) {
-//        this.agfilter = agfilter;
-//    }
-}
-

boman-modules/boman-system/src/main/java/com/boman/system/common/DbRowAction.java

@@ -1,17 +0,0 @@
-package com.boman.system.common;
-
-/**
- * @author lzm
- * @date 2018/9/21
- */
-public enum DbRowAction {
-    INSERT(0, "插入"), UPDATE(1, "更新"), DELETE(2, "删除");
-
-    private int value;
-    private String desc;
-
-    DbRowAction(int value, String desc) {
-        this.value = value;
-        this.desc = desc;
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/DefaultTableService.java

@@ -1,24 +0,0 @@
-//package com.boman.system.common;
-//
-//
-//import org.springframework.stereotype.Component;
-//
-///**
-// * @author shiqian
-// * @description
-// * @date 2021年03月22日 10:21
-// **/
-//@Component("defaultTableService-one")
-//public class DefaultTableService extends BaseTableService {
-//    public DefaultTableService() {
-//    }
-//
-//    public DefaultTableService(String tableName) {
-//        super(tableName);
-//    }
-//
-//    @Override
-//    public RowResult executeAction(TableServiceContext context, MainTableRecord row) {
-//        return null;
-//    }
-//}

boman-modules/boman-system/src/main/java/com/boman/system/common/ExceptionFilter.java

@@ -1,24 +0,0 @@
-package com.boman.system.common;
-
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 11:01
- **/
-public abstract class ExceptionFilter extends BaseFilter {
-
-    public ExceptionFilter() {
-    }
-
-    /**
-     * 异常处理Filter，返回null,则表示本Filter不处理该异常（异常继续往下传递，如所有异常处理Filter都不处理，则往外抛出）
-     * 返回非null值，则表示本Filter处理了改异常，不往下传递（异常被吞）
-     *
-     * @param context
-     * @param row
-     * @param exception
-     * @return
-     */
-    public abstract RowResult handleException(TableServiceContext context, MainTableRecord row, Exception exception);
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/Feature.java

@@ -1,94 +0,0 @@
-package com.boman.system.common;
-
-
-import com.google.common.collect.Lists;
-import org.apache.commons.collections4.keyvalue.DefaultMapEntry;
-import org.springframework.beans.factory.InitializingBean;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.function.BiPredicate;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 10:42
- **/
-public abstract class Feature implements InitializingBean {
-    public static final BiPredicate<String, String> matchAll = (tableName, actionName) -> {
-        return true;
-    };
-    private String name;
-    private String description;
-    private boolean isSystem;
-    private Collection<Map.Entry<BiPredicate<String, String>, Validator>> validates;
-    private Collection<Map.Entry<BiPredicate<String, String>, Filter>> filters;
-
-    protected Feature() {
-        this.validates = Lists.newArrayList();
-        this.filters = Lists.newArrayList();
-        this.isSystem = false;
-    }
-
-    protected Feature(String name, String description, boolean isSystem) {
-        this();
-        this.name = name;
-        this.description = description;
-        this.isSystem = isSystem;
-    }
-
-    @Override
-    public final void afterPropertiesSet() throws Exception {
-        this.initialization();
-    }
-
-    protected abstract void initialization();
-
-    protected final void addValidator(Validator validator, BiPredicate<String, String> condition) {
-        this.validates.add(new DefaultMapEntry(condition, validator));
-    }
-
-    protected final void addFilter(Filter filter, BiPredicate<String, String> condition) {
-        this.filters.add(new DefaultMapEntry(condition, filter));
-    }
-
-    protected final void addGlobalValidator(Validator validator) {
-        this.addValidator(validator, matchAll);
-    }
-
-    protected final void addGlobalFilter(Filter filter) {
-        this.addFilter(filter, matchAll);
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    protected void setName(final String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-
-    protected void setDescription(final String description) {
-        this.description = description;
-    }
-
-    public boolean isSystem() {
-        return this.isSystem;
-    }
-
-    protected void setSystem(final boolean isSystem) {
-        this.isSystem = isSystem;
-    }
-
-    public Collection<Map.Entry<BiPredicate<String, String>, Validator>> getValidates() {
-        return this.validates;
-    }
-
-    public Collection<Map.Entry<BiPredicate<String, String>, Filter>> getFilters() {
-        return this.filters;
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/FeatureManager.java

@@ -1,87 +0,0 @@
-package com.boman.system.common;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiPredicate;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 10:02
- **/
-public class FeatureManager {
-
-    private static final Map<String, Feature> features = Maps.newHashMap();
-
-    private static final Map<String, Collection<Validator>> validatorCache = Maps.newHashMap();
-
-    private static final Map<String, Collection<Filter>> filterCache = Maps.newHashMap();
-
-    public static void addFeature(Feature feature) {
-        if (!features.containsKey(feature.getName())) {
-            features.put(feature.getName(), feature);
-            validatorCache.clear();
-            filterCache.clear();
-        }
-    }
-
-    public static void removeFeature(String featureName) {
-        if (null != features.remove(featureName)) {
-            validatorCache.clear(); //TODO:注意这里面要获取下写锁
-            filterCache.clear();
-        }
-    }
-
-    static Collection<Validator> getValidators(String tableName, String actionName) {
-        String cacheKey = getCacheKey(tableName, actionName);
-        Collection<Validator> result = validatorCache.get(cacheKey);
-        if (result == null) {
-            Set<Integer> temp = Sets.newHashSet();
-            result = Lists.newArrayList();
-            Collection<Feature> allFeatures = features.values();
-            for (Feature feature : allFeatures) {
-                for (Map.Entry<BiPredicate<String, String>, Validator> item : feature.getValidates()) {
-                    if (item.getKey() == null || item.getKey().test(tableName, actionName)) {
-                        Validator value = item.getValue();
-                        if (!temp.contains(value.hashCode())) {
-                            temp.add(value.hashCode());
-                            result.add(value);
-                        }
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    static Collection<Filter> getFilters(String tableName, String actionName) {
-        String cacheKey = getCacheKey(tableName, actionName);
-        Collection<Filter> result = filterCache.get(cacheKey);
-        if (result == null) {
-            Set<Integer> temp = Sets.newHashSet();
-            result = Lists.newArrayList();
-            Collection<Feature> allFeatures = features.values();
-            for (Feature feature : allFeatures) {
-                for (Map.Entry<BiPredicate<String, String>, Filter> item : feature.getFilters()) {
-                    if (item.getKey() == null || item.getKey().test(tableName, actionName)) {
-                        Filter value = item.getValue();
-                        if (!temp.contains(value.hashCode())) {
-                            temp.add(value.hashCode());
-                            result.add(value);
-                        }
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    private static String getCacheKey(String tableName, String actionName) {
-        return String.format("%s.%s", tableName, actionName);
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/Filter.java

@@ -1,12 +0,0 @@
-package com.boman.system.common;
-
-
-/**
- * @author lzm
- * @date 2018/9/27
- */
-public interface Filter {
-    void before(TableServiceContext context, MainTableRecord row);
-
-    void after(TableServiceContext context, MainTableRecord row);
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/MainTableRecord.java

@@ -26,127 +26,17 @@ public class MainTableRecord {
 
     private TableServiceContext context;
     private RowRecord mainData;
-    private Map<String, SubTableRecord> subTables;
-
-    /**
-     * 子表和对应的外健
-     */
-    private JSONObject fkColumns;
 
     @Setter
     @Getter
     private RowResult result;
 
 
-    public MainTableRecord(TableServiceContext context, GenTable genTable, Long id, JSONObject fkColumns, JSONObject fixedData, JSONObject delTables) {
+    public MainTableRecord(TableServiceContext context, GenTable genTable, Long id, JSONObject fixedData, JSONObject delTables) {
         this.context = context;
-        this.subTables = Maps.newHashMap();
-
-        //获取提交数据rowData
-        JSONObject rowData = fixedData;
-//        if (fixedData != null) {
-//            rowData = fixedData.getJSONObject("columns");
-////            rowData = fixedData.getJSONArray("columns");
-//        }
-//        if (rowData == null) {
-//            rowData = new JSONObject();
-//        }
-        if (fixedData == null) {
-            fixedData = new JSONObject();
-        }
-
-        if (fkColumns == null) {
-            //伪造下外键
-            fkColumns = new JSONObject();
-        }
-        this.fkColumns = fkColumns;
-
-        if (delTables == null) {
-            delTables = new JSONObject();
-        }
         this.mainData = new RowRecord(id, genTable, fixedData);
-
-//        for (String subTableName : fixedData.keySet()) {
-//            if (!subTableName.equalsIgnoreCase(genTable.getTableName())) {
-//                Table subTable = TableServiceContext.getTableByName(subTableName);
-//                String fkColumnName = fkColumns.getString(subTableName);
-//                SubTableRecord subRow = new SubTableRecord(subTable, fkColumnName, fixedData.getJSONArray(subTableName));
-//                subTables.put(subTableName, subRow);
-//            }
-//        }
-
-    }
-
-
-    public MainTableRecord(TableServiceContext context, Table table, Long id, JSONObject fkColumns, JSONObject tables, JSONObject delTables) {
-        this.context = context;
-        this.subTables = Maps.newHashMap();
-
-        //获取提交数据rowData
-        JSONObject rowData = null;
-        if (tables != null) {
-            rowData = tables.getJSONObject(table.getName());
-        }
-        if (rowData == null) {
-            rowData = new JSONObject();
-        }
-        if (tables == null) {
-            tables = new JSONObject();
-        }
-
-        if (fkColumns == null) {
-            //伪造下外键
-            fkColumns = new JSONObject();
-        }
-        this.fkColumns = fkColumns;
-
-        if (delTables == null) {
-            delTables = new JSONObject();
-        }
-
-//        if (Constants.ACTION_DELETE.equals(context.getActionName())) {
-//            LOGGER.debug("====>" + delTables.keySet());
-//            this.mainData = new RowRecord(id, table, rowData);
-//            for (String subTableName : delTables.keySet()) {
-//                if (!subTableName.equalsIgnoreCase(table.getName())) {
-//                    Table subTable = com.eboss.sys.srv.service.basetable.TableServiceContext.getTableByName(subTableName);
-//                    //外健
-//                    String fkColumnName = fkColumns.getString(subTableName);
-//                    if (fkColumnName == null || fkColumnName.isEmpty()) {
-//                        fkColumnName = findFkColumnName(subTable, table.getName());
-//                    }
-//                    SubTableRecord subRow = new SubTableRecord(subTable, fkColumnName, delTables.getJSONArray(subTableName));
-//                    subTables.put(subTableName, subRow);
-//                }
-//            }
-//        } else {
-            this.mainData = new RowRecord(id, table, rowData);
-            for (String subTableName : tables.keySet()) {
-                if (!subTableName.equalsIgnoreCase(table.getName())) {
-                    Table subTable = TableServiceContext.getTableByName(subTableName);
-//                    //外健
-                    String fkColumnName = fkColumns.getString(subTableName);
-//                    if (fkColumnName == null || fkColumnName.isEmpty()) {
-//                        fkColumnName = findFkColumnName(subTable, table.getName());
-//                    }
-                    SubTableRecord subRow = new SubTableRecord(subTable, fkColumnName, tables.getJSONArray(subTableName));
-                    subTables.put(subTableName, subRow);
-                }
-            }
-//        }
     }
 
-//    private String findFkColumnName(Table subtable, String mainTableName) {
-//        ArrayList<Column> columns = subtable.getAllColumns();
-//        for (Column col : columns) {
-//            Table refTable = col.getReferenceTable();
-//            if (refTable != null && mainTableName.equalsIgnoreCase(refTable.getName())) {
-//                return col.getName();
-//            }
-//        }
-//        return null;
-//    }
-
     public Long getId() {
         return mainData.getId();
     }
@@ -159,15 +49,11 @@ public class MainTableRecord {
         return mainData.getGenTable();
     }
 
-    public DbRowAction getAction() {
-        return mainData.getAction();
-    }
-
     public JSONObject getCommitData() {
         return mainData.getCommitData();
     }
 
-    public JSONObject getOrignalData() {
-        return mainData.getOrignalData();
+    public JSONObject getOriginalData() {
+        return mainData.getOriginalData();
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/common/NDSException.java

@@ -1,9 +0,0 @@
-package com.boman.system.common;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 14:57
- **/
-public class NDSException {
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/OverlayJSONObject.java

@@ -1,46 +0,0 @@
-package com.boman.system.common;
-
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.AbstractMap;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @author lzm
- * @date 2018/10/29
- * 可被覆盖的
- */
-public class OverlayJSONObject extends AbstractMap {
-    private JSONObject baseData;
-    private JSONObject data;
-
-    public OverlayJSONObject(JSONObject base, JSONObject data) {
-        if (data == null) {
-            throw new IllegalArgumentException("入口的新集合不可为空！");
-        }
-        this.baseData = base;
-        this.data = data;
-    }
-
-    @Override
-    public Object remove(Object key) {
-        return data.remove(key);
-    }
-
-    @Override
-    public Object put(Object key, Object value) {
-        return data.put((String) key, value);
-    }
-
-    @Override
-    public Set<Entry<String, Object>> entrySet() {
-        if (this.baseData == null) {
-            return this.data.entrySet();
-        } else {
-            return Stream.concat(this.data.entrySet().stream(), this.baseData.entrySet().stream()
-                    .filter(pair -> !this.data.containsKey(pair.getKey()))).collect(Collectors.toSet());
-        }
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/QueryUtils.java

@@ -1,47 +0,0 @@
-package com.boman.system.common;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 11:42
- **/
-public class QueryUtils {
-
-    public static String replaceVariables(String sql, User user) {
-        if (user == null) {
-            return sql;
-        } else if (sql == null) {
-            return null;
-        } else {
-            StringBuilder sb = new StringBuilder();
-            int p = 0;
-
-            while (p < sql.length()) {
-                int p1 = sql.indexOf("$", p);
-                if (p1 > -1) {
-                    int p2 = sql.indexOf("$", p1 + 1);
-                    if (p2 > -1) {
-                        String n = sql.substring(p1, p2 + 1);
-                        Object v = user.getAttribute(n);
-                        if (v != null) {
-                            sb.append(sql.substring(p, p1)).append(v);
-                            p = p2 + 1;
-                        } else {
-                            sb.append(sql.substring(p, p2));
-                            p = p2;
-                        }
-                        continue;
-                    }
-
-                    sb.append(sql.substring(p));
-                    break;
-                }
-
-                sb.append(sql.substring(p));
-                break;
-            }
-
-            return sb.toString();
-        }
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/RequestUtil.java

@@ -1,69 +0,0 @@
-package com.boman.system.common;
-
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 09:38
- **/
-public class RequestUtil {
-
-    public RequestUtil() {
-    }
-
-    public static User getUser() {
-        ServletRequestAttributes attrs = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
-        if (attrs != null) {
-            HttpServletRequest request = attrs.getRequest();
-            if (request.getAttribute("user") != null) {
-                return (User)request.getAttribute("user");
-            }
-        }
-
-        return null;
-    }
-
-    public static HttpServletRequest getRequest() {
-        ServletRequestAttributes attrs = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
-        if (attrs != null) {
-            return attrs.getRequest();
-        } else {
-            return null;
-        }
-    }
-
-    public static Object getAttribute(String name) {
-        ServletRequestAttributes attrs = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        if (attrs != null) {
-            HttpServletRequest request = attrs.getRequest();
-            return request.getAttribute(name);
-        } else {
-            return null;
-        }
-    }
-
-    public static String getParameter(String name) {
-        ServletRequestAttributes attrs = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
-        if (attrs != null) {
-            HttpServletRequest request = attrs.getRequest();
-            return request.getParameter(name);
-        } else {
-            return null;
-        }
-    }
-
-    public static HttpServletRequest getRequet() {
-        ServletRequestAttributes attrs = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
-        return attrs != null ? attrs.getRequest() : null;
-    }
-
-    public static HttpServletResponse getResponse() {
-        ServletRequestAttributes attrs = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
-        return attrs != null ? attrs.getResponse() : null;
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/Resources.java

@@ -1,57 +0,0 @@
-package com.boman.system.common;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 13:54
- **/
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.PropertySource;
-
-@PropertySource(
-        value = {"classpath:application.properties", "classpath:config/email.properties", "classpath:config/thirdParty.properties", "classpath:config/ebossCloud.properties", "classpath:i18n/messages*.properties"},
-        ignoreResourceNotFound = true
-)
-public final class Resources {
-    private static final Logger log = LoggerFactory.getLogger(Resources.class);
-    private static final Map<String, ResourceBundle> MESSAGES = new HashMap();
-
-    public Resources() {
-    }
-
-    public static String getMessage(String key, Object... params) {
-        return getMessage(key, (Locale)null, params);
-    }
-
-    public static String getMessage(String key, Locale plocale, Object... params) {
-        ResourceBundle pp = ResourceBundle.getBundle("application");
-        String defaultLocal = pp.getString("spring.locale.default");
-//        Locale locale = plocale != null ? plocale : Tools.getLocale("zh_CN");
-        Locale locale =  Locale.getDefault();
-        ResourceBundle message = (ResourceBundle)MESSAGES.get(locale.getLanguage());
-        if (message == null) {
-            synchronized(MESSAGES) {
-                message = (ResourceBundle)MESSAGES.get(locale.getLanguage());
-                if (message == null) {
-                    message = ResourceBundle.getBundle("i18n/messages", locale);
-                    MESSAGES.put(locale.getLanguage(), message);
-                }
-            }
-        }
-
-        try {
-            return params != null ? String.format(message.getString(key), params) : message.getString(key);
-        } catch (Exception var10) {
-            return locale.toString().equals(defaultLocal) && params.length == 1 ? String.valueOf(params[0]) : key;
-        }
-    }
-
-    public static void flushMessage() {
-        MESSAGES.clear();
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/ResultCode.java

@@ -1,12 +0,0 @@
-package com.boman.system.common;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 15:41
- **/
-public class ResultCode {
-
-    public static final int SUCCESS = 0;
-    public static final int FAIL = -1;
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/RowRecord.java

@@ -1,6 +1,7 @@
 package com.boman.system.common;
 
 import com.alibaba.fastjson.JSONObject;
+import com.boman.common.core.utils.SpringUtils;
 import com.boman.gen.domain.GenTable;
 import com.boman.system.mapper.StandardlyMapper;
 import lombok.Data;
@@ -18,41 +19,28 @@ public class RowRecord {
 
     private GenTable genTable;
 
-    private Table table;
-
     private Long id;
-    private DbRowAction action;
 
     //提交过来的数据
-    private JSONObject postData;
+    private JSONObject postData = new JSONObject();
 
     //原数据
-    private JSONObject orignalData;
+    private JSONObject originalData = new JSONObject();
 
     //新数据
     private JSONObject newData;
 
     //将要提交到数据库中的数据
-    private JSONObject commitData;
+    private JSONObject commitData = new JSONObject();
 
     public RowRecord(Long id, GenTable genTable, JSONObject fixedData) {
         this.id = id;
         this.genTable = genTable;
-        postData = new JSONObject();
-        orignalData = new JSONObject();
-        commitData = new JSONObject();
 
         if (fixedData == null) {
             fixedData = new JSONObject();
         }
-//        if (!fixedData.containsKey("ID") || fixedData.getLong("ID") == null || fixedData.getLong("ID") <= 0) {
-//            fixedData.put("ID", this.id);
-//        }else{
-//            //modify by nathan 导入修改
-//            this.id = fixedData.getLong("ID");
-//        }
 
-        action = (this.id == null || this.id <= 0) ? DbRowAction.INSERT : DbRowAction.UPDATE;
         fixedData.forEach((fieldName, fieldValue)->{
             postData.put(fieldName.toUpperCase(), fieldValue);
         });
@@ -61,87 +49,10 @@ public class RowRecord {
             commitData.put(key, postData.get(key));
         }
 
-        newData = new JSONObject(new OverlayJSONObject(orignalData, commitData));
-    }
-
-    public RowRecord(Long id, Table table, JSONObject postRow) {
-        this.id = id;
-        this.table = table;
-        postData = new JSONObject();
-        orignalData = new JSONObject();
-        commitData = new JSONObject();
-
-        if (postRow == null) {
-            postRow = new JSONObject();
-        }
-        if (!postRow.containsKey("ID") || postRow.getLong("ID") == null || postRow.getLong("ID") <= 0) {
-            postRow.put("ID", this.id);
-        }else{
-            //modify by nathan 导入修改
-            this.id = postRow.getLong("ID");
-        }
-        action = (this.id == null || this.id <= 0) ? DbRowAction.INSERT : DbRowAction.UPDATE;
-//        log.debug("postRow:" + postRow.toJSONString());
-//        log.debug("allColumns:" + table.getAllColumns().toString());
-        for (String key : postRow.keySet()) {
-            Column column = /*table.getColumn(key)*/null;
-            int type = -1;
-            if (column != null) {
-                type = /*column.getType()*/0;
-            } else {
-                log.debug("column is null key===>" + key);
-            }
-            try {
-                switch (type) {
-                    case Column.DATE:
-                        postData.put(key.toUpperCase(), postRow.getDate(key));
-                        break;
-//                    case Column.DATENUMBER:
-//                        postData.put(key.toUpperCase(), postRow.getDate(key));
-//                        break;
-//                    case Column.TIME:
-//                        postData.put(key.toUpperCase(), postRow.get(key));
-//                        break;
-                    case Column.NUMBER:
-                        postData.put(key.toUpperCase(), postRow.getBigDecimal(key));
-                        break;
-
-                    default:
-                        postData.put(key.toUpperCase(), postRow.get(key));
-                }
-            } catch (Exception e) {
-                //log.error(String.format("%s填充字段%s-%s出错，错误信息为%s", this.id, table.getRealTableName(), key, e.getMessage()));
-                throw e;
-            }
-        }
-
-        for (String key : postData.keySet()) {
-            commitData.put(key, postData.get(key));
-        }
-
-        if (this.getAction() == DbRowAction.UPDATE) {
-            StandardlyMapper mapper = ApplicationContextHandle.getBean(StandardlyMapper.class);
-            JSONObject oldData = mapper.getById(this.getRealTableName(), this.getId());
-            if (oldData != null) {
-                for (String key : oldData.keySet()) {
-//                    key = key.toUpperCase();
-                    orignalData.put(key.toUpperCase(), oldData.get(key));
-                }
-            }
-        }
-
-        newData = new JSONObject(new OverlayJSONObject(orignalData, commitData));
-    }
-
-    public String getTableName() {
-        return genTable.getTableName();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("baseData", originalData);
+        jsonObject.put("data", commitData);
+        newData = new JSONObject(jsonObject);
     }
 
-    public String getRealTableName() {
-        String realTableName = /*table.getRealTableName()*/"";
-        if (realTableName == null || realTableName.isEmpty()) {
-            realTableName = table.getName();
-        }
-        return realTableName;
-    }
 }

boman-modules/boman-system/src/main/java/com/boman/system/common/RowResult.java

@@ -1,7 +1,5 @@
 package com.boman.system.common;
 
-import java.util.Locale;
-
 /**
  * @author shiqian
  * @description
@@ -20,10 +18,6 @@ public class RowResult {
         return this.code >= 0;
     }
 
-    public static RowResult ok(Locale locale) {
-        return ok(Resources.getMessage("成功", locale, new Object[0]));
-    }
-
     public static RowResult ok(String message) {
         return create(0, message);
     }
@@ -52,17 +46,6 @@ public class RowResult {
         return result;
     }
 
-    public ValueHolder toValueHolder() {
-        ValueHolder result = new ValueHolder();
-        result.setCode(this.code);
-        result.setMessage(this.message == null ? "" : this.message);
-        if (this.data != null) {
-            result.setData(this.data);
-        }
-
-        return result;
-    }
-
     public Integer getCode() {
         return this.code;
     }
@@ -80,7 +63,7 @@ public class RowResult {
     }
 
     public static boolean checkSuccess(RowResult rowResult){
-        return null != rowResult && ValueHolder.OK == rowResult.getCode();
+        return null != rowResult && 0 == rowResult.getCode();
     }
 
     public static boolean checkFail(RowResult rowResult){

boman-modules/boman-system/src/main/java/com/boman/system/common/StoredProcedureService.java

@@ -1,114 +0,0 @@
-package com.boman.system.common;
-
-import com.boman.system.mapper.StoredProcedureMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author wmc
- * @date 2020/8/26 9:13
- */
-@Service
-@Slf4j
-public class StoredProcedureService {
-
-/*    @Autowired
-    private StoredProcedureMapper storedProcedureMapper;
-
-    *//**
-     * 增删改提交 统一存储过程
-     *
-     * @param state      是否启用存储过程
-     * @param storedName 存储过程名
-     * @param pId        对象ID
-     * @param tableName  表名
-     *//*
-    @Transactional(rollbackFor = Exception.class)
-    public void storedProcedure(String state, String storedName, Long pId, Long pIsAdd, String tableName) {
-        if (StringUtils.isNotBlank(state)) {
-            if ("Y".equalsIgnoreCase(state)) {
-                if (StringUtils.isBlank(storedName)) {
-                    throw new IllegalArgumentException("启用存储过程,但未设置存储过程名称");
-                } else {
-                    if (pId == null) {
-                        throw new IllegalArgumentException("storedProcedure==>pId为空");
-                    } else {
-                        //判断调用哪种存储过程 storedProcedure两个入参 storedProcedure2两个入参 两个出参
-                        if ("2".equalsIgnoreCase(storedName.substring(storedName.length() - 1))) {
-                            Map<String, Object> map = new HashMap<>();
-                            map.put("pId", pId);
-                            map.put("pIsAdd", pIsAdd);
-                            map.put("storedName", storedName);
-                            map.put("p_code", null);
-                            map.put("p_message", null);
-                            //storedProcedureMapper.storedProcedure2(map);
-                            if ("-1".equalsIgnoreCase(map.get("p_code").toString())) {
-                                //throw new NDSException("存储过程"+storedName+"异常:"+map.get("p_message").toString());
-//                                throw new NDSException(map.get("p_message").toString());
-                                throw new IllegalArgumentException(map.get("p_message").toString());
-                            }
-                        } else {
-                            //判断一下表名  因为数据库 表的存储过程参数不一样
-                            if ("C_PAYWAY".contains(tableName)) {
-                                //storedProcedureMapper.storedProcedure(pId, storedName);
-                            } else {
-                                //调用存储过程
-                               // storedProcedureMapper.storedProcedure1(pId, pIsAdd, storedName);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }*/
-
-    /**
-     * 页面调用存储过程
-     */
-//    @Transactional(rollbackFor = Exception.class)
-//    public ValueHolder storedProcedure(JSONObject json) {
-//        //json里包含   isreturn是否有返回值  storedName存储过程名   params参数
-//        if (!json.containsKey("storedName")) {
-//            throw new NDSException("未找到存储过程名称");
-//        }
-//        if (!json.containsKey("isReturn")) {
-//            throw new NDSException("未找到存储过程是否需要返回值");
-//        }
-//        if (!json.containsKey("params")) {
-//            throw new NDSException("未找到存储过程参数");
-//        }
-//
-//        Boolean isReturn = json.getBoolean("isReturn");
-//        String storedName = json.getString("storedName");
-//        JSONObject params = json.getJSONObject("params");
-//        User user = RequestUtil.getUser();
-//        params.put("USERID", user == null ? "未找到用户id" : user.getId());
-//
-//        Map<String, Object> parmMap = new HashMap<>();
-//        parmMap.put("storedName", storedName);
-//        parmMap.put("params", params.toJSONString());
-//        ValueHolder valueHolder = new ValueHolder();
-//        if (isReturn) {
-//            //有返回值
-//            parmMap.put("datas", null);
-//            storedProcedureMapper.procedureGetValue(parmMap);
-//            try {
-//                JSONObject datas = JSONObject.parseObject(parmMap.get("datas").toString());
-//                valueHolder.setData(datas);
-//            } catch (Exception e) {
-//                throw new NDSException("存储过程返回值非标准json字符串");
-//            }
-//        } else {
-//            //没有返回值
-//            storedProcedureMapper.procedureNoValue(parmMap);
-//        }
-//        valueHolder.setCode(ResultCode.SUCCESS);
-//        return valueHolder;
-//    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/SubTableRecord.java

@@ -1,62 +0,0 @@
-package com.boman.system.common;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
-import lombok.Getter;
-
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-/**
- * @author lzm
- * @date 2018/10/29
- */
-@Getter
-public class SubTableRecord {
-    private Table table;
-//    private Column FK;
-    private Collection<RowRecord> rows;
-
-    public SubTableRecord(Table table, String fkColumnName, JSONArray jo) {
-        this.table = table;
-//        if (fkColumnName != null && !fkColumnName.isEmpty()) {
-//            this.FK = table.getColumn(fkColumnName);
-//        }
-        this.rows = Lists.newArrayList();
-        for (Integer i = 0; i < jo.size(); i++) {
-            try {
-                Long id = jo.getLong(i);
-                //只有id上传上来了
-                JSONObject tempPostData = new JSONObject();
-                tempPostData.put("ID", id);
-                RowRecord row = new RowRecord(id, table, tempPostData);
-                rows.add(row);
-            } catch (Exception e) {
-                JSONObject tempPostData = jo.getJSONObject(i);
-                RowRecord row = new RowRecord(tempPostData.getLong("ID"), table, tempPostData);
-                rows.add(row);
-            }
-        }
-    }
-
-//    public String getFKColumnName() {
-//        return FK.getName();
-//    }
-
-    public String getTableName() {
-        return table.getName();
-    }
-
-    public String getRealTableName() {
-//        String realTableName = table.getRealTableName();
-//        if (realTableName == null || realTableName.isEmpty()) {
-        String realTableName = table.getName();
-//        }
-        return realTableName;
-    }
-
-    public JSONArray getCommitDatas() {
-        return rows.stream().map(row -> row.getCommitData()).collect(Collectors.toCollection(JSONArray::new));
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/Table.java

@@ -1,21 +0,0 @@
-package com.boman.system.common;
-
-import com.boman.gen.domain.GenTableColumn;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 15:06
- **/
-@Data
-public class Table {
-
-    private Object id;
-
-    private String name;
-
-    private List<GenTableColumn> columns;
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/TableService.java

@@ -1,18 +0,0 @@
-package com.boman.system.common;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 10:13
- **/
-public interface TableService {
-
-    Logger LOGGER = LoggerFactory.getLogger(TableService.class);
-
-    void configure(TableServiceContext context);
-
-    RowResult executeAction(TableServiceContext context, MainTableRecord row);
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/TableServiceCmdService.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.collection.CollectionUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
+import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
 import com.boman.gen.domain.GenTable;
@@ -56,14 +57,14 @@ public class TableServiceCmdService {
         return baseTableDTO;
     }
 
-    public final ValueHolder<RowResult> objectSave(BaseTableSaveDTO baseTableSaveDTO) {
+    public final AjaxResult objectSave(BaseTableSaveDTO baseTableSaveDTO) {
         BaseTableDTO baseTableDTO = packTableDTO(baseTableSaveDTO);
         TableServiceContext context = TableServiceContext.createFrom(baseTableDTO);
-//        BaseSaveService baseSaveService = SpringUtils.getBean(BaseSaveService.class);
         // 拿到pkName和maxId
         List<GenTableColumn> columns = context.getTable().getColumns();
         String pkName = IdUtils.getPkName(columns);
-        StringUtils.requireNonNull(pkName);
+        requireNonNull(pkName);
+
         Long maxId = IdUtils.getMaxId(baseTableDTO.getTable(), pkName);
         RowResult rowResult = saveService.insertRow(context.getRealTableName(), pkName, maxId, context.getRows().get(0));
         if (RowResult.checkSuccess(rowResult)) {
@@ -72,7 +73,7 @@ public class TableServiceCmdService {
             LOGGER.error("保存失败，保持的原始数据为: {}", JSON.toJSONString(baseTableSaveDTO));
         }
 
-        return ValueHolder.ok(rowResult);
+        return AjaxResult.success(rowResult);
     }
 
     /**
@@ -81,7 +82,7 @@ public class TableServiceCmdService {
      * @param dto 前台传过来的dto
      * @return com.boman.system.common.ValueHolder
      */
-    public ValueHolder<RowResult> objectDelete(BaseTableSaveDTO dto) {
+    public AjaxResult objectDelete(BaseTableSaveDTO dto) {
         requireNonNull(dto.getTable());
         Long[] idArr = CollectionUtils.listToArray(dto.getIdList());
         requiredNonNull(idArr);
@@ -92,7 +93,7 @@ public class TableServiceCmdService {
 
         RowResult rowResult = deleteService.objectDelete(idArr, dto.getTable(), requireNonNull(pkName));
         LOGGER.info(rowResult.getMessage() + ", id: {}", Arrays.toString(idArr));
-        return ValueHolder.ok(rowResult);
+        return AjaxResult.success(rowResult);
     }
 
 
@@ -102,7 +103,7 @@ public class TableServiceCmdService {
      * @param dto 前台传过来的dto
      * @return com.boman.system.common.ValueHolder
      */
-    public ValueHolder<RowResult> objectLogicDelete(BaseTableSaveDTO dto) {
+    public AjaxResult objectLogicDelete(BaseTableSaveDTO dto) {
         requireNonNull(dto.getTable());
         Long[] idArr = CollectionUtils.listToArray(dto.getIdList());
         requiredNonNull(idArr);
@@ -117,7 +118,7 @@ public class TableServiceCmdService {
 
         RowResult rowResult = deleteService.objectLogicDelete(idArr, dto.getTable(), requireNonNull(pkName), jsonObject);
         LOGGER.info(rowResult.getMessage() + ", id: {}", Arrays.toString(idArr));
-        return ValueHolder.ok(rowResult);
+        return AjaxResult.success(rowResult);
     }
 
     /**
@@ -126,7 +127,7 @@ public class TableServiceCmdService {
      * @param dto condition
      * @return com.boman.system.common.ValueHolder
      */
-    public ValueHolder<List<JSONObject>> getObject(BaseTableSaveDTO dto) {
+    public AjaxResult getObject(BaseTableSaveDTO dto) {
         requireNonNull(dto.getTable());
 
         // 拿到每个字段对应的查询类型，=、 like、 >、 <
@@ -143,7 +144,7 @@ public class TableServiceCmdService {
         JSONArray showData = fixedData.getJSONArray(SHOW_DATA);
         List<JSONObject> result = selectService.selectByCondition(genTable.getTableName(), condition, packCondition
                 , showData, dto.getOrderBy(), dto.getLimit(), dto.getOffset());
-        return ValueHolder.ok(result);
+        return AjaxResult.success(result);
     }
 
     /**

boman-modules/boman-system/src/main/java/com/boman/system/common/TableServiceContext.java

@@ -68,38 +68,12 @@ public class TableServiceContext {
         values = Maps.newHashMap();
     }
 
-//    /**
-//     * 表名
-//     * 与realTableName的含义有差异
-//     */
-//    public String getTableName() {
-//        return table.getName();
-//    }
-
-    private User user;
-
-    /**
-     * 附加的校验器
-     */
-    private Collection<Validator> validators;
-
-    /**
-     * 附加的过滤器
-     */
-    private Collection<Filter> filters;
-
 
     @Resource
     private RedisService redisService;
 
     public static TableServiceContext createFrom(BaseTableDTO baseTableDTO) {
         TableServiceContext result = new TableServiceContext();
-        result.user = RequestUtil.getUser();
-//        result.actionName = actionName.replace(PREFIX, "").toUpperCase();
-//        if (StringUtils.isEmpty(result.actionName)) {
-//            throw new IllegalArgumentException("actionName不能为空");
-//        }
-
         String tableName = baseTableDTO.getTable();
         if (StringUtils.isEmpty(tableName)) {
             throw new IllegalArgumentException("表名参数不能为空");
@@ -113,7 +87,6 @@ public class TableServiceContext {
             throw new IllegalArgumentException(tableName + "表信息不存在");
         }
 
-
         result.realTableName = result.table.getTableName();
         if (Strings.isNullOrEmpty(result.realTableName)) {
             throw new IllegalArgumentException(tableName + "表名不存在");
@@ -121,8 +94,6 @@ public class TableServiceContext {
 
         // 前台传过来的数据
         JSONObject fixedData = baseTableDTO.getFixedData();
-        //获取FK
-         JSONObject fkColumn = /*getFKColumn(fixColumn, tableName)*/null;
         //删除
         Boolean isdelmtable = baseTableDTO.getDelMTable();
         JSONObject tabItem = baseTableDTO.getTabItem();
@@ -134,70 +105,13 @@ public class TableServiceContext {
 
         // 获取objid判断 新增或更新
         Long objid = baseTableDTO.getObjId();
-        MainTableRecord mainRowData = new MainTableRecord(result, result.table, objid, fkColumn, fixedData, tabItem);
+        MainTableRecord mainRowData = new MainTableRecord(result, result.table, objid, fixedData, tabItem);
         result.rows = Lists.newArrayList();
         result.rows.add(mainRowData);
 
         return result;
     }
 
-    public static Table getTableByName(String tableName) {
-//        return TableManagerCache.getTableManager().getTable(tableName);
-        return null;
-    }
-//
-//    /**
-//     * 获取子表外健
-//     * @param fixColumn
-//     * @param tableName
-//     * @return
-//     */
-//    private static JSONObject getFKColumn(JSONObject fixColumn, String tableName) {
-//
-//        Table table = getTableByName(tableName);
-//        if (fixColumn == null || table == null) {
-//            return null;
-//        }
-//        //获取对应外键
-//        JSONObject fkcolumn = new JSONObject();
-//        Set<String> fixTable = fixColumn.keySet();
-//        Iterator it = fixTable.iterator();
-//        while (it.hasNext()) {
-//            tableName = (String) it.next();
-//            ArrayList<RefByTable> list = table.getRefByTables();
-//            for (int j = 0; j < list.size(); j++) {
-//                if (list.get(j).getReftable().getName().equals(tableName)) {
-//                    fkcolumn.put(tableName, TableManagerCache.getTableManager().getColumn(list.get(j).getRefByColumnId()).getName());
-//                }
-//            }
-//        }
-//
-//        return fkcolumn;
-//    }
-
-//    /**
-//     * 获取主表的明细表和外健
-//     *
-//     * @param tableName
-//     * @return
-//     */
-//    private static JSONObject getMainTableFKColumn(String tableName) {
-//
-//        Table table = getTableByName(tableName);
-//        if (table == null) {
-//            return null;
-//        }
-//        JSONObject fkcolumn = new JSONObject();
-//        //获取对应外键
-//        ArrayList<RefByTable> list = table.getRefByTables();
-//        for (int j = 0; j < list.size(); j++) {
-//            fkcolumn.put(list.get(j).getReftable().getName(), TableManagerCache.getTableManager().getColumn(list.get(j).getRefByColumnId()).getName());
-//        }
-//
-//        return fkcolumn;
-//    }
-
-
     public GenTable getTable() {
         return table;
     }
@@ -261,28 +175,12 @@ public class TableServiceContext {
     public void setInsertBacth(boolean insertBacth) {
         isInsertBacth = insertBacth;
     }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Collection<Validator> getValidators() {
-        return validators;
-    }
-
-    public void setValidators(Collection<Validator> validators) {
-        this.validators = validators;
-    }
-
-    public Collection<Filter> getFilters() {
-        return filters;
-    }
-
-    public void setFilters(Collection<Filter> filters) {
-        this.filters = filters;
-    }
+//
+//    public Collection<Filter> getFilters() {
+//        return filters;
+//    }
+//
+//    public void setFilters(Collection<Filter> filters) {
+//        this.filters = filters;
+//    }
 }

boman-modules/boman-system/src/main/java/com/boman/system/common/User.java

@@ -1,191 +0,0 @@
-package com.boman.system.common;
-
-//import com.eboss.sys.util.DateUtil;
-
-import java.util.*;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 09:44
- **/
-public class User {
-
-    private Long id;
-    private String name;
-    private String eName;
-    private String trueName;
-    private String passwordHash;
-    private int isEnabled;
-    private Boolean isActive;
-    private int isEmployee;
-    private Boolean isAdmin;
-    private String description;
-    private String email;
-    private String phone;
-    private String lastLoginIp;
-    private String headImg;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String geteName() {
-        return eName;
-    }
-
-    public void seteName(String eName) {
-        this.eName = eName;
-    }
-
-    public String getTrueName() {
-        return trueName;
-    }
-
-    public void setTrueName(String trueName) {
-        this.trueName = trueName;
-    }
-
-    public String getPasswordHash() {
-        return passwordHash;
-    }
-
-    public void setPasswordHash(String passwordHash) {
-        this.passwordHash = passwordHash;
-    }
-
-    public int getIsEnabled() {
-        return isEnabled;
-    }
-
-    public void setIsEnabled(int isEnabled) {
-        this.isEnabled = isEnabled;
-    }
-
-    public Boolean getActive() {
-        return isActive;
-    }
-
-    public void setActive(Boolean active) {
-        isActive = active;
-    }
-
-    public int getIsEmployee() {
-        return isEmployee;
-    }
-
-    public void setIsEmployee(int isEmployee) {
-        this.isEmployee = isEmployee;
-    }
-
-    public Boolean getAdmin() {
-        return isAdmin;
-    }
-
-    public void setAdmin(Boolean admin) {
-        isAdmin = admin;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getLastLoginIp() {
-        return lastLoginIp;
-    }
-
-    public void setLastLoginIp(String lastLoginIp) {
-        this.lastLoginIp = lastLoginIp;
-    }
-
-    public String getHeadImg() {
-        return headImg;
-    }
-
-    public void setHeadImg(String headImg) {
-        this.headImg = headImg;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof User)) {
-            return false;
-        }
-        User user = (User) o;
-        return getIsEnabled() == user.getIsEnabled() &&
-                getIsEmployee() == user.getIsEmployee() &&
-                Objects.equals(getId(), user.getId()) &&
-                Objects.equals(getName(), user.getName()) &&
-                Objects.equals(geteName(), user.geteName()) &&
-                Objects.equals(getTrueName(), user.getTrueName()) &&
-                Objects.equals(getPasswordHash(), user.getPasswordHash()) &&
-                Objects.equals(isActive, user.isActive) &&
-                Objects.equals(isAdmin, user.isAdmin) &&
-                Objects.equals(getDescription(), user.getDescription()) &&
-                Objects.equals(getEmail(), user.getEmail()) &&
-                Objects.equals(getPhone(), user.getPhone()) &&
-                Objects.equals(getLastLoginIp(), user.getLastLoginIp()) &&
-                Objects.equals(getHeadImg(), user.getHeadImg());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getId(), getName(), geteName(), getTrueName(), getPasswordHash(), getIsEnabled(), isActive, getIsEmployee(), isAdmin, getDescription(), getEmail(), getPhone(), getLastLoginIp(), getHeadImg());
-    }
-
-    public Object getAttribute(String name) {
-//        name = name.toUpperCase().trim();
-//        if (this.userEnv == null) {
-//            return null;
-//        } else {
-//            Object o = this.userEnv.get(name);
-//            if (o == null) {
-//                if ("$SYSDATE$".equals(name)) {
-//                    o = DateUtil.dateFormatter.format(new Date());
-//                } else if ("$SYSDATENUM$".equals(name)) {
-//                    o = DateUtil.dateNumberFormatter.format(new Date());
-//                } else if ("$SYSDATETIME$".equals(name)) {
-//                    o = DateUtil.dateTimeSecondsFormatter.format(new Date());
-//                }
-//            }
-//
-//            return o;
-
-        return null;
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/ValidationResults.java

@@ -1,54 +0,0 @@
-package com.boman.system.common;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 10:50
- **/
-public class ValidationResults {
-    private static final Logger log = LoggerFactory.getLogger(ValidationResults.class);
-    private static ValidationResults okResult = new ValidationResults();
-    private Collection<String> errors = new ArrayList();
-
-    public ValidationResults() {
-    }
-
-    public static ValidationResults ok() {
-        return okResult;
-    }
-
-    public boolean isOk() {
-        return this.errors == null || this.errors.size() <= 0;
-    }
-
-//    public RowResult toRowResult(MainTableRecord row) {
-//        return RowResult.error(String.join("\r\n", this.errors));
-//    }
-
-//    public void addError(Exception e) {
-//        String message = getMessage(e);
-//        this.errors.add(message);
-//    }
-
-//    private static String getMessage(Exception ex) {
-//        String message = ex.getMessage();
-//        if (!(ex instanceof NDSException)) {
-//            StringWriter sw = new StringWriter();
-//            PrintWriter pw = new PrintWriter(sw);
-//            ex.printStackTrace(pw);
-//            message = sw.toString().replace("\n", "<br/>").replace("\tat", "");
-//        }
-//
-//        return message;
-//    }
-
-    public Collection<String> getErrors() {
-        return this.errors;
-    }
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/Validator.java

@@ -1,8 +0,0 @@
-package com.boman.system.common;
-
-
-
-
-public interface Validator {
-    void validate(TableServiceContext context, MainTableRecord currentRow);
-}

boman-modules/boman-system/src/main/java/com/boman/system/common/ValueHolder.java

@@ -1,165 +0,0 @@
-package com.boman.system.common;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author shiqian
- * @description
- * @date 2021年03月22日 09:26
- **/
-@Data
-public class ValueHolder<T> implements Serializable {
-
-    public static final int OK = 0;
-    public static final int FAIL = -1;
-
-    private T data;
-    private int code;
-    private String message;
-
-    public ValueHolder() {
-    }
-
-    public ValueHolder(int code, String message, T data) {
-        this.data = data;
-        this.code = code;
-        this.message = message;
-    }
-
-    public ValueHolder(int code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public JSONObject toJSONObject() {
-        JSONObject obj = new JSONObject();
-        obj.put("code", this.code);
-        obj.put("message", this.message);
-        obj.put("data", this.data);
-        return obj;
-    }
-
-    public static <T> ValueHolder<T> ok(String message){
-        return new ValueHolder<>(OK, message);
-    }
-
-    public static <T> ValueHolder<T> ok(String message, T data){
-        return new ValueHolder<>(OK, message, data);
-    }
-
-
-    public static <T> ValueHolder<T> ok(T data){
-        return new ValueHolder<>(OK, "成功", data);
-    }
-
-
-    public static <T> ValueHolder<T> fail(String message, T data){
-        return new ValueHolder<>(FAIL, message, data);
-    }
-
-    public static <T> ValueHolder<T> fail(String message){
-        return new ValueHolder<>(FAIL, message);
-    }
-
-
-
-
-
-
-
-
-    public boolean isOK() {
-        return this.code == 0;
-    }
-
-    public String toDebugString() {
-        return this.toJSONObject().toString();
-    }
-
-    public T getData() {
-        return this.data;
-    }
-
-    public int getCode() {
-        return this.code;
-    }
-
-    public String getMessage() {
-        return this.message;
-    }
-
-    public void setData(final T data) {
-        this.data = data;
-    }
-
-    public void setCode(final int code) {
-        this.code = code;
-    }
-
-    public void setMessage(final String message) {
-        this.message = message;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (o == this) {
-            return true;
-        } else if (!(o instanceof ValueHolder)) {
-            return false;
-        } else {
-            ValueHolder<?> other = (ValueHolder)o;
-            if (!other.canEqual(this)) {
-                return false;
-            } else {
-                label39: {
-                    Object this$data = this.getData();
-                    Object other$data = other.getData();
-                    if (this$data == null) {
-                        if (other$data == null) {
-                            break label39;
-                        }
-                    } else if (this$data.equals(other$data)) {
-                        break label39;
-                    }
-
-                    return false;
-                }
-
-                if (this.getCode() != other.getCode()) {
-                    return false;
-                } else {
-                    Object this$message = this.getMessage();
-                    Object other$message = other.getMessage();
-                    if (this$message == null) {
-                        return other$message == null;
-                    } else return this$message.equals(other$message);
-
-                }
-            }
-        }
-    }
-
-    protected boolean canEqual(final Object other) {
-        return other instanceof ValueHolder;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = 1;
-        Object $data = this.getData();
-        result = result * 59 + ($data == null ? 43 : $data.hashCode());
-        result = result * 59 + this.getCode();
-        Object $message = this.getMessage();
-        result = result * 59 + ($message == null ? 43 : $message.hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "ValueHolder(data=" + this.getData() + ", code=" + this.getCode() + ", message=" + this.getMessage() + ")";
-    }
-}
-

boman-modules/boman-system/src/main/java/com/boman/system/controller/ObjController.java

@@ -1,10 +1,8 @@
 package com.boman.system.controller;
 
-import com.alibaba.fastjson.JSONObject;
+import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.system.common.BaseTableSaveDTO;
-import com.boman.system.common.RowResult;
 import com.boman.system.common.TableServiceCmdService;
-import com.boman.system.common.ValueHolder;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,8 +10,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 
 /**
  * @author shiqian
@@ -46,7 +42,7 @@ public class ObjController {
      */
     @ApiOperation(value = "单对象保存")
     @PostMapping("/objectSave")
-    public ValueHolder<RowResult> objectSave(@RequestBody BaseTableSaveDTO baseTableSaveDTO) {
+    public AjaxResult objectSave(@RequestBody BaseTableSaveDTO baseTableSaveDTO) {
         return tableServiceCmdService.objectSave(baseTableSaveDTO);
     }
 
@@ -67,7 +63,7 @@ public class ObjController {
      */
     @ApiOperation(value = "单对象删除")
     @PostMapping("/objectDelete")
-    public ValueHolder<RowResult> objectDelete(@RequestBody BaseTableSaveDTO baseTableSaveDTO) {
+    public AjaxResult objectDelete(@RequestBody BaseTableSaveDTO baseTableSaveDTO) {
         return tableServiceCmdService.objectDelete(baseTableSaveDTO);
     }
 
@@ -89,7 +85,7 @@ public class ObjController {
      */
     @ApiOperation(value = "单对象逻辑删除")
     @PostMapping("/objectLogicDelete")
-    public ValueHolder<RowResult> objectLogicDelete(@RequestBody BaseTableSaveDTO baseTableSaveDTO) {
+    public AjaxResult objectLogicDelete(@RequestBody BaseTableSaveDTO baseTableSaveDTO) {
         return tableServiceCmdService.objectLogicDelete(baseTableSaveDTO);
     }
 
@@ -116,14 +112,13 @@ public class ObjController {
      */
     @ApiOperation(value = "获取单表单数据")
     @PostMapping("/getObject")
-    public ValueHolder<List<JSONObject>> getObject(@RequestBody BaseTableSaveDTO condition) {
+    public AjaxResult getObject(@RequestBody BaseTableSaveDTO condition) {
         return tableServiceCmdService.getObject(condition);
     }
 
-
-    @ApiOperation(value = "表单提交接口")
-    @PostMapping("/objectSubmit")
-    public ValueHolder<List<JSONObject>> objectSubmit(@RequestBody BaseTableSaveDTO condition) {
+    @ApiOperation(value = "获取表单列表数据")
+    @PostMapping("/queryList")
+    public AjaxResult queryList(@RequestBody BaseTableSaveDTO condition) {
         return tableServiceCmdService.getObject(condition);
     }
 

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysConfigController.java

@@ -62,10 +62,10 @@ public class SysConfigController extends BaseController
     /**
      * 根据参数编号获取详细信息
      */
-    @GetMapping(value = "/{configId}")
-    public AjaxResult getInfo(@PathVariable Long configId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(configService.selectConfigById(configId));
+        return AjaxResult.success(configService.selectConfigById(id));
     }
 
     /**
@@ -114,10 +114,10 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:config:remove")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{configIds}")
-    public AjaxResult remove(@PathVariable Long[] configIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(configService.deleteConfigByIds(configIds));
+        return toAjax(configService.deleteConfigByIds(ids));
     }
 
     /**

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDeptController.java

@@ -51,16 +51,16 @@ public class SysDeptController extends BaseController
      * 查询部门列表（排除节点）
      */
     @PreAuthorize(hasPermi = "system:dept:list")
-    @GetMapping("/list/exclude/{deptId}")
-    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    @GetMapping("/list/exclude/{id}")
+    public AjaxResult excludeChild(@PathVariable(value = "id", required = false) Long id)
     {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         Iterator<SysDept> it = depts.iterator();
         while (it.hasNext())
         {
             SysDept d = (SysDept) it.next();
-            if (d.getDeptId().intValue() == deptId
-                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
+            if (d.getId().intValue() == id
+                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), id + ""))
             {
                 it.remove();
             }
@@ -72,10 +72,10 @@ public class SysDeptController extends BaseController
      * 根据部门编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:dept:query")
-    @GetMapping(value = "/{deptId}")
-    public AjaxResult getInfo(@PathVariable Long deptId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(deptService.selectDeptById(deptId));
+        return AjaxResult.success(deptService.selectDeptById(id));
     }
 
     /**
@@ -129,12 +129,12 @@ public class SysDeptController extends BaseController
         {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
-        else if (dept.getParentId().equals(dept.getDeptId()))
+        else if (dept.getParentId().equals(dept.getId()))
         {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
         }
         else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
+                && deptService.selectNormalChildrenDeptById(dept.getId()) > 0)
         {
             return AjaxResult.error("该部门包含未停用的子部门！");
         }
@@ -147,17 +147,17 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{deptId}")
-    public AjaxResult remove(@PathVariable Long deptId)
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable Long id)
     {
-        if (deptService.hasChildByDeptId(deptId))
+        if (deptService.hasChildById(id))
         {
             return AjaxResult.error("存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
+        if (deptService.checkDeptExistUser(id))
         {
             return AjaxResult.error("部门存在用户,不允许删除");
         }
-        return toAjax(deptService.deleteDeptById(deptId));
+        return toAjax(deptService.deleteDeptById(id));
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictDataController.java

@@ -65,10 +65,10 @@ public class SysDictDataController extends BaseController
      * 查询字典数据详细
      */
     @PreAuthorize(hasPermi = "system:dict:query")
-    @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+        return AjaxResult.success(dictDataService.selectDictDataById(id));
     }
 
     /**
@@ -114,9 +114,9 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
+        return toAjax(dictDataService.deleteDictDataByIds(ids));
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDictTypeController.java

@@ -60,10 +60,10 @@ public class SysDictTypeController extends BaseController
      * 查询字典类型详细
      */
     @PreAuthorize(hasPermi = "system:dict:query")
-    @GetMapping(value = "/{dictId}")
-    public AjaxResult getInfo(@PathVariable Long dictId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(dictTypeService.selectDictTypeById(dictId));
+        return AjaxResult.success(dictTypeService.selectDictTypeById(id));
     }
 
     /**
@@ -103,10 +103,10 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{dictIds}")
-    public AjaxResult remove(@PathVariable Long[] dictIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(dictTypeService.deleteDictTypeByIds(dictIds));
+        return toAjax(dictTypeService.deleteDictTypeByIds(ids));
     }
 
     /**

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysLogininforController.java

@@ -57,10 +57,10 @@ public class SysLogininforController extends BaseController
 
     @PreAuthorize(hasPermi = "system:logininfor:remove")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{infoIds}")
-    public AjaxResult remove(@PathVariable Long[] infoIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+        return toAjax(logininforService.deleteLogininforByIds(ids));
     }
 
     @PreAuthorize(hasPermi = "system:logininfor:remove")

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysMenuController.java

@@ -51,10 +51,10 @@ public class SysMenuController extends BaseController
      * 根据菜单编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:menu:query")
-    @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable Long menuId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(menuService.selectMenuById(menuId));
+        return AjaxResult.success(menuService.selectMenuById(id));
     }
 
     /**
@@ -120,7 +120,7 @@ public class SysMenuController extends BaseController
         {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
-        else if (menu.getMenuId().equals(menu.getParentId()))
+        else if (menu.getId().equals(menu.getParentId()))
         {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
@@ -133,18 +133,18 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{menuId}")
-    public AjaxResult remove(@PathVariable("menuId") Long menuId)
+    @DeleteMapping("/{id}")
+    public AjaxResult remove(@PathVariable("id") Long id)
     {
-        if (menuService.hasChildByMenuId(menuId))
+        if (menuService.hasChildById(id))
         {
             return AjaxResult.error("存在子菜单,不允许删除");
         }
-        if (menuService.checkMenuExistRole(menuId))
+        if (menuService.checkMenuExistRole(id))
         {
             return AjaxResult.error("菜单已分配,不允许删除");
         }
-        return toAjax(menuService.deleteMenuById(menuId));
+        return toAjax(menuService.deleteMenuById(id));
     }
 
     /**
@@ -156,7 +156,7 @@ public class SysMenuController extends BaseController
     public AjaxResult getRouters()
     {
         Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        List<SysMenu> menus = menuService.selectMenuTreeById(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysNoticeController.java

@@ -49,10 +49,10 @@ public class SysNoticeController extends BaseController
      * 根据通知公告编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:notice:query")
-    @GetMapping(value = "/{noticeId}")
-    public AjaxResult getInfo(@PathVariable Long noticeId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(noticeService.selectNoticeById(noticeId));
+        return AjaxResult.success(noticeService.selectNoticeById(id));
     }
 
     /**
@@ -84,9 +84,9 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:notice:remove")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{noticeIds}")
-    public AjaxResult remove(@PathVariable Long[] noticeIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+        return toAjax(noticeService.deleteNoticeByIds(ids));
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysOperlogController.java

@@ -53,10 +53,10 @@ public class SysOperlogController extends BaseController
     }
 
     @PreAuthorize(hasPermi = "system:operlog:remove")
-    @DeleteMapping("/{operIds}")
-    public AjaxResult remove(@PathVariable Long[] operIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(operLogService.deleteOperLogByIds(operIds));
+        return toAjax(operLogService.deleteOperLogByIds(ids));
     }
 
     @PreAuthorize(hasPermi = "system:operlog:remove")

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysPostController.java

@@ -63,10 +63,10 @@ public class SysPostController extends BaseController
      * 根据岗位编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:post:query")
-    @GetMapping(value = "/{postId}")
-    public AjaxResult getInfo(@PathVariable Long postId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(postService.selectPostById(postId));
+        return AjaxResult.success(postService.selectPostById(id));
     }
 
     /**
@@ -114,10 +114,10 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:post:remove")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{postIds}")
-    public AjaxResult remove(@PathVariable Long[] postIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(postService.deletePostByIds(postIds));
+        return toAjax(postService.deletePostByIds(ids));
     }
 
     /**

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java

@@ -60,10 +60,10 @@ public class SysRoleController extends BaseController
      * 根据角色编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:role:query")
-    @GetMapping(value = "/{roleId}")
-    public AjaxResult getInfo(@PathVariable Long roleId)
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id)
     {
-        return AjaxResult.success(roleService.selectRoleById(roleId));
+        return AjaxResult.success(roleService.selectRoleById(id));
     }
 
     /**
@@ -138,10 +138,10 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{roleIds}")
-    public AjaxResult remove(@PathVariable Long[] roleIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(roleService.deleteRoleByIds(roleIds));
+        return toAjax(roleService.deleteRoleByIds(ids));
     }
 
     /**

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java

@@ -109,9 +109,9 @@ public class SysUserController extends BaseController
             return R.fail("用户名或密码错误");
         }
         // 角色集合
-        Set<String> roles = permissionService.getRolePermission(sysUser.getUserId());
+        Set<String> roles = permissionService.getRolePermission(sysUser.getId());
         // 权限集合
-        Set<String> permissions = permissionService.getMenuPermission(sysUser.getUserId());
+        Set<String> permissions = permissionService.getMenuPermission(sysUser.getId());
         LoginUser sysUserVo = new LoginUser();
         sysUserVo.setSysUser(sysUser);
         sysUserVo.setRoles(roles);
@@ -127,13 +127,13 @@ public class SysUserController extends BaseController
     @GetMapping("getInfo")
     public AjaxResult getInfo()
     {
-        Long userId = SecurityUtils.getUserId();
+        Long id = SecurityUtils.getUserId();
         // 角色集合
-        Set<String> roles = permissionService.getRolePermission(userId);
+        Set<String> roles = permissionService.getRolePermission(id);
         // 权限集合
-        Set<String> permissions = permissionService.getMenuPermission(userId);
+        Set<String> permissions = permissionService.getMenuPermission(id);
         AjaxResult ajax = AjaxResult.success();
-        ajax.put("user", userService.selectUserById(userId));
+        ajax.put("user", userService.selectUserById(id));
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
         return ajax;
@@ -143,18 +143,18 @@ public class SysUserController extends BaseController
      * 根据用户编号获取详细信息
      */
     @PreAuthorize(hasPermi = "system:user:query")
-    @GetMapping(value = { "/", "/{userId}" })
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    @GetMapping(value = { "/", "/{id}" })
+    public AjaxResult getInfo(@PathVariable(value = "id", required = false) Long id)
     {
         AjaxResult ajax = AjaxResult.success();
         List<SysRole> roles = roleService.selectRoleAll();
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", SysUser.isAdmin(id) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll());
-        if (StringUtils.isNotNull(userId))
+        if (StringUtils.isNotNull(id))
         {
-            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
-            ajax.put("postIds", postService.selectPostListByUserId(userId));
-            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
+            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(id));
+            ajax.put("postIds", postService.selectPostListById(id));
+            ajax.put("roleIds", roleService.selectRoleListById(id));
         }
         return ajax;
     }
@@ -214,10 +214,10 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(userService.deleteUserByIds(userIds));
+        return toAjax(userService.deleteUserByIds(ids));
     }
 
     /**

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysConfig.java

@@ -19,7 +19,7 @@ public class SysConfig extends BaseEntity
 
     /** 参数主键 */
     @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
-    private Long configId;
+    private Long id;
 
     /** 参数名称 */
     @Excel(name = "参数名称")
@@ -37,14 +37,12 @@ public class SysConfig extends BaseEntity
     @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
     private String configType;
 
-    public Long getConfigId()
-    {
-        return configId;
+    public Long getId() {
+        return id;
     }
 
-    public void setConfigId(Long configId)
-    {
-        this.configId = configId;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     @NotBlank(message = "参数名称不能为空")
@@ -92,20 +90,15 @@ public class SysConfig extends BaseEntity
     {
         this.configType = configType;
     }
-    
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("configId", getConfigId())
-            .append("configName", getConfigName())
-            .append("configKey", getConfigKey())
-            .append("configValue", getConfigValue())
-            .append("configType", getConfigType())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return "SysConfig{" +
+                "id=" + id +
+                ", configName='" + configName + '\'' +
+                ", configKey='" + configKey + '\'' +
+                ", configValue='" + configValue + '\'' +
+                ", configType='" + configType + '\'' +
+                '}';
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysDictData.java

@@ -20,7 +20,7 @@ public class SysDictData extends BaseEntity
 
     /** 字典编码 */
     @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
-    private Long dictCode;
+    private Long id;
 
     /** 字典排序 */
     @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
@@ -52,14 +52,14 @@ public class SysDictData extends BaseEntity
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    public Long getDictCode()
+    public Long getId()
     {
-        return dictCode;
+        return id;
     }
 
-    public void setDictCode(Long dictCode)
+    public void setId(Long id)
     {
-        this.dictCode = dictCode;
+        this.id = id;
     }
 
     public Long getDictSort()
@@ -157,7 +157,7 @@ public class SysDictData extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictCode", getDictCode())
+            .append("id", getId())
             .append("dictSort", getDictSort())
             .append("dictLabel", getDictLabel())
             .append("dictValue", getDictValue())

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysDictType.java

@@ -19,7 +19,7 @@ public class SysDictType extends BaseEntity
 
     /** 字典主键 */
     @Excel(name = "字典主键", cellType = ColumnType.NUMERIC)
-    private Long dictId;
+    private Long id;
 
     /** 字典名称 */
     @Excel(name = "字典名称")
@@ -33,14 +33,14 @@ public class SysDictType extends BaseEntity
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    public Long getDictId()
+    public Long getId()
     {
-        return dictId;
+        return id;
     }
 
-    public void setDictId(Long dictId)
+    public void setId(Long id)
     {
-        this.dictId = dictId;
+        this.id = id;
     }
 
     @NotBlank(message = "字典名称不能为空")
@@ -80,7 +80,7 @@ public class SysDictType extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictId", getDictId())
+            .append("id", getId())
             .append("dictName", getDictName())
             .append("dictType", getDictType())
             .append("status", getStatus())

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysLogininfor.java

@@ -17,7 +17,7 @@ public class SysLogininfor extends BaseEntity
 
     /** ID */
     @Excel(name = "序号", cellType = ColumnType.NUMERIC)
-    private Long infoId;
+    private Long id;
 
     /** 用户账号 */
     @Excel(name = "用户账号")
@@ -40,14 +40,14 @@ public class SysLogininfor extends BaseEntity
     @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date accessTime;
 
-    public Long getInfoId()
+    public Long getId()
     {
-        return infoId;
+        return id;
     }
 
-    public void setInfoId(Long infoId)
+    public void setId(Long id)
     {
-        this.infoId = infoId;
+        this.id = id;
     }
 
     public String getUserName()

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysMenu.java

@@ -19,7 +19,7 @@ public class SysMenu extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 菜单ID */
-    private Long menuId;
+    private Long id;
 
     /** 菜单名称 */
     private String menuName;
@@ -63,14 +63,14 @@ public class SysMenu extends BaseEntity
     /** 子菜单 */
     private List<SysMenu> children = new ArrayList<SysMenu>();
 
-    public Long getMenuId()
+    public Long getId()
     {
-        return menuId;
+        return id;
     }
 
-    public void setMenuId(Long menuId)
+    public void setId(Long id)
     {
-        this.menuId = menuId;
+        this.id = id;
     }
 
     @NotBlank(message = "菜单名称不能为空")
@@ -223,7 +223,7 @@ public class SysMenu extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("menuId", getMenuId())
+            .append("id", getId())
             .append("menuName", getMenuName())
             .append("parentId", getParentId())
             .append("orderNum", getOrderNum())

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysNotice.java

@@ -17,7 +17,7 @@ public class SysNotice extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 公告ID */
-    private Long noticeId;
+    private Long id;
 
     /** 公告标题 */
     private String noticeTitle;
@@ -31,14 +31,14 @@ public class SysNotice extends BaseEntity
     /** 公告状态（0正常 1关闭） */
     private String status;
 
-    public Long getNoticeId()
+    public Long getId()
     {
-        return noticeId;
+        return id;
     }
 
-    public void setNoticeId(Long noticeId)
+    public void setId(Long id)
     {
-        this.noticeId = noticeId;
+        this.id = id;
     }
 
     public void setNoticeTitle(String noticeTitle)
@@ -86,7 +86,7 @@ public class SysNotice extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
+            .append("id", getId())
             .append("noticeTitle", getNoticeTitle())
             .append("noticeType", getNoticeType())
             .append("noticeContent", getNoticeContent())

boman-modules/boman-system/src/main/java/com/boman/system/domain/SysPost.java

@@ -19,7 +19,7 @@ public class SysPost extends BaseEntity
 
     /** 岗位序号 */
     @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
-    private Long postId;
+    private Long id;
 
     /** 岗位编码 */
     @Excel(name = "岗位编码")
@@ -40,14 +40,14 @@ public class SysPost extends BaseEntity
     /** 用户是否存在此岗位标识 默认不存在 */
     private boolean flag = false;
 
-    public Long getPostId()
+    public Long getId()
     {
-        return postId;
+        return id;
     }
 
-    public void setPostId(Long postId)
+    public void setId(Long id)
     {
-        this.postId = postId;
+        this.id = id;
     }
 
     @NotBlank(message = "岗位编码不能为空")
@@ -108,7 +108,7 @@ public class SysPost extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("postId", getPostId())
+            .append("id", getId())
             .append("postCode", getPostCode())
             .append("postName", getPostName())
             .append("postSort", getPostSort())

boman-modules/boman-system/src/main/java/com/boman/system/domain/vo/TreeSelect.java

@@ -33,14 +33,14 @@ public class TreeSelect implements Serializable
 
     public TreeSelect(SysDept dept)
     {
-        this.id = dept.getDeptId();
+        this.id = dept.getId();
         this.label = dept.getDeptName();
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
     public TreeSelect(SysMenu menu)
     {
-        this.id = menu.getMenuId();
+        this.id = menu.getId();
         this.label = menu.getMenuName();
         this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysConfigMapper.java

@@ -57,16 +57,16 @@ public interface SysConfigMapper
     /**
      * 删除参数配置
      * 
-     * @param configId 参数ID
+     * @param id 参数ID
      * @return 结果
      */
-    public int deleteConfigById(Long configId);
+    public int deleteConfigById(Long id);
 
     /**
      * 批量删除参数信息
      * 
-     * @param configIds 需要删除的参数ID
+     * @param ids 需要删除的参数ID
      * @return 结果
      */
-    public int deleteConfigByIds(Long[] configIds);
+    public int deleteConfigByIds(Long[] ids);
 }

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDeptMapper.java

@@ -24,51 +24,51 @@ public interface SysDeptMapper
     /**
      * 根据角色ID查询部门树信息
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @param deptCheckStrictly 部门树选择项是否关联显示
      * @return 选中部门列表
      */
-    public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
+    public List<Integer> selectDeptListById(@Param("id") Long id, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
     /**
      * 根据部门ID查询信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 部门信息
      */
-    public SysDept selectDeptById(Long deptId);
+    public SysDept selectDeptById(Long id);
 
     /**
      * 根据ID查询所有子部门
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 部门列表
      */
-    public List<SysDept> selectChildrenDeptById(Long deptId);
+    public List<SysDept> selectChildrenDeptById(Long id);
 
     /**
      * 根据ID查询所有子部门（正常状态）
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById(Long deptId);
+    public int selectNormalChildrenDeptById(Long id);
 
     /**
      * 是否存在子节点
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
-    public int hasChildByDeptId(Long deptId);
+    public int hasChildById(Long id);
 
     /**
      * 查询部门是否存在用户
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
-    public int checkDeptExistUser(Long deptId);
+    public int checkDeptExistUser(Long id);
 
     /**
      * 校验部门名称是否唯一
@@ -113,8 +113,8 @@ public interface SysDeptMapper
     /**
      * 删除部门管理信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+    public int deleteDeptById(Long id);
 }

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDictDataMapper.java

@@ -41,10 +41,10 @@ public interface SysDictDataMapper
     /**
      * 根据字典数据ID查询信息
      * 
-     * @param dictCode 字典数据ID
+     * @param id 字典数据ID
      * @return 字典数据
      */
-    public SysDictData selectDictDataById(Long dictCode);
+    public SysDictData selectDictDataById(Long id);
 
     /**
      * 查询字典数据
@@ -57,18 +57,18 @@ public interface SysDictDataMapper
     /**
      * 通过字典ID删除字典数据信息
      * 
-     * @param dictCode 字典数据ID
+     * @param id 字典数据ID
      * @return 结果
      */
-    public int deleteDictDataById(Long dictCode);
+    public int deleteDictDataById(Long id);
 
     /**
      * 批量删除字典数据信息
      * 
-     * @param dictCodes 需要删除的字典数据ID
+     * @param ids 需要删除的字典数据ID
      * @return 结果
      */
-    public int deleteDictDataByIds(Long[] dictCodes);
+    public int deleteDictDataByIds(Long[] ids);
 
     /**
      * 新增字典数据信息

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDictTypeMapper.java

@@ -32,10 +32,10 @@ public interface SysDictTypeMapper
     /**
      * 根据字典类型ID查询信息
      * 
-     * @param dictId 字典类型ID
+     * @param id 字典类型ID
      * @return 字典类型
      */
-    public SysDictType selectDictTypeById(Long dictId);
+    public SysDictType selectDictTypeById(Long id);
 
     /**
      * 根据字典类型查询信息
@@ -48,18 +48,18 @@ public interface SysDictTypeMapper
     /**
      * 通过字典ID删除字典信息
      * 
-     * @param dictId 字典ID
+     * @param id 字典ID
      * @return 结果
      */
-    public int deleteDictTypeById(Long dictId);
+    public int deleteDictTypeById(Long id);
 
     /**
      * 批量删除字典类型信息
      * 
-     * @param dictIds 需要删除的字典ID
+     * @param ids 需要删除的字典ID
      * @return 结果
      */
-    public int deleteDictTypeByIds(Long[] dictIds);
+    public int deleteDictTypeByIds(Long[] ids);
 
     /**
      * 新增字典类型信息

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysLogininforMapper.java

@@ -28,10 +28,10 @@ public interface SysLogininforMapper
     /**
      * 批量删除系统登录日志
      * 
-     * @param infoIds 需要删除的登录日志ID
+     * @param ids 需要删除的登录日志ID
      * @return 结果
      */
-    public int deleteLogininforByIds(Long[] infoIds);
+    public int deleteLogininforByIds(Long[] ids);
 
     /**
      * 清空系统登录日志

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysMenuMapper.java

@@ -39,10 +39,10 @@ public interface SysMenuMapper
     /**
      * 根据用户ID查询权限
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 权限列表
      */
-    public List<String> selectMenuPermsByUserId(Long userId);
+    public List<String> selectMenuPermsById(Long id);
 
     /**
      * 根据用户ID查询菜单
@@ -54,10 +54,10 @@ public interface SysMenuMapper
     /**
      * 根据用户ID查询菜单
      * 
-     * @param username 用户ID
+     * @param id 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeById(Long id);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -71,18 +71,18 @@ public interface SysMenuMapper
     /**
      * 根据菜单ID查询信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 菜单信息
      */
-    public SysMenu selectMenuById(Long menuId);
+    public SysMenu selectMenuById(Long id);
 
     /**
      * 是否存在菜单子节点
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
-    public int hasChildByMenuId(Long menuId);
+    public int hasChildById(Long id);
 
     /**
      * 新增菜单信息
@@ -103,10 +103,10 @@ public interface SysMenuMapper
     /**
      * 删除菜单管理信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
-    public int deleteMenuById(Long menuId);
+    public int deleteMenuById(Long id);
 
     /**
      * 校验菜单名称是否唯一

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysNoticeMapper.java

@@ -14,10 +14,10 @@ public interface SysNoticeMapper
     /**
      * 查询公告信息
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 公告信息
      */
-    public SysNotice selectNoticeById(Long noticeId);
+    public SysNotice selectNoticeById(Long id);
 
     /**
      * 查询公告列表
@@ -46,16 +46,16 @@ public interface SysNoticeMapper
     /**
      * 批量删除公告
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 结果
      */
-    public int deleteNoticeById(Long noticeId);
+    public int deleteNoticeById(Long id);
 
     /**
      * 批量删除公告信息
      * 
-     * @param noticeIds 需要删除的公告ID
+     * @param ids 需要删除的公告ID
      * @return 结果
      */
-    public int deleteNoticeByIds(Long[] noticeIds);
+    public int deleteNoticeByIds(Long[] ids);
 }

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysOperLogMapper.java

@@ -29,18 +29,18 @@ public interface SysOperLogMapper
     /**
      * 批量删除系统操作日志
      * 
-     * @param operIds 需要删除的操作日志ID
+     * @param ids 需要删除的操作日志ID
      * @return 结果
      */
-    public int deleteOperLogByIds(Long[] operIds);
+    public int deleteOperLogByIds(Long[] ids);
 
     /**
      * 查询操作日志详细
      * 
-     * @param operId 操作ID
+     * @param id 操作ID
      * @return 操作日志对象
      */
-    public SysOperLog selectOperLogById(Long operId);
+    public SysOperLog selectOperLogById(Long id);
 
     /**
      * 清空操作日志

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysPostMapper.java

@@ -29,18 +29,18 @@ public interface SysPostMapper
     /**
      * 通过岗位ID查询岗位信息
      * 
-     * @param postId 岗位ID
+     * @param id 岗位ID
      * @return 角色对象信息
      */
-    public SysPost selectPostById(Long postId);
+    public SysPost selectPostById(Long id);
 
     /**
      * 根据用户ID获取岗位选择框列表
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Integer> selectPostListByUserId(Long userId);
+    public List<Integer> selectPostListById(Long id);
 
     /**
      * 查询用户所属岗位组
@@ -53,18 +53,18 @@ public interface SysPostMapper
     /**
      * 删除岗位信息
      * 
-     * @param postId 岗位ID
+     * @param id 岗位ID
      * @return 结果
      */
-    public int deletePostById(Long postId);
+    public int deletePostById(Long id);
 
     /**
      * 批量删除岗位信息
      * 
-     * @param postIds 需要删除的岗位ID
+     * @param ids 需要删除的岗位ID
      * @return 结果
      */
-    public int deletePostByIds(Long[] postIds);
+    public int deletePostByIds(Long[] ids);
 
     /**
      * 修改岗位信息

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysRoleMapper.java

@@ -22,10 +22,10 @@ public interface SysRoleMapper
     /**
      * 根据用户ID查询角色
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 角色列表
      */
-    public List<SysRole> selectRolePermissionByUserId(Long userId);
+    public List<SysRole> selectRolePermissionById(Long id);
 
     /**
      * 查询所有角色
@@ -37,10 +37,10 @@ public interface SysRoleMapper
     /**
      * 根据用户ID获取角色选择框列表
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 选中角色ID列表
      */
-    public List<Integer> selectRoleListByUserId(Long userId);
+    public List<Integer> selectRoleListById(Long id);
 
     /**
      * 通过角色ID查询角色

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysUserMapper.java

@@ -32,10 +32,10 @@ public interface SysUserMapper
     /**
      * 通过用户ID查询用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(Long id);
 
     /**
      * 新增用户信息
@@ -74,18 +74,18 @@ public interface SysUserMapper
     /**
      * 通过用户ID删除用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(Long id);
 
     /**
      * 批量删除用户信息
      * 
-     * @param userIds 需要删除的用户ID
+     * @param ids 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    public int deleteUserByIds(Long[] ids);
 
     /**
      * 校验用户名称是否唯一

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysUserRoleMapper.java

@@ -56,9 +56,9 @@ public interface SysUserRoleMapper
     /**
      * 批量取消授权用户角色
      * 
-     * @param roleId 角色ID
-     * @param userIds 需要删除的用户数据ID
+     * @param id 角色ID
+     * @param ids 需要删除的用户数据ID
      * @return 结果
      */
-    public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+    public int deleteUserRoleInfos(@Param("id") Long id, @Param("ids") Long[] ids);
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysConfigService.java

@@ -14,10 +14,10 @@ public interface ISysConfigService
     /**
      * 查询参数配置信息
      * 
-     * @param configId 参数配置ID
+     * @param id 参数配置ID
      * @return 参数配置信息
      */
-    public SysConfig selectConfigById(Long configId);
+    public SysConfig selectConfigById(Long id);
 
     /**
      * 根据键名查询参数配置信息
@@ -54,10 +54,10 @@ public interface ISysConfigService
     /**
      * 批量删除参数信息
      * 
-     * @param configIds 需要删除的参数ID
+     * @param ids 需要删除的参数ID
      * @return 结果
      */
-    public int deleteConfigByIds(Long[] configIds);
+    public int deleteConfigByIds(Long[] ids);
 
     /**
      * 清空缓存数据

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDeptService.java

@@ -47,34 +47,34 @@ public interface ISysDeptService
     /**
      * 根据部门ID查询信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 部门信息
      */
-    public SysDept selectDeptById(Long deptId);
+    public SysDept selectDeptById(Long id);
 
     /**
      * 根据ID查询所有子部门（正常状态）
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById(Long deptId);
+    public int selectNormalChildrenDeptById(Long id);
 
     /**
      * 是否存在部门子节点
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
-    public boolean hasChildByDeptId(Long deptId);
+    public boolean hasChildById(Long id);
 
     /**
      * 查询部门是否存在用户
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkDeptExistUser(Long deptId);
+    public boolean checkDeptExistUser(Long id);
 
     /**
      * 校验部门名称是否唯一
@@ -103,8 +103,8 @@ public interface ISysDeptService
     /**
      * 删除部门管理信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+    public int deleteDeptById(Long id);
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDictDataService.java

@@ -30,18 +30,18 @@ public interface ISysDictDataService
     /**
      * 根据字典数据ID查询信息
      * 
-     * @param dictCode 字典数据ID
+     * @param id 字典数据ID
      * @return 字典数据
      */
-    public SysDictData selectDictDataById(Long dictCode);
+    public SysDictData selectDictDataById(Long id);
 
     /**
      * 批量删除字典数据信息
      * 
-     * @param dictCodes 需要删除的字典数据ID
+     * @param ids 需要删除的字典数据ID
      * @return 结果
      */
-    public int deleteDictDataByIds(Long[] dictCodes);
+    public int deleteDictDataByIds(Long[] ids);
 
     /**
      * 新增保存字典数据信息

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDictTypeService.java

@@ -37,10 +37,10 @@ public interface ISysDictTypeService
     /**
      * 根据字典类型ID查询信息
      * 
-     * @param dictId 字典类型ID
+     * @param id 字典类型ID
      * @return 字典类型
      */
-    public SysDictType selectDictTypeById(Long dictId);
+    public SysDictType selectDictTypeById(Long id);
 
     /**
      * 根据字典类型查询信息
@@ -53,10 +53,10 @@ public interface ISysDictTypeService
     /**
      * 批量删除字典信息
      * 
-     * @param dictIds 需要删除的字典ID
+     * @param ids 需要删除的字典ID
      * @return 结果
      */
-    public int deleteDictTypeByIds(Long[] dictIds);
+    public int deleteDictTypeByIds(Long[] ids);
 
     /**
      * 清空缓存数据

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysLogininforService.java

@@ -28,10 +28,10 @@ public interface ISysLogininforService
     /**
      * 批量删除系统登录日志
      * 
-     * @param infoIds 需要删除的登录日志ID
+     * @param ids 需要删除的登录日志ID
      * @return
      */
-    public int deleteLogininforByIds(Long[] infoIds);
+    public int deleteLogininforByIds(Long[] ids);
 
     /**
      * 清空系统登录日志

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysMenuService.java

@@ -34,18 +34,18 @@ public interface ISysMenuService
     /**
      * 根据用户ID查询权限
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 权限列表
      */
-    public Set<String> selectMenuPermsByUserId(Long userId);
+    public Set<String> selectMenuPermsById(Long id);
 
     /**
      * 根据用户ID查询菜单树信息
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeById(Long id);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -82,26 +82,26 @@ public interface ISysMenuService
     /**
      * 根据菜单ID查询信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 菜单信息
      */
-    public SysMenu selectMenuById(Long menuId);
+    public SysMenu selectMenuById(Long id);
 
     /**
      * 是否存在菜单子节点
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean hasChildByMenuId(Long menuId);
+    public boolean hasChildById(Long id);
 
     /**
      * 查询菜单是否存在角色
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkMenuExistRole(Long menuId);
+    public boolean checkMenuExistRole(Long id);
 
     /**
      * 新增保存菜单信息
@@ -122,10 +122,10 @@ public interface ISysMenuService
     /**
      * 删除菜单管理信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
-    public int deleteMenuById(Long menuId);
+    public int deleteMenuById(Long id);
 
     /**
      * 校验菜单名称是否唯一

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysNoticeService.java

@@ -14,10 +14,10 @@ public interface ISysNoticeService
     /**
      * 查询公告信息
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 公告信息
      */
-    public SysNotice selectNoticeById(Long noticeId);
+    public SysNotice selectNoticeById(Long id);
 
     /**
      * 查询公告列表
@@ -46,16 +46,16 @@ public interface ISysNoticeService
     /**
      * 删除公告信息
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 结果
      */
-    public int deleteNoticeById(Long noticeId);
+    public int deleteNoticeById(Long id);
     
     /**
      * 批量删除公告信息
      * 
-     * @param noticeIds 需要删除的公告ID
+     * @param ids 需要删除的公告ID
      * @return 结果
      */
-    public int deleteNoticeByIds(Long[] noticeIds);
+    public int deleteNoticeByIds(Long[] ids);
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysOperLogService.java

@@ -29,18 +29,18 @@ public interface ISysOperLogService
     /**
      * 批量删除系统操作日志
      * 
-     * @param operIds 需要删除的操作日志ID
+     * @param ids 需要删除的操作日志ID
      * @return 结果
      */
-    public int deleteOperLogByIds(Long[] operIds);
+    public int deleteOperLogByIds(Long[] ids);
 
     /**
      * 查询操作日志详细
      * 
-     * @param operId 操作ID
+     * @param id 操作ID
      * @return 操作日志对象
      */
-    public SysOperLog selectOperLogById(Long operId);
+    public SysOperLog selectOperLogById(Long id);
 
     /**
      * 清空操作日志

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysPermissionService.java

@@ -7,16 +7,16 @@ public interface ISysPermissionService
     /**
      * 获取角色数据权限
      * 
-     * @param userId 用户Id
+     * @param id 用户Id
      * @return 角色权限信息
      */
-    public Set<String> getRolePermission(Long userId);
+    public Set<String> getRolePermission(Long id);
 
     /**
      * 获取菜单数据权限
      * 
-     * @param userId 用户Id
+     * @param id 用户Id
      * @return 菜单权限信息
      */
-    public Set<String> getMenuPermission(Long userId);
+    public Set<String> getMenuPermission(Long id);
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysPostService.java

@@ -36,15 +36,15 @@ public interface ISysPostService
 
     /**
      * 根据用户ID获取岗位选择框列表
-     * 
-     * @param userId 用户ID
+     *
+     * @param id 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Integer> selectPostListByUserId(Long userId);
+    public List<Integer> selectPostListById(Long id);
 
     /**
      * 校验岗位名称
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
@@ -52,7 +52,7 @@ public interface ISysPostService
 
     /**
      * 校验岗位编码
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
@@ -60,7 +60,7 @@ public interface ISysPostService
 
     /**
      * 通过岗位ID查询岗位使用数量
-     * 
+     *
      * @param postId 岗位ID
      * @return 结果
      */
@@ -68,7 +68,7 @@ public interface ISysPostService
 
     /**
      * 删除岗位信息
-     * 
+     *
      * @param postId 岗位ID
      * @return 结果
      */
@@ -76,7 +76,7 @@ public interface ISysPostService
 
     /**
      * 批量删除岗位信息
-     * 
+     *
      * @param postIds 需要删除的岗位ID
      * @return 结果
      * @throws Exception 异常

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysRoleService.java

@@ -23,10 +23,10 @@ public interface ISysRoleService
     /**
      * 根据用户ID查询角色
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 权限列表
      */
-    public Set<String> selectRolePermissionByUserId(Long userId);
+    public Set<String> selectRolePermissionById(Long id);
 
     /**
      * 查询所有角色
@@ -41,15 +41,15 @@ public interface ISysRoleService
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
-    public List<Integer> selectRoleListByUserId(Long userId);
+    public List<Integer> selectRoleListById(Long userId);
 
     /**
      * 通过角色ID查询角色
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @return 角色对象信息
      */
-    public SysRole selectRoleById(Long roleId);
+    public SysRole selectRoleById(Long id);
 
     /**
      * 校验角色名称是否唯一
@@ -77,10 +77,10 @@ public interface ISysRoleService
     /**
      * 通过角色ID查询角色使用数量
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @return 结果
      */
-    public int countUserRoleByRoleId(Long roleId);
+    public int countUserRoleByRoleId(Long id);
 
     /**
      * 新增保存角色信息
@@ -117,16 +117,16 @@ public interface ISysRoleService
     /**
      * 通过角色ID删除角色
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @return 结果
      */
-    public int deleteRoleById(Long roleId);
+    public int deleteRoleById(Long id);
 
     /**
      * 批量删除角色信息
      * 
-     * @param roleIds 需要删除的角色ID
+     * @param ids 需要删除的角色ID
      * @return 结果
      */
-    public int deleteRoleByIds(Long[] roleIds);
+    public int deleteRoleByIds(Long[] ids);
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysUserService.java

@@ -30,10 +30,10 @@ public interface ISysUserService
     /**
      * 通过用户ID查询用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(Long id);
 
     /**
      * 根据用户ID查询用户所属角色组
@@ -143,18 +143,18 @@ public interface ISysUserService
     /**
      * 通过用户ID删除用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(Long id);
 
     /**
      * 批量删除用户信息
      * 
-     * @param userIds 需要删除的用户ID
+     * @param ids 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    public int deleteUserByIds(Long[] ids);
 
     /**
      * 导入用户数据

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/BaseSaveService.java

@@ -3,7 +3,6 @@ package com.boman.system.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.system.common.MainTableRecord;
 import com.boman.system.common.RowResult;
-import com.boman.system.common.TableService;
 import com.boman.system.common.TableServiceContext;
 import com.boman.system.mapper.StandardlyMapper;
 import org.slf4j.Logger;
@@ -20,11 +19,9 @@ import java.sql.Timestamp;
  **/
 @Component
 public class BaseSaveService {
-    private static final Logger LOGGER = LoggerFactory.getLogger(TableService.class);
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(BaseSaveService.class);
 
-    //    @Resource
-//    StoredProcedureService storedProcedureService;
     @Autowired
     private StandardlyMapper mapper;
 

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysConfigServiceImpl.java

@@ -45,14 +45,14 @@ public class SysConfigServiceImpl implements ISysConfigService
     /**
      * 查询参数配置信息
      * 
-     * @param configId 参数配置ID
+     * @param id 参数配置ID
      * @return 参数配置信息
      */
     @Override
-    public SysConfig selectConfigById(Long configId)
+    public SysConfig selectConfigById(Long id)
     {
         SysConfig config = new SysConfig();
-        config.setConfigId(configId);
+        config.setId(id);
         return configMapper.selectConfig(config);
     }
 
@@ -130,21 +130,21 @@ public class SysConfigServiceImpl implements ISysConfigService
     /**
      * 批量删除参数信息
      * 
-     * @param configIds 需要删除的参数ID
+     * @param ids 需要删除的参数ID
      * @return 结果
      */
     @Override
-    public int deleteConfigByIds(Long[] configIds)
+    public int deleteConfigByIds(Long[] ids)
     {
-        for (Long configId : configIds)
+        for (Long id : ids)
         {
-            SysConfig config = selectConfigById(configId);
+            SysConfig config = selectConfigById(id);
             if (StringUtils.equals(UserConstants.YES, config.getConfigType()))
             {
                 throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
         }
-        int count = configMapper.deleteConfigByIds(configIds);
+        int count = configMapper.deleteConfigByIds(ids);
         if (count > 0)
         {
             Collection<String> keys = redisService.keys(Constants.SYS_CONFIG_KEY + "*");
@@ -172,9 +172,9 @@ public class SysConfigServiceImpl implements ISysConfigService
     @Override
     public String checkConfigKeyUnique(SysConfig config)
     {
-        Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
+        Long id = StringUtils.isNull(config.getId()) ? -1L : config.getId();
         SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
-        if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDeptServiceImpl.java

@@ -57,7 +57,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         List<Long> tempList = new ArrayList<Long>();
         for (SysDept dept : depts)
         {
-            tempList.add(dept.getDeptId());
+            tempList.add(dept.getId());
         }
         for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
         {
@@ -99,56 +99,56 @@ public class SysDeptServiceImpl implements ISysDeptService
     public List<Integer> selectDeptListByRoleId(Long roleId)
     {
         SysRole role = roleMapper.selectRoleById(roleId);
-        return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
+        return deptMapper.selectDeptListById(roleId, role.isDeptCheckStrictly());
     }
 
     /**
      * 根据部门ID查询信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 部门信息
      */
     @Override
-    public SysDept selectDeptById(Long deptId)
+    public SysDept selectDeptById(Long id)
     {
-        return deptMapper.selectDeptById(deptId);
+        return deptMapper.selectDeptById(id);
     }
 
     /**
      * 根据ID查询所有子部门（正常状态）
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 子部门数
      */
     @Override
-    public int selectNormalChildrenDeptById(Long deptId)
+    public int selectNormalChildrenDeptById(Long id)
     {
-        return deptMapper.selectNormalChildrenDeptById(deptId);
+        return deptMapper.selectNormalChildrenDeptById(id);
     }
 
     /**
      * 是否存在子节点
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
     @Override
-    public boolean hasChildByDeptId(Long deptId)
+    public boolean hasChildById(Long id)
     {
-        int result = deptMapper.hasChildByDeptId(deptId);
+        int result = deptMapper.hasChildById(id);
         return result > 0 ? true : false;
     }
 
     /**
      * 查询部门是否存在用户
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果 true 存在 false 不存在
      */
     @Override
-    public boolean checkDeptExistUser(Long deptId)
+    public boolean checkDeptExistUser(Long id)
     {
-        int result = deptMapper.checkDeptExistUser(deptId);
+        int result = deptMapper.checkDeptExistUser(id);
         return result > 0 ? true : false;
     }
 
@@ -161,9 +161,9 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public String checkDeptNameUnique(SysDept dept)
     {
-        Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
+        Long id = StringUtils.isNull(dept.getId()) ? -1L : dept.getId();
         SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
-        if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -199,13 +199,13 @@ public class SysDeptServiceImpl implements ISysDeptService
     public int updateDept(SysDept dept)
     {
         SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
-        SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
+        SysDept oldDept = deptMapper.selectDeptById(dept.getId());
         if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept))
         {
-            String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
+            String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getId();
             String oldAncestors = oldDept.getAncestors();
             dept.setAncestors(newAncestors);
-            updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
+            updateDeptChildren(dept.getId(), newAncestors, oldAncestors);
         }
         int result = deptMapper.updateDept(dept);
         if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
@@ -224,7 +224,7 @@ public class SysDeptServiceImpl implements ISysDeptService
     private void updateParentDeptStatus(SysDept dept)
     {
         String updateBy = dept.getUpdateBy();
-        dept = deptMapper.selectDeptById(dept.getDeptId());
+        dept = deptMapper.selectDeptById(dept.getId());
         dept.setUpdateBy(updateBy);
         deptMapper.updateDeptStatus(dept);
     }
@@ -232,13 +232,13 @@ public class SysDeptServiceImpl implements ISysDeptService
     /**
      * 修改子元素关系
      * 
-     * @param deptId 被修改的部门ID
+     * @param id 被修改的部门ID
      * @param newAncestors 新的父ID集合
      * @param oldAncestors 旧的父ID集合
      */
-    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors)
+    public void updateDeptChildren(Long id, String newAncestors, String oldAncestors)
     {
-        List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
+        List<SysDept> children = deptMapper.selectChildrenDeptById(id);
         for (SysDept child : children)
         {
             child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors));
@@ -252,13 +252,13 @@ public class SysDeptServiceImpl implements ISysDeptService
     /**
      * 删除部门管理信息
      * 
-     * @param deptId 部门ID
+     * @param id 部门ID
      * @return 结果
      */
     @Override
-    public int deleteDeptById(Long deptId)
+    public int deleteDeptById(Long id)
     {
-        return deptMapper.deleteDeptById(deptId);
+        return deptMapper.deleteDeptById(id);
     }
 
     /**
@@ -288,7 +288,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         while (it.hasNext())
         {
             SysDept n = (SysDept) it.next();
-            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
+            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getId().longValue())
             {
                 tlist.add(n);
             }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDictDataServiceImpl.java

@@ -47,25 +47,25 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     /**
      * 根据字典数据ID查询信息
      * 
-     * @param dictCode 字典数据ID
+     * @param id 字典数据ID
      * @return 字典数据
      */
     @Override
-    public SysDictData selectDictDataById(Long dictCode)
+    public SysDictData selectDictDataById(Long id)
     {
-        return dictDataMapper.selectDictDataById(dictCode);
+        return dictDataMapper.selectDictDataById(id);
     }
 
     /**
      * 批量删除字典数据信息
      * 
-     * @param dictCodes 需要删除的字典数据ID
+     * @param ids 需要删除的字典数据ID
      * @return 结果
      */
     @Override
-    public int deleteDictDataByIds(Long[] dictCodes)
+    public int deleteDictDataByIds(Long[] ids)
     {
-        int row = dictDataMapper.deleteDictDataByIds(dictCodes);
+        int row = dictDataMapper.deleteDictDataByIds(ids);
         if (row > 0)
         {
             DictUtils.clearDictCache();

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDictTypeServiceImpl.java

@@ -92,13 +92,13 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     /**
      * 根据字典类型ID查询信息
      * 
-     * @param dictId 字典类型ID
+     * @param id 字典类型ID
      * @return 字典类型
      */
     @Override
-    public SysDictType selectDictTypeById(Long dictId)
+    public SysDictType selectDictTypeById(Long id)
     {
-        return dictTypeMapper.selectDictTypeById(dictId);
+        return dictTypeMapper.selectDictTypeById(id);
     }
 
     /**
@@ -116,21 +116,21 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     /**
      * 批量删除字典类型信息
      * 
-     * @param dictIds 需要删除的字典ID
+     * @param ids 需要删除的字典ID
      * @return 结果
      */
     @Override
-    public int deleteDictTypeByIds(Long[] dictIds)
+    public int deleteDictTypeByIds(Long[] ids)
     {
-        for (Long dictId : dictIds)
+        for (Long id : ids)
         {
-            SysDictType dictType = selectDictTypeById(dictId);
+            SysDictType dictType = selectDictTypeById(id);
             if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)
             {
                 throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
             }
         }
-        int count = dictTypeMapper.deleteDictTypeByIds(dictIds);
+        int count = dictTypeMapper.deleteDictTypeByIds(ids);
         if (count > 0)
         {
             DictUtils.clearDictCache();
@@ -174,7 +174,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     @Transactional
     public int updateDictType(SysDictType dictType)
     {
-        SysDictType oldDict = dictTypeMapper.selectDictTypeById(dictType.getDictId());
+        SysDictType oldDict = dictTypeMapper.selectDictTypeById(dictType.getId());
         dictDataMapper.updateDictDataType(oldDict.getDictType(), dictType.getDictType());
         int row = dictTypeMapper.updateDictType(dictType);
         if (row > 0)
@@ -193,9 +193,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     @Override
     public String checkDictTypeUnique(SysDictType dict)
     {
-        Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId();
+        Long id = StringUtils.isNull(dict.getId()) ? -1L : dict.getId();
         SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
-        if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
+        if (StringUtils.isNotNull(dictType) && dictType.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysLogininforServiceImpl.java

@@ -45,13 +45,13 @@ public class SysLogininforServiceImpl implements ISysLogininforService
     /**
      * 批量删除系统登录日志
      * 
-     * @param infoIds 需要删除的登录日志ID
+     * @param ids 需要删除的登录日志ID
      * @return
      */
     @Override
-    public int deleteLogininforByIds(Long[] infoIds)
+    public int deleteLogininforByIds(Long[] ids)
     {
-        return logininforMapper.deleteLogininforByIds(infoIds);
+        return logininforMapper.deleteLogininforByIds(ids);
     }
 
     /**

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java

@@ -81,13 +81,13 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 根据用户ID查询权限
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 权限列表
      */
     @Override
-    public Set<String> selectMenuPermsByUserId(Long userId)
+    public Set<String> selectMenuPermsById(Long id)
     {
-        List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
+        List<String> perms = menuMapper.selectMenuPermsById(id);
         Set<String> permsSet = new HashSet<>();
         for (String perm : perms)
         {
@@ -102,20 +102,20 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 根据用户ID查询菜单
      * 
-     * @param userId 用户名称
+     * @param id 用户名称
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId)
+    public List<SysMenu> selectMenuTreeById(Long id)
     {
         List<SysMenu> menus = null;
-        if (SecurityUtils.isAdmin(userId))
+        if (SecurityUtils.isAdmin(id))
         {
             menus = menuMapper.selectMenuTreeAll();
         }
         else
         {
-            menus = menuMapper.selectMenuTreeByUserId(userId);
+            menus = menuMapper.selectMenuTreeById(id);
         }
         return getChildPerms(menus, 0);
     }
@@ -187,7 +187,7 @@ public class SysMenuServiceImpl implements ISysMenuService
         List<Long> tempList = new ArrayList<Long>();
         for (SysMenu dept : menus)
         {
-            tempList.add(dept.getMenuId());
+            tempList.add(dept.getId());
         }
         for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
         {
@@ -222,38 +222,38 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 根据菜单ID查询信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 菜单信息
      */
     @Override
-    public SysMenu selectMenuById(Long menuId)
+    public SysMenu selectMenuById(Long id)
     {
-        return menuMapper.selectMenuById(menuId);
+        return menuMapper.selectMenuById(id);
     }
 
     /**
      * 是否存在菜单子节点
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
     @Override
-    public boolean hasChildByMenuId(Long menuId)
+    public boolean hasChildById(Long id)
     {
-        int result = menuMapper.hasChildByMenuId(menuId);
+        int result = menuMapper.hasChildById(id);
         return result > 0 ? true : false;
     }
 
     /**
      * 查询菜单使用数量
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
     @Override
-    public boolean checkMenuExistRole(Long menuId)
+    public boolean checkMenuExistRole(Long id)
     {
-        int result = roleMenuMapper.checkMenuExistRole(menuId);
+        int result = roleMenuMapper.checkMenuExistRole(id);
         return result > 0 ? true : false;
     }
 
@@ -284,13 +284,13 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 删除菜单管理信息
      * 
-     * @param menuId 菜单ID
+     * @param id 菜单ID
      * @return 结果
      */
     @Override
-    public int deleteMenuById(Long menuId)
+    public int deleteMenuById(Long id)
     {
-        return menuMapper.deleteMenuById(menuId);
+        return menuMapper.deleteMenuById(id);
     }
 
     /**
@@ -302,9 +302,9 @@ public class SysMenuServiceImpl implements ISysMenuService
     @Override
     public String checkMenuNameUnique(SysMenu menu)
     {
-        Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
+        Long id = StringUtils.isNull(menu.getId()) ? -1L : menu.getId();
         SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
-        if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -447,7 +447,7 @@ public class SysMenuServiceImpl implements ISysMenuService
         while (it.hasNext())
         {
             SysMenu n = (SysMenu) it.next();
-            if (n.getParentId().longValue() == t.getMenuId().longValue())
+            if (n.getParentId().longValue() == t.getId().longValue())
             {
                 tlist.add(n);
             }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysNoticeServiceImpl.java

@@ -23,13 +23,13 @@ public class SysNoticeServiceImpl implements ISysNoticeService
     /**
      * 查询公告信息
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 公告信息
      */
     @Override
-    public SysNotice selectNoticeById(Long noticeId)
+    public SysNotice selectNoticeById(Long id)
     {
-        return noticeMapper.selectNoticeById(noticeId);
+        return noticeMapper.selectNoticeById(id);
     }
 
     /**
@@ -71,24 +71,24 @@ public class SysNoticeServiceImpl implements ISysNoticeService
     /**
      * 删除公告对象
      * 
-     * @param noticeId 公告ID
+     * @param id 公告ID
      * @return 结果
      */
     @Override
-    public int deleteNoticeById(Long noticeId)
+    public int deleteNoticeById(Long id)
     {
-        return noticeMapper.deleteNoticeById(noticeId);
+        return noticeMapper.deleteNoticeById(id);
     }
 
     /**
      * 批量删除公告信息
      * 
-     * @param noticeIds 需要删除的公告ID
+     * @param ids 需要删除的公告ID
      * @return 结果
      */
     @Override
-    public int deleteNoticeByIds(Long[] noticeIds)
+    public int deleteNoticeByIds(Long[] ids)
     {
-        return noticeMapper.deleteNoticeByIds(noticeIds);
+        return noticeMapper.deleteNoticeByIds(ids);
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysOperLogServiceImpl.java

@@ -45,25 +45,25 @@ public class SysOperLogServiceImpl implements ISysOperLogService
     /**
      * 批量删除系统操作日志
      * 
-     * @param operIds 需要删除的操作日志ID
+     * @param ids 需要删除的操作日志ID
      * @return 结果
      */
     @Override
-    public int deleteOperLogByIds(Long[] operIds)
+    public int deleteOperLogByIds(Long[] ids)
     {
-        return operLogMapper.deleteOperLogByIds(operIds);
+        return operLogMapper.deleteOperLogByIds(ids);
     }
 
     /**
      * 查询操作日志详细
      * 
-     * @param operId 操作ID
+     * @param id 操作ID
      * @return 操作日志对象
      */
     @Override
-    public SysOperLog selectOperLogById(Long operId)
+    public SysOperLog selectOperLogById(Long id)
     {
-        return operLogMapper.selectOperLogById(operId);
+        return operLogMapper.selectOperLogById(id);
     }
 
     /**

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysPermissionServiceImpl.java

@@ -22,21 +22,21 @@ public class SysPermissionServiceImpl implements ISysPermissionService
     /**
      * 获取角色数据权限
      * 
-     * @param userId 用户Id
+     * @param id 用户Id
      * @return 角色权限信息
      */
     @Override
-    public Set<String> getRolePermission(Long userId)
+    public Set<String> getRolePermission(Long id)
     {
         Set<String> roles = new HashSet<String>();
         // 管理员拥有所有权限
-        if (SysUser.isAdmin(userId))
+        if (SysUser.isAdmin(id))
         {
             roles.add("admin");
         }
         else
         {
-            roles.addAll(roleService.selectRolePermissionByUserId(userId));
+            roles.addAll(roleService.selectRolePermissionById(id));
         }
         return roles;
     }
@@ -44,21 +44,21 @@ public class SysPermissionServiceImpl implements ISysPermissionService
     /**
      * 获取菜单数据权限
      * 
-     * @param userId 用户Id
+     * @param id 用户Id
      * @return 菜单权限信息
      */
     @Override
-    public Set<String> getMenuPermission(Long userId)
+    public Set<String> getMenuPermission(Long id)
     {
         Set<String> perms = new HashSet<String>();
         // 管理员拥有所有权限
-        if (SysUser.isAdmin(userId))
+        if (SysUser.isAdmin(id))
         {
             perms.add("*:*:*");
         }
         else
         {
-            perms.addAll(menuService.selectMenuPermsByUserId(userId));
+            perms.addAll(menuService.selectMenuPermsById(id));
         }
         return perms;
     }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysPostServiceImpl.java

@@ -53,25 +53,25 @@ public class SysPostServiceImpl implements ISysPostService
     /**
      * 通过岗位ID查询岗位信息
      * 
-     * @param postId 岗位ID
+     * @param id 岗位ID
      * @return 角色对象信息
      */
     @Override
-    public SysPost selectPostById(Long postId)
+    public SysPost selectPostById(Long id)
     {
-        return postMapper.selectPostById(postId);
+        return postMapper.selectPostById(id);
     }
 
     /**
      * 根据用户ID获取岗位选择框列表
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 选中岗位ID列表
      */
     @Override
-    public List<Integer> selectPostListByUserId(Long userId)
+    public List<Integer> selectPostListById(Long id)
     {
-        return postMapper.selectPostListByUserId(userId);
+        return postMapper.selectPostListById(id);
     }
 
     /**
@@ -83,9 +83,9 @@ public class SysPostServiceImpl implements ISysPostService
     @Override
     public String checkPostNameUnique(SysPost post)
     {
-        Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
+        Long id = StringUtils.isNull(post.getId()) ? -1L : post.getId();
         SysPost info = postMapper.checkPostNameUnique(post.getPostName());
-        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -101,9 +101,9 @@ public class SysPostServiceImpl implements ISysPostService
     @Override
     public String checkPostCodeUnique(SysPost post)
     {
-        Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
+        Long id = StringUtils.isNull(post.getId()) ? -1L : post.getId();
         SysPost info = postMapper.checkPostCodeUnique(post.getPostCode());
-        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -113,46 +113,46 @@ public class SysPostServiceImpl implements ISysPostService
     /**
      * 通过岗位ID查询岗位使用数量
      * 
-     * @param postId 岗位ID
+     * @param id 岗位ID
      * @return 结果
      */
     @Override
-    public int countUserPostById(Long postId)
+    public int countUserPostById(Long id)
     {
-        return userPostMapper.countUserPostById(postId);
+        return userPostMapper.countUserPostById(id);
     }
 
     /**
      * 删除岗位信息
      * 
-     * @param postId 岗位ID
+     * @param id 岗位ID
      * @return 结果
      */
     @Override
-    public int deletePostById(Long postId)
+    public int deletePostById(Long id)
     {
-        return postMapper.deletePostById(postId);
+        return postMapper.deletePostById(id);
     }
 
     /**
      * 批量删除岗位信息
      * 
-     * @param postIds 需要删除的岗位ID
+     * @param ids 需要删除的岗位ID
      * @return 结果
      * @throws Exception 异常
      */
     @Override
-    public int deletePostByIds(Long[] postIds)
+    public int deletePostByIds(Long[] ids)
     {
-        for (Long postId : postIds)
+        for (Long id : ids)
         {
-            SysPost post = selectPostById(postId);
-            if (countUserPostById(postId) > 0)
+            SysPost post = selectPostById(id);
+            if (countUserPostById(id) > 0)
             {
                 throw new CustomException(String.format("%1$s已分配,不能删除", post.getPostName()));
             }
         }
-        return postMapper.deletePostByIds(postIds);
+        return postMapper.deletePostByIds(ids);
     }
 
     /**

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysRoleServiceImpl.java

@@ -58,13 +58,13 @@ public class SysRoleServiceImpl implements ISysRoleService
     /**
      * 根据用户ID查询权限
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 权限列表
      */
     @Override
-    public Set<String> selectRolePermissionByUserId(Long userId)
+    public Set<String> selectRolePermissionById(Long id)
     {
-        List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
+        List<SysRole> perms = roleMapper.selectRolePermissionById(id);
         Set<String> permsSet = new HashSet<>();
         for (SysRole perm : perms)
         {
@@ -90,25 +90,25 @@ public class SysRoleServiceImpl implements ISysRoleService
     /**
      * 根据用户ID获取角色选择框列表
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 选中角色ID列表
      */
     @Override
-    public List<Integer> selectRoleListByUserId(Long userId)
+    public List<Integer> selectRoleListById(Long id)
     {
-        return roleMapper.selectRoleListByUserId(userId);
+        return roleMapper.selectRoleListById(id);
     }
 
     /**
      * 通过角色ID查询角色
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @return 角色对象信息
      */
     @Override
-    public SysRole selectRoleById(Long roleId)
+    public SysRole selectRoleById(Long id)
     {
-        return roleMapper.selectRoleById(roleId);
+        return roleMapper.selectRoleById(id);
     }
 
     /**
@@ -120,9 +120,9 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public String checkRoleNameUnique(SysRole role)
     {
-        Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
+        Long id = StringUtils.isNull(role.getId()) ? -1L : role.getId();
         SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -138,9 +138,9 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public String checkRoleKeyUnique(SysRole role)
     {
-        Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
+        Long id = StringUtils.isNull(role.getId()) ? -1L : role.getId();
         SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
-        if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -155,7 +155,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public void checkRoleAllowed(SysRole role)
     {
-        if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())
+        if (StringUtils.isNotNull(role.getId()) && role.isAdmin())
         {
             throw new CustomException("不允许操作超级管理员角色");
         }
@@ -201,7 +201,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
+        roleMenuMapper.deleteRoleMenuByRoleId(role.getId());
         return insertRoleMenu(role);
     }
 
@@ -230,7 +230,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         // 修改角色信息
         roleMapper.updateRole(role);
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId());
+        roleDeptMapper.deleteRoleDeptByRoleId(role.getId());
         // 新增角色和部门信息（数据权限）
         return insertRoleDept(role);
     }
@@ -248,7 +248,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         for (Long menuId : role.getMenuIds())
         {
             SysRoleMenu rm = new SysRoleMenu();
-            rm.setRoleId(role.getRoleId());
+            rm.setRoleId(role.getId());
             rm.setMenuId(menuId);
             list.add(rm);
         }
@@ -272,7 +272,7 @@ public class SysRoleServiceImpl implements ISysRoleService
         for (Long deptId : role.getDeptIds())
         {
             SysRoleDept rd = new SysRoleDept();
-            rd.setRoleId(role.getRoleId());
+            rd.setRoleId(role.getId());
             rd.setDeptId(deptId);
             list.add(rd);
         }
@@ -286,43 +286,43 @@ public class SysRoleServiceImpl implements ISysRoleService
     /**
      * 通过角色ID删除角色
      * 
-     * @param roleId 角色ID
+     * @param id 角色ID
      * @return 结果
      */
     @Override
     @Transactional
-    public int deleteRoleById(Long roleId)
+    public int deleteRoleById(Long id)
     {
         // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenuByRoleId(roleId);
+        roleMenuMapper.deleteRoleMenuByRoleId(id);
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDeptByRoleId(roleId);
-        return roleMapper.deleteRoleById(roleId);
+        roleDeptMapper.deleteRoleDeptByRoleId(id);
+        return roleMapper.deleteRoleById(id);
     }
 
     /**
      * 批量删除角色信息
      * 
-     * @param roleIds 需要删除的角色ID
+     * @param ids 需要删除的角色ID
      * @return 结果
      */
     @Override
     @Transactional
-    public int deleteRoleByIds(Long[] roleIds)
+    public int deleteRoleByIds(Long[] ids)
     {
-        for (Long roleId : roleIds)
+        for (Long id : ids)
         {
-            checkRoleAllowed(new SysRole(roleId));
-            SysRole role = selectRoleById(roleId);
-            if (countUserRoleByRoleId(roleId) > 0)
+            checkRoleAllowed(new SysRole(id));
+            SysRole role = selectRoleById(id);
+            if (countUserRoleByRoleId(id) > 0)
             {
                 throw new CustomException(String.format("%1$s已分配,不能删除", role.getRoleName()));
             }
         }
         // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenu(roleIds);
+        roleMenuMapper.deleteRoleMenu(ids);
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDept(roleIds);
-        return roleMapper.deleteRoleByIds(roleIds);
+        roleDeptMapper.deleteRoleDept(ids);
+        return roleMapper.deleteRoleByIds(ids);
     }
 }

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysUserServiceImpl.java

@@ -81,13 +81,13 @@ public class SysUserServiceImpl implements ISysUserService
     /**
      * 通过用户ID查询用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserById(Long userId)
+    public SysUser selectUserById(Long id)
     {
-        return userMapper.selectUserById(userId);
+        return userMapper.selectUserById(id);
     }
 
     /**
@@ -160,9 +160,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public String checkPhoneUnique(SysUser user)
     {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        Long id = StringUtils.isNull(user.getId()) ? -1L : user.getId();
         SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -178,9 +178,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public String checkEmailUnique(SysUser user)
     {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        Long id = StringUtils.isNull(user.getId()) ? -1L : user.getId();
         SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != id.longValue())
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -195,7 +195,7 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public void checkUserAllowed(SysUser user)
     {
-        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
+        if (StringUtils.isNotNull(user.getId()) && user.isAdmin())
         {
             throw new CustomException("不允许操作超级管理员用户");
         }
@@ -230,13 +230,13 @@ public class SysUserServiceImpl implements ISysUserService
     @Transactional
     public int updateUser(SysUser user)
     {
-        Long userId = user.getUserId();
+        Long id = user.getId();
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
+        userRoleMapper.deleteUserRoleByUserId(id);
         // 新增用户与角色管理
         insertUserRole(user);
         // 删除用户与岗位关联
-        userPostMapper.deleteUserPostByUserId(userId);
+        userPostMapper.deleteUserPostByUserId(id);
         // 新增用户与岗位管理
         insertUserPost(user);
         return userMapper.updateUser(user);
@@ -319,7 +319,7 @@ public class SysUserServiceImpl implements ISysUserService
             for (Long roleId : roles)
             {
                 SysUserRole ur = new SysUserRole();
-                ur.setUserId(user.getUserId());
+                ur.setUserId(user.getId());
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
@@ -345,7 +345,7 @@ public class SysUserServiceImpl implements ISysUserService
             for (Long postId : posts)
             {
                 SysUserPost up = new SysUserPost();
-                up.setUserId(user.getUserId());
+                up.setUserId(user.getId());
                 up.setPostId(postId);
                 list.add(up);
             }
@@ -359,39 +359,39 @@ public class SysUserServiceImpl implements ISysUserService
     /**
      * 通过用户ID删除用户
      * 
-     * @param userId 用户ID
+     * @param id 用户ID
      * @return 结果
      */
     @Override
     @Transactional
-    public int deleteUserById(Long userId)
+    public int deleteUserById(Long id)
     {
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
+        userRoleMapper.deleteUserRoleByUserId(id);
         // 删除用户与岗位表
-        userPostMapper.deleteUserPostByUserId(userId);
-        return userMapper.deleteUserById(userId);
+        userPostMapper.deleteUserPostByUserId(id);
+        return userMapper.deleteUserById(id);
     }
 
     /**
      * 批量删除用户信息
      * 
-     * @param userIds 需要删除的用户ID
+     * @param ids 需要删除的用户ID
      * @return 结果
      */
     @Override
     @Transactional
-    public int deleteUserByIds(Long[] userIds)
+    public int deleteUserByIds(Long[] ids)
     {
-        for (Long userId : userIds)
+        for (Long id : ids)
         {
-            checkUserAllowed(new SysUser(userId));
+            checkUserAllowed(new SysUser(id));
         }
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRole(userIds);
+        userRoleMapper.deleteUserRole(ids);
         // 删除用户与岗位关联
-        userPostMapper.deleteUserPost(userIds);
-        return userMapper.deleteUserByIds(userIds);
+        userPostMapper.deleteUserPost(ids);
+        return userMapper.deleteUserByIds(ids);
     }
 
     /**

boman-modules/boman-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysConfigMapper">
     
     <resultMap type="SysConfig" id="SysConfigResult">
-    	<id     property="configId"      column="config_id"      />
+    	<id     property="id"      column="id"      />
         <result property="configName"    column="config_name"    />
         <result property="configKey"     column="config_key"     />
         <result property="configValue"   column="config_value"   />
@@ -17,15 +17,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     
     <sql id="selectConfigVo">
-        select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark 
+        select id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark 
 		from sys_config
     </sql>
     
     <!-- 查询条件 -->
 	<sql id="sqlwhereSearch">
 		<where>
-			<if test="configId !=null">
-				and config_id = #{configId}
+			<if test="id !=null">
+				and id = #{id}
 			</if>
 			<if test="configKey !=null and configKey != ''">
 				and config_key = #{configKey}
@@ -115,17 +115,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
  			update_time = sysdate()
         </set>
-        where config_id = #{configId}
+        where id = #{id}
     </update>
 	
     <delete id="deleteConfigById" parameterType="Long">
-        delete from sys_config where config_id = #{configId}
+        delete from sys_config where id = #{id}
     </delete>
     
     <delete id="deleteConfigByIds" parameterType="Long">
-        delete from sys_config where config_id in 
-        <foreach item="configId" collection="array" open="(" separator="," close=")">
-        	#{configId}
+        delete from sys_config where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+        	#{id}
         </foreach>
     </delete>
     

boman-modules/boman-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysDeptMapper">
 
 	<resultMap type="SysDept" id="SysDeptResult">
-		<id     property="deptId"     column="dept_id"     />
+		<id     property="id"     column="id"     />
 		<result property="parentId"   column="parent_id"   />
 		<result property="ancestors"  column="ancestors"   />
 		<result property="deptName"   column="dept_name"   />
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
         from sys_dept d
     </sql>
     
@@ -44,37 +44,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by d.parent_id, d.order_num
     </select>
     
-    <select id="selectDeptListByRoleId" resultType="Integer">
-		select d.dept_id
+    <select id="selectDeptListById" resultType="java.lang.Integer">
+		select d.id
 		from sys_dept d
-            left join sys_role_dept rd on d.dept_id = rd.dept_id
-        where rd.role_id = #{roleId}
+            left join sys_role_dept rd on d.id = rd.role_id
+        where rd.role_id = #{id}
             <if test="deptCheckStrictly">
-              and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
+              and d.id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.id = rd.role_id and rd.role_id = #{id})
             </if>
 		order by d.parent_id, d.order_num
 	</select>
     
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		<include refid="selectDeptVo"/>
-		where dept_id = #{deptId}
+		where id = #{id}
 	</select>
     
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
-		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
+		select count(1) from sys_user where id = #{id} and del_flag = '0'
 	</select>
 	
-	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
+	<select id="hasChildById" parameterType="Long" resultType="int">
 		select count(1) from sys_dept
-		where del_flag = '0' and parent_id = #{deptId}
+		where del_flag = '0' and parent_id = #{id}
 	</select>
 	
 	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select * from sys_dept where find_in_set(#{deptId}, ancestors)
+		select * from sys_dept where find_in_set(#{id}, ancestors)
 	</select>
 	
 	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="java.lang.Integer">
-		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
+		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{id}, ancestors)
 	</select>
 	
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <insert id="insertDept" parameterType="SysDept">
  		insert into sys_dept(
- 			<if test="deptId != null and deptId != 0">dept_id,</if>
+ 			<if test="id != null and id != 0">id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
  			<if test="deptName != null and deptName != ''">dept_name,</if>
  			<if test="ancestors != null and ancestors != ''">ancestors,</if>
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 			<if test="deptId != null and deptId != 0">#{deptId},</if>
+ 			<if test="id != null and id != 0">#{id},</if>
  			<if test="parentId != null and parentId != 0">#{parentId},</if>
  			<if test="deptName != null and deptName != ''">#{deptName},</if>
  			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
@@ -124,19 +124,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
- 		where dept_id = #{deptId}
+ 		where id = #{id}
 	</update>
 	
 	<update id="updateDeptChildren" parameterType="java.util.List">
 	    update sys_dept set ancestors =
 	    <foreach collection="depts" item="item" index="index"
-	        separator=" " open="case dept_id" close="end">
-	        when #{item.deptId} then #{item.ancestors}
+	        separator=" " open="case id" close="end">
+	        when #{item.id} then #{item.ancestors}
 	    </foreach>
-	    where dept_id in
+	    where id in
 	    <foreach collection="depts" item="item" index="index"
 	        separator="," open="(" close=")">
-	        #{item.deptId}
+	        #{item.id}
 	    </foreach>
 	</update>
 	 
@@ -147,11 +147,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  	        <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  	        update_time = sysdate()
         </set>
- 	    where dept_id in (${ancestors})
+ 	    where id in (${ancestors})
 	</update>
 	
 	<delete id="deleteDeptById" parameterType="Long">
-		update sys_dept set del_flag = '2' where dept_id = #{deptId}
+		update sys_dept set del_flag = '2' where id = #{id}
 	</delete>
 
 </mapper> 

boman-modules/boman-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysDictDataMapper">
 	
 	<resultMap type="SysDictData" id="SysDictDataResult">
-		<id     property="dictCode"   column="dict_code"   />
+		<id     property="id"   column="id"   />
 		<result property="dictSort"   column="dict_sort"   />
 		<result property="dictLabel"  column="dict_label"  />
 		<result property="dictValue"  column="dict_value"  />
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDictDataVo">
-        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
+        select id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
 		from sys_dict_data
     </sql>
 
@@ -46,28 +46,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where status = '0' and dict_type = #{dictType} order by dict_sort asc
 	</select>
 	
-	<select id="selectDictLabel" resultType="String">
+	<select id="selectDictLabel" resultType="java.lang.String">
 		select dict_label from sys_dict_data
 		where dict_type = #{dictType} and dict_value = #{dictValue}
 	</select>
 	
 	<select id="selectDictDataById" parameterType="Long" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
-		where dict_code = #{dictCode}
+		where id = #{id}
 	</select>
 	
-	<select id="countDictDataByType" resultType="Integer">
+	<select id="countDictDataByType" resultType="java.lang.Integer">
 	    select count(1) from sys_dict_data where dict_type=#{dictType}  
 	</select>
 	
 	<delete id="deleteDictDataById" parameterType="Long">
- 		delete from sys_dict_data where dict_code = #{dictCode}
+ 		delete from sys_dict_data where id = #{id}
  	</delete>
  	
  	<delete id="deleteDictDataByIds" parameterType="Long">
- 		delete from sys_dict_data where dict_code in
- 		<foreach collection="array" item="dictCode" open="(" separator="," close=")">
- 			#{dictCode}
+ 		delete from sys_dict_data where id in
+ 		<foreach collection="array" item="id" open="(" separator="," close=")">
+ 			#{id}
         </foreach> 
  	</delete>
 	
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
- 		where dict_code = #{dictCode}
+ 		where id = #{id}
 	</update>
 	
 	<update id="updateDictDataType" parameterType="String">

boman-modules/boman-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.system.mapper.SysDictTypeMapper">
 
 	<resultMap type="SysDictType" id="SysDictTypeResult">
-		<id     property="dictId"     column="dict_id"     />
+		<id     property="id"     column="id"     />
 		<result property="dictName"   column="dict_name"   />
 		<result property="dictType"   column="dict_type"   />
 		<result property="status"     column="status"      />
@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDictTypeVo">
-        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
+        select id, dict_name, dict_type, status, create_by, create_time, remark 
 		from sys_dict_type
     </sql>
 
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
-		where dict_id = #{dictId}
+		where id = #{id}
 	</select>
 	
 	<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
@@ -61,13 +61,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<delete id="deleteDictTypeById" parameterType="Long">
- 		delete from sys_dict_type where dict_id = #{dictId}
+ 		delete from sys_dict_type where id = #{id}
  	</delete>
  	
  	<delete id="deleteDictTypeByIds" parameterType="Long">
- 		delete from sys_dict_type where dict_id in
- 		<foreach collection="array" item="dictId" open="(" separator="," close=")">
- 			#{dictId}
+ 		delete from sys_dict_type where id in
+ 		<foreach collection="array" item="id" open="(" separator="," close=")">
+ 			#{id}
         </foreach> 
  	</delete>
 
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
- 		where dict_id = #{dictId}
+ 		where id = #{id}
 	</update>
  	
  	<insert id="insertDictType" parameterType="SysDictType">