diff --git a/src/main/java/com/youlai/system/controller/NoticeStatusController.java b/src/main/java/com/youlai/system/controller/NoticeStatusController.java index 18d241c1..8969c541 100644 --- a/src/main/java/com/youlai/system/controller/NoticeStatusController.java +++ b/src/main/java/com/youlai/system/controller/NoticeStatusController.java @@ -22,7 +22,7 @@ import jakarta.validation.Valid; * 用户公告状态前端控制层 * * @author youlaitech - * @since 2024-08-27 09:53 + * @since 2024-08-28 16:56 */ @Tag(name = "用户公告状态接口") @RestController diff --git a/src/main/java/com/youlai/system/converter/NoticeStatusConverter.java b/src/main/java/com/youlai/system/converter/NoticeStatusConverter.java index b2195e5a..94ea63df 100644 --- a/src/main/java/com/youlai/system/converter/NoticeStatusConverter.java +++ b/src/main/java/com/youlai/system/converter/NoticeStatusConverter.java @@ -9,7 +9,7 @@ import com.youlai.system.model.form.NoticeStatusForm; * 用户公告状态对象转换器 * * @author youlaitech - * @since 2024-08-27 09:53 + * @since 2024-08-28 16:56 */ @Mapper(componentModel = "spring") public interface NoticeStatusConverter{ diff --git a/src/main/java/com/youlai/system/mapper/NoticeStatusMapper.java b/src/main/java/com/youlai/system/mapper/NoticeStatusMapper.java index 097d8eff..a3e1d01c 100644 --- a/src/main/java/com/youlai/system/mapper/NoticeStatusMapper.java +++ b/src/main/java/com/youlai/system/mapper/NoticeStatusMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper; * 用户公告状态Mapper接口 * * @author youlaitech - * @since 2024-08-27 09:53 + * @since 2024-08-28 16:56 */ @Mapper public interface NoticeStatusMapper extends BaseMapper { diff --git a/src/main/java/com/youlai/system/model/entity/NoticeStatus.java b/src/main/java/com/youlai/system/model/entity/NoticeStatus.java index 6615291b..39d4cedf 100644 --- a/src/main/java/com/youlai/system/model/entity/NoticeStatus.java +++ b/src/main/java/com/youlai/system/model/entity/NoticeStatus.java @@ -10,7 +10,7 @@ import com.youlai.system.common.base.BaseEntity; * 用户公告状态实体对象 * * @author youlaitech - * @since 2024-08-27 09:53 + * @since 2024-08-28 16:56 */ @Getter @Setter diff --git a/src/main/java/com/youlai/system/model/form/NoticeStatusForm.java b/src/main/java/com/youlai/system/model/form/NoticeStatusForm.java index d8c2b370..d53689aa 100644 --- a/src/main/java/com/youlai/system/model/form/NoticeStatusForm.java +++ b/src/main/java/com/youlai/system/model/form/NoticeStatusForm.java @@ -12,7 +12,7 @@ import jakarta.validation.constraints.*; * 用户公告状态表单对象 * * @author youlaitech - * @since 2024-08-27 09:53 + * @since 2024-08-28 16:56 */ @Getter @Setter diff --git a/src/main/java/com/youlai/system/model/query/NoticeStatusQuery.java b/src/main/java/com/youlai/system/model/query/NoticeStatusQuery.java index 36fbd346..e56fcbef 100644 --- a/src/main/java/com/youlai/system/model/query/NoticeStatusQuery.java +++ b/src/main/java/com/youlai/system/model/query/NoticeStatusQuery.java @@ -5,12 +5,13 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import java.time.LocalDateTime; +import java.util.List; /** * 用户公告状态分页查询对象 * * @author youlaitech - * @since 2024-08-27 09:53 + * @since 2024-08-28 16:56 */ @Schema(description ="用户公告状态查询对象") @Getter @@ -18,4 +19,15 @@ import java.time.LocalDateTime; public class NoticeStatusQuery extends BasePageQuery { private static final long serialVersionUID = 1L; + + @Schema(description = "id") + private Long id; + @Schema(description = "公共通知id") + private Long noticeId; + @Schema(description = "用户id") + private Integer userId; + @Schema(description = "读取状态,0未读,1已读取") + private Long readStatus; + @Schema(description = "用户阅读时间") + private List readTiem; } diff --git a/src/main/java/com/youlai/system/model/vo/NoticeStatusVO.java b/src/main/java/com/youlai/system/model/vo/NoticeStatusVO.java index 8659716e..8265e020 100644 --- a/src/main/java/com/youlai/system/model/vo/NoticeStatusVO.java +++ b/src/main/java/com/youlai/system/model/vo/NoticeStatusVO.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; * 用户公告状态视图对象 * * @author youlaitech - * @since 2024-08-27 09:53 + * @since 2024-08-28 16:56 */ @Getter @Setter @@ -22,4 +22,14 @@ public class NoticeStatusVO implements Serializable { @Serial private static final long serialVersionUID = 1L; + @Schema(description = "id") + private Long id; + @Schema(description = "公共通知id") + private Long noticeId; + @Schema(description = "用户id") + private Integer userId; + @Schema(description = "读取状态,0未读,1已读取") + private Long readStatus; + @Schema(description = "用户阅读时间") + private LocalDateTime readTiem; } diff --git a/src/main/java/com/youlai/system/service/NoticeStatusService.java b/src/main/java/com/youlai/system/service/NoticeStatusService.java index b6193e76..7e785f6c 100644 --- a/src/main/java/com/youlai/system/service/NoticeStatusService.java +++ b/src/main/java/com/youlai/system/service/NoticeStatusService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 用户公告状态服务类 * * @author youlaitech - * @since 2024-08-27 09:53 + * @since 2024-08-28 16:56 */ public interface NoticeStatusService extends IService { diff --git a/src/main/java/com/youlai/system/service/impl/NoticeStatusServiceImpl.java b/src/main/java/com/youlai/system/service/impl/NoticeStatusServiceImpl.java index e01a77ab..10f90cd1 100644 --- a/src/main/java/com/youlai/system/service/impl/NoticeStatusServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/NoticeStatusServiceImpl.java @@ -24,7 +24,7 @@ import cn.hutool.core.util.StrUtil; * 用户公告状态服务实现类 * * @author youlaitech - * @since 2024-08-27 09:53 + * @since 2024-08-28 16:56 */ @Service @RequiredArgsConstructor diff --git a/src/main/resources/mapper/NoticeStatusMapper.xml b/src/main/resources/mapper/NoticeStatusMapper.xml index 2d8c04d5..e3be239e 100644 --- a/src/main/resources/mapper/NoticeStatusMapper.xml +++ b/src/main/resources/mapper/NoticeStatusMapper.xml @@ -5,9 +5,36 @@