Merge remote-tracking branch 'cloud-schoolapi/ywx'

sapi/src/main/resources/application.properties

@@ -32,7 +32,7 @@ mybatis.mapper-Locations=classpath*:mapper/**/*.xml
 mapper.mappers=com.xhkjedu.sapi.base.TkMapper
 mapper.identity=MYSQL
 #打印日志的两种方式第一种可以指定包名，第二种都可以打印
-logging.level.com.xhkjedu.mapper=debug
+logging.level.com.xhkjedu.sapi.mapper=debug
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 #分页
 spring.pagehelper.helper-dialect=mysql

sclass/src/main/java/com/xhkjedu/sclass/interceptors/RequestInterceptor.java

@@ -104,30 +104,7 @@ public class RequestInterceptor extends JedisUtil implements HandlerInterceptor
     private Boolean interceptorApi(String uri) {
         boolean rtn = false;
         String[] url = new String[]{
-                "/ps/start_paper",//题库作业--开始做作业
-                "/ps/sstart_paper",//图片作业--开始做作业
-                "/psw/sstart_paper",//图片作业--开始做作业
-                "/psw/start_paper",//题库作业--开始做作业
-                "/croom/saveclass",//课堂--保存数据
-                "/resource/add",//资源--添加
-                "/recite/save",//背诵--添加
-                "/read/savers",//阅读--保存阅读记录
-                "/ps/submit_question",//作业--提交单题
-                "/ps/submit_paper",//作业--提交
-                "/ps/ssubmit_question",//图片作业--提交单题
-                "/ps/ssubmit_paper",//图片作业--提交
-                "/ps/scorrect",//答题卡--批改
-                "/ps/correc",//试题库--批改
-                "/paper/saves",//答题卡--保存
-                "/paper/saveq",//试题库--保存
-                "/pg/save",//作业--发布
-                "/question/add",//试题--添加
-                "/basket/add",//试题篮--添加
-                "/recites/up",//背诵--学生保存
-                "/question_class/end_correct",//试题--批阅完成
-                "/research/save",//教研管理--添加
-                "/researchu/up",//教研教师--保存评价
-                "/notice/add",//通知--添加
+                "/room/saveclass",//课堂--保存数据
         };
 
         for (int i = 0; i < url.length; i++) {

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

@@ -410,7 +410,6 @@ public class ClassroomService {
      **/
     public ResultVo getReport(Long roomid) {
         ReportRoomVo room = classroomMapper.getReport(roomid);
-        Integer realstunum = room.getRealstunum();
         //课堂提问列表
         List<Map> questions = classroomMapper.listQuestionReport(roomid);
         room.setQuestions(questions);
@@ -418,7 +417,7 @@ public class ClassroomService {
         //课堂考试列表
         List<ReportExamVo> exams = classroomMapper.listPaper(roomid);
         for (ReportExamVo exam : exams) {
-            realstunum = exam.getYtjnum();
+            Integer realstunum = exam.getYtjnum();
             List<String> paperfiles = classroomPaperFileMapper.listFilepath(exam.getPaperid());
             exam.setPaperfiles(paperfiles);
 

sclass/src/main/resources/application.properties

@@ -32,7 +32,7 @@ mybatis.mapper-Locations=classpath*:mapper/**/*.xml
 mapper.mappers=com.xhkjedu.sclass.base.TkMapper
 mapper.identity=MYSQL
 #打印日志的两种方式第一种可以指定包名，第二种都可以打印
-logging.level.com.xhkjedu.mapper=debug
+logging.level.com.xhkjedu.sclass.mapper=debug
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 #分页
 spring.pagehelper.helper-dialect=mysql

slive/src/main/resources/application.properties

@@ -32,7 +32,7 @@ mybatis.mapper-Locations=classpath*:mapper/**/*.xml
 mapper.mappers=com.xhkjedu.slive.base.TkMapper
 mapper.identity=MYSQL
 #打印日志的两种方式第一种可以指定包名，第二种都可以打印
-logging.level.com.xhkjedu.mapper=debug
+logging.level.com.xhkjedu.slive.mapper=debug
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 #分页
 spring.pagehelper.helper-dialect=mysql

sstudy/src/main/resources/application.properties

@@ -32,7 +32,7 @@ mybatis.mapper-Locations=classpath*:mapper/**/*.xml
 mapper.mappers=com.xhkjedu.sstudy.base.TkMapper
 mapper.identity=MYSQL
 #打印日志的两种方式第一种可以指定包名，第二种都可以打印
-logging.level.com.xhkjedu.mapper=debug
+logging.level.com.xhkjedu.sstudy.mapper=debug
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 #分页
 spring.pagehelper.helper-dialect=mysql