Explorar o código

http请求方式修改

wangliang %!s(int64=4) %!d(string=hai) anos
pai
achega
8f8562cdf2
Modificáronse 19 ficheiros con 45 adicións e 37 borrados
  1. 5 0
      pom.xml
  2. 6 6
      themis-backend/src/main/java/com/qmth/themis/backend/api/SysController.java
  3. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBExamInvigilateUserController.java
  4. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBOrgController.java
  5. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBTaskHistoryController.java
  6. 7 7
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java
  7. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamActivityController.java
  8. 3 3
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamController.java
  9. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamCourseController.java
  10. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamPaperController.java
  11. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java
  12. 2 2
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEStudentController.java
  13. 2 2
      themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateController.java
  14. 4 0
      themis-business/pom.xml
  15. 4 3
      themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamDto.java
  16. 1 3
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java
  17. 1 1
      themis-exam/src/main/java/com/qmth/themis/exam/api/SysController.java
  18. 2 2
      themis-exam/src/main/java/com/qmth/themis/exam/api/TEExamController.java
  19. 1 1
      themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

+ 5 - 0
pom.xml

@@ -101,6 +101,11 @@
                 <artifactId>swagger-bootstrap-ui</artifactId>
                 <version>${swagger2-bootstrap.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger-ui</artifactId>
+                <version>${swagger2.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid</artifactId>

+ 6 - 6
themis-backend/src/main/java/com/qmth/themis/backend/api/SysController.java

@@ -65,7 +65,7 @@ public class SysController {
     TBRoleService tbRoleService;
 
     @ApiOperation(value = "菜单查询接口")
-    @RequestMapping(value = "/getMenu", method = RequestMethod.GET)
+    @RequestMapping(value = "/getMenu", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "菜单信息", response = TBPrivilege.class)})
     public Result getMenu() {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
@@ -80,7 +80,7 @@ public class SysController {
     }
 
     @ApiOperation(value = "获取环境接口")
-    @RequestMapping(value = "/env", method = RequestMethod.GET)
+    @RequestMapping(value = "/env", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "环境信息", response = Result.class)})
     public Result env(@ApiParam(value = "机构id", required = true) @RequestParam Long orgId) {
         if (Objects.isNull(orgId) || Objects.equals(orgId, "")) {
@@ -115,7 +115,7 @@ public class SysController {
     }
 
     @ApiOperation(value = "文件下载接口")
-    @RequestMapping(value = "/file/download", method = RequestMethod.GET)
+    @RequestMapping(value = "/file/download", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"url\":string}", response = Result.class)})
     public Result fileDownload(@ApiParam(value = "任务id", required = true) @RequestParam Long id, @ApiParam(value = "下载文件类型", required = true) @RequestParam Integer type) {
         if (Objects.isNull(id) || Objects.equals(id, "")) {
@@ -160,7 +160,7 @@ public class SysController {
     }
 
     @ApiOperation(value = "根据机构代码查询机构信息接口")
-    @RequestMapping(value = "/org/queryByOrgCode", method = RequestMethod.GET)
+    @RequestMapping(value = "/org/queryByOrgCode", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrg.class)})
     public Result queryByOrgCode(@ApiParam(value = "机构code", required = true) @RequestParam String code) {
         if (Objects.isNull(code) || Objects.equals(code, "")) {
@@ -184,7 +184,7 @@ public class SysController {
     }
 
     @ApiOperation(value = "机构查询接口")
-    @RequestMapping(value = "/org/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/org/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrg.class)})
     public Result query(@ApiParam(value = "机构id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "机构编码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "机构名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable) {
         QueryWrapper<TBOrg> tbOrgQueryWrapper = new QueryWrapper<>();
@@ -207,7 +207,7 @@ public class SysController {
     }
 
     @ApiOperation(value = "角色查询接口")
-    @RequestMapping(value = "/role/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/role/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "角色信息", response = TBRole.class)})
     public Result roleList() {
         List<TBRole> tbRoleList = (List<TBRole>) EhcacheUtil.get(SystemConstant.roleCache, SystemConstant.roleCache);

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TBExamInvigilateUserController.java

@@ -61,7 +61,7 @@ public class TBExamInvigilateUserController {
     SystemConfig systemConfig;
 
     @ApiOperation(value = "监考员查询接口")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "监考员信息", response = TBExamInvigilateUserDto.class)})
     public Result query(@ApiParam(value = "考场代码", required = false) @RequestParam(required = false) String roomCode, @ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TBExamInvigilateUserDto> examInvigilateUserQuery = tbExamInvigilateUserService.examInvigilateUserQuery(new Page<>(pageNumber, pageSize), roomCode, userId);

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TBOrgController.java

@@ -52,7 +52,7 @@ public class TBOrgController {
     //    @CachePut(value = "org_cache", key = "'orgCacheQuery'")
 //    @Cacheable(value = "org_cache", key = "#p0")
     @ApiOperation(value = "机构查询分页接口")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrgDto.class)})
     public Result queryByPage(@ApiParam(value = "机构代码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "机构名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TBOrgDto> tborgIPage = tbOrgService.queryByPage(new Page<>(pageNumber, pageSize), code, name, enable);

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TBTaskHistoryController.java

@@ -39,7 +39,7 @@ public class TBTaskHistoryController {
     TBTaskHistoryService tbTaskHistoryService;
 
     @ApiOperation(value = "任务查询接口")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "任务信息", response = TBTaskDto.class)})
     public Result query(@ApiParam(value = "任务id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "业务对象id", required = false) @RequestParam(required = false) Long entityId, @ApiParam(value = "任务类型", required = true) @RequestParam TaskTypeEnum type, @ApiParam(value = "任务状态", required = false) @RequestParam(required = false) TaskStatusEnum status, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         if (Objects.isNull(type) || Objects.equals(type, "")) {

+ 7 - 7
themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -251,7 +251,7 @@ public class TBUserController {
 //    ETEStudentRepo eteStudentRepo;
 
 //    @ApiOperation(value = "es查询接口")
-//    @RequestMapping(value = "/es/list", method = RequestMethod.GET)
+//    @RequestMapping(value = "/es/list", method = RequestMethod.POST)
 //    @Transactional
 //    public Result esList() {
 ////        eteStudentService.createIndex();
@@ -301,7 +301,7 @@ public class TBUserController {
 //    }
 
 //    @ApiOperation(value = "用户查询接口")
-//    @RequestMapping(value = "/list", method = RequestMethod.GET)
+//    @RequestMapping(value = "/list", method = RequestMethod.POST)
 //    @Transactional
 //    public Result list() {
 //        String tableName = "t_e_exam_activity_test1";
@@ -514,7 +514,7 @@ public class TBUserController {
 //    }
 
     @ApiOperation(value = "登出接口")
-    @RequestMapping(value = "/logout", method = RequestMethod.GET)
+    @RequestMapping(value = "/logout", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
     public Result logout() throws NoSuchAlgorithmException {
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
@@ -545,7 +545,7 @@ public class TBUserController {
 
     //    @CachePut(value = "user_cache", key = "'userCacheQuery'")
     @ApiOperation(value = "用户查询接口")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = TBUserDto.class)})
     public Result query(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "登录名", required = false) @RequestParam(required = false) String loginName, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "角色", required = false) @RequestParam(required = false) String role, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TBUserDto> tbUserIPage = tbUserService.userQuery(new Page<>(pageNumber, pageSize), id, loginName, name, role, enable);
@@ -609,7 +609,7 @@ public class TBUserController {
     }
 
     @ApiOperation(value = "获取短信验证码接口")
-    @RequestMapping(value = "/getVerifyCode", method = RequestMethod.GET)
+    @RequestMapping(value = "/getVerifyCode", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"verifyCode\":123456}", response = Result.class)})
     public Result getVerifyCode(@ApiParam(value = "登录名", required = true) @RequestParam String loginName) {
         if (Objects.isNull(loginName) || Objects.equals(loginName, "")) {
@@ -620,7 +620,7 @@ public class TBUserController {
     }
 
     @ApiOperation(value = "获取短信验证码接口")
-    @RequestMapping(value = "/validate/verifyCode", method = RequestMethod.GET)
+    @RequestMapping(value = "/validate/verifyCode", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
     public Result validateVerifyCode(@ApiParam(value = "验证码", required = true) @RequestParam String verifyCode) {
         if (Objects.isNull(verifyCode) || Objects.equals(verifyCode, "")) {
@@ -630,7 +630,7 @@ public class TBUserController {
     }
 
     @ApiOperation(value = "二次验证获取短信验证码接口")
-    @RequestMapping(value = "/validate/getVerifyCode", method = RequestMethod.GET)
+    @RequestMapping(value = "/validate/getVerifyCode", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
     public Result validateGetVerifyCode() {
         return ResultUtil.ok(JacksonUtil.parseJson(SystemConstant.SUCCESS));

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamActivityController.java

@@ -96,7 +96,7 @@ public class TEExamActivityController {
     }
 
     @ApiOperation(value = "考试场次查询接口")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试场次信息", response = TEExamActivity.class)})
     public Result query(@ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long examId, @ApiParam(value = "考试场次编码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "开始日期", required = false) @RequestParam(required = false) String startDate, @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) String finishDate, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TEExamActivity> teExamActivityIPage = teExamActivityService.examActivityQuery(new Page<>(pageNumber, pageSize), examId, code, startDate, finishDate);

+ 3 - 3
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamController.java

@@ -145,7 +145,7 @@ public class TEExamController {
     }
 
     @ApiOperation(value = "考试批次统计接口")
-    @RequestMapping(value = "/count", method = RequestMethod.GET)
+    @RequestMapping(value = "/count", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"count\":1}", response = Result.class)})
     public Result count(@ApiParam(value = "考试批次编码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "考试批次名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "考试批次模式", required = false) @RequestParam(required = false) Integer mode) {
         QueryWrapper<TEExam> teExamQueryWrapper = new QueryWrapper<>();
@@ -165,7 +165,7 @@ public class TEExamController {
     }
 
     @ApiOperation(value = "考试批次查询接口")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试批次信息", response = TEExam.class)})
     public Result query(@ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "考试批次编码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "考试批次名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "考试批次模式", required = false) @RequestParam(required = false) Integer mode, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TEExam> teExamIPage = teExamService.examQuery(new Page<>(pageNumber, pageSize), id, code, name, mode, enable);
@@ -204,7 +204,7 @@ public class TEExamController {
     }
 
     @ApiOperation(value = "考试批次详情接口")
-    @RequestMapping(value = "/detail", method = RequestMethod.GET)
+    @RequestMapping(value = "/detail", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试批次信息", response = TEExam.class)})
     public Result detail(@ApiParam(value = "考试批次id", required = true) @RequestParam Long id) {
         if (Objects.isNull(id) || Objects.equals(id, "")) {

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamCourseController.java

@@ -66,7 +66,7 @@ public class TEExamCourseController {
     }
 
     @ApiOperation(value = "考试科目查询接口")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TEExamCourse.class)})
     public Result query(@ApiParam(value = "考试批次id", required = true) @RequestParam Long examId, @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode, @ApiParam(value = "科目名称", required = false) @RequestParam(required = false) String courseName, @ApiParam(value = "是否已绑定试卷", required = false) @RequestParam(required = false) Integer hasPaper, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamPaperController.java

@@ -81,7 +81,7 @@ public class TEExamPaperController {
     SystemConfig systemConfig;
 
     @ApiOperation(value = "考试试卷查询接口")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TEExamPaper.class)})
     public Result query(@ApiParam(value = "考试批次id", required = true) @RequestParam Long examId, @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java

@@ -75,7 +75,7 @@ public class TEExamStudentController {
     SystemConfig systemConfig;
 
     @ApiOperation(value = "考生查询接口")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEExamStudentDto.class)})
     public Result query(@ApiParam(value = "考试批次id", required = true) @RequestParam Long examId, @ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long activityId, @ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "考场代码", required = false) @RequestParam(required = false) String roomCode, @ApiParam(value = "科目代码", required = false) @RequestParam(required = false) String courseCode, @ApiParam(value = "年级", required = false) @RequestParam String grade, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {

+ 2 - 2
themis-backend/src/main/java/com/qmth/themis/backend/api/TEStudentController.java

@@ -42,7 +42,7 @@ public class TEStudentController {
     TEStudentService teStudentService;
 
     @ApiOperation(value = "学生查询接口")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEStudentDto.class)})
     public Result query(@ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TEStudentDto> teExamStudentIPage = teStudentService.studentQuery(new Page<>(pageNumber, pageSize), identity, name, enable);
@@ -106,7 +106,7 @@ public class TEStudentController {
     }
 
     @ApiOperation(value = "学生考试记录查询接口")
-    @RequestMapping(value = "/studentExamRecordQuery", method = RequestMethod.GET)
+    @RequestMapping(value = "/studentExamRecordQuery", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEStudentExamRecordDto.class)})
     public Result studentExamRecordQuery(@ApiParam(value = "学生id", required = true) @RequestParam Long id, @ApiParam(value = "批次名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         if (Objects.isNull(id) || Objects.equals(id, "")) {

+ 2 - 2
themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateController.java

@@ -45,14 +45,14 @@ public class TIeInvigilateController {
     MqDtoService mqDtoService;
 
     @ApiOperation(value = "实时监控台列表接口")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list() {
         log.info("invigilate list is come in");
         return ResultUtil.ok(SystemConstant.SUCCESS);
     }
 
     @ApiOperation(value = "实时监控台视频列表接口")
-    @RequestMapping(value = "/list/video", method = RequestMethod.GET)
+    @RequestMapping(value = "/list/video", method = RequestMethod.POST)
     public Result listVideo() {
         log.info("invigilate listVideo is come in");
         return ResultUtil.ok(SystemConstant.SUCCESS);

+ 4 - 0
themis-business/pom.xml

@@ -80,6 +80,10 @@
 			<groupId>com.github.xiaoymin</groupId>
 			<artifactId>swagger-bootstrap-ui</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>

+ 4 - 3
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamDto.java

@@ -1,6 +1,7 @@
 package com.qmth.themis.business.dto.response;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,13 +21,13 @@ public class TEExamDto implements Serializable {
     private Integer preNoticeStaySeconds;//考试须知阅读时长(秒)
     private String postNotice;//考后说明,针对一个场次进行设置
     private Integer reallyTime;
-    private Map<String,Object> activities;
+    private List<TEExamActivityDto> activities;
 
-    public Map<String, Object> getActivities() {
+    public List<TEExamActivityDto> getActivities() {
         return activities;
     }
 
-    public void setActivities(Map<String, Object> activities) {
+    public void setActivities(List<TEExamActivityDto> activities) {
         this.activities = activities;
     }
 

+ 1 - 3
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java

@@ -126,9 +126,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
         if (Objects.nonNull(list) && list.size() > 0) {
             list.forEach(s -> {
                 List<TEExamActivityDto> teExamActivityList = teExamActivityService.getWaitingExam(studentId, s.getId(), s.getExamActivityId());
-                Map<String, Object> map = new HashMap();
-                map.put("activities", teExamActivityList);
-                s.setActivities(map);
+                s.setActivities(teExamActivityList);
             });
         }
         return list;

+ 1 - 1
themis-exam/src/main/java/com/qmth/themis/exam/api/SysController.java

@@ -24,7 +24,7 @@ public class SysController {
     private TBOrgService orgService;
 
     @ApiOperation(value = "获取环境接口")
-    @RequestMapping(value = "/env", method = RequestMethod.GET)
+    @RequestMapping(value = "/env", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "环境信息", response = Result.class)})
     public Result env(@ApiParam(value = "机构id", required = false) @RequestParam(required = false) Long orgId) {
         EnvBean env = new EnvBean();

+ 2 - 2
themis-exam/src/main/java/com/qmth/themis/exam/api/TEExamController.java

@@ -54,7 +54,7 @@ public class TEExamController {
     MqDtoService mqDtoService;
 
     @ApiOperation(value = "验证考试口令接口")
-    @RequestMapping(value = "/shortCode", method = RequestMethod.GET)
+    @RequestMapping(value = "/shortCode", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试信息", response = TEExam.class)})
     public Result shortCode(@ApiParam(value = "考试口令", required = true) @RequestParam String shortCode) {
         if (Objects.isNull(shortCode) || Objects.equals(shortCode, "")) {
@@ -73,7 +73,7 @@ public class TEExamController {
     }
 
     @ApiOperation(value = "获取待考列表接口")
-    @RequestMapping(value = "/waiting", method = RequestMethod.GET)
+    @RequestMapping(value = "/waiting", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试信息", response = TEExamResultDto.class)})
     public Result waiting() {
         TEStudentCacheDto teStudent = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();

+ 1 - 1
themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -236,7 +236,7 @@ public class TEStudentController {
     }
 
     @ApiOperation(value = "登出接口")
-    @RequestMapping(value = "/logout", method = RequestMethod.GET)
+    @RequestMapping(value = "/logout", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
     public Result logout() throws NoSuchAlgorithmException {
         TEStudentCacheDto teStudent = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();