refactor(sa-base): 重构支持模块的包结构

- 将 config、heartbeat、loginlog、mail、operatelog、table等子模块的 DAO 和服务层接口移动到各自的子包中
- 更新了相关的导入路径
- 删除了不必要的空行和注释
This commit is contained in:
钟家兴 2025-05-03 01:02:33 +08:00
parent bbe551f10d
commit 7b6e789b8c
35 changed files with 50 additions and 47 deletions

View File

@ -24,5 +24,4 @@ public class OperateLogAspectConfig extends OperateLogAspect{
return OperateLogConfig.builder().corePoolSize(1).queueCapacity(10000).build();
}
}

View File

@ -28,7 +28,6 @@ public class AdminSwaggerTagConst extends SwaggerTagConst {
}
public static class System {
public static final String SYSTEM_LOGIN = "系统-员工登录";
@ -55,5 +54,4 @@ public class AdminSwaggerTagConst extends SwaggerTagConst {
}
}

View File

@ -37,14 +37,14 @@ import net.lab1024.sa.base.constant.RedisKeyConst;
import net.lab1024.sa.base.module.support.apiencrypt.service.ApiEncryptService;
import net.lab1024.sa.base.module.support.captcha.CaptchaService;
import net.lab1024.sa.base.module.support.captcha.domain.CaptchaVO;
import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
import net.lab1024.sa.base.module.support.config.ConfigService;
import net.lab1024.sa.base.module.support.config.enums.ConfigKeyEnum;
import net.lab1024.sa.base.module.support.config.service.ConfigService;
import net.lab1024.sa.base.module.support.file.service.IFileStorageService;
import net.lab1024.sa.base.module.support.loginlog.LoginLogResultEnum;
import net.lab1024.sa.base.module.support.loginlog.LoginLogService;
import net.lab1024.sa.base.module.support.loginlog.enums.LoginLogResultEnum;
import net.lab1024.sa.base.module.support.loginlog.service.LoginLogService;
import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogEntity;
import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO;
import net.lab1024.sa.base.module.support.mail.MailService;
import net.lab1024.sa.base.module.support.mail.service.MailService;
import net.lab1024.sa.base.module.support.mail.constant.MailTemplateCodeEnum;
import net.lab1024.sa.base.module.support.redis.RedisService;
import net.lab1024.sa.base.module.support.securityprotect.domain.LoginFailEntity;

View File

@ -9,7 +9,7 @@ import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.constant.SwaggerTagConst;
import net.lab1024.sa.base.module.support.config.ConfigService;
import net.lab1024.sa.base.module.support.config.service.ConfigService;
import net.lab1024.sa.base.module.support.config.domain.ConfigAddForm;
import net.lab1024.sa.base.module.support.config.domain.ConfigQueryForm;
import net.lab1024.sa.base.module.support.config.domain.ConfigUpdateForm;

View File

@ -8,7 +8,7 @@ import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.constant.SwaggerTagConst;
import net.lab1024.sa.base.module.support.heartbeat.HeartBeatService;
import net.lab1024.sa.base.module.support.heartbeat.service.HeartBeatService;
import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordQueryForm;
import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordVO;
import org.springframework.web.bind.annotation.PostMapping;

View File

@ -10,7 +10,7 @@ import net.lab1024.sa.base.common.domain.RequestUser;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartRequestUtil;
import net.lab1024.sa.base.constant.SwaggerTagConst;
import net.lab1024.sa.base.module.support.loginlog.LoginLogService;
import net.lab1024.sa.base.module.support.loginlog.service.LoginLogService;
import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogQueryForm;
import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO;
import org.springframework.web.bind.annotation.PostMapping;

View File

@ -10,7 +10,7 @@ import net.lab1024.sa.base.common.domain.RequestUser;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartRequestUtil;
import net.lab1024.sa.base.constant.SwaggerTagConst;
import net.lab1024.sa.base.module.support.operatelog.OperateLogService;
import net.lab1024.sa.base.module.support.operatelog.service.OperateLogService;
import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogQueryForm;
import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogVO;
import org.springframework.web.bind.annotation.*;

View File

