From b3541e975898e17a6cbc1a9ea776f3ec7e91d39a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 12 六月 2021 20:13:35 +0800
Subject: [PATCH] update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 42 ++----------------------------------------
1 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 516d102..317b92e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -1,16 +1,8 @@
package com.ruoyi.common.core.controller;
-import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpStatus;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.PageDomain;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.sql.SqlUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
@@ -18,11 +10,10 @@
import java.beans.PropertyEditorSupport;
import java.util.Date;
-import java.util.List;
/**
* web灞傞�氱敤鏁版嵁澶勭悊
- *
+ *
* @author ruoyi
*/
public class BaseController
@@ -47,37 +38,8 @@
}
/**
- * 璁剧疆璇锋眰鍒嗛〉鏁版嵁
- */
- protected void startPage()
- {
- PageDomain pageDomain = TableSupport.buildPageRequest();
- Integer pageNum = pageDomain.getPageNum();
- Integer pageSize = pageDomain.getPageSize();
- if (Validator.isNotNull(pageNum) && Validator.isNotNull(pageSize))
- {
- String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
- PageHelper.startPage(pageNum, pageSize, orderBy);
- }
- }
-
- /**
- * 鍝嶅簲璇锋眰鍒嗛〉鏁版嵁
- */
- @SuppressWarnings({ "rawtypes", "unchecked" })
- protected <T> TableDataInfo<T> getDataTable(List<T> list)
- {
- TableDataInfo<T> rspData = new TableDataInfo();
- rspData.setCode(HttpStatus.HTTP_OK);
- rspData.setMsg("鏌ヨ鎴愬姛");
- rspData.setRows(list);
- rspData.setTotal(new PageInfo(list).getTotal());
- return rspData;
- }
-
- /**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
--
Gitblit v1.9.3