fix:修复引入了pagehelper导致项目启动失败问题，不用pagehelper

pom.xml

@@ -15,7 +15,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-<!--        <pagehelper.boot.version>1.4.7</pagehelper.boot.version>-->
+<!--        <pagehelper.boot.version>2.0.0</pagehelper.boot.version>-->
         <data-calc.version>0.1.8-SNAPSHOT</data-calc.version>
         <joda-time.version>2.12.7</joda-time.version>
         <commons-math3.version>3.6.1</commons-math3.version>

service-base/pom.xml

@@ -33,12 +33,12 @@
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
         </dependency>
-        <!-- pagehelper 分页插件 -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>2.0.0</version>
-        </dependency>
+<!--        &lt;!&ndash; pagehelper 分页插件 &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.github.pagehelper</groupId>-->
+<!--            <artifactId>pagehelper-spring-boot-starter</artifactId>-->
+<!--            <version>2.0.0</version>-->
+<!--        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>com.baomidou</groupId>-->
 <!--            <artifactId>mybatis-plus</artifactId>-->
@@ -156,11 +156,11 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>6.1.12</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework</groupId>-->
+<!--            <artifactId>spring-web</artifactId>-->
+<!--            <version>6.1.12</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <repositories>

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

@@ -1,34 +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-base/src/main/java/com/simuwang/shiro/config/ShiroConfig.java

