From 2cba0d00dc45998105129a0c26cb546282cd39a8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 05 六月 2024 13:44:23 +0800
Subject: [PATCH] 随访功能测试：模板、任务、定时发送、公众号发送，流程走通
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 86 ++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 54 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 25efcaf..a8753e2 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
@@ -3,6 +3,7 @@
import java.beans.PropertyEditorSupport;
import java.util.Date;
import java.util.List;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
@@ -23,25 +24,21 @@
/**
* web灞傞�氱敤鏁版嵁澶勭悊
- *
+ *
* @author ruoyi
*/
-public class BaseController
-{
+public class BaseController {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
/**
* 灏嗗墠鍙颁紶閫掕繃鏉ョ殑鏃ユ湡鏍煎紡鐨勫瓧绗︿覆锛岃嚜鍔ㄨ浆鍖栦负Date绫诲瀷
*/
@InitBinder
- public void initBinder(WebDataBinder binder)
- {
+ public void initBinder(WebDataBinder binder) {
// Date 绫诲瀷杞崲
- binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
- {
+ binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
@Override
- public void setAsText(String text)
- {
+ public void setAsText(String text) {
setValue(DateUtils.parseDate(text));
}
});
@@ -50,19 +47,16 @@
/**
* 璁剧疆璇锋眰鍒嗛〉鏁版嵁
*/
- protected void startPage()
- {
+ protected void startPage() {
PageUtils.startPage();
}
/**
* 璁剧疆璇锋眰鎺掑簭鏁版嵁
*/
- protected void startOrderBy()
- {
+ protected void startOrderBy() {
PageDomain pageDomain = TableSupport.buildPageRequest();
- if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
- {
+ if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) {
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
PageHelper.orderBy(orderBy);
}
@@ -71,17 +65,15 @@
/**
* 娓呯悊鍒嗛〉鐨勭嚎绋嬪彉閲�
*/
- protected void clearPage()
- {
+ protected void clearPage() {
PageUtils.clearPage();
}
/**
* 鍝嶅簲璇锋眰鍒嗛〉鏁版嵁
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
- protected TableDataInfo getDataTable(List<?> list)
- {
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ protected TableDataInfo getDataTable(List<?> list) {
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("鏌ヨ鎴愬姛");
@@ -93,124 +85,110 @@
/**
* 鍝嶅簲璇锋眰鍒嗛〉鏁版嵁
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
- protected TableDataInfo getDataTable2(List<?> list,List<?> list2)
- {
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ protected TableDataInfo getDataTable2(long total, List<?> list) {
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("鏌ヨ鎴愬姛");
- rspData.setRows(list2);
- rspData.setTotal(new PageInfo(list).getTotal());
+ rspData.setRows(list);
+ rspData.setTotal(total);
return rspData;
}
/**
* 杩斿洖鎴愬姛
*/
- public AjaxResult success()
- {
+ public AjaxResult success() {
return AjaxResult.success();
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult error()
- {
+ public AjaxResult error() {
return AjaxResult.error();
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public AjaxResult success(String message)
- {
+ public AjaxResult success(String message) {
return AjaxResult.success(message);
}
-
+
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public AjaxResult success(Object data)
- {
+ public AjaxResult success(Object data) {
return AjaxResult.success(data);
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult error(String message)
- {
+ public AjaxResult error(String message) {
return AjaxResult.error(message);
}
/**
* 杩斿洖璀﹀憡娑堟伅
*/
- public AjaxResult warn(String message)
- {
+ public AjaxResult warn(String message) {
return AjaxResult.warn(message);
}
/**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult toAjax(int rows)
- {
+ protected AjaxResult toAjax(int rows) {
return rows > 0 ? AjaxResult.success() : AjaxResult.error();
}
/**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param result 缁撴灉
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult toAjax(boolean result)
- {
+ protected AjaxResult toAjax(boolean result) {
return result ? success() : error();
}
/**
* 椤甸潰璺宠浆
*/
- public String redirect(String url)
- {
+ public String redirect(String url) {
return StringUtils.format("redirect:{}", url);
}
/**
* 鑾峰彇鐢ㄦ埛缂撳瓨淇℃伅
*/
- public LoginUser getLoginUser()
- {
+ public LoginUser getLoginUser() {
return SecurityUtils.getLoginUser();
}
/**
* 鑾峰彇鐧诲綍鐢ㄦ埛id
*/
- public Long getUserId()
- {
+ public Long getUserId() {
return getLoginUser().getUserId();
}
/**
* 鑾峰彇鐧诲綍閮ㄩ棬id
*/
- public Long getDeptId()
- {
+ public Long getDeptId() {
return getLoginUser().getDeptId();
}
/**
* 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
*/
- public String getUsername()
- {
+ public String getUsername() {
return getLoginUser().getUsername();
}
}
--
Gitblit v1.9.3