通知管理

sapi/src/main/java/com/xhkjedu/sapi/controller/notice/NoticeController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author ywx
@@ -148,4 +149,12 @@ public class NoticeController {
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取学生通知列表成功",pageResult);
     }
+
+    @PostMapping("/list_user")
+    public ResultVo listUser(@RequestBody TNotice notice) {
+        Integer noticeid = notice.getNoticeid();
+        N_Utils.validation(new Object[]{noticeid, "通知id", 1});
+        List<Map> list = noticeService.listUser(noticeid);
+        return new ResultVo(0, "获取通知对象成功", list);
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/notice/NoticeFileMapper.java

@@ -2,6 +2,9 @@ package com.xhkjedu.sapi.mapper.notice;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.sapi.model.notice.TNoticeFile;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description
@@ -9,4 +12,6 @@ import com.xhkjedu.sapi.model.notice.TNoticeFile;
  * Date 2023/12/18 14:08
  **/
 public interface NoticeFileMapper extends TkMapper<TNoticeFile> {
+    //通知附件列表
+    List<TNoticeFile> listByNoticeId(@Param("noticeid") Integer noticeid);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/notice/NoticeUserMapper.java

@@ -5,6 +5,9 @@ import com.xhkjedu.sapi.model.notice.TNotice;
 import com.xhkjedu.sapi.model.notice.TNoticeUser;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 public interface NoticeUserMapper extends TkMapper<TNoticeUser> {
     /**
      * 批量添加
@@ -24,4 +27,7 @@ public interface NoticeUserMapper extends TkMapper<TNoticeUser> {
      **/
     Integer reade(@Param("noticeid") Integer noticeid, @Param("userid") Integer userid
             , @Param("timestamp") int timestamp);
+
+    //通知对象
+    List<Map> listByNoticeId(@Param("noticeid") Integer noticeid);
 }

sapi/src/main/java/com/xhkjedu/sapi/model/notice/TNoticeFile.java

@@ -14,7 +14,7 @@ public class TNoticeFile extends BaseBean {
     private Integer nfid;
 
     //通知id
-    private String noticeid;
+    private Integer noticeid;
 
     //资源名称
     private String resourcename;

sapi/src/main/java/com/xhkjedu/sapi/model/notice/TNoticeUser.java

@@ -25,6 +25,15 @@ public class TNoticeUser extends BaseBean {
     //查看时间
     private Integer readtime;
 
+    //年级id
+    private Integer gradeid;
+
+    //班级id
+    private Integer classid;
+
+    //科目id
+    private String subjectid;
+
     //创建时间
     private Integer createtime;
 

sapi/src/main/java/com/xhkjedu/sapi/service/notice/NoticeService.java

@@ -1,20 +1,14 @@
 package com.xhkjedu.sapi.service.notice;
 
-import com.xhkjedu.sapi.mapper.notice.NoticeClassMapper;
-import com.xhkjedu.sapi.mapper.notice.NoticeMapper;
-import com.xhkjedu.sapi.mapper.notice.NoticeSchoolMapper;
-import com.xhkjedu.sapi.mapper.notice.NoticeUserMapper;
-import com.xhkjedu.sapi.model.system.TSchool;
+import com.xhkjedu.sapi.mapper.notice.*;
+import com.xhkjedu.sapi.model.notice.TNoticeFile;
 import com.xhkjedu.sapi.model.notice.TNotice;
 import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.sapi.vo.gradeclass.ClassVo;
-import com.xhkjedu.sapi.vo.notice.NoticeUserVo;
 import com.xhkjedu.sapi.vo.notice.NoticeVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author ywx
@@ -31,7 +25,7 @@ public class NoticeService {
     @Resource
     private NoticeUserMapper noticeUserMapper;
     @Resource
-    private NoticeSchoolMapper noticeSchoolMapper;
+    private NoticeFileMapper noticeFileMapper;
 
     //添加
     public Integer save(TNotice model) {
@@ -43,6 +37,15 @@ public class NoticeService {
         //添加通知对象
         saveNoticeObj(model);
 
+        //通知附件
+        List<TNoticeFile> files = model.getFiles();
+        if (N_Utils.isListNotEmpty(files)) {
+            Integer noticeid = model.getNoticeid();
+            for (TNoticeFile file : files) {
+                file.setNoticeid(noticeid);
+            }
+            noticeFileMapper.insertList(files);
+        }
         return model.getId();
     }
 
@@ -66,20 +69,21 @@ public class NoticeService {
             noticeUserMapper.batchSave(model);
         }
 
-        if (N_Utils.isListEmpty(model.getSchools())) {//兼容以前添加单个学校模式
+        /*if (N_Utils.isListEmpty(model.getSchools())) {//兼容以前添加单个学校模式
             List<TSchool> schools = new ArrayList<>();
             TSchool s = new TSchool();
             s.setSchoolid(model.getSchoolid());
             schools.add(s);
             model.setSchools(schools);
         }
-        noticeSchoolMapper.batchSave(model);//通知学校关联信息
+        noticeSchoolMapper.batchSave(model);//通知学校关联信息*/
     }
 
     //获取详情
     public TNotice findById(Integer noticeid) {
         TNotice notice = noticeMapper.findById(noticeid);
-        Integer noticetype = notice.getNoticetype();
+        notice.setFiles(noticeFileMapper.listByNoticeId(noticeid));
+        /*Integer noticetype = notice.getNoticetype();
         if (noticetype == 1) {
             List<ClassVo> classes = noticeMapper.listClass(noticeid);
             notice.setClasses(classes);
@@ -89,7 +93,7 @@ public class NoticeService {
         } else {
             List<TSchool> schools = noticeMapper.listSchool(noticeid);
             notice.setSchools(schools);
-        }
+        }*/
         return notice;
     }
 
@@ -129,6 +133,7 @@ public class NoticeService {
      **/
     public TNotice reade(Integer noticeid, Integer createid) {
         TNotice notice = noticeMapper.findById2(noticeid);
+        notice.setFiles(noticeFileMapper.listByNoticeId(noticeid));
         noticeUserMapper.reade(noticeid, createid, N_Utils.getSecondTimestamp());
         return notice;
     }
@@ -159,4 +164,15 @@ public class NoticeService {
     public List<NoticeVo> listNoticeStuWeb(TNotice notice) {
         return noticeMapper.listNoticeForStuWeb(notice);
     }
+
+    /**
+     * @Description 通知对象
+     * @Date 2023/12/18 16:26
+     * @Author YWX
+     * @Param [noticeid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map> listUser(Integer noticeid) {
+        return noticeUserMapper.listByNoticeId(noticeid);
+    }
 }

sapi/src/main/java/com/xhkjedu/sapi/service/research/ResearchService.java

@@ -98,10 +98,10 @@ public class ResearchService {
             notice.setSchoolid(research.getSchoolid());
             userids.forEach(uid->{
                 NoticeUserVo nt = new NoticeUserVo();
-                nt.setTeacherid(uid);
+                nt.setUserid(uid);
                 teachers.add(nt);
             });
-            notice.setTeachers(teachers);
+            notice.setUsers(teachers);
             noticeService.save(notice);
         }
 

sapi/src/main/java/com/xhkjedu/sapi/vo/notice/NoticeUserVo.java

@@ -12,4 +12,13 @@ public class NoticeUserVo {
 
     //是否查看0未查看1已查看
     private Integer readed;
+
+    //年级id
+    private Integer gradeid;
+
+    //班级id
+    private Integer classid;
+
+    //科目id
+    private String subjectid;
 }

sapi/src/main/resources/mapper/notice/NoticeFileMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sapi.mapper.notice.NoticeFileMapper">
+    <!--通知附件列表-->
+    <select id="listByNoticeId" resultType="com.xhkjedu.sapi.model.notice.TNoticeFile">
+        select * from t_notice_file where noticeid=#{noticeid}
+    </select>
+</mapper>

sapi/src/main/resources/mapper/notice/NoticeMapper.xml

@@ -41,7 +41,7 @@
     </select>
     <!--通知用户列表-->
     <select id="listUser" resultType="com.xhkjedu.sapi.vo.notice.NoticeUserVo">
-        select t.userid,tu.username teachername,t.readed
+        select t.userid,tu.username,t.readed
         from t_notice_user t left join t_user tu on t.userid = tu.userid
         where t.noticeid=#{noticeid}
     </select>

sapi/src/main/resources/mapper/notice/NoticeUserMapper.xml

@@ -3,10 +3,11 @@
 <mapper namespace="com.xhkjedu.sapi.mapper.notice.NoticeUserMapper">
     <!--批量添加-->
     <insert id="batchSave" parameterType="com.xhkjedu.sapi.model.notice.TNotice">
-        INSERT INTO t_notice_user (noticeid,userid,createtime,schoolid)
+        INSERT INTO t_notice_user (noticeid,userid,createtime,schoolid,gradeid,classid,subjectid)
         VALUES
-        <foreach collection ="notice.teachers" item="t" index= "index" separator =",">
-            (#{notice.noticeid},#{t.userid},#{notice.createtime},#{notice.schoolid})
+        <foreach collection ="notice.users" item="t" index= "index" separator =",">
+            (#{notice.noticeid},#{t.userid},#{notice.createtime},#{notice.schoolid}
+            ,#{t.gradeid},#{t.classid},#{t.subjectid})
         </foreach>
     </insert>
     <!--查看-->
@@ -14,4 +15,24 @@
         update t_notice_user nt set nt.readed=1,nt.readtime=#{timestamp}
         where nt.noticeid=#{noticeid} and nt.userid=#{userid}
     </update>
+    <!--通知对象-->
+    <resultMap id="userResult" type="java.util.Map">
+        <result property="gradeid" column="gradeid"/>
+        <result property="classid" column="classid"/>
+        <result property="subjectid" column="subjectid"/>
+        <result property="name" column="name"/>
+        <collection property="users" ofType="java.util.Map" javaType="java.util.List">
+            <result property="userid" column="userid"/>
+            <result property="readed" column="readed"/>
+            <result property="username" column="username"/>
+        </collection>
+    </resultMap>
+    <select id="listByNoticeId" resultMap="userResult">
+        select nu.userid,nu.readed,u.username,nu.gradeid,nu.classid,nu.subjectid
+        ,if(nu.classid is not null,(select c.classname from t_class c where c.classid=nu.classid)
+            ,(select s.subjectname from t_subject s where s.subjectid=nu.subjectid))name
+        from t_notice_user nu left join t_user u on nu.userid = u.userid
+        where nu.noticeid=#{noticeid}
+        order by convert(u.username using gbk)
+    </select>
 </mapper>