update 完成所有原生功能使用 Mybatis-Plus 与 Lombok 重写

README.md

@@ -26,6 +26,7 @@
 * ORM框架 使用 Mybatis-Plus 简化CRUD (目前支持单表生成与树表 不支持主子表)
 * Bean简化 使用 Lombok 简化 get set toString 等等
 * 容器改动 Tomcat 改为 并发性能更好的 undertow
+* 所有原生功能使用 Mybatis-Plus 与 Lombok 重写
 * 代码生成模板 改为适配 Mybatis-Plus 的代码
 * 代码生成模板 拆分出Vo,QueryBo,AddBo,EditBo等领域对象
 * 项目修改为 maven多环境配置

ruoyi/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java

@@ -2,14 +2,7 @@ package com.ruoyi.framework.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
-import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
-import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
-import com.baomidou.mybatisplus.core.injector.ISqlInjector;
-import com.baomidou.mybatisplus.extension.incrementer.H2KeyGenerator;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.IllegalSQLInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.ruoyi.framework.mybatisplus.CreateAndUpdateMetaObjectHandler;
@@ -29,7 +22,7 @@ public class MybatisPlusConfig {
 		// 乐观锁插件
 		interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
 		// 阻断插件
-		interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
+//		interceptor.addInnerInterceptor(blockAttackInnerInterceptor());
 		return interceptor;
 	}
 
@@ -58,9 +51,9 @@ public class MybatisPlusConfig {
 	 * 如果是对全表的删除或更新操作，就会终止该操作
 	 * https://baomidou.com/guide/interceptor-block-attack.html
 	 */
-	public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
+//	public BlockAttackInnerInterceptor blockAttackInnerInterceptor() {
-		return new BlockAttackInnerInterceptor();
+//		return new BlockAttackInnerInterceptor();
-	}
+//	}
 
 	/**
 	 * sql性能规范插件(垃圾SQL拦截)

ruoyi/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -1,370 +1,232 @@
 package com.ruoyi.generator.domain;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.constant.GenConstants;
-import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.*;
+import lombok.experimental.Accessors;
 import org.apache.commons.lang3.ArrayUtils;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 业务表 gen_table
  *
  * @author ruoyi
  */
