修改

src/main/java/com/steerinfo/dil/controller/DilNoticeController.java

@@ -199,6 +199,12 @@ public class DilNoticeController extends BaseRESTfulController {
         return success(result);
     }
 
+    @PostMapping(value = "/readAll")
+    public RESTfulResult readAll(@RequestBody(required = false) Map<String, Object> map){
+        int result = dilNoticeService.readAll(map);
+        return success(result);
+    }
+
     /**
      * 根据id删除通知信息
      * @param id
@@ -298,5 +304,21 @@ public class DilNoticeController extends BaseRESTfulController {
         //return null;
     }
 
+    /**
+     * @author:zyf
+     * @version:2.0
+     * @Date:2022-10-14
+     * @Description:获取通知数据
+     */
+    @ApiOperation(value = "查询通知信息", notes = "根据传过来的orgcode查询")
+    @PostMapping(value = "/getNoticeAll")
+    public RESTfulResult getNoticeAll(@RequestBody(required = false) Map<String, Object> mapValue){
+        if (mapValue==null ||mapValue.get("userId")==null){
+            return failed();
+        }
+        List<Map<String, Object>> noticeData = dilNoticeService.getNoticeAll(mapValue);
+        return success(noticeData);
+    }
+
 
 }

src/main/java/com/steerinfo/dil/mapper/DilNoticeMapper.java

@@ -156,4 +156,12 @@ public interface DilNoticeMapper extends IBaseMapper<DilNotice, BigDecimal> {
      * @Description:修改数据
     */
     int modifyData(DilNotice dilNotice);
+
+    List<Map<String, Object>> getNoticeAll(Map<String, Object> mapValue);
+
+    /**
+     * 已读所有通知,针对特定插入用户
+     * @return
+     */
+    int readAll(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/IDilNoticeService.java

@@ -47,6 +47,10 @@ public interface IDilNoticeService {
 
     public List<Map<String,Object>> getNoticeData(String orgcode);
 
+    List<Map<String,Object>> getNoticeAll(Map<String, Object> mapValue);
+
+    int readAll(Map<String,Object> map);
+
 /*    List<Map<String,Object>> getCapacityTypeId();
 
     List<Map<String,Object>> getCarrierId();*/

src/main/java/com/steerinfo/dil/service/impl/DilNoticeServiceImpl.java

@@ -321,7 +321,13 @@ public class DilNoticeServiceImpl  implements IDilNoticeService {
     }
 */
 
+    @Override
+    public List<Map<String, Object>> getNoticeAll(Map<String, Object> mapValue) {
+        return dilNoticeMapper.getNoticeAll(mapValue);
+    }
 
-
-
+    @Override
+    public int readAll(Map<String, Object> map) {
+        return dilNoticeMapper.readAll(map);
+    }
 }

src/main/resources/com/steerinfo/dil/mapper/DilNoticeMapper.xml

@@ -787,4 +787,26 @@
     from DIL_NOTICE DN
     where  DN.NOTICE_ID=#{id}
   </select>
+  <select id="getNoticeAll" resultType="java.util.Map">
+    SELECT DN.NOTICE_TITLE AS "noticetitle",
+           DN.NOTICE_CONTENT AS "noticecontent",
+           DN.INSERT_USERNAME AS "insertusername",
+           DN.INSERT_TIME AS "inserttime",
+           DN.NOTICE_ID AS "noticeId",
+           DNU.STATUS "status"
+    FROM DIL_NOTICE	DN
+           LEFT JOIN DIL_NOTICE_USERS DNU ON DNU .NOTICE_ID=DN .NOTICE_ID
+    WHERE DNU.USER_ID=#{userId}
+    AND SYSDATE > DN.INSERT_TIME
+  </select>
+
+  <update id="readAll">
+    update DIL_NOTICE_USERS
+    SET STATUS=1
+    WHERE USER_ID=#{userId}
+      and NOTICE_ID IN(
+      SELECT NOTICE_ID FROM DIL_NOTICE
+      WHERE INSERT_USERNAME = #{insertUserName}
+    )
+  </update>
 </mapper>