@ -9,8 +9,8 @@ import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.ValidateList;
import net.lab1024.sa.base.constant.SwaggerTagConst;
import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
import net.lab1024.sa.base.module.support.config.ConfigService;
import net.lab1024.sa.base.module.support.config.enums.ConfigKeyEnum;
import net.lab1024.sa.base.module.support.config.service.ConfigService;
import net.lab1024.sa.base.module.support.securityprotect.domain.Level3ProtectConfigForm;
import net.lab1024.sa.base.module.support.securityprotect.domain.LoginFailQueryForm;
import net.lab1024.sa.base.module.support.securityprotect.domain.LoginFailVO;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.config;
package net.lab1024.sa.base.module.support.config.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -6,6 +6,7 @@ import jakarta.annotation.Resource;
import net.lab1024.sa.base.common.controller.SupportBaseController;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.constant.SwaggerTagConst;
import net.lab1024.sa.base.module.support.config.service.ConfigService;
import net.lab1024.sa.base.module.support.config.domain.ConfigVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.config;
package net.lab1024.sa.base.module.support.config.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -6,7 +6,6 @@ import net.lab1024.sa.base.module.support.config.domain.ConfigEntity;
import net.lab1024.sa.base.module.support.config.domain.ConfigQueryForm;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import java.util.List;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.config;
package net.lab1024.sa.base.module.support.config.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.config;
package net.lab1024.sa.base.module.support.config.service;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
@ -12,7 +12,9 @@ import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
import net.lab1024.sa.base.common.util.SmartPageUtil;
import net.lab1024.sa.base.constant.ReloadConst;
import net.lab1024.sa.base.module.support.config.dao.ConfigDao;
import net.lab1024.sa.base.module.support.config.domain.*;
import net.lab1024.sa.base.module.support.config.enums.ConfigKeyEnum;
import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.heartbeat;
package net.lab1024.sa.base.module.support.heartbeat.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -7,7 +7,6 @@ import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordQueryF
import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.List;

View File

@ -1,10 +1,11 @@
package net.lab1024.sa.base.module.support.heartbeat;
package net.lab1024.sa.base.module.support.heartbeat.handler;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
import net.lab1024.sa.base.module.support.heartbeat.core.HeartBeatRecord;
import net.lab1024.sa.base.module.support.heartbeat.core.IHeartBeatRecordHandler;
import net.lab1024.sa.base.module.support.heartbeat.dao.HeartBeatRecordDao;
import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordEntity;
import org.springframework.stereotype.Service;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.heartbeat;
package net.lab1024.sa.base.module.support.heartbeat.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartPageUtil;
import net.lab1024.sa.base.module.support.heartbeat.dao.HeartBeatRecordDao;
import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordQueryForm;
import net.lab1024.sa.base.module.support.heartbeat.domain.HeartBeatRecordVO;
import org.springframework.stereotype.Service;

View File

@ -1,7 +1,7 @@
package net.lab1024.sa.base.module.support.job.sample;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.module.support.config.ConfigDao;
import net.lab1024.sa.base.module.support.config.dao.ConfigDao;
import net.lab1024.sa.base.module.support.config.domain.ConfigEntity;
import net.lab1024.sa.base.module.support.job.core.SmartJob;
import org.springframework.beans.factory.annotation.Autowired;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.loginlog;
package net.lab1024.sa.base.module.support.loginlog.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -7,7 +7,6 @@ import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogQueryForm;
import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import java.util.List;

View File

@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
import net.lab1024.sa.base.common.swagger.SchemaEnum;
import net.lab1024.sa.base.module.support.loginlog.LoginLogResultEnum;
import net.lab1024.sa.base.module.support.loginlog.enums.LoginLogResultEnum;
import java.time.LocalDateTime;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.loginlog;
package net.lab1024.sa.base.module.support.loginlog.enums;
import net.lab1024.sa.base.common.enumeration.BaseEnum;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.loginlog;
package net.lab1024.sa.base.module.support.loginlog.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
@ -7,6 +7,8 @@ import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
import net.lab1024.sa.base.common.util.SmartPageUtil;
import net.lab1024.sa.base.module.support.loginlog.enums.LoginLogResultEnum;
import net.lab1024.sa.base.module.support.loginlog.dao.LoginLogDao;
import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogEntity;
import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogQueryForm;
import net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO;

View File

