mybatis-plus与pagehelper冲突处理

service-base/src/main/java/com/simuwang/base/common/util/PageUtils.java

@@ -1,35 +1,35 @@
-//package com.simuwang.base.common.util;
-//
-//import com.github.pagehelper
-//        .PageHelper;
-//import com.simuwang.base.common.page.PageDomain;
-//import com.simuwang.base.common.page.TableSupport;
-//
-///**
-// * 分页工具类
-// *
-// * @author ruoyi
-// */
-//public class PageUtils extends PageHelper
-//{
-//    /**
-//     * 设置请求分页数据
-//     */
-//    public static void startPage()
-//    {
-//        PageDomain pageDomain = TableSupport.buildPageRequest();
-//        Integer pageNum = pageDomain.getPageNum();
-//        Integer pageSize = pageDomain.getPageSize();
-//        String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
-//        Boolean reasonable = pageDomain.getReasonable();
-//        PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
-//    }
-//
-//    /**
-//     * 清理分页的线程变量
-//     */
-//    public static void clearPage()
-//    {
-//        PageHelper.clearPage();
-//    }
-//}
+package com.simuwang.base.common.util;
+
+import com.github.pagehelper
+        .PageHelper;
+import com.simuwang.base.common.page.PageDomain;
+import com.simuwang.base.common.page.TableSupport;
+
+/**
+ * 分页工具类
+ *
+ * @author ruoyi
+ */
+public class PageUtils extends PageHelper
+{
+    /**
+     * 设置请求分页数据
+     */
+    public static void startPage()
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+        Boolean reasonable = pageDomain.getReasonable();
+        PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
+    }
+
+    /**
+     * 清理分页的线程变量
+     */
+    public static void clearPage()
+    {
+        PageHelper.clearPage();
+    }
+}

service-manage/src/main/java/com/simuwang/manage/api/base/BaseController.java

