新增entity

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/TAExamCourseCollegeTeacherController.java

@@ -71,35 +71,43 @@ public class TAExamCourseCollegeTeacherController {
     }
 
     @ApiOperation(value = "我的课堂考试分析-图表接口")
-    @RequestMapping(value = "/teacher/view", method = RequestMethod.POST)
+    @RequestMapping(value = "/view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = SurveyTeacherViewResult.class)})
     public Result teacherView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
                               @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                               @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                               @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                              @ApiParam(value = "考查学院id", required = true) @RequestParam String inspectCollegeId) {
+                              @ApiParam(value = "考查学院id", required = false) @RequestParam(required = false) String inspectCollegeId) {
         return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(inspectCollegeId) ? SystemConstant.convertIdToLong(inspectCollegeId) : null));
     }
 
     @ApiOperation(value = "我的课堂考试分析-试题难度得分情况分析接口")
-    @RequestMapping(value = "/teacher/question_view", method = RequestMethod.POST)
+    @RequestMapping(value = "/question_view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = SurveyTeacherViewResult.class)})
     public Result teacherQuestionView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                       @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                       @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                       @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                                      @ApiParam(value = "学院id", required = true) @RequestParam String collegeId) {
-        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : null));
+                                      @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String collegeId) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        if (Objects.isNull(sysUser)) {
+            throw ExceptionResultEnum.NOT_LOGIN.exception();
+        }
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId()));
     }
 
     @ApiOperation(value = "我的课堂考试分析-各难度水平题目上的作答分析接口")
-    @RequestMapping(value = "/teacher/question_answer_view", method = RequestMethod.POST)
+    @RequestMapping(value = "/question_answer_view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = SurveyTeacherViewResult.class)})
     public Result teacherQuestionAnswerView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                             @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                             @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                                            @ApiParam(value = "学院id", required = true) @RequestParam String collegeId) {
-        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : null));
+                                            @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String collegeId) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        if (Objects.isNull(sysUser)) {
+            throw ExceptionResultEnum.NOT_LOGIN.exception();
+        }
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId()));
     }
 }

teachcloud-report/src/main/resources/application-dev.properties

@@ -10,19 +10,20 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=teachcloud-report
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-#db.host=192.168.10.136
-db.host=localhost
+db.host=192.168.10.136
+#db.host=localhost
 db.port=3306
-db.name=teachcloud-report
+db.name=teachcloud-report-617
+#db.name=teachcloud-report
 db.username=root
-#db.password=Qmth87863577!
-db.password=123456789
+db.password=Qmth87863577!
+#db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
 com.qmth.redis.port=6379
 com.qmth.redis.db=1
-#com.qmth.redis.password=123456
+com.qmth.redis.password=123456
 
 #mysql\u914D\u7F6E
 com.qmth.mysql.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8