tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews

Browse Source 
# Conflicts:
#	src/main/java/com/youlai/boot/platform/websocket/service/impl/WebsocketServiceImpl.java
#	src/main/java/com/youlai/boot/system/controller/NoticeController.java
#	src/main/java/com/youlai/boot/system/controller/NoticeStatusController.java
#	src/main/java/com/youlai/boot/system/converter/NoticeConverter.java
#	src/main/java/com/youlai/boot/system/converter/NoticeStatusConverter.java
#	src/main/java/com/youlai/boot/system/mapper/NoticeMapper.java
#	src/main/java/com/youlai/boot/system/mapper/NoticeStatusMapper.java
#	src/main/java/com/youlai/boot/system/model/entity/Notice.java
#	src/main/java/com/youlai/boot/system/model/entity/NoticeStatus.java
#	src/main/java/com/youlai/boot/system/model/form/NoticeForm.java
#	src/main/java/com/youlai/boot/system/model/form/NoticeStatusForm.java
#	src/main/java/com/youlai/boot/system/model/query/NoticeQuery.java
#	src/main/java/com/youlai/boot/system/model/query/NoticeStatusQuery.java
#	src/main/java/com/youlai/boot/system/model/vo/NoticeStatusVO.java
#	src/main/java/com/youlai/boot/system/model/vo/NoticeVO.java
#	src/main/java/com/youlai/boot/system/service/NoticeService.java
#	src/main/java/com/youlai/boot/system/service/NoticeStatusService.java
#	src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java
#	src/main/java/com/youlai/boot/system/service/impl/NoticeStatusServiceImpl.java
This commit is contained in:
Theo
2024-08-31 20:10:54 +08:00
parent 936fc24b2e 86762c959c
commit 55ec7673fd
252 changed files with 1338 additions and 1267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/resources/application-dev.yml
View File

@@ -1,5 +1,4 @@
server:
port: 8989
spring:
jackson:
@@ -62,7 +61,7 @@ mybatis-plus:
# 主键ID类型
id-type: none
# 逻辑删除字段名称
logic-delete-field: deleted
logic-delete-field: is_deleted
# 逻辑删除-删除值
logic-delete-value: 1
# 逻辑删除-未删除值
@@ -146,9 +145,13 @@ springdoc:
api-docs:
path: /v3/api-docs
group-configs:
- group: 'default'
paths-to-match: '/**'
packages-to-scan: com.youlai.system.controller
- group: '系统管理'
paths-to-match: "/**"
packages-to-scan:
- com.youlai.boot.system.controller
- com.youlai.boot.platform.auth.controller
- com.youlai.boot.platform.file.controller
- com.youlai.boot.platform.generator.controller
default-flat-param-object: true
# knife4j 接口文档配置

17
src/main/resources/application-prod.yml
View File

@@ -1,6 +1,3 @@
server:
port: 8989
spring:
jackson:
## 默认序列化时间格式
@@ -45,7 +42,7 @@ mybatis-plus:
# 主键ID类型
id-type: none
# 逻辑删除字段名称
logic-delete-field: deleted
logic-delete-field: is_deleted
# 逻辑删除-删除值
logic-delete-value: 1
# 逻辑删除-未删除值
@@ -130,9 +127,13 @@ springdoc:
api-docs:
path: /v3/api-docs
group-configs:
- group: 'default'
paths-to-match: '/**'
packages-to-scan: com.youlai.system.controller
- group: '系统管理'
paths-to-match: "/**"
packages-to-scan:
- com.youlai.boot.system.controller
- com.youlai.boot.platform.auth.controller
- com.youlai.boot.platform.file.controller
- com.youlai.boot.platform.generator.controller
default-flat-param-object: true
# knife4j 接口文档配置
@@ -140,7 +141,7 @@ knife4j:
# 是否开启 Knife4j 增强功能
enable: true # 设置为 true 表示开启增强功能
# 生产环境配置
production: true # 设置为 true 表示在生产环境中不显示文档，为 false 表示显示文档（通常在开发环境中使用）
production: false # 设置为 true 表示在生产环境中不显示文档，为 false 表示显示文档（通常在开发环境中使用）
setting:
language: zh_cn

2
src/main/resources/application.yml
View File

@@ -1,3 +1,5 @@
server:
port: 8989
spring:
main:
allow-circular-references: true

