Browse Source

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

tags/正式3.2.0
王宁 2 years ago
parent
commit
b2ad7d6a86

+ 1
- 1
sapi/src/main/resources/application.properties View File

32
 mapper.mappers=com.xhkjedu.sapi.base.TkMapper
32
 mapper.mappers=com.xhkjedu.sapi.base.TkMapper
33
 mapper.identity=MYSQL
33
 mapper.identity=MYSQL
34
 #打印日志的两种方式第一种可以指定包名,第二种都可以打印
34
 #打印日志的两种方式第一种可以指定包名,第二种都可以打印
35
-logging.level.com.xhkjedu.mapper=debug
35
+logging.level.com.xhkjedu.sapi.mapper=debug
36
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
36
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
37
 #分页
37
 #分页
38
 spring.pagehelper.helper-dialect=mysql
38
 spring.pagehelper.helper-dialect=mysql

+ 1
- 24
sclass/src/main/java/com/xhkjedu/sclass/interceptors/RequestInterceptor.java View File

104
     private Boolean interceptorApi(String uri) {
104
     private Boolean interceptorApi(String uri) {
105
         boolean rtn = false;
105
         boolean rtn = false;
106
         String[] url = new String[]{
106
         String[] url = new String[]{
107
-                "/ps/start_paper",//题库作业--开始做作业
108
-                "/ps/sstart_paper",//图片作业--开始做作业
109
-                "/psw/sstart_paper",//图片作业--开始做作业
110
-                "/psw/start_paper",//题库作业--开始做作业
111
-                "/croom/saveclass",//课堂--保存数据
112
-                "/resource/add",//资源--添加
113
-                "/recite/save",//背诵--添加
114
-                "/read/savers",//阅读--保存阅读记录
115
-                "/ps/submit_question",//作业--提交单题
116
-                "/ps/submit_paper",//作业--提交
117
-                "/ps/ssubmit_question",//图片作业--提交单题
118
-                "/ps/ssubmit_paper",//图片作业--提交
119
-                "/ps/scorrect",//答题卡--批改
120
-                "/ps/correc",//试题库--批改
121
-                "/paper/saves",//答题卡--保存
122
-                "/paper/saveq",//试题库--保存
123
-                "/pg/save",//作业--发布
124
-                "/question/add",//试题--添加
125
-                "/basket/add",//试题篮--添加
126
-                "/recites/up",//背诵--学生保存
127
-                "/question_class/end_correct",//试题--批阅完成
128
-                "/research/save",//教研管理--添加
129
-                "/researchu/up",//教研教师--保存评价
130
-                "/notice/add",//通知--添加
107
+                "/room/saveclass",//课堂--保存数据
131
         };
108
         };
132
 
109
 
133
         for (int i = 0; i < url.length; i++) {
110
         for (int i = 0; i < url.length; i++) {

+ 1
- 2
sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomService.java View File

410
      **/
410
      **/
411
     public ResultVo getReport(Long roomid) {
411
     public ResultVo getReport(Long roomid) {
412
         ReportRoomVo room = classroomMapper.getReport(roomid);
412
         ReportRoomVo room = classroomMapper.getReport(roomid);
413
-        Integer realstunum = room.getRealstunum();
414
         //课堂提问列表
413
         //课堂提问列表
415
         List<Map> questions = classroomMapper.listQuestionReport(roomid);
414
         List<Map> questions = classroomMapper.listQuestionReport(roomid);
416
         room.setQuestions(questions);
415
         room.setQuestions(questions);
418
         //课堂考试列表
417
         //课堂考试列表
419
         List<ReportExamVo> exams = classroomMapper.listPaper(roomid);
418
         List<ReportExamVo> exams = classroomMapper.listPaper(roomid);
420
         for (ReportExamVo exam : exams) {
419
         for (ReportExamVo exam : exams) {
421
-            realstunum = exam.getYtjnum();
420
+            Integer realstunum = exam.getYtjnum();
422
             List<String> paperfiles = classroomPaperFileMapper.listFilepath(exam.getPaperid());
421
             List<String> paperfiles = classroomPaperFileMapper.listFilepath(exam.getPaperid());
423
             exam.setPaperfiles(paperfiles);
422
             exam.setPaperfiles(paperfiles);
424
 
423
 

+ 1
- 1
sclass/src/main/resources/application.properties View File

32
 mapper.mappers=com.xhkjedu.sclass.base.TkMapper
32
 mapper.mappers=com.xhkjedu.sclass.base.TkMapper
33
 mapper.identity=MYSQL
33
 mapper.identity=MYSQL
34
 #打印日志的两种方式第一种可以指定包名,第二种都可以打印
34
 #打印日志的两种方式第一种可以指定包名,第二种都可以打印
35
-logging.level.com.xhkjedu.mapper=debug
35
+logging.level.com.xhkjedu.sclass.mapper=debug
36
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
36
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
37
 #分页
37
 #分页
38
 spring.pagehelper.helper-dialect=mysql
38
 spring.pagehelper.helper-dialect=mysql

+ 1
- 1
slive/src/main/resources/application.properties View File

32
 mapper.mappers=com.xhkjedu.slive.base.TkMapper
32
 mapper.mappers=com.xhkjedu.slive.base.TkMapper
33
 mapper.identity=MYSQL
33
 mapper.identity=MYSQL
34
 #打印日志的两种方式第一种可以指定包名,第二种都可以打印
34
 #打印日志的两种方式第一种可以指定包名,第二种都可以打印
35
-logging.level.com.xhkjedu.mapper=debug
35
+logging.level.com.xhkjedu.slive.mapper=debug
36
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
36
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
37
 #分页
37
 #分页
38
 spring.pagehelper.helper-dialect=mysql
38
 spring.pagehelper.helper-dialect=mysql

+ 1
- 1
sstudy/src/main/resources/application.properties View File

32
 mapper.mappers=com.xhkjedu.sstudy.base.TkMapper
32
 mapper.mappers=com.xhkjedu.sstudy.base.TkMapper
33
 mapper.identity=MYSQL
33
 mapper.identity=MYSQL
34
 #打印日志的两种方式第一种可以指定包名,第二种都可以打印
34
 #打印日志的两种方式第一种可以指定包名,第二种都可以打印
35
-logging.level.com.xhkjedu.mapper=debug
35
+logging.level.com.xhkjedu.sstudy.mapper=debug
36
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
36
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
37
 #分页
37
 #分页
38
 spring.pagehelper.helper-dialect=mysql
38
 spring.pagehelper.helper-dialect=mysql

Loading…
Cancel
Save