@@ -1,162 +1,162 @@
-//package com.simuwang.manage.api.base;
-//
-//import com.github.pagehelper.PageHelper;
-//import com.github.pagehelper.PageInfo;
-//import com.simuwang.base.common.page.PageDomain;
-//import com.simuwang.base.common.page.TableDataInfo;
-//import com.simuwang.base.common.page.TableSupport;
-//import com.simuwang.base.common.result.AjaxResult;
-//import com.simuwang.base.common.util.DateUtils;
-//import com.simuwang.base.common.util.PageUtils;
-//import com.simuwang.base.common.util.SqlUtil;
-//import com.simuwang.base.common.util.StringUtil;
-//import com.smppw.common.pojo.enums.status.ResultCode;
-//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 java.util.List;
-//
-///**
-// * FileName: BaseController
-// * Author:   chenjianhua
-// * Date:     2024/9/8 10:02
-// * Description: ${DESCRIPTION}
-// */
-//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));
-//                }
-//            });
-//        }
-//
-//        /**
-//         * 设置请求分页数据
-//         */
-//        protected void startPage()
-//        {
-//            PageUtils.startPage();
-//        }
-//
-//        /**
-//         * 设置请求排序数据
-//         */
-//        protected void startOrderBy()
-//        {
-//            PageDomain pageDomain = TableSupport.buildPageRequest();
-//            if (StringUtil.isNotEmpty(pageDomain.getOrderBy()))
-//            {
-//                String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
-//                PageHelper.orderBy(orderBy);
-//            }
-//        }
-//
-//        /**
-//         * 清理分页的线程变量
-//         */
-//        protected void clearPage()
-//        {
-//            PageUtils.clearPage();
-//        }
-//
-//        /**
-//         * 响应请求分页数据
-//         */
-//        @SuppressWarnings({ "rawtypes", "unchecked" })
-//        protected TableDataInfo getDataTable(List<?> list)
-//        {
-//            TableDataInfo rspData = new TableDataInfo();
-//            rspData.setCode(ResultCode.SUCCESS.getCode());
-//            rspData.setMsg(null);
-//            rspData.setRows(list);
-//            rspData.setTotal(new PageInfo(list).getTotal());
-//            return rspData;
-//        }
-//
-//    /**
-//     * 响应返回结果
-//     *
-//     * @param rows 影响行数
-//     * @return 操作结果
-//     */
-//    protected AjaxResult toAjax(int rows)
-//    {
-//        return rows > 0 ? success() : error();
-//    }
-//
-//    /**
-//     * 响应返回结果
-//     *
-//     * @param result 结果
-//     * @return 操作结果
-//     */
-//    protected AjaxResult toAjax(boolean result)
-//    {
-//        return result ? success() : error();
-//    }
-//
-//    /**
-//     * 返回成功
-//     */
-//    public AjaxResult success()
-//    {
-//        return AjaxResult.success();
-//    }
-//
-//    /**
-//     * 返回失败消息
-//     */
-//    public AjaxResult error()
-//    {
-//        return AjaxResult.error();
-//    }
-//
-//    /**
-//     * 返回成功消息
-//     */
-//    public AjaxResult success(String message)
-//    {
-//        return AjaxResult.success(message);
-//    }
-//
-//    /**
-//     * 返回成功数据
-//     */
-//    public static AjaxResult success(Object data)
-//    {
-//        return AjaxResult.success("操作成功", data);
-//    }
-//
-//    /**
-//     * 返回失败消息
-//     */
-//    public AjaxResult error(String message)
-//    {
-//        return AjaxResult.error(message);
-//    }
-//
-//    /**
-//     * 返回错误码消息
-//     */
-//    public AjaxResult error(AjaxResult.Type type, String message)
-//    {
-//        return new AjaxResult(type, message);
-//    }
-//
-//}
+package com.simuwang.manage.api.base;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.simuwang.base.common.page.PageDomain;
+import com.simuwang.base.common.page.TableDataInfo;
+import com.simuwang.base.common.page.TableSupport;
+import com.simuwang.base.common.result.AjaxResult;
+import com.simuwang.base.common.util.DateUtils;
+import com.simuwang.base.common.util.PageUtils;
+import com.simuwang.base.common.util.SqlUtil;
+import com.simuwang.base.common.util.StringUtil;
+import com.smppw.common.pojo.enums.status.ResultCode;
+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 java.util.List;
+
+/**
+ * FileName: BaseController
+ * Author:   chenjianhua
+ * Date:     2024/9/8 10:02
+ * Description: ${DESCRIPTION}
+ */
+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));
+                }
+            });
+        }
+
+        /**
+         * 设置请求分页数据
+         */
+        protected void startPage()
+        {
+            PageUtils.startPage();
+        }
+
+        /**
+         * 设置请求排序数据
+         */
+        protected void startOrderBy()
+        {
+            PageDomain pageDomain = TableSupport.buildPageRequest();
+            if (StringUtil.isNotEmpty(pageDomain.getOrderBy()))
+            {
+                String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+                PageHelper.orderBy(orderBy);
+            }
+        }
+
+        /**
+         * 清理分页的线程变量
+         */
+        protected void clearPage()
+        {
+            PageUtils.clearPage();
+        }
+
+        /**
+         * 响应请求分页数据
+         */
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        protected TableDataInfo getDataTable(List<?> list)
+        {
+            TableDataInfo rspData = new TableDataInfo();
+            rspData.setCode(ResultCode.SUCCESS.getCode());
+            rspData.setMsg(null);
+            rspData.setRows(list);
+            rspData.setTotal(new PageInfo(list).getTotal());
+            return rspData;
+        }
+
+    /**
+     * 响应返回结果
+     *
+     * @param rows 影响行数
+     * @return 操作结果
+     */
+    protected AjaxResult toAjax(int rows)
+    {
+        return rows > 0 ? success() : error();
+    }
+
+    /**
+     * 响应返回结果
+     *
+     * @param result 结果
+     * @return 操作结果
+     */
+    protected AjaxResult toAjax(boolean result)
+    {
+        return result ? success() : error();
+    }
+
+    /**
+     * 返回成功
+     */
+    public AjaxResult success()
+    {
+        return AjaxResult.success();
+    }
+
+    /**
+     * 返回失败消息
+     */
+    public AjaxResult error()
+    {
+        return AjaxResult.error();
+    }
+
+    /**
+     * 返回成功消息
+     */
+    public AjaxResult success(String message)
+    {
+        return AjaxResult.success(message);
+    }
+
+    /**
+     * 返回成功数据
+     */
+    public static AjaxResult success(Object data)
+    {
+        return AjaxResult.success("操作成功", data);
+    }
+
+    /**
+     * 返回失败消息
+     */
+    public AjaxResult error(String message)
+    {
+        return AjaxResult.error(message);
+    }
+
+    /**
+     * 返回错误码消息
+     */
+    public AjaxResult error(AjaxResult.Type type, String message)
+    {
+        return new AjaxResult(type, message);
+    }
+
+}

service-manage/src/main/java/com/simuwang/manage/api/fund/FundInformationController.java