2
src/main/resources/mapper/SysDeptMapper.xml → src/main/resources/mapper/ConfigMapper.xml
View File

@@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.SysDeptMapper">
<mapper namespace="com.youlai.boot.system.mapper.ConfigMapper">
</mapper>

9
src/main/resources/mapper/DatabaseMapper.xml
View File

@@ -2,10 +2,10 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.DatabaseMapper">
<mapper namespace="com.youlai.boot.platform.generator.mapper.DatabaseMapper">
<!-- 查询数据库表分页 -->
<select id="getTablePage" resultType="com.youlai.system.model.vo.TablePageVO">
<select id="getTablePage" resultType="com.youlai.boot.system.model.vo.TablePageVO">
SELECT
t1.TABLE_NAME ,
t1.TABLE_COMMENT ,
@@ -33,7 +33,7 @@
CREATE_TIME DESC
</select>
<select id="getTableMetadata" resultType="com.youlai.system.model.bo.TableMetaData">
<select id="getTableMetadata" resultType="com.youlai.boot.system.model.bo.TableMetaData">
SELECT
TABLE_NAME ,
TABLE_COMMENT ,
@@ -47,7 +47,7 @@
AND TABLE_NAME = #{tableName}
</select>
<select id="getTableColumns" resultType="com.youlai.system.model.bo.ColumnMetaData">
<select id="getTableColumns" resultType="com.youlai.boot.system.model.bo.ColumnMetaData">
SELECT
COLUMN_NAME,
DATA_TYPE,
@@ -62,6 +62,7 @@
WHERE
TABLE_SCHEMA = (SELECT DATABASE())
AND TABLE_NAME = #{tableName}
ORDER BY ORDINAL_POSITION ASC
</select>

2
src/main/resources/mapper/SysConfigMapper.xml → src/main/resources/mapper/DeptMapper.xml
View File

@@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.SysConfigMapper">
<mapper namespace="com.youlai.boot.system.mapper.DeptMapper">
</mapper>

4
src/main/resources/mapper/SysDictItemMapper.xml → src/main/resources/mapper/DictItemMapper.xml
View File

@@ -2,10 +2,10 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.SysDictItemMapper">
<mapper namespace="com.youlai.boot.system.mapper.DictItemMapper">
<!-- 根据字典编码获取字典列表 -->
<select id="listDictItemsByDictId" resultType="com.youlai.system.model.vo.DictPageVO$DictItem">
<select id="listDictItemsByDictId" resultType="com.youlai.boot.system.model.vo.DictPageVO$DictItem">
SELECT
id,
`name`,

6
src/main/resources/mapper/SysDictMapper.xml → src/main/resources/mapper/DictMapper.xml
View File

@@ -2,13 +2,13 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.SysDictMapper">
<mapper namespace="com.youlai.boot.system.mapper.DictMapper">
<!-- 字典映射 -->
<resultMap id="DictMap" type="com.youlai.system.model.vo.DictPageVO">
<resultMap id="DictMap" type="com.youlai.boot.system.model.vo.DictPageVO">
<collection property="dictItems"
column="{dictId=id}"
select="com.youlai.system.mapper.SysDictItemMapper.listDictItemsByDictId">
select="com.youlai.boot.system.mapper.DictItemMapper.listDictItemsByDictId">
</collection>
</resultMap>
<!-- 字典分页列表 -->

2
src/main/resources/mapper/GenConfigMapper.xml
View File

@@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.GenConfigMapper">
<mapper namespace="com.youlai.boot.platform.generator.mapper.GenConfigMapper">
</mapper>

2
src/main/resources/mapper/GenFieldConfigMapper.xml
View File

@@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.GenFieldConfigMapper">
<mapper namespace="com.youlai.boot.platform.generator.mapper.GenFieldConfigMapper">
</mapper>

12
src/main/resources/mapper/SysLogMapper.xml → src/main/resources/mapper/LogMapper.xml
View File

