ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-15 14:57:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 公告管理 Announcement => Notice

Browse Source
This commit is contained in:
Charles7c
2024-04-27 17:03:22 +08:00
parent abf1e651e9
commit dbe93df8bc
22 changed files with 98 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-system/src/main/java/top/continew/admin/system/enums/AnnouncementStatusEnum.java → continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java
View File

@@ -29,7 +29,7 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum;
*/
@Getter
@RequiredArgsConstructor
public enum AnnouncementStatusEnum implements IBaseEnum<Integer> {
public enum NoticeStatusEnum implements IBaseEnum<Integer> {
/**
* 待发布

8
continew-admin-system/src/main/java/top/continew/admin/system/mapper/AnnouncementMapper.java → continew-admin-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java
View File

@@ -16,8 +16,8 @@
package top.continew.admin.system.mapper;
import top.continew.admin.system.model.entity.AnnouncementDO;
import top.continew.admin.system.model.resp.DashboardAnnouncementResp;
import top.continew.admin.system.model.entity.NoticeDO;
import top.continew.admin.system.model.resp.DashboardNoticeResp;
import top.continew.starter.data.mybatis.plus.base.BaseMapper;
import java.util.List;
@@ -28,12 +28,12 @@ import java.util.List;
* @author Charles7c
* @since 2023/8/20 10:55
*/
public interface AnnouncementMapper extends BaseMapper<AnnouncementDO> {
public interface NoticeMapper extends BaseMapper<NoticeDO> {
/**
* 查询仪表盘公告列表
*
* @return 仪表盘公告列表
*/
List<DashboardAnnouncementResp> selectDashboardList();
List<DashboardNoticeResp> selectDashboardList();
}

4
continew-admin-system/src/main/java/top/continew/admin/system/model/entity/AnnouncementDO.java → continew-admin-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java
View File

@@ -30,8 +30,8 @@ import java.time.LocalDateTime;
* @since 2023/8/20 10:55
*/
@Data
@TableName("sys_announcement")
public class AnnouncementDO extends BaseDO {
@TableName("sys_notice")
public class NoticeDO extends BaseDO {
@Serial
private static final long serialVersionUID = 1L;

2
continew-admin-system/src/main/java/top/continew/admin/system/model/query/AnnouncementQuery.java → continew-admin-system/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java
View File

@@ -32,7 +32,7 @@ import java.io.Serializable;
*/
@Data
@Schema(description = "公告查询条件")
public class AnnouncementQuery implements Serializable {
public class NoticeQuery implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

2
continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictReq.java
View File

@@ -50,7 +50,7 @@ public class DictReq extends BaseReq {
/**
* 编码
*/
@Schema(description = "编码", example = "announcement_type")
@Schema(description = "编码", example = "notice_type")
@NotBlank(message = "编码不能为空")
@Pattern(regexp = RegexConstants.GENERAL_CODE, message = "编码长度为 2 到 30 位，可以包含字母、数字，下划线，以字母开头")
private String code;

6
continew-admin-system/src/main/java/top/continew/admin/system/model/req/AnnouncementReq.java → continew-admin-system/src/main/java/top/continew/admin/system/model/req/NoticeReq.java
View File

@@ -34,7 +34,7 @@ import java.time.LocalDateTime;
*/
@Data
@Schema(description = "创建或修改公告信息")
public class AnnouncementReq extends BaseReq {
public class NoticeReq extends BaseReq {
@Serial
private static final long serialVersionUID = 1L;
@@ -55,9 +55,9 @@ public class AnnouncementReq extends BaseReq {
private String content;
/**
* 类型（取值于字典 announcement_type）
* 类型（取值于字典 notice_type）
*/
@Schema(description = "类型（取值于字典 announcement_type）", example = "1")
@Schema(description = "类型（取值于字典 notice_type）", example = "1")
@NotBlank(message = "类型不能为空")
@Length(max = 30, message = "类型长度不能超过 {max} 个字符")
private String type;

6
continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardAnnouncementResp.java → continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DashboardNoticeResp.java
View File

@@ -30,7 +30,7 @@ import java.io.Serializable;
*/
@Data
@Schema(description = "仪表盘-公告信息")
public class DashboardAnnouncementResp implements Serializable {
public class DashboardNoticeResp implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@@ -48,8 +48,8 @@ public class DashboardAnnouncementResp implements Serializable {
private String title;
/**
* 类型（取值于字典 announcement_type）
* 类型（取值于字典 notice_type）
*/
@Schema(description = "类型（取值于字典 announcement_type）", example = "1")
@Schema(description = "类型（取值于字典 notice_type）", example = "1")
private String type;
}

2
continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java
View File

@@ -44,7 +44,7 @@ public class DictResp extends BaseDetailResp {
/**
* 编码
*/
@Schema(description = "编码", example = "announcement_type")
@Schema(description = "编码", example = "notice_type")
private String code;
/**

6
continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AnnouncementDetailResp.java → continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java
View File

@@ -34,7 +34,7 @@ import java.time.LocalDateTime;
@Data
@ExcelIgnoreUnannotated
@Schema(description = "公告详情信息")
public class AnnouncementDetailResp extends BaseDetailResp {
public class NoticeDetailResp extends BaseDetailResp {
@Serial
private static final long serialVersionUID = 1L;
@@ -54,9 +54,9 @@ public class AnnouncementDetailResp extends BaseDetailResp {
private String content;
/**
* 类型（取值于字典 announcement_type）
* 类型（取值于字典 notice_type）
*/
@Schema(description = "类型（取值于字典 announcement_type）", example = "1")
@Schema(description = "类型（取值于字典 notice_type）", example = "1")
@ExcelProperty(value = "类型")
private String type;

16
continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AnnouncementResp.java → continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java
View File

@@ -18,7 +18,7 @@ package top.continew.admin.system.model.resp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import top.continew.admin.system.enums.AnnouncementStatusEnum;
import top.continew.admin.system.enums.NoticeStatusEnum;
import top.continew.starter.extension.crud.model.resp.BaseResp;
import java.io.Serial;
@@ -32,7 +32,7 @@ import java.time.LocalDateTime;
*/
@Data
@Schema(description = "公告信息")
public class AnnouncementResp extends BaseResp {
public class NoticeResp extends BaseResp {
@Serial
private static final long serialVersionUID = 1L;
@@ -44,9 +44,9 @@ public class AnnouncementResp extends BaseResp {
private String title;
/**
* 类型（取值于字典 announcement_type）
* 类型（取值于字典 notice_type）
*/
@Schema(description = "类型（取值于字典 announcement_type）", example = "1")
@Schema(description = "类型（取值于字典 notice_type）", example = "1")
private String type;
/**
@@ -67,13 +67,13 @@ public class AnnouncementResp extends BaseResp {
* @return 公告状态
*/
@Schema(description = "状态（1：待发布；2：已发布；3：已过期）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1")
public AnnouncementStatusEnum getStatus() {
public NoticeStatusEnum getStatus() {
if (null != this.effectiveTime && this.effectiveTime.isAfter(LocalDateTime.now())) {
return AnnouncementStatusEnum.PENDING_RELEASE;
return NoticeStatusEnum.PENDING_RELEASE;
}
if (null != this.terminateTime && this.terminateTime.isBefore(LocalDateTime.now())) {
return AnnouncementStatusEnum.EXPIRED;
return NoticeStatusEnum.EXPIRED;
}
return AnnouncementStatusEnum.PUBLISHED;
return NoticeStatusEnum.PUBLISHED;
}
}

2
continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java
View File

@@ -62,5 +62,5 @@ public interface DashboardService {
*
* @return 公告列表
*/
List<DashboardAnnouncementResp> listAnnouncement();
List<DashboardNoticeResp> listNotice();
}

16
continew-admin-system/src/main/java/top/continew/admin/system/service/AnnouncementService.java → continew-admin-system/src/main/java/top/continew/admin/system/service/NoticeService.java
View File

@@ -16,12 +16,12 @@
package top.continew.admin.system.service;
import top.continew.admin.system.model.entity.AnnouncementDO;
import top.continew.admin.system.model.query.AnnouncementQuery;
import top.continew.admin.system.model.req.AnnouncementReq;
import top.continew.admin.system.model.resp.AnnouncementDetailResp;
import top.continew.admin.system.model.resp.AnnouncementResp;
import top.continew.admin.system.model.resp.DashboardAnnouncementResp;
import top.continew.admin.system.model.entity.NoticeDO;
import top.continew.admin.system.model.query.NoticeQuery;
import top.continew.admin.system.model.req.NoticeReq;
import top.continew.admin.system.model.resp.NoticeDetailResp;
import top.continew.admin.system.model.resp.NoticeResp;
import top.continew.admin.system.model.resp.DashboardNoticeResp;
import top.continew.starter.extension.crud.service.BaseService;
import top.continew.starter.data.mybatis.plus.service.IService;
@@ -33,12 +33,12 @@ import java.util.List;
* @author Charles7c
* @since 2023/8/20 10:55
*/
public interface AnnouncementService extends BaseService<AnnouncementResp, AnnouncementDetailResp, AnnouncementQuery, AnnouncementReq>, IService<AnnouncementDO> {
public interface NoticeService extends BaseService<NoticeResp, NoticeDetailResp, NoticeQuery, NoticeReq>, IService<NoticeDO> {
/**
* 查询仪表盘公告列表
*
* @return 仪表盘公告列表
*/
List<DashboardAnnouncementResp> listDashboard();
List<DashboardNoticeResp> listDashboard();
}

8
continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java
View File

@@ -20,7 +20,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.NumberUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.continew.admin.system.service.AnnouncementService;
import top.continew.admin.system.service.NoticeService;
import top.continew.admin.system.service.DashboardService;
import top.continew.admin.system.service.LogService;
import top.continew.admin.system.model.resp.*;
@@ -40,7 +40,7 @@ import java.util.Map;
public class DashboardServiceImpl implements DashboardService {
private final LogService logService;
private final AnnouncementService announcementService;
private final NoticeService noticeService;
@Override
public DashboardTotalResp getTotal() {
@@ -85,7 +85,7 @@ public class DashboardServiceImpl implements DashboardService {
}
@Override
public List<DashboardAnnouncementResp> listAnnouncement() {
return announcementService.listDashboard();
public List<DashboardNoticeResp> listNotice() {
return noticeService.listDashboard();
}
}

26
continew-admin-system/src/main/java/top/continew/admin/system/service/impl/AnnouncementServiceImpl.java → continew-admin-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java
View File

@@ -16,22 +16,20 @@
package top.continew.admin.system.service.impl;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import top.continew.admin.system.mapper.AnnouncementMapper;
import top.continew.admin.system.model.entity.AnnouncementDO;
import top.continew.admin.system.model.query.AnnouncementQuery;
import top.continew.admin.system.model.req.AnnouncementReq;
import top.continew.admin.system.model.resp.AnnouncementDetailResp;
import top.continew.admin.system.model.resp.AnnouncementResp;
import top.continew.admin.system.model.resp.DashboardAnnouncementResp;
import top.continew.admin.system.service.AnnouncementService;
import top.continew.admin.system.mapper.NoticeMapper;
import top.continew.admin.system.model.entity.NoticeDO;
import top.continew.admin.system.model.query.NoticeQuery;
import top.continew.admin.system.model.req.NoticeReq;
import top.continew.admin.system.model.resp.DashboardNoticeResp;
import top.continew.admin.system.model.resp.NoticeDetailResp;
import top.continew.admin.system.model.resp.NoticeResp;
import top.continew.admin.system.service.NoticeService;
import top.continew.starter.extension.crud.service.impl.BaseServiceImpl;
import java.util.List;
/**
* 公告业务实现
*
@@ -40,10 +38,10 @@ import top.continew.starter.extension.crud.service.impl.BaseServiceImpl;
*/
@Service
@RequiredArgsConstructor
public class AnnouncementServiceImpl extends BaseServiceImpl<AnnouncementMapper, AnnouncementDO, AnnouncementResp, AnnouncementDetailResp, AnnouncementQuery, AnnouncementReq> implements AnnouncementService {
public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, NoticeDO, NoticeResp, NoticeDetailResp, NoticeQuery, NoticeReq> implements NoticeService {
@Override
public List<DashboardAnnouncementResp> listDashboard() {
public List<DashboardNoticeResp> listDashboard() {
return baseMapper.selectDashboardList();
}
}

6
continew-admin-system/src/main/resources/mapper/AnnouncementMapper.xml → continew-admin-system/src/main/resources/mapper/NoticeMapper.xml
View File

@@ -1,12 +1,12 @@
<?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="top.continew.admin.system.mapper.AnnouncementMapper">
<mapper namespace="top.continew.admin.system.mapper.NoticeMapper">
<select id="selectDashboardList"
resultType="top.continew.admin.system.model.resp.DashboardAnnouncementResp">
resultType="top.continew.admin.system.model.resp.DashboardNoticeResp">
SELECT
id, title, type
FROM sys_announcement
FROM sys_notice
WHERE (effective_time IS NULL OR NOW() > effective_time)
AND (terminate_time IS NULL OR terminate_time > NOW())
ORDER BY sort ASC, effective_time DESC