@@ -1,80 +1,80 @@
-//package com.simuwang.manage.api.fund;
-//
-//import com.simuwang.base.common.page.TableDataInfo;
-//import com.simuwang.base.pojo.vo.FundInformationVO;
-//import com.simuwang.base.pojo.vo.FundReportFrequencyVO;
-//import com.simuwang.manage.api.base.BaseController;
-//import com.simuwang.manage.service.FundInformationService;
-//import com.simuwang.manage.service.FundReportFrequencyService;
-//import com.smppw.common.pojo.ResultVo;
-//import com.smppw.common.pojo.enums.status.ResultCode;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * FileName: FundInformationController
-// * Author:   chenjianhua
-// * Date:     2024/9/6 15:01
-// * Description: ${DESCRIPTION}
-// */
-//@RestController
-//@RequestMapping("/fund")
-//public class FundInformationController extends BaseController {
-//
-//    private static final Logger logger = LoggerFactory.getLogger(FundInformationController.class);
-//
-//
-//    @Autowired
-//    private FundInformationService fundInformationService;
-//
-//    @Autowired
-//    private FundReportFrequencyService fundReportFrequencyService;
-//    /**
-//     * 搜索输入框查询
-//     * @param keyword
-//     * @return
-//     */
-//    @RequestMapping("search-info")
-//    public TableDataInfo searchFundInfo(@RequestParam(value = "keyword",required = false)String keyword){
-//        List<Map<String,String>> result = fundInformationService.searchFundInfo(keyword);
-//        return getDataTable(result);
-//    }
-//
-//    /**
-//     * @param fundShortName
-//     * @param companyShortName
-//     * @param navFrequency
-//     * @param assetFrequency
-//     * @return
-//     */
-//    @RequestMapping("search-list")
-//    public List<FundInformationVO> searchFundInfoList(
-//              @RequestParam(value = "fundId",required = false)String fundId,
-//              @RequestParam(value = "fundShortName",required = false)String fundShortName,
-//              @RequestParam(value = "companyShortName",required = false)String companyShortName,
-//              @RequestParam(value = "navFrequency",required = false)Integer navFrequency,
-//              @RequestParam(value = "assetFrequency",required = false)Integer assetFrequency,
-//              @RequestParam(value = "startDate",required = false)Integer startDate,
-//              @RequestParam(value = "endDate",required = false)Integer endDate){
-//        List<FundInformationVO> result = fundInformationService.searchFundInfoList(fundId,fundShortName,companyShortName,navFrequency,assetFrequency,startDate,endDate);
-//        return result;
-//    }
-//
-//    @PostMapping("/save-frequency")
-//    public ResultVo saveFundReportFrequency(@RequestBody FundReportFrequencyVO fundReportFrequency){
-//        ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
-//        try{
-//            fundReportFrequencyService.saveFundReportFrequency(fundReportFrequency);
-//        }catch (Exception e){
-//            vo = new ResultVo(ResultCode.SAVE_FAILED);
-//            logger.error(e.getMessage(),e);
-//        }
-//        return vo;
-//    }
-//
-//}
+package com.simuwang.manage.api.fund;
+
+import com.simuwang.base.common.page.TableDataInfo;
+import com.simuwang.base.pojo.vo.FundInformationVO;
+import com.simuwang.base.pojo.vo.FundReportFrequencyVO;
+import com.simuwang.manage.api.base.BaseController;
+import com.simuwang.manage.service.FundInformationService;
+import com.simuwang.manage.service.FundReportFrequencyService;
+import com.smppw.common.pojo.ResultVo;
+import com.smppw.common.pojo.enums.status.ResultCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * FileName: FundInformationController
+ * Author:   chenjianhua
+ * Date:     2024/9/6 15:01
+ * Description: ${DESCRIPTION}
+ */
+@RestController
+@RequestMapping("/fund")
+public class FundInformationController extends BaseController {
+
+    private static final Logger logger = LoggerFactory.getLogger(FundInformationController.class);
+
+
+    @Autowired
+    private FundInformationService fundInformationService;
+
+    @Autowired
+    private FundReportFrequencyService fundReportFrequencyService;
+    /**
+     * 搜索输入框查询
+     * @param keyword
+     * @return
+     */
+    @RequestMapping("search-info")
+    public TableDataInfo searchFundInfo(@RequestParam(value = "keyword",required = false)String keyword){
+        List<Map<String,String>> result = fundInformationService.searchFundInfo(keyword);
+        return getDataTable(result);
+    }
+
+    /**
+     * @param fundShortName
+     * @param companyShortName
+     * @param navFrequency
+     * @param assetFrequency
+     * @return
+     */
+    @RequestMapping("search-list")
+    public List<FundInformationVO> searchFundInfoList(
+              @RequestParam(value = "fundId",required = false)String fundId,
+              @RequestParam(value = "fundShortName",required = false)String fundShortName,
+              @RequestParam(value = "companyShortName",required = false)String companyShortName,
+              @RequestParam(value = "navFrequency",required = false)Integer navFrequency,
+              @RequestParam(value = "assetFrequency",required = false)Integer assetFrequency,
+              @RequestParam(value = "startDate",required = false)Integer startDate,
+              @RequestParam(value = "endDate",required = false)Integer endDate){
+        List<FundInformationVO> result = fundInformationService.searchFundInfoList(fundId,fundShortName,companyShortName,navFrequency,assetFrequency,startDate,endDate);
+        return result;
+    }
+
+    @PostMapping("/save-frequency")
+    public ResultVo saveFundReportFrequency(@RequestBody FundReportFrequencyVO fundReportFrequency){
+        ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
+        try{
+            fundReportFrequencyService.saveFundReportFrequency(fundReportFrequency);
+        }catch (Exception e){
+            vo = new ResultVo(ResultCode.SAVE_FAILED);
+            logger.error(e.getMessage(),e);
+        }
+        return vo;
+    }
+
+}