通知管理

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

@@ -73,9 +73,9 @@ public class NoticeController {
         Integer pageSize = tNotice.getPageSize();
         Integer createid = tNotice.getCreateid();
         Integer schoolid = tNotice.getSchoolid();
-        N_Utils.validation(new Object[]{pageSize,"显示条数",1,createid,"教师id",1,schoolid,"学校id",1});
+        N_Utils.validation(new Object[]{pageSize,"显示条数",1,createid,"用户id",1,schoolid,"学校id",1});
         List<NoticeVo> list = noticeService.listMy(tNotice);
-        return new ResultVo(0,"获取教师通知列表成功",list);
+        return new ResultVo(0,"获取用户通知列表成功",list);
     }
 
     @PostMapping("/list_my_all")
@@ -84,7 +84,7 @@ public class NoticeController {
         Integer pageSize = tNotice.getPageSize();
         Integer createid = tNotice.getCreateid();
         Integer schoolid = tNotice.getSchoolid();
-        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,createid,"教师id",1,schoolid,"学校id",1});
+        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,createid,"用户id",1,schoolid,"学校id",1});
         PageHelper.startPage(page, pageSize);
         List<NoticeVo> list = noticeService.listMy(tNotice);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
@@ -110,7 +110,7 @@ public class NoticeController {
         Integer createid = tNotice.getCreateid();
         N_Utils.validation(new Object[]{noticeid,"通知id",1,createid,"用户id",1});
         TNotice notice = noticeService.reade(noticeid, createid);
-        return new ResultVo(0,"教师查看成功", notice);
+        return new ResultVo(0,"用户查看成功", notice);
     }
 
     @PostMapping("/student_readed")
