考试发送通知

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/EBaseController.java

 import com.xhkjedu.sexam.model.exam.ESubject;
 import com.xhkjedu.sexam.model.notice.TMsg;
 import com.xhkjedu.sexam.model.notice.TNotice;
-import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
+import com.xhkjedu.sexam.model.notice.TNoticeUser;
 import com.xhkjedu.sexam.service.exam.EBaseService;
 import com.xhkjedu.sexam.service.notice.NoticeService;
 import com.xhkjedu.sexam.service.report.EReportGenerateService;
         List<TMsg> msgList = new ArrayList<>();
         String examname = eBaseService.getNameByExamId(examid);
         String noticetitle = examname + "-考试设置";
+        Integer gradeid = vo.getGradeid();
         for (ESubject s : subjects) {
             try {
                 N_Utils.validation(new Object[]{s.getSubjectid(), "科目id", 2});
                     TNotice n = new TNotice();
                     n.setNoticetitle(noticetitle);
                     n.setNoticecontent(noticecontent);
-                    TNoticeTeacher nt = new TNoticeTeacher();
-                    nt.setTeacherid(teacherid);
-                    n.setTeachers(Arrays.asList(nt));
+                    TNoticeUser nt = new TNoticeUser();
+                    nt.setUserid(teacherid);
+                    nt.setGradeid(gradeid);
+                    nt.setSubjectid(s.getSubjectid());
+                    n.setUsers(Arrays.asList(nt));
                     noticeList.add(n);
                 }
                 if (msg == 1) {
         vo.setSchoolid(schoolid);
         vo.setHandleid(createid);
         vo.setExamname(examname);
+        vo.setGradeid(exam.getGradeid());
         noticeService.batchSave2(vo, students);
         return new ResultVo(0, "发布成功");
     }

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/ESubjectInvigilateController.java

 import com.xhkjedu.sexam.model.exam.ESubjectInvigilate;
 import com.xhkjedu.sexam.model.notice.TMsg;
 import com.xhkjedu.sexam.model.notice.TNotice;
-import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
+import com.xhkjedu.sexam.model.notice.TNoticeUser;
 import com.xhkjedu.sexam.service.exam.ESubjectInvigilateService;
 import com.xhkjedu.sexam.service.notice.NoticeService;
 import com.xhkjedu.sexam.vo.exam.EInVigilateVo;
         Map s = eSubjectInvigilateService.getESubjectByEsId(esid);
         Integer schoolid = (Integer) s.get("schoolid");
         String noticetitle = s.get("examname") + "-监考设置";
+        Integer gradeid = N_Utils.str2Int(s.get("gradeid").toString());
         for (ESubjectInvigilate ei : teachers) {
             Integer teacherid = ei.getTeacherid();
             if (N_Utils.isEmptyInteger(teacherid)) continue;
                 TNotice n = new TNotice();
                 n.setNoticetitle(noticetitle);
                 n.setNoticecontent(noticecontent);
-                TNoticeTeacher nt = new TNoticeTeacher();
-                nt.setTeacherid(teacherid);
-                n.setTeachers(Arrays.asList(nt));
+                TNoticeUser nt = new TNoticeUser();
+                nt.setUserid(teacherid);
+                nt.setGradeid(gradeid);
+                nt.setSubjectid(subjectid);
+                n.setUsers(Arrays.asList(nt));
                 noticeList.add(n);
             }
             if (msg == 1) {

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperCorrectclassController.java

 import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sexam.model.notice.TMsg;
 import com.xhkjedu.sexam.model.notice.TNotice;
-import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
+import com.xhkjedu.sexam.model.notice.TNoticeUser;
 import com.xhkjedu.sexam.model.paper.EPaperCorrectclass;
 import com.xhkjedu.sexam.service.notice.NoticeService;
 import com.xhkjedu.sexam.service.paper.EPaperCorrectclassService;
         Map s = ePaperCorrectclassService.getESubjectByEpId(epid);
         Integer schoolid = (Integer) s.get("schoolid");
         String noticetitle = s.get("examname") + "-阅卷按班设置";
+        Integer gradeid = N_Utils.str2Int(s.get("gradeid").toString());
+        String subjectid = s.get("subjectid").toString();
         for (EPaperCorrectclass c : teachers) {
             Integer teacherid = c.getTeacherid();
             if (N_Utils.isEmptyInteger(teacherid)) continue;
                 TNotice n = new TNotice();
                 n.setNoticetitle(noticetitle);
                 n.setNoticecontent(noticecontent);
-                TNoticeTeacher nt = new TNoticeTeacher();
-                nt.setTeacherid(teacherid);
-                n.setTeachers(Arrays.asList(nt));
+                TNoticeUser nt = new TNoticeUser();
+                nt.setUserid(teacherid);
+                nt.setGradeid(gradeid);
+                nt.setSubjectid(subjectid);
+                n.setUsers(Arrays.asList(nt));
                 noticeList.add(n);
             }
             if (msg == 1) {

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperCorrectquestionController.java

 import com.xhkjedu.annotation.Action;
 import com.xhkjedu.sexam.model.notice.TMsg;
 import com.xhkjedu.sexam.model.notice.TNotice;
-import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
+import com.xhkjedu.sexam.model.notice.TNoticeUser;
 import com.xhkjedu.sexam.model.paper.EPaper;
 import com.xhkjedu.sexam.model.paper.EPaperCorrectquestion;
 import com.xhkjedu.sexam.service.notice.NoticeService;
         Map s = ePaperCorrectquestionService.getESubjectByEpId(epid);
         Integer schoolid = (Integer) s.get("schoolid");
         String noticetitle = s.get("examname") + "-阅卷按题设置";
+        Integer gradeid = N_Utils.str2Int(s.get("gradeid").toString());
+        String subjectid = s.get("subjectid").toString();
         for (EPaperCorrectquestion q : teachers) {
             Integer teacherid = q.getTeacherid();
             if (N_Utils.isEmptyInteger(teacherid)) continue;
                 TNotice n = new TNotice();
                 n.setNoticetitle(noticetitle);
                 n.setNoticecontent(noticecontent);
-                TNoticeTeacher nt = new TNoticeTeacher();
-                nt.setTeacherid(teacherid);
-                n.setTeachers(Arrays.asList(nt));
+                TNoticeUser nt = new TNoticeUser();
+                nt.setUserid(teacherid);
+                nt.setGradeid(gradeid);
+                nt.setSubjectid(subjectid);
+                n.setUsers(Arrays.asList(nt));
                 noticeList.add(n);
             }
             if (msg == 1) {

sexam/src/main/java/com/xhkjedu/sexam/mapper/notice/NoticeTeacherMapper.java

-package com.xhkjedu.sexam.mapper.notice;
-
-import com.xhkjedu.base.TkMapper;
-import com.xhkjedu.sexam.model.notice.TNoticeTeacher;
-
-public interface NoticeTeacherMapper extends TkMapper<TNoticeTeacher> {
-}

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

+package com.xhkjedu.sexam.mapper.notice;
+
+import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.sexam.model.notice.TNoticeUser;
+
+public interface NoticeUserMapper extends TkMapper<TNoticeUser> {
+}

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

 
     @Transient
     //教师id集合
-    private List<TNoticeTeacher> teachers = new ArrayList<>();
+    private List<TNoticeUser> users = new ArrayList<>();
 
     @Transient
     //开始时间

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

 
 @Table(name = "t_notice_user")
 @Data
-public class TNoticeTeacher extends BaseBean {
+public class TNoticeUser extends BaseBean {
     @Id
     //通知用户表
     private Integer nuid;
     private Integer noticeid;
 
     //用户id
-    private Integer teacherid;
+    private Integer userid;
 
     //是否查看0未查看1已查看
     private Integer readed;
     //查看时间
     private Integer readtime;
 
+    //年级id
+    private Integer gradeid;
+
+    //班级id
+    private Integer classid;
+
+    //科目id
+    private String subjectid;
+
     //创建时间
     private Integer createtime;
 

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

     @Resource
     private NoticeMapper noticeMapper;
     @Resource
-    private NoticeTeacherMapper noticeTeacherMapper;
-    @Resource
-    private NoticeClassMapper noticeClassMapper;
-    @Resource
-    private NoticeSchoolMapper noticeSchoolMapper;
+    private NoticeUserMapper noticeUserMapper;
     @Resource
     private MsgMapper msgMapper;
     @Resource
                 });
                 noticeMapper.insertList(noticeList);
 
-                List<TNoticeTeacher> teacherList = new ArrayList<>();
-                List<TNoticeClass> classList = new ArrayList<>();
-                List<TNoticeSchool> schoolList = new ArrayList<>();
+                List<TNoticeUser> teacherList = new ArrayList<>();
                 noticeList.forEach(n -> {
                     Integer noticeid = n.getId();
-                    List<TNoticeTeacher> teachers = n.getTeachers().stream().distinct().collect(Collectors.toList());
+                    List<TNoticeUser> teachers = n.getUsers().stream().distinct().collect(Collectors.toList());
                     teachers.forEach(t -> {
                         t.setNoticeid(noticeid);
                         t.setReaded(0);
                         t.setSchoolid(schoolid);
                     });
                     teacherList.addAll(teachers);
-
-                    List<TNoticeClass> classes = n.getClasses();
-                    classes.forEach(c -> {
-                        c.setNoticeid(noticeid);
-                        c.setCreateid(createid);
-                        c.setCreatetime(createtime);
-                    });
-                    classList.addAll(classes);
-
-                    TNoticeSchool ns = new TNoticeSchool();
-                    ns.setNoticeid(noticeid);
-                    ns.setSchoolid(schoolid);
-                    ns.setCreateid(createid);
-                    ns.setCreatetime(createtime);
-                    schoolList.add(ns);
                 });
 
-                if (N_Utils.isListNotEmpty(teacherList)) noticeTeacherMapper.insertList(teacherList);//通知教师关联信息
-                if (N_Utils.isListNotEmpty(classList)) noticeClassMapper.insertList(classList);//通知班级关联信息
-                if (N_Utils.isListNotEmpty(schoolList)) noticeSchoolMapper.insertList(schoolList);//通知学校关联信息
+                if (N_Utils.isListNotEmpty(teacherList)) noticeUserMapper.insertList(teacherList);//通知教师关联信息
             }
 
             if (N_Utils.isListNotEmpty(msgList)) {//短信
                         msgs.add(msg);
                     }
                 } else {//通知对象2老师
-                    List<Integer> userids = msgList.stream().map(m -> m.getUserid()).distinct().collect(Collectors.toList());
+                    List<Integer> userids = msgList.stream().map(TMsg::getUserid).distinct().collect(Collectors.toList());
                     List<UserVo> users = userMapper.listPhoneByUserIds(userids);//根据用户ids查找手机号
-                    Map<Integer, TMsg> msgMap = msgList.stream().collect(Collectors.toMap(m -> m.getUserid(), m -> m));
-                    for (int i = 0; i < users.size(); i++) {
-                        UserVo u = users.get(i);
+                    Map<Integer, TMsg> msgMap = msgList.stream().collect(Collectors.toMap(TMsg::getUserid, m -> m));
+                    for (UserVo u : users) {
                         String userphone = u.getUserphone();
                         if (N_Utils.isEmpty(userphone)) continue;
                         TMsg m = msgMap.get(u.getUserid());
                     msgMapper.insertList(msgs);//短信保存到数据库
 
                     //发短信
-                    Integer pageSize = 2000;//手机号，多个手机号为用半角 , 分开，如13899999999,13688888888(最多2000个，必填)
-                    Map<String, List<TMsg>> mcollect = msgs.stream().collect(Collectors.groupingBy(s -> s.getMsgtxt()
+                    int pageSize = 2000;//手机号，多个手机号为用半角 , 分开，如13899999999,13688888888(最多2000个，必填)
+                    Map<String, List<TMsg>> mcollect = msgs.stream().collect(Collectors.groupingBy(TMsg::getMsgtxt
                             , LinkedHashMap::new, Collectors.toList()));
                     for (Map.Entry<String, List<TMsg>> entry : mcollect.entrySet()) {
                         List<TMsg> list = entry.getValue();
                         for (int i = 0; i < list.size(); i += pageSize) {
                             ZtMsgVo vo = new ZtMsgVo();
                             String userphone = list.stream().skip(i).limit(pageSize)
-                                    .map(s -> s.getUserphone()).collect(Collectors.joining(","));
+                                                   .map(TMsg::getUserphone).collect(Collectors.joining(","));
                             vo.setMobile(userphone);
                             vo.setContent(msgtxt);
                             SMSSender.sendSms(vo);
                 }
             }
         } catch (Exception e) {
-            log.error("批量添加通知和短信失败", e.getMessage());
+            log.error("批量添加通知和短信失败：{}", e.getMessage());
         }
     }
 
         Integer examid = examVo.getExamid();
         String examname = examVo.getExamname();
         Integer schoolid = examVo.getSchoolid();
+        Integer gradeid = examVo.getGradeid();
         try {
             List<TNotice> noticeList = new ArrayList<>();
-            List<TNoticeClass> classList = new ArrayList<>();
-            List<TNoticeTeacher> teacherList = new ArrayList<>();
+            List<TNoticeUser> stuList = new ArrayList<>();
+            List<TNoticeUser> teacherList = new ArrayList<>();
             List<TMsg> msgList = new ArrayList<>();
             String noticetitle = examname + "-考试公告";
             List<Map> classes = eClassMapper.listByExamId(examid);
             String classids = classes.stream().map(c -> c.get("classid").toString()).collect(Collectors.joining(","));
             List<UserVo> teachers = userMapper.listTeacherByClassIds(classids);//获取考试班级任教老师
             if (notice == 1) {
-                for (Map s : classes) {
-                    TNoticeClass nt = new TNoticeClass();
-                    nt.setClassid((Integer) s.get("classid"));
-                    classList.add(nt);
+                for (UserVo student : students) {
+                    TNoticeUser nu = new TNoticeUser();
+                    nu.setUserid(student.getUserid());
+                    nu.setGradeid(gradeid);
+                    nu.setClassid(student.getClassid());
+                    stuList.add(nu);
                 }
                 TNotice n = new TNotice();
                 n.setNoticetitle(noticetitle);
                 n.setNoticecontent(examcomm);
-                n.setNoticetype(1);
-                n.setClasses(classList);
+                n.setNoticetype(3);
+                n.setUsers(stuList);
                 noticeList.add(n);
 
                 for (UserVo t : teachers) {
-                    TNoticeTeacher nt = new TNoticeTeacher();
-                    nt.setTeacherid(t.getUserid());
+                    TNoticeUser nt = new TNoticeUser();
+                    nt.setUserid(t.getUserid());
+                    nt.setGradeid(gradeid);
+                    nt.setSubjectid(t.getSubjectid());
                     teacherList.add(nt);
                 }
                 TNotice n2 = new TNotice();
                 n2.setNoticetitle(noticetitle);
                 n2.setNoticecontent(examcomm);
                 n2.setNoticetype(2);
-                n2.setTeachers(teacherList);
+                n2.setUsers(teacherList);
                 noticeList.add(n2);
             }
             if (msg == 1) {
                 String msgtxt = noticetitle + "\n" + ExamUtil.htmlRemoveTag(examcomm);
-                List<String> userphones = students.stream().filter(s -> N_Utils.isNotEmpty(s.getUserphone()))
-                        .map(s -> s.getUserphone()).collect(Collectors.toList());
+                List<String> userphones = new ArrayList<>();
+                for (UserVo student : students) {
+                    if (N_Utils.isNotEmpty(student.getUserphone())) {
+                        String sUserphone = student.getUserphone();
+                        userphones.add(sUserphone);
+                    }
+                }
                 for (String userphone : userphones) {
                     TMsg m = new TMsg();
                     m.setMsgtxt(msgtxt);
                     m.setUserphone(userphone);
                     msgList.add(m);
                 }
-                userphones = teachers.stream().filter(s -> N_Utils.isNotEmpty(s.getUserphone()))
-                        .map(s -> s.getUserphone()).collect(Collectors.toList());
+                List<String> list = new ArrayList<>();
+                for (UserVo s : teachers) {
+                    String sUserphone = s.getUserphone();
+                    if (N_Utils.isNotEmpty(sUserphone)) {
+                        list.add(sUserphone);
+                    }
+                }
+                userphones = list;
                 for (String userphone : userphones) {
                     TMsg m = new TMsg();
                     m.setMsgtxt(msgtxt);
                 });
                 noticeMapper.insertList(noticeList);
 
-                List<TNoticeTeacher> nteacherList = new ArrayList<>();
-                List<TNoticeClass> nclassList = new ArrayList<>();
-                List<TNoticeSchool> schoolList = new ArrayList<>();
+                List<TNoticeUser> nteacherList = new ArrayList<>();
                 noticeList.forEach(n -> {
                     Integer noticeid = n.getId();
-                    List<TNoticeTeacher> cteachers = n.getTeachers().stream().distinct().collect(Collectors.toList());
+                    List<TNoticeUser> cteachers = n.getUsers().stream().distinct().collect(Collectors.toList());
                     cteachers.forEach(t -> {
                         t.setNoticeid(noticeid);
                         t.setReaded(0);
                         t.setSchoolid(schoolid);
                     });
                     nteacherList.addAll(cteachers);
-
-                    List<TNoticeClass> nclasses = n.getClasses();
-                    nclasses.forEach(c -> {
-                        c.setNoticeid(noticeid);
-                        c.setCreateid(createid);
-                        c.setCreatetime(createtime);
-                    });
-                    nclassList.addAll(nclasses);
-
-                    TNoticeSchool ns = new TNoticeSchool();
-                    ns.setNoticeid(noticeid);
-                    ns.setSchoolid(schoolid);
-                    ns.setCreateid(createid);
-                    ns.setCreatetime(createtime);
-                    schoolList.add(ns);
                 });
 
-                if (N_Utils.isListNotEmpty(nteacherList)) noticeTeacherMapper.insertList(teacherList);//通知教师关联信息
-                if (N_Utils.isListNotEmpty(nclassList)) noticeClassMapper.insertList(classList);//通知班级关联信息
-                if (N_Utils.isListNotEmpty(schoolList)) noticeSchoolMapper.insertList(schoolList);//通知学校关联信息
+                if (N_Utils.isListNotEmpty(nteacherList)) noticeUserMapper.insertList(teacherList);//通知教师关联信息
             }
 
             if (N_Utils.isListNotEmpty(msgList)) {//短信
                     msgMapper.insertList(msgs);//短信保存到数据库
 
                     //发短信
-                    Integer pageSize = 2000;//手机号，多个手机号为用半角 , 分开，如13899999999,13688888888(最多2000个，必填)
-                    Map<String, List<TMsg>> mcollect = msgs.stream().collect(Collectors.groupingBy(s -> s.getMsgtxt()
+                    int pageSize = 2000;//手机号，多个手机号为用半角 , 分开，如13899999999,13688888888(最多2000个，必填)
+                    Map<String, List<TMsg>> mcollect = msgs.stream().collect(Collectors.groupingBy(TMsg::getMsgtxt
                             , LinkedHashMap::new, Collectors.toList()));
                     for (Map.Entry<String, List<TMsg>> entry : mcollect.entrySet()) {
                         List<TMsg> list = entry.getValue();
                         for (int i = 0; i < list.size(); i += pageSize) {
                             ZtMsgVo vo = new ZtMsgVo();
                             String userphone = list.stream().skip(i).limit(pageSize)
-                                    .map(s -> s.getUserphone()).collect(Collectors.joining(","));
+                                                   .map(TMsg::getUserphone).collect(Collectors.joining(","));
                             vo.setMobile(userphone);
                             vo.setContent(msgtxt);
                             SMSSender.sendSms(vo);
                 }
             }
         } catch (Exception e) {
-            log.error("批量添加通知和短信（发布考试用）失败", e.getMessage());
+            log.error("批量添加通知和短信（发布考试用）失败：{}", e.getMessage());
         }
     }
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/exam/ExamVo.java

 
     //学校id
     private Integer schoolid;
+    
+    //年级id
+    private Integer gradeid;
 
     //考试名称
     private String examname;

sexam/src/main/resources/mapper/exam/EBaseMapper.xml

     </select>
     <!--根据考试id获取状态和模式-->
     <select id="getExamStateAndMode" resultType="com.xhkjedu.sexam.vo.exam.EBaseVo">
-        select eb.examstate,eb.exammode
+        select eb.examstate,eb.exammode,eb.gradeid
         from e_base eb where eb.examid=#{examid}
     </select>
     <!--根据考试id获取显示排名-->

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

-<?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.sexam.mapper.notice.NoticeTeacherMapper">
-    <!--批量添加-->
-    <insert id="batchSave" parameterType="com.xhkjedu.sexam.model.notice.TNotice">
-        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})
-        </foreach>
-    </insert>
-</mapper>

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

+<?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.sexam.mapper.notice.NoticeUserMapper">
+</mapper>

sexam/src/main/resources/mapper/paper/EPaperMapper.xml

     </select>
     <!--根据试卷id获取考试科目基本信息-->
     <select id="getESubjectByEpId" resultType="java.util.Map">
-        select es.sdate,es.begintime,es.endtime,eb.examname,eb.schoolid
+        select es.sdate,es.begintime,es.endtime,eb.examname,eb.schoolid,eb.gradeid,es.subjectid
         from e_paper ep left join e_subject es on ep.esid = es.esid
         left join e_base eb on es.examid = eb.examid
         where ep.epid=#{epid}

sexam/src/main/resources/mapper/system/UserMapper.xml

     <!--获取考试班级任教老师-->
     <select id="listTeacherByClassIds" resultType="com.xhkjedu.vo.system.UserVo">
         select u.userid,u.userphone
+        ,(select tp.subjectid from t_teacher_powersb tp where tp.teacherid=ct.teacherid limit 1)subjectid
         from t_class_teacher ct left join t_user u on ct.teacherid = u.userid
         where ct.classid in(${classids}) and u.userstate=1
         group by u.userid