From aac6e0521a906aa1402f4a35f58c940e757c04cf Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期日, 24 四月 2022 13:28:52 +0800 Subject: [PATCH] 发布 4.1.0 --- ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 112 ++++++++++++++++++++------------------------------------ 1 files changed, 40 insertions(+), 72 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 317b92e..1e0a5d5 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,41 +1,16 @@ package com.ruoyi.common.core.controller; -import cn.hutool.core.util.StrUtil; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.DateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; - -import java.beans.PropertyEditorSupport; -import java.util.Date; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.helper.LoginHelper; +import com.ruoyi.common.utils.StringUtils; /** * web灞傞�氱敤鏁版嵁澶勭悊 * - * @author ruoyi + * @author Lion Li */ -public class BaseController -{ - protected final Logger logger = LoggerFactory.getLogger(this.getClass()); - - /** - * 灏嗗墠鍙颁紶閫掕繃鏉ョ殑鏃ユ湡鏍煎紡鐨勫瓧绗︿覆锛岃嚜鍔ㄨ浆鍖栦负Date绫诲瀷 - */ - @InitBinder - public void initBinder(WebDataBinder binder) - { - // Date 绫诲瀷杞崲 - binder.registerCustomEditor(Date.class, new PropertyEditorSupport() - { - @Override - public void setAsText(String text) - { - setValue(DateUtils.parseDate(text)); - } - }); - } +public class BaseController { /** * 鍝嶅簲杩斿洖缁撴灉 @@ -43,9 +18,8 @@ * @param rows 褰卞搷琛屾暟 * @return 鎿嶄綔缁撴灉 */ - protected AjaxResult<Void> toAjax(int rows) - { - return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + protected R<Void> toAjax(int rows) { + return rows > 0 ? R.ok() : R.fail(); } /** @@ -54,48 +28,42 @@ * @param result 缁撴灉 * @return 鎿嶄綔缁撴灉 */ - protected AjaxResult<Void> toAjax(boolean result) - { - return result ? success() : error(); - } - - /** - * 杩斿洖鎴愬姛 - */ - public AjaxResult<Void> success() - { - return AjaxResult.success(); - } - - /** - * 杩斿洖澶辫触娑堟伅 - */ - public AjaxResult<Void> error() - { - return AjaxResult.error(); - } - - /** - * 杩斿洖鎴愬姛娑堟伅 - */ - public AjaxResult<Void> success(String message) - { - return AjaxResult.success(message); - } - - /** - * 杩斿洖澶辫触娑堟伅 - */ - public AjaxResult<Void> error(String message) - { - return AjaxResult.error(message); + protected R<Void> toAjax(boolean result) { + return result ? R.ok() : R.fail(); } /** * 椤甸潰璺宠浆 */ - public String redirect(String url) - { - return StrUtil.format("redirect:{}", url); + public String redirect(String url) { + return StringUtils.format("redirect:{}", url); + } + + /** + * 鑾峰彇鐢ㄦ埛缂撳瓨淇℃伅 + */ + public LoginUser getLoginUser() { + return LoginHelper.getLoginUser(); + } + + /** + * 鑾峰彇鐧诲綍鐢ㄦ埛id + */ + public Long getUserId() { + return LoginHelper.getUserId(); + } + + /** + * 鑾峰彇鐧诲綍閮ㄩ棬id + */ + public Long getDeptId() { + return LoginHelper.getDeptId(); + } + + /** + * 鑾峰彇鐧诲綍鐢ㄦ埛鍚� + */ + public String getUsername() { + return LoginHelper.getUsername(); } } -- Gitblit v1.9.3