消息通知

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("消息通知")
+    @ApiOperation("消息通知")
-//    @GetMapping("/qyNotice")
+    @GetMapping("/qyNotice")
-//    public AjaxResult qyNotice() {
+    public AjaxResult qyNotice() {
-//        return success(qyStatsService.qyNotice(SecurityUtils.getUsername()));
+        return success(qyStatsService.qyNotice(SecurityUtils.getUsername()));
-//    }
+    }
 }
 

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<BasicInformation> page) {
         return success(basicInformationService.projectList(page));
     }
+
+    /**
+     * 消息通知
+     */
+    @ApiOperation("消息通知")
+    @GetMapping("/zwNotice")
+    public AjaxResult zwNotice() {
+        return success(zwStatsService.zwNotice());
+    }
 }
 

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;
 }
 

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<BasicInformation> relationalProject(String username);
+
+    /**
+     * 消息通知
+     */
+    List<Notice> qyNotice(@Param("username") String username);
 }
 

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<RibbonResponse> investors();
+
+    /**
+     * 消息通知
+     */
+    List<Notice> zwNotice();
 }
 

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 * * *")
+    @Scheduled(cron = "0 0 0 1 * ?")
-//    private void configureTasks() {
+    private void configureTasks() {
-//        Notice notice = new Notice();
+        Notice notice = new Notice();
-//        notice.setType(1);
+        notice.setType(1);
-//
+        notice.setContent(LocalDate.now().getYear() +
-//        noticeService.save(notice);
+                "年"+
-//    }
+                LocalDate.now().getMonth().getValue()+
+                "月"+
+                "项目进展未填写");
+        noticeService.save(notice);
+    }
 }

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<BasicInformation> relationalProject(String username);
 
 
+    /**
+     * 消息通知
+     */
+    List<Notice> qyNotice(String username);
 }
 

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<RibbonResponse> investors();
+
+
+    /**
+     * 消息通知
+     */
+    List<Notice> zwNotice();
 }
 

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<Notice> qyNotice(String username) {
+        return qyStatsMapper.qyNotice(username);
+    }
+
 }

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<RibbonResponse> investors() {
         return zwStatsMapper.investors();
     }
+
+    /**
+     * 消息通知
+     */
+    @Override
+    public List<Notice> zwNotice() {
+        return zwStatsMapper.zwNotice();
+    }
 }

ruoyi-admin/src/main/resources/mapper/QyStatsMapper.xml

@@ -29,5 +29,9 @@
     <select id="relationalProject" resultType="com.ruoyi.gysl.entity.BasicInformation">
 
     </select>
+    <select id="qyNotice" resultType="com.ruoyi.gysl.entity.Notice">
+         select * from notice
+         where tyshxydm = #{username} and type = 2
+    </select>
 </mapper>
 

ruoyi-admin/src/main/resources/mapper/ZwStatsMapper.xml

@@ -39,5 +39,9 @@
         GROUP BY
             nature
     </select>
+    <select id="zwNotice" resultType="com.ruoyi.gysl.entity.Notice">
+        select * from notice
+        where  type = 2
+    </select>
 </mapper>