@ -1,10 +1,9 @@
package net.lab1024.sa.base.module.support.mail;
package net.lab1024.sa.base.module.support.mail.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import net.lab1024.sa.base.module.support.mail.domain.MailTemplateEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Component;
/**
* 邮件模板

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.mail;
package net.lab1024.sa.base.module.support.mail.service;
import cn.hutool.core.lang.UUID;
@ -11,6 +11,7 @@ import jakarta.mail.internet.MimeMessage;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.SystemEnvironment;
import net.lab1024.sa.base.module.support.mail.dao.MailTemplateDao;
import net.lab1024.sa.base.module.support.mail.constant.MailTemplateCodeEnum;
import net.lab1024.sa.base.module.support.mail.constant.MailTemplateTypeEnum;
import net.lab1024.sa.base.module.support.mail.domain.MailTemplateEntity;

View File

@ -13,7 +13,7 @@ import net.lab1024.sa.base.common.constant.StringConst;
import net.lab1024.sa.base.common.domain.RequestUser;
import net.lab1024.sa.base.common.util.SmartIpUtil;
import net.lab1024.sa.base.common.util.SmartRequestUtil;
import net.lab1024.sa.base.module.support.operatelog.OperateLogDao;
import net.lab1024.sa.base.module.support.operatelog.dao.OperateLogDao;
import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog;
import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogEntity;
import org.aspectj.lang.JoinPoint;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.operatelog;
package net.lab1024.sa.base.module.support.operatelog.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -6,7 +6,6 @@ import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogEntity;
import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogQueryForm;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import java.util.List;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.operatelog;
package net.lab1024.sa.base.module.support.operatelog.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
@ -7,6 +7,7 @@ import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
import net.lab1024.sa.base.common.util.SmartPageUtil;
import net.lab1024.sa.base.module.support.operatelog.dao.OperateLogDao;
import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogEntity;
import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogQueryForm;
import net.lab1024.sa.base.module.support.operatelog.domain.OperateLogVO;

View File

@ -7,8 +7,8 @@ import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
import net.lab1024.sa.base.module.support.config.ConfigService;
import net.lab1024.sa.base.module.support.config.enums.ConfigKeyEnum;
import net.lab1024.sa.base.module.support.config.service.ConfigService;
import net.lab1024.sa.base.module.support.securityprotect.domain.Level3ProtectConfigForm;
import org.springframework.stereotype.Service;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.table;
package net.lab1024.sa.base.module.support.table.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -9,6 +9,7 @@ import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartRequestUtil;
import net.lab1024.sa.base.constant.SwaggerTagConst;
import net.lab1024.sa.base.module.support.repeatsubmit.annoation.RepeatSubmit;
import net.lab1024.sa.base.module.support.table.service.TableColumnService;
import net.lab1024.sa.base.module.support.table.domain.TableColumnUpdateForm;
import org.springframework.web.bind.annotation.*;

View File

@ -1,4 +1,4 @@
package net.lab1024.sa.base.module.support.table;
package net.lab1024.sa.base.module.support.table.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import net.lab1024.sa.base.module.support.table.domain.TableColumnEntity;

View File

@ -1,9 +1,10 @@
package net.lab1024.sa.base.module.support.table;
package net.lab1024.sa.base.module.support.table.service;
import com.alibaba.fastjson.JSONArray;
import jakarta.annotation.Resource;
import net.lab1024.sa.base.common.domain.RequestUser;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.module.support.table.dao.TableColumnDao;
import net.lab1024.sa.base.module.support.table.domain.TableColumnEntity;
import net.lab1024.sa.base.module.support.table.domain.TableColumnUpdateForm;
import org.apache.commons.collections4.CollectionUtils;

View File

@ -45,7 +45,7 @@ spring:
database: 1
host: 127.0.0.1
port: 6379
password: 123456
password:
timeout: 10000ms
lettuce:
pool:

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.base.module.support.config.ConfigDao">
<mapper namespace="net.lab1024.sa.base.module.support.config.dao.ConfigDao">
<!-- 分页查询系统配置 -->
<select id="queryByPage" resultType="net.lab1024.sa.base.module.support.config.domain.ConfigEntity">
SELECT *

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.base.module.support.heartbeat.HeartBeatRecordDao">
<mapper namespace="net.lab1024.sa.base.module.support.heartbeat.dao.HeartBeatRecordDao">
<update id="updateHeartBeatTimeById">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.base.module.support.loginlog.LoginLogDao">
<mapper namespace="net.lab1024.sa.base.module.support.loginlog.dao.LoginLogDao">
<select id="queryByPage" resultType="net.lab1024.sa.base.module.support.loginlog.domain.LoginLogVO">
select

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.base.module.support.operatelog.OperateLogDao">
<mapper namespace="net.lab1024.sa.base.module.support.operatelog.dao.OperateLogDao">
<select id="queryByPage" resultType="net.lab1024.sa.base.module.support.operatelog.domain.OperateLogEntity">
select

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.base.module.support.table.TableColumnDao">
<mapper namespace="net.lab1024.sa.base.module.support.table.dao.TableColumnDao">
<delete id="deleteTableColumn">
delete
from t_table_column