@@ -2,10 +2,10 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.SysLogMapper">
<mapper namespace="com.youlai.boot.system.mapper.LogMapper">
<!-- 日志分页列表 -->
<select id="listPagedLogs" resultType="com.youlai.system.model.vo.LogPageVO">
<select id="listPagedLogs" resultType="com.youlai.boot.system.model.vo.LogPageVO">
SELECT
t1.id,
t1.module,
@@ -48,7 +48,7 @@
</select>
<!-- 获取访问量日统计列表 -->
<select id="getPvCounts" resultType="com.youlai.system.model.bo.VisitCount">
<select id="getPvCounts" resultType="com.youlai.boot.system.model.bo.VisitCount">
SELECT
COUNT(1) AS count,
DATE_FORMAT(create_time,'%Y-%m-%d') AS date
@@ -61,7 +61,7 @@
</select>
<!-- 获取IP日统计列表-->
<select id="getIpCounts" resultType="com.youlai.system.model.bo.VisitCount">
<select id="getIpCounts" resultType="com.youlai.boot.system.model.bo.VisitCount">
SELECT
COUNT(DISTINCT ip) AS count,
DATE_FORMAT(create_time, '%Y-%m-%d') AS date
@@ -74,7 +74,7 @@
</select>
<!-- 获取访问量(PV)统计数据 -->
<select id="getPvStats" resultType="com.youlai.system.model.vo.VisitStatsVO">
<select id="getPvStats" resultType="com.youlai.boot.system.model.vo.VisitStatsVO">
SELECT
COUNT(CASE WHEN DATE(create_time) = CURDATE() THEN 1 END) AS todayCount,
COUNT(*) AS totalCount,
@@ -94,7 +94,7 @@
</select>
<!-- 获取IP统计数据 -->
<select id="getIpStats" resultType="com.youlai.system.model.vo.VisitStatsVO">
<select id="getIpStats" resultType="com.youlai.boot.system.model.vo.VisitStatsVO">
SELECT
COUNT(DISTINCT CASE WHEN DATE(create_time) = CURDATE() THEN ip END) AS todayCount,
COUNT(DISTINCT ip) AS totalCount,

6
src/main/resources/mapper/SysMenuMapper.xml → src/main/resources/mapper/MenuMapper.xml
View File

@@ -2,10 +2,10 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.SysMenuMapper">
<mapper namespace="com.youlai.boot.system.mapper.MenuMapper">
<!-- 菜单路由映射 -->
<resultMap id="RouteMap" type="com.youlai.system.model.bo.RouteBO">
<resultMap id="RouteMap" type="com.youlai.boot.system.model.bo.RouteBO">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="parentId" column="parent_id" jdbcType="BIGINT"/>
@@ -44,7 +44,7 @@
INNER JOIN sys_role_menu t2 ON t1.id = t2.menu_id
INNER JOIN sys_role t3 ON t2.role_id = t3.id AND t3.status = 1 AND t3.is_deleted = 0
WHERE
t1.type != '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}'
t1.type != '${@com.youlai.boot.common.enums.MenuTypeEnum@BUTTON.getValue()}'
<if test="roles != null and roles.size() > 0">
<!-- ROOT 可查看所有菜单 -->
<if test="!roles.contains('ROOT')">

2
src/main/resources/mapper/SysRoleMapper.xml → src/main/resources/mapper/RoleMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.SysRoleMapper">
<mapper namespace="com.youlai.boot.system.mapper.RoleMapper">
<!-- 获取最大范围的数据权限 -->
<select id="getMaximumDataScope" resultType="java.lang.Integer">

8
src/main/resources/mapper/SysRoleMenuMapper.xml → src/main/resources/mapper/RoleMenuMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.SysRoleMenuMapper">
<mapper namespace="com.youlai.boot.system.mapper.RoleMenuMapper">
<!-- 获取角色拥有的菜单ID集合 -->
<select id="listMenuIdsByRoleId" resultType="java.lang.Long">
@@ -16,7 +16,7 @@
</select>
<!-- 权限和拥有权限的角色的映射 -->
<resultMap id="PremRolesMap" type="com.youlai.system.model.bo.RolePermsBO">
<resultMap id="PremRolesMap" type="com.youlai.boot.system.model.bo.RolePermsBO">
<result property="roleCode" column="role_code"/>
<collection property="perms" ofType="string" javaType="java.util.Set">
<result column="perm"/>
@@ -33,7 +33,7 @@
INNER JOIN sys_role t2 ON t1.role_id = t2.id AND t2.is_deleted = 0 AND t2.`status` = 1
INNER JOIN sys_menu t3 ON t1.menu_id = t3.id
WHERE
type = '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}'
type = '${@com.youlai.boot.common.enums.MenuTypeEnum@BUTTON.getValue()}'
<if test="roleCode!=null and roleCode.trim() neq ''">
AND t2.`code` = #{roleCode}
</if>
@@ -48,7 +48,7 @@
INNER JOIN sys_menu t2 ON t2.id = t1.menu_id
INNER JOIN sys_role t3 ON t3.id = t1.role_id
WHERE
t2.type = '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}'
t2.type = '${@com.youlai.boot.common.enums.MenuTypeEnum@BUTTON.getValue()}'
AND t2.perm IS NOT NULL
AND t3.CODE IN
<foreach collection="roles" item="role" separator="," open="(" close=")">