@@ -1,134 +1,134 @@
-//package com.simuwang.shiro.config;
-//
-//import com.simuwang.shiro.PropertiesUtil;
-//import com.simuwang.shiro.core.ShiroDbRealm;
-//import com.simuwang.shiro.core.adapter.AuthAdapter;
-//import com.simuwang.shiro.core.adapter.SimpleAuthAdapter;
-//import com.simuwang.shiro.core.bridge.AuthBridgeService;
-//import com.simuwang.shiro.core.impl.ShiroDbRealmImpl;
-//import org.apache.shiro.spring.LifecycleBeanPostProcessor;
-//import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
-//import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
-//import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
-//import org.apache.shiro.web.servlet.SimpleCookie;
-//import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
-//import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.context.annotation.DependsOn;
-//
-//import java.util.LinkedHashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-//@Configuration
-//public class ShiroConfig {
-//    /**
-//     * @Description 保证实现了Shiro内部lifecycle函数的bean执行
-//     */
-//    @Bean(name = "lifecycleBeanPostProcessor")
-//    public static LifecycleBeanPostProcessor getLifecycleBeanPostProcessor() {
-//        return new LifecycleBeanPostProcessor();
-//    }
-//
-//    @Bean
-//    public AuthAdapter authAdapter() {
-//        return new SimpleAuthAdapter();
-//    }
-//
-//    @Bean
-//    public AuthBridgeService authBridgeService() {
-//        return new AuthBridgeService(this.authAdapter());
-//    }
-//
-//    /**
-//     * @Description 创建cookie对象
-//     */
-//    @Bean(name = "sessionIdCookie")
-//    public SimpleCookie simpleCookie() {
-//        SimpleCookie simpleCookie = new SimpleCookie();
-//        simpleCookie.setName("ShiroSession");
-//        return simpleCookie;
-//    }
-//
-//    /**
-//     * @Description 权限管理器
-//     */
-//    @Bean(name = "securityManager")
-//    public DefaultWebSecurityManager defaultWebSecurityManager() {
-//        DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
-//        securityManager.setRealm(shiroDbRealm());
-//        securityManager.setSessionManager(shiroSessionManager());
-//        return securityManager;
-//    }
-//
-//    /**
-//     * @Description 自定义RealmImpl
-//     */
-//    @Bean(name = "shiroDbRealm")
-//    public ShiroDbRealm shiroDbRealm() {
-//        return new ShiroDbRealmImpl(this.authBridgeService());
-//    }
-//
-//    /**
-//     * @Description 会话管理器
-//     */
-//    @Bean(name = "sessionManager")
-//    public DefaultWebSessionManager shiroSessionManager() {
-//        DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
-//        sessionManager.setSessionValidationSchedulerEnabled(false);
-//        sessionManager.setSessionIdCookieEnabled(true);
-//        sessionManager.setSessionIdCookie(simpleCookie());
-//        sessionManager.setGlobalSessionTimeout(3600000);
-//        return sessionManager;
-//    }
-//
-//    /**
-//     * @Description AOP式方法级权限检查
-//     */
-//    @Bean
-//    @DependsOn("lifecycleBeanPostProcessor")
-//    public DefaultAdvisorAutoProxyCreator getDefaultAdvisorAutoProxyCreator() {
-//        DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();
-//        defaultAdvisorAutoProxyCreator.setProxyTargetClass(true);
-//        return defaultAdvisorAutoProxyCreator;
-//    }
-//
-//    /**
-//     * @Description 配合DefaultAdvisorAutoProxyCreator事项注解权限校验
-//     */
-//    @Bean
-//    public AuthorizationAttributeSourceAdvisor getAuthorizationAttributeSourceAdvisor() {
-//        AuthorizationAttributeSourceAdvisor aasa = new AuthorizationAttributeSourceAdvisor();
-//        aasa.setSecurityManager(defaultWebSecurityManager());
-//        return new AuthorizationAttributeSourceAdvisor();
-//    }
-//
-//    /**
-//     * @Description 过滤器链
-//     */
-//    private Map<String, String> filterChainDefinition() {
-//        List<Object> list = PropertiesUtil.propertiesShiro.getKeyList();
-//        Map<String, String> map = new LinkedHashMap<>();
-//        for (Object object : list) {
-//            String key = object.toString();
-//            String value = PropertiesUtil.getShiroValue(key);
-////            log.info("读取防止盗链控制：---key{},---value:{}", key, value);
-//            map.put(key, value);
-//        }
-//        return map;
-//    }
-//
-//    /**
-//     * @Description Shiro过滤器
-//     */
-//    @Bean("shiroFilter")
-//    public ShiroFilterFactoryBean shiroFilterFactoryBean() {
-//        ShiroFilterFactoryBean shiroFilter = new ShiroFilterFactoryBean();
-//        shiroFilter.setSecurityManager(defaultWebSecurityManager());
-//        shiroFilter.setFilterChainDefinitionMap(filterChainDefinition());
-//        shiroFilter.setLoginUrl("/login");
-//        shiroFilter.setUnauthorizedUrl("/login");
-//        return shiroFilter;
-//    }
-//}
+package com.simuwang.shiro.config;
+
+import com.simuwang.shiro.PropertiesUtil;
+import com.simuwang.shiro.core.ShiroDbRealm;
+import com.simuwang.shiro.core.adapter.AuthAdapter;
+import com.simuwang.shiro.core.adapter.SimpleAuthAdapter;
+import com.simuwang.shiro.core.bridge.AuthBridgeService;
+import com.simuwang.shiro.core.impl.ShiroDbRealmImpl;
+import org.apache.shiro.spring.LifecycleBeanPostProcessor;
+import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
+import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
+import org.apache.shiro.web.servlet.SimpleCookie;
+import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
+import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@Configuration
+public class ShiroConfig {
+    /**
+     * @Description 保证实现了Shiro内部lifecycle函数的bean执行
+     */
+    @Bean(name = "lifecycleBeanPostProcessor")
+    public static LifecycleBeanPostProcessor getLifecycleBeanPostProcessor() {
+        return new LifecycleBeanPostProcessor();
+    }
+
+    @Bean
+    public AuthAdapter authAdapter() {
+        return new SimpleAuthAdapter();
+    }
+
+    @Bean
+    public AuthBridgeService authBridgeService() {
+        return new AuthBridgeService(this.authAdapter());
+    }
+
+    /**
+     * @Description 创建cookie对象
+     */
+    @Bean(name = "sessionIdCookie")
+    public SimpleCookie simpleCookie() {
+        SimpleCookie simpleCookie = new SimpleCookie();
+        simpleCookie.setName("ShiroSession");
+        return simpleCookie;
+    }
+
+    /**
+     * @Description 权限管理器
+     */
+    @Bean(name = "securityManager")
+    public DefaultWebSecurityManager defaultWebSecurityManager() {
+        DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
+        securityManager.setRealm(shiroDbRealm());
+        securityManager.setSessionManager(shiroSessionManager());
+        return securityManager;
+    }
+
+    /**
+     * @Description 自定义RealmImpl
+     */
+    @Bean(name = "shiroDbRealm")
+    public ShiroDbRealm shiroDbRealm() {
+        return new ShiroDbRealmImpl(this.authBridgeService());
+    }
+
+    /**
+     * @Description 会话管理器
+     */
+    @Bean(name = "sessionManager")
+    public DefaultWebSessionManager shiroSessionManager() {
+        DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
+        sessionManager.setSessionValidationSchedulerEnabled(false);
+        sessionManager.setSessionIdCookieEnabled(true);
+        sessionManager.setSessionIdCookie(simpleCookie());
+        sessionManager.setGlobalSessionTimeout(3600000);
+        return sessionManager;
+    }
+
+    /**
+     * @Description AOP式方法级权限检查
+     */
+    @Bean
+    @DependsOn("lifecycleBeanPostProcessor")
+    public DefaultAdvisorAutoProxyCreator getDefaultAdvisorAutoProxyCreator() {
+        DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();
+        defaultAdvisorAutoProxyCreator.setProxyTargetClass(true);
+        return defaultAdvisorAutoProxyCreator;
+    }
+
+    /**
+     * @Description 配合DefaultAdvisorAutoProxyCreator事项注解权限校验
+     */
+    @Bean
+    public AuthorizationAttributeSourceAdvisor getAuthorizationAttributeSourceAdvisor() {
+        AuthorizationAttributeSourceAdvisor aasa = new AuthorizationAttributeSourceAdvisor();
+        aasa.setSecurityManager(defaultWebSecurityManager());
+        return new AuthorizationAttributeSourceAdvisor();
+    }
+
+    /**
+     * @Description 过滤器链
+     */
+    private Map<String, String> filterChainDefinition() {
+        List<Object> list = PropertiesUtil.propertiesShiro.getKeyList();
+        Map<String, String> map = new LinkedHashMap<>();
+        for (Object object : list) {
+            String key = object.toString();
+            String value = PropertiesUtil.getShiroValue(key);
+//            log.info("读取防止盗链控制：---key{},---value:{}", key, value);
+            map.put(key, value);
+        }
+        return map;
+    }
+
+    /**
+     * @Description Shiro过滤器
+     */
+    @Bean("shiroFilter")
+    public ShiroFilterFactoryBean shiroFilterFactoryBean() {
+        ShiroFilterFactoryBean shiroFilter = new ShiroFilterFactoryBean();
+        shiroFilter.setSecurityManager(defaultWebSecurityManager());
+        shiroFilter.setFilterChainDefinitionMap(filterChainDefinition());
+        shiroFilter.setLoginUrl("/login");
+        shiroFilter.setUnauthorizedUrl("/login");
+        return shiroFilter;
+    }
+}

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;
+//    }
+//
+//}