@@ -124,9 +124,9 @@ public class NoticeController {
     @PostMapping("/no_read_num")
     public ResultVo noReadNum(@RequestBody TNotice tNotice) {
         Integer createid = tNotice.getCreateid();
-        N_Utils.validation(new Object[]{createid,"教师id",1});
+        N_Utils.validation(new Object[]{createid,"用户id",1});
         Integer num = noticeService.noReadNum(createid);
-        return new ResultVo(0,"获取教师未看通知数量成功",num);
+        return new ResultVo(0,"获取用户未看通知数量成功",num);
     }
 
     /**

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

@@ -0,0 +1,12 @@
+package com.xhkjedu.sapi.mapper.notice;
+
+import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.sapi.model.notice.TNoticeFile;
+
+/**
+ * @Description
+ * @Author ywx
+ * Date 2023/12/18 14:08
+ **/
+public interface NoticeFileMapper extends TkMapper<TNoticeFile> {
+}

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

@@ -4,7 +4,7 @@ import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.sapi.model.system.TSchool;
 import com.xhkjedu.sapi.model.notice.TNotice;
 import com.xhkjedu.sapi.vo.gradeclass.ClassVo;
-import com.xhkjedu.sapi.vo.notice.NoticeTeacherVo;
+import com.xhkjedu.sapi.vo.notice.NoticeUserVo;
 import com.xhkjedu.sapi.vo.notice.NoticeVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,7 +18,7 @@ public interface NoticeMapper extends TkMapper<TNotice> {
     TNotice findById(@Param("noticeid") Integer noticeid);
 
     /**
-     * 教师通知列表
+     * 用户通知列表
      * @Param [notice]
      * @Author ywx
      * @Date 2020/6/13 9:57
@@ -36,7 +36,7 @@ public interface NoticeMapper extends TkMapper<TNotice> {
     List<NoticeVo> listStudent(@Param("notice") TNotice notice);
 
     /**
-     * 教师、学生查看详情
+     * 用户查看详情
      * @Param [noticeid]
      * @Author ywx
      * @Date 2020/6/13 11:50
@@ -45,13 +45,13 @@ public interface NoticeMapper extends TkMapper<TNotice> {
     TNotice findById2(@Param("noticeid") Integer noticeid);
 
     /**
-     * 教师未看通知数量
-     * @Param [teacherid]
+     * 用户未看通知数量
+     * @Param [userid]
      * @Author ywx
      * @Date 2020/7/24 10:39
      * @return java.lang.Integer
      **/
-    Integer noReadNum(@Param("teacherid") Integer teacherid);
+    Integer noReadNum(@Param("userid") Integer userid);
 
 
     //////////////////////////////////////////////学生WEB端//////////////////////////////////////////////
@@ -70,8 +70,8 @@ public interface NoticeMapper extends TkMapper<TNotice> {
     //通知班级列表
     List<ClassVo> listClass(Integer noticeid);
 
-    //通知教师列表
-    List<NoticeTeacherVo> listTeacher(Integer noticeid);
+    //通知用户列表
+    List<NoticeUserVo> listUser(Integer noticeid);
 
     //通知学校列表
     List<TSchool> listSchool(Integer noticeid);

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

@@ -2,10 +2,10 @@ package com.xhkjedu.sapi.mapper.notice;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.sapi.model.notice.TNotice;
-import com.xhkjedu.sapi.model.notice.TNoticeTeacher;
+import com.xhkjedu.sapi.model.notice.TNoticeUser;
 import org.apache.ibatis.annotations.Param;
 
-public interface NoticeTeacherMapper extends TkMapper<TNoticeTeacher> {
+public interface NoticeUserMapper extends TkMapper<TNoticeUser> {
     /**
      * 批量添加
      * @Param [notice]
@@ -15,22 +15,13 @@ public interface NoticeTeacherMapper extends TkMapper<TNoticeTeacher> {
      **/
     Integer batchSave(@Param("notice") TNotice notice);
 
-    /**
-     * 删除通知对象
-     * @Param [noticeid]
-     * @Author ywx
-     * @Date 2020/6/13 10:00
-     * @return java.lang.Integer
-     **/
-    Integer deleteByNoticeId(@Param("noticeid") Integer noticeid);
-
     /**
      * 查看
-     * @Param [noticeid, teacherid]
+     * @Param [noticeid, userid]
      * @Author ywx
      * @Date 2020/6/13 11:17
      * @return java.lang.Integer
      **/
-    Integer reade(@Param("noticeid") Integer noticeid, @Param("teacherid") Integer teacherid
+    Integer reade(@Param("noticeid") Integer noticeid, @Param("userid") Integer userid
             , @Param("timestamp") int timestamp);
 }

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

@@ -3,7 +3,7 @@ package com.xhkjedu.sapi.model.notice;
 import com.xhkjedu.model.BaseBean;
 import com.xhkjedu.sapi.model.system.TSchool;
 import com.xhkjedu.sapi.vo.gradeclass.ClassVo;
-import com.xhkjedu.sapi.vo.notice.NoticeTeacherVo;
+import com.xhkjedu.sapi.vo.notice.NoticeUserVo;
 import lombok.Data;
 
 import javax.persistence.Id;
@@ -45,7 +45,7 @@ public class TNotice extends BaseBean {
 
     @Transient
     //教师id集合
-    private List<NoticeTeacherVo> teachers;
+    private List<NoticeUserVo> users;
 
     @Transient
     //开始时间
@@ -61,4 +61,8 @@ public class TNotice extends BaseBean {
     @Transient
     //学校id集合
     private List<TSchool> schools;
+
+    @Transient
+    //通知附件
+    private List<TNoticeFile> files;
 }

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

@@ -0,0 +1,51 @@
+package com.xhkjedu.sapi.model.notice;
+
+import com.xhkjedu.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_notice_file")
+@Data
+public class TNoticeFile extends BaseBean {
+    @Id
+    //通知附件表
+    private Integer nfid;
+
+    //通知id
+    private String noticeid;
+
+    //资源名称
+    private String resourcename;
+
+    //资源分类1word,2ppt,3pdf,4图片,5视频,6音频,7压缩包,10其他
+    private Integer resourceclass;
+
+    //资源地址
+    private String resourceurl;
+
+    //封面图地址
+    private String resourcecover;
+
+    //是否转换0未转换1已转换2转换失败3加密
+    private Integer converted;
+
+    //转换失败原因
+    private String convertmsg;
+
+    //转换后的pdf文件地址
+    private String pdfurl;
+
+    //文件后缀
+    private String suffix;
+
+    //文件大小
+    private Integer resourcesize;
+
+    //视频时长（秒）
+    private Integer duration;
+
+    //创建时间
+    private Integer createtime;
+}

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

@@ -6,9 +6,9 @@ import lombok.Data;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-@Table(name = "t_notice_teacher")
+@Table(name = "t_notice_user")
 @Data
-public class TNoticeTeacher extends BaseBean {
+public class TNoticeUser extends BaseBean {
     @Id
     //通知用户表
     private Integer nuid;
@@ -17,7 +17,7 @@ public class TNoticeTeacher extends BaseBean {
     private Integer noticeid;
 
     //用户id
-    private Integer teacherid;
+    private Integer userid;
 
     //是否查看0未查看1已查看
     private Integer readed;

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

@@ -3,12 +3,12 @@ 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.NoticeTeacherMapper;
+import com.xhkjedu.sapi.mapper.notice.NoticeUserMapper;
 import com.xhkjedu.sapi.model.system.TSchool;
 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.NoticeTeacherVo;
+import com.xhkjedu.sapi.vo.notice.NoticeUserVo;
 import com.xhkjedu.sapi.vo.notice.NoticeVo;
 import org.springframework.stereotype.Service;
 
@@ -29,7 +29,7 @@ public class NoticeService {
     @Resource
     private NoticeClassMapper noticeClassMapper;
     @Resource
-    private NoticeTeacherMapper noticeTeacherMapper;
+    private NoticeUserMapper noticeUserMapper;
     @Resource
     private NoticeSchoolMapper noticeSchoolMapper;
 
@@ -58,11 +58,12 @@ public class NoticeService {
 
     //添加通知对象
     private void saveNoticeObj(TNotice model) {
-        if (model.getNoticetype() == 1) {//通知对象1班级
+        Integer noticetype = model.getNoticetype();
+        if (noticetype == 1) {//通知对象1班级
             noticeClassMapper.batchSave(model);
-        } else if (model.getNoticetype() == 2) {//通知对象2老师
-            model.setTeachers(N_Utils.listDistinct(model.getTeachers()));//通知对象去重
-            noticeTeacherMapper.batchSave(model);
+        } else if (noticetype == 2 || noticetype == 3) {//通知对象2老师3单个学生
+            model.setUsers(N_Utils.listDistinct(model.getUsers()));//通知对象去重
+            noticeUserMapper.batchSave(model);
         }
 
         if (N_Utils.isListEmpty(model.getSchools())) {//兼容以前添加单个学校模式
@@ -82,9 +83,9 @@ public class NoticeService {
         if (noticetype == 1) {
             List<ClassVo> classes = noticeMapper.listClass(noticeid);
             notice.setClasses(classes);
-        } else if (noticetype == 2) {
-            List<NoticeTeacherVo> teachers = noticeMapper.listTeacher(noticeid);
-            notice.setTeachers(teachers);
+        } else if (noticetype == 2 || noticetype == 3) {
+            List<NoticeUserVo> users = noticeMapper.listUser(noticeid);
+            notice.setUsers(users);
         } else {
             List<TSchool> schools = noticeMapper.listSchool(noticeid);
             notice.setSchools(schools);
@@ -98,7 +99,7 @@ public class NoticeService {
     }
 
     /**
-     * 教师通知列表
+     * 用户通知列表
      * @Param [notice]
      * @Author ywx
      * @Date 2020/6/13 9:55
@@ -120,7 +121,7 @@ public class NoticeService {
     }
 
     /**
-     * 教师查看
+     * 用户查看
      * @Param [noticeid, createid]
      * @Author ywx
      * @Date 2020/6/13 11:21
@@ -128,7 +129,7 @@ public class NoticeService {
      **/
     public TNotice reade(Integer noticeid, Integer createid) {
         TNotice notice = noticeMapper.findById2(noticeid);
-        noticeTeacherMapper.reade(noticeid, createid, N_Utils.getSecondTimestamp());
+        noticeUserMapper.reade(noticeid, createid, N_Utils.getSecondTimestamp());
         return notice;
     }
 
@@ -144,7 +145,7 @@ public class NoticeService {
     }
 
     /**
-     * 教师未看通知数量
+     * 用户未看通知数量
      * @Param [teacherid]
      * @Author ywx
      * @Date 2020/7/24 10:37
@@ -154,11 +155,6 @@ public class NoticeService {
         return noticeMapper.noReadNum(teacherid);
     }
 
-    //根据班级删除通知
-    public void deleteByClassId(Integer classid) {
-        noticeMapper.deleteByClassId(classid);
-    }
-
     //通知学生--网页--列表
     public List<NoticeVo> listNoticeStuWeb(TNotice notice) {
         return noticeMapper.listNoticeForStuWeb(notice);

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

@@ -9,7 +9,7 @@ import com.xhkjedu.sapi.model.research.TResearch;
 import com.xhkjedu.sapi.model.research.TResearchUser;
 import com.xhkjedu.sapi.service.notice.NoticeService;
 import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.sapi.vo.notice.NoticeTeacherVo;
+import com.xhkjedu.sapi.vo.notice.NoticeUserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,7 +88,7 @@ public class ResearchService {
 
 
         if( research.getNotice() == 1){//发送通知
-            List<NoticeTeacherVo> teachers = new ArrayList<>();
+            List<NoticeUserVo> teachers = new ArrayList<>();
             TNotice notice = new TNotice();
             notice.setNoticetitle(research.getResearchname());
             notice.setNoticecontent(research.getResearchcontent());
@@ -97,7 +97,7 @@ public class ResearchService {
             notice.setCreateid(research.getCreateid());
             notice.setSchoolid(research.getSchoolid());
             userids.forEach(uid->{
-                NoticeTeacherVo nt = new NoticeTeacherVo();
+                NoticeUserVo nt = new NoticeUserVo();
                 nt.setTeacherid(uid);
                 teachers.add(nt);
             });

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

@@ -3,12 +3,12 @@ package com.xhkjedu.sapi.vo.notice;
 import lombok.Data;
 
 @Data
-public class NoticeTeacherVo {
-    //教师id
-    private Integer teacherid;
+public class NoticeUserVo {
+    //用户id
+    private Integer userid;
 
-    //教师名称
-    private String teachername;
+    //用户名称
+    private String username;
 
     //是否查看0未查看1已查看
     private Integer readed;

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

@@ -39,10 +39,10 @@
         where nc.noticeid=#{noticeid}
         order by c.gradeid,c.classtype,c.classorder
     </select>
-    <!--通知教师列表-->
-    <select id="listTeacher" resultType="com.xhkjedu.sapi.vo.notice.NoticeTeacherVo">
-        select t.teacherid,tu.username teachername,t.readed
-        from t_notice_teacher t left join t_user tu on t.teacherid = tu.userid
+    <!--通知用户列表-->
+    <select id="listUser" resultType="com.xhkjedu.sapi.vo.notice.NoticeUserVo">
+        select t.userid,tu.username teachername,t.readed
+        from t_notice_user t left join t_user tu on t.userid = tu.userid
         where t.noticeid=#{noticeid}
     </select>
     <!--通知学校列表-->
@@ -56,18 +56,18 @@
         from t_notice n left join t_user u on n.createid=u.userid
         where n.noticeid=#{noticeid} limit 1
     </select>
-    <!--教师、学生查看详情-->
+    <!--用户查看详情-->
     <select id="findById2" resultType="com.xhkjedu.sapi.model.notice.TNotice">
         select n.*,u.username createname
         from t_notice n left join t_user u on n.createid=u.userid
         where n.noticeid=#{noticeid} limit 1
     </select>
-    <!-- 教师通知列表 -->
+    <!-- 用户通知列表 -->
     <select id="listMy" resultType="com.xhkjedu.sapi.vo.notice.NoticeVo">
-        select n.noticeid,n.noticetitle,n.createtime,u.username createname,IFNULL(nt.readed,0)readed
+        select n.noticeid,n.noticetitle,n.createtime,u.username createname,IFNULL(nt.readed,0) as readed
         from t_notice n left join t_user u on n.createid=u.userid
-        left join t_notice_teacher nt on n.noticeid = nt.noticeid
-        where nt.teacherid=#{notice.createid}
+        left join t_notice_user nt on n.noticeid = nt.noticeid
+        where nt.userid=#{notice.createid}
         <if test="notice.readed!=null"> and nt.readed=#{notice.readed}</if>
         <if test="notice.noticetitle!=null and notice.noticetitle!=''">
             and (n.noticetitle like concat('%', #{notice.noticetitle}, '%')
@@ -80,14 +80,14 @@
             and n.createtime &lt;=#{notice.stoptime}
         </if>
 
-        group by n.noticeid order by nt.readed asc,n.createtime desc
+        group by n.noticeid order by nt.readed,n.createtime desc
         <if test="notice.page==null">
             limit #{notice.pageSize}
         </if>
     </select>
-    <!--教师未看通知数量-->
+    <!--用户未看通知数量-->
     <select id="noReadNum" resultType="java.lang.Integer">
-        select count(*) from t_notice_teacher t where t.teacherid=#{teacherid} and t.readed=0
+        select count(*) from t_notice_user t where t.userid=#{userid} and t.readed=0
     </select>
     <!--学生通知列表-->
     <select id="listStudent" resultType="com.xhkjedu.sapi.vo.notice.NoticeVo">

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

@@ -1,21 +0,0 @@
-<?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.NoticeTeacherMapper">
-    <!--批量添加-->
-    <insert id="batchSave" parameterType="com.xhkjedu.sapi.model.notice.TNotice">
-        INSERT INTO t_notice_teacher (noticeid,teacherid,createtime,schoolid)
-        VALUES
-        <foreach collection ="notice.teachers" item="t" index= "index" separator =",">
-            (#{notice.noticeid},#{t.teacherid},#{notice.createtime},#{notice.schoolid})
-        </foreach>
-    </insert>
-    <!--删除通知对象-->
-    <delete id="deleteByNoticeId">
-        delete from t_notice_teacher where noticeid=#{noticeid}
-    </delete>
-    <!--查看-->
-    <update id="reade">
-        update t_notice_teacher nt set nt.readed=1,nt.readtime=#{timestamp}
-        where nt.noticeid=#{noticeid} and nt.teacherid=#{teacherid}
-    </update>
-</mapper>

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

@@ -0,0 +1,17 @@
+<?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.NoticeUserMapper">
+    <!--批量添加-->
+    <insert id="batchSave" parameterType="com.xhkjedu.sapi.model.notice.TNotice">
+        INSERT INTO t_notice_user (noticeid,userid,createtime,schoolid)
+        VALUES
+        <foreach collection ="notice.teachers" item="t" index= "index" separator =",">
+            (#{notice.noticeid},#{t.userid},#{notice.createtime},#{notice.schoolid})
+        </foreach>
+    </insert>
+    <!--查看-->
+    <update id="reade">
+        update t_notice_user nt set nt.readed=1,nt.readtime=#{timestamp}
+        where nt.noticeid=#{noticeid} and nt.userid=#{userid}
+    </update>
+</mapper>

sexam/src/main/java/com/xhkjedu/sexam/model/notice/TNoticeTeacher.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-@Table(name = "t_notice_teacher")
+@Table(name = "t_notice_user")
 @Data
 public class TNoticeTeacher extends BaseBean {
     @Id

sexam/src/main/resources/mapper/notice/NoticeTeacherMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.xhkjedu.sexam.mapper.notice.NoticeTeacherMapper">
     <!--批量添加-->
     <insert id="batchSave" parameterType="com.xhkjedu.sexam.model.notice.TNotice">
-        INSERT INTO t_notice_teacher (noticeid,teacherid,createtime,schoolid)
+        INSERT INTO t_notice_user (noticeid,teacherid,createtime,schoolid)
         VALUES
         <foreach collection ="notice.teachers" item="t" index= "index" separator =",">
             (#{notice.noticeid},#{t.teacherid},#{notice.createtime},#{notice.schoolid})