From 2d7a2bfd94a6821c644755cf3bf3208f65264a36 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Mon, 24 Mar 2025 10:19:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gysl/controller/QyStatsController.java | 16 ++++++++-------- .../gysl/controller/ZwStatsController.java | 10 ++++++++++ .../java/com/ruoyi/gysl/entity/Notice.java | 3 +++ .../com/ruoyi/gysl/mapper/QyStatsMapper.java | 6 ++++++ .../com/ruoyi/gysl/mapper/ZwStatsMapper.java | 6 ++++++ .../com/ruoyi/gysl/regular/NoticeTiming.java | 19 ++++++++++++------- .../ruoyi/gysl/service/QyStatsService.java | 5 +++++ .../ruoyi/gysl/service/ZwStatsService.java | 7 +++++++ .../gysl/service/impl/QyStatsServiceImpl.java | 9 +++++++++ .../gysl/service/impl/ZwStatsServiceImpl.java | 9 +++++++++ .../main/resources/mapper/QyStatsMapper.xml | 4 ++++ .../main/resources/mapper/ZwStatsMapper.xml | 4 ++++ 12 files changed, 83 insertions(+), 15 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java index f5e546b..9946185 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/QyStatsController.java @@ -47,13 +47,13 @@ public class QyStatsController extends BaseController { return success(qyStatsService.relationalProject(SecurityUtils.getUsername())); } -// /** -// * 消息通知 -// */ -// @ApiOperation("消息通知") -// @GetMapping("/qyNotice") -// public AjaxResult qyNotice() { -// return success(qyStatsService.qyNotice(SecurityUtils.getUsername())); -// } + /** + * 消息通知 + */ + @ApiOperation("消息通知") + @GetMapping("/qyNotice") + public AjaxResult qyNotice() { + return success(qyStatsService.qyNotice(SecurityUtils.getUsername())); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java index 856ea61..ecd9a3c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/ZwStatsController.java @@ -4,6 +4,7 @@ package com.ruoyi.gysl.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.gysl.entity.BasicInformation; import com.ruoyi.gysl.service.BasicInformationService; import com.ruoyi.gysl.service.ZwStatsService; @@ -69,5 +70,14 @@ public class ZwStatsController extends BaseController { public AjaxResult projectList(Page page) { return success(basicInformationService.projectList(page)); } + + /** + * 消息通知 + */ + @ApiOperation("消息通知") + @GetMapping("/zwNotice") + public AjaxResult zwNotice() { + return success(zwStatsService.zwNotice()); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java index ccf4237..e389b49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/Notice.java @@ -45,5 +45,8 @@ public class Notice implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + + @ApiModelProperty(value = "项目id") + private Long zwId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java index eb81424..cb68037 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/QyStatsMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.gysl.mapper; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,10 @@ public interface QyStatsMapper { * 关联项目 */ List relationalProject(String username); + + /** + * 消息通知 + */ + List qyNotice(@Param("username") String username); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java index 77105a0..b975d4e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/mapper/ZwStatsMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.gysl.mapper; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; @@ -26,5 +27,10 @@ public interface ZwStatsMapper { * 投资主体 */ List investors(); + + /** + * 消息通知 + */ + List zwNotice(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java index 0c3a005..67f604a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/regular/NoticeTiming.java @@ -7,6 +7,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import javax.annotation.Resource; +import java.time.LocalDate; /** * 每月固定时间定时任务 @@ -23,11 +24,15 @@ public class NoticeTiming { /** * 每个月固定发一次政务通知 */ -// @Scheduled(cron = "1 0 0 * * *") -// private void configureTasks() { -// Notice notice = new Notice(); -// notice.setType(1); -// -// noticeService.save(notice); -// } + @Scheduled(cron = "0 0 0 1 * ?") + private void configureTasks() { + Notice notice = new Notice(); + notice.setType(1); + notice.setContent(LocalDate.now().getYear() + + "年"+ + LocalDate.now().getMonth().getValue()+ + "月"+ + "项目进展未填写"); + noticeService.save(notice); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java index a213d3f..cdf289c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/QyStatsService.java @@ -1,6 +1,7 @@ package com.ruoyi.gysl.service; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; @@ -25,5 +26,9 @@ public interface QyStatsService { List relationalProject(String username); + /** + * 消息通知 + */ + List qyNotice(String username); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java index 3d25ed1..89413ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/ZwStatsService.java @@ -1,5 +1,6 @@ package com.ruoyi.gysl.service; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; @@ -27,5 +28,11 @@ public interface ZwStatsService { * 投资主体 */ List investors(); + + + /** + * 消息通知 + */ + List zwNotice(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java index 37db9cb..dc6f335 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/QyStatsServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.gysl.service.impl; import com.ruoyi.gysl.entity.BasicInformation; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; import com.ruoyi.gysl.mapper.QyStatsMapper; @@ -40,4 +41,12 @@ public class QyStatsServiceImpl implements QyStatsService { return qyStatsMapper.relationalProject(username); } + /** + * 消息通知 + */ + @Override + public List qyNotice(String username) { + return qyStatsMapper.qyNotice(username); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java index 44bf816..e984ff9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/ZwStatsServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.gysl.service.impl; +import com.ruoyi.gysl.entity.Notice; import com.ruoyi.gysl.entity.stats.AllProjectResponse; import com.ruoyi.gysl.entity.stats.RibbonResponse; import com.ruoyi.gysl.mapper.ZwStatsMapper; @@ -43,4 +44,12 @@ public class ZwStatsServiceImpl implements ZwStatsService { public List investors() { return zwStatsMapper.investors(); } + + /** + * 消息通知 + */ + @Override + public List zwNotice() { + return zwStatsMapper.zwNotice(); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml index e054b9c..70354d1 100644 --- a/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml @@ -29,5 +29,9 @@ + diff --git a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml index 4c742f0..4058cd5 100644 --- a/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml @@ -39,5 +39,9 @@ GROUP BY nature +