解决通知两个小bug。

ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysNoticeController.java

@@ -91,10 +91,10 @@ public class SysNoticeController extends BaseController
      * @return
      */
     @GetMapping(value = "/show")
-    public TableDataInfo show(){
+    public TableDataInfo show(@RequestParam Long userId){
 
         startPage();
-        return getDataTable(noticeService.show());
+        return getDataTable(noticeService.show(userId));
     }
 
     /**
@@ -109,17 +109,6 @@ public class SysNoticeController extends BaseController
 
     }
 
-    /**
-     * Showing ids which have not been read in small app.
-     * @param userId
-     * @return
-     */
-    @GetMapping(value = "/showNotReadIds")
-    public AjaxResult showNotReadIds(Integer userId){
-
-        return AjaxResult.success(noticeService.showNotReadIds(userId));
-    }
-
 
     @PostMapping("/add")
     public AjaxResult add(@RequestBody SysXhpcNoticeReadEntity sysXhpcNoticeReadEntity){

ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/SysNoticeMapper.java

@@ -65,7 +65,7 @@ public interface SysNoticeMapper
      * Showing notice items in the small app.
      * @return
      */
-    List<Map<String,Object>> selectTypeContentCreateTime();
+    List<Map<String,Object>> selectTypeContentCreateTimeId();
 
     /**
      * Show the number of notices which have not been read in small app.
@@ -75,7 +75,15 @@ public interface SysNoticeMapper
     int countNotRead(@Param("userId") Integer userId);
 
 
-    List<Map<String,Object>> selectNotReadIds(@Param("userId") Integer userId);
+    /**
+     * Showing ids which have not been read in small app.
+     * @param userId
+     * @return
+     */
+    List<Map<String,Object>> selectNotReadIds(@Param("userId") Long userId);
+
+
+
 
     int insertIntoRead(@Param("noticeId") Integer noticeId,@Param("userId") Long userId);
 

ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/ISysNoticeService.java

@@ -66,7 +66,7 @@ public interface ISysNoticeService
      * Showing notice items in small app.
      * @return
      */
-    List<Map<String,Object>> show();
+    List<Map<String,Object>> show(Long userId);
 
     /**
      * Showing the number of notices which have not been read in small app.
@@ -75,12 +75,6 @@ public interface ISysNoticeService
      */
     int showNotRead(Integer userId);
 
-    /**
-     * Showing ids which have not been read in small app.
-     * @param userId
-     * @return
-     */
-    List<Map<String,Object>> showNotReadIds(Integer userId);
 
 
     AjaxResult addReadItem(Integer noticeId,Long userId);

ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysNoticeServiceImpl.java

@@ -95,9 +95,28 @@ public class SysNoticeServiceImpl implements ISysNoticeService
 
 
     @Override
-    public List<Map<String, Object>> show() {
+    public List<Map<String, Object>> show(Long userId) {
+        //If status's value equals zero it means read, if not not read.
+        List<Map<String,Object>> list=noticeMapper.selectTypeContentCreateTimeId();
+        List<Map<String,Object>> readId=noticeMapper.selectNotReadIds(userId);
+        for(Map<String,Object> value1:list){
+            int temp1= (int) value1.get("noticeId");
+            boolean flag=false;
+            for(Map<String,Object> value2:readId){
+                int temp2=(int)value2.get("noticeId");
+                if(temp1==temp2){
+                    flag=true;
+                    value1.put("status",1);
+                    break;
+                }
+            }
+            if(!flag){
+                value1.put("status",0);
+            }
 
-        return noticeMapper.selectTypeContentCreateTime();
+        }
+
+        return list;
     }
 
     @Override
@@ -106,19 +125,26 @@ public class SysNoticeServiceImpl implements ISysNoticeService
         return noticeMapper.countNotRead(userId);
     }
 
-    @Override
-    public List<Map<String, Object>> showNotReadIds(Integer userId) {
-
-        return noticeMapper.selectNotReadIds(userId);
-    }
 
     @Override
     public AjaxResult addReadItem(Integer noticeId, Long userId) {
 
-        int res=noticeMapper.insertIntoRead(noticeId, userId);
+        List<Map<String,Object>> notReadIds=noticeMapper.selectNotReadIds(userId);
-        if(res==0){
+        boolean flag=false;
+        for(Map<String,Object> value:notReadIds){
+            int temp1=(int)value.get("noticeId");
+            if(noticeId==temp1){
+                flag=true;
+                break;
+            }
+
+        }
+        if (flag) {
+            int res = noticeMapper.insertIntoRead(noticeId, userId);
+            if (res == 0) {
                 return AjaxResult.error("插入失败");
             }
+        }
         return AjaxResult.success();
     }
 }

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -95,9 +95,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <select id="selectTypeContentCreateTime" resultType="map">
+    <select id="selectTypeContentCreateTimeId" resultType="map">
 
-        select notice_type as noticeType, cast(notice_content as char) as noticeContent,create_time as createTime
+        select notice_type as noticeType,
+         cast(notice_content as char) as noticeContent,
+         create_time as createTime,
+         notice_id as noticeId
         from sys_notice
     </select>
 
@@ -115,6 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where r.user_id=#{userId}
         )
     </select>
+
+
     <select id="selectNotReadIds" resultType="map">
 
          select notice_id as noticeId