diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/controller/NoticeController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/controller/NoticeController.java new file mode 100644 index 0000000..020e5d5 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/controller/NoticeController.java @@ -0,0 +1,47 @@ +package com.bonus.material.notice.controller; + +import com.bonus.common.core.constant.SecurityConstants; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; +import com.bonus.common.security.annotation.InnerAuth; +import com.bonus.common.security.annotation.RequiresPermissions; +import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; +import com.bonus.material.notice.entity.Notice; +import com.bonus.material.notice.service.NoticeService; +import com.bonus.system.api.RemoteNoticeService; +import com.bonus.system.api.domain.SysNotice; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @Author:liang.chao + * @Date:2024/12/20 - 19:12 + */ +@RestController +@RequestMapping("/notice") +@Api(value = "消息通知", tags = "消息通知") +@Slf4j +public class NoticeController extends BaseController { + + @Resource + private NoticeService noticeService; + + @GetMapping("/list") + @ApiOperation(value = "消息列表") + public AjaxResult list(Notice notice) { + startPage(); + List sysNotices = noticeService.selectNoticeList(notice); + return AjaxResult.success(getDataTable(sysNotices)); + } +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/entity/Notice.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/entity/Notice.java new file mode 100644 index 0000000..2a92bc9 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/entity/Notice.java @@ -0,0 +1,73 @@ +package com.bonus.material.notice.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @Author:liang.chao + * @Date:2024/12/20 - 19:35 + */ +@Data +public class Notice { + /** + * 公告ID + */ + private Integer noticeId; + + /** + * 公告标题 + */ + private String noticeTitle; + + /** + * 公告类型(1通知 2公告 3质检到期提醒) + */ + private String noticeType; + + /** + * 公告内容 + */ + private String noticeContent; + + /** + * 公告状态(0正常 1关闭) + */ + private String status; + + /** + * 创建者 + */ + private String createBy; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + + /** + * 更新者 + */ + private String updateBy; + + /** + * 更新时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * 装备质检到期所属公司 + */ + private Integer ownCo; +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/mapper/NoticeMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/mapper/NoticeMapper.java new file mode 100644 index 0000000..739a53a --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/mapper/NoticeMapper.java @@ -0,0 +1,14 @@ +package com.bonus.material.notice.mapper; + +import com.bonus.material.notice.entity.Notice; +import com.bonus.system.api.domain.SysNotice; + +import java.util.List; + +/** + * @Author:liang.chao + * @Date:2024/12/20 - 19:25 + */ +public interface NoticeMapper { + List selectNoticeList(Notice notice); +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/service/NoticeService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/service/NoticeService.java new file mode 100644 index 0000000..044d9fe --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/service/NoticeService.java @@ -0,0 +1,14 @@ +package com.bonus.material.notice.service; + +import com.bonus.material.notice.entity.Notice; +import com.bonus.system.api.domain.SysNotice; + +import java.util.List; + +/** + * @Author:liang.chao + * @Date:2024/12/20 - 19:22 + */ +public interface NoticeService { + List selectNoticeList(Notice notice); +} diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/service/impl/NoticeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/service/impl/NoticeServiceImpl.java new file mode 100644 index 0000000..e80f1c8 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/service/impl/NoticeServiceImpl.java @@ -0,0 +1,25 @@ +package com.bonus.material.notice.service.impl; + +import com.bonus.material.notice.entity.Notice; +import com.bonus.material.notice.mapper.NoticeMapper; +import com.bonus.material.notice.service.NoticeService; +import com.bonus.system.api.domain.SysNotice; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author:liang.chao + * @Date:2024/12/20 - 19:23 + */ +@Service +public class NoticeServiceImpl implements NoticeService { + + @Resource + private NoticeMapper noticeMapper; + @Override + public List selectNoticeList(Notice notice) { + return noticeMapper.selectNoticeList(notice); + } +} diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/notice/ReplyMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/notice/ReplyMapper.xml new file mode 100644 index 0000000..784a30f --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/notice/ReplyMapper.xml @@ -0,0 +1,33 @@ + + + + + + \ No newline at end of file