定时任务处理维护资产（0）

pcbms/src/main/java/com/hssx/pcbms/controller/NewsNoticeController.java

@@ -29,12 +29,12 @@ public class NewsNoticeController {
     private NewsNoticeService newsNoticeService;
 
     /**
-     * 根据日期获取评分详情
+     * 获取消息列表
      * 参数：
      *      uid:用户id,pageNum:当前页，pageSize：每页多少条
      * @return
      */
-    @ApiOperation(value = "评分详情", notes = "评分详情方法")
+    @ApiOperation(value = "获取消息列表", notes = "获取消息列表")
     @RequestMapping("/getNewsList")
     @ResponseBody
     public HttpRespMsg getNewsList(Integer uid, PageUtil page) {
@@ -47,5 +47,24 @@ public class NewsNoticeController {
         return msg;
     }
 
+    /**
+     * 获取未读消息数量
+     * 参数：
+     *      uid:用户id
+     * @return
+     */
+    @ApiOperation(value = "获取消息列表", notes = "获取消息列表")
+    @RequestMapping("/getNoReadNewsCount")
+    @ResponseBody
+    public HttpRespMsg getNoReadNewsCount(Integer uid) {
+        HttpRespMsg msg = new HttpRespMsg();
+        try {
+            msg = newsNoticeService.getNoReadNewsCount(uid);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return msg;
+    }
+
 }
 

pcbms/src/main/java/com/hssx/pcbms/controller/ScoreController.java

@@ -54,6 +54,26 @@ public class ScoreController {
         }
         return msg;
     }
+//    /**
+//     * 打分/修改打分
+//     * 参数：
+//     * uid :被打分人的id，personalScore：个人分，ideaScore:建议分,reason:评分原因,
+//     * total:总得分，scoringYearMonth：打分日期如：2019-10,raterId:打分人id
+//     * 注：修改时传 scoreId:打分数据的id（以上参数修改的传，没修改的不传）
+//     * @return
+//     */
+//    @ApiOperation(value = "打分/修改打分", notes = "打分/修改打分方法")
+//    @RequestMapping("/addOrUpdate")
+//    @ResponseBody
+//    public HttpRespMsg addOrUpdate(Score score) {
+//        HttpRespMsg msg = new HttpRespMsg();
+//        try {
+//             msg = scoreService.add(score);
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//        }
+//        return msg;
+//    }
     /**
      * 我的评分
      * 参数：

pcbms/src/main/java/com/hssx/pcbms/mapper/NewsNoticeMapper.java

@@ -2,6 +2,9 @@ package com.hssx.pcbms.mapper;
 
 import com.hssx.pcbms.entity.NewsNotice;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface NewsNoticeMapper extends BaseMapper<NewsNotice> {
 
+    List<NewsNotice> selectListByCondition(@Param("uid") Integer uid);
+
+    Integer getNoReadNewsCount(Integer uid);
 }

pcbms/src/main/java/com/hssx/pcbms/service/NewsNoticeService.java

@@ -16,4 +16,6 @@ import com.hssx.pcbms.util.PageUtil;
 public interface NewsNoticeService extends IService<NewsNotice> {
 
     HttpRespMsg getNewsList(Integer uid, PageUtil page);
+
+    HttpRespMsg getNoReadNewsCount(Integer uid);
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/IdeaServiceImpl.java

@@ -33,6 +33,13 @@ public class IdeaServiceImpl extends ServiceImpl<IdeaMapper, Idea> implements Id
     public HttpRespMsg add(Idea idea) {
         HttpRespMsg msg = new HttpRespMsg();
         if(null == idea.getId()){
+            if(1==idea.getIsDraft()){
+                //只能保留一条草稿
+                Idea oldIdea = ideaMapper.selectOne(new QueryWrapper<Idea>().eq("uid", idea.getUid()).eq("is_draft", 1).last("limit 1"));
+                if(oldIdea!=null){
+
+                }
+            }
             ideaMapper.insert(idea);
         }else{
             Idea oldIdea = ideaMapper.selectById(idea.getId());

pcbms/src/main/java/com/hssx/pcbms/service/impl/NewsNoticeServiceImpl.java

@@ -2,6 +2,7 @@ package com.hssx.pcbms.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hssx.pcbms.entity.NewsNotice;
 import com.hssx.pcbms.mapper.NewsNoticeMapper;
 import com.hssx.pcbms.mapper.NewsNoticeUserMapper;
@@ -27,13 +28,21 @@ public class NewsNoticeServiceImpl extends ServiceImpl<NewsNoticeMapper, NewsNot
 
     @Resource
     private NewsNoticeMapper newsNoticeMapper;
-    @Resource
-    private NewsNoticeUserMapper newsNoticeUserMapper;
 
     @Override
     public HttpRespMsg getNewsList(Integer uid, PageUtil page) {
+        HttpRespMsg msg = new HttpRespMsg();
         PageHelper.startPage(page.getPageNum(),page.getPageSize());
-//        List<NewsNotice> notices = newsNoticeMapper
-        return null;
+        List<NewsNotice> list = newsNoticeMapper.selectListByCondition(uid);
+        PageInfo<NewsNotice> pageInfo = new PageInfo<>(list);
+        msg.data = pageInfo;
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg getNoReadNewsCount(Integer uid) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = newsNoticeMapper.getNoReadNewsCount(uid);
+        return msg;
     }
 }

pcbms/src/main/resources/mapper/NewsNoticeMapper.xml

@@ -17,4 +17,25 @@
         id, raf_name, ref_id, notice_type, content, indate
     </sql>
 
+    <select id="selectListByCondition" resultMap="BaseResultMap">
+        select
+              nn.id, nn.notice_type, nn.content, nn.indate
+          from
+              news_notice nn
+          left join news_notice_user nnu
+          on nn.id = nnu.news_id
+          where nnu.user_id = #{uid}
+    </select>
+    
+    <select id="getNoReadNewsCount" resultType="int">
+        select
+              count(nn.id)
+          from
+              news_notice nn
+          left join news_notice_user nnu
+          on nn.id = nnu.news_id
+          where nnu.user_id = #{uid}
+          and nnu.is_read = 0
+    </select>
+
 </mapper>