service-manage/src/main/java/com/simuwang/manage/api/system/SysConfigController.java

@@ -1,125 +1,125 @@
-package com.simuwang.manage.api.system;
-
-import com.simuwang.base.common.page.TableDataInfo;
-import com.simuwang.base.common.result.AjaxResult;
-import com.simuwang.base.pojo.vo.SysConfigVO;
-import com.simuwang.manage.api.base.BaseController;
-import com.simuwang.manage.service.system.SysConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 参数配置 信息操作处理
- * 
- * @author ruoyi
- */
-@Controller
-@RequestMapping("/system/config")
-public class SysConfigController extends BaseController
-{
-    private String prefix = "system/config";
-
-    @Autowired
-    private SysConfigService configService;
-
-    @GetMapping()
-    public String config()
-    {
-        return prefix + "/config";
-    }
-
-    /**
-     * 查询参数配置列表
-     */
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(SysConfigVO config)
-    {
-        startPage();
-        List<SysConfigVO> list = configService.selectConfigList(config);
-        return getDataTable(list);
-    }
-    /**
-     * 新增参数配置
-     */
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存参数配置
-     */
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(@Validated SysConfigVO config)
-    {
-        if (!configService.checkConfigKeyUnique(config))
-        {
-            return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
-        }
-        return toAjax(configService.insertConfig(config));
-    }
-
-    /**
-     * 修改参数配置
-     */
-    @GetMapping("/edit/{configId}")
-    public String edit(@PathVariable("configId") Long configId, ModelMap mmap)
-    {
-        mmap.put("config", configService.selectConfigById(configId));
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存参数配置
-     */
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(@Validated SysConfigVO config)
-    {
-        if (!configService.checkConfigKeyUnique(config))
-        {
-            return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
-        }
-        return toAjax(configService.updateConfig(config));
-    }
-
-    /**
-     * 删除参数配置
-     */
-    @PostMapping("/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        configService.deleteConfigByIds(ids);
-        return success();
-    }
-
-    /**
-     * 刷新参数缓存
-     */
-    @GetMapping("/refreshCache")
-    @ResponseBody
-    public AjaxResult refreshCache()
-    {
-        configService.resetConfigCache();
-        return success();
-    }
-
-    /**
-     * 校验参数键名
-     */
-    @PostMapping("/checkConfigKeyUnique")
-    @ResponseBody
-    public boolean checkConfigKeyUnique(SysConfigVO config)
-    {
-        return configService.checkConfigKeyUnique(config);
-    }
-}
+//package com.simuwang.manage.api.system;
+//
+//import com.simuwang.base.common.page.TableDataInfo;
+//import com.simuwang.base.common.result.AjaxResult;
+//import com.simuwang.base.pojo.vo.SysConfigVO;
+//import com.simuwang.manage.api.base.BaseController;
+//import com.simuwang.manage.service.system.SysConfigService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.ui.ModelMap;
+//import org.springframework.validation.annotation.Validated;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 参数配置 信息操作处理
+// *
+// * @author ruoyi
+// */
+//@Controller
+//@RequestMapping("/system/config")
+//public class SysConfigController extends BaseController
+//{
+//    private String prefix = "system/config";
+//
+//    @Autowired
+//    private SysConfigService configService;
+//
+//    @GetMapping()
+//    public String config()
+//    {
+//        return prefix + "/config";
+//    }
+//
+//    /**
+//     * 查询参数配置列表
+//     */
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public TableDataInfo list(SysConfigVO config)
+//    {
+//        startPage();
+//        List<SysConfigVO> list = configService.selectConfigList(config);
+//        return getDataTable(list);
+//    }
+//    /**
+//     * 新增参数配置
+//     */
+//    @GetMapping("/add")
+//    public String add()
+//    {
+//        return prefix + "/add";
+//    }
+//
+//    /**
+//     * 新增保存参数配置
+//     */
+//    @PostMapping("/add")
+//    @ResponseBody
+//    public AjaxResult addSave(@Validated SysConfigVO config)
+//    {
+//        if (!configService.checkConfigKeyUnique(config))
+//        {
+//            return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+//        }
+//        return toAjax(configService.insertConfig(config));
+//    }
+//
+//    /**
+//     * 修改参数配置
+//     */
+//    @GetMapping("/edit/{configId}")
+//    public String edit(@PathVariable("configId") Long configId, ModelMap mmap)
+//    {
+//        mmap.put("config", configService.selectConfigById(configId));
+//        return prefix + "/edit";
+//    }
+//
+//    /**
+//     * 修改保存参数配置
+//     */
+//    @PostMapping("/edit")
+//    @ResponseBody
+//    public AjaxResult editSave(@Validated SysConfigVO config)
+//    {
+//        if (!configService.checkConfigKeyUnique(config))
+//        {
+//            return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+//        }
+//        return toAjax(configService.updateConfig(config));
+//    }
+//
+//    /**
+//     * 删除参数配置
+//     */
+//    @PostMapping("/remove")
+//    @ResponseBody
+//    public AjaxResult remove(String ids)
+//    {
+//        configService.deleteConfigByIds(ids);
+//        return success();
+//    }
+//
+//    /**
+//     * 刷新参数缓存
+//     */
+//    @GetMapping("/refreshCache")
+//    @ResponseBody
+//    public AjaxResult refreshCache()
+//    {
+//        configService.resetConfigCache();
+//        return success();
+//    }
+//
+//    /**
+//     * 校验参数键名
+//     */
+//    @PostMapping("/checkConfigKeyUnique")
+//    @ResponseBody
+//    public boolean checkConfigKeyUnique(SysConfigVO config)
+//    {
+//        return configService.checkConfigKeyUnique(config);
+//    }
+//}

service-manage/src/main/java/com/simuwang/manage/service/impl/FundReportFrequencyServiceImpl.java

@@ -14,6 +14,7 @@ import java.util.Date;
  * Author:   chenjianhua
  * Date:     2024/9/6 17:14
  * Description: ${DESCRIPTION}
+ *
  */
 @Service
 public class FundReportFrequencyServiceImpl implements FundReportFrequencyService {