Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
查尔斯-BUG万象集
Continew Admin
提交
8529af8e
Continew Admin
项目概览
查尔斯-BUG万象集
/
Continew Admin
8 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
分析
仓库
DevOps
项目成员
Pages
Continew Admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
8529af8e
编写于
9月 16, 2023
作者:
查尔斯-BUG万象集
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: 优化字典导出数据和格式
上级
9ed63dbd
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
69 addition
and
23 deletion
+69
-23
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailVO.java
.../java/top/charles7c/cnadmin/common/base/BaseDetailVO.java
+2
-2
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
...va/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
+1
-1
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseVO.java
...c/main/java/top/charles7c/cnadmin/common/base/BaseVO.java
+3
-3
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DictDetailVO.java
...a/top/charles7c/cnadmin/system/model/vo/DictDetailVO.java
+0
-7
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DictItemDetailVO.java
...p/charles7c/cnadmin/system/model/vo/DictItemDetailVO.java
+21
-8
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DictItemService.java
...top/charles7c/cnadmin/system/service/DictItemService.java
+9
-0
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictItemServiceImpl.java
...es7c/cnadmin/system/service/impl/DictItemServiceImpl.java
+12
-0
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictServiceImpl.java
...harles7c/cnadmin/system/service/impl/DictServiceImpl.java
+21
-2
未找到文件。
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseDetailVO.java
浏览文件 @
8529af8e
...
...
@@ -46,13 +46,13 @@ public class BaseDetailVO extends BaseVO {
* 修改人
*/
@Schema
(
description
=
"修改人"
,
example
=
"李四"
)
@ExcelProperty
(
value
=
"修改人"
)
@ExcelProperty
(
value
=
"修改人"
,
order
=
Integer
.
MAX_VALUE
-
2
)
private
String
updateUserString
;
/**
* 修改时间
*/
@Schema
(
description
=
"修改时间"
,
example
=
"2023-08-08 08:08:08"
,
type
=
"string"
)
@ExcelProperty
(
value
=
"修改时间"
)
@ExcelProperty
(
value
=
"修改时间"
,
order
=
Integer
.
MAX_VALUE
-
1
)
private
LocalDateTime
updateTime
;
}
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
浏览文件 @
8529af8e
...
...
@@ -236,7 +236,7 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseDO,
* @param detailObj
* 待填充详情信息
*/
p
rotected
void
fillDetail
(
Object
detailObj
)
{
p
ublic
void
fillDetail
(
Object
detailObj
)
{
if
(
detailObj
instanceof
BaseDetailVO
)
{
BaseDetailVO
detailVO
=
(
BaseDetailVO
)
detailObj
;
this
.
fill
(
detailVO
);
...
...
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseVO.java
浏览文件 @
8529af8e
...
...
@@ -42,7 +42,7 @@ public class BaseVO implements Serializable {
* ID
*/
@Schema
(
description
=
"ID"
,
example
=
"1"
)
@ExcelProperty
(
value
=
"ID"
)
@ExcelProperty
(
value
=
"ID"
,
order
=
1
)
private
Long
id
;
/**
...
...
@@ -55,14 +55,14 @@ public class BaseVO implements Serializable {
* 创建人
*/
@Schema
(
description
=
"创建人"
,
example
=
"超级管理员"
)
@ExcelProperty
(
value
=
"创建人"
)
@ExcelProperty
(
value
=
"创建人"
,
order
=
Integer
.
MAX_VALUE
-
4
)
private
String
createUserString
;
/**
* 创建时间
*/
@Schema
(
description
=
"创建时间"
,
example
=
"2023-08-08 08:08:08"
,
type
=
"string"
)
@ExcelProperty
(
value
=
"创建时间"
)
@ExcelProperty
(
value
=
"创建时间"
,
order
=
Integer
.
MAX_VALUE
-
3
)
private
LocalDateTime
createTime
;
/**
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DictDetailVO.java
浏览文件 @
8529af8e
...
...
@@ -20,9 +20,6 @@ import lombok.Data;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
com.alibaba.excel.annotation.ExcelIgnoreUnannotated
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
top.charles7c.cnadmin.common.base.BaseDetailVO
;
/**
...
...
@@ -32,7 +29,6 @@ import top.charles7c.cnadmin.common.base.BaseDetailVO;
* @since 2023/9/11 21:29
*/
@Data
@ExcelIgnoreUnannotated
@Schema
(
description
=
"字典详情信息"
)
public
class
DictDetailVO
extends
BaseDetailVO
{
...
...
@@ -42,20 +38,17 @@ public class DictDetailVO extends BaseDetailVO {
* 字典名称
*/
@Schema
(
description
=
"字典名称"
,
example
=
"公告类型"
)
@ExcelProperty
(
value
=
"字典名称"
)
private
String
name
;
/**
* 字典编码
*/
@Schema
(
description
=
"字典编码"
,
example
=
"announcement_type"
)
@ExcelProperty
(
value
=
"字典编码"
)
private
String
code
;
/**
* 描述
*/
@Schema
(
description
=
"描述"
,
example
=
"公告类型描述信息"
)
@ExcelProperty
(
value
=
"描述"
)
private
String
description
;
}
\ No newline at end of file
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/DictItemDetailVO.java
浏览文件 @
8529af8e
...
...
@@ -42,41 +42,54 @@ public class DictItemDetailVO extends BaseDetailVO {
* 字典标签
*/
@Schema
(
description
=
"字典标签"
,
example
=
"通知"
)
@ExcelProperty
(
value
=
"字典标签"
)
@ExcelProperty
(
value
=
"字典标签"
,
order
=
2
)
private
String
label
;
/**
* 字典值
*/
@Schema
(
description
=
"字典值"
,
example
=
"1"
)
@ExcelProperty
(
value
=
"字典值"
)
@ExcelProperty
(
value
=
"字典值"
,
order
=
3
)
private
String
value
;
/**
* 背景颜色
*/
@Schema
(
description
=
"背景颜色"
,
example
=
"blue"
)
@ExcelProperty
(
value
=
"背景颜色"
)
@ExcelProperty
(
value
=
"背景颜色"
,
order
=
4
)
private
String
color
;
/**
* 排序
*/
@Schema
(
description
=
"排序"
,
example
=
"1"
)
@ExcelProperty
(
value
=
"排序"
)
@ExcelProperty
(
value
=
"排序"
,
order
=
5
)
private
Integer
sort
;
/**
* 描述
*/
@Schema
(
description
=
"描述"
,
example
=
"通知描述信息"
)
@ExcelProperty
(
value
=
"描述"
)
@ExcelProperty
(
value
=
"描述"
,
order
=
6
)
private
String
description
;
/**
*
所属字典
*
字典 ID
*/
@Schema
(
description
=
"所属字典"
,
example
=
"1"
)
@ExcelProperty
(
value
=
"所属字典"
)
@Schema
(
description
=
"字典 ID"
,
example
=
"1"
)
private
Long
dictId
;
/**
* 字典名称
*/
@Schema
(
hidden
=
true
)
@ExcelProperty
(
value
=
"字典名称"
,
order
=
7
)
private
String
dictName
;
/**
* 字典编码
*/
@Schema
(
hidden
=
true
)
@ExcelProperty
(
value
=
"字典编码"
,
order
=
8
)
private
String
dictCode
;
}
\ No newline at end of file
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/DictItemService.java
浏览文件 @
8529af8e
...
...
@@ -32,6 +32,15 @@ import top.charles7c.cnadmin.system.model.vo.DictItemVO;
*/
public
interface
DictItemService
extends
BaseService
<
DictItemVO
,
DictItemDetailVO
,
DictItemQuery
,
DictItemRequest
>
{
/**
* 根据字典 ID 查询
*
* @param dictId
* 字典 ID
* @return 字典项列表
*/
List
<
DictItemDetailVO
>
listByDictId
(
Long
dictId
);
/**
* 根据字典 ID 列表删除
*
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictItemServiceImpl.java
浏览文件 @
8529af8e
...
...
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
top.charles7c.cnadmin.common.base.BaseServiceImpl
;
import
top.charles7c.cnadmin.common.model.query.SortQuery
;
import
top.charles7c.cnadmin.common.util.validate.CheckUtils
;
import
top.charles7c.cnadmin.system.mapper.DictItemMapper
;
import
top.charles7c.cnadmin.system.model.entity.DictItemDO
;
...
...
@@ -61,6 +62,17 @@ public class DictItemServiceImpl
super
.
update
(
request
,
id
);
}
@Override
public
List
<
DictItemDetailVO
>
listByDictId
(
Long
dictId
)
{
DictItemQuery
dictItemQuery
=
new
DictItemQuery
();
dictItemQuery
.
setDictId
(
dictId
);
SortQuery
sortQuery
=
new
SortQuery
();
sortQuery
.
setSort
(
new
String
[]
{
"sort,asc"
});
List
<
DictItemDetailVO
>
detailList
=
super
.
list
(
dictItemQuery
,
sortQuery
,
DictItemDetailVO
.
class
);
detailList
.
forEach
(
super
::
fillDetail
);
return
detailList
;
}
@Override
public
void
deleteByDictIds
(
List
<
Long
>
dictIds
)
{
baseMapper
.
lambdaUpdate
().
in
(
DictItemDO:
:
getDictId
,
dictIds
).
remove
();
...
...
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DictServiceImpl.java
浏览文件 @
8529af8e
...
...
@@ -16,21 +16,25 @@
package
top.charles7c.cnadmin.system.service.impl
;
import
java.util.ArrayList
;
import
java.util.List
;
import
javax.servlet.http.HttpServletResponse
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
top.charles7c.cnadmin.common.base.BaseServiceImpl
;
import
top.charles7c.cnadmin.common.model.query.SortQuery
;
import
top.charles7c.cnadmin.common.util.ExcelUtils
;
import
top.charles7c.cnadmin.common.util.validate.CheckUtils
;
import
top.charles7c.cnadmin.system.mapper.DictMapper
;
import
top.charles7c.cnadmin.system.model.entity.DictDO
;
import
top.charles7c.cnadmin.system.model.query.DictQuery
;
import
top.charles7c.cnadmin.system.model.request.DictRequest
;
import
top.charles7c.cnadmin.system.model.vo.DictDetailVO
;
import
top.charles7c.cnadmin.system.model.vo.DictVO
;
import
top.charles7c.cnadmin.system.model.vo.*
;
import
top.charles7c.cnadmin.system.service.DictItemService
;
import
top.charles7c.cnadmin.system.service.DictService
;
...
...
@@ -74,6 +78,21 @@ public class DictServiceImpl extends BaseServiceImpl<DictMapper, DictDO, DictVO,
super
.
delete
(
ids
);
}
@Override
public
void
export
(
DictQuery
query
,
SortQuery
sortQuery
,
HttpServletResponse
response
)
{
List
<
DictVO
>
dictList
=
this
.
list
(
query
,
sortQuery
);
List
<
DictItemDetailVO
>
dictItemList
=
new
ArrayList
<>();
for
(
DictVO
dict
:
dictList
)
{
List
<
DictItemDetailVO
>
tempDictItemList
=
dictItemService
.
listByDictId
(
dict
.
getId
());
for
(
DictItemDetailVO
dictItem
:
tempDictItemList
)
{
dictItem
.
setDictName
(
dict
.
getName
());
dictItem
.
setDictCode
(
dict
.
getCode
());
dictItemList
.
add
(
dictItem
);
}
}
ExcelUtils
.
export
(
dictItemList
,
"导出数据"
,
DictItemDetailVO
.
class
,
response
);
}
/**
* 检查名称是否存在
*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录