-public class GenTable extends BaseEntity
+
-{
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("gen_table")
+public class GenTable implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
+    @TableId(value = "table_id", type = IdType.AUTO)
     private Long tableId;
 
-    /** 表名称 */
+    /**
+     * 表名称
+     */
     @NotBlank(message = "表名称不能为空")
     private String tableName;
 
-    /** 表描述 */
+    /**
+     * 表描述
+     */
     @NotBlank(message = "表描述不能为空")
     private String tableComment;
 
-    /** 关联父表的表名 */
+    /**
+     * 关联父表的表名
+     */
     private String subTableName;
 
-    /** 本表关联父表的外键名 */
+    /**
+     * 本表关联父表的外键名
+     */
     private String subTableFkName;
 
-    /** 实体类名称(首字母大写) */
+    /**
+     * 实体类名称(首字母大写)
+     */
     @NotBlank(message = "实体类名称不能为空")
     private String className;
 
-    /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
+    /**
+     * 使用的模板（crud单表操作 tree树表操作 sub主子表操作）
+     */
     private String tplCategory;
 
-    /** 生成包路径 */
+    /**
+     * 生成包路径
+     */
     @NotBlank(message = "生成包路径不能为空")
     private String packageName;
 
-    /** 生成模块名 */
+    /**
+     * 生成模块名
+     */
     @NotBlank(message = "生成模块名不能为空")
     private String moduleName;
 
-    /** 生成业务名 */
+    /**
+     * 生成业务名
+     */
     @NotBlank(message = "生成业务名不能为空")
     private String businessName;
 
-    /** 生成功能名 */
+    /**
+     * 生成功能名
+     */
     @NotBlank(message = "生成功能名不能为空")
     private String functionName;
 
-    /** 生成作者 */
+    /**
+     * 生成作者
+     */
     @NotBlank(message = "作者不能为空")
     private String functionAuthor;
 
-    /** 生成代码方式（0zip压缩包 1自定义路径） */
+    /**
+     * 生成代码方式（0zip压缩包 1自定义路径）
+     */
     private String genType;
 
-    /** 生成路径（不填默认项目路径） */
+    /**
+     * 生成路径（不填默认项目路径）
+     */
     private String genPath;
 
-    /** 主键信息 */
+    /**
+     * 主键信息
+     */
+    @TableField(exist = false)
     private GenTableColumn pkColumn;
 
-    /** 子表信息 */
+    /**
+     * 子表信息
+     */
+    @TableField(exist = false)
     private GenTable subTable;
 
-    /** 表列信息 */
+    /**
+     * 表列信息
+     */
     @Valid
+    @TableField(exist = false)
     private List<GenTableColumn> columns;
 
-    /** 其它生成选项 */
+    /**
+     * 其它生成选项
+     */
     private String options;
 
-    /** 树编码字段 */
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    /**
+     * 树编码字段
+     */
+    @TableField(exist = false)
     private String treeCode;
 
-    /** 树父编码字段 */
+    /**
+     * 树父编码字段
+     */
+    @TableField(exist = false)
     private String treeParentCode;
 
-    /** 树名称字段 */
+    /**
+     * 树名称字段
+     */
+    @TableField(exist = false)
     private String treeName;
 
-    /** 上级菜单ID字段 */
+    /**
+     * 上级菜单ID字段
+     */
+    @TableField(exist = false)
     private String parentMenuId;
 
-    /** 上级菜单名称字段 */
+    /**
+     * 上级菜单名称字段
+     */
+    @TableField(exist = false)
     private String parentMenuName;
 
-    public Long getTableId()
+    public boolean isSub() {
-    {
-        return tableId;
-    }
-
-    public void setTableId(Long tableId)
-    {
-        this.tableId = tableId;
-    }
-
-    public String getTableName()
-    {
-        return tableName;
-    }
-
-    public void setTableName(String tableName)
-    {
-        this.tableName = tableName;
-    }
-
-    public String getTableComment()
-    {
-        return tableComment;
-    }
-
-    public void setTableComment(String tableComment)
-    {
-        this.tableComment = tableComment;
-    }
-
-    public String getSubTableName()
-    {
-        return subTableName;
-    }
-
-    public void setSubTableName(String subTableName)
-    {
-        this.subTableName = subTableName;
-    }
-
-    public String getSubTableFkName()
-    {
-        return subTableFkName;
-    }
-
-    public void setSubTableFkName(String subTableFkName)
-    {
-        this.subTableFkName = subTableFkName;
-    }
-
-    public String getClassName()
-    {
-        return className;
-    }
-
-    public void setClassName(String className)
-    {
-        this.className = className;
-    }
-
-    public String getTplCategory()
-    {
-        return tplCategory;
-    }
-
-    public void setTplCategory(String tplCategory)
-    {
-        this.tplCategory = tplCategory;
-    }
-
-    public String getPackageName()
-    {
-        return packageName;
-    }
-
-    public void setPackageName(String packageName)
-    {
-        this.packageName = packageName;
-    }
-
-    public String getModuleName()
-    {
-        return moduleName;
-    }
-
-    public void setModuleName(String moduleName)
-    {
-        this.moduleName = moduleName;
-    }
-
-    public String getBusinessName()
-    {
-        return businessName;
-    }
-
-    public void setBusinessName(String businessName)
-    {
-        this.businessName = businessName;
-    }
-
-    public String getFunctionName()
-    {
-        return functionName;
-    }
-
-    public void setFunctionName(String functionName)
-    {
-        this.functionName = functionName;
-    }
-
-    public String getFunctionAuthor()
-    {
-        return functionAuthor;
-    }
-
-    public void setFunctionAuthor(String functionAuthor)
-    {
-        this.functionAuthor = functionAuthor;
-    }
-
-    public String getGenType()
-    {
-        return genType;
-    }
-
-    public void setGenType(String genType)
-    {
-        this.genType = genType;
-    }
-
-    public String getGenPath()
-    {
-        return genPath;
-    }
-
-    public void setGenPath(String genPath)
-    {
-        this.genPath = genPath;
-    }
-
-    public GenTableColumn getPkColumn()
-    {
-        return pkColumn;
-    }
-
-    public void setPkColumn(GenTableColumn pkColumn)
-    {
-        this.pkColumn = pkColumn;
-    }
-
-    public GenTable getSubTable()
-    {
-        return subTable;
-    }
-
-    public void setSubTable(GenTable subTable)
-    {
-        this.subTable = subTable;
-    }
-
-    public List<GenTableColumn> getColumns()
-    {
-        return columns;
-    }
-
-    public void setColumns(List<GenTableColumn> columns)
-    {
-        this.columns = columns;
-    }
-
-    public String getOptions()
-    {
-        return options;
-    }
-
-    public void setOptions(String options)
-    {
-        this.options = options;
-    }
-
-    public String getTreeCode()
-    {
-        return treeCode;
-    }
-
-    public void setTreeCode(String treeCode)
-    {
-        this.treeCode = treeCode;
-    }
-
-    public String getTreeParentCode()
-    {
-        return treeParentCode;
-    }
-
-    public void setTreeParentCode(String treeParentCode)
-    {
-        this.treeParentCode = treeParentCode;
-    }
-
-    public String getTreeName()
-    {
-        return treeName;
-    }
-
-    public void setTreeName(String treeName)
-    {
-        this.treeName = treeName;
-    }
-
-    public String getParentMenuId()
-    {
-        return parentMenuId;
-    }
-
-    public void setParentMenuId(String parentMenuId)
-    {
-        this.parentMenuId = parentMenuId;
-    }
-
-    public String getParentMenuName()
-    {
-        return parentMenuName;
-    }
-
-    public void setParentMenuName(String parentMenuName)
-    {
-        this.parentMenuName = parentMenuName;
-    }
-
-    public boolean isSub()
-    {
         return isSub(this.tplCategory);
     }
 
-    public static boolean isSub(String tplCategory)
+    public static boolean isSub(String tplCategory) {
-    {
         return tplCategory != null && StrUtil.equals(GenConstants.TPL_SUB, tplCategory);
     }
 
-    public boolean isTree()
+    public boolean isTree() {
-    {
         return isTree(this.tplCategory);
     }
 
-    public static boolean isTree(String tplCategory)
+    public static boolean isTree(String tplCategory) {
-    {
         return tplCategory != null && StrUtil.equals(GenConstants.TPL_TREE, tplCategory);
     }
 
-    public boolean isCrud()
+    public boolean isCrud() {
-    {
         return isCrud(this.tplCategory);
     }
 
-    public static boolean isCrud(String tplCategory)
+    public static boolean isCrud(String tplCategory) {
-    {
         return tplCategory != null && StrUtil.equals(GenConstants.TPL_CRUD, tplCategory);
     }
 
-    public boolean isSuperColumn(String javaField)
+    public boolean isSuperColumn(String javaField) {
-    {
         return isSuperColumn(this.tplCategory, javaField);
     }
 
-    public static boolean isSuperColumn(String tplCategory, String javaField)
+    public static boolean isSuperColumn(String tplCategory, String javaField) {
-    {
+        if (isTree(tplCategory)) {
-        if (isTree(tplCategory))
-        {
             return StrUtil.equalsAnyIgnoreCase(javaField,
                     ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
         }

ruoyi/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

@@ -1,336 +1,217 @@
 package com.ruoyi.generator.domain;
 
 import cn.hutool.core.util.StrUtil;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
+import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 代码生成业务字段表 gen_table_column
  *
  * @author ruoyi
  */
-public class GenTableColumn extends BaseEntity
+
-{
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("gen_table_column")
+public class GenTableColumn implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 编号 */
+    /**
+     * 编号
+     */
+    @TableId(value = "column_id", type = IdType.AUTO)
     private Long columnId;
 
-    /** 归属表编号 */
+    /**
+     * 归属表编号
+     */
     private Long tableId;
 
-    /** 列名称 */
+    /**
+     * 列名称
+     */
     private String columnName;
 
-    /** 列描述 */
+    /**
+     * 列描述
+     */
     private String columnComment;
 
-    /** 列类型 */
+    /**
+     * 列类型
+     */
     private String columnType;
 
-    /** JAVA类型 */
+    /**
+     * JAVA类型
+     */
     private String javaType;
 
-    /** JAVA字段名 */
+    /**
+     * JAVA字段名
+     */
     @NotBlank(message = "Java属性不能为空")
     private String javaField;
 
-    /** 是否主键（1是） */
+    /**
+     * 是否主键（1是）
+     */
     private String isPk;
 
-    /** 是否自增（1是） */
+    /**
+     * 是否自增（1是）
+     */
     private String isIncrement;
 
-    /** 是否必填（1是） */
+    /**
+     * 是否必填（1是）
+     */
     private String isRequired;
 
-    /** 是否为插入字段（1是） */
+    /**
+     * 是否为插入字段（1是）
+     */
     private String isInsert;
 
-    /** 是否编辑字段（1是） */
+    /**
+     * 是否编辑字段（1是）
+     */
     private String isEdit;
 
-    /** 是否列表字段（1是） */
+    /**
+     * 是否列表字段（1是）
+     */
     private String isList;
 
-    /** 是否查询字段（1是） */
+    /**
+     * 是否查询字段（1是）
+     */
     private String isQuery;
 
-    /** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */
+    /**
+     * 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围）
+     */
     private String queryType;
 
-    /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件） */
+    /**
+     * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件）
+     */
     private String htmlType;
 
-    /** 字典类型 */
+    /**
+     * 字典类型
+     */
     private String dictType;
 
-    /** 排序 */
+    /**
+     * 排序
+     */
     private Integer sort;
 
-    public void setColumnId(Long columnId)
+    /**
-    {
+     * 创建者
-        this.columnId = columnId;
+     */
-    }
+    private String createBy;
 
-    public Long getColumnId()
+    /**
-    {
+     * 创建时间
-        return columnId;
+     */
-    }
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
-    public void setTableId(Long tableId)
+    /**
-    {
+     * 更新者
-        this.tableId = tableId;
+     */
-    }
+    private String updateBy;
 
-    public Long getTableId()
+    /**
-    {
+     * 更新时间
-        return tableId;
+     */
-    }
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
-    public void setColumnName(String columnName)
+    /**
-    {
+     * 请求参数
-        this.columnName = columnName;
+     */
-    }
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
 
-    public String getColumnName()
+    public String getCapJavaField() {
-    {
-        return columnName;
-    }
-
-    public void setColumnComment(String columnComment)
-    {
-        this.columnComment = columnComment;
-    }
-
-    public String getColumnComment()
-    {
-        return columnComment;
-    }
-
-    public void setColumnType(String columnType)
-    {
-        this.columnType = columnType;
-    }
-
-    public String getColumnType()
-    {
-        return columnType;
-    }
-
-    public void setJavaType(String javaType)
-    {
-        this.javaType = javaType;
-    }
-
-    public String getJavaType()
-    {
-        return javaType;
-    }
-
-    public void setJavaField(String javaField)
-    {
-        this.javaField = javaField;
-    }
-
-    public String getJavaField()
-    {
-        return javaField;
-    }
-
-    public String getCapJavaField()
-    {
         return StrUtil.upperFirst(javaField);
     }
 
-    public void setIsPk(String isPk)
+    public boolean isPk() {
-    {
-        this.isPk = isPk;
-    }
-
-    public String getIsPk()
-    {
-        return isPk;
-    }
-
-    public boolean isPk()
-    {
         return isPk(this.isPk);
     }
 
-    public boolean isPk(String isPk)
+    public boolean isPk(String isPk) {
-    {
         return isPk != null && StrUtil.equals("1", isPk);
     }
 
-    public String getIsIncrement()
+    public boolean isIncrement() {
-    {
-        return isIncrement;
-    }
-
-    public void setIsIncrement(String isIncrement)
-    {
-        this.isIncrement = isIncrement;
-    }
-
-    public boolean isIncrement()
-    {
         return isIncrement(this.isIncrement);
     }
 
-    public boolean isIncrement(String isIncrement)
+    public boolean isIncrement(String isIncrement) {
-    {
         return isIncrement != null && StrUtil.equals("1", isIncrement);
     }
 
-    public void setIsRequired(String isRequired)
+    public boolean isRequired() {
-    {
-        this.isRequired = isRequired;
-    }
-
-    public String getIsRequired()
-    {
-        return isRequired;
-    }
-
-    public boolean isRequired()
-    {
         return isRequired(this.isRequired);
     }
 
-    public boolean isRequired(String isRequired)
+    public boolean isRequired(String isRequired) {
-    {
         return isRequired != null && StrUtil.equals("1", isRequired);
     }
 
-    public void setIsInsert(String isInsert)
+    public boolean isInsert() {
-    {
-        this.isInsert = isInsert;
-    }
-
-    public String getIsInsert()
-    {
-        return isInsert;
-    }
-
-    public boolean isInsert()
-    {
         return isInsert(this.isInsert);
     }
 
-    public boolean isInsert(String isInsert)
+    public boolean isInsert(String isInsert) {
-    {
         return isInsert != null && StrUtil.equals("1", isInsert);
     }
 
-    public void setIsEdit(String isEdit)
+    public boolean isEdit() {
-    {
-        this.isEdit = isEdit;
-    }
-
-    public String getIsEdit()
-    {
-        return isEdit;
-    }
-
-    public boolean isEdit()
-    {
         return isInsert(this.isEdit);
     }
 
-    public boolean isEdit(String isEdit)
+    public boolean isEdit(String isEdit) {
-    {
         return isEdit != null && StrUtil.equals("1", isEdit);
     }
 
-    public void setIsList(String isList)
+    public boolean isList() {
-    {
-        this.isList = isList;
-    }
-
-    public String getIsList()
-    {
-        return isList;
-    }
-
-    public boolean isList()
-    {
         return isList(this.isList);
     }
 
-    public boolean isList(String isList)
+    public boolean isList(String isList) {
-    {
         return isList != null && StrUtil.equals("1", isList);
     }
 
-    public void setIsQuery(String isQuery)
+    public boolean isQuery() {
-    {
-        this.isQuery = isQuery;
-    }
-
-    public String getIsQuery()
-    {
-        return isQuery;
-    }
-
-    public boolean isQuery()
-    {
         return isQuery(this.isQuery);
     }
 
-    public boolean isQuery(String isQuery)
+    public boolean isQuery(String isQuery) {
-    {
         return isQuery != null && StrUtil.equals("1", isQuery);
     }
 
-    public void setQueryType(String queryType)
+    public boolean isSuperColumn() {
-    {
-        this.queryType = queryType;
-    }
-
-    public String getQueryType()
-    {
-        return queryType;
-    }
-
-    public String getHtmlType()
-    {
-        return htmlType;
-    }
-
-    public void setHtmlType(String htmlType)
-    {
-        this.htmlType = htmlType;
-    }
-
-    public void setDictType(String dictType)
-    {
-        this.dictType = dictType;
-    }
-
-    public String getDictType()
-    {
-        return dictType;
-    }
-
-    public void setSort(Integer sort)
-    {
-        this.sort = sort;
-    }
-
-    public Integer getSort()
-    {
-        return sort;
-    }
-
-    public boolean isSuperColumn()
-    {
         return isSuperColumn(this.javaField);
     }
 
-    public static boolean isSuperColumn(String javaField)
+    public static boolean isSuperColumn(String javaField) {
-    {
         return StrUtil.equalsAnyIgnoreCase(javaField,
                 // BaseEntity
                 "createBy", "createTime", "updateBy", "updateTime", "remark",
@@ -338,36 +219,28 @@ public class GenTableColumn extends BaseEntity
                 "parentName", "parentId", "orderNum", "ancestors");
     }
 
-    public boolean isUsableColumn()
+    public boolean isUsableColumn() {
-    {
         return isUsableColumn(javaField);
     }
 
-    public static boolean isUsableColumn(String javaField)
+    public static boolean isUsableColumn(String javaField) {
-    {
         // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
         return StrUtil.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
     }
 
-    public String readConverterExp()
+    public String readConverterExp() {
-    {
         String remarks = StrUtil.subBetween(this.columnComment, "（", "）");
         StringBuffer sb = new StringBuffer();
-        if (StrUtil.isNotEmpty(remarks))
+        if (StrUtil.isNotEmpty(remarks)) {
-        {
+            for (String value : remarks.split(" ")) {
-            for (String value : remarks.split(" "))
+                if (StrUtil.isNotEmpty(value)) {
-            {
-                if (StrUtil.isNotEmpty(value))
-                {
                     Object startStr = value.subSequence(0, 1);
                     String endStr = value.substring(1);
                     sb.append("").append(startStr).append("=").append(endStr).append(",");
                 }
             }
             return sb.deleteCharAt(sb.length() - 1).toString();
-        }
+        } else {
-        else
-        {
             return this.columnComment;
         }
     }

ruoyi/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java

@@ -1,15 +1,16 @@
 package com.ruoyi.generator.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.generator.domain.GenTableColumn;
 
+import java.util.List;
+
 /**
  * 业务字段 数据层
  *
  * @author ruoyi
  */
-public interface GenTableColumnMapper
+public interface GenTableColumnMapper extends BaseMapper<GenTableColumn> {
-{
     /**
      * 根据表名称查询列信息
      *
@@ -18,43 +19,4 @@ public interface GenTableColumnMapper
      */
     public List<GenTableColumn> selectDbTableColumnsByName(String tableName);
 
-    /**
-     * 查询业务字段列表
-     * 
-     * @param tableId 业务字段编号
-     * @return 业务字段集合
-     */
-    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
-
-    /**
-     * 新增业务字段
-     * 
-     * @param genTableColumn 业务字段信息
-     * @return 结果
-     */
-    public int insertGenTableColumn(GenTableColumn genTableColumn);
-
-    /**
-     * 修改业务字段
-     * 
-     * @param genTableColumn 业务字段信息
-     * @return 结果
-     */
-    public int updateGenTableColumn(GenTableColumn genTableColumn);
-
-    /**
-     * 删除业务字段
-     * 
-     * @param genTableColumns 列数据
-     * @return 结果
-     */
-    public int deleteGenTableColumns(List<GenTableColumn> genTableColumns);
-
-    /**
-     * 批量删除业务字段
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteGenTableColumnByIds(Long[] ids);
 }

ruoyi/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java

@@ -1,15 +1,16 @@
 package com.ruoyi.generator.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.generator.domain.GenTable;
 
+import java.util.List;
+
 /**
  * 业务 数据层
  *
  * @author ruoyi
  */
-public interface GenTableMapper
+public interface GenTableMapper extends BaseMapper<GenTable> {
-{
     /**
      * 查询业务列表
      *
@@ -57,27 +58,4 @@ public interface GenTableMapper
      */
     public GenTable selectGenTableByName(String tableName);
 
-    /**
-     * 新增业务
-     * 
-     * @param genTable 业务信息
-     * @return 结果
-     */
-    public int insertGenTable(GenTable genTable);
-
-    /**
-     * 修改业务
-     * 
-     * @param genTable 业务信息
-     * @return 结果
-     */
-    public int updateGenTable(GenTable genTable);
-
-    /**
-     * 批量删除业务
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteGenTableByIds(Long[] ids);
 }

ruoyi/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java

@@ -1,11 +1,13 @@
 package com.ruoyi.generator.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import cn.hutool.core.convert.Convert;
 import com.ruoyi.generator.domain.GenTableColumn;
 import com.ruoyi.generator.mapper.GenTableColumnMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 业务字段 服务层实现
@@ -13,22 +15,20 @@ import com.ruoyi.generator.mapper.GenTableColumnMapper;
  * @author ruoyi
  */
 @Service
-public class GenTableColumnServiceImpl implements IGenTableColumnService 
+public class GenTableColumnServiceImpl extends ServiceImpl<GenTableColumnMapper, GenTableColumn> implements IGenTableColumnService {
-{
-	@Autowired
-	private GenTableColumnMapper genTableColumnMapper;
 
-	/**
+    /**
      * 查询业务字段列表
      *
      * @param tableId 业务字段编号
      * @return 业务字段集合
      */
-	@Override
+    @Override
-	public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId)
+    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) {
-	{
+        return list(new LambdaQueryWrapper<GenTableColumn>()
-	    return genTableColumnMapper.selectGenTableColumnListByTableId(tableId);
+                .eq(GenTableColumn::getTableId,tableId)
-	}
+                .orderByAsc(GenTableColumn::getSort));
+    }
 
     /**
      * 新增业务字段
@@ -36,33 +36,30 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService
      * @param genTableColumn 业务字段信息
      * @return 结果
      */
-	@Override
+    @Override
-	public int insertGenTableColumn(GenTableColumn genTableColumn)
+    public int insertGenTableColumn(GenTableColumn genTableColumn) {
-	{
+        return baseMapper.insert(genTableColumn);
-	    return genTableColumnMapper.insertGenTableColumn(genTableColumn);
+    }
-	}
 
-	/**
+    /**
      * 修改业务字段
      *
      * @param genTableColumn 业务字段信息
      * @return 结果
      */
-	@Override
+    @Override
-	public int updateGenTableColumn(GenTableColumn genTableColumn)
+    public int updateGenTableColumn(GenTableColumn genTableColumn) {
-	{
+        return baseMapper.updateById(genTableColumn);
-	    return genTableColumnMapper.updateGenTableColumn(genTableColumn);
+    }
-	}
 
-	/**
+    /**
      * 删除业务字段对象
      *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-	@Override
+    @Override
-	public int deleteGenTableColumnByIds(String ids)
+    public int deleteGenTableColumnByIds(String ids) {
-	{
+        return baseMapper.deleteBatchIds(Arrays.asList(ids.split(",")));
-		return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
+    }
-	}
 }

ruoyi/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -5,6 +5,8 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.GenConstants;
 import com.ruoyi.common.exception.CustomException;
@@ -17,12 +19,11 @@ import com.ruoyi.generator.mapper.GenTableMapper;
 import com.ruoyi.generator.util.GenUtils;
 import com.ruoyi.generator.util.VelocityInitializer;
 import com.ruoyi.generator.util.VelocityUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +32,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,13 +45,9 @@ import java.util.zip.ZipOutputStream;
  *
  * @author ruoyi
  */
+@Slf4j
 @Service
-public class GenTableServiceImpl implements IGenTableService
+public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> implements IGenTableService {
-{
-    private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class);
-
-    @Autowired
-    private GenTableMapper genTableMapper;
 
     @Autowired
     private GenTableColumnMapper genTableColumnMapper;
@@ -61,9 +59,8 @@ public class GenTableServiceImpl implements IGenTableService
      * @return 业务信息
      */
     @Override
-    public GenTable selectGenTableById(Long id)
+    public GenTable selectGenTableById(Long id) {
-    {
+        GenTable genTable = baseMapper.selectGenTableById(id);
-        GenTable genTable = genTableMapper.selectGenTableById(id);
         setTableFromOptions(genTable);
         return genTable;
     }
@@ -75,9 +72,8 @@ public class GenTableServiceImpl implements IGenTableService
      * @return 业务集合
      */
     @Override
-    public List<GenTable> selectGenTableList(GenTable genTable)
+    public List<GenTable> selectGenTableList(GenTable genTable) {
-    {
+        return baseMapper.selectGenTableList(genTable);
-        return genTableMapper.selectGenTableList(genTable);
     }
 
     /**
@@ -87,9 +83,8 @@ public class GenTableServiceImpl implements IGenTableService
      * @return 数据库表集合
      */
     @Override
-    public List<GenTable> selectDbTableList(GenTable genTable)
+    public List<GenTable> selectDbTableList(GenTable genTable) {
-    {
+        return baseMapper.selectDbTableList(genTable);
-        return genTableMapper.selectDbTableList(genTable);
     }
 
     /**
@@ -99,9 +94,8 @@ public class GenTableServiceImpl implements IGenTableService
      * @return 数据库表集合
      */
     @Override
-    public List<GenTable> selectDbTableListByNames(String[] tableNames)
+    public List<GenTable> selectDbTableListByNames(String[] tableNames) {
-    {
+        return baseMapper.selectDbTableListByNames(tableNames);
-        return genTableMapper.selectDbTableListByNames(tableNames);
     }
 
     /**
@@ -110,9 +104,8 @@ public class GenTableServiceImpl implements IGenTableService
      * @return 表信息集合
      */
     @Override
-    public List<GenTable> selectGenTableAll()
+    public List<GenTable> selectGenTableAll() {
-    {
+        return baseMapper.selectGenTableAll();
-        return genTableMapper.selectGenTableAll();
     }
 
     /**
@@ -123,16 +116,13 @@ public class GenTableServiceImpl implements IGenTableService
      */
     @Override
     @Transactional
-    public void updateGenTable(GenTable genTable)
+    public void updateGenTable(GenTable genTable) {
-    {
         String options = JSON.toJSONString(genTable.getParams());
         genTable.setOptions(options);
-        int row = genTableMapper.updateGenTable(genTable);
+        int row = baseMapper.updateById(genTable);
-        if (row > 0)
+        if (row > 0) {
-        {
+            for (GenTableColumn cenTableColumn : genTable.getColumns()) {
-            for (GenTableColumn cenTableColumn : genTable.getColumns())
+                genTableColumnMapper.updateById(cenTableColumn);
-            {
-                genTableColumnMapper.updateGenTableColumn(cenTableColumn);
             }
         }
     }
@@ -145,10 +135,10 @@ public class GenTableServiceImpl implements IGenTableService
      */
     @Override
     @Transactional
-    public void deleteGenTableByIds(Long[] tableIds)
+    public void deleteGenTableByIds(Long[] tableIds) {
-    {
+        List<Long> ids = Arrays.asList(tableIds);
-        genTableMapper.deleteGenTableByIds(tableIds);
+        removeByIds(ids);
-        genTableColumnMapper.deleteGenTableColumnByIds(tableIds);
+        genTableColumnMapper.delete(new LambdaQueryWrapper<GenTableColumn>().in(GenTableColumn::getTableId, ids));
     }
 
     /**
@@ -158,30 +148,23 @@ public class GenTableServiceImpl implements IGenTableService
      */
     @Override
     @Transactional
-    public void importGenTable(List<GenTable> tableList)
+    public void importGenTable(List<GenTable> tableList) {
-    {
         String operName = SecurityUtils.getUsername();
-        try
+        try {
-        {
+            for (GenTable table : tableList) {
-            for (GenTable table : tableList)
-            {
                 String tableName = table.getTableName();
                 GenUtils.initTable(table, operName);
-                int row = genTableMapper.insertGenTable(table);
+                int row = baseMapper.insert(table);
-                if (row > 0)
+                if (row > 0) {
-                {
                     // 保存列信息
                     List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
-                    for (GenTableColumn column : genTableColumns)
+                    for (GenTableColumn column : genTableColumns) {
-                    {
                         GenUtils.initColumnField(column, table);
-                        genTableColumnMapper.insertGenTableColumn(column);
+                        genTableColumnMapper.insert(column);
                     }
                 }
             }
-        }
+        } catch (Exception e) {
-        catch (Exception e)
-        {
             throw new CustomException("导入失败：" + e.getMessage());
         }
     }
@@ -193,11 +176,10 @@ public class GenTableServiceImpl implements IGenTableService
      * @return 预览数据列表
      */
     @Override
-    public Map<String, String> previewCode(Long tableId)
+    public Map<String, String> previewCode(Long tableId) {
-    {
         Map<String, String> dataMap = new LinkedHashMap<>();
         // 查询表信息
-        GenTable table = genTableMapper.selectGenTableById(tableId);
+        GenTable table = baseMapper.selectGenTableById(tableId);
         // 设置主子表信息
         setSubTable(table);
         // 设置主键列信息
@@ -208,8 +190,7 @@ public class GenTableServiceImpl implements IGenTableService
 
         // 获取模板列表
         List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
-        for (String template : templates)
+        for (String template : templates) {
-        {
             // 渲染模板
             StringWriter sw = new StringWriter();
             Template tpl = Velocity.getTemplate(template, Constants.UTF8);
@@ -226,8 +207,7 @@ public class GenTableServiceImpl implements IGenTableService
      * @return 数据
      */
     @Override
-    public byte[] downloadCode(String tableName)
+    public byte[] downloadCode(String tableName) {
-    {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zip = new ZipOutputStream(outputStream);
         generatorCode(tableName, zip);
@@ -241,10 +221,9 @@ public class GenTableServiceImpl implements IGenTableService
      * @param tableName 表名称
      */
     @Override
-    public void generatorCode(String tableName)
+    public void generatorCode(String tableName) {
-    {
         // 查询表信息
-        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        GenTable table = baseMapper.selectGenTableByName(tableName);
         // 设置主子表信息
         setSubTable(table);
         // 设置主键列信息
@@ -256,21 +235,16 @@ public class GenTableServiceImpl implements IGenTableService
 
         // 获取模板列表
         List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
-        for (String template : templates)
+        for (String template : templates) {
-        {
+            if (!StrUtil.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) {
-            if (!StrUtil.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
-            {
                 // 渲染模板
                 StringWriter sw = new StringWriter();
                 Template tpl = Velocity.getTemplate(template, Constants.UTF8);
                 tpl.merge(context, sw);
-                try
+                try {
-                {
                     String path = getGenPath(table, template);
                     FileUtils.writeStringToFile(new File(path), sw.toString(), Constants.UTF8);
-                }
+                } catch (IOException e) {
-                catch (IOException e)
-                {
                     throw new CustomException("渲染模板失败，表名：" + table.getTableName());
                 }
             }
@@ -284,31 +258,28 @@ public class GenTableServiceImpl implements IGenTableService
      */
     @Override
     @Transactional
-    public void synchDb(String tableName)
+    public void synchDb(String tableName) {
-    {
+        GenTable table = baseMapper.selectGenTableByName(tableName);
-        GenTable table = genTableMapper.selectGenTableByName(tableName);
         List<GenTableColumn> tableColumns = table.getColumns();
         List<String> tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
 
         List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
-        if (Validator.isEmpty(dbTableColumns))
+        if (Validator.isEmpty(dbTableColumns)) {
-        {
             throw new CustomException("同步数据失败，原表结构不存在");
         }
         List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
 
         dbTableColumns.forEach(column -> {
-            if (!tableColumnNames.contains(column.getColumnName()))
+            if (!tableColumnNames.contains(column.getColumnName())) {
-            {
                 GenUtils.initColumnField(column, table);
-                genTableColumnMapper.insertGenTableColumn(column);
+                genTableColumnMapper.insert(column);
             }
         });
 
         List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
-        if (CollUtil.isNotEmpty(delColumns))
+        if (CollUtil.isNotEmpty(delColumns)) {
-        {
+            List<Long> ids = delColumns.stream().map(GenTableColumn::getColumnId).collect(Collectors.toList());
-            genTableColumnMapper.deleteGenTableColumns(delColumns);
+            genTableColumnMapper.deleteBatchIds(ids);
         }
     }
 
@@ -319,12 +290,10 @@ public class GenTableServiceImpl implements IGenTableService
      * @return 数据
      */
     @Override
-    public byte[] downloadCode(String[] tableNames)
+    public byte[] downloadCode(String[] tableNames) {
-    {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zip = new ZipOutputStream(outputStream);
-        for (String tableName : tableNames)
+        for (String tableName : tableNames) {
-        {
             generatorCode(tableName, zip);
         }
         IOUtils.closeQuietly(zip);
@@ -334,10 +303,9 @@ public class GenTableServiceImpl implements IGenTableService
     /**
      * 查询表信息并生成代码
      */
-    private void generatorCode(String tableName, ZipOutputStream zip)
+    private void generatorCode(String tableName, ZipOutputStream zip) {
-    {
         // 查询表信息
-        GenTable table = genTableMapper.selectGenTableByName(tableName);
+        GenTable table = baseMapper.selectGenTableByName(tableName);
         // 设置主子表信息
         setSubTable(table);
         // 设置主键列信息
@@ -349,23 +317,19 @@ public class GenTableServiceImpl implements IGenTableService
 
         // 获取模板列表
         List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
-        for (String template : templates)
+        for (String template : templates) {
-        {
             // 渲染模板
             StringWriter sw = new StringWriter();
             Template tpl = Velocity.getTemplate(template, Constants.UTF8);
             tpl.merge(context, sw);
-            try
+            try {
-            {
                 // 添加到zip
                 zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
                 IOUtils.write(sw.toString(), zip, Constants.UTF8);
                 IOUtils.closeQuietly(sw);
-				zip.flush();
+                zip.flush();
                 zip.closeEntry();
-            }
+            } catch (IOException e) {
-            catch (IOException e)
-            {
                 log.error("渲染模板失败，表名：" + table.getTableName(), e);
             }
         }
@@ -377,32 +341,20 @@ public class GenTableServiceImpl implements IGenTableService
      * @param genTable 业务信息
      */
     @Override
-    public void validateEdit(GenTable genTable)
+    public void validateEdit(GenTable genTable) {
-    {
+        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
-        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory()))
-        {
             String options = JSON.toJSONString(genTable.getParams());
             JSONObject paramsObj = JSONObject.parseObject(options);
-            if (Validator.isEmpty(paramsObj.getString(GenConstants.TREE_CODE)))
+            if (Validator.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) {
-            {
                 throw new CustomException("树编码字段不能为空");
-            }
+            } else if (Validator.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) {
-            else if (Validator.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE)))
-            {
                 throw new CustomException("树父编码字段不能为空");
-            }
+            } else if (Validator.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) {
-            else if (Validator.isEmpty(paramsObj.getString(GenConstants.TREE_NAME)))
-            {
                 throw new CustomException("树名称字段不能为空");
-            }
+            } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
-            else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
+                if (Validator.isEmpty(genTable.getSubTableName())) {
-            {
-                if (Validator.isEmpty(genTable.getSubTableName()))
-                {
                     throw new CustomException("关联子表的表名不能为空");
-                }
+                } else if (Validator.isEmpty(genTable.getSubTableFkName())) {
-                else if (Validator.isEmpty(genTable.getSubTableFkName()))
-                {
                     throw new CustomException("子表关联的外键名不能为空");
                 }
             }
@@ -414,32 +366,24 @@ public class GenTableServiceImpl implements IGenTableService
      *
      * @param table 业务表信息
      */
-    public void setPkColumn(GenTable table)
+    public void setPkColumn(GenTable table) {
-    {
+        for (GenTableColumn column : table.getColumns()) {
-        for (GenTableColumn column : table.getColumns())
+            if (column.isPk()) {
-        {
-            if (column.isPk())
-            {
                 table.setPkColumn(column);
                 break;
             }
         }
-        if (Validator.isNull(table.getPkColumn()))
+        if (Validator.isNull(table.getPkColumn())) {
-        {
             table.setPkColumn(table.getColumns().get(0));
         }
-        if (GenConstants.TPL_SUB.equals(table.getTplCategory()))
+        if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
-        {
+            for (GenTableColumn column : table.getSubTable().getColumns()) {
-            for (GenTableColumn column : table.getSubTable().getColumns())
+                if (column.isPk()) {
-            {
-                if (column.isPk())
-                {
                     table.getSubTable().setPkColumn(column);
                     break;
                 }
             }
-            if (Validator.isNull(table.getSubTable().getPkColumn()))
+            if (Validator.isNull(table.getSubTable().getPkColumn())) {
-            {
                 table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
             }
         }
@@ -450,12 +394,10 @@ public class GenTableServiceImpl implements IGenTableService
      *
      * @param table 业务表信息
      */
-    public void setSubTable(GenTable table)
+    public void setSubTable(GenTable table) {
-    {
         String subTableName = table.getSubTableName();
-        if (Validator.isNotEmpty(subTableName))
+        if (Validator.isNotEmpty(subTableName)) {
-        {
+            table.setSubTable(baseMapper.selectGenTableByName(subTableName));
-            table.setSubTable(genTableMapper.selectGenTableByName(subTableName));
         }
     }
 
@@ -464,11 +406,9 @@ public class GenTableServiceImpl implements IGenTableService
      *
      * @param genTable 设置后的生成对象
      */
-    public void setTableFromOptions(GenTable genTable)
+    public void setTableFromOptions(GenTable genTable) {
-    {
         JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions());
-        if (Validator.isNotNull(paramsObj))
+        if (Validator.isNotNull(paramsObj)) {
-        {
             String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
             String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
             String treeName = paramsObj.getString(GenConstants.TREE_NAME);
@@ -486,15 +426,13 @@ public class GenTableServiceImpl implements IGenTableService
     /**
      * 获取代码生成地址
      *
-     * @param table 业务表信息
+     * @param table    业务表信息
      * @param template 模板文件路径
      * @return 生成地址
      */
-    public static String getGenPath(GenTable table, String template)
+    public static String getGenPath(GenTable table, String template) {
-    {
         String genPath = table.getGenPath();
-        if (StrUtil.equals(genPath, "/"))
+        if (StrUtil.equals(genPath, "/")) {
-        {
             return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
         }
         return genPath + File.separator + VelocityUtils.getFileName(template, table);

ruoyi/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java

@@ -1,15 +1,16 @@
 package com.ruoyi.generator.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.generator.domain.GenTableColumn;
 
+import java.util.List;
+
 /**
  * 业务字段 服务层
  *
  * @author ruoyi
  */
-public interface IGenTableColumnService
+public interface IGenTableColumnService extends IService<GenTableColumn> {
-{
     /**
      * 查询业务字段列表
      *

ruoyi/src/main/java/com/ruoyi/generator/service/IGenTableService.java

@@ -1,16 +1,17 @@
 package com.ruoyi.generator.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.generator.domain.GenTable;
+
 import java.util.List;
 import java.util.Map;
-import com.ruoyi.generator.domain.GenTable;
 
 /**
  * 业务 服务层
  *
  * @author ruoyi
  */
-public interface IGenTableService
+public interface IGenTableService extends IService<GenTable> {
-{
     /**
      * 查询业务列表
      *

ruoyi/src/main/java/com/ruoyi/quartz/domain/SysJob.java

@@ -1,34 +1,45 @@
 package com.ruoyi.quartz.domain;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.constant.ScheduleConstants;
-import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.quartz.util.CronUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 定时任务调度表 sys_job
  * 
  * @author ruoyi
  */
-public class SysJob extends BaseEntity implements Serializable
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_job")
+public class SysJob implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
     /** 任务ID */
     @Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
+    @TableId(value = "job_id", type = IdType.AUTO)
     private Long jobId;
 
     /** 任务名称 */
+    @NotBlank(message = "任务名称不能为空")
+    @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
     @Excel(name = "任务名称")
     private String jobName;
 
@@ -37,10 +48,14 @@ public class SysJob extends BaseEntity implements Serializable
     private String jobGroup;
 
     /** 调用目标字符串 */
+    @NotBlank(message = "调用目标字符串不能为空")
+    @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
     @Excel(name = "调用目标字符串")
     private String invokeTarget;
 
     /** cron执行表达式 */
+    @NotBlank(message = "Cron执行表达式不能为空")
+    @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
     @Excel(name = "执行表达式 ")
     private String cronExpression;
 
@@ -56,61 +71,40 @@ public class SysJob extends BaseEntity implements Serializable
     @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
     private String status;
 
-    public Long getJobId()
+    /**
-    {
+     * 创建者
-        return jobId;
+     */
-    }
+    private String createBy;
 
-    public void setJobId(Long jobId)
+    /**
-    {
+     * 创建时间
-        this.jobId = jobId;
+     */
-    }
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
-    @NotBlank(message = "任务名称不能为空")
+    /**
-    @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
+     * 更新者
-    public String getJobName()
+     */
-    {
+    private String updateBy;
-        return jobName;
-    }
 
-    public void setJobName(String jobName)
+    /**
-    {
+     * 更新时间
-        this.jobName = jobName;
+     */
-    }
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
-    public String getJobGroup()
+    /**
-    {
+     * 备注
-        return jobGroup;
+     */
-    }
+    private String remark;
 
-    public void setJobGroup(String jobGroup)
+    /**
-    {
+     * 请求参数
-        this.jobGroup = jobGroup;
+     */
-    }
+    @TableField(exist = false)
-
+    private Map<String, Object> params = new HashMap<>();
-    @NotBlank(message = "调用目标字符串不能为空")
-    @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
-    public String getInvokeTarget()
-    {
-        return invokeTarget;
-    }
-
-    public void setInvokeTarget(String invokeTarget)
-    {
-        this.invokeTarget = invokeTarget;
-    }
-
-    @NotBlank(message = "Cron执行表达式不能为空")
-    @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
-    public String getCronExpression()
-    {
-        return cronExpression;
-    }
-
-    public void setCronExpression(String cronExpression)
-    {
-        this.cronExpression = cronExpression;
-    }
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date getNextValidTime()
@@ -122,52 +116,4 @@ public class SysJob extends BaseEntity implements Serializable
         return null;
     }
 
-    public String getMisfirePolicy()
-    {
-        return misfirePolicy;
-    }
-
-    public void setMisfirePolicy(String misfirePolicy)
-    {
-        this.misfirePolicy = misfirePolicy;
-    }
-
-    public String getConcurrent()
-    {
-        return concurrent;
-    }
-
-    public void setConcurrent(String concurrent)
-    {
-        this.concurrent = concurrent;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("jobId", getJobId())
-            .append("jobName", getJobName())
-            .append("jobGroup", getJobGroup())
-            .append("cronExpression", getCronExpression())
-            .append("nextValidTime", getNextValidTime())
-            .append("misfirePolicy", getMisfirePolicy())
-            .append("concurrent", getConcurrent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

ruoyi/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java

@@ -1,22 +1,33 @@
 package com.ruoyi.quartz.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 定时任务调度日志表 sys_job_log
  * 
  * @author ruoyi
  */
-public class SysJobLog extends BaseEntity
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_job_log")
+public class SysJobLog
 {
     private static final long serialVersionUID = 1L;
 
     /** ID */
     @Excel(name = "日志序号")
+    @TableId(value = "job_log_id", type = IdType.AUTO)
     private Long jobLogId;
 
     /** 任务名称 */
@@ -43,113 +54,25 @@ public class SysJobLog extends BaseEntity
     @Excel(name = "异常信息")
     private String exceptionInfo;
 
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
     /** 开始时间 */
+    @TableField(exist = false)
     private Date startTime;
 
     /** 停止时间 */
+    @TableField(exist = false)
     private Date stopTime;
 
-    public Long getJobLogId()
-    {
-        return jobLogId;
-    }
-
-    public void setJobLogId(Long jobLogId)
-    {
-        this.jobLogId = jobLogId;
-    }
-
-    public String getJobName()
-    {
-        return jobName;
-    }
-
-    public void setJobName(String jobName)
-    {
-        this.jobName = jobName;
-    }
-
-    public String getJobGroup()
-    {
-        return jobGroup;
-    }
-
-    public void setJobGroup(String jobGroup)
-    {
-        this.jobGroup = jobGroup;
-    }
-
-    public String getInvokeTarget()
-    {
-        return invokeTarget;
-    }
-
-    public void setInvokeTarget(String invokeTarget)
-    {
-        this.invokeTarget = invokeTarget;
-    }
-
-    public String getJobMessage()
-    {
-        return jobMessage;
-    }
-
-    public void setJobMessage(String jobMessage)
-    {
-        this.jobMessage = jobMessage;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getExceptionInfo()
-    {
-        return exceptionInfo;
-    }
-
-    public void setExceptionInfo(String exceptionInfo)
-    {
-        this.exceptionInfo = exceptionInfo;
-    }
-
-    public Date getStartTime()
-    {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime)
-    {
-        this.startTime = startTime;
-    }
-    
-    public Date getStopTime()
-    {
-        return stopTime;
-    }
-
-    public void setStopTime(Date stopTime)
-    {
-        this.stopTime = stopTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("jobLogId", getJobLogId())
-            .append("jobName", getJobName())
-            .append("jobGroup", getJobGroup())
-            .append("jobMessage", getJobMessage())
-            .append("status", getStatus())
-            .append("exceptionInfo", getExceptionInfo())
-            .append("startTime", getStartTime())
-            .append("stopTime", getStopTime())
-            .toString();
-    }
 }

ruoyi/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.quartz.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.quartz.domain.SysJobLog;
 
 /**
@@ -8,57 +8,6 @@ import com.ruoyi.quartz.domain.SysJobLog;
  *
  * @author ruoyi
  */
-public interface SysJobLogMapper
+public interface SysJobLogMapper extends BaseMapper<SysJobLog> {
-{
-    /**
-     * 获取quartz调度器日志的计划任务
-     * 
-     * @param jobLog 调度日志信息
-     * @return 调度任务日志集合
-     */
-    public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
 
-    /**
-     * 查询所有调度任务日志
-     *
-     * @return 调度任务日志列表
-     */
-    public List<SysJobLog> selectJobLogAll();
-
-    /**
-     * 通过调度任务日志ID查询调度信息
-     * 
-     * @param jobLogId 调度任务日志ID
-     * @return 调度任务日志对象信息
-     */
-    public SysJobLog selectJobLogById(Long jobLogId);
-
-    /**
-     * 新增任务日志
-     * 
-     * @param jobLog 调度日志信息
-     * @return 结果
-     */
-    public int insertJobLog(SysJobLog jobLog);
-
-    /**
-     * 批量删除调度日志信息
-     * 
-     * @param logIds 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteJobLogByIds(Long[] logIds);
-
-    /**
-     * 删除任务日志
-     * 
-     * @param jobId 调度日志ID
-     * @return 结果
-     */
-    public int deleteJobLogById(Long jobId);
-
-    /**
-     * 清空任务日志
-     */
-    public void cleanJobLog();
 }

ruoyi/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.quartz.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.quartz.domain.SysJob;
 
 /**
@@ -8,60 +8,6 @@ import com.ruoyi.quartz.domain.SysJob;
  *
  * @author ruoyi
  */
-public interface SysJobMapper
+public interface SysJobMapper extends BaseMapper<SysJob> {
-{
-    /**
-     * 查询调度任务日志集合
-     * 
-     * @param job 调度信息
-     * @return 操作日志集合
-     */
-    public List<SysJob> selectJobList(SysJob job);
 
-    /**
-     * 查询所有调度任务
-     * 
-     * @return 调度任务列表
-     */
-    public List<SysJob> selectJobAll();
-
-    /**
-     * 通过调度ID查询调度任务信息
-     * 
-     * @param jobId 调度ID
-     * @return 角色对象信息
-     */
-    public SysJob selectJobById(Long jobId);
-
-    /**
-     * 通过调度ID删除调度任务信息
-     * 
-     * @param jobId 调度ID
-     * @return 结果
-     */
-    public int deleteJobById(Long jobId);
-
-    /**
-     * 批量删除调度任务信息
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteJobByIds(Long[] ids);
-
-    /**
-     * 修改调度任务信息
-     * 
-     * @param job 调度任务信息
-     * @return 结果
-     */
-    public int updateJob(SysJob job);
-
-    /**
-     * 新增调度任务信息
-     * 
-     * @param job 调度任务信息
-     * @return 结果
-     */
-    public int insertJob(SysJob job);
 }

ruoyi/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java

@@ -1,15 +1,16 @@
 package com.ruoyi.quartz.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.quartz.domain.SysJobLog;
 
+import java.util.List;
+
 /**
  * 定时任务调度日志信息信息 服务层
  *
  * @author ruoyi
  */
-public interface ISysJobLogService
+public interface ISysJobLogService extends IService<SysJobLog> {
-{
     /**
      * 获取quartz调度器日志的计划任务
      *

ruoyi/src/main/java/com/ruoyi/quartz/service/ISysJobService.java

@@ -1,17 +1,18 @@
 package com.ruoyi.quartz.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
-import org.quartz.SchedulerException;
 import com.ruoyi.common.exception.job.TaskException;
 import com.ruoyi.quartz.domain.SysJob;
+import org.quartz.SchedulerException;
+
+import java.util.List;
 
 /**
  * 定时任务调度信息信息 服务层
  *
  * @author ruoyi
  */
-public interface ISysJobService
+public interface ISysJobService extends IService<SysJob> {
-{
     /**
      * 获取quartz调度器的计划任务
      *

ruoyi/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java

@@ -1,11 +1,17 @@
 package com.ruoyi.quartz.service.impl;
 
-import java.util.List;
+import cn.hutool.core.lang.Validator;
-import org.springframework.beans.factory.annotation.Autowired;
+import cn.hutool.core.util.StrUtil;
-import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.quartz.domain.SysJobLog;
 import com.ruoyi.quartz.mapper.SysJobLogMapper;
 import com.ruoyi.quartz.service.ISysJobLogService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 定时任务调度日志信息 服务层
@@ -13,10 +19,7 @@ import com.ruoyi.quartz.service.ISysJobLogService;
  * @author ruoyi
  */
 @Service
-public class SysJobLogServiceImpl implements ISysJobLogService
+public class SysJobLogServiceImpl extends ServiceImpl<SysJobLogMapper, SysJobLog> implements ISysJobLogService {
-{
-    @Autowired
-    private SysJobLogMapper jobLogMapper;
 
     /**
      * 获取quartz调度器日志的计划任务
@@ -25,9 +28,19 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * @return 调度任务日志集合
      */
     @Override
-    public List<SysJobLog> selectJobLogList(SysJobLog jobLog)
+    public List<SysJobLog> selectJobLogList(SysJobLog jobLog) {
-    {
+        Map<String, Object> params = jobLog.getParams();
-        return jobLogMapper.selectJobLogList(jobLog);
+        return list(new LambdaQueryWrapper<SysJobLog>()
+                .like(StrUtil.isNotBlank(jobLog.getJobName()), SysJobLog::getJobName, jobLog.getJobName())
+                .eq(StrUtil.isNotBlank(jobLog.getJobGroup()), SysJobLog::getJobGroup, jobLog.getJobGroup())
+                .eq(StrUtil.isNotBlank(jobLog.getStatus()), SysJobLog::getStatus, jobLog.getStatus())
+                .like(StrUtil.isNotBlank(jobLog.getInvokeTarget()), SysJobLog::getInvokeTarget, jobLog.getInvokeTarget())
+                .apply(Validator.isNotEmpty(params.get("beginTime")),
+                        "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+                        params.get("beginTime"))
+                .apply(Validator.isNotEmpty(params.get("endTime")),
+                        "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+                        params.get("endTime")));
     }
 
     /**
@@ -37,9 +50,8 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * @return 调度任务日志对象信息
      */
     @Override
-    public SysJobLog selectJobLogById(Long jobLogId)
+    public SysJobLog selectJobLogById(Long jobLogId) {
-    {
+        return getById(jobLogId);
-        return jobLogMapper.selectJobLogById(jobLogId);
     }
 
     /**
@@ -48,9 +60,8 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * @param jobLog 调度日志信息
      */
     @Override
-    public void addJobLog(SysJobLog jobLog)
+    public void addJobLog(SysJobLog jobLog) {
-    {
+        baseMapper.insert(jobLog);
-        jobLogMapper.insertJobLog(jobLog);
     }
 
     /**
@@ -60,9 +71,8 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * @return 结果
      */
     @Override
-    public int deleteJobLogByIds(Long[] logIds)
+    public int deleteJobLogByIds(Long[] logIds) {
-    {
+        return baseMapper.deleteBatchIds(Arrays.asList(logIds));
-        return jobLogMapper.deleteJobLogByIds(logIds);
     }
 
     /**
@@ -71,17 +81,15 @@ public class SysJobLogServiceImpl implements ISysJobLogService
      * @param jobId 调度日志ID
      */
     @Override
-    public int deleteJobLogById(Long jobId)
+    public int deleteJobLogById(Long jobId) {
-    {
+        return baseMapper.deleteById(jobId);
-        return jobLogMapper.deleteJobLogById(jobId);
     }
 
     /**
      * 清空任务日志
      */
     @Override
-    public void cleanJobLog()
+    public void cleanJobLog() {
-    {
+        remove(new LambdaQueryWrapper<>());
-        jobLogMapper.cleanJobLog();
     }
 }

ruoyi/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java

@@ -1,14 +1,8 @@
 package com.ruoyi.quartz.service.impl;
 
-import java.util.List;
+import cn.hutool.core.util.StrUtil;
-import javax.annotation.PostConstruct;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.quartz.JobDataMap;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.quartz.JobKey;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.common.constant.ScheduleConstants;
 import com.ruoyi.common.exception.job.TaskException;
 import com.ruoyi.quartz.domain.SysJob;
@@ -16,6 +10,16 @@ import com.ruoyi.quartz.mapper.SysJobMapper;
 import com.ruoyi.quartz.service.ISysJobService;
 import com.ruoyi.quartz.util.CronUtils;
 import com.ruoyi.quartz.util.ScheduleUtils;
+import org.quartz.JobDataMap;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
 
 /**
  * 定时任务调度信息 服务层
@@ -23,24 +27,18 @@ import com.ruoyi.quartz.util.ScheduleUtils;
  * @author ruoyi
  */
 @Service
-public class SysJobServiceImpl implements ISysJobService
+public class SysJobServiceImpl extends ServiceImpl<SysJobMapper, SysJob> implements ISysJobService {
-{
     @Autowired
     private Scheduler scheduler;
 
-    @Autowired
-    private SysJobMapper jobMapper;
-
     /**
      * 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据）
      */
     @PostConstruct
-    public void init() throws SchedulerException, TaskException
+    public void init() throws SchedulerException, TaskException {
-    {
         scheduler.clear();
-        List<SysJob> jobList = jobMapper.selectJobAll();
+        List<SysJob> jobList = list();
-        for (SysJob job : jobList)
+        for (SysJob job : jobList) {
-        {
             ScheduleUtils.createScheduleJob(scheduler, job);
         }
     }
@@ -52,9 +50,12 @@ public class SysJobServiceImpl implements ISysJobService
      * @return
      */
     @Override
-    public List<SysJob> selectJobList(SysJob job)
+    public List<SysJob> selectJobList(SysJob job) {
-    {
+        return list(new LambdaQueryWrapper<SysJob>()
-        return jobMapper.selectJobList(job);
+                .like(StrUtil.isNotBlank(job.getJobName()), SysJob::getJobName, job.getJobName())
+                .eq(StrUtil.isNotBlank(job.getJobGroup()), SysJob::getJobGroup, job.getJobGroup())
+                .eq(StrUtil.isNotBlank(job.getStatus()), SysJob::getStatus, job.getStatus())
+                .like(StrUtil.isNotBlank(job.getInvokeTarget()), SysJob::getInvokeTarget, job.getInvokeTarget()));
     }
 
     /**
@@ -64,9 +65,8 @@ public class SysJobServiceImpl implements ISysJobService
      * @return 调度任务对象信息
      */
     @Override
-    public SysJob selectJobById(Long jobId)
+    public SysJob selectJobById(Long jobId) {
-    {
+        return getById(jobId);
-        return jobMapper.selectJobById(jobId);
     }
 
     /**
@@ -76,14 +76,12 @@ public class SysJobServiceImpl implements ISysJobService
      */
     @Override
     @Transactional
-    public int pauseJob(SysJob job) throws SchedulerException
+    public int pauseJob(SysJob job) throws SchedulerException {
-    {
         Long jobId = job.getJobId();
         String jobGroup = job.getJobGroup();
         job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
-        int rows = jobMapper.updateJob(job);
+        int rows = baseMapper.updateById(job);
-        if (rows > 0)
+        if (rows > 0) {
-        {
             scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
         }
         return rows;
@@ -96,14 +94,12 @@ public class SysJobServiceImpl implements ISysJobService
      */
     @Override
     @Transactional
-    public int resumeJob(SysJob job) throws SchedulerException
+    public int resumeJob(SysJob job) throws SchedulerException {
-    {
         Long jobId = job.getJobId();
         String jobGroup = job.getJobGroup();
         job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
-        int rows = jobMapper.updateJob(job);
+        int rows = baseMapper.updateById(job);
-        if (rows > 0)
+        if (rows > 0) {
-        {
             scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup));
         }
         return rows;
@@ -116,13 +112,11 @@ public class SysJobServiceImpl implements ISysJobService
      */
     @Override
     @Transactional
-    public int deleteJob(SysJob job) throws SchedulerException
+    public int deleteJob(SysJob job) throws SchedulerException {
-    {
         Long jobId = job.getJobId();
         String jobGroup = job.getJobGroup();
-        int rows = jobMapper.deleteJobById(jobId);
+        int rows = baseMapper.deleteById(jobId);
-        if (rows > 0)
+        if (rows > 0) {
-        {
             scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup));
         }
         return rows;
@@ -136,11 +130,9 @@ public class SysJobServiceImpl implements ISysJobService
      */
     @Override
     @Transactional
-    public void deleteJobByIds(Long[] jobIds) throws SchedulerException
+    public void deleteJobByIds(Long[] jobIds) throws SchedulerException {
-    {
+        for (Long jobId : jobIds) {
-        for (Long jobId : jobIds)
+            SysJob job = getById(jobId);
-        {
-            SysJob job = jobMapper.selectJobById(jobId);
             deleteJob(job);
         }
     }
@@ -152,16 +144,12 @@ public class SysJobServiceImpl implements ISysJobService
      */
     @Override
     @Transactional
-    public int changeStatus(SysJob job) throws SchedulerException
+    public int changeStatus(SysJob job) throws SchedulerException {
-    {
         int rows = 0;
         String status = job.getStatus();
-        if (ScheduleConstants.Status.NORMAL.getValue().equals(status))
+        if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) {
-        {
             rows = resumeJob(job);
-        }
+        } else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) {
-        else if (ScheduleConstants.Status.PAUSE.getValue().equals(status))
-        {
             rows = pauseJob(job);
         }
         return rows;
@@ -174,8 +162,7 @@ public class SysJobServiceImpl implements ISysJobService
      */
     @Override
     @Transactional
-    public void run(SysJob job) throws SchedulerException
+    public void run(SysJob job) throws SchedulerException {
-    {
         Long jobId = job.getJobId();
         String jobGroup = job.getJobGroup();
         SysJob properties = selectJobById(job.getJobId());
@@ -192,12 +179,10 @@ public class SysJobServiceImpl implements ISysJobService
      */
     @Override
     @Transactional
-    public int insertJob(SysJob job) throws SchedulerException, TaskException
+    public int insertJob(SysJob job) throws SchedulerException, TaskException {
-    {
         job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
-        int rows = jobMapper.insertJob(job);
+        int rows = baseMapper.insert(job);
-        if (rows > 0)
+        if (rows > 0) {
-        {
             ScheduleUtils.createScheduleJob(scheduler, job);
         }
         return rows;
@@ -210,12 +195,10 @@ public class SysJobServiceImpl implements ISysJobService
      */
     @Override
     @Transactional
-    public int updateJob(SysJob job) throws SchedulerException, TaskException
+    public int updateJob(SysJob job) throws SchedulerException, TaskException {
-    {
         SysJob properties = selectJobById(job.getJobId());
-        int rows = jobMapper.updateJob(job);
+        int rows = baseMapper.updateById(job);
-        if (rows > 0)
+        if (rows > 0) {
-        {
             updateSchedulerJob(job, properties.getJobGroup());
         }
         return rows;
@@ -224,16 +207,14 @@ public class SysJobServiceImpl implements ISysJobService
     /**
      * 更新任务
      *
-     * @param job 任务对象
+     * @param job      任务对象
      * @param jobGroup 任务组名
      */
-    public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException
+    public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException {
-    {
         Long jobId = job.getJobId();
         // 判断是否存在
         JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
-        if (scheduler.checkExists(jobKey))
+        if (scheduler.checkExists(jobKey)) {
-        {
             // 防止创建时存在数据问题 先移除，然后在执行创建操作
             scheduler.deleteJob(jobKey);
         }
@@ -247,8 +228,7 @@ public class SysJobServiceImpl implements ISysJobService
      * @return 结果
      */
     @Override
-    public boolean checkCronExpressionIsValid(String cronExpression)
+    public boolean checkCronExpressionIsValid(String cronExpression) {
-    {
         return CronUtils.isValid(cronExpression);
     }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/SysConfig.java

@@ -1,111 +1,103 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.io.Serializable;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Date;
-import com.ruoyi.common.annotation.Excel;
+import java.util.HashMap;
-import com.ruoyi.common.annotation.Excel.ColumnType;
+import java.util.Map;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 参数配置表 sys_config
  *
  * @author ruoyi
  */
-public class SysConfig extends BaseEntity
+
-{
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_config")
+public class SysConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 参数主键 */
+    /**
+     * 参数主键
+     */
     @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
+    @TableId(value = "config_id", type = IdType.AUTO)
     private Long configId;
 
-    /** 参数名称 */
+    /**
+     * 参数名称
+     */
     @Excel(name = "参数名称")
+    @NotBlank(message = "参数名称不能为空")
+    @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
     private String configName;
 
-    /** 参数键名 */
+    /**
+     * 参数键名
+     */
     @Excel(name = "参数键名")
+    @NotBlank(message = "参数键名长度不能为空")
+    @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
     private String configKey;
 
-    /** 参数键值 */
+    /**
+     * 参数键值
+     */
     @Excel(name = "参数键值")
+    @NotBlank(message = "参数键值不能为空")
+    @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
     private String configValue;
 
-    /** 系统内置（Y是 N否） */
+    /**
+     * 系统内置（Y是 N否）
+     */
     @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
     private String configType;
 
-    public Long getConfigId()
+    /**
-    {
+     * 创建者
-        return configId;
+     */
-    }
+    private String createBy;
 
-    public void setConfigId(Long configId)
+    /**
-    {
+     * 创建时间
-        this.configId = configId;
+     */
-    }
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
-    @NotBlank(message = "参数名称不能为空")
+    /**
-    @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
+     * 更新者
-    public String getConfigName()
+     */
-    {
+    private String updateBy;
-        return configName;
-    }
 
-    public void setConfigName(String configName)
+    /**
-    {
+     * 更新时间
-        this.configName = configName;
+     */
-    }
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
-    @NotBlank(message = "参数键名长度不能为空")
+    /**
-    @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
+     * 备注
-    public String getConfigKey()
+     */
-    {
+    private String remark;
-        return configKey;
-    }
 
-    public void setConfigKey(String configKey)
+    /**
-    {
+     * 请求参数
-        this.configKey = configKey;
+     */
-    }
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
 
-    @NotBlank(message = "参数键值不能为空")
-    @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
-    public String getConfigValue()
-    {
-        return configValue;
-    }
-
-    public void setConfigValue(String configValue)
-    {
-        this.configValue = configValue;
-    }
-
-    public String getConfigType()
-    {
-        return configType;
-    }
-
-    public void setConfigType(String configType)
-    {
-        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();
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/SysLogininfor.java

@@ -1,144 +1,94 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 系统访问记录表 sys_logininfor
  *
  * @author ruoyi
  */
-public class SysLogininfor extends BaseEntity
+
-{
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_logininfor")
+public class SysLogininfor implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** ID */
+    /**
+     * ID
+     */
     @Excel(name = "序号", cellType = ColumnType.NUMERIC)
+    @TableId(value = "info_id", type = IdType.AUTO)
     private Long infoId;
 
-    /** 用户账号 */
+    /**
+     * 用户账号
+     */
     @Excel(name = "用户账号")
     private String userName;
 
-    /** 登录状态 0成功 1失败 */
+    /**
+     * 登录状态 0成功 1失败
+     */
     @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
     private String status;
 
-    /** 登录IP地址 */
+    /**
+     * 登录IP地址
+     */
     @Excel(name = "登录地址")
     private String ipaddr;
 
-    /** 登录地点 */
+    /**
+     * 登录地点
+     */
     @Excel(name = "登录地点")
     private String loginLocation;
 
-    /** 浏览器类型 */
+    /**
+     * 浏览器类型
+     */
     @Excel(name = "浏览器")
     private String browser;
 
-    /** 操作系统 */
+    /**
+     * 操作系统
+     */
     @Excel(name = "操作系统")
     private String os;
 
-    /** 提示消息 */
+    /**
+     * 提示消息
+     */
     @Excel(name = "提示消息")
     private String msg;
 
-    /** 访问时间 */
+    /**
+     * 访问时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date loginTime;
 
-    public Long getInfoId()
+    /**
-    {
+     * 请求参数
-        return infoId;
+     */
-    }
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
 
-    public void setInfoId(Long infoId)
-    {
-        this.infoId = infoId;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getLoginLocation()
-    {
-        return loginLocation;
-    }
-
-    public void setLoginLocation(String loginLocation)
-    {
-        this.loginLocation = loginLocation;
-    }
-
-    public String getBrowser()
-    {
-        return browser;
-    }
-
-    public void setBrowser(String browser)
-    {
-        this.browser = browser;
-    }
-
-    public String getOs()
-    {
-        return os;
-    }
-
-    public void setOs(String os)
-    {
-        this.os = os;
-    }
-
-    public String getMsg()
-    {
-        return msg;
-    }
-
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
-
-    public Date getLoginTime()
-    {
-        return loginTime;
-    }
-
-    public void setLoginTime(Date loginTime)
-    {
-        this.loginTime = loginTime;
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -1,100 +1,91 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.io.Serializable;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Date;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 通知公告表 sys_notice
  *
  * @author ruoyi
  */
-public class SysNotice extends BaseEntity
+@Data
-{
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_notice")
+public class SysNotice implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 公告ID */
+    /**
+     * 公告ID
+     */
+    @TableId(value = "notice_id", type = IdType.AUTO)
     private Long noticeId;
 
-    /** 公告标题 */
+    /**
-    private String noticeTitle;
+     * 公告标题
-
+     */
-    /** 公告类型（1通知 2公告） */
-    private String noticeType;
-
-    /** 公告内容 */
-    private String noticeContent;
-
-    /** 公告状态（0正常 1关闭） */
-    private String status;
-
-    public Long getNoticeId()
-    {
-        return noticeId;
-    }
-
-    public void setNoticeId(Long noticeId)
-    {
-        this.noticeId = noticeId;
-    }
-
-    public void setNoticeTitle(String noticeTitle)
-    {
-        this.noticeTitle = noticeTitle;
-    }
-
     @NotBlank(message = "公告标题不能为空")
     @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
-    public String getNoticeTitle()
+    private String noticeTitle;
-    {
-        return noticeTitle;
-    }
 
-    public void setNoticeType(String noticeType)
+    /**
-    {
+     * 公告类型（1通知 2公告）
-        this.noticeType = noticeType;
+     */
-    }
+    private String noticeType;
 
-    public String getNoticeType()
+    /**
-    {
+     * 公告内容
-        return noticeType;
+     */
-    }
+    private String noticeContent;
 
-    public void setNoticeContent(String noticeContent)
+    /**
-    {
+     * 公告状态（0正常 1关闭）
-        this.noticeContent = noticeContent;
+     */
-    }
+    private String status;
 
-    public String getNoticeContent()
+    /**
-    {
+     * 创建者
-        return noticeContent;
+     */
-    }
+    private String createBy;
 
-    public void setStatus(String status)
+    /**
-    {
+     * 创建时间
-        this.status = status;
+     */
-    }
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
-    public String getStatus()
+    /**
-    {
+     * 更新者
-        return status;
+     */
-    }
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
-            .append("noticeTitle", getNoticeTitle())
-            .append("noticeType", getNoticeType())
-            .append("noticeContent", getNoticeContent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/SysOperLog.java

@@ -1,255 +1,142 @@
 package com.ruoyi.system.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 操作日志记录表 oper_log
  *
  * @author ruoyi
  */
-public class SysOperLog extends BaseEntity
+
-{
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_oper_log")
+public class SysOperLog implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 日志主键 */
+    /**
+     * 日志主键
+     */
     @Excel(name = "操作序号", cellType = ColumnType.NUMERIC)
+    @TableId(value = "oper_id", type = IdType.AUTO)
     private Long operId;
 
-    /** 操作模块 */
+    /**
+     * 操作模块
+     */
     @Excel(name = "操作模块")
     private String title;
 
-    /** 业务类型（0其它 1新增 2修改 3删除） */
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
     @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据")
     private Integer businessType;
 
-    /** 业务类型数组 */
+    /**
+     * 业务类型数组
+     */
+    @TableField(exist = false)
     private Integer[] businessTypes;
 
-    /** 请求方法 */
+    /**
+     * 请求方法
+     */
     @Excel(name = "请求方法")
     private String method;
 
-    /** 请求方式 */
+    /**
+     * 请求方式
+     */
     @Excel(name = "请求方式")
     private String requestMethod;
 
-    /** 操作类别（0其它 1后台用户 2手机端用户） */
+    /**
+     * 操作类别（0其它 1后台用户 2手机端用户）
+     */
     @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户")
     private Integer operatorType;
 
-    /** 操作人员 */
+    /**
+     * 操作人员
+     */
     @Excel(name = "操作人员")
     private String operName;
 
-    /** 部门名称 */
+    /**
+     * 部门名称
+     */
     @Excel(name = "部门名称")
     private String deptName;
 
-    /** 请求url */
+    /**
+     * 请求url
+     */
     @Excel(name = "请求地址")
     private String operUrl;
 
-    /** 操作地址 */
+    /**
+     * 操作地址
+     */
     @Excel(name = "操作地址")
     private String operIp;
 
-    /** 操作地点 */
+    /**
+     * 操作地点
+     */
     @Excel(name = "操作地点")
     private String operLocation;
 
-    /** 请求参数 */
+    /**
+     * 请求参数
+     */
     @Excel(name = "请求参数")
     private String operParam;
 
-    /** 返回参数 */
+    /**
+     * 返回参数
+     */
     @Excel(name = "返回参数")
     private String jsonResult;
 
-    /** 操作状态（0正常 1异常） */
+    /**
+     * 操作状态（0正常 1异常）
+     */
     @Excel(name = "状态", readConverterExp = "0=正常,1=异常")
     private Integer status;
 
-    /** 错误消息 */
+    /**
+     * 错误消息
+     */
     @Excel(name = "错误消息")
     private String errorMsg;
 
-    /** 操作时间 */
+    /**
+     * 操作时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;
 
-    public Long getOperId()
+    /**
-    {
+     * 请求参数
-        return operId;
+     */
-    }
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
 
-    public void setOperId(Long operId)
-    {
-        this.operId = operId;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-
-    public Integer getBusinessType()
-    {
-        return businessType;
-    }
-
-    public void setBusinessType(Integer businessType)
-    {
-        this.businessType = businessType;
-    }
-
-    public Integer[] getBusinessTypes()
-    {
-        return businessTypes;
-    }
-
-    public void setBusinessTypes(Integer[] businessTypes)
-    {
-        this.businessTypes = businessTypes;
-    }
-
-    public String getMethod()
-    {
-        return method;
-    }
-
-    public void setMethod(String method)
-    {
-        this.method = method;
-    }
-
-    public String getRequestMethod()
-    {
-        return requestMethod;
-    }
-
-    public void setRequestMethod(String requestMethod)
-    {
-        this.requestMethod = requestMethod;
-    }
-
-    public Integer getOperatorType()
-    {
-        return operatorType;
-    }
-
-    public void setOperatorType(Integer operatorType)
-    {
-        this.operatorType = operatorType;
-    }
-
-    public String getOperName()
-    {
-        return operName;
-    }
-
-    public void setOperName(String operName)
-    {
-        this.operName = operName;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getOperUrl()
-    {
-        return operUrl;
-    }
-
-    public void setOperUrl(String operUrl)
-    {
-        this.operUrl = operUrl;
-    }
-
-    public String getOperIp()
-    {
-        return operIp;
-    }
-
-    public void setOperIp(String operIp)
-    {
-        this.operIp = operIp;
-    }
-
-    public String getOperLocation()
-    {
-        return operLocation;
-    }
-
-    public void setOperLocation(String operLocation)
-    {
-        this.operLocation = operLocation;
-    }
-
-    public String getOperParam()
-    {
-        return operParam;
-    }
-
-    public void setOperParam(String operParam)
-    {
-        this.operParam = operParam;
-    }
-
-    public String getJsonResult()
-    {
-        return jsonResult;
-    }
-
-    public void setJsonResult(String jsonResult)
-    {
-        this.jsonResult = jsonResult;
-    }
-
-    public Integer getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(Integer status)
-    {
-        this.status = status;
-    }
-
-    public String getErrorMsg()
-    {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg)
-    {
-        this.errorMsg = errorMsg;
-    }
-
-    public Date getOperTime()
-    {
-        return operTime;
-    }
-
-    public void setOperTime(Date operTime)
-    {
-        this.operTime = operTime;
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/SysPost.java

@@ -1,123 +1,108 @@
 package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import java.io.Serializable;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Date;
-import com.ruoyi.common.annotation.Excel;
+import java.util.HashMap;
-import com.ruoyi.common.annotation.Excel.ColumnType;
+import java.util.Map;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 岗位表 sys_post
  *
  * @author ruoyi
  */
-public class SysPost extends BaseEntity
+
-{
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_post")
+public class SysPost implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 岗位序号 */
+    /**
+     * 岗位序号
+     */
     @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC)
+    @TableId(value = "post_id", type = IdType.AUTO)
     private Long postId;
 
-    /** 岗位编码 */
+    /**
+     * 岗位编码
+     */
     @Excel(name = "岗位编码")
+    @NotBlank(message = "岗位编码不能为空")
+    @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
     private String postCode;
 
-    /** 岗位名称 */
+    /**
+     * 岗位名称
+     */
     @Excel(name = "岗位名称")
+    @NotBlank(message = "岗位名称不能为空")
+    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
     private String postName;
 
-    /** 岗位排序 */
+    /**
+     * 岗位排序
+     */
     @Excel(name = "岗位排序")
+    @NotBlank(message = "显示顺序不能为空")
     private String postSort;
 
-    /** 状态（0正常 1停用） */
+    /**
+     * 状态（0正常 1停用）
+     */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
-    /** 用户是否存在此岗位标识 默认不存在 */
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    /**
+     * 用户是否存在此岗位标识 默认不存在
+     */
+    @TableField(exist = false)
     private boolean flag = false;
 
-    public Long getPostId()
-    {
-        return postId;
-    }
-
-    public void setPostId(Long postId)
-    {
-        this.postId = postId;
-    }
-
-    @NotBlank(message = "岗位编码不能为空")
-    @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
-    public String getPostCode()
-    {
-        return postCode;
-    }
-
-    public void setPostCode(String postCode)
-    {
-        this.postCode = postCode;
-    }
-
-    @NotBlank(message = "岗位名称不能为空")
-    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
-    public String getPostName()
-    {
-        return postName;
-    }
-
-    public void setPostName(String postName)
-    {
-        this.postName = postName;
-    }
-
-    @NotBlank(message = "显示顺序不能为空")
-    public String getPostSort()
-    {
-        return postSort;
-    }
-
-    public void setPostSort(String postSort)
-    {
-        this.postSort = postSort;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public boolean isFlag()
-    {
-        return flag;
-    }
-
-    public void setFlag(boolean flag)
-    {
-        this.flag = flag;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("postId", getPostId())
-            .append("postCode", getPostCode())
-            .append("postName", getPostName())
-            .append("postSort", getPostSort())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/SysRoleDept.java

@@ -1,46 +1,29 @@
 package com.ruoyi.system.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 /**
  * 角色和部门关联 sys_role_dept
  *
  * @author ruoyi
  */
-public class SysRoleDept
+
-{
+@Data
-    /** 角色ID */
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_role_dept")
+public class SysRoleDept {
+    /**
+     * 角色ID
+     */
     private Long roleId;
 
-    /** 部门ID */
+    /**
+     * 部门ID
+     */
     private Long deptId;
 
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("deptId", getDeptId())
-            .toString();
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java

@@ -1,46 +1,29 @@
 package com.ruoyi.system.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 /**
  * 角色和菜单关联 sys_role_menu
  *
  * @author ruoyi
  */
-public class SysRoleMenu
+
-{
+@Data
-    /** 角色ID */
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_role_menu")
+public class SysRoleMenu {
+    /**
+     * 角色ID
+     */
     private Long roleId;
 
-    /** 菜单ID */
+    /**
+     * 菜单ID
+     */
     private Long menuId;
 
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    public Long getMenuId()
-    {
-        return menuId;
-    }
-
-    public void setMenuId(Long menuId)
-    {
-        this.menuId = menuId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("menuId", getMenuId())
-            .toString();
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/SysUserOnline.java

@@ -1,113 +1,56 @@
 package com.ruoyi.system.domain;
 
+import lombok.*;
+import lombok.experimental.Accessors;
+
 /**
  * 当前在线会话
  *
  * @author ruoyi
  */
-public class SysUserOnline
+
-{
+@Data
-    /** 会话编号 */
+@NoArgsConstructor
+@Accessors(chain = true)
+public class SysUserOnline {
+    /**
+     * 会话编号
+     */
     private String tokenId;
 
-    /** 部门名称 */
+    /**
+     * 部门名称
+     */
     private String deptName;
 
-    /** 用户名称 */
+    /**
+     * 用户名称
+     */
     private String userName;
 
-    /** 登录IP地址 */
+    /**
+     * 登录IP地址
+     */
     private String ipaddr;
 
-    /** 登录地址 */
+    /**
+     * 登录地址
+     */
     private String loginLocation;
 
-    /** 浏览器类型 */
+    /**
+     * 浏览器类型
+     */
     private String browser;
 
-    /** 操作系统 */
+    /**
+     * 操作系统
+     */
     private String os;
 
-    /** 登录时间 */
+    /**
+     * 登录时间
+     */
     private Long loginTime;
 
-    public String getTokenId()
-    {
-        return tokenId;
-    }
-
-    public void setTokenId(String tokenId)
-    {
-        this.tokenId = tokenId;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getLoginLocation()
-    {
-        return loginLocation;
-    }
-
-    public void setLoginLocation(String loginLocation)
-    {
-        this.loginLocation = loginLocation;
-    }
-
-    public String getBrowser()
-    {
-        return browser;
-    }
-
-    public void setBrowser(String browser)
-    {
-        this.browser = browser;
-    }
-
-    public String getOs()
-    {
-        return os;
-    }
-
-    public void setOs(String os)
-    {
-        this.os = os;
-    }
-
-    public Long getLoginTime()
-    {
-        return loginTime;
-    }
-
-    public void setLoginTime(Long loginTime)
-    {
-        this.loginTime = loginTime;
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/SysUserPost.java

@@ -1,46 +1,29 @@
 package com.ruoyi.system.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 /**
  * 用户和岗位关联 sys_user_post
  *
  * @author ruoyi
  */
-public class SysUserPost
+
-{
+@Data
-    /** 用户ID */
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_config")
+public class SysUserPost {
+    /**
+     * 用户ID
+     */
     private Long userId;
 
-    /** 岗位ID */
+    /**
+     * 岗位ID
+     */
     private Long postId;
 
-    public Long getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public Long getPostId()
-    {
-        return postId;
-    }
-
-    public void setPostId(Long postId)
-    {
-        this.postId = postId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("postId", getPostId())
-            .toString();
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/SysUserRole.java

@@ -1,46 +1,29 @@
 package com.ruoyi.system.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
+import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 /**
  * 用户和角色关联 sys_user_role
  *
  * @author ruoyi
  */
-public class SysUserRole
+
-{
+@Data
-    /** 用户ID */
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_config")
+public class SysUserRole {
+    /**
+     * 用户ID
+     */
     private Long userId;
 
-    /** 角色ID */
+    /**
+     * 角色ID
+     */
     private Long roleId;
 
-    public Long getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("roleId", getRoleId())
-            .toString();
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java

@@ -1,12 +1,18 @@
 package com.ruoyi.system.domain.vo;
 
+import lombok.*;
+import lombok.experimental.Accessors;
+
 /**
  * 路由显示信息
  *
  * @author ruoyi
  */
-public class MetaVo
+
-{
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class MetaVo {
     /**
      * 设置该路由在侧边栏和面包屑中展示的名字
      */
@@ -22,50 +28,15 @@ public class MetaVo
      */
     private boolean noCache;
 
-    public MetaVo()
+    public MetaVo(String title, String icon) {
-    {
-    }
-
-    public MetaVo(String title, String icon)
-    {
         this.title = title;
         this.icon = icon;
     }
 
-    public MetaVo(String title, String icon, boolean noCache)
+    public MetaVo(String title, String icon, boolean noCache) {
-    {
         this.title = title;
         this.icon = icon;
         this.noCache = noCache;
     }
 
-    public boolean isNoCache()
-    {
-        return noCache;
-    }
-
-    public void setNoCache(boolean noCache)
-    {
-        this.noCache = noCache;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-
-    public String getIcon()
-    {
-        return icon;
-    }
-
-    public void setIcon(String icon)
-    {
-        this.icon = icon;
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.*;
+import lombok.experimental.Accessors;
+
 import java.util.List;
 
 /**
@@ -8,9 +11,11 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo
+public class RouterVo {
-{
     /**
      * 路由名字
      */
@@ -51,83 +56,4 @@ public class RouterVo
      */
     private List<RouterVo> children;
 
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getPath()
-    {
-        return path;
-    }
-
-    public void setPath(String path)
-    {
-        this.path = path;
-    }
-
-    public boolean getHidden()
-    {
-        return hidden;
-    }
-
-    public void setHidden(boolean hidden)
-    {
-        this.hidden = hidden;
-    }
-
-    public String getRedirect()
-    {
-        return redirect;
-    }
-
-    public void setRedirect(String redirect)
-    {
-        this.redirect = redirect;
-    }
-
-    public String getComponent()
-    {
-        return component;
-    }
-
-    public void setComponent(String component)
-    {
-        this.component = component;
-    }
-
-    public Boolean getAlwaysShow()
-    {
-        return alwaysShow;
-    }
-
-    public void setAlwaysShow(Boolean alwaysShow)
-    {
-        this.alwaysShow = alwaysShow;
-    }
-
-    public MetaVo getMeta()
-    {
-        return meta;
-    }
-
-    public void setMeta(MetaVo meta)
-    {
-        this.meta = meta;
-    }
-
-    public List<RouterVo> getChildren()
-    {
-        return children;
-    }
-
-    public void setChildren(List<RouterVo> children)
-    {
-        this.children = children;
-    }
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.SysConfig;
 
 /**
@@ -8,61 +8,6 @@ import com.ruoyi.system.domain.SysConfig;
  *
  * @author ruoyi
  */
-public interface SysConfigMapper
+public interface SysConfigMapper extends BaseMapper<SysConfig> {
-{
-    /**
-     * 查询参数配置信息
-     * 
-     * @param config 参数配置信息
-     * @return 参数配置信息
-     */
-    public SysConfig selectConfig(SysConfig config);
 
-    /**
-     * 查询参数配置列表
-     * 
-     * @param config 参数配置信息
-     * @return 参数配置集合
-     */
-    public List<SysConfig> selectConfigList(SysConfig config);
-
-    /**
-     * 根据键名查询参数配置信息
-     * 
-     * @param configKey 参数键名
-     * @return 参数配置信息
-     */
-    public SysConfig checkConfigKeyUnique(String configKey);
-
-    /**
-     * 新增参数配置
-     * 
-     * @param config 参数配置信息
-     * @return 结果
-     */
-    public int insertConfig(SysConfig config);
-
-    /**
-     * 修改参数配置
-     * 
-     * @param config 参数配置信息
-     * @return 结果
-     */
-    public int updateConfig(SysConfig config);
-
-    /**
-     * 删除参数配置
-     * 
-     * @param configId 参数ID
-     * @return 结果
-     */
-    public int deleteConfigById(Long configId);
-
-    /**
-     * 批量删除参数信息
-     * 
-     * @param configIds 需要删除的参数ID
-     * @return 结果
-     */
-    public int deleteConfigByIds(Long[] configIds);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -1,118 +1,25 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 部门管理 数据层
  *
  * @author ruoyi
  */
-public interface SysDeptMapper
+public interface SysDeptMapper extends BaseMapper<SysDept> {
-{
-    /**
-     * 查询部门管理数据
-     * 
-     * @param dept 部门信息
-     * @return 部门信息集合
-     */
-    public List<SysDept> selectDeptList(SysDept dept);
 
     /**
      * 根据角色ID查询部门树信息
      *
-     * @param roleId 角色ID
+     * @param roleId            角色ID
      * @param deptCheckStrictly 部门树选择项是否关联显示
      * @return 选中部门列表
      */
     public List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
-    /**
-     * 根据部门ID查询信息
-     * 
-     * @param deptId 部门ID
-     * @return 部门信息
-     */
-    public SysDept selectDeptById(Long deptId);
-
-    /**
-     * 根据ID查询所有子部门
-     * 
-     * @param deptId 部门ID
-     * @return 部门列表
-     */
-    public List<SysDept> selectChildrenDeptById(Long deptId);
-
-    /**
-     * 根据ID查询所有子部门（正常状态）
-     * 
-     * @param deptId 部门ID
-     * @return 子部门数
-     */
-    public int selectNormalChildrenDeptById(Long deptId);
-
-    /**
-     * 是否存在子节点
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    public int hasChildByDeptId(Long deptId);
-
-    /**
-     * 查询部门是否存在用户
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    public int checkDeptExistUser(Long deptId);
-
-    /**
-     * 校验部门名称是否唯一
-     * 
-     * @param deptName 部门名称
-     * @param parentId 父部门ID
-     * @return 结果
-     */
-    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
-
-    /**
-     * 新增部门信息
-     * 
-     * @param dept 部门信息
-     * @return 结果
-     */
-    public int insertDept(SysDept dept);
-
-    /**
-     * 修改部门信息
-     * 
-     * @param dept 部门信息
-     * @return 结果
-     */
-    public int updateDept(SysDept dept);
-
-    /**
-     * 修改所在部门的父级部门状态
-     * 
-     * @param dept 部门
-     */
-    public void updateDeptStatus(SysDept dept);
-
-    /**
-     * 修改子元素关系
-     * 
-     * @param depts 子元素
-     * @return 结果
-     */
-    public int updateDeptChildren(@Param("depts") List<SysDept> depts);
-
-    /**
-     * 删除部门管理信息
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    public int deleteDeptById(Long deptId);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 
 /**
@@ -9,87 +8,6 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
  *
  * @author ruoyi
  */
-public interface SysDictDataMapper
+public interface SysDictDataMapper extends BaseMapper<SysDictData> {
-{
-    /**
-     * 根据条件分页查询字典数据
-     * 
-     * @param dictData 字典数据信息
-     * @return 字典数据集合信息
-     */
-    public List<SysDictData> selectDictDataList(SysDictData dictData);
 
-    /**
-     * 根据字典类型查询字典数据
-     * 
-     * @param dictType 字典类型
-     * @return 字典数据集合信息
-     */
-    public List<SysDictData> selectDictDataByType(String dictType);
-
-    /**
-     * 根据字典类型和字典键值查询字典数据信息
-     * 
-     * @param dictType 字典类型
-     * @param dictValue 字典键值
-     * @return 字典标签
-     */
-    public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
-
-    /**
-     * 根据字典数据ID查询信息
-     * 
-     * @param dictCode 字典数据ID
-     * @return 字典数据
-     */
-    public SysDictData selectDictDataById(Long dictCode);
-
-    /**
-     * 查询字典数据
-     * 
-     * @param dictType 字典类型
-     * @return 字典数据
-     */
-    public int countDictDataByType(String dictType);
-
-    /**
-     * 通过字典ID删除字典数据信息
-     * 
-     * @param dictCode 字典数据ID
-     * @return 结果
-     */
-    public int deleteDictDataById(Long dictCode);
-
-    /**
-     * 批量删除字典数据信息
-     * 
-     * @param dictCodes 需要删除的字典数据ID
-     * @return 结果
-     */
-    public int deleteDictDataByIds(Long[] dictCodes);
-
-    /**
-     * 新增字典数据信息
-     * 
-     * @param dictData 字典数据信息
-     * @return 结果
-     */
-    public int insertDictData(SysDictData dictData);
-
-    /**
-     * 修改字典数据信息
-     * 
-     * @param dictData 字典数据信息
-     * @return 结果
-     */
-    public int updateDictData(SysDictData dictData);
-
-    /**
-     * 同步修改字典类型
-     * 
-     * @param oldDictType 旧字典类型
-     * @param newDictType 新旧字典类型
-     * @return 结果
-     */
-    public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
 import com.ruoyi.common.core.domain.entity.SysDictType;
 
 /**
@@ -9,77 +8,6 @@ import com.ruoyi.common.core.domain.entity.SysDictType;
  *
  * @author ruoyi
  */
-@Mapper
+public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
-public interface SysDictTypeMapper
-{
-    /**
-     * 根据条件分页查询字典类型
-     * 
-     * @param dictType 字典类型信息
-     * @return 字典类型集合信息
-     */
-    public List<SysDictType> selectDictTypeList(SysDictType dictType);
 
-    /**
-     * 根据所有字典类型
-     * 
-     * @return 字典类型集合信息
-     */
-    public List<SysDictType> selectDictTypeAll();
-
-    /**
-     * 根据字典类型ID查询信息
-     * 
-     * @param dictId 字典类型ID
-     * @return 字典类型
-     */
-    public SysDictType selectDictTypeById(Long dictId);
-
-    /**
-     * 根据字典类型查询信息
-     * 
-     * @param dictType 字典类型
-     * @return 字典类型
-     */
-    public SysDictType selectDictTypeByType(String dictType);
-
-    /**
-     * 通过字典ID删除字典信息
-     * 
-     * @param dictId 字典ID
-     * @return 结果
-     */
-    public int deleteDictTypeById(Long dictId);
-
-    /**
-     * 批量删除字典类型信息
-     * 
-     * @param dictIds 需要删除的字典ID
-     * @return 结果
-     */
-    public int deleteDictTypeByIds(Long[] dictIds);
-
-    /**
-     * 新增字典类型信息
-     * 
-     * @param dictType 字典类型信息
-     * @return 结果
-     */
-    public int insertDictType(SysDictType dictType);
-
-    /**
-     * 修改字典类型信息
-     * 
-     * @param dictType 字典类型信息
-     * @return 结果
-     */
-    public int updateDictType(SysDictType dictType);
-
-    /**
-     * 校验字典类型称是否唯一
-     * 
-     * @param dictType 字典类型
-     * @return 结果
-     */
-    public SysDictType checkDictTypeUnique(String dictType);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.SysLogininfor;
 
 /**
@@ -8,35 +8,6 @@ import com.ruoyi.system.domain.SysLogininfor;
  *
  * @author ruoyi
  */
-public interface SysLogininforMapper
+public interface SysLogininforMapper extends BaseMapper<SysLogininfor> {
-{
-    /**
-     * 新增系统登录日志
-     * 
-     * @param logininfor 访问日志对象
-     */
-    public void insertLogininfor(SysLogininfor logininfor);
 
-    /**
-     * 查询系统登录日志集合
-     * 
-     * @param logininfor 访问日志对象
-     * @return 登录记录集合
-     */
-    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
-
-    /**
-     * 批量删除系统登录日志
-     * 
-     * @param infoIds 需要删除的登录日志ID
-     * @return 结果
-     */
-    public int deleteLogininforByIds(Long[] infoIds);
-
-    /**
-     * 清空系统登录日志
-     * 
-     * @return 结果
-     */
-    public int cleanLogininfor();
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -1,23 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysMenu;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 菜单表 数据层
  *
  * @author ruoyi
  */
-public interface SysMenuMapper
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
-{
-    /**
-     * 查询系统菜单列表
-     *
-     * @param menu 菜单信息
-     * @return 菜单列表
-     */
-    public List<SysMenu> selectMenuList(SysMenu menu);
 
     /**
      * 根据用户所有权限
@@ -60,58 +54,10 @@ public interface SysMenuMapper
     /**
      * 根据角色ID查询菜单树信息
      *
-     * @param roleId 角色ID
+     * @param roleId            角色ID
      * @param menuCheckStrictly 菜单树选择项是否关联显示
      * @return 选中菜单列表
      */
     public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
 
-    /**
-     * 根据菜单ID查询信息
-     *
-     * @param menuId 菜单ID
-     * @return 菜单信息
-     */
-    public SysMenu selectMenuById(Long menuId);
-
-    /**
-     * 是否存在菜单子节点
-     *
-     * @param menuId 菜单ID
-     * @return 结果
-     */
-    public int hasChildByMenuId(Long menuId);
-
-    /**
-     * 新增菜单信息
-     *
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public int insertMenu(SysMenu menu);
-
-    /**
-     * 修改菜单信息
-     *
-     * @param menu 菜单信息
-     * @return 结果
-     */
-    public int updateMenu(SysMenu menu);
-
-    /**
-     * 删除菜单管理信息
-     *
-     * @param menuId 菜单ID
-     * @return 结果
-     */
-    public int deleteMenuById(Long menuId);
-
-    /**
-     * 校验菜单名称是否唯一
-     *
-     * @param menuName 菜单名称
-     * @param parentId 父菜单ID
-     * @return 结果
-     */
-    public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.SysNotice;
 
 /**
@@ -8,53 +8,6 @@ import com.ruoyi.system.domain.SysNotice;
  *
  * @author ruoyi
  */
-public interface SysNoticeMapper
+public interface SysNoticeMapper extends BaseMapper<SysNotice> {
-{
-    /**
-     * 查询公告信息
-     * 
-     * @param noticeId 公告ID
-     * @return 公告信息
-     */
-    public SysNotice selectNoticeById(Long noticeId);
 
-    /**
-     * 查询公告列表
-     * 
-     * @param notice 公告信息
-     * @return 公告集合
-     */
-    public List<SysNotice> selectNoticeList(SysNotice notice);
-
-    /**
-     * 新增公告
-     * 
-     * @param notice 公告信息
-     * @return 结果
-     */
-    public int insertNotice(SysNotice notice);
-
-    /**
-     * 修改公告
-     * 
-     * @param notice 公告信息
-     * @return 结果
-     */
-    public int updateNotice(SysNotice notice);
-
-    /**
-     * 批量删除公告
-     * 
-     * @param noticeId 公告ID
-     * @return 结果
-     */
-    public int deleteNoticeById(Long noticeId);
-
-    /**
-     * 批量删除公告信息
-     * 
-     * @param noticeIds 需要删除的公告ID
-     * @return 结果
-     */
-    public int deleteNoticeByIds(Long[] noticeIds);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.SysOperLog;
 
 /**
@@ -8,41 +8,6 @@ import com.ruoyi.system.domain.SysOperLog;
  *
  * @author ruoyi
  */
-public interface SysOperLogMapper
+public interface SysOperLogMapper extends BaseMapper<SysOperLog> {
-{
-    /**
-     * 新增操作日志
-     * 
-     * @param operLog 操作日志对象
-     */
-    public void insertOperlog(SysOperLog operLog);
 
-    /**
-     * 查询系统操作日志集合
-     * 
-     * @param operLog 操作日志对象
-     * @return 操作日志集合
-     */
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog);
-
-    /**
-     * 批量删除系统操作日志
-     * 
-     * @param operIds 需要删除的操作日志ID
-     * @return 结果
-     */
-    public int deleteOperLogByIds(Long[] operIds);
-
-    /**
-     * 查询操作日志详细
-     * 
-     * @param operId 操作ID
-     * @return 操作日志对象
-     */
-    public SysOperLog selectOperLogById(Long operId);
-
-    /**
-     * 清空操作日志
-     */
-    public void cleanOperLog();
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java

@@ -1,37 +1,16 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.SysPost;
 
+import java.util.List;
+
 /**
  * 岗位信息 数据层
  *
  * @author ruoyi
  */
-public interface SysPostMapper
+public interface SysPostMapper extends BaseMapper<SysPost> {
-{
-    /**
-     * 查询岗位数据集合
-     * 
-     * @param post 岗位信息
-     * @return 岗位数据集合
-     */
-    public List<SysPost> selectPostList(SysPost post);
-
-    /**
-     * 查询所有岗位
-     * 
-     * @return 岗位列表
-     */
-    public List<SysPost> selectPostAll();
-
-    /**
-     * 通过岗位ID查询岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 角色对象信息
-     */
-    public SysPost selectPostById(Long postId);
 
     /**
      * 根据用户ID获取岗位选择框列表
@@ -49,51 +28,4 @@ public interface SysPostMapper
      */
     public List<SysPost> selectPostsByUserName(String userName);
 
-    /**
-     * 删除岗位信息
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    public int deletePostById(Long postId);
-
-    /**
-     * 批量删除岗位信息
-     * 
-     * @param postIds 需要删除的岗位ID
-     * @return 结果
-     */
-    public int deletePostByIds(Long[] postIds);
-
-    /**
-     * 修改岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public int updatePost(SysPost post);
-
-    /**
-     * 新增岗位信息
-     * 
-     * @param post 岗位信息
-     * @return 结果
-     */
-    public int insertPost(SysPost post);
-
-    /**
-     * 校验岗位名称
-     * 
-     * @param postName 岗位名称
-     * @return 结果
-     */
-    public SysPost checkPostNameUnique(String postName);
-
-    /**
-     * 校验岗位编码
-     * 
-     * @param postCode 岗位编码
-     * @return 结果
-     */
-    public SysPost checkPostCodeUnique(String postCode);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.SysRoleDept;
 
 /**
@@ -8,37 +8,6 @@ import com.ruoyi.system.domain.SysRoleDept;
  *
  * @author ruoyi
  */
-public interface SysRoleDeptMapper
+public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
-{
-    /**
-     * 通过角色ID删除角色和部门关联
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public int deleteRoleDeptByRoleId(Long roleId);
 
-    /**
-     * 批量删除角色部门关联信息
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteRoleDept(Long[] ids);
-
-    /**
-     * 查询部门使用数量
-     * 
-     * @param deptId 部门ID
-     * @return 结果
-     */
-    public int selectCountRoleDeptByDeptId(Long deptId);
-
-    /**
-     * 批量新增角色部门信息
-     * 
-     * @param roleDeptList 角色部门列表
-     * @return 结果
-     */
-    public int batchRoleDept(List<SysRoleDept> roleDeptList);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

@@ -1,22 +1,17 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.common.core.domain.entity.SysRole;
 
+import java.util.List;
+
 /**
  * 角色表 数据层
  *
  * @author ruoyi
  */
-public interface SysRoleMapper
+public interface SysRoleMapper extends BaseMapper<SysRole> {
-{
+
-    /**
-     * 根据条件分页查询角色数据
-     * 
-     * @param role 角色信息
-     * @return 角色数据集合信息
-     */
-    public List<SysRole> selectRoleList(SysRole role);
 
     /**
      * 根据用户ID查询角色
@@ -26,12 +21,6 @@ public interface SysRoleMapper
      */
     public List<SysRole> selectRolePermissionByUserId(Long userId);
 
-    /**
-     * 查询所有角色
-     * 
-     * @return 角色列表
-     */
-    public List<SysRole> selectRoleAll();
 
     /**
      * 根据用户ID获取角色选择框列表
@@ -41,14 +30,6 @@ public interface SysRoleMapper
      */
     public List<Integer> selectRoleListByUserId(Long userId);
 
-    /**
-     * 通过角色ID查询角色
-     * 
-     * @param roleId 角色ID
-     * @return 角色对象信息
-     */
-    public SysRole selectRoleById(Long roleId);
-
     /**
      * 根据用户ID查询角色
      *
@@ -57,51 +38,4 @@ public interface SysRoleMapper
      */
     public List<SysRole> selectRolesByUserName(String userName);
 
-    /**
-     * 校验角色名称是否唯一
-     * 
-     * @param roleName 角色名称
-     * @return 角色信息
-     */
-    public SysRole checkRoleNameUnique(String roleName);
-
-    /**
-     * 校验角色权限是否唯一
-     * 
-     * @param roleKey 角色权限
-     * @return 角色信息
-     */
-    public SysRole checkRoleKeyUnique(String roleKey);
-
-    /**
-     * 修改角色信息
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    public int updateRole(SysRole role);
-
-    /**
-     * 新增角色信息
-     * 
-     * @param role 角色信息
-     * @return 结果
-     */
-    public int insertRole(SysRole role);
-
-    /**
-     * 通过角色ID删除角色
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public int deleteRoleById(Long roleId);
-
-    /**
-     * 批量删除角色信息
-     * 
-     * @param roleIds 需要删除的角色ID
-     * @return 结果
-     */
-    public int deleteRoleByIds(Long[] roleIds);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.SysRoleMenu;
 
 /**
@@ -8,37 +8,6 @@ import com.ruoyi.system.domain.SysRoleMenu;
  *
  * @author ruoyi
  */
-public interface SysRoleMenuMapper
+public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
-{
-    /**
-     * 查询菜单使用数量
-     * 
-     * @param menuId 菜单ID
-     * @return 结果
-     */
-    public int checkMenuExistRole(Long menuId);
 
-    /**
-     * 通过角色ID删除角色和菜单关联
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public int deleteRoleMenuByRoleId(Long roleId);
-
-    /**
-     * 批量删除角色菜单关联信息
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteRoleMenu(Long[] ids);
-
-    /**
-     * 批量新增角色菜单信息
-     * 
-     * @param roleMenuList 角色菜单列表
-     * @return 结果
-     */
-    public int batchRoleMenu(List<SysRoleMenu> roleMenuList);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -1,16 +1,16 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
+import java.util.List;
+
 /**
  * 用户表 数据层
  *
  * @author ruoyi
  */
-public interface SysUserMapper
+public interface SysUserMapper extends BaseMapper<SysUser> {
-{
     /**
      * 根据条件分页查询用户列表
      *
@@ -35,77 +35,4 @@ public interface SysUserMapper
      */
     public SysUser selectUserById(Long userId);
 
-    /**
-     * 新增用户信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public int insertUser(SysUser user);
-
-    /**
-     * 修改用户信息
-     * 
-     * @param user 用户信息
-     * @return 结果
-     */
-    public int updateUser(SysUser user);
-
-    /**
-     * 修改用户头像
-     * 
-     * @param userName 用户名
-     * @param avatar 头像地址
-     * @return 结果
-     */
-    public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
-
-    /**
-     * 重置用户密码
-     * 
-     * @param userName 用户名
-     * @param password 密码
-     * @return 结果
-     */
-    public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
-
-    /**
-     * 通过用户ID删除用户
-     * 
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public int deleteUserById(Long userId);
-
-    /**
-     * 批量删除用户信息
-     * 
-     * @param userIds 需要删除的用户ID
-     * @return 结果
-     */
-    public int deleteUserByIds(Long[] userIds);
-
-    /**
-     * 校验用户名称是否唯一
-     * 
-     * @param userName 用户名称
-     * @return 结果
-     */
-    public int checkUserNameUnique(String userName);
-
-    /**
-     * 校验手机号码是否唯一
-     *
-     * @param phonenumber 手机号码
-     * @return 结果
-     */
-    public SysUser checkPhoneUnique(String phonenumber);
-
-    /**
-     * 校验email是否唯一
-     *
-     * @param email 用户邮箱
-     * @return 结果
-     */
-    public SysUser checkEmailUnique(String email);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

@@ -1,6 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.domain.SysUserPost;
 
 /**
@@ -8,37 +8,6 @@ import com.ruoyi.system.domain.SysUserPost;
  *
  * @author ruoyi
  */
-public interface SysUserPostMapper
+public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
-{
-    /**
-     * 通过用户ID删除用户和岗位关联
-     * 
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public int deleteUserPostByUserId(Long userId);
 
-    /**
-     * 通过岗位ID查询岗位使用数量
-     * 
-     * @param postId 岗位ID
-     * @return 结果
-     */
-    public int countUserPostById(Long postId);
-
-    /**
-     * 批量删除用户和岗位关联
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteUserPost(Long[] ids);
-
-    /**
-     * 批量新增用户岗位信息
-     * 
-     * @param userPostList 用户角色列表
-     * @return 结果
-     */
-    public int batchUserPost(List<SysUserPost> userPostList);
 }

ruoyi/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
 import com.ruoyi.system.domain.SysUserRole;
 
 /**
@@ -9,54 +8,6 @@ import com.ruoyi.system.domain.SysUserRole;
  *
  * @author ruoyi
  */
-public interface SysUserRoleMapper
+public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
-{
-    /**
-     * 通过用户ID删除用户和角色关联
-     * 
-     * @param userId 用户ID
-     * @return 结果
-     */
-    public int deleteUserRoleByUserId(Long userId);
 
-    /**
-     * 批量删除用户和角色关联
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteUserRole(Long[] ids);
-
-    /**
-     * 通过角色ID查询角色使用数量
-     * 
-     * @param roleId 角色ID
-     * @return 结果
-     */
-    public int countUserRoleByRoleId(Long roleId);
-
-    /**
-     * 批量新增用户角色信息
-     * 
-     * @param userRoleList 用户角色列表
-     * @return 结果
-     */
-    public int batchUserRole(List<SysUserRole> userRoleList);
-
-    /**
-     * 删除用户和角色关联信息
-     * 
-     * @param userRole 用户和角色关联信息
-     * @return 结果
-     */
-    public int deleteUserRoleInfo(SysUserRole userRole);
-
-    /**
-     * 批量取消授权用户角色
-     * 
-     * @param roleId 角色ID
-     * @param userIds 需要删除的用户数据ID
-     * @return 结果
-     */
-    public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
 }

ruoyi/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -1,15 +1,16 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.SysConfig;
 
+import java.util.List;
+
 /**
  * 参数配置 服务层
  *
  * @author ruoyi
  */
-public interface ISysConfigService
+public interface ISysConfigService extends IService<SysConfig> {
-{
     /**
      * 查询参数配置信息
      *

ruoyi/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -1,16 +1,17 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
 
+import java.util.List;
+
 /**
  * 部门管理 服务层
  *
  * @author ruoyi
  */
-public interface ISysDeptService
+public interface ISysDeptService extends IService<SysDept> {
-{
     /**
      * 查询部门管理数据
      *

ruoyi/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

@@ -1,15 +1,16 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 
+import java.util.List;
+
 /**
  * 字典 业务层
  *
  * @author ruoyi
  */
-public interface ISysDictDataService
+public interface ISysDictDataService extends IService<SysDictData> {
-{
     /**
      * 根据条件分页查询字典数据
      *
@@ -21,7 +22,7 @@ public interface ISysDictDataService
     /**
      * 根据字典类型和字典键值查询字典数据信息
      *
-     * @param dictType 字典类型
+     * @param dictType  字典类型
      * @param dictValue 字典键值
      * @return 字典标签
      */

ruoyi/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java

@@ -1,16 +1,17 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysDictType;
 
+import java.util.List;
+
 /**
  * 字典 业务层
  *
  * @author ruoyi
  */
-public interface ISysDictTypeService
+public interface ISysDictTypeService extends IService<SysDictType> {
-{
     /**
      * 根据条件分页查询字典类型
      *

ruoyi/src/main/java/com/ruoyi/system/service/ISysLogininforService.java

@@ -1,15 +1,16 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.SysLogininfor;
 
+import java.util.List;
+
 /**
  * 系统访问日志情况信息 服务层
  *
  * @author ruoyi
  */
-public interface ISysLogininforService
+public interface ISysLogininforService extends IService<SysLogininfor> {
-{
     /**
      * 新增系统登录日志
      *

ruoyi/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -1,18 +1,19 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.Set;
 import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.system.domain.vo.RouterVo;
 
+import java.util.List;
+import java.util.Set;
+
 /**
  * 菜单 业务层
  *
  * @author ruoyi
  */
-public interface ISysMenuService
+public interface ISysMenuService extends IService<SysMenu> {
-{
     /**
      * 根据用户查询系统菜单列表
      *
@@ -24,7 +25,7 @@ public interface ISysMenuService
     /**
      * 根据用户查询系统菜单列表
      *
-     * @param menu 菜单信息
+     * @param menu   菜单信息
      * @param userId 用户ID
      * @return 菜单列表
      */

ruoyi/src/main/java/com/ruoyi/system/service/ISysNoticeService.java

@@ -1,15 +1,16 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.SysNotice;
 
+import java.util.List;
+
 /**
  * 公告 服务层
  *
  * @author ruoyi
  */
-public interface ISysNoticeService
+public interface ISysNoticeService extends IService<SysNotice> {
-{
     /**
      * 查询公告信息
      *

ruoyi/src/main/java/com/ruoyi/system/service/ISysOperLogService.java

@@ -1,15 +1,16 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.SysOperLog;
 
+import java.util.List;
+
 /**
  * 操作日志 服务层
  *
  * @author ruoyi
  */
-public interface ISysOperLogService
+public interface ISysOperLogService extends IService<SysOperLog> {
-{
     /**
      * 新增操作日志
      *

ruoyi/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -1,15 +1,16 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.system.domain.SysPost;
 
+import java.util.List;
+
 /**
  * 岗位信息 服务层
  *
  * @author ruoyi
  */
-public interface ISysPostService
+public interface ISysPostService extends IService<SysPost> {
-{
     /**
      * 查询岗位信息集合
      *

ruoyi/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -1,16 +1,17 @@
 package com.ruoyi.system.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.entity.SysRole;
+
 import java.util.List;
 import java.util.Set;
-import com.ruoyi.common.core.domain.entity.SysRole;
 
 /**
  * 角色业务层
  *
  * @author ruoyi
  */
-public interface ISysRoleService
+public interface ISysRoleService extends IService<SysRole> {
-{
     /**
      * 根据条件分页查询角色数据
      *

ruoyi/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java

@@ -8,13 +8,12 @@ import com.ruoyi.system.domain.SysUserOnline;
  *
  * @author ruoyi
  */
-public interface ISysUserOnlineService
+public interface ISysUserOnlineService {
-{
     /**
      * 通过登录地址查询信息
      *
      * @param ipaddr 登录地址
-     * @param user 用户信息
+     * @param user   用户信息
      * @return 在线用户信息
      */
     public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user);
@@ -23,7 +22,7 @@ public interface ISysUserOnlineService
      * 通过用户名称查询信息
      *
      * @param userName 用户名称
-     * @param user 用户信息
+     * @param user     用户信息
      * @return 在线用户信息
      */
     public SysUserOnline selectOnlineByUserName(String userName, LoginUser user);
@@ -31,9 +30,9 @@ public interface ISysUserOnlineService
     /**
      * 通过登录地址/用户名称查询信息
      *
-     * @param ipaddr 登录地址
+     * @param ipaddr   登录地址
      * @param userName 用户名称
-     * @param user 用户信息
+     * @param user     用户信息
      * @return 在线用户信息
      */
     public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user);

ruoyi/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -1,15 +1,16 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.entity.SysUser;
 
+import java.util.List;
+
 /**
  * 用户 业务层
  *
  * @author ruoyi
  */
-public interface ISysUserService
+public interface ISysUserService extends IService<SysUser> {
-{
     /**
      * 根据条件分页查询用户列表
      *
@@ -117,7 +118,7 @@ public interface ISysUserService
      * 修改用户头像
      *
      * @param userName 用户名
-     * @param avatar 头像地址
+     * @param avatar   头像地址
      * @return 结果
      */
     public boolean updateUserAvatar(String userName, String avatar);
@@ -158,9 +159,9 @@ public interface ISysUserService
     /**
      * 导入用户数据
      *
-     * @param userList 用户数据列表
+     * @param userList        用户数据列表
      * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
-     * @param operName 操作用户
+     * @param operName        操作用户
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -3,6 +3,8 @@ package com.ruoyi.system.service.impl;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.UserConstants;
@@ -16,8 +18,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 参数配置 服务层实现
@@ -25,10 +29,7 @@ import java.util.List;
  * @author ruoyi
  */
 @Service
-public class SysConfigServiceImpl implements ISysConfigService
+public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
-{
-    @Autowired
-    private SysConfigMapper configMapper;
 
     @Autowired
     private RedisCache redisCache;
@@ -37,11 +38,9 @@ public class SysConfigServiceImpl implements ISysConfigService
      * 项目启动时，初始化参数到缓存
      */
     @PostConstruct
-    public void init()
+    public void init() {
-    {
+        List<SysConfig> configsList = baseMapper.selectList(new LambdaQueryWrapper<>());
-        List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
+        for (SysConfig config : configsList) {
-        for (SysConfig config : configsList)
-        {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }
     }
@@ -54,11 +53,8 @@ public class SysConfigServiceImpl implements ISysConfigService
      */
     @Override
     @DataSource(DataSourceType.MASTER)
-    public SysConfig selectConfigById(Long configId)
+    public SysConfig selectConfigById(Long configId) {
-    {
+        return baseMapper.selectById(configId);
-        SysConfig config = new SysConfig();
-        config.setConfigId(configId);
-        return configMapper.selectConfig(config);
     }
 
     /**
@@ -68,18 +64,14 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 参数键值
      */
     @Override
-    public String selectConfigByKey(String configKey)
+    public String selectConfigByKey(String configKey) {
-    {
         String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
-        if (Validator.isNotEmpty(configValue))
+        if (Validator.isNotEmpty(configValue)) {
-        {
             return configValue;
         }
-        SysConfig config = new SysConfig();
+        SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
-        config.setConfigKey(configKey);
+                .eq(SysConfig::getConfigKey, configKey));
-        SysConfig retConfig = configMapper.selectConfig(config);
+        if (Validator.isNotNull(retConfig)) {
-        if (Validator.isNotNull(retConfig))
-        {
             redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
             return retConfig.getConfigValue();
         }
@@ -93,9 +85,19 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 参数配置集合
      */
     @Override
-    public List<SysConfig> selectConfigList(SysConfig config)
+    public List<SysConfig> selectConfigList(SysConfig config) {
-    {
+        LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<>();
-        return configMapper.selectConfigList(config);
+        lqw.like(StrUtil.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName());
+        lqw.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType());
+        lqw.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey());
+        Map<String, Object> params = config.getParams();
+        lqw.apply(Validator.isNotEmpty(params.get("beginTime")),
+                "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
+                params.get("beginTime"));
+        lqw.apply(Validator.isNotEmpty(params.get("endTime")),
+                "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
+                params.get("endTime"));
+        return baseMapper.selectList(lqw);
     }
 
     /**
@@ -105,11 +107,9 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 结果
      */
     @Override
-    public int insertConfig(SysConfig config)
+    public int insertConfig(SysConfig config) {
-    {
+        int row = baseMapper.insert(config);
-        int row = configMapper.insertConfig(config);
+        if (row > 0) {
-        if (row > 0)
-        {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }
         return row;
@@ -122,11 +122,9 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 结果
      */
     @Override
-    public int updateConfig(SysConfig config)
+    public int updateConfig(SysConfig config) {
-    {
+        int row = baseMapper.updateById(config);
-        int row = configMapper.updateConfig(config);
+        if (row > 0) {
-        if (row > 0)
-        {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }
         return row;
@@ -139,19 +137,15 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 结果
      */
     @Override
-    public int deleteConfigByIds(Long[] configIds)
+    public int deleteConfigByIds(Long[] configIds) {
-    {
+        for (Long configId : configIds) {
-        for (Long configId : configIds)
-        {
             SysConfig config = selectConfigById(configId);
-            if (StrUtil.equals(UserConstants.YES, config.getConfigType()))
+            if (StrUtil.equals(UserConstants.YES, config.getConfigType())) {
-            {
                 throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
         }
-        int count = configMapper.deleteConfigByIds(configIds);
+        int count = baseMapper.deleteBatchIds(Arrays.asList(configIds));
-        if (count > 0)
+        if (count > 0) {
-        {
             Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
             redisCache.deleteObject(keys);
         }
@@ -162,8 +156,7 @@ public class SysConfigServiceImpl implements ISysConfigService
      * 清空缓存数据
      */
     @Override
-    public void clearCache()
+    public void clearCache() {
-    {
         Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
         redisCache.deleteObject(keys);
     }
@@ -175,12 +168,10 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 结果
      */
     @Override
-    public String checkConfigKeyUnique(SysConfig config)
+    public String checkConfigKeyUnique(SysConfig config) {
-    {
         Long configId = Validator.isNull(config.getConfigId()) ? -1L : config.getConfigId();
-        SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
+        SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, config.getConfigKey()));
-        if (Validator.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
+        if (Validator.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
-        {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -192,8 +183,7 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @param configKey 参数键
      * @return 缓存键key
      */
-    private String getCacheKey(String configKey)
+    private String getCacheKey(String configKey) {
-    {
         return Constants.SYS_CONFIG_KEY + configKey;
     }
 }

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -1,19 +1,26 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,14 +31,14 @@ import java.util.stream.Collectors;
  * @author ruoyi
  */
 @Service
-public class SysDeptServiceImpl implements ISysDeptService
+public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements ISysDeptService {
-{
-    @Autowired
-    private SysDeptMapper deptMapper;
 
     @Autowired
     private SysRoleMapper roleMapper;
 
+    @Autowired
+    private SysUserMapper userMapper;
+
     /**
      * 查询部门管理数据
      *
@@ -40,9 +47,16 @@ public class SysDeptServiceImpl implements ISysDeptService
      */
     @Override
     @DataScope(deptAlias = "d")
-    public List<SysDept> selectDeptList(SysDept dept)
+    public List<SysDept> selectDeptList(SysDept dept) {
-    {
+        Object dataScope = dept.getParams().get("dataScope");
-        return deptMapper.selectDeptList(dept);
+        return list(new LambdaQueryWrapper<SysDept>()
+                .eq(dept.getParentId() != null && dept.getParentId() != 0,
+                        SysDept::getParentId, dept.getParentId())
+                .like(StrUtil.isNotBlank(dept.getDeptName()), SysDept::getDeptName, dept.getDeptName())
+                .eq(StrUtil.isNotBlank(dept.getStatus()), SysDept::getStatus, dept.getStatus())
+                .apply(dataScope != null, dataScope != null ? dataScope.toString() : null)
+                .orderByAsc(SysDept::getParentId)
+                .orderByAsc(SysDept::getOrderNum));
     }
 
     /**
@@ -52,26 +66,21 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 树结构列表
      */
     @Override
-    public List<SysDept> buildDeptTree(List<SysDept> depts)
+    public List<SysDept> buildDeptTree(List<SysDept> depts) {
-    {
         List<SysDept> returnList = new ArrayList<SysDept>();
         List<Long> tempList = new ArrayList<Long>();
-        for (SysDept dept : depts)
+        for (SysDept dept : depts) {
-        {
             tempList.add(dept.getDeptId());
         }
-        for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
+        for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext(); ) {
-        {
             SysDept dept = (SysDept) iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(dept.getParentId()))
+            if (!tempList.contains(dept.getParentId())) {
-            {
                 recursionFn(depts, dept);
                 returnList.add(dept);
             }
         }
-        if (returnList.isEmpty())
+        if (returnList.isEmpty()) {
-        {
             returnList = depts;
         }
         return returnList;
@@ -84,8 +93,7 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 下拉树结构列表
      */
     @Override
-    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts)
+    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts) {
-    {
         List<SysDept> deptTrees = buildDeptTree(depts);
         return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
     }
@@ -97,10 +105,9 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 选中部门列表
      */
     @Override
-    public List<Integer> selectDeptListByRoleId(Long roleId)
+    public List<Integer> selectDeptListByRoleId(Long roleId) {
-    {
+        SysRole role = roleMapper.selectById(roleId);
-        SysRole role = roleMapper.selectRoleById(roleId);
+        return baseMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
-        return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
     }
 
     /**
@@ -110,9 +117,8 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 部门信息
      */
     @Override
-    public SysDept selectDeptById(Long deptId)
+    public SysDept selectDeptById(Long deptId) {
-    {
+        return getById(deptId);
-        return deptMapper.selectDeptById(deptId);
     }
 
     /**
@@ -122,9 +128,10 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 子部门数
      */
     @Override
-    public int selectNormalChildrenDeptById(Long deptId)
+    public int selectNormalChildrenDeptById(Long deptId) {
-    {
+        return count(new LambdaQueryWrapper<SysDept>()
-        return deptMapper.selectNormalChildrenDeptById(deptId);
+                .eq(SysDept::getStatus, 0)
+                .apply("find_in_set({0}, ancestors)", deptId));
     }
 
     /**
@@ -134,9 +141,10 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 结果
      */
     @Override
-    public boolean hasChildByDeptId(Long deptId)
+    public boolean hasChildByDeptId(Long deptId) {
-    {
+        int result = count(new LambdaQueryWrapper<SysDept>()
-        int result = deptMapper.hasChildByDeptId(deptId);
+                .eq(SysDept::getParentId, deptId)
+                .last("limit 1"));
         return result > 0 ? true : false;
     }
 
@@ -147,9 +155,9 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 结果 true 存在 false 不存在
      */
     @Override
-    public boolean checkDeptExistUser(Long deptId)
+    public boolean checkDeptExistUser(Long deptId) {
-    {
+        int result = userMapper.selectCount(new LambdaQueryWrapper<SysUser>()
-        int result = deptMapper.checkDeptExistUser(deptId);
+                .eq(SysUser::getDeptId, deptId));
         return result > 0 ? true : false;
     }
 
@@ -160,12 +168,13 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 结果
      */
     @Override
-    public String checkDeptNameUnique(SysDept dept)
+    public String checkDeptNameUnique(SysDept dept) {
-    {
         Long deptId = Validator.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
-        SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
+        SysDept info = getOne(new LambdaQueryWrapper<SysDept>()
-        if (Validator.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
+                .eq(SysDept::getDeptName, dept.getDeptName())
-        {
+                .eq(SysDept::getParentId, dept.getParentId())
+                .last("limit 1"));
+        if (Validator.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -178,16 +187,14 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 结果
      */
     @Override
-    public int insertDept(SysDept dept)
+    public int insertDept(SysDept dept) {
-    {
+        SysDept info = getById(dept.getParentId());
-        SysDept info = deptMapper.selectDeptById(dept.getParentId());
         // 如果父节点不为正常状态,则不允许新增子节点
-        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
+        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
-        {
             throw new CustomException("部门停用，不允许新增");
         }
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
-        return deptMapper.insertDept(dept);
+        return baseMapper.insert(dept);
     }
 
     /**
@@ -197,20 +204,17 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 结果
      */
     @Override
-    public int updateDept(SysDept dept)
+    public int updateDept(SysDept dept) {
-    {
+        SysDept newParentDept = getById(dept.getParentId());
-        SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
+        SysDept oldDept = getById(dept.getDeptId());
-        SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
+        if (Validator.isNotNull(newParentDept) && Validator.isNotNull(oldDept)) {
-        if (Validator.isNotNull(newParentDept) && Validator.isNotNull(oldDept))
-        {
             String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
             String oldAncestors = oldDept.getAncestors();
             dept.setAncestors(newAncestors);
             updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
         }
-        int result = deptMapper.updateDept(dept);
+        int result = baseMapper.updateById(dept);
-        if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
+        if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) {
-        {
             // 如果该部门是启用状态，则启用该部门的所有上级部门
             updateParentDeptStatus(dept);
         }
@@ -222,31 +226,33 @@ public class SysDeptServiceImpl implements ISysDeptService
      *
      * @param dept 当前部门
      */
-    private void updateParentDeptStatus(SysDept dept)
+    private void updateParentDeptStatus(SysDept dept) {
-    {
         String updateBy = dept.getUpdateBy();
-        dept = deptMapper.selectDeptById(dept.getDeptId());
+        dept = getById(dept.getDeptId());
         dept.setUpdateBy(updateBy);
-        deptMapper.updateDeptStatus(dept);
+        update(null,new LambdaUpdateWrapper<SysDept>()
+                .set(StrUtil.isNotBlank(dept.getStatus()),
+                        SysDept::getStatus,dept.getStatus())
+                .set(StrUtil.isNotBlank(dept.getUpdateBy()),
+                        SysDept::getUpdateBy,dept.getUpdateBy())
+                .in(SysDept::getDeptId, Arrays.asList(dept.getAncestors().split(","))));
     }
 
     /**
      * 修改子元素关系
      *
-     * @param deptId 被修改的部门ID
+     * @param deptId       被修改的部门ID
      * @param newAncestors 新的父ID集合
      * @param oldAncestors 旧的父ID集合
      */
-    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors)
+    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
-    {
+        List<SysDept> children = list(new LambdaQueryWrapper<SysDept>()
-        List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
+                .apply("find_in_set({0},ancestors)",deptId));
-        for (SysDept child : children)
+        for (SysDept child : children) {
-        {
             child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors));
         }
-        if (children.size() > 0)
+        if (children.size() > 0) {
-        {
+            updateBatchById(children);
-            deptMapper.updateDeptChildren(children);
         }
     }
 
@@ -257,23 +263,19 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 结果
      */
     @Override
-    public int deleteDeptById(Long deptId)
+    public int deleteDeptById(Long deptId) {
-    {
+        return baseMapper.deleteById(deptId);
-        return deptMapper.deleteDeptById(deptId);
     }
 
     /**
      * 递归列表
      */
-    private void recursionFn(List<SysDept> list, SysDept t)
+    private void recursionFn(List<SysDept> list, SysDept t) {
-    {
         // 得到子节点列表
         List<SysDept> childList = getChildList(list, t);
         t.setChildren(childList);
-        for (SysDept tChild : childList)
+        for (SysDept tChild : childList) {
-        {
+            if (hasChild(list, tChild)) {
-            if (hasChild(list, tChild))
-            {
                 recursionFn(list, tChild);
             }
         }
@@ -282,15 +284,12 @@ public class SysDeptServiceImpl implements ISysDeptService
     /**
      * 得到子节点列表
      */
-    private List<SysDept> getChildList(List<SysDept> list, SysDept t)
+    private List<SysDept> getChildList(List<SysDept> list, SysDept t) {
-    {
         List<SysDept> tlist = new ArrayList<SysDept>();
         Iterator<SysDept> it = list.iterator();
-        while (it.hasNext())
+        while (it.hasNext()) {
-        {
             SysDept n = (SysDept) it.next();
-            if (Validator.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
+            if (Validator.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
-            {
                 tlist.add(n);
             }
         }
@@ -300,8 +299,7 @@ public class SysDeptServiceImpl implements ISysDeptService
     /**
      * 判断是否有子节点
      */
-    private boolean hasChild(List<SysDept> list, SysDept t)
+    private boolean hasChild(List<SysDept> list, SysDept t) {
-    {
         return getChildList(list, t).size() > 0 ? true : false;
     }
 }

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

@@ -1,12 +1,16 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.List;
+import cn.hutool.core.util.StrUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.service.ISysDictDataService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 字典 业务层处理
@@ -14,10 +18,7 @@ import com.ruoyi.system.service.ISysDictDataService;
  * @author ruoyi
  */
 @Service
-public class SysDictDataServiceImpl implements ISysDictDataService
+public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService {
-{
-    @Autowired
-    private SysDictDataMapper dictDataMapper;
 
     /**
      * 根据条件分页查询字典数据
@@ -26,22 +27,27 @@ public class SysDictDataServiceImpl implements ISysDictDataService
      * @return 字典数据集合信息
      */
     @Override
-    public List<SysDictData> selectDictDataList(SysDictData dictData)
+    public List<SysDictData> selectDictDataList(SysDictData dictData) {
-    {
+        return list(new LambdaQueryWrapper<SysDictData>().eq(StrUtil.isNotBlank(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
-        return dictDataMapper.selectDictDataList(dictData);
+                .like(StrUtil.isNotBlank(dictData.getDictLabel()), SysDictData::getDictLabel, dictData.getDictLabel())
+                .eq(StrUtil.isNotBlank(dictData.getStatus()), SysDictData::getStatus, dictData.getStatus())
+                .orderByAsc(SysDictData::getDictSort));
     }
 
     /**
      * 根据字典类型和字典键值查询字典数据信息
      *
-     * @param dictType 字典类型
+     * @param dictType  字典类型
      * @param dictValue 字典键值
      * @return 字典标签
      */
     @Override
-    public String selectDictLabel(String dictType, String dictValue)
+    public String selectDictLabel(String dictType, String dictValue) {
-    {
+        return getOne(new LambdaQueryWrapper<SysDictData>()
-        return dictDataMapper.selectDictLabel(dictType, dictValue);
+                .select(SysDictData::getDictLabel)
+                .eq(SysDictData::getDictType, dictType)
+                .eq(SysDictData::getDictValue, dictValue))
+                .getDictLabel();
     }
 
     /**
@@ -51,9 +57,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService
      * @return 字典数据
      */
     @Override
-    public SysDictData selectDictDataById(Long dictCode)
+    public SysDictData selectDictDataById(Long dictCode) {
-    {
+        return getById(dictCode);
-        return dictDataMapper.selectDictDataById(dictCode);
     }
 
     /**
@@ -63,11 +68,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService
      * @return 结果
      */
     @Override
-    public int deleteDictDataByIds(Long[] dictCodes)
+    public int deleteDictDataByIds(Long[] dictCodes) {
-    {
+        int row = baseMapper.deleteBatchIds(Arrays.asList(dictCodes));
-        int row = dictDataMapper.deleteDictDataByIds(dictCodes);
+        if (row > 0) {
-        if (row > 0)
-        {
             DictUtils.clearDictCache();
         }
         return row;
@@ -80,11 +83,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService
      * @return 结果
      */
     @Override
-    public int insertDictData(SysDictData dictData)
+    public int insertDictData(SysDictData dictData) {
-    {
+        int row = baseMapper.insert(dictData);
-        int row = dictDataMapper.insertDictData(dictData);
+        if (row > 0) {
-        if (row > 0)
-        {
             DictUtils.clearDictCache();
         }
         return row;
@@ -97,11 +98,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService
      * @return 结果
      */
     @Override
-    public int updateDictData(SysDictData dictData)
+    public int updateDictData(SysDictData dictData) {
-    {
+        int row = baseMapper.updateById(dictData);
-        int row = dictDataMapper.updateDictData(dictData);
+        if (row > 0) {
-        if (row > 0)
-        {
             DictUtils.clearDictCache();
         }
         return row;

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -2,6 +2,10 @@ package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.domain.entity.SysDictType;
@@ -15,7 +19,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 字典 业务层处理
@@ -23,10 +29,7 @@ import java.util.List;
  * @author ruoyi
  */
 @Service
-public class SysDictTypeServiceImpl implements ISysDictTypeService
+public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
-{
-    @Autowired
-    private SysDictTypeMapper dictTypeMapper;
 
     @Autowired
     private SysDictDataMapper dictDataMapper;
@@ -35,12 +38,14 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * 项目启动时，初始化字典到缓存
      */
     @PostConstruct
-    public void init()
+    public void init() {
-    {
+        List<SysDictType> dictTypeList = list();
-        List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
+        for (SysDictType dictType : dictTypeList) {
-        for (SysDictType dictType : dictTypeList)
+            List<SysDictData> dictDatas = dictDataMapper.selectList(
-        {
+                    new LambdaQueryWrapper<SysDictData>()
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
+                            .eq(SysDictData::getStatus, 0)
+                            .eq(SysDictData::getDictType, dictType.getDictType())
+                            .orderByAsc(SysDictData::getDictSort));
             DictUtils.setDictCache(dictType.getDictType(), dictDatas);
         }
     }
@@ -52,9 +57,18 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 字典类型集合信息
      */
     @Override
-    public List<SysDictType> selectDictTypeList(SysDictType dictType)
+    public List<SysDictType> selectDictTypeList(SysDictType dictType) {
-    {
+        Map<String, Object> params = dictType.getParams();
-        return dictTypeMapper.selectDictTypeList(dictType);
+        return list(new LambdaQueryWrapper<SysDictType>()
+                .like(StrUtil.isNotBlank(dictType.getDictName()),SysDictType::getDictName, dictType.getDictName())
+                .eq(StrUtil.isNotBlank(dictType.getStatus()),SysDictType::getStatus, dictType.getStatus())
+                .like(StrUtil.isNotBlank(dictType.getDictType()),SysDictType::getDictType, dictType.getDictType())
+                .apply(Validator.isNotEmpty(params.get("beginTime")),
+                        "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+                        params.get("beginTime"))
+                .apply(Validator.isNotEmpty(params.get("endTime")),
+                        "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+                        params.get("endTime")));
     }
 
     /**
@@ -63,9 +77,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 字典类型集合信息
      */
     @Override
-    public List<SysDictType> selectDictTypeAll()
+    public List<SysDictType> selectDictTypeAll() {
-    {
+        return list();
-        return dictTypeMapper.selectDictTypeAll();
     }
 
     /**
@@ -75,16 +88,16 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 字典数据集合信息
      */
     @Override
-    public List<SysDictData> selectDictDataByType(String dictType)
+    public List<SysDictData> selectDictDataByType(String dictType) {
-    {
         List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
-        if (CollUtil.isNotEmpty(dictDatas))
+        if (CollUtil.isNotEmpty(dictDatas)) {
-        {
             return dictDatas;
         }
-        dictDatas = dictDataMapper.selectDictDataByType(dictType);
+        dictDatas = dictDataMapper.selectList(new LambdaQueryWrapper<SysDictData>()
-        if (CollUtil.isNotEmpty(dictDatas))
+                .eq(SysDictData::getStatus, 0)
-        {
+                .eq(SysDictData::getDictType, dictType)
+                .orderByAsc(SysDictData::getDictSort));
+        if (CollUtil.isNotEmpty(dictDatas)) {
             DictUtils.setDictCache(dictType, dictDatas);
             return dictDatas;
         }
@@ -98,9 +111,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 字典类型
      */
     @Override
-    public SysDictType selectDictTypeById(Long dictId)
+    public SysDictType selectDictTypeById(Long dictId) {
-    {
+        return getById(dictId);
-        return dictTypeMapper.selectDictTypeById(dictId);
     }
 
     /**
@@ -110,9 +122,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 字典类型
      */
     @Override
-    public SysDictType selectDictTypeByType(String dictType)
+    public SysDictType selectDictTypeByType(String dictType) {
-    {
+        return getOne(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType));
-        return dictTypeMapper.selectDictTypeByType(dictType);
     }
 
     /**
@@ -122,19 +133,16 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 结果
      */
     @Override
-    public int deleteDictTypeByIds(Long[] dictIds)
+    public int deleteDictTypeByIds(Long[] dictIds) {
-    {
+        for (Long dictId : dictIds) {
-        for (Long dictId : dictIds)
-        {
             SysDictType dictType = selectDictTypeById(dictId);
-            if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)
+            if (dictDataMapper.selectCount(new LambdaQueryWrapper<SysDictData>()
-            {
+                    .eq(SysDictData::getDictType, dictType.getDictType())) > 0) {
                 throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
             }
         }
-        int count = dictTypeMapper.deleteDictTypeByIds(dictIds);
+        int count = baseMapper.deleteBatchIds(Arrays.asList(dictIds));
-        if (count > 0)
+        if (count > 0) {
-        {
             DictUtils.clearDictCache();
         }
         return count;
@@ -144,8 +152,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * 清空缓存数据
      */
     @Override
-    public void clearCache()
+    public void clearCache() {
-    {
         DictUtils.clearDictCache();
     }
 
@@ -156,11 +163,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 结果
      */
     @Override
-    public int insertDictType(SysDictType dictType)
+    public int insertDictType(SysDictType dictType) {
-    {
+        int row = baseMapper.insert(dictType);
-        int row = dictTypeMapper.insertDictType(dictType);
+        if (row > 0) {
-        if (row > 0)
-        {
             DictUtils.clearDictCache();
         }
         return row;
@@ -174,13 +179,13 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      */
     @Override
     @Transactional
-    public int updateDictType(SysDictType dictType)
+    public int updateDictType(SysDictType dictType) {
-    {
+        SysDictType oldDict = getById(dictType.getDictId());
-        SysDictType oldDict = dictTypeMapper.selectDictTypeById(dictType.getDictId());
+        dictDataMapper.update(null, new LambdaUpdateWrapper<SysDictData>()
-        dictDataMapper.updateDictDataType(oldDict.getDictType(), dictType.getDictType());
+                .set(SysDictData::getDictType, dictType.getDictType())
-        int row = dictTypeMapper.updateDictType(dictType);
+                .eq(SysDictData::getDictType, oldDict.getDictType()));
-        if (row > 0)
+        int row = baseMapper.updateById(dictType);
-        {
+        if (row > 0) {
             DictUtils.clearDictCache();
         }
         return row;
@@ -193,12 +198,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
      * @return 结果
      */
     @Override
-    public String checkDictTypeUnique(SysDictType dict)
+    public String checkDictTypeUnique(SysDictType dict) {
-    {
         Long dictId = Validator.isNull(dict.getDictId()) ? -1L : dict.getDictId();
-        SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType());
+        SysDictType dictType = getOne(new LambdaQueryWrapper<SysDictType>()
-        if (Validator.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())
+                .eq(SysDictType::getDictType, dict.getDictType())
-        {
+                .last("limit 1"));
+        if (Validator.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java

@@ -1,11 +1,17 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.List;
+import cn.hutool.core.lang.Validator;
-import org.springframework.beans.factory.annotation.Autowired;
+import cn.hutool.core.util.StrUtil;
-import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.SysLogininfor;
 import com.ruoyi.system.mapper.SysLogininforMapper;
 import com.ruoyi.system.service.ISysLogininforService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 系统访问日志情况信息 服务层处理
@@ -13,11 +19,7 @@ import com.ruoyi.system.service.ISysLogininforService;
  * @author ruoyi
  */
 @Service
-public class SysLogininforServiceImpl implements ISysLogininforService
+public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, SysLogininfor> implements ISysLogininforService {
-{
-
-    @Autowired
-    private SysLogininforMapper logininforMapper;
 
     /**
      * 新增系统登录日志
@@ -25,9 +27,8 @@ public class SysLogininforServiceImpl implements ISysLogininforService
      * @param logininfor 访问日志对象
      */
     @Override
-    public void insertLogininfor(SysLogininfor logininfor)
+    public void insertLogininfor(SysLogininfor logininfor) {
-    {
+        save(logininfor);
-        logininforMapper.insertLogininfor(logininfor);
     }
 
     /**
@@ -37,9 +38,19 @@ public class SysLogininforServiceImpl implements ISysLogininforService
      * @return 登录记录集合
      */
     @Override
-    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor)
+    public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor) {
-    {
+        Map<String, Object> params = logininfor.getParams();
-        return logininforMapper.selectLogininforList(logininfor);
+        return list(new LambdaQueryWrapper<SysLogininfor>()
+                .like(StrUtil.isNotBlank(logininfor.getIpaddr()),SysLogininfor::getIpaddr,logininfor.getIpaddr())
+                .eq(StrUtil.isNotBlank(logininfor.getStatus()),SysLogininfor::getStatus,logininfor.getStatus())
+                .like(StrUtil.isNotBlank(logininfor.getUserName()),SysLogininfor::getUserName,logininfor.getUserName())
+                .apply(Validator.isNotEmpty(params.get("beginTime")),
+                        "date_format(login_time,'%y%m%d') &gt;= date_format({0},'%y%m%d')",
+                        params.get("beginTime"))
+                .apply(Validator.isNotEmpty(params.get("endTime")),
+                        "date_format(login_time,'%y%m%d') &lt;= date_format({0},'%y%m%d'",
+                        params.get("endTime"))
+                .orderByDesc(SysLogininfor::getInfoId));
     }
 
     /**
@@ -49,17 +60,15 @@ public class SysLogininforServiceImpl implements ISysLogininforService
      * @return
      */
     @Override
-    public int deleteLogininforByIds(Long[] infoIds)
+    public int deleteLogininforByIds(Long[] infoIds) {
-    {
+        return baseMapper.deleteBatchIds(Arrays.asList(infoIds));
-        return logininforMapper.deleteLogininforByIds(infoIds);
     }
 
     /**
      * 清空系统登录日志
      */
     @Override
-    public void cleanLogininfor()
+    public void cleanLogininfor() {
-    {
+        remove(new LambdaQueryWrapper<>());
-        logininforMapper.cleanLogininfor();
     }
 }

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -2,12 +2,15 @@ package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.SysRoleMenu;
 import com.ruoyi.system.domain.vo.MetaVo;
 import com.ruoyi.system.domain.vo.RouterVo;
 import com.ruoyi.system.mapper.SysMenuMapper;
@@ -26,13 +29,9 @@ import java.util.stream.Collectors;
  * @author ruoyi
  */
 @Service
-public class SysMenuServiceImpl implements ISysMenuService
+public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
-{
     public static final String PREMISSION_STRING = "perms[\"{0}\"]";
 
-    @Autowired
-    private SysMenuMapper menuMapper;
-
     @Autowired
     private SysRoleMapper roleMapper;
 
@@ -46,8 +45,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(Long userId)
+    public List<SysMenu> selectMenuList(Long userId) {
-    {
         return selectMenuList(new SysMenu(), userId);
     }
 
@@ -58,18 +56,19 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
+    public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
-    {
         List<SysMenu> menuList = null;
         // 管理员显示所有菜单信息
-        if (SysUser.isAdmin(userId))
+        if (SysUser.isAdmin(userId)) {
-        {
+            menuList = list(new LambdaQueryWrapper<SysMenu>()
-            menuList = menuMapper.selectMenuList(menu);
+                    .like(StrUtil.isNotBlank(menu.getMenuName()),SysMenu::getMenuName,menu.getMenuName())
-        }
+                    .eq(StrUtil.isNotBlank(menu.getVisible()),SysMenu::getVisible,menu.getVisible())
-        else
+                    .eq(StrUtil.isNotBlank(menu.getStatus()),SysMenu::getStatus,menu.getStatus())
-        {
+                    .orderByAsc(SysMenu::getParentId)
+                    .orderByAsc(SysMenu::getOrderNum));
+        } else {
             menu.getParams().put("userId", userId);
-            menuList = menuMapper.selectMenuListByUserId(menu);
+            menuList = baseMapper.selectMenuListByUserId(menu);
         }
         return menuList;
     }
@@ -81,14 +80,11 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 权限列表
      */
     @Override
-    public Set<String> selectMenuPermsByUserId(Long userId)
+    public Set<String> selectMenuPermsByUserId(Long userId) {
-    {
+        List<String> perms = baseMapper.selectMenuPermsByUserId(userId);
-        List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
         Set<String> permsSet = new HashSet<>();
-        for (String perm : perms)
+        for (String perm : perms) {
-        {
+            if (Validator.isNotEmpty(perm)) {
-            if (Validator.isNotEmpty(perm))
-            {
                 permsSet.addAll(Arrays.asList(perm.trim().split(",")));
             }
         }
@@ -102,16 +98,12 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId)
+    public List<SysMenu> selectMenuTreeByUserId(Long userId) {
-    {
         List<SysMenu> menus = null;
-        if (SecurityUtils.isAdmin(userId))
+        if (SecurityUtils.isAdmin(userId)) {
-        {
+            menus = baseMapper.selectMenuTreeAll();
-            menus = menuMapper.selectMenuTreeAll();
+        } else {
-        }
+            menus = baseMapper.selectMenuTreeByUserId(userId);
-        else
-        {
-            menus = menuMapper.selectMenuTreeByUserId(userId);
         }
         return getChildPerms(menus, 0);
     }
@@ -123,10 +115,9 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 选中菜单列表
      */
     @Override
-    public List<Integer> selectMenuListByRoleId(Long roleId)
+    public List<Integer> selectMenuListByRoleId(Long roleId) {
-    {
+        SysRole role = roleMapper.selectById(roleId);
-        SysRole role = roleMapper.selectRoleById(roleId);
+        return baseMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
-        return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
     }
 
     /**
@@ -136,11 +127,9 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 路由列表
      */
     @Override
-    public List<RouterVo> buildMenus(List<SysMenu> menus)
+    public List<RouterVo> buildMenus(List<SysMenu> menus) {
-    {
         List<RouterVo> routers = new LinkedList<RouterVo>();
-        for (SysMenu menu : menus)
+        for (SysMenu menu : menus) {
-        {
             RouterVo router = new RouterVo();
             router.setHidden("1".equals(menu.getVisible()));
             router.setName(getRouteName(menu));
@@ -148,14 +137,11 @@ public class SysMenuServiceImpl implements ISysMenuService
             router.setComponent(getComponent(menu));
             router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache())));
             List<SysMenu> cMenus = menu.getChildren();
-            if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
+            if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
-            {
                 router.setAlwaysShow(true);
                 router.setRedirect("noRedirect");
                 router.setChildren(buildMenus(cMenus));
-            }
+            } else if (isMenuFrame(menu)) {
-            else if (isMenuFrame(menu))
-            {
                 List<RouterVo> childrenList = new ArrayList<RouterVo>();
                 RouterVo children = new RouterVo();
                 children.setPath(menu.getPath());
@@ -177,26 +163,21 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 树结构列表
      */
     @Override
-    public List<SysMenu> buildMenuTree(List<SysMenu> menus)
+    public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
-    {
         List<SysMenu> returnList = new ArrayList<SysMenu>();
         List<Long> tempList = new ArrayList<Long>();
-        for (SysMenu dept : menus)
+        for (SysMenu dept : menus) {
-        {
             tempList.add(dept.getMenuId());
         }
-        for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext();)
+        for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext(); ) {
-        {
             SysMenu menu = (SysMenu) iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(menu.getParentId()))
+            if (!tempList.contains(menu.getParentId())) {
-            {
                 recursionFn(menus, menu);
                 returnList.add(menu);
             }
         }
-        if (returnList.isEmpty())
+        if (returnList.isEmpty()) {
-        {
             returnList = menus;
         }
         return returnList;
@@ -209,8 +190,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 下拉树结构列表
      */
     @Override
-    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus)
+    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus) {
-    {
         List<SysMenu> menuTrees = buildMenuTree(menus);
         return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
     }
@@ -222,9 +202,8 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单信息
      */
     @Override
-    public SysMenu selectMenuById(Long menuId)
+    public SysMenu selectMenuById(Long menuId) {
-    {
+        return getById(menuId);
-        return menuMapper.selectMenuById(menuId);
     }
 
     /**
@@ -234,9 +213,8 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public boolean hasChildByMenuId(Long menuId)
+    public boolean hasChildByMenuId(Long menuId) {
-    {
+        int result = count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId,menuId));
-        int result = menuMapper.hasChildByMenuId(menuId);
         return result > 0 ? true : false;
     }
 
@@ -247,9 +225,8 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public boolean checkMenuExistRole(Long menuId)
+    public boolean checkMenuExistRole(Long menuId) {
-    {
+        int result = roleMenuMapper.selectCount(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getMenuId,menuId));
-        int result = roleMenuMapper.checkMenuExistRole(menuId);
         return result > 0 ? true : false;
     }
 
@@ -260,9 +237,8 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public int insertMenu(SysMenu menu)
+    public int insertMenu(SysMenu menu) {
-    {
+        return baseMapper.insert(menu);
-        return menuMapper.insertMenu(menu);
     }
 
     /**
@@ -272,9 +248,8 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public int updateMenu(SysMenu menu)
+    public int updateMenu(SysMenu menu) {
-    {
+        return baseMapper.updateById(menu);
-        return menuMapper.updateMenu(menu);
     }
 
     /**
@@ -284,9 +259,8 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public int deleteMenuById(Long menuId)
+    public int deleteMenuById(Long menuId) {
-    {
+        return baseMapper.deleteById(menuId);
-        return menuMapper.deleteMenuById(menuId);
     }
 
     /**
@@ -296,12 +270,13 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 结果
      */
     @Override
-    public String checkMenuNameUnique(SysMenu menu)
+    public String checkMenuNameUnique(SysMenu menu) {
-    {
         Long menuId = Validator.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
-        SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
+        SysMenu info = getOne(new LambdaQueryWrapper<SysMenu>()
-        if (Validator.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue())
+                .eq(SysMenu::getMenuName,menu.getMenuName())
-        {
+                .eq(SysMenu::getParentId,menu.getParentId())
+                .last("limit 1"));
+        if (Validator.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -313,12 +288,10 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 路由名称
      */
-    public String getRouteName(SysMenu menu)
+    public String getRouteName(SysMenu menu) {
-    {
         String routerName = StrUtil.upperFirst(menu.getPath());
         // 非外链并且是一级目录（类型为目录）
-        if (isMenuFrame(menu))
+        if (isMenuFrame(menu)) {
-        {
             routerName = StrUtil.EMPTY;
         }
         return routerName;
@@ -330,18 +303,15 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 路由地址
      */
-    public String getRouterPath(SysMenu menu)
+    public String getRouterPath(SysMenu menu) {
-    {
         String routerPath = menu.getPath();
         // 非外链并且是一级目录（类型为目录）
         if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
-                && UserConstants.NO_FRAME.equals(menu.getIsFrame()))
+                && UserConstants.NO_FRAME.equals(menu.getIsFrame())) {
-        {
             routerPath = "/" + menu.getPath();
         }
         // 非外链并且是一级目录（类型为菜单）
-        else if (isMenuFrame(menu))
+        else if (isMenuFrame(menu)) {
-        {
             routerPath = "/";
         }
         return routerPath;
@@ -353,15 +323,11 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 组件信息
      */
-    public String getComponent(SysMenu menu)
+    public String getComponent(SysMenu menu) {
-    {
         String component = UserConstants.LAYOUT;
-        if (StrUtil.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu))
+        if (StrUtil.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) {
-        {
             component = menu.getComponent();
-        }
+        } else if (StrUtil.isEmpty(menu.getComponent()) && isParentView(menu)) {
-        else if (StrUtil.isEmpty(menu.getComponent()) && isParentView(menu))
-        {
             component = UserConstants.PARENT_VIEW;
         }
         return component;
@@ -373,8 +339,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 结果
      */
-    public boolean isMenuFrame(SysMenu menu)
+    public boolean isMenuFrame(SysMenu menu) {
-    {
         return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
                 && menu.getIsFrame().equals(UserConstants.NO_FRAME);
     }
@@ -385,27 +350,23 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param menu 菜单信息
      * @return 结果
      */
-    public boolean isParentView(SysMenu menu)
+    public boolean isParentView(SysMenu menu) {
-    {
         return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
     }
 
     /**
      * 根据父节点的ID获取所有子节点
      *
-     * @param list 分类表
+     * @param list     分类表
      * @param parentId 传入的父节点ID
      * @return String
      */
-    public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId)
+    public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId) {
-    {
         List<SysMenu> returnList = new ArrayList<SysMenu>();
-        for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext();)
+        for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext(); ) {
-        {
             SysMenu t = (SysMenu) iterator.next();
             // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
-            if (t.getParentId() == parentId)
+            if (t.getParentId() == parentId) {
-            {
                 recursionFn(list, t);
                 returnList.add(t);
             }
@@ -419,15 +380,12 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @param list
      * @param t
      */
-    private void recursionFn(List<SysMenu> list, SysMenu t)
+    private void recursionFn(List<SysMenu> list, SysMenu t) {
-    {
         // 得到子节点列表
         List<SysMenu> childList = getChildList(list, t);
         t.setChildren(childList);
-        for (SysMenu tChild : childList)
+        for (SysMenu tChild : childList) {
-        {
+            if (hasChild(list, tChild)) {
-            if (hasChild(list, tChild))
-            {
                 recursionFn(list, tChild);
             }
         }
@@ -436,15 +394,12 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 得到子节点列表
      */
-    private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t)
+    private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) {
-    {
         List<SysMenu> tlist = new ArrayList<SysMenu>();
         Iterator<SysMenu> it = list.iterator();
-        while (it.hasNext())
+        while (it.hasNext()) {
-        {
             SysMenu n = (SysMenu) it.next();
-            if (n.getParentId().longValue() == t.getMenuId().longValue())
+            if (n.getParentId().longValue() == t.getMenuId().longValue()) {
-            {
                 tlist.add(n);
             }
         }
@@ -454,8 +409,7 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 判断是否有子节点
      */
-    private boolean hasChild(List<SysMenu> list, SysMenu t)
+    private boolean hasChild(List<SysMenu> list, SysMenu t) {
-    {
         return getChildList(list, t).size() > 0 ? true : false;
     }
 }

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java

@@ -1,11 +1,15 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.List;
+import cn.hutool.core.util.StrUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.mapper.SysNoticeMapper;
 import com.ruoyi.system.service.ISysNoticeService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 公告 服务层实现
@@ -13,10 +17,7 @@ import com.ruoyi.system.service.ISysNoticeService;
  * @author ruoyi
  */
 @Service
-public class SysNoticeServiceImpl implements ISysNoticeService
+public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService {
-{
-    @Autowired
-    private SysNoticeMapper noticeMapper;
 
     /**
      * 查询公告信息
@@ -25,9 +26,8 @@ public class SysNoticeServiceImpl implements ISysNoticeService
      * @return 公告信息
      */
     @Override
-    public SysNotice selectNoticeById(Long noticeId)
+    public SysNotice selectNoticeById(Long noticeId) {
-    {
+        return getById(noticeId);
-        return noticeMapper.selectNoticeById(noticeId);
     }
 
     /**
@@ -37,9 +37,11 @@ public class SysNoticeServiceImpl implements ISysNoticeService
      * @return 公告集合
      */
     @Override
-    public List<SysNotice> selectNoticeList(SysNotice notice)
+    public List<SysNotice> selectNoticeList(SysNotice notice) {
-    {
+        return list(new LambdaQueryWrapper<SysNotice>()
-        return noticeMapper.selectNoticeList(notice);
+                .like(StrUtil.isNotBlank(notice.getNoticeTitle()),SysNotice::getNoticeTitle,notice.getNoticeTitle())
+                .eq(StrUtil.isNotBlank(notice.getNoticeType()),SysNotice::getNoticeType,notice.getNoticeType())
+                .like(StrUtil.isNotBlank(notice.getCreateBy()),SysNotice::getCreateBy,notice.getCreateBy()));
     }
 
     /**
@@ -49,9 +51,8 @@ public class SysNoticeServiceImpl implements ISysNoticeService
      * @return 结果
      */
     @Override
-    public int insertNotice(SysNotice notice)
+    public int insertNotice(SysNotice notice) {
-    {
+        return baseMapper.insert(notice);
-        return noticeMapper.insertNotice(notice);
     }
 
     /**
@@ -61,9 +62,8 @@ public class SysNoticeServiceImpl implements ISysNoticeService
      * @return 结果
      */
     @Override
-    public int updateNotice(SysNotice notice)
+    public int updateNotice(SysNotice notice) {
-    {
+        return baseMapper.updateById(notice);
-        return noticeMapper.updateNotice(notice);
     }
 
     /**
@@ -73,9 +73,8 @@ public class SysNoticeServiceImpl implements ISysNoticeService
      * @return 结果
      */
     @Override
-    public int deleteNoticeById(Long noticeId)
+    public int deleteNoticeById(Long noticeId) {
-    {
+        return baseMapper.deleteById(noticeId);
-        return noticeMapper.deleteNoticeById(noticeId);
     }
 
     /**
@@ -85,8 +84,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService
      * @return 结果
      */
     @Override
-    public int deleteNoticeByIds(Long[] noticeIds)
+    public int deleteNoticeByIds(Long[] noticeIds) {
-    {
+        return baseMapper.deleteBatchIds(Arrays.asList(noticeIds));
-        return noticeMapper.deleteNoticeByIds(noticeIds);
     }
 }

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java

@@ -1,11 +1,18 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.List;
+import cn.hutool.core.lang.Validator;
-import org.springframework.beans.factory.annotation.Autowired;
+import cn.hutool.core.util.ArrayUtil;
-import org.springframework.stereotype.Service;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.domain.SysOperLog;
 import com.ruoyi.system.mapper.SysOperLogMapper;
 import com.ruoyi.system.service.ISysOperLogService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 操作日志 服务层处理
@@ -13,10 +20,7 @@ import com.ruoyi.system.service.ISysOperLogService;
  * @author ruoyi
  */
 @Service
-public class SysOperLogServiceImpl implements ISysOperLogService
+public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOperLog> implements ISysOperLogService {
-{
-    @Autowired
-    private SysOperLogMapper operLogMapper;
 
     /**
      * 新增操作日志
@@ -24,9 +28,8 @@ public class SysOperLogServiceImpl implements ISysOperLogService
      * @param operLog 操作日志对象
      */
     @Override
-    public void insertOperlog(SysOperLog operLog)
+    public void insertOperlog(SysOperLog operLog) {
-    {
+        save(operLog);
-        operLogMapper.insertOperlog(operLog);
     }
 
     /**
@@ -36,9 +39,27 @@ public class SysOperLogServiceImpl implements ISysOperLogService
      * @return 操作日志集合
      */
     @Override
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog)
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
-    {
+        Map<String, Object> params = operLog.getParams();
-        return operLogMapper.selectOperLogList(operLog);
+        return list(new LambdaQueryWrapper<SysOperLog>()
+                .like(StrUtil.isNotBlank(operLog.getTitle()),SysOperLog::getTitle,operLog.getTitle())
+                .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
+                        SysOperLog::getBusinessType,operLog.getBusinessType())
+                .func(f -> {
+                    if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())){
+                        f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
+                    }
+                })
+                .eq(operLog.getStatus() != null && operLog.getStatus() > 0,
+                        SysOperLog::getStatus,operLog.getStatus())
+                .like(StrUtil.isNotBlank(operLog.getOperName()),SysOperLog::getOperName,operLog.getOperName())
+                .apply(Validator.isNotEmpty(params.get("beginTime")),
+                        "date_format(login_time,'%y%m%d') &gt;= date_format({0},'%y%m%d')",
+                        params.get("beginTime"))
+                .apply(Validator.isNotEmpty(params.get("endTime")),
+                        "date_format(login_time,'%y%m%d') &lt;= date_format({0},'%y%m%d'",
+                        params.get("endTime"))
+                .orderByDesc(SysOperLog::getOperId));
     }
 
     /**
@@ -48,9 +69,8 @@ public class SysOperLogServiceImpl implements ISysOperLogService
      * @return 结果
      */
     @Override
-    public int deleteOperLogByIds(Long[] operIds)
+    public int deleteOperLogByIds(Long[] operIds) {
-    {
+        return baseMapper.deleteBatchIds(Arrays.asList(operIds));
-        return operLogMapper.deleteOperLogByIds(operIds);
     }
 
     /**
@@ -60,17 +80,15 @@ public class SysOperLogServiceImpl implements ISysOperLogService
      * @return 操作日志对象
      */
     @Override
-    public SysOperLog selectOperLogById(Long operId)
+    public SysOperLog selectOperLogById(Long operId) {
-    {
+        return getById(operId);
-        return operLogMapper.selectOperLogById(operId);
     }
 
     /**
      * 清空操作日志
      */
     @Override
-    public void cleanOperLog()
+    public void cleanOperLog() {
-    {
+        remove(new LambdaQueryWrapper<>());
-        operLogMapper.cleanOperLog();
     }
 }

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -1,15 +1,20 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.domain.SysUserPost;
 import com.ruoyi.system.mapper.SysPostMapper;
 import com.ruoyi.system.mapper.SysUserPostMapper;
 import com.ruoyi.system.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -18,10 +23,7 @@ import java.util.List;
  * @author ruoyi
  */
 @Service
-public class SysPostServiceImpl implements ISysPostService
+public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> implements ISysPostService {
-{
-    @Autowired
-    private SysPostMapper postMapper;
 
     @Autowired
     private SysUserPostMapper userPostMapper;
@@ -33,9 +35,11 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 岗位信息集合
      */
     @Override
-    public List<SysPost> selectPostList(SysPost post)
+    public List<SysPost> selectPostList(SysPost post) {
-    {
+        return list(new LambdaQueryWrapper<SysPost>()
-        return postMapper.selectPostList(post);
+                .like(StrUtil.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
+                .eq(StrUtil.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
+                .like(StrUtil.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName()));
     }
 
     /**
@@ -44,9 +48,8 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 岗位列表
      */
     @Override
-    public List<SysPost> selectPostAll()
+    public List<SysPost> selectPostAll() {
-    {
+        return list();
-        return postMapper.selectPostAll();
     }
 
     /**
@@ -56,9 +59,8 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 角色对象信息
      */
     @Override
-    public SysPost selectPostById(Long postId)
+    public SysPost selectPostById(Long postId) {
-    {
+        return getById(postId);
-        return postMapper.selectPostById(postId);
     }
 
     /**
@@ -68,9 +70,8 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 选中岗位ID列表
      */
     @Override
-    public List<Integer> selectPostListByUserId(Long userId)
+    public List<Integer> selectPostListByUserId(Long userId) {
-    {
+        return baseMapper.selectPostListByUserId(userId);
-        return postMapper.selectPostListByUserId(userId);
     }
 
     /**
@@ -80,12 +81,11 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 结果
      */
     @Override
-    public String checkPostNameUnique(SysPost post)
+    public String checkPostNameUnique(SysPost post) {
-    {
         Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId();
-        SysPost info = postMapper.checkPostNameUnique(post.getPostName());
+        SysPost info = getOne(new LambdaQueryWrapper<SysPost>()
-        if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
+                .eq(SysPost::getPostName, post.getPostName()).last("limit 1"));
-        {
+        if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -98,12 +98,11 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 结果
      */
     @Override
-    public String checkPostCodeUnique(SysPost post)
+    public String checkPostCodeUnique(SysPost post) {
-    {
         Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId();
-        SysPost info = postMapper.checkPostCodeUnique(post.getPostCode());
+        SysPost info = getOne(new LambdaQueryWrapper<SysPost>()
-        if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
+                .eq(SysPost::getPostCode, post.getPostCode()).last("limit 1"));
-        {
+        if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -116,9 +115,8 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 结果
      */
     @Override
-    public int countUserPostById(Long postId)
+    public int countUserPostById(Long postId) {
-    {
+        return userPostMapper.selectCount(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getPostId,postId));
-        return userPostMapper.countUserPostById(postId);
     }
 
     /**
@@ -128,9 +126,8 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 结果
      */
     @Override
-    public int deletePostById(Long postId)
+    public int deletePostById(Long postId) {
-    {
+        return baseMapper.deleteById(postId);
-        return postMapper.deletePostById(postId);
     }
 
     /**
@@ -141,17 +138,14 @@ public class SysPostServiceImpl implements ISysPostService
      * @throws Exception 异常
      */
     @Override
-    public int deletePostByIds(Long[] postIds)
+    public int deletePostByIds(Long[] postIds) {
-    {
+        for (Long postId : postIds) {
-        for (Long postId : postIds)
-        {
             SysPost post = selectPostById(postId);
-            if (countUserPostById(postId) > 0)
+            if (countUserPostById(postId) > 0) {
-            {
                 throw new CustomException(String.format("%1$s已分配,不能删除", post.getPostName()));
             }
         }
-        return postMapper.deletePostByIds(postIds);
+        return baseMapper.deleteBatchIds(Arrays.asList(postIds));
     }
 
     /**
@@ -161,9 +155,8 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 结果
      */
     @Override
-    public int insertPost(SysPost post)
+    public int insertPost(SysPost post) {
-    {
+        return baseMapper.insert(post);
-        return postMapper.insertPost(post);
     }
 
     /**
@@ -173,8 +166,7 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 结果
      */
     @Override
-    public int updatePost(SysPost post)
+    public int updatePost(SysPost post) {
-    {
+        return baseMapper.updateById(post);
-        return postMapper.updatePost(post);
     }
 }

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysRole;
@@ -8,6 +11,7 @@ import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.SysRoleDept;
 import com.ruoyi.system.domain.SysRoleMenu;
+import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.SysRoleDeptMapper;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysRoleMenuMapper;
@@ -25,10 +29,7 @@ import java.util.*;
  * @author ruoyi
  */
 @Service
-public class SysRoleServiceImpl implements ISysRoleService
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
-{
-    @Autowired
-    private SysRoleMapper roleMapper;
 
     @Autowired
     private SysRoleMenuMapper roleMenuMapper;
@@ -47,9 +48,21 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @DataScope(deptAlias = "d")
-    public List<SysRole> selectRoleList(SysRole role)
+    public List<SysRole> selectRoleList(SysRole role) {
-    {
+        Map<String, Object> params = role.getParams();
-        return roleMapper.selectRoleList(role);
+        Object dataScope = params.get("dataScope");
+        return list(new LambdaQueryWrapper<SysRole>()
+                .like(StrUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())
+                .eq(StrUtil.isNotBlank(role.getStatus()), SysRole::getStatus, role.getStatus())
+                .like(StrUtil.isNotBlank(role.getRoleKey()), SysRole::getRoleKey, role.getRoleKey())
+                .apply(Validator.isNotEmpty(params.get("beginTime")),
+                        "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+                        params.get("beginTime"))
+                .apply(Validator.isNotEmpty(params.get("endTime")),
+                        "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+                        params.get("endTime"))
+                .apply(dataScope != null, dataScope != null ? dataScope.toString() : null)
+                .orderByAsc(SysRole::getRoleSort));
     }
 
     /**
@@ -59,14 +72,11 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 权限列表
      */
     @Override
-    public Set<String> selectRolePermissionByUserId(Long userId)
+    public Set<String> selectRolePermissionByUserId(Long userId) {
-    {
+        List<SysRole> perms = baseMapper.selectRolePermissionByUserId(userId);
-        List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
         Set<String> permsSet = new HashSet<>();
-        for (SysRole perm : perms)
+        for (SysRole perm : perms) {
-        {
+            if (Validator.isNotNull(perm)) {
-            if (Validator.isNotNull(perm))
-            {
                 permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
             }
         }
@@ -79,8 +89,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色列表
      */
     @Override
-    public List<SysRole> selectRoleAll()
+    public List<SysRole> selectRoleAll() {
-    {
         return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
     }
 
@@ -91,9 +100,8 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 选中角色ID列表
      */
     @Override
-    public List<Integer> selectRoleListByUserId(Long userId)
+    public List<Integer> selectRoleListByUserId(Long userId) {
-    {
+        return baseMapper.selectRoleListByUserId(userId);
-        return roleMapper.selectRoleListByUserId(userId);
     }
 
     /**
@@ -103,9 +111,8 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色对象信息
      */
     @Override
-    public SysRole selectRoleById(Long roleId)
+    public SysRole selectRoleById(Long roleId) {
-    {
+        return getById(roleId);
-        return roleMapper.selectRoleById(roleId);
     }
 
     /**
@@ -115,12 +122,11 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public String checkRoleNameUnique(SysRole role)
+    public String checkRoleNameUnique(SysRole role) {
-    {
         Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId();
-        SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
+        SysRole info = getOne(new LambdaQueryWrapper<SysRole>()
-        if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
+                .eq(SysRole::getRoleName, role.getRoleName()).last("limit 1"));
-        {
+        if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -133,12 +139,11 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public String checkRoleKeyUnique(SysRole role)
+    public String checkRoleKeyUnique(SysRole role) {
-    {
         Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId();
-        SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
+        SysRole info = getOne(new LambdaQueryWrapper<SysRole>()
-        if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
+                .eq(SysRole::getRoleKey, role.getRoleKey()).last("limit 1"));
-        {
+        if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -150,10 +155,8 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @param role 角色信息
      */
     @Override
-    public void checkRoleAllowed(SysRole role)
+    public void checkRoleAllowed(SysRole role) {
-    {
+        if (Validator.isNotNull(role.getRoleId()) && role.isAdmin()) {
-        if (Validator.isNotNull(role.getRoleId()) && role.isAdmin())
-        {
             throw new CustomException("不允许操作超级管理员角色");
         }
     }
@@ -165,9 +168,8 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public int countUserRoleByRoleId(Long roleId)
+    public int countUserRoleByRoleId(Long roleId) {
-    {
+        return userRoleMapper.selectCount(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, roleId));
-        return userRoleMapper.countUserRoleByRoleId(roleId);
     }
 
     /**
@@ -178,10 +180,9 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int insertRole(SysRole role)
+    public int insertRole(SysRole role) {
-    {
         // 新增角色信息
-        roleMapper.insertRole(role);
+        baseMapper.insert(role);
         return insertRoleMenu(role);
     }
 
@@ -193,12 +194,11 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int updateRole(SysRole role)
+    public int updateRole(SysRole role) {
-    {
         // 修改角色信息
-        roleMapper.updateRole(role);
+        baseMapper.updateById(role);
         // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
+        roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, role.getRoleId()));
         return insertRoleMenu(role);
     }
 
@@ -209,9 +209,8 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public int updateRoleStatus(SysRole role)
+    public int updateRoleStatus(SysRole role) {
-    {
+        return baseMapper.updateById(role);
-        return roleMapper.updateRole(role);
     }
 
     /**
@@ -222,12 +221,11 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int authDataScope(SysRole role)
+    public int authDataScope(SysRole role) {
-    {
         // 修改角色信息
-        roleMapper.updateRole(role);
+        baseMapper.updateById(role);
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId());
+        roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().eq(SysRoleDept::getRoleId, role.getRoleId()));
         // 新增角色和部门信息（数据权限）
         return insertRoleDept(role);
     }
@@ -237,21 +235,20 @@ public class SysRoleServiceImpl implements ISysRoleService
      *
      * @param role 角色对象
      */
-    public int insertRoleMenu(SysRole role)
+    public int insertRoleMenu(SysRole role) {
-    {
+        int rows = 0;
-        int rows = 1;
         // 新增用户与角色管理
         List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
-        for (Long menuId : role.getMenuIds())
+        for (Long menuId : role.getMenuIds()) {
-        {
             SysRoleMenu rm = new SysRoleMenu();
             rm.setRoleId(role.getRoleId());
             rm.setMenuId(menuId);
             list.add(rm);
         }
-        if (list.size() > 0)
+        if (list.size() > 0) {
-        {
+            for (SysRoleMenu sysRoleMenu : list) {
-            rows = roleMenuMapper.batchRoleMenu(list);
+                rows += roleMenuMapper.insert(sysRoleMenu);
+            }
         }
         return rows;
     }
@@ -261,21 +258,20 @@ public class SysRoleServiceImpl implements ISysRoleService
      *
      * @param role 角色对象
      */
-    public int insertRoleDept(SysRole role)
+    public int insertRoleDept(SysRole role) {
-    {
+        int rows = 0;
-        int rows = 1;
         // 新增角色与部门（数据权限）管理
         List<SysRoleDept> list = new ArrayList<SysRoleDept>();
-        for (Long deptId : role.getDeptIds())
+        for (Long deptId : role.getDeptIds()) {
-        {
             SysRoleDept rd = new SysRoleDept();
             rd.setRoleId(role.getRoleId());
             rd.setDeptId(deptId);
             list.add(rd);
         }
-        if (list.size() > 0)
+        if (list.size() > 0) {
-        {
+            for (SysRoleDept sysRoleDept : list) {
-            rows = roleDeptMapper.batchRoleDept(list);
+                rows += roleDeptMapper.insert(sysRoleDept);
+            }
         }
         return rows;
     }
@@ -288,13 +284,12 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int deleteRoleById(Long roleId)
+    public int deleteRoleById(Long roleId) {
-    {
         // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenuByRoleId(roleId);
+        roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDeptByRoleId(roleId);
+        roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().eq(SysRoleDept::getRoleId, roleId));
-        return roleMapper.deleteRoleById(roleId);
+        return baseMapper.deleteById(roleId);
     }
 
     /**
@@ -305,21 +300,19 @@ public class SysRoleServiceImpl implements ISysRoleService
      */
     @Override
     @Transactional
-    public int deleteRoleByIds(Long[] roleIds)
+    public int deleteRoleByIds(Long[] roleIds) {
-    {
+        for (Long roleId : roleIds) {
-        for (Long roleId : roleIds)
-        {
             checkRoleAllowed(new SysRole(roleId));
             SysRole role = selectRoleById(roleId);
-            if (countUserRoleByRoleId(roleId) > 0)
+            if (countUserRoleByRoleId(roleId) > 0) {
-            {
                 throw new CustomException(String.format("%1$s已分配,不能删除", role.getRoleName()));
             }
         }
+        List<Long> ids = Arrays.asList(roleIds);
         // 删除角色与菜单关联
-        roleMenuMapper.deleteRoleMenu(roleIds);
+        roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getRoleId, ids));
         // 删除角色与部门关联
-        roleDeptMapper.deleteRoleDept(roleIds);
+        roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().in(SysRoleDept::getRoleId, ids));
-        return roleMapper.deleteRoleByIds(roleIds);
+        return baseMapper.deleteBatchIds(ids);
     }
 }

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java

@@ -13,20 +13,17 @@ import org.springframework.stereotype.Service;
  * @author ruoyi
  */
 @Service
-public class SysUserOnlineServiceImpl implements ISysUserOnlineService
+public class SysUserOnlineServiceImpl implements ISysUserOnlineService {
-{
     /**
      * 通过登录地址查询信息
      *
      * @param ipaddr 登录地址
-     * @param user 用户信息
+     * @param user   用户信息
      * @return 在线用户信息
      */
     @Override
-    public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user)
+    public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) {
-    {
+        if (StrUtil.equals(ipaddr, user.getIpaddr())) {
-        if (StrUtil.equals(ipaddr, user.getIpaddr()))
-        {
             return loginUserToUserOnline(user);
         }
         return null;
@@ -36,14 +33,12 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
      * 通过用户名称查询信息
      *
      * @param userName 用户名称
-     * @param user 用户信息
+     * @param user     用户信息
      * @return 在线用户信息
      */
     @Override
-    public SysUserOnline selectOnlineByUserName(String userName, LoginUser user)
+    public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) {
-    {
+        if (StrUtil.equals(userName, user.getUsername())) {
-        if (StrUtil.equals(userName, user.getUsername()))
-        {
             return loginUserToUserOnline(user);
         }
         return null;
@@ -52,16 +47,14 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
     /**
      * 通过登录地址/用户名称查询信息
      *
-     * @param ipaddr 登录地址
+     * @param ipaddr   登录地址
      * @param userName 用户名称
-     * @param user 用户信息
+     * @param user     用户信息
      * @return 在线用户信息
      */
     @Override
-    public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user)
+    public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) {
-    {
+        if (StrUtil.equals(ipaddr, user.getIpaddr()) && StrUtil.equals(userName, user.getUsername())) {
-        if (StrUtil.equals(ipaddr, user.getIpaddr()) && StrUtil.equals(userName, user.getUsername()))
-        {
             return loginUserToUserOnline(user);
         }
         return null;
@@ -74,10 +67,8 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
      * @return 在线用户
      */
     @Override
-    public SysUserOnline loginUserToUserOnline(LoginUser user)
+    public SysUserOnline loginUserToUserOnline(LoginUser user) {
-    {
+        if (Validator.isNull(user) || Validator.isNull(user.getUser())) {
-        if (Validator.isNull(user) || Validator.isNull(user.getUser()))
-        {
             return null;
         }
         SysUserOnline sysUserOnline = new SysUserOnline();
@@ -88,8 +79,7 @@ public class SysUserOnlineServiceImpl implements ISysUserOnlineService
         sysUserOnline.setBrowser(user.getBrowser());
         sysUserOnline.setOs(user.getOs());
         sysUserOnline.setLoginTime(user.getLoginTime());
-        if (Validator.isNotNull(user.getUser().getDept()))
+        if (Validator.isNotNull(user.getUser().getDept())) {
-        {
             sysUserOnline.setDeptName(user.getUser().getDept().getDeptName());
         }
         return sysUserOnline;

ruoyi/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.lang.Validator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysRole;
@@ -13,13 +16,13 @@ import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
-import org.slf4j.Logger;
+import lombok.extern.slf4j.Slf4j;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -27,13 +30,9 @@ import java.util.List;
  *
  * @author ruoyi
  */
+@Slf4j
 @Service
-public class SysUserServiceImpl implements ISysUserService
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
-{
-    private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
-
-    @Autowired
-    private SysUserMapper userMapper;
 
     @Autowired
     private SysRoleMapper roleMapper;
@@ -58,9 +57,8 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectUserList(SysUser user)
+    public List<SysUser> selectUserList(SysUser user) {
-    {
+        return baseMapper.selectUserList(user);
-        return userMapper.selectUserList(user);
     }
 
     /**
@@ -70,9 +68,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserByUserName(String userName)
+    public SysUser selectUserByUserName(String userName) {
-    {
+        return baseMapper.selectUserByUserName(userName);
-        return userMapper.selectUserByUserName(userName);
     }
 
     /**
@@ -82,9 +79,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserById(Long userId)
+    public SysUser selectUserById(Long userId) {
-    {
+        return baseMapper.selectUserById(userId);
-        return userMapper.selectUserById(userId);
     }
 
     /**
@@ -94,16 +90,13 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public String selectUserRoleGroup(String userName)
+    public String selectUserRoleGroup(String userName) {
-    {
         List<SysRole> list = roleMapper.selectRolesByUserName(userName);
         StringBuffer idsStr = new StringBuffer();
-        for (SysRole role : list)
+        for (SysRole role : list) {
-        {
             idsStr.append(role.getRoleName()).append(",");
         }
-        if (Validator.isNotEmpty(idsStr.toString()))
+        if (Validator.isNotEmpty(idsStr.toString())) {
-        {
             return idsStr.substring(0, idsStr.length() - 1);
         }
         return idsStr.toString();
@@ -116,16 +109,13 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public String selectUserPostGroup(String userName)
+    public String selectUserPostGroup(String userName) {
-    {
         List<SysPost> list = postMapper.selectPostsByUserName(userName);
         StringBuffer idsStr = new StringBuffer();
-        for (SysPost post : list)
+        for (SysPost post : list) {
-        {
             idsStr.append(post.getPostName()).append(",");
         }
-        if (Validator.isNotEmpty(idsStr.toString()))
+        if (Validator.isNotEmpty(idsStr.toString())) {
-        {
             return idsStr.substring(0, idsStr.length() - 1);
         }
         return idsStr.toString();
@@ -138,11 +128,9 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public String checkUserNameUnique(String userName)
+    public String checkUserNameUnique(String userName) {
-    {
+        int count = count(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName).last("limit 1"));
-        int count = userMapper.checkUserNameUnique(userName);
+        if (count > 0) {
-        if (count > 0)
-        {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -155,12 +143,12 @@ public class SysUserServiceImpl implements ISysUserService
      * @return
      */
     @Override
-    public String checkPhoneUnique(SysUser user)
+    public String checkPhoneUnique(SysUser user) {
-    {
         Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
+        SysUser info = getOne(new LambdaQueryWrapper<SysUser>()
-        if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+                .select(SysUser::getUserId, SysUser::getPhonenumber)
-        {
+                .eq(SysUser::getPhonenumber, user.getPhonenumber()).last("limit 1"));
+        if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -173,12 +161,12 @@ public class SysUserServiceImpl implements ISysUserService
      * @return
      */
     @Override
-    public String checkEmailUnique(SysUser user)
+    public String checkEmailUnique(SysUser user) {
-    {
         Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
-        SysUser info = userMapper.checkEmailUnique(user.getEmail());
+        SysUser info = getOne(new LambdaQueryWrapper<SysUser>()
-        if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+                .select(SysUser::getUserId, SysUser::getEmail)
-        {
+                .eq(SysUser::getEmail, user.getEmail()).last("limit 1"));
+        if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -190,10 +178,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @param user 用户信息
      */
     @Override
-    public void checkUserAllowed(SysUser user)
+    public void checkUserAllowed(SysUser user) {
-    {
+        if (Validator.isNotNull(user.getUserId()) && user.isAdmin()) {
-        if (Validator.isNotNull(user.getUserId()) && user.isAdmin())
-        {
             throw new CustomException("不允许操作超级管理员用户");
         }
     }
@@ -206,10 +192,9 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int insertUser(SysUser user)
+    public int insertUser(SysUser user) {
-    {
         // 新增用户信息
-        int rows = userMapper.insertUser(user);
+        int rows = baseMapper.insert(user);
         // 新增用户岗位关联
         insertUserPost(user);
         // 新增用户与角色管理
@@ -225,18 +210,17 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int updateUser(SysUser user)
+    public int updateUser(SysUser user) {
-    {
         Long userId = user.getUserId();
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
+        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));
         // 新增用户与角色管理
         insertUserRole(user);
         // 删除用户与岗位关联
-        userPostMapper.deleteUserPostByUserId(userId);
+        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));
         // 新增用户与岗位管理
         insertUserPost(user);
-        return userMapper.updateUser(user);
+        return baseMapper.updateById(user);
     }
 
     /**
@@ -246,9 +230,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int updateUserStatus(SysUser user)
+    public int updateUserStatus(SysUser user) {
-    {
+        return baseMapper.updateById(user);
-        return userMapper.updateUser(user);
     }
 
     /**
@@ -258,22 +241,23 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int updateUserProfile(SysUser user)
+    public int updateUserProfile(SysUser user) {
-    {
+        return baseMapper.updateById(user);
-        return userMapper.updateUser(user);
     }
 
     /**
      * 修改用户头像
      *
      * @param userName 用户名
-     * @param avatar 头像地址
+     * @param avatar   头像地址
      * @return 结果
      */
     @Override
-    public boolean updateUserAvatar(String userName, String avatar)
+    public boolean updateUserAvatar(String userName, String avatar) {
-    {
+        return baseMapper.update(null,
-        return userMapper.updateUserAvatar(userName, avatar) > 0;
+                new LambdaUpdateWrapper<SysUser>()
+                        .set(SysUser::getAvatar,avatar)
+                        .eq(SysUser::getUserName,userName)) > 0;
     }
 
     /**
@@ -283,9 +267,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int resetPwd(SysUser user)
+    public int resetPwd(SysUser user) {
-    {
+        return baseMapper.updateById(user);
-        return userMapper.updateUser(user);
     }
 
     /**
@@ -296,9 +279,11 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int resetUserPwd(String userName, String password)
+    public int resetUserPwd(String userName, String password) {
-    {
+        return baseMapper.update(null,
-        return userMapper.resetUserPwd(userName, password);
+                new LambdaUpdateWrapper<SysUser>()
+                        .set(SysUser::getPassword,password)
+                        .eq(SysUser::getUserName,userName));
     }
 
     /**
@@ -306,23 +291,21 @@ public class SysUserServiceImpl implements ISysUserService
      *
      * @param user 用户对象
      */
-    public void insertUserRole(SysUser user)
+    public void insertUserRole(SysUser user) {
-    {
         Long[] roles = user.getRoleIds();
-        if (Validator.isNotNull(roles))
+        if (Validator.isNotNull(roles)) {
-        {
             // 新增用户与角色管理
             List<SysUserRole> list = new ArrayList<SysUserRole>();
-            for (Long roleId : roles)
+            for (Long roleId : roles) {
-            {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(user.getUserId());
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
-            if (list.size() > 0)
+            if (list.size() > 0) {
-            {
+                for (SysUserRole sysUserRole : list) {
-                userRoleMapper.batchUserRole(list);
+                    userRoleMapper.insert(sysUserRole);
+                }
             }
         }
     }
@@ -332,23 +315,21 @@ public class SysUserServiceImpl implements ISysUserService
      *
      * @param user 用户对象
      */
-    public void insertUserPost(SysUser user)
+    public void insertUserPost(SysUser user) {
-    {
         Long[] posts = user.getPostIds();
-        if (Validator.isNotNull(posts))
+        if (Validator.isNotNull(posts)) {
-        {
             // 新增用户与岗位管理
             List<SysUserPost> list = new ArrayList<SysUserPost>();
-            for (Long postId : posts)
+            for (Long postId : posts) {
-            {
                 SysUserPost up = new SysUserPost();
                 up.setUserId(user.getUserId());
                 up.setPostId(postId);
                 list.add(up);
             }
-            if (list.size() > 0)
+            if (list.size() > 0) {
-            {
+                for (SysUserPost sysUserPost : list) {
-                userPostMapper.batchUserPost(list);
+                    userPostMapper.insert(sysUserPost);
+                }
             }
         }
     }
@@ -361,13 +342,12 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int deleteUserById(Long userId)
+    public int deleteUserById(Long userId) {
-    {
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRoleByUserId(userId);
+        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));
         // 删除用户与岗位表
-        userPostMapper.deleteUserPostByUserId(userId);
+        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));
-        return userMapper.deleteUserById(userId);
+        return baseMapper.deleteById(userId);
     }
 
     /**
@@ -378,32 +358,29 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int deleteUserByIds(Long[] userIds)
+    public int deleteUserByIds(Long[] userIds) {
-    {
+        for (Long userId : userIds) {
-        for (Long userId : userIds)
-        {
             checkUserAllowed(new SysUser(userId));
         }
+        List<Long> ids = Arrays.asList(userIds);
         // 删除用户与角色关联
-        userRoleMapper.deleteUserRole(userIds);
+        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId,ids));
-        // 删除用户与岗位关联
+        // 删除用户与岗位表
-        userPostMapper.deleteUserPost(userIds);
+        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId,ids));
-        return userMapper.deleteUserByIds(userIds);
+        return baseMapper.deleteBatchIds(ids);
     }
 
     /**
      * 导入用户数据
      *
-     * @param userList 用户数据列表
+     * @param userList        用户数据列表
      * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
-     * @param operName 操作用户
+     * @param operName        操作用户
      * @return 结果
      */
     @Override
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
+    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
-    {
+        if (Validator.isNull(userList) || userList.size() == 0) {
-        if (Validator.isNull(userList) || userList.size() == 0)
-        {
             throw new CustomException("导入用户数据不能为空！");
         }
         int successNum = 0;
@@ -411,48 +388,36 @@ public class SysUserServiceImpl implements ISysUserService
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         String password = configService.selectConfigByKey("sys.user.initPassword");
-        for (SysUser user : userList)
+        for (SysUser user : userList) {
-        {
+            try {
-            try
-            {
                 // 验证是否存在这个用户
-                SysUser u = userMapper.selectUserByUserName(user.getUserName());
+                SysUser u = baseMapper.selectUserByUserName(user.getUserName());
-                if (Validator.isNull(u))
+                if (Validator.isNull(u)) {
-                {
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
                     this.insertUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
-                }
+                } else if (isUpdateSupport) {
-                else if (isUpdateSupport)
-                {
                     user.setUpdateBy(operName);
                     this.updateUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
-                }
+                } else {
-                else
-                {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
                 }
-            }
+            } catch (Exception e) {
-            catch (Exception e)
-            {
                 failureNum++;
                 String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
                 log.error(msg, e);
             }
         }
-        if (failureNum > 0)
+        if (failureNum > 0) {
-        {
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new CustomException(failureMsg.toString());
-        }
+        } else {
-        else
-        {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
         }
         return successMsg.toString();

ruoyi/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -29,99 +29,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"     column="update_time"    />
     </resultMap>
     
-	<sql id="selectGenTableColumnVo">
-        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
-    </sql>
-	
-    <select id="selectGenTableColumnListByTableId" parameterType="Long" resultMap="GenTableColumnResult">
-        <include refid="selectGenTableColumnVo"/>
-        where table_id = #{tableId}
-        order by sort
-    </select>
-    
     <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
 		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
 		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
 		order by ordinal_position
 	</select>
 
-    <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
-        insert into gen_table_column (
-			<if test="tableId != null and tableId != ''">table_id,</if>
-			<if test="columnName != null and columnName != ''">column_name,</if>
-			<if test="columnComment != null and columnComment != ''">column_comment,</if>
-			<if test="columnType != null and columnType != ''">column_type,</if>
-			<if test="javaType != null and javaType != ''">java_type,</if>
-			<if test="javaField != null  and javaField != ''">java_field,</if>
-			<if test="isPk != null and isPk != ''">is_pk,</if>
-			<if test="isIncrement != null and isIncrement != ''">is_increment,</if>
-			<if test="isRequired != null and isRequired != ''">is_required,</if>
-			<if test="isInsert != null and isInsert != ''">is_insert,</if>
-			<if test="isEdit != null and isEdit != ''">is_edit,</if>
-			<if test="isList != null and isList != ''">is_list,</if>
-			<if test="isQuery != null and isQuery != ''">is_query,</if>
-			<if test="queryType != null and queryType != ''">query_type,</if>
-			<if test="htmlType != null and htmlType != ''">html_type,</if>
-			<if test="dictType != null and dictType != ''">dict_type,</if>
-			<if test="sort != null">sort,</if>
-			<if test="createBy != null and createBy != ''">create_by,</if>
-			create_time
-         )values(
-			<if test="tableId != null and tableId != ''">#{tableId},</if>
-			<if test="columnName != null and columnName != ''">#{columnName},</if>
-			<if test="columnComment != null and columnComment != ''">#{columnComment},</if>
-			<if test="columnType != null and columnType != ''">#{columnType},</if>
-			<if test="javaType != null and javaType != ''">#{javaType},</if>
-			<if test="javaField != null and javaField != ''">#{javaField},</if>
-			<if test="isPk != null and isPk != ''">#{isPk},</if>
-			<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
-			<if test="isRequired != null and isRequired != ''">#{isRequired},</if>
-			<if test="isInsert != null and isInsert != ''">#{isInsert},</if>
-			<if test="isEdit != null and isEdit != ''">#{isEdit},</if>
-			<if test="isList != null and isList != ''">#{isList},</if>
-			<if test="isQuery != null and isQuery != ''">#{isQuery},</if>
-			<if test="queryType != null and queryType != ''">#{queryType},</if>
-			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
-			<if test="dictType != null and dictType != ''">#{dictType},</if>
-			<if test="sort != null">#{sort},</if>
-			<if test="createBy != null and createBy != ''">#{createBy},</if>
-			sysdate()
-         )
-    </insert>
-	 
-    <update id="updateGenTableColumn" parameterType="GenTableColumn">
-        update gen_table_column
-        <set>
-            column_comment = #{columnComment},
-            java_type = #{javaType},
-            java_field = #{javaField},
-            is_insert = #{isInsert},
-            is_edit = #{isEdit},
-            is_list = #{isList},
-            is_query = #{isQuery},
-            is_required = #{isRequired},
-            query_type = #{queryType},
-            html_type = #{htmlType},
-            dict_type = #{dictType},
-            sort = #{sort},
-            update_by = #{updateBy},
-            update_time = sysdate()
-        </set>
-        where column_id = #{columnId}
-    </update>
-
-    <delete id="deleteGenTableColumnByIds" parameterType="Long">
-        delete from gen_table_column where table_id in 
-        <foreach collection="array" item="tableId" open="(" separator="," close=")">
-            #{tableId}
-        </foreach>
-    </delete>
-    
-    <delete id="deleteGenTableColumns">
-        delete from gen_table_column where column_id in 
-        <foreach collection="list" item="item" open="(" separator="," close=")">
-            #{item.columnId}
-        </foreach>
-    </delete>
-
 </mapper>

ruoyi/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -133,69 +133,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by c.sort
 	</select>
 
-	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
-        insert into gen_table (
-			<if test="tableName != null">table_name,</if>
-			<if test="tableComment != null and tableComment != ''">table_comment,</if>
-			<if test="className != null and className != ''">class_name,</if>
-			<if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
-			<if test="packageName != null and packageName != ''">package_name,</if>
-			<if test="moduleName != null and moduleName != ''">module_name,</if>
-			<if test="businessName != null and businessName != ''">business_name,</if>
-			<if test="functionName != null and functionName != ''">function_name,</if>
-			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
-			<if test="genType != null and genType != ''">gen_type,</if>
-			<if test="genPath != null and genPath != ''">gen_path,</if>
-			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
-			create_time
-         )values(
-			<if test="tableName != null">#{tableName},</if>
-			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
-			<if test="className != null and className != ''">#{className},</if>
-			<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
-			<if test="packageName != null and packageName != ''">#{packageName},</if>
-			<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
-			<if test="businessName != null and businessName != ''">#{businessName},</if>
-			<if test="functionName != null and functionName != ''">#{functionName},</if>
-			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
-			<if test="genType != null and genType != ''">#{genType},</if>
-			<if test="genPath != null and genPath != ''">#{genPath},</if>
-			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
-			sysdate()
-         )
-    </insert>
-    
-    <update id="updateGenTable" parameterType="GenTable">
-        update gen_table
-        <set>
-            <if test="tableName != null">table_name = #{tableName},</if>
-            <if test="tableComment != null and tableComment != ''">table_comment = #{tableComment},</if>
-            <if test="subTableName != null">sub_table_name = #{subTableName},</if>
-            <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
-            <if test="className != null and className != ''">class_name = #{className},</if>
-            <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
-            <if test="genType != null and genType != ''">gen_type = #{genType},</if>
-            <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
-            <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>
-            <if test="packageName != null and packageName != ''">package_name = #{packageName},</if>
-            <if test="moduleName != null and moduleName != ''">module_name = #{moduleName},</if>
-            <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
-            <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
-            <if test="options != null and options != ''">options = #{options},</if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            update_time = sysdate()
-        </set>
-        where table_id = #{tableId}
-    </update>
-    
-    <delete id="deleteGenTableByIds" parameterType="Long">
-        delete from gen_table where table_id in 
-        <foreach collection="array" item="tableId" open="(" separator="," close=")">
-            #{tableId}
-        </foreach>
-    </delete>
-
 </mapper>

ruoyi/src/main/resources/mapper/quartz/SysJobLogMapper.xml

@@ -15,79 +15,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime"     column="create_time"     />
 	</resultMap>
 
-	<sql id="selectJobLogVo">
-        select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time 
-		from sys_job_log
-    </sql>
-	
-	<select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
-		<include refid="selectJobLogVo"/>
-		<where>
-			<if test="jobName != null and jobName != ''">
-				AND job_name like concat('%', #{jobName}, '%')
-			</if>
-			<if test="jobGroup != null and jobGroup != ''">
-				AND job_group = #{jobGroup}
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="invokeTarget != null and invokeTarget != ''">
-				AND invoke_target like concat('%', #{invokeTarget}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-		</where>
-	</select>
-	
-	<select id="selectJobLogAll" resultMap="SysJobLogResult">
-		<include refid="selectJobLogVo"/>
-	</select>
-	
-	<select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
-		<include refid="selectJobLogVo"/>
-		where job_log_id = #{jobLogId}
-	</select>
-	
-	<delete id="deleteJobLogById" parameterType="Long">
- 		delete from sys_job_log where job_log_id = #{jobLogId}
- 	</delete>
- 	
- 	<delete id="deleteJobLogByIds" parameterType="Long">
- 		delete from sys_job_log where job_log_id in
- 		<foreach collection="array" item="jobLogId" open="(" separator="," close=")">
- 			#{jobLogId}
-        </foreach> 
- 	</delete>
- 	
- 	<update id="cleanJobLog">
-        truncate table sys_job_log
-    </update>
- 	
- 	<insert id="insertJobLog" parameterType="SysJobLog">
- 		insert into sys_job_log(
- 			<if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
- 			<if test="jobName != null and jobName != ''">job_name,</if>
- 			<if test="jobGroup != null and jobGroup != ''">job_group,</if>
- 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
- 			<if test="jobMessage != null and jobMessage != ''">job_message,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
- 			create_time
- 		)values(
- 			<if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
- 			<if test="jobName != null and jobName != ''">#{jobName},</if>
- 			<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
- 			<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
- 			<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
- 			sysdate()
- 		)
-	</insert>
-
 </mapper> 

ruoyi/src/main/resources/mapper/quartz/SysJobMapper.xml

@@ -20,92 +20,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="remark"         column="remark"          />
 	</resultMap>
 
-	<sql id="selectJobVo">
-        select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark 
-		from sys_job
-    </sql>
-	
-	<select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
-		<include refid="selectJobVo"/>
-		<where>
-			<if test="jobName != null and jobName != ''">
-				AND job_name like concat('%', #{jobName}, '%')
-			</if>
-			<if test="jobGroup != null and jobGroup != ''">
-				AND job_group = #{jobGroup}
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="invokeTarget != null and invokeTarget != ''">
-				AND invoke_target like concat('%', #{invokeTarget}, '%')
-			</if>
-		</where>
-	</select>
-	
-	<select id="selectJobAll" resultMap="SysJobResult">
-		<include refid="selectJobVo"/>
-	</select>
-	
-	<select id="selectJobById" parameterType="Long" resultMap="SysJobResult">
-		<include refid="selectJobVo"/>
-		where job_id = #{jobId}
-	</select>
-	
-	<delete id="deleteJobById" parameterType="Long">
- 		delete from sys_job where job_id = #{jobId}
- 	</delete>
- 	
- 	<delete id="deleteJobByIds" parameterType="Long">
- 		delete from sys_job where job_id in
- 		<foreach collection="array" item="jobId" open="(" separator="," close=")">
- 			#{jobId}
-        </foreach> 
- 	</delete>
- 	
- 	<update id="updateJob" parameterType="SysJob">
- 		update sys_job
- 		<set>
- 			<if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
- 			<if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
- 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target = #{invokeTarget},</if>
- 			<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
- 			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
- 			<if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
- 			<if test="status !=null">status = #{status},</if>
- 			<if test="remark != null and remark != ''">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where job_id = #{jobId}
-	</update>
- 	
- 	<insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
- 		insert into sys_job(
- 			<if test="jobId != null and jobId != 0">job_id,</if>
- 			<if test="jobName != null and jobName != ''">job_name,</if>
- 			<if test="jobGroup != null and jobGroup != ''">job_group,</if>
- 			<if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
- 			<if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
- 			<if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
- 			<if test="concurrent != null and concurrent != ''">concurrent,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="jobId != null and jobId != 0">#{jobId},</if>
- 			<if test="jobName != null and jobName != ''">#{jobName},</if>
- 			<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
- 			<if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
- 			<if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
- 			<if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
- 			<if test="concurrent != null and concurrent != ''">#{concurrent},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -1,112 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
 
     <resultMap type="SysConfig" id="SysConfigResult">
-    	<id     property="configId"      column="config_id"      />
+        <id property="configId" column="config_id"/>
-        <result property="configName"    column="config_name"    />
+        <result property="configName" column="config_name"/>
-        <result property="configKey"     column="config_key"     />
+        <result property="configKey" column="config_key"/>
-        <result property="configValue"   column="config_value"   />
+        <result property="configValue" column="config_value"/>
-        <result property="configType"    column="config_type"    />
+        <result property="configType" column="config_type"/>
-        <result property="createBy"      column="create_by"      />
+        <result property="createBy" column="create_by"/>
-        <result property="createTime"    column="create_time"    />
+        <result property="createTime" column="create_time"/>
-        <result property="updateBy"      column="update_by"      />
+        <result property="updateBy" column="update_by"/>
-        <result property="updateTime"    column="update_time"    />
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
-    <sql id="selectConfigVo">
-        select config_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>
-			<if test="configKey !=null and configKey != ''">
-				and config_key = #{configKey}
-			</if>
-		</where>
-	</sql>
-    
-    <select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
-        <include refid="selectConfigVo"/>
-        <include refid="sqlwhereSearch"/>
-    </select>
-    
-    <select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
-        <include refid="selectConfigVo"/>
-        <where>
-			<if test="configName != null and configName != ''">
-				AND config_name like concat('%', #{configName}, '%')
-			</if>
-			<if test="configType != null and configType != ''">
-				AND config_type = #{configType}
-			</if>
-			<if test="configKey != null and configKey != ''">
-				AND config_key like concat('%', #{configKey}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-		</where>
-    </select>
-    
-    <select id="checkConfigKeyUnique" parameterType="String" resultMap="SysConfigResult">
-        <include refid="selectConfigVo"/>
-        where config_key = #{configKey} limit 1
-    </select>
-    
-    <insert id="insertConfig" parameterType="SysConfig">
-        insert into sys_config (
-			<if test="configName != null and configName != '' ">config_name,</if>
-			<if test="configKey != null and configKey != '' ">config_key,</if>
-			<if test="configValue != null and configValue != '' ">config_value,</if>
-			<if test="configType != null and configType != '' ">config_type,</if>
-			<if test="createBy != null and createBy != ''">create_by,</if>
-			<if test="remark != null and remark != ''">remark,</if>
- 			create_time
-        )values(
-			<if test="configName != null and configName != ''">#{configName},</if>
-			<if test="configKey != null and configKey != ''">#{configKey},</if>
-			<if test="configValue != null and configValue != ''">#{configValue},</if>
-			<if test="configType != null and configType != ''">#{configType},</if>
-			<if test="createBy != null and createBy != ''">#{createBy},</if>
-			<if test="remark != null and remark != ''">#{remark},</if>
- 			sysdate()
-		)
-    </insert>
-	 
-    <update id="updateConfig" parameterType="SysConfig">
-        update sys_config 
-        <set>
-            <if test="configName != null and configName != ''">config_name = #{configName},</if>
-            <if test="configKey != null and configKey != ''">config_key = #{configKey},</if>
-            <if test="configValue != null and configValue != ''">config_value = #{configValue},</if>
-            <if test="configType != null and configType != ''">config_type = #{configType},</if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-            <if test="remark != null">remark = #{remark},</if>
- 			update_time = sysdate()
-        </set>
-        where config_id = #{configId}
-    </update>
-	
-    <delete id="deleteConfigById" parameterType="Long">
-        delete from sys_config where config_id = #{configId}
-    </delete>
-    
-    <delete id="deleteConfigByIds" parameterType="Long">
-        delete from sys_config where config_id in 
-        <foreach item="configId" collection="array" open="(" separator="," close=")">
-        	#{configId}
-        </foreach>
-    </delete>
-    
 </mapper>

ruoyi/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -1,157 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
 
-	<resultMap type="SysDept" id="SysDeptResult">
+    <resultMap type="SysDept" id="SysDeptResult">
-		<id     property="deptId"     column="dept_id"     />
+        <id property="deptId" column="dept_id"/>
-		<result property="parentId"   column="parent_id"   />
+        <result property="parentId" column="parent_id"/>
-		<result property="ancestors"  column="ancestors"   />
+        <result property="ancestors" column="ancestors"/>
-		<result property="deptName"   column="dept_name"   />
+        <result property="deptName" column="dept_name"/>
-		<result property="orderNum"   column="order_num"   />
+        <result property="orderNum" column="order_num"/>
-		<result property="leader"     column="leader"      />
+        <result property="leader" column="leader"/>
-		<result property="phone"      column="phone"       />
+        <result property="phone" column="phone"/>
-		<result property="email"      column="email"       />
+        <result property="email" column="email"/>
-		<result property="status"     column="status"      />
+        <result property="status" column="status"/>
-		<result property="delFlag"    column="del_flag"    />
+        <result property="delFlag" column="del_flag"/>
-		<result property="parentName" column="parent_name" />
+        <result property="parentName" column="parent_name"/>
-		<result property="createBy"   column="create_by"   />
+        <result property="createBy" column="create_by"/>
-		<result property="createTime" column="create_time" />
+        <result property="createTime" column="create_time"/>
-		<result property="updateBy"   column="update_by"   />
+        <result property="updateBy" column="update_by"/>
-		<result property="updateTime" column="update_time" />
+        <result property="updateTime" column="update_time"/>
-	</resultMap>
+    </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 
-        from sys_dept d
-    </sql>
-    
-	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
-        <include refid="selectDeptVo"/>
-        where d.del_flag = '0'
-        <if test="parentId != null and parentId != 0">
-			AND parent_id = #{parentId}
-		</if>
-		<if test="deptName != null and deptName != ''">
-			AND dept_name like concat('%', #{deptName}, '%')
-		</if>
-		<if test="status != null and status != ''">
-			AND status = #{status}
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-		order by d.parent_id, d.order_num
-    </select>
 
     <select id="selectDeptListByRoleId" resultType="Integer">
-		select d.dept_id
+        select d.dept_id
-		from sys_dept d
+        from sys_dept d
-            left join sys_role_dept rd on d.dept_id = rd.dept_id
+        left join sys_role_dept rd on d.dept_id = rd.dept_id
         where rd.role_id = #{roleId}
-            <if test="deptCheckStrictly">
+        <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.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
-            </if>
+            rd.dept_id and rd.role_id = #{roleId})
-		order by d.parent_id, d.order_num
+        </if>
-	</select>
+        order by d.parent_id, d.order_num
-    
+    </select>
-    <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
-		<include refid="selectDeptVo"/>
-		where dept_id = #{deptId}
-	</select>
-    
-    <select id="checkDeptExistUser" parameterType="Long" resultType="int">
-		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
-	</select>
-	
-	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
-		select count(1) from sys_dept
-		where del_flag = '0' and parent_id = #{deptId} limit 1
-	</select>
-	
-	<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
-		select * from sys_dept where find_in_set(#{deptId}, ancestors)
-	</select>
-	
-	<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
-		select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors)
-	</select>
-	
-	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
-	    <include refid="selectDeptVo"/>
-		where dept_name=#{deptName} and parent_id = #{parentId} limit 1
-	</select>
-    
-    <insert id="insertDept" parameterType="SysDept">
- 		insert into sys_dept(
- 			<if test="deptId != null and deptId != 0">dept_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>
- 			<if test="orderNum != null and orderNum != ''">order_num,</if>
- 			<if test="leader != null and leader != ''">leader,</if>
- 			<if test="phone != null and phone != ''">phone,</if>
- 			<if test="email != null and email != ''">email,</if>
- 			<if test="status != null">status,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="deptId != null and deptId != 0">#{deptId},</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>
- 			<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
- 			<if test="leader != null and leader != ''">#{leader},</if>
- 			<if test="phone != null and phone != ''">#{phone},</if>
- 			<if test="email != null and email != ''">#{email},</if>
- 			<if test="status != null">#{status},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-	
-	<update id="updateDept" parameterType="SysDept">
- 		update sys_dept
- 		<set>
- 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
- 			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
- 			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
- 			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
- 			<if test="leader != null">leader = #{leader},</if>
- 			<if test="phone != null">phone = #{phone},</if>
- 			<if test="email != null">email = #{email},</if>
- 			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where dept_id = #{deptId}
-	</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}
-	    </foreach>
-	    where dept_id in
-	    <foreach collection="depts" item="item" index="index"
-	        separator="," open="(" close=")">
-	        #{item.deptId}
-	    </foreach>
-	</update>
-	 
-	 <update id="updateDeptStatus" parameterType="SysDept">
- 	    update sys_dept
- 	    <set>
- 	        <if test="status != null and status != ''">status = #{status},</if>
- 	        <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 	        update_time = sysdate()
-        </set>
- 	    where dept_id in (${ancestors})
-	</update>
-	
-	<delete id="deleteDeptById" parameterType="Long">
-		update sys_dept set del_flag = '2' where dept_id = #{deptId}
-	</delete>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -1,124 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper">
 
-	<resultMap type="SysDictData" id="SysDictDataResult">
+    <resultMap type="SysDictData" id="SysDictDataResult">
-		<id     property="dictCode"   column="dict_code"   />
+        <id property="dictCode" column="dict_code"/>
-		<result property="dictSort"   column="dict_sort"   />
+        <result property="dictSort" column="dict_sort"/>
-		<result property="dictLabel"  column="dict_label"  />
+        <result property="dictLabel" column="dict_label"/>
-		<result property="dictValue"  column="dict_value"  />
+        <result property="dictValue" column="dict_value"/>
-		<result property="dictType"   column="dict_type"   />
+        <result property="dictType" column="dict_type"/>
-		<result property="cssClass"   column="css_class"   />
+        <result property="cssClass" column="css_class"/>
-		<result property="listClass"  column="list_class"  />
+        <result property="listClass" column="list_class"/>
-		<result property="isDefault"  column="is_default"  />
+        <result property="isDefault" column="is_default"/>
-		<result property="status"     column="status"      />
+        <result property="status" column="status"/>
-		<result property="createBy"   column="create_by"   />
+        <result property="createBy" column="create_by"/>
-		<result property="createTime" column="create_time" />
+        <result property="createTime" column="create_time"/>
-		<result property="updateBy"   column="update_by"   />
+        <result property="updateBy" column="update_by"/>
-		<result property="updateTime" column="update_time" />
+        <result property="updateTime" column="update_time"/>
-	</resultMap>
+    </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 
-		from sys_dict_data
-    </sql>
-
-	<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
-	    <include refid="selectDictDataVo"/>
-		<where>
-		    <if test="dictType != null and dictType != ''">
-				AND dict_type = #{dictType}
-			</if>
-			<if test="dictLabel != null and dictLabel != ''">
-				AND dict_label like concat('%', #{dictLabel}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-		</where>
-		order by dict_sort asc
-	</select>
-	
-	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
-		<include refid="selectDictDataVo"/>
-		where status = '0' and dict_type = #{dictType} order by dict_sort asc
-	</select>
-	
-	<select id="selectDictLabel" resultType="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}
-	</select>
-	
-	<select id="countDictDataByType" resultType="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>
- 	
- 	<delete id="deleteDictDataByIds" parameterType="Long">
- 		delete from sys_dict_data where dict_code in
- 		<foreach collection="array" item="dictCode" open="(" separator="," close=")">
- 			#{dictCode}
-        </foreach> 
- 	</delete>
-	
-	<update id="updateDictData" parameterType="SysDictData">
- 		update sys_dict_data
- 		<set>
- 			<if test="dictSort != null">dict_sort = #{dictSort},</if>
- 			<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
- 			<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
- 			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- 			<if test="cssClass != null">css_class = #{cssClass},</if>
- 			<if test="listClass != null">list_class = #{listClass},</if>
- 			<if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
- 			<if test="status != null">status = #{status},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where dict_code = #{dictCode}
-	</update>
-	
-	<update id="updateDictDataType" parameterType="String">
- 		update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
-	</update>
- 	
- 	<insert id="insertDictData" parameterType="SysDictData">
- 		insert into sys_dict_data(
- 			<if test="dictSort != null">dict_sort,</if>
- 			<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
- 			<if test="dictValue != null and dictValue != ''">dict_value,</if>
- 			<if test="dictType != null and dictType != ''">dict_type,</if>
- 			<if test="cssClass != null and cssClass != ''">css_class,</if>
- 			<if test="listClass != null and listClass != ''">list_class,</if>
- 			<if test="isDefault != null and isDefault != ''">is_default,</if>
- 			<if test="status != null">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 		    <if test="dictSort != null">#{dictSort},</if>
- 		    <if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
- 			<if test="dictValue != null and dictValue != ''">#{dictValue},</if>
- 			<if test="dictType != null and dictType != ''">#{dictType},</if>
- 			<if test="cssClass != null and cssClass != ''">#{cssClass},</if>
- 			<if test="listClass != null and listClass != ''">#{listClass},</if>
- 			<if test="isDefault != null and isDefault != ''">#{isDefault},</if>
- 			<if test="status != null">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -1,105 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
 
-	<resultMap type="SysDictType" id="SysDictTypeResult">
+    <resultMap type="SysDictType" id="SysDictTypeResult">
-		<id     property="dictId"     column="dict_id"     />
+        <id property="dictId" column="dict_id"/>
-		<result property="dictName"   column="dict_name"   />
+        <result property="dictName" column="dict_name"/>
-		<result property="dictType"   column="dict_type"   />
+        <result property="dictType" column="dict_type"/>
-		<result property="status"     column="status"      />
+        <result property="status" column="status"/>
-		<result property="createBy"   column="create_by"   />
+        <result property="createBy" column="create_by"/>
-		<result property="createTime" column="create_time" />
+        <result property="createTime" column="create_time"/>
-		<result property="updateBy"   column="update_by"   />
+        <result property="updateBy" column="update_by"/>
-		<result property="updateTime" column="update_time" />
+        <result property="updateTime" column="update_time"/>
-	</resultMap>
+    </resultMap>
-	
-	<sql id="selectDictTypeVo">
-        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
-		from sys_dict_type
-    </sql>
-
-	<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
-	    <include refid="selectDictTypeVo"/>
-		<where>
-		    <if test="dictName != null and dictName != ''">
-				AND dict_name like concat('%', #{dictName}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="dictType != null and dictType != ''">
-				AND dict_type like concat('%', #{dictType}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-	    </where>
-	</select>
-	
-	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-	</select>
-	
-	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-		where dict_id = #{dictId}
-	</select>
-	
-	<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-		where dict_type = #{dictType}
-	</select>
-	
-	<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
-		<include refid="selectDictTypeVo"/>
-		where dict_type = #{dictType} limit 1
-	</select>
-	
-	<delete id="deleteDictTypeById" parameterType="Long">
- 		delete from sys_dict_type where dict_id = #{dictId}
- 	</delete>
- 	
- 	<delete id="deleteDictTypeByIds" parameterType="Long">
- 		delete from sys_dict_type where dict_id in
- 		<foreach collection="array" item="dictId" open="(" separator="," close=")">
- 			#{dictId}
-        </foreach> 
- 	</delete>
-
- 	<update id="updateDictType" parameterType="SysDictType">
- 		update sys_dict_type
- 		<set>
- 			<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
- 			<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
- 			<if test="status != null">status = #{status},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where dict_id = #{dictId}
-	</update>
- 	
- 	<insert id="insertDictType" parameterType="SysDictType">
- 		insert into sys_dict_type(
- 			<if test="dictName != null and dictName != ''">dict_name,</if>
- 			<if test="dictType != null and dictType != ''">dict_type,</if>
- 			<if test="status != null">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="dictName != null and dictName != ''">#{dictName},</if>
- 			<if test="dictType != null and dictType != ''">#{dictType},</if>
- 			<if test="status != null">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -1,57 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper">
 
-	<resultMap type="SysLogininfor" id="SysLogininforResult">
+    <resultMap type="SysLogininfor" id="SysLogininforResult">
-		<id     property="infoId"        column="info_id"           />
+        <id property="infoId" column="info_id"/>
-		<result property="userName"      column="user_name"         />
+        <result property="userName" column="user_name"/>
-		<result property="status"        column="status"            />
+        <result property="status" column="status"/>
-		<result property="ipaddr"        column="ipaddr"            />
+        <result property="ipaddr" column="ipaddr"/>
-		<result property="loginLocation" column="login_location"    />
+        <result property="loginLocation" column="login_location"/>
-		<result property="browser"       column="browser"           />
+        <result property="browser" column="browser"/>
-		<result property="os"            column="os"                />
+        <result property="os" column="os"/>
-		<result property="msg"           column="msg"               />
+        <result property="msg" column="msg"/>
-		<result property="loginTime"     column="login_time"        />
+        <result property="loginTime" column="login_time"/>
-	</resultMap>
+    </resultMap>
-
-	<insert id="insertLogininfor" parameterType="SysLogininfor">
-		insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
-		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
-	</insert>
-	
-	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
-		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
-		<where>
-			<if test="ipaddr != null and ipaddr != ''">
-				AND ipaddr like concat('%', #{ipaddr}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="userName != null and userName != ''">
-				AND user_name like concat('%', #{userName}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(login_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(login_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-		</where>
-		order by info_id desc
-	</select>
-	
-	<delete id="deleteLogininforByIds" parameterType="Long">
- 		delete from sys_logininfor where info_id in
- 		<foreach collection="array" item="infoId" open="(" separator="," close=")">
- 			#{infoId}
-        </foreach> 
- 	</delete>
-    
-    <update id="cleanLogininfor">
-        truncate table sys_logininfor
-    </update>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -1,191 +1,146 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
 
-	<resultMap type="SysMenu" id="SysMenuResult">
+    <resultMap type="SysMenu" id="SysMenuResult">
-		<id     property="menuId"         column="menu_id"        />
+        <id property="menuId" column="menu_id"/>
-		<result property="menuName"       column="menu_name"      />
+        <result property="menuName" column="menu_name"/>
-		<result property="parentName"     column="parent_name"    />
+        <result property="parentName" column="parent_name"/>
-		<result property="parentId"       column="parent_id"      />
+        <result property="parentId" column="parent_id"/>
-		<result property="orderNum"       column="order_num"      />
+        <result property="orderNum" column="order_num"/>
-		<result property="path"           column="path"           />
+        <result property="path" column="path"/>
-		<result property="component"      column="component"      />
+        <result property="component" column="component"/>
-		<result property="isFrame"        column="is_frame"       />
+        <result property="isFrame" column="is_frame"/>
-		<result property="isCache"        column="is_cache"       />
+        <result property="isCache" column="is_cache"/>
-		<result property="menuType"       column="menu_type"      />
+        <result property="menuType" column="menu_type"/>
-		<result property="visible"        column="visible"        />
+        <result property="visible" column="visible"/>
-		<result property="status"         column="status"         />
+        <result property="status" column="status"/>
-		<result property="perms"          column="perms"          />
+        <result property="perms" column="perms"/>
-		<result property="icon"           column="icon"           />
+        <result property="icon" column="icon"/>
-		<result property="createBy"       column="create_by"      />
+        <result property="createBy" column="create_by"/>
-		<result property="createTime"     column="create_time"    />
+        <result property="createTime" column="create_time"/>
-		<result property="updateTime"     column="update_time"    />
+        <result property="updateTime" column="update_time"/>
-		<result property="updateBy"       column="update_by"      />
+        <result property="updateBy" column="update_by"/>
-		<result property="remark"         column="remark"         />
+        <result property="remark" column="remark"/>
-	</resultMap>
+    </resultMap>
 
-	<sql id="selectMenuVo">
+    <sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time 
+        select menu_id,
-		from sys_menu
+               menu_name,
+               parent_id,
+               order_num,
+               path,
+               component,
+               is_frame,
+               is_cache,
+               menu_type,
+               visible,
+               status,
+               ifnull(perms, '') as perms,
+               icon,
+               create_time
+        from sys_menu
     </sql>
 
-    <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
-		<include refid="selectMenuVo"/>
-		<where>
-			<if test="menuName != null and menuName != ''">
-				AND menu_name like concat('%', #{menuName}, '%')
-			</if>
-			<if test="visible != null and visible != ''">
-				AND visible = #{visible}
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-		</where>
-		order by parent_id, order_num
-	</select>
 
-	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
+    <select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+        select distinct m.menu_id,
-		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
+                        m.parent_id,
-		order by m.parent_id, m.order_num
+                        m.menu_name,
-	</select>
+                        m.path,
+                        m.component,
+                        m.visible,
+                        m.status,
+                        ifnull(m.perms, '') as perms,
+                        m.is_frame,
+                        m.is_cache,
+                        m.menu_type,
+                        m.icon,
+                        m.order_num,
+                        m.create_time
+        from sys_menu m
+        where m.menu_type in ('M', 'C')
+          and m.status = 0
+        order by m.parent_id, m.order_num
+    </select>
 
-	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
+    <select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status,
-		from sys_menu m
+        ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
-		left join sys_role_menu rm on m.menu_id = rm.menu_id
+        from sys_menu m
-		left join sys_user_role ur on rm.role_id = ur.role_id
+        left join sys_role_menu rm on m.menu_id = rm.menu_id
-		left join sys_role ro on ur.role_id = ro.role_id
+        left join sys_user_role ur on rm.role_id = ur.role_id
-		where ur.user_id = #{params.userId}
+        left join sys_role ro on ur.role_id = ro.role_id
-		<if test="menuName != null and menuName != ''">
+        where ur.user_id = #{params.userId}
+        <if test="menuName != null and menuName != ''">
             AND menu_name like concat('%', #{menuName}, '%')
-		</if>
+        </if>
-		<if test="visible != null and visible != ''">
+        <if test="visible != null and visible != ''">
             AND visible = #{visible}
-		</if>
+        </if>
-		<if test="status != null and status != ''">
+        <if test="status != null and status != ''">
             AND status = #{status}
-		</if>
+        </if>
-		order by m.parent_id, m.order_num
+        order by m.parent_id, m.order_num
-	</select>
+    </select>
 
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+        select distinct m.menu_id,
-		from sys_menu m
+                        m.parent_id,
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+                        m.menu_name,
-			 left join sys_user_role ur on rm.role_id = ur.role_id
+                        m.path,
-			 left join sys_role ro on ur.role_id = ro.role_id
+                        m.component,
-			 left join sys_user u on ur.user_id = u.user_id
+                        m.visible,
-		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
+                        m.status,
-		order by m.parent_id, m.order_num
+                        ifnull(m.perms, '') as perms,
-	</select>
+                        m.is_frame,
+                        m.is_cache,
+                        m.menu_type,
+                        m.icon,
+                        m.order_num,
+                        m.create_time
+        from sys_menu m
+                 left join sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join sys_user_role ur on rm.role_id = ur.role_id
+                 left join sys_role ro on ur.role_id = ro.role_id
+                 left join sys_user u on ur.user_id = u.user_id
+        where u.user_id = #{userId}
+          and m.menu_type in ('M', 'C')
+          and m.status = 0
+          AND ro.status = 0
+        order by m.parent_id, m.order_num
+    </select>
 
-	<select id="selectMenuListByRoleId" resultType="Integer">
+    <select id="selectMenuListByRoleId" resultType="Integer">
-		select m.menu_id
+        select m.menu_id
-		from sys_menu m
+        from sys_menu m
-            left join sys_role_menu rm on m.menu_id = rm.menu_id
+        left join sys_role_menu rm on m.menu_id = rm.menu_id
         where rm.role_id = #{roleId}
-            <if test="menuCheckStrictly">
+        <if test="menuCheckStrictly">
-              and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id = rm.menu_id and rm.role_id = #{roleId})
+            and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id =
-            </if>
+            rm.menu_id and rm.role_id = #{roleId})
-		order by m.parent_id, m.order_num
+        </if>
-	</select>
+        order by m.parent_id, m.order_num
+    </select>
 
-	<select id="selectMenuPerms" resultType="String">
+    <select id="selectMenuPerms" resultType="String">
-		select distinct m.perms
+        select distinct m.perms
-		from sys_menu m
+        from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join sys_role_menu rm on m.menu_id = rm.menu_id
-			 left join sys_user_role ur on rm.role_id = ur.role_id
+                 left join sys_user_role ur on rm.role_id = ur.role_id
-	</select>
+    </select>
 
-	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
+    <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
-		select distinct m.perms
+        select distinct m.perms
-		from sys_menu m
+        from sys_menu m
-			 left join sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join sys_role_menu rm on m.menu_id = rm.menu_id
-			 left join sys_user_role ur on rm.role_id = ur.role_id
+                 left join sys_user_role ur on rm.role_id = ur.role_id
-			 left join sys_role r on r.role_id = ur.role_id
+                 left join sys_role r on r.role_id = ur.role_id
-		where m.status = '0' and r.status = '0' and ur.user_id = #{userId}
+        where m.status = '0'
-	</select>
+          and r.status = '0'
-	
+          and ur.user_id = #{userId}
-	<select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
+    </select>
-		<include refid="selectMenuVo"/>
-		where menu_id = #{menuId}
-	</select>
-	
-	<select id="hasChildByMenuId" resultType="Integer">
-	    select count(1) from sys_menu where parent_id = #{menuId}  
-	</select>
-	
-	<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
-		<include refid="selectMenuVo"/>
-		where menu_name=#{menuName} and parent_id = #{parentId} limit 1
-	</select>
-	
-	<update id="updateMenu" parameterType="SysMenu">
-		update sys_menu
-		<set>
-			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
-			<if test="parentId != null">parent_id = #{parentId},</if>
-			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
-			<if test="path != null and path != ''">path = #{path},</if>
-			<if test="component != null">component = #{component},</if>
-			<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
-			<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
-			<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
-			<if test="visible != null">visible = #{visible},</if>
-			<if test="status != null">status = #{status},</if>
-			<if test="perms !=null">perms = #{perms},</if>
-			<if test="icon !=null and icon != ''">icon = #{icon},</if>
-			<if test="remark != null and remark != ''">remark = #{remark},</if>
-			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-			update_time = sysdate()
-		</set>
-		where menu_id = #{menuId}
-	</update>
-
-	<insert id="insertMenu" parameterType="SysMenu">
-		insert into sys_menu(
-		<if test="menuId != null and menuId != 0">menu_id,</if>
-		<if test="parentId != null and parentId != 0">parent_id,</if>
-		<if test="menuName != null and menuName != ''">menu_name,</if>
-		<if test="orderNum != null and orderNum != ''">order_num,</if>
-		<if test="path != null and path != ''">path,</if>
-		<if test="component != null and component != ''">component,</if>
-		<if test="isFrame != null and isFrame != ''">is_frame,</if>
-		<if test="isCache != null and isCache != ''">is_cache,</if>
-		<if test="menuType != null and menuType != ''">menu_type,</if>
-		<if test="visible != null">visible,</if>
-		<if test="status != null">status,</if>
-		<if test="perms !=null and perms != ''">perms,</if>
-		<if test="icon != null and icon != ''">icon,</if>
-		<if test="remark != null and remark != ''">remark,</if>
-		<if test="createBy != null and createBy != ''">create_by,</if>
-		create_time
-		)values(
-		<if test="menuId != null and menuId != 0">#{menuId},</if>
-		<if test="parentId != null and parentId != 0">#{parentId},</if>
-		<if test="menuName != null and menuName != ''">#{menuName},</if>
-		<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
-		<if test="path != null and path != ''">#{path},</if>
-		<if test="component != null and component != ''">#{component},</if>
-		<if test="isFrame != null and isFrame != ''">#{isFrame},</if>
-		<if test="isCache != null and isCache != ''">#{isCache},</if>
-		<if test="menuType != null and menuType != ''">#{menuType},</if>
-		<if test="visible != null">#{visible},</if>
-		<if test="status != null">#{status},</if>
-		<if test="perms !=null and perms != ''">#{perms},</if>
-		<if test="icon != null and icon != ''">#{icon},</if>
-		<if test="remark != null and remark != ''">#{remark},</if>
-		<if test="createBy != null and createBy != ''">#{createBy},</if>
-		sysdate()
-		)
-	</insert>
-	
-	<delete id="deleteMenuById" parameterType="Long">
-	    delete from sys_menu where menu_id = #{menuId}
-	</delete>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -1,89 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper">
 
     <resultMap type="SysNotice" id="SysNoticeResult">
-        <result property="noticeId"       column="notice_id"       />
+        <result property="noticeId" column="notice_id"/>
-        <result property="noticeTitle"    column="notice_title"    />
+        <result property="noticeTitle" column="notice_title"/>
-        <result property="noticeType"     column="notice_type"     />
+        <result property="noticeType" column="notice_type"/>
-        <result property="noticeContent"  column="notice_content"  />
+        <result property="noticeContent" column="notice_content"/>
-        <result property="status"         column="status"          />
+        <result property="status" column="status"/>
-        <result property="createBy"       column="create_by"       />
+        <result property="createBy" column="create_by"/>
-        <result property="createTime"     column="create_time"     />
+        <result property="createTime" column="create_time"/>
-        <result property="updateBy"       column="update_by"       />
+        <result property="updateBy" column="update_by"/>
-        <result property="updateTime"     column="update_time"     />
+        <result property="updateTime" column="update_time"/>
-        <result property="remark"         column="remark"          />
+        <result property="remark" column="remark"/>
     </resultMap>
 
-    <sql id="selectNoticeVo">
-        select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark
-		from sys_notice
-    </sql>
-    
-    <select id="selectNoticeById" parameterType="Long" resultMap="SysNoticeResult">
-        <include refid="selectNoticeVo"/>
-        where notice_id = #{noticeId}
-    </select>
-    
-    <select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
-        <include refid="selectNoticeVo"/>
-        <where>
-			<if test="noticeTitle != null and noticeTitle != ''">
-				AND notice_title like concat('%', #{noticeTitle}, '%')
-			</if>
-			<if test="noticeType != null and noticeType != ''">
-				AND notice_type = #{noticeType}
-			</if>
-			<if test="createBy != null and createBy != ''">
-				AND create_by like concat('%', #{createBy}, '%')
-			</if>
-		</where>
-    </select>
-    
-    <insert id="insertNotice" parameterType="SysNotice">
-        insert into sys_notice (
-			<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
-			<if test="noticeType != null and noticeType != '' ">notice_type, </if>
-			<if test="noticeContent != null and noticeContent != '' ">notice_content, </if>
-			<if test="status != null and status != '' ">status, </if>
-			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
-			<if test="noticeTitle != null and noticeTitle != ''">#{noticeTitle}, </if>
-			<if test="noticeType != null and noticeType != ''">#{noticeType}, </if>
-			<if test="noticeContent != null and noticeContent != ''">#{noticeContent}, </if>
-			<if test="status != null and status != ''">#{status}, </if>
-			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
-		)
-    </insert>
-	 
-    <update id="updateNotice" parameterType="SysNotice">
-        update sys_notice 
-        <set>
-            <if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
-            <if test="noticeType != null and noticeType != ''">notice_type = #{noticeType}, </if>
-            <if test="noticeContent != null">notice_content = #{noticeContent}, </if>
-            <if test="status != null and status != ''">status = #{status}, </if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
-        </set>
-        where notice_id = #{noticeId}
-    </update>
-	
-    <delete id="deleteNoticeById" parameterType="Long">
-        delete from sys_notice where notice_id = #{noticeId}
-    </delete>
-    
-    <delete id="deleteNoticeByIds" parameterType="Long">
-        delete from sys_notice where notice_id in 
-        <foreach item="noticeId" collection="array" open="(" separator="," close=")">
-            #{noticeId}
-        </foreach>
-    </delete>
-    
 </mapper>

ruoyi/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -1,83 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper">
 
-	<resultMap type="SysOperLog" id="SysOperLogResult">
+    <resultMap type="SysOperLog" id="SysOperLogResult">
-		<id     property="operId"         column="oper_id"        />
+        <id property="operId" column="oper_id"/>
-		<result property="title"          column="title"          />
+        <result property="title" column="title"/>
-		<result property="businessType"   column="business_type"  />
+        <result property="businessType" column="business_type"/>
-		<result property="method"         column="method"         />
+        <result property="method" column="method"/>
-		<result property="requestMethod"  column="request_method" />
+        <result property="requestMethod" column="request_method"/>
-		<result property="operatorType"   column="operator_type"  />
+        <result property="operatorType" column="operator_type"/>
-		<result property="operName"       column="oper_name"      />
+        <result property="operName" column="oper_name"/>
-		<result property="deptName"       column="dept_name"      />
+        <result property="deptName" column="dept_name"/>
-		<result property="operUrl"        column="oper_url"       />
+        <result property="operUrl" column="oper_url"/>
-		<result property="operIp"         column="oper_ip"        />
+        <result property="operIp" column="oper_ip"/>
-		<result property="operLocation"   column="oper_location"  />
+        <result property="operLocation" column="oper_location"/>
-		<result property="operParam"      column="oper_param"     />
+        <result property="operParam" column="oper_param"/>
-		<result property="jsonResult"     column="json_result"    />
+        <result property="jsonResult" column="json_result"/>
-		<result property="status"         column="status"         />
+        <result property="status" column="status"/>
-		<result property="errorMsg"       column="error_msg"      />
+        <result property="errorMsg" column="error_msg"/>
-		<result property="operTime"       column="oper_time"      />
+        <result property="operTime" column="oper_time"/>
-	</resultMap>
+    </resultMap>
-
-	<sql id="selectOperLogVo">
-        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time
-        from sys_oper_log
-    </sql>
-    
-	<insert id="insertOperlog" parameterType="SysOperLog">
-		insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time)
-        values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate())
-	</insert>
-	
-	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
-		<include refid="selectOperLogVo"/>
-		<where>
-			<if test="title != null and title != ''">
-				AND title like concat('%', #{title}, '%')
-			</if>
-			<if test="businessType != null and businessType != ''">
-				AND business_type = #{businessType}
-			</if>
-			<if test="businessTypes != null and businessTypes.length > 0">
-			    AND business_type in
-			    <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
-		 			#{businessType}
-		        </foreach> 
-			</if>
-			<if test="status != null">
-				AND status = #{status}
-			</if>
-			<if test="operName != null and operName != ''">
-				AND oper_name like concat('%', #{operName}, '%')
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(oper_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-		</where>
-		order by oper_id desc
-	</select>
-	
-	<delete id="deleteOperLogByIds" parameterType="Long">
- 		delete from sys_oper_log where oper_id in
- 		<foreach collection="array" item="operId" open="(" separator="," close=")">
- 			#{operId}
-        </foreach> 
- 	</delete>
- 	
- 	<select id="selectOperLogById" parameterType="Long" resultMap="SysOperLogResult">
-		<include refid="selectOperLogVo"/>
-		where oper_id = #{operId}
-	</select>
-	
-	<update id="cleanOperLog">
-        truncate table sys_oper_log
-    </update>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysPostMapper.xml

@@ -1,122 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysPostMapper">
 
-	<resultMap type="SysPost" id="SysPostResult">
+    <resultMap type="SysPost" id="SysPostResult">
-		<id     property="postId"        column="post_id"       />
+        <id property="postId" column="post_id"/>
-		<result property="postCode"      column="post_code"     />
+        <result property="postCode" column="post_code"/>
-		<result property="postName"      column="post_name"     />
+        <result property="postName" column="post_name"/>
-		<result property="postSort"      column="post_sort"     />
+        <result property="postSort" column="post_sort"/>
-		<result property="status"        column="status"        />
+        <result property="status" column="status"/>
-		<result property="createBy"      column="create_by"     />
+        <result property="createBy" column="create_by"/>
-		<result property="createTime"    column="create_time"   />
+        <result property="createTime" column="create_time"/>
-		<result property="updateBy"      column="update_by"     />
+        <result property="updateBy" column="update_by"/>
-		<result property="updateTime"    column="update_time"   />
+        <result property="updateTime" column="update_time"/>
-		<result property="remark"        column="remark"        />
+        <result property="remark" column="remark"/>
-	</resultMap>
+    </resultMap>
 
-	<sql id="selectPostVo">
+    <sql id="selectPostVo">
-        select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
+        select post_id,
-		from sys_post
+               post_code,
+               post_name,
+               post_sort,
+               status,
+               create_by,
+               create_time,
+               remark
+        from sys_post
     </sql>
 
-	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
+    <select id="selectPostListByUserId" parameterType="Long" resultType="Integer">
-	    <include refid="selectPostVo"/>
+        select p.post_id
-		<where>
-			<if test="postCode != null and postCode != ''">
-				AND post_code like concat('%', #{postCode}, '%')
-			</if>
-			<if test="status != null and status != ''">
-				AND status = #{status}
-			</if>
-			<if test="postName != null and postName != ''">
-				AND post_name like concat('%', #{postName}, '%')
-			</if>
-		</where>
-	</select>
-	
-	<select id="selectPostAll" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-	</select>
-	
-	<select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-		where post_id = #{postId}
-	</select>
-	
-	<select id="selectPostListByUserId" parameterType="Long" resultType="Integer">
-		select p.post_id
         from sys_post p
-	        left join sys_user_post up on up.post_id = p.post_id
+                 left join sys_user_post up on up.post_id = p.post_id
-	        left join sys_user u on u.user_id = up.user_id
+                 left join sys_user u on u.user_id = up.user_id
-	    where u.user_id = #{userId}
+        where u.user_id = #{userId}
-	</select>
+    </select>
 
-	<select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
+    <select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
-		select p.post_id, p.post_name, p.post_code
+        select p.post_id, p.post_name, p.post_code
-		from sys_post p
+        from sys_post p
-			 left join sys_user_post up on up.post_id = p.post_id
+                 left join sys_user_post up on up.post_id = p.post_id
-			 left join sys_user u on u.user_id = up.user_id
+                 left join sys_user u on u.user_id = up.user_id
-		where u.user_name = #{userName}
+        where u.user_name = #{userName}
-	</select>
+    </select>
-	
-	<select id="checkPostNameUnique" parameterType="String" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-		 where post_name=#{postName} limit 1
-	</select>
-	
-	<select id="checkPostCodeUnique" parameterType="String" resultMap="SysPostResult">
-		<include refid="selectPostVo"/>
-		 where post_code=#{postCode} limit 1
-	</select>
-	
-	<update id="updatePost" parameterType="SysPost">
- 		update sys_post
- 		<set>
- 			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
- 			<if test="postName != null and postName != ''">post_name = #{postName},</if>
- 			<if test="postSort != null and postSort != ''">post_sort = #{postSort},</if>
- 			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where post_id = #{postId}
-	</update>
- 	
- 	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
- 		insert into sys_post(
- 			<if test="postId != null and postId != 0">post_id,</if>
- 			<if test="postCode != null and postCode != ''">post_code,</if>
- 			<if test="postName != null and postName != ''">post_name,</if>
- 			<if test="postSort != null and postSort != ''">post_sort,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="postId != null and postId != 0">#{postId},</if>
- 			<if test="postCode != null and postCode != ''">#{postCode},</if>
- 			<if test="postName != null and postName != ''">#{postName},</if>
- 			<if test="postSort != null and postSort != ''">#{postSort},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-	
-	<delete id="deletePostById" parameterType="Long">
-		delete from sys_post where post_id = #{postId}
-	</delete>
-	
-	<delete id="deletePostByIds" parameterType="Long">
- 		delete from sys_post where post_id in
- 		<foreach collection="array" item="postId" open="(" separator="," close=")">
- 			#{postId}
-        </foreach> 
- 	</delete>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysRoleDeptMapper.xml

@@ -1,34 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper">
 
-	<resultMap type="SysRoleDept" id="SysRoleDeptResult">
+    <resultMap type="SysRoleDept" id="SysRoleDeptResult">
-		<result property="roleId"     column="role_id"      />
+        <result property="roleId" column="role_id"/>
-		<result property="deptId"     column="dept_id"      />
+        <result property="deptId" column="dept_id"/>
-	</resultMap>
+    </resultMap>
-
-	<delete id="deleteRoleDeptByRoleId" parameterType="Long">
-		delete from sys_role_dept where role_id=#{roleId}
-	</delete>
-	
-	<select id="selectCountRoleDeptByDeptId" resultType="Integer">
-	    select count(1) from sys_role_dept where dept_id=#{deptId}
-	</select>
-	
-	<delete id="deleteRoleDept" parameterType="Long">
- 		delete from sys_role_dept where role_id in
- 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
- 			#{roleId}
-        </foreach> 
- 	</delete>
-	
-	<insert id="batchRoleDept">
-		insert into sys_role_dept(role_id, dept_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.roleId},#{item.deptId})
-		</foreach>
-	</insert>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -1,149 +1,60 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
 
-	<resultMap type="SysRole" id="SysRoleResult">
+    <resultMap type="SysRole" id="SysRoleResult">
-		<id     property="roleId"             column="role_id"               />
+        <id property="roleId" column="role_id"/>
-		<result property="roleName"           column="role_name"             />
+        <result property="roleName" column="role_name"/>
-		<result property="roleKey"            column="role_key"              />
+        <result property="roleKey" column="role_key"/>
-		<result property="roleSort"           column="role_sort"             />
+        <result property="roleSort" column="role_sort"/>
-		<result property="dataScope"          column="data_scope"            />
+        <result property="dataScope" column="data_scope"/>
-		<result property="menuCheckStrictly"  column="menu_check_strictly"   />
+        <result property="menuCheckStrictly" column="menu_check_strictly"/>
-		<result property="deptCheckStrictly"  column="dept_check_strictly"   />
+        <result property="deptCheckStrictly" column="dept_check_strictly"/>
-		<result property="status"             column="status"                />
+        <result property="status" column="status"/>
-		<result property="delFlag"            column="del_flag"              />
+        <result property="delFlag" column="del_flag"/>
-		<result property="createBy"           column="create_by"             />
+        <result property="createBy" column="create_by"/>
-		<result property="createTime"         column="create_time"           />
+        <result property="createTime" column="create_time"/>
-		<result property="updateBy"           column="update_by"             />
+        <result property="updateBy" column="update_by"/>
-		<result property="updateTime"         column="update_time"           />
+        <result property="updateTime" column="update_time"/>
-		<result property="remark"             column="remark"                />
+        <result property="remark" column="remark"/>
-	</resultMap>
+    </resultMap>
 
-	<sql id="selectRoleVo">
+    <sql id="selectRoleVo">
-	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
+        select distinct r.role_id,
-            r.status, r.del_flag, r.create_time, r.remark 
+                        r.role_name,
+                        r.role_key,
+                        r.role_sort,
+                        r.data_scope,
+                        r.menu_check_strictly,
+                        r.dept_check_strictly,
+                        r.status,
+                        r.del_flag,
+                        r.create_time,
+                        r.remark
         from sys_role r
-	        left join sys_user_role ur on ur.role_id = r.role_id
+                 left join sys_user_role ur on ur.role_id = r.role_id
-	        left join sys_user u on u.user_id = ur.user_id
+                 left join sys_user u on u.user_id = ur.user_id
-	        left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_dept d on u.dept_id = d.dept_id
     </sql>
 
-    <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
+    <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
+        <include refid="selectRoleVo"/>
-		where r.del_flag = '0'
+        WHERE r.del_flag = '0' and ur.user_id = #{userId}
-		<if test="roleName != null and roleName != ''">
+    </select>
-			AND r.role_name like concat('%', #{roleName}, '%')
-		</if>
-		<if test="status != null and status != ''">
-			AND r.status = #{status}
-		</if>
-		<if test="roleKey != null and roleKey != ''">
-			AND r.role_key like concat('%', #{roleKey}, '%')
-		</if>
-		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-		</if>
-		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-		</if>
-		<!-- 数据范围过滤 -->
-		${params.dataScope}
-		order by r.role_sort
-	</select>
 
-	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+    <select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
-		<include refid="selectRoleVo"/>
+        select r.role_id
-		WHERE r.del_flag = '0' and ur.user_id = #{userId}
-	</select>
-	
-	<select id="selectRoleAll" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-	</select>
-	
-	<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
-		select r.role_id
         from sys_role r
-	        left join sys_user_role ur on ur.role_id = r.role_id
+                 left join sys_user_role ur on ur.role_id = r.role_id
-	        left join sys_user u on u.user_id = ur.user_id
+                 left join sys_user u on u.user_id = ur.user_id
-	    where u.user_id = #{userId}
+        where u.user_id = #{userId}
-	</select>
+    </select>
 
-	<select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
+    <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
+        <include refid="selectRoleVo"/>
-		where r.role_id = #{roleId}
+        WHERE r.del_flag = '0' and u.user_name = #{userName}
-	</select>
+    </select>
-	
-	<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-		WHERE r.del_flag = '0' and u.user_name = #{userName}
-	</select>
-	
-	<select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-		 where r.role_name=#{roleName} limit 1
-	</select>
-	
-	<select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
-		<include refid="selectRoleVo"/>
-		 where r.role_key=#{roleKey} limit 1
-	</select>
-	
- 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
- 		insert into sys_role(
- 			<if test="roleId != null and roleId != 0">role_id,</if>
- 			<if test="roleName != null and roleName != ''">role_name,</if>
- 			<if test="roleKey != null and roleKey != ''">role_key,</if>
- 			<if test="roleSort != null and roleSort != ''">role_sort,</if>
- 			<if test="dataScope != null and dataScope != ''">data_scope,</if>
- 			<if test="menuCheckStrictly != null">menu_check_strictly,</if>
- 			<if test="deptCheckStrictly != null">dept_check_strictly,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			create_time
- 		)values(
- 			<if test="roleId != null and roleId != 0">#{roleId},</if>
- 			<if test="roleName != null and roleName != ''">#{roleName},</if>
- 			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
- 			<if test="roleSort != null and roleSort != ''">#{roleSort},</if>
- 			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
- 			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
- 			<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			sysdate()
- 		)
-	</insert>
-	
-	<update id="updateRole" parameterType="SysRole">
- 		update sys_role
- 		<set>
- 			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
- 			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
- 			<if test="roleSort != null and roleSort != ''">role_sort = #{roleSort},</if>
- 			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
- 			<if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
- 			<if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
- 			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate()
- 		</set>
- 		where role_id = #{roleId}
-	</update>
-	
-	<delete id="deleteRoleById" parameterType="Long">
-		update sys_role set del_flag = '2' where role_id = #{roleId}
- 	</delete>
- 	
- 	<delete id="deleteRoleByIds" parameterType="Long">
- 	    update sys_role set del_flag = '2' where role_id in
- 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
- 			#{roleId}
-        </foreach> 
- 	</delete>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysRoleMenuMapper.xml

@@ -1,34 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper">
 
-	<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
+    <resultMap type="SysRoleMenu" id="SysRoleMenuResult">
-		<result property="roleId"     column="role_id"      />
+        <result property="roleId" column="role_id"/>
-		<result property="menuId"     column="menu_id"      />
+        <result property="menuId" column="menu_id"/>
-	</resultMap>
+    </resultMap>
-	
-	<select id="checkMenuExistRole" resultType="Integer">
-	    select count(1) from sys_role_menu where menu_id = #{menuId}
-	</select>
-
-	<delete id="deleteRoleMenuByRoleId" parameterType="Long">
-		delete from sys_role_menu where role_id=#{roleId}
-	</delete>
-	
-	<delete id="deleteRoleMenu" parameterType="Long">
- 		delete from sys_role_menu where role_id in
- 		<foreach collection="array" item="roleId" open="(" separator="," close=")">
- 			#{roleId}
-        </foreach>
- 	</delete>
-
-	<insert id="batchRoleMenu">
-		insert into sys_role_menu(role_id, menu_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.roleId},#{item.menuId})
-		</foreach>
-	</insert>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysUserMapper.xml

@@ -1,182 +1,123 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
 
-	<resultMap type="SysUser" id="SysUserResult">
+    <resultMap type="SysUser" id="SysUserResult">
-		<id     property="userId"       column="user_id"      />
+        <id property="userId" column="user_id"/>
-		<result property="deptId"       column="dept_id"      />
+        <result property="deptId" column="dept_id"/>
-		<result property="userName"     column="user_name"    />
+        <result property="userName" column="user_name"/>
-		<result property="nickName"     column="nick_name"    />
+        <result property="nickName" column="nick_name"/>
-		<result property="email"        column="email"        />
+        <result property="email" column="email"/>
-		<result property="phonenumber"  column="phonenumber"  />
+        <result property="phonenumber" column="phonenumber"/>
-		<result property="sex"          column="sex"          />
+        <result property="sex" column="sex"/>
-		<result property="avatar"       column="avatar"       />
+        <result property="avatar" column="avatar"/>
-		<result property="password"     column="password"     />
+        <result property="password" column="password"/>
-		<result property="status"       column="status"       />
+        <result property="status" column="status"/>
-		<result property="delFlag"      column="del_flag"     />
+        <result property="delFlag" column="del_flag"/>
-		<result property="loginIp"      column="login_ip"     />
+        <result property="loginIp" column="login_ip"/>
-		<result property="loginDate"    column="login_date"   />
+        <result property="loginDate" column="login_date"/>
-		<result property="createBy"     column="create_by"    />
+        <result property="createBy" column="create_by"/>
-		<result property="createTime"   column="create_time"  />
+        <result property="createTime" column="create_time"/>
-		<result property="updateBy"     column="update_by"    />
+        <result property="updateBy" column="update_by"/>
-		<result property="updateTime"   column="update_time"  />
+        <result property="updateTime" column="update_time"/>
-		<result property="remark"       column="remark"       />
+        <result property="remark" column="remark"/>
-		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
+        <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
-		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
+        <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
-	</resultMap>
+    </resultMap>
 
-	<resultMap id="deptResult" type="SysDept">
+    <resultMap id="deptResult" type="SysDept">
-		<id     property="deptId"   column="dept_id"     />
+        <id property="deptId" column="dept_id"/>
-		<result property="parentId" column="parent_id"   />
+        <result property="parentId" column="parent_id"/>
-		<result property="deptName" column="dept_name"   />
+        <result property="deptName" column="dept_name"/>
-		<result property="orderNum" column="order_num"   />
+        <result property="orderNum" column="order_num"/>
-		<result property="leader"   column="leader"      />
+        <result property="leader" column="leader"/>
-		<result property="status"   column="dept_status" />
+        <result property="status" column="dept_status"/>
-	</resultMap>
+    </resultMap>
 
-	<resultMap id="RoleResult" type="SysRole">
+    <resultMap id="RoleResult" type="SysRole">
-		<id     property="roleId"       column="role_id"        />
+        <id property="roleId" column="role_id"/>
-		<result property="roleName"     column="role_name"      />
+        <result property="roleName" column="role_name"/>
-		<result property="roleKey"      column="role_key"       />
+        <result property="roleKey" column="role_key"/>
-		<result property="roleSort"     column="role_sort"      />
+        <result property="roleSort" column="role_sort"/>
-		<result property="dataScope"     column="data_scope"    />
+        <result property="dataScope" column="data_scope"/>
-		<result property="status"       column="role_status"    />
+        <result property="status" column="role_status"/>
-	</resultMap>
+    </resultMap>
 
-	<sql id="selectUserVo">
+    <sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id,
-        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+               u.dept_id,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+               u.user_name,
+               u.nick_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.password,
+               u.sex,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_id,
+               d.parent_id,
+               d.dept_name,
+               d.order_num,
+               d.leader,
+               d.status as dept_status,
+               r.role_id,
+               r.role_name,
+               r.role_key,
+               r.role_sort,
+               r.data_scope,
+               r.status as role_status
         from sys_user u
-		    left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_dept d on u.dept_id = d.dept_id
-		    left join sys_user_role ur on u.user_id = ur.user_id
+                 left join sys_user_role ur on u.user_id = ur.user_id
-		    left join sys_role r on r.role_id = ur.role_id
+                 left join sys_role r on r.role_id = ur.role_id
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
-		left join sys_dept d on u.dept_id = d.dept_id
+        u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from
-		where u.del_flag = '0'
+        sys_user u
-		<if test="userName != null and userName != ''">
+        left join sys_dept d on u.dept_id = d.dept_id
-			AND u.user_name like concat('%', #{userName}, '%')
+        where u.del_flag = '0'
-		</if>
+        <if test="userName != null and userName != ''">
-		<if test="status != null and status != ''">
+            AND u.user_name like concat('%', #{userName}, '%')
-			AND u.status = #{status}
+        </if>
-		</if>
+        <if test="status != null and status != ''">
-		<if test="phonenumber != null and phonenumber != ''">
+            AND u.status = #{status}
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+        </if>
-		</if>
+        <if test="phonenumber != null and phonenumber != ''">
-		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+            AND u.phonenumber like concat('%', #{phonenumber}, '%')
-			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+        </if>
-		</if>
+        <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+        </if>
-		</if>
+        <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-		<if test="deptId != null and deptId != 0">
+            AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+        </if>
-		</if>
+        <if test="deptId != null and deptId != 0">
-		<!-- 数据范围过滤 -->
+            AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
-		${params.dataScope}
+            ancestors) ))
-	</select>
+        </if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
 
-	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
+    <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
-	    <include refid="selectUserVo"/>
+        <include refid="selectUserVo"/>
-		where u.user_name = #{userName}
+        where u.user_name = #{userName}
-	</select>
+    </select>
 
-	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
+    <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
-		<include refid="selectUserVo"/>
+        <include refid="selectUserVo"/>
-		where u.user_id = #{userId}
+        where u.user_id = #{userId}
-	</select>
+    </select>
 
-	<select id="checkUserNameUnique" parameterType="String" resultType="int">
-		select count(1) from sys_user where user_name = #{userName} limit 1
-	</select>
-	
-	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
-	</select>
-	
-	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, email from sys_user where email = #{email} limit 1
-	</select>
-	
-	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
- 		insert into sys_user(
- 			<if test="userId != null and userId != 0">user_id,</if>
- 			<if test="deptId != null and deptId != 0">dept_id,</if>
- 			<if test="userName != null and userName != ''">user_name,</if>
- 			<if test="nickName != null and nickName != ''">nick_name,</if>
- 			<if test="email != null and email != ''">email,</if>
- 			<if test="avatar != null and avatar != ''">avatar,</if>
- 			<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
- 			<if test="sex != null and sex != ''">sex,</if>
- 			<if test="password != null and password != ''">password,</if>
- 			<if test="status != null and status != ''">status,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
- 			<if test="remark != null and remark != ''">remark,</if>
- 			create_time
- 		)values(
- 			<if test="userId != null and userId != ''">#{userId},</if>
- 			<if test="deptId != null and deptId != ''">#{deptId},</if>
- 			<if test="userName != null and userName != ''">#{userName},</if>
- 			<if test="nickName != null and nickName != ''">#{nickName},</if>
- 			<if test="email != null and email != ''">#{email},</if>
- 			<if test="avatar != null and avatar != ''">#{avatar},</if>
- 			<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
- 			<if test="sex != null and sex != ''">#{sex},</if>
- 			<if test="password != null and password != ''">#{password},</if>
- 			<if test="status != null and status != ''">#{status},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
- 			<if test="remark != null and remark != ''">#{remark},</if>
- 			sysdate()
- 		)
-	</insert>
-	
-	<update id="updateUser" parameterType="SysUser">
- 		update sys_user
- 		<set>
- 			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
- 			<if test="userName != null and userName != ''">user_name = #{userName},</if>
- 			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
- 			<if test="email != null ">email = #{email},</if>
- 			<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
- 			<if test="sex != null and sex != ''">sex = #{sex},</if>
- 			<if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
- 			<if test="password != null and password != ''">password = #{password},</if>
- 			<if test="status != null and status != ''">status = #{status},</if>
- 			<if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
- 			<if test="loginDate != null">login_date = #{loginDate},</if>
- 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			<if test="remark != null">remark = #{remark},</if>
- 			update_time = sysdate()
- 		</set>
- 		where user_id = #{userId}
-	</update>
-	
-	<update id="updateUserStatus" parameterType="SysUser">
- 		update sys_user set status = #{status} where user_id = #{userId}
-	</update>
-	
-	<update id="updateUserAvatar" parameterType="SysUser">
- 		update sys_user set avatar = #{avatar} where user_name = #{userName}
-	</update>
-	
-	<update id="resetUserPwd" parameterType="SysUser">
- 		update sys_user set password = #{password} where user_name = #{userName}
-	</update>
-	
-	<delete id="deleteUserById" parameterType="Long">
-		update sys_user set del_flag = '2' where user_id = #{userId}
- 	</delete>
- 	
- 	<delete id="deleteUserByIds" parameterType="Long">
- 		update sys_user set del_flag = '2' where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
-        </foreach> 
- 	</delete>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -1,34 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
 
-	<resultMap type="SysUserPost" id="SysUserPostResult">
+    <resultMap type="SysUserPost" id="SysUserPostResult">
-		<result property="userId"     column="user_id"      />
+        <result property="userId" column="user_id"/>
-		<result property="postId"     column="post_id"      />
+        <result property="postId" column="post_id"/>
-	</resultMap>
+    </resultMap>
-
-	<delete id="deleteUserPostByUserId" parameterType="Long">
-		delete from sys_user_post where user_id=#{userId}
-	</delete>
-	
-	<select id="countUserPostById" resultType="Integer">
-	    select count(1) from sys_user_post where post_id=#{postId}  
-	</select>
-	
-	<delete id="deleteUserPost" parameterType="Long">
- 		delete from sys_user_post where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
-        </foreach> 
- 	</delete>
-	
-	<insert id="batchUserPost">
-		insert into sys_user_post(user_id, post_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.userId},#{item.postId})
-		</foreach>
-	</insert>
 
 </mapper> 

ruoyi/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -1,44 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
 
-	<resultMap type="SysUserRole" id="SysUserRoleResult">
+    <resultMap type="SysUserRole" id="SysUserRoleResult">
-		<result property="userId"     column="user_id"      />
+        <result property="userId" column="user_id"/>
-		<result property="roleId"     column="role_id"      />
+        <result property="roleId" column="role_id"/>
-	</resultMap>
+    </resultMap>
 
-	<delete id="deleteUserRoleByUserId" parameterType="Long">
-		delete from sys_user_role where user_id=#{userId}
-	</delete>
-	
-	<select id="countUserRoleByRoleId" resultType="Integer">
-	    select count(1) from sys_user_role where role_id=#{roleId}  
-	</select>
-	
-	<delete id="deleteUserRole" parameterType="Long">
- 		delete from sys_user_role where user_id in
- 		<foreach collection="array" item="userId" open="(" separator="," close=")">
- 			#{userId}
-        </foreach> 
- 	</delete>
-	
-	<insert id="batchUserRole">
-		insert into sys_user_role(user_id, role_id) values
-		<foreach item="item" index="index" collection="list" separator=",">
-			(#{item.userId},#{item.roleId})
-		</foreach>
-	</insert>
-	
-	<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
-		delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
-	</delete>
-	
-	<delete id="deleteUserRoleInfos">
-	    delete from sys_user_role where role_id=#{roleId} and user_id in
- 	    <foreach collection="userIds" item="userId" open="(" separator="," close=")">
- 	        #{userId}
-            </foreach> 
-	</delete>
 </mapper> 

ruoyi/src/main/resources/vm/java/controller.java.vm

@@ -74,7 +74,7 @@ public class ${ClassName}Controller extends BaseController {
     public AjaxResult<${ClassName}Vo> export(${ClassName}QueryBo bo) {
         List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
         ExcelUtil<${ClassName}Vo> util = new ExcelUtil<${ClassName}Vo>(${ClassName}Vo.class);
-        return util.exportExcel(list, "${businessName}" );
+        return util.exportExcel(list, "${businessName}数据" );
     }
 
     /**

ruoyi/src/main/resources/vm/java/queryBo.java.vm

@@ -51,10 +51,10 @@ public class ${ClassName}QueryBo extends ${Entity} {
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField) && $column.query)
 	/** $column.columnComment */
-	@ApiModelProperty("$column.columnComment")
 #if($column.javaType == 'Date')
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 #end
+	@ApiModelProperty("$column.columnComment")
 	private $column.javaType $column.javaField;
 #end
 #end