ai背诵、作业、学生预习、课堂回顾模块，允许学校管理员查看所有教师发布的信息，允许查看、下载、删除、统计

导入文件过大提示

sclass/src/main/java/com/xhkjedu/sclass/controller/classroom/ClassroomController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.annotation.Action;
+import com.xhkjedu.sclass.mapper.system.UserMapper;
 import com.xhkjedu.sclass.model.classroom.*;
 import com.xhkjedu.sclass.model.paperstudent.TPaperStudent;
 import com.xhkjedu.sclass.model.paperstudent.TPaperStudentScantron;
@@ -18,6 +19,7 @@ import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -40,6 +42,8 @@ public class ClassroomController {
     private ClassroomService classroomService;
     @Resource
     private ClassroomPaperService classroomPaperService;
+    @Resource
+    private UserMapper userMapper;
 
     /**
      * 批量保存课堂数据
@@ -464,8 +468,9 @@ public class ClassroomController {
         Integer pageSize = room.getPageSize();
         N_Utils.validation(new Object[]{teacherid, "教师id", 1, page, "显示页码", 1, pageSize, "显示条数", 1});
         try {
+            UserVo userVo = userMapper.getUserInfoForHandleLog(teacherid);
             PageHelper.startPage(page, pageSize);
-            List<Map> list = classroomService.listClassByDirectorId(room);
+            List<Map> list = classroomService.listClassByDirectorId(room, userVo);
             PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
             return new ResultVo(0, "获取课堂回顾列表成功", pageResult);
         } catch (Exception e) {
@@ -474,6 +479,21 @@ public class ClassroomController {
         }
     }
 
+    /**
+     * @Description 删除
+     * @Date 2023/11/17 14:26
+     * @Author YWX
+     * @Param [room]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TClassroom room) {
+        Long roomid = room.getRoomid();
+        N_Utils.validation(new Object[]{roomid, "课堂id", 1});
+        classroomService.deleteById(roomid);
+        return new ResultVo(0, "删除成功");
+    }
+
     /**
      * 课堂回顾详情
      *

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomService.java

@@ -2,7 +2,6 @@ package com.xhkjedu.sclass.service.classroom;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sclass.mapper.classroom.*;
-import com.xhkjedu.sclass.mapper.system.UserMapper;
 import com.xhkjedu.sclass.model.classroom.*;
 import com.xhkjedu.sclass.utils.ArithUtil;
 import com.xhkjedu.sclass.vo.classroom.*;
@@ -53,8 +52,6 @@ public class ClassroomService {
     private ClassroomFileMapper classroomFileMapper;
     @Resource
     private ClassroomVideoMapper classroomVideoMapper;
-    @Resource
-    private UserMapper userMapper;
 
     /**
      * 开始课堂
@@ -410,8 +407,7 @@ public class ClassroomService {
      * @Author ywx
      * @Date 2020/6/15 9:19
      **/
-    public List<Map> listClassByDirectorId(TClassroom room) {
-        UserVo userVo = userMapper.getUserInfoForHandleLog(room.getTeacherid());
+    public List<Map> listClassByDirectorId(TClassroom room, UserVo userVo) {
         List<Map> rooms = classroomMapper.listClassByDirectorId(room,userVo);
         classRoomForList(rooms,1);
         return rooms;
@@ -859,4 +855,15 @@ public class ClassroomService {
     public Integer getSchoolYearBySchoolid(Integer schoolid){
         return classroomMapper.getSchoolYearBySchoolid(schoolid);
     }
+
+    /**
+     * @Description 删除
+     * @Date 2023/11/17 14:25
+     * @Author YWX
+     * @Param [roomid]
+     * @Return void
+     **/
+    public void deleteById(Long roomid) {
+        classroomMapper.deleteByPrimaryKey(roomid);
+    }
 }

scommons/src/main/java/com/xhkjedu/exception/ErrorAdivceController.java

@@ -45,6 +45,8 @@ public class ErrorAdivceController {
         String msg = ex.getMessage();
         if (N_Utils.isNotEmpty(msg) && msg.indexOf("JSON parse error") != -1){
             return new ResultVo(1,"json格式不对");
+        } else if (N_Utils.isNotEmpty(msg) && msg.indexOf("Maximum upload size exceeded") != -1) {
+            return new ResultVo(1, "文件过大");
         }
         return new ResultVo(1, "程序处理异常");
     }

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.annotation.Action;
+import com.xhkjedu.sstudy.mapper.system.UserMapper;
 import com.xhkjedu.sstudy.model.paper.*;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudent;
 import com.xhkjedu.sstudy.service.gradeclass.ClassService;
@@ -16,6 +17,7 @@ import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -39,6 +41,8 @@ public class PaperController {
     private ClassService classService;
     @Resource
     private SchoolService schoolService;
+    @Resource
+    private UserMapper userMapper;
 
     /**
      * 功能描述  答题卡作业--保存
@@ -214,13 +218,16 @@ public class PaperController {
         Integer page = paper.getPage();
         Integer pageSize = paper.getPageSize();
         N_Utils.validation(new Object[]{lsbid,"教材关联关系id",2,createid,"教师id",1,page,"显示页码",1,pageSize,"显示条数",1});
-        //获取当前教师权限班级
-        Map classMap = classService.getQxClassidsByTeacherid(createid, null);
-        String bxclassids = classMap.get("bxclassids").toString();//本校权限班级
-        paper.setBxclassids(bxclassids);
-        paper.setClassids(classMap.get("classids").toString());
+        UserVo userVo = userMapper.getUserInfoForHandleLog(createid);
+        if (userVo != null && !userVo.getUsertype().equals(0)) {
+            //获取当前教师权限班级
+            Map classMap = classService.getQxClassidsByTeacherid(createid, null);
+            String bxclassids = classMap.get("bxclassids").toString();//本校权限班级
+            paper.setBxclassids(bxclassids);
+            paper.setClassids(classMap.get("classids").toString());
+        }
         PageHelper.startPage(page,pageSize);
-        List<PaperListVo> list = paperService.findAll(paper);
+        List<PaperListVo> list = paperService.findAll(paper, userVo);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
         return new ResultVo(0,"获取作业列表成功",pageResult);
     }

sstudy/src/main/java/com/xhkjedu/sstudy/controller/recite/ReciteController.java

@@ -3,6 +3,7 @@ package com.xhkjedu.sstudy.controller.recite;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.annotation.Action;
+import com.xhkjedu.sstudy.mapper.system.UserMapper;
 import com.xhkjedu.sstudy.model.recite.TRecite;
 import com.xhkjedu.sstudy.service.gradeclass.ClassService;
 import com.xhkjedu.sstudy.service.recite.ReciteService;
@@ -33,6 +34,8 @@ public class ReciteController {
     private ReciteService reciteService;
     @Resource
     private ClassService classService;
+    @Resource
+    private UserMapper userMapper;
 
     /**
      *功能描述  发布背诵
@@ -112,15 +115,17 @@ public class ReciteController {
      */
     @PostMapping("list")
     public ResultVo list(@RequestBody TRecite recite) {
+        Integer createid = recite.getCreateid();
         N_Utils.validation(new Object[]{
                 recite.getPage(), "显示页码", 1, recite.getPageSize(), "显示条数", 1,
-                recite.getCreateid(), "创建人", 1,recite.getSchoolid(),"学校id",1});
-        Map classmap = classService.getQxClassidsByTeacherid(recite.getCreateid(), null);
+                createid, "创建人", 1,recite.getSchoolid(),"学校id",1});
+        Map classmap = classService.getQxClassidsByTeacherid(createid, null);
         recite.setClassids(classmap.get("classids").toString());
         recite.setBxclassids(classmap.get("bxclassids").toString());
+        Integer usertype = userMapper.getUsertypeByUserid(createid);
         PageHelper.startPage(recite.getPage(), recite.getPageSize());
         recite.setNowtime(N_Utils.getSecondTimestamp());
-        List<Map> list = reciteService.listRecites(recite);
+        List<Map> list = reciteService.listRecites(recite, usertype);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0, "获取列表成功", pageResult);
     }

sstudy/src/main/java/com/xhkjedu/sstudy/controller/resource/GuideController.java

@@ -3,6 +3,7 @@ package com.xhkjedu.sstudy.controller.resource;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.annotation.Action;
+import com.xhkjedu.sstudy.mapper.system.UserMapper;
 import com.xhkjedu.sstudy.model.resource.TGuide;
 import com.xhkjedu.sstudy.service.gradeclass.ClassService;
 import com.xhkjedu.sstudy.service.resource.GuideService;
@@ -13,6 +14,7 @@ import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,6 +40,8 @@ public class GuideController {
     private GuideService guideService;
     @Resource
     private ClassService classService;
+    @Resource
+    private UserMapper userMapper;
 
     //教师网页端预习列表
     @PostMapping("/teaweb")
@@ -48,14 +52,17 @@ public class GuideController {
         String subjectid = guide.getSubjectid();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,createid,"教师id",1
                 ,subjectid,"科目",2});
-        Map<String, String> map = classService.getQxClassidsByTeacherid(createid, null);
-        guide.setClassids(map.get("classids"));
-        guide.setBxclassids(map.get("bxclassids"));
-        if (N_Utils.isEmpty(guide.getSchoolid())) {
-            guide.setSchoolid(N_Utils.str2Int(map.get("userschoolid")));
+        UserVo userVo = userMapper.getUserInfoForHandleLog(createid);
+        if (userVo != null && !userVo.getUsertype().equals(0)) {
+            Map<String, String> map = classService.getQxClassidsByTeacherid(createid, null);
+            guide.setClassids(map.get("classids"));
+            guide.setBxclassids(map.get("bxclassids"));
+            if (N_Utils.isEmpty(guide.getSchoolid())) {
+                guide.setSchoolid(N_Utils.str2Int(map.get("userschoolid")));
+            }
         }
         PageHelper.startPage(page, pageSize);
-        List<GuideVo> list = guideService.listGuidesForTeacherWeb(guide);
+        List<GuideVo> list = guideService.listGuidesForTeacherWeb(guide, userVo);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
         return new ResultVo(0,"获取教师预习列表成功",pageResult);
     }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paper/PaperMapper.java

@@ -7,6 +7,7 @@ import com.xhkjedu.sstudy.vo.paper.*;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperGroupParam;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperSearchVo;
 import com.xhkjedu.sstudy.vo.question.QuestionVo;
+import com.xhkjedu.vo.system.UserVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -67,10 +68,10 @@ public interface PaperMapper extends TkMapper<TPaper> {
      * @Date 2020/6/11 16:06
      * @return java.util.List<com.xhkjedu.vo.paper.PaperListVo>
      **/
-    List<PaperListVo> listAll(@Param("paper") PaperSearchVo paper);
+    List<PaperListVo> listAll(@Param("paper") PaperSearchVo paper,@Param("userVo") UserVo userVo);
 
     //作业列表--未发布
-    List<PaperListVo> listWfbPapers(@Param("paper") PaperSearchVo paper);
+    List<PaperListVo> listWfbPapers(@Param("paper") PaperSearchVo paper,@Param("userVo") UserVo userVo);
 
     /**
      * 设置批改方式

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/resource/GuideMapper.java

@@ -6,6 +6,7 @@ import com.xhkjedu.sstudy.vo.paper.AStudentPaperVo;
 import com.xhkjedu.sstudy.vo.paper.AnalyzeSearchVo;
 import com.xhkjedu.sstudy.vo.resource.GuideAnalyzeVo;
 import com.xhkjedu.sstudy.vo.resource.GuideVo;
+import com.xhkjedu.vo.system.UserVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,7 +21,7 @@ import java.util.Map;
 public interface GuideMapper extends TkMapper<TGuide> {
 
     //学生预习列表--教师网页
-    List<GuideVo> listGuidesForTeacherWeb(@Param("guide") TGuide guide);
+    List<GuideVo> listGuidesForTeacherWeb(@Param("guide") TGuide guide,@Param("userVo") UserVo userVo);
     //学生预习列表--教师app
     List<Map> listGuidesForTeacherApp(@Param("guide") TGuide guide);
 

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -18,6 +18,7 @@ import com.xhkjedu.sstudy.vo.question.QuestionVo;
 import com.xhkjedu.sstudy.vo.subjectbook.PointVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -1056,13 +1057,13 @@ public class PaperService {
      * @Date 2020/6/11 16:30
      * @return java.util.List<com.xhkjedu.vo.paper.PaperListVo>
      **/
-    public List<PaperListVo> findAll(PaperSearchVo paper) {
+    public List<PaperListVo> findAll(PaperSearchVo paper, UserVo userVo) {
         if(paper.getPsstate()!=null && paper.getPsstate() == 21){
             //未布置作业
-            return paperMapper.listWfbPapers(paper);
+            return paperMapper.listWfbPapers(paper, userVo);
         }else{
             //全部作业
-            List<PaperListVo>  list = paperMapper.listAll(paper);
+            List<PaperListVo>  list = paperMapper.listAll(paper, userVo);
             return StudyUtil.getPaperListVo(list);
         }
     }

sstudy/src/main/java/com/xhkjedu/sstudy/service/recite/ReciteService.java

@@ -5,13 +5,11 @@ import com.xhkjedu.sstudy.mapper.recite.ReciteGroupMapper;
 import com.xhkjedu.sstudy.mapper.recite.ReciteMapper;
 import com.xhkjedu.sstudy.mapper.recite.ReciteStudentMapper;
 import com.xhkjedu.sstudy.mapper.system.SchoolMapper;
-import com.xhkjedu.sstudy.mapper.system.UserMapper;
 import com.xhkjedu.sstudy.model.recite.TRecite;
 import com.xhkjedu.sstudy.model.recite.TReciteGroup;
 import com.xhkjedu.sstudy.model.recite.TReciteStudent;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
-import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,8 +44,6 @@ public class ReciteService {
 
     @Resource
     private SchoolMapper schoolMapper;
-    @Resource
-    private UserMapper userMapper;
 
     @Transactional(rollbackFor = Exception.class)
     public ResultVo save(TRecite recite){
@@ -192,10 +188,8 @@ public class ReciteService {
      * @author WN
      * @date 2020/6/10
      */
-    public List<Map> listRecites(TRecite recite) {
-        UserVo userVo = userMapper.getUserInfoForHandleLog(recite.getCreateid());
-
-        List<Map> list = reciteMapper.listRecites(recite,userVo.getUsertype());
+    public List<Map> listRecites(TRecite recite, Integer usertype) {
+        List<Map> list = reciteMapper.listRecites(recite, usertype);
         for(Map map : list){
             List<Map> reciteStus = (List<Map>) map.get("reciteStus");//背诵关联学生
             Integer hashb = Integer.parseInt(map.get("hashb").toString());

sstudy/src/main/java/com/xhkjedu/sstudy/service/resource/GuideService.java

@@ -14,6 +14,7 @@ import com.xhkjedu.sstudy.vo.resource.GuideAnalyzeVo;
 import com.xhkjedu.sstudy.vo.resource.GuideVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,8 +58,8 @@ public class GuideService {
     private ConvertUtil convertUtil;
 
     //学生预习列表--教师网页端
-    public List<GuideVo> listGuidesForTeacherWeb(TGuide guide){
-        return guideMapper.listGuidesForTeacherWeb(guide);
+    public List<GuideVo> listGuidesForTeacherWeb(TGuide guide, UserVo userVo){
+        return guideMapper.listGuidesForTeacherWeb(guide, userVo);
     }
     //学生预习列表--教师app
     public List<Map> listGuidesForTeacherApp(TGuide guide){

sstudy/src/main/resources/mapper/paper/PaperMapper.xml

@@ -198,9 +198,15 @@
         from t_paper p left join t_user u on p.createid=u.userid
         left join t_paper_class pg on p.paperid=pg.paperid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.lsbid=#{paper.lsbid} and (p.createid=#{paper.createid} or pg.checkid=#{paper.createid} or
-        (p.hashb=1 and p.schoolid=#{paper.schoolid} and pg.classid in (${paper.classids})) or
-        (pg.classid in (${paper.bxclassids})))
+        where (d.disabled=0 or p.directorid is null) and p.lsbid=#{paper.lsbid}
+        <if test="userVo.usertype!=null and userVo.usertype==0">
+            and p.schoolid=#{userVo.schoolid}
+        </if>
+        <if test="userVo.usertype!=0">
+            and (p.createid=#{paper.createid} or pg.checkid=#{paper.createid} or
+            (p.hashb=1 and p.schoolid=#{paper.schoolid} and pg.classid in (${paper.classids})) or
+            (pg.classid in (${paper.bxclassids})))
+        </if>
         <if test="paper.directorid!=null and paper.directorid!='0'.toString() and paper.directorid!=''">
             and p.directorid=#{paper.directorid}
         </if>
@@ -227,7 +233,13 @@
         select p.paperid,p.papername,p.papertype,p.paperclass,p.paperstate,p.checktype,p.createtime,p.createid,p.hasreport,p.schoolid
         ,(select u.username from t_user u where u.userid=p.createid)createname
         from t_paper p left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.lsbid=#{paper.lsbid} and p.createid=#{paper.createid} and p.paperstate=21
+        where (d.disabled=0 or p.directorid is null) and p.lsbid=#{paper.lsbid} and p.paperstate=21
+        <if test="userVo.usertype!=null and userVo.usertype==0">
+            and p.schoolid=#{userVo.schoolid}
+        </if>
+        <if test="userVo.usertype!=0">
+            and p.createid=#{paper.createid}
+        </if>
         <if test="paper.directorid!=null and paper.directorid!='0'.toString() and paper.directorid!=''">
             and p.directorid=#{paper.directorid}
         </if>
@@ -265,7 +277,7 @@
         left join t_paper_class pg on p.paperid=pg.paperid
         left join t_paper_student ps on p.paperid=ps.paperid and pg.classid=ps.classid
         left join t_director d on p.directorid=d.directorid
-        where (d.disabled=0 or p.directorid is null) and p.checktype=1
+        where (d.disabled=0 or p.directorid is null)
         and (p.createid=#{checkid} or ps.checkid=#{checkid}) and ps.psstate in (1,2) and ps.pschecked!=1
         group by p.paperid order by p.createtime desc
     </select>

sstudy/src/main/resources/mapper/resource/GuideMapper.xml

@@ -24,8 +24,13 @@
         left join t_guide_group gg on g.guideid = gg.guideid
         left join t_director d on g.directorid=d.directorid
         where d.disabled=0 and g.subjectid=#{guide.subjectid}
-        and ((g.hashb=1 and g.schoolid=#{guide.schoolid} and gg.classid in (${guide.classids})) or
-        (gg.classid in (${guide.bxclassids})) or g.createid=#{guide.createid})
+        <if test="userVo.usertype!=null and userVo.usertype==0">
+            and g.schoolid=#{userVo.schoolid}
+        </if>
+        <if test="userVo.usertype!=0">
+            and ((g.hashb=1 and g.schoolid=#{guide.schoolid} and gg.classid in (${guide.classids})) or
+            (gg.classid in (${guide.bxclassids})) or g.createid=#{guide.createid})
+        </if>
         <if test="guide.lsbid!=null and guide.lsbid!='' and guide.lsbid!='0'.toString()">
             and g.lsbid = #{guide.lsbid}
         </if>