14
src/main/resources/mapper/SysUserMapper.xml → src/main/resources/mapper/UserMapper.xml
View File

@@ -2,10 +2,10 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.SysUserMapper">
<mapper namespace="com.youlai.boot.system.mapper.UserMapper">
<!-- 用户分页列表 -->
<select id="listPagedUsers" resultType="com.youlai.system.model.bo.UserBO">
<select id="listPagedUsers" resultType="com.youlai.boot.system.model.bo.UserBO">
SELECT
u.id,
u.username,
@@ -53,7 +53,7 @@
</select>
<!-- 用户表单信息映射 -->
<resultMap id="UserFormMap" type="com.youlai.system.model.form.UserForm">
<resultMap id="UserFormMap" type="com.youlai.boot.system.model.form.UserForm">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="username" column="username" jdbcType="VARCHAR"/>
<result property="nickname" column="nickname" jdbcType="VARCHAR"/>
@@ -66,7 +66,7 @@
<collection
property="roleIds"
column="id"
select="com.youlai.system.mapper.SysUserRoleMapper.listRoleIdsByUserId" >
select="com.youlai.boot.system.mapper.UserRoleMapper.listRoleIdsByUserId" >
<result column="role_id" />
</collection>
</resultMap>
@@ -90,7 +90,7 @@
</select>
<!-- 用户认证信息映射 -->
<resultMap id="UserAuthMap" type="com.youlai.system.model.dto.UserAuthInfo">
<resultMap id="UserAuthMap" type="com.youlai.boot.system.model.dto.UserAuthInfo">
<id property="userId" column="userId" jdbcType="BIGINT"/>
<result property="username" column="username" jdbcType="VARCHAR"/>
<result property="password" column="password" jdbcType="VARCHAR"/>
@@ -120,7 +120,7 @@
</select>
<!-- 获取用户导出列表 -->
<select id="listExportUsers" resultType="com.youlai.system.model.dto.UserExportDTO">
<select id="listExportUsers" resultType="com.youlai.boot.system.model.dto.UserExportDTO">
SELECT
u.username,
u.nickname,
@@ -153,7 +153,7 @@
</select>
<!-- 根据用户ID获取用户详情 -->
<select id="getUserProfile" resultType="com.youlai.system.model.bo.UserBO">
<select id="getUserProfile" resultType="com.youlai.boot.system.model.bo.UserBO">
SELECT
u.id,
u.username,

2
src/main/resources/mapper/SysUserRoleMapper.xml → src/main/resources/mapper/UserRoleMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.youlai.system.mapper.SysUserRoleMapper">
<mapper namespace="com.youlai.boot.system.mapper.UserRoleMapper">
<!-- 根据用户ID获取角色ID集合 -->
<select id="listRoleIdsByUserId" resultType="java.lang.Long">

4
src/main/resources/templates/generator/controller.java.vm
View File

@@ -8,8 +8,8 @@ import ${packageName}.${moduleName}.model.form.${entityName}Form;
import ${packageName}.${moduleName}.model.query.${entityName}Query;
import ${packageName}.${moduleName}.model.vo.${entityName}VO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.youlai.system.common.result.PageResult;
import com.youlai.system.common.result.Result;
import com.youlai.boot.common.result.PageResult;
import com.youlai.boot.common.result.Result;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;

2
src/main/resources/templates/generator/entity.java.vm
View File

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
import java.math.BigDecimal;
#end
import com.baomidou.mybatisplus.annotation.TableName;
import com.youlai.system.common.base.BaseEntity;
import com.youlai.boot.common.base.BaseEntity;
/**
* $!{businessName}实体对象

2
src/main/resources/templates/generator/query.java.vm
View File

@@ -1,6 +1,6 @@
package ${packageName}.${moduleName}.${subpackageName};
import com.youlai.system.common.base.BasePageQuery;
import com.youlai.boot.common.base.BasePageQuery;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;