add 整合 mybatis-plus 重写所有业务

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java

@@ -1,30 +1,28 @@
-package com.ruoyi.system.api;
-
-import com.ruoyi.system.api.domain.SysLogininfor;
-import com.ruoyi.system.api.domain.SysOperLog;
-
-/**
- * 日志服务
- *
- * @author Lion Li
- */
-public interface RemoteLogService {
-
-    /**
-     * 保存系统日志
-     *
-     * @param sysOperLog 日志实体
-     * @param source     请求来源
-     * @return 结果
-     */
-    Boolean saveLog(SysOperLog sysOperLog, String source);
-
-    /**
-     * 保存访问记录
-     *
-     * @param sysLogininfor 访问实体
-     * @param source        请求来源
-     * @return 结果
-     */
-    Boolean saveLogininfor(SysLogininfor sysLogininfor, String source);
-}
+package com.ruoyi.system.api;
+
+import com.ruoyi.system.api.domain.SysLogininfor;
+import com.ruoyi.system.api.domain.SysOperLog;
+
+/**
+ * 日志服务
+ *
+ * @author Lion Li
+ */
+public interface RemoteLogService {
+
+    /**
+     * 保存系统日志
+     *
+     * @param sysOperLog 日志实体
+     * @return 结果
+     */
+    Boolean saveLog(SysOperLog sysOperLog);
+
+    /**
+     * 保存访问记录
+     *
+     * @param sysLogininfor 访问实体
+     * @return 结果
+     */
+    Boolean saveLogininfor(SysLogininfor sysLogininfor);
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java

@@ -1,30 +1,28 @@
-package com.ruoyi.system.api;
-
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.model.LoginUser;
-
-/**
- * 用户服务
- *
- * @author Lion Li
- */
-public interface RemoteUserService {
-
-    /**
-     * 通过用户名查询用户信息
-     *
-     * @param username 用户名
-     * @param source   请求来源
-     * @return 结果
-     */
-    LoginUser getUserInfo(String username, String source);
-
-    /**
-     * 注册用户信息
-     *
-     * @param sysUser 用户信息
-     * @param source  请求来源
-     * @return 结果
-     */
-    Boolean registerUserInfo(SysUser sysUser, String source);
-}
+package com.ruoyi.system.api;
+
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.model.LoginUser;
+
+/**
+ * 用户服务
+ *
+ * @author Lion Li
+ */
+public interface RemoteUserService {
+
+    /**
+     * 通过用户名查询用户信息
+     *
+     * @param username 用户名
+     * @return 结果
+     */
+    LoginUser getUserInfo(String username);
+
+    /**
+     * 注册用户信息
+     *
+     * @param sysUser 用户信息
+     * @return 结果
+     */
+    Boolean registerUserInfo(SysUser sysUser);
+}

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

@@ -1,11 +1,14 @@
 package com.ruoyi.system.api.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.TreeEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
@@ -20,6 +23,8 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@TableName("sys_dept")
 @ApiModel("部门业务对象")
 public class SysDept extends TreeEntity {
     private static final long serialVersionUID = 1L;
@@ -28,6 +33,7 @@ public class SysDept extends TreeEntity {
      * 部门ID
      */
     @ApiModelProperty(value = "部门id")
+    @TableId(value = "dept_id")
     private Long deptId;
 
     /**
@@ -76,6 +82,7 @@ public class SysDept extends TreeEntity {
      * 删除标志（0代表存在 2代表删除）
      */
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    @TableLogic
     private String delFlag;
 
     /**

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.api.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
@@ -10,6 +12,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -22,6 +25,8 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@TableName("sys_dict_data")
 @ExcelIgnoreUnannotated
 @ApiModel("字典数据业务对象")
 public class SysDictData extends BaseEntity {
@@ -31,6 +36,7 @@ public class SysDictData extends BaseEntity {
      */
     @ApiModelProperty(value = "字典编码")
     @ExcelProperty(value = "字典编码")
+    @TableId(value = "dict_code")
     private Long dictCode;
 
     /**

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.api.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
@@ -9,7 +11,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -22,6 +24,8 @@ import javax.validation.constraints.Size;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@TableName("sys_dict_type")
 @ExcelIgnoreUnannotated
 @ApiModel("字典类型业务对象")
 public class SysDictType extends BaseEntity {
@@ -31,6 +35,7 @@ public class SysDictType extends BaseEntity {
      */
     @ApiModelProperty(value = "字典主键")
     @ExcelProperty(value = "字典主键")
+    @TableId(value = "dict_id")
     private Long dictId;
 
     /**

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

@@ -2,12 +2,15 @@ package com.ruoyi.system.api.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -21,6 +24,8 @@ import java.util.Map;
  */
 
 @Data
+@NoArgsConstructor
+@TableName("sys_logininfor")
 @ExcelIgnoreUnannotated
 @ApiModel("系统访问记录业务对象")
 public class SysLogininfor implements Serializable {
@@ -31,6 +36,7 @@ public class SysLogininfor implements Serializable {
      */
     @ApiModelProperty(value = "访问ID")
     @ExcelProperty(value = "序号")
+    @TableId(value = "info_id")
     private Long infoId;
 
     /**
@@ -73,6 +79,7 @@ public class SysLogininfor implements Serializable {
      * 请求参数
      */
     @ApiModelProperty(value = "请求参数")
+    @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 
 }

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

@@ -2,12 +2,15 @@ package com.ruoyi.system.api.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.experimental.Accessors;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -21,6 +24,8 @@ import java.util.Map;
  */
 
 @Data
+@NoArgsConstructor
+@TableName("sys_oper_log")
 @ExcelIgnoreUnannotated
 @ApiModel("操作日志记录业务对象")
 public class SysOperLog implements Serializable {
@@ -32,6 +37,7 @@ public class SysOperLog implements Serializable {
      */
     @ApiModelProperty(value = "日志主键")
     @ExcelProperty(value = "日志主键")
+    @TableId(value = "oper_id")
     private Long operId;
 
     /**
@@ -53,6 +59,7 @@ public class SysOperLog implements Serializable {
      * 业务类型数组
      */
     @ApiModelProperty(value = "业务类型数组")
+    @TableField(exist = false)
     private Integer[] businessTypes;
 
     /**
@@ -145,6 +152,7 @@ public class SysOperLog implements Serializable {
      * 请求参数
      */
     @ApiModelProperty(value = "请求参数")
+    @TableField(exist = false)
     private Map<String, Object> params = new HashMap<>();
 
 }

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

@@ -2,6 +2,10 @@ package com.ruoyi.system.api.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.excel.annotation.ExcelDictFormat;
 import com.ruoyi.common.excel.convert.ExcelDictConvert;
@@ -9,7 +13,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -23,6 +26,7 @@ import javax.validation.constraints.Size;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
+@TableName("sys_role")
 @ExcelIgnoreUnannotated
 public class SysRole extends BaseEntity {
 
@@ -31,6 +35,7 @@ public class SysRole extends BaseEntity {
      */
     @ApiModelProperty(value = "角色ID")
     @ExcelProperty(value = "角色序号")
+    @TableId(value = "role_id")
     private Long roleId;
 
     /**
@@ -91,6 +96,7 @@ public class SysRole extends BaseEntity {
      * 删除标志（0代表存在 2代表删除）
      */
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    @TableLogic
     private String delFlag;
 
     /**
@@ -103,18 +109,21 @@ public class SysRole extends BaseEntity {
      * 用户是否存在此角色标识 默认不存在
      */
     @ApiModelProperty(value = "用户是否存在此角色标识 默认不存在")
+    @TableField(exist = false)
     private boolean flag = false;
 
     /**
      * 菜单组
      */
     @ApiModelProperty(value = "菜单组")
+    @TableField(exist = false)
     private Long[] menuIds;
 
     /**
      * 部门组（数据权限）
      */
     @ApiModelProperty(value = "部门组（数据权限）")
+    @TableField(exist = false)
     private Long[] deptIds;
 
     public SysRole(Long roleId) {

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

@@ -1,5 +1,6 @@
 package com.ruoyi.system.api.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.core.web.domain.BaseEntity;
@@ -9,7 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
@@ -26,6 +26,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
+@TableName("sys_user")
 @ApiModel("用户信息业务对象")
 public class SysUser extends BaseEntity {
 
@@ -33,6 +34,7 @@ public class SysUser extends BaseEntity {
      * 用户ID
      */
     @ApiModelProperty(value = "用户ID")
+    @TableId(value = "user_id")
     private Long userId;
 
     /**
@@ -94,6 +96,11 @@ public class SysUser extends BaseEntity {
      * 密码
      */
     @ApiModelProperty(value = "密码")
+    @TableField(
+        insertStrategy = FieldStrategy.NOT_EMPTY,
+        updateStrategy = FieldStrategy.NOT_EMPTY,
+        whereStrategy = FieldStrategy.NOT_EMPTY
+    )
     private String password;
 
     @JsonIgnore
@@ -112,6 +119,7 @@ public class SysUser extends BaseEntity {
      * 删除标志（0代表存在 2代表删除）
      */
     @ApiModelProperty(value = "删除标志（0代表存在 2代表删除）")
+    @TableLogic
     private String delFlag;
 
     /**
@@ -136,30 +144,35 @@ public class SysUser extends BaseEntity {
      * 部门对象
      */
     @ApiModelProperty(value = "部门对象")
+    @TableField(exist = false)
     private SysDept dept;
 
     /**
      * 角色对象
      */
     @ApiModelProperty(value = "角色对象")
+    @TableField(exist = false)
     private List<SysRole> roles;
 
     /**
      * 角色组
      */
     @ApiModelProperty(value = "角色组")
+    @TableField(exist = false)
     private Long[] roleIds;
 
     /**
      * 岗位组
      */
     @ApiModelProperty(value = "岗位组")
+    @TableField(exist = false)
     private Long[] postIds;
 
     /**
      * 数据权限 当前角色ID
      */
     @ApiModelProperty(value = "角色ID")
+    @TableField(exist = false)
     private Long roleId;
 
     public SysUser(Long userId) {