jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

!11 [功能] 拆分出Vo,QueryBo,AddBo,EditBo等领域对象

Browse Source 
* [修改] 错误引入的无用导包删除
* [新增] 增加Vo,QueryBo,AddBo,EditBo等视图,并调整controller,service的调用代码
* [新增] 增加CreateAndUpdateMetaObjectHandler,配合fill注解,实现创建和修改人的自动设置,减少重复代码
This commit is contained in:
wugh
2021-03-22 09:32:49 +08:00
committed by 疯狂的狮子li
parent 5d1e977442
commit 3d6fbb93f5
14 changed files with 432 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
View File

@ -65,9 +65,9 @@ public class BaseController
* 响应请求分页数据
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
protected TableDataInfo getDataTable(List<?> list)
protected <T> TableDataInfo<T> getDataTable(List<T> list)
{
TableDataInfo rspData = new TableDataInfo();
TableDataInfo<T> rspData = new TableDataInfo();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
rspData.setRows(list);
@ -81,7 +81,7 @@ public class BaseController
* @param rows 影响行数
* @return 操作结果
*/
protected AjaxResult toAjax(int rows)
protected AjaxResult<Void> toAjax(int rows)
{
return rows > 0 ? AjaxResult.success() : AjaxResult.error();
}
@ -92,7 +92,7 @@ public class BaseController
* @param result 结果
* @return 操作结果
*/
protected AjaxResult toAjax(boolean result)
protected AjaxResult<Void> toAjax(boolean result)
{
return result ? success() : error();
}
@ -100,7 +100,7 @@ public class BaseController
/**
* 返回成功
*/
public AjaxResult success()
public AjaxResult<Void> success()
{
return AjaxResult.success();
}
@ -108,7 +108,7 @@ public class BaseController
/**
* 返回失败消息
*/
public AjaxResult error()
public AjaxResult<Void> error()
{
return AjaxResult.error();
}
@ -116,7 +116,7 @@ public class BaseController
/**
* 返回成功消息
*/
public AjaxResult success(String message)
public AjaxResult<Void> success(String message)
{
return AjaxResult.success(message);
}
@ -124,7 +124,7 @@ public class BaseController
/**
* 返回失败消息
*/
public AjaxResult error(String message)
public AjaxResult<Void> error(String message)
{
return AjaxResult.error(message);
}

32
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.common.core.domain;
import cn.hutool.core.lang.Validator;
import cn.hutool.http.HttpStatus;
import lombok.Data;
import java.util.HashMap;
@ -10,7 +11,7 @@ import java.util.HashMap;
*
* @author ruoyi
*/
public class AjaxResult extends HashMap<String, Object>
public class AjaxResult<T> extends HashMap<String, Object>
{
private static final long serialVersionUID = 1L;
@ -23,6 +24,17 @@ public class AjaxResult extends HashMap<String, Object>
/** 数据对象 */
public static final String DATA_TAG = "data";
public Integer getCode(){
return (Integer) super.get(CODE_TAG);
}
public String getMsg(){
return (String) super.get(MSG_TAG);
}
public T getData(){
return (T) super.get(DATA_TAG);
}
/**
* 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
*/
@ -49,7 +61,7 @@ public class AjaxResult extends HashMap<String, Object>
* @param msg 返回内容
* @param data 数据对象
*/
public AjaxResult(int code, String msg, Object data)
public AjaxResult(int code, String msg, T data)
{
super.put(CODE_TAG, code);
super.put(MSG_TAG, msg);
@ -64,7 +76,7 @@ public class AjaxResult extends HashMap<String, Object>
*
* @return 成功消息
*/
public static AjaxResult success()
public static AjaxResult<Void> success()
{
return AjaxResult.success("操作成功");
}
@ -74,7 +86,7 @@ public class AjaxResult extends HashMap<String, Object>
*
* @return 成功消息
*/
public static AjaxResult success(Object data)
public static <T> AjaxResult<T> success(T data)
{
return AjaxResult.success("操作成功", data);
}
@ -85,7 +97,7 @@ public class AjaxResult extends HashMap<String, Object>
* @param msg 返回内容
* @return 成功消息
*/
public static AjaxResult success(String msg)
public static AjaxResult<Void> success(String msg)
{
return AjaxResult.success(msg, null);
}
@ -97,7 +109,7 @@ public class AjaxResult extends HashMap<String, Object>
* @param data 数据对象
* @return 成功消息
*/
public static AjaxResult success(String msg, Object data)
public static <T> AjaxResult<T> success(String msg, T data)
{
return new AjaxResult(HttpStatus.HTTP_OK, msg, data);
}
@ -107,7 +119,7 @@ public class AjaxResult extends HashMap<String, Object>
*
* @return
*/
public static AjaxResult error()
public static AjaxResult<Void> error()
{
return AjaxResult.error("操作失败");
}
@ -118,7 +130,7 @@ public class AjaxResult extends HashMap<String, Object>
* @param msg 返回内容
* @return 警告消息
*/
public static AjaxResult error(String msg)
public static AjaxResult<Void> error(String msg)
{
return AjaxResult.error(msg, null);
}
@ -130,7 +142,7 @@ public class AjaxResult extends HashMap<String, Object>
* @param data 数据对象
* @return 警告消息
*/
public static AjaxResult error(String msg, Object data)
public static <T> AjaxResult<T> error(String msg, T data)
{
return new AjaxResult(HttpStatus.HTTP_INTERNAL_ERROR, msg, data);
}
@ -142,7 +154,7 @@ public class AjaxResult extends HashMap<String, Object>
* @param msg 返回内容
* @return 警告消息
*/
public static AjaxResult error(int code, String msg)
public static AjaxResult<Void> error(int code, String msg)
{
return new AjaxResult(code, msg, null);
}

10
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
View File

@ -8,7 +8,7 @@ import java.util.List;
*
* @author ruoyi
*/
public class TableDataInfo implements Serializable
public class TableDataInfo<T> implements Serializable
{
private static final long serialVersionUID = 1L;
@ -16,7 +16,7 @@ public class TableDataInfo implements Serializable
private long total;
/** 列表数据 */
private List<?> rows;
private List<T> rows;
/** 消息状态码 */
private int code;
@ -37,7 +37,7 @@ public class TableDataInfo implements Serializable
* @param list 列表数据
* @param total 总记录数
*/
public TableDataInfo(List<?> list, int total)
public TableDataInfo(List<T> list, int total)
{
this.rows = list;
this.total = total;
@ -53,12 +53,12 @@ public class TableDataInfo implements Serializable
this.total = total;
}
public List<?> getRows()
public List<T> getRows()
{
return rows;
}
public void setRows(List<?> rows)
public void setRows(List<T> rows)
{
this.rows = rows;
}