美术阅卷10月新增需求-新增试评检查状态功能

stmms-ms-admin/pom.xml

@@ -35,6 +35,26 @@
             <version>2.6</version>
         </dependency>
 
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger2</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.springfox</groupId>-->
+            <!--<artifactId>springfox-swagger-ui</artifactId>-->
+            <!--<version>2.9.2</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.swagger</groupId>-->
+            <!--<artifactId>swagger-annotations</artifactId>-->
+            <!--<version>1.5.21</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>io.swagger</groupId>-->
+            <!--<artifactId>swagger-models</artifactId>-->
+            <!--<version>1.5.21</version>-->
+        <!--</dependency>-->
     </dependencies>
 
 </project>

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/TrialController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Author: wangliang
  * @Date: 2019/11/4
  */
+//@Api(tags = "试评任务接口controller")
 @RestController
 @RequestMapping("api/trial")
 public class TrialController {
@@ -29,8 +30,13 @@ public class TrialController {
      * @param subject
      * @throws Exception
      */
+//    @ApiOperation(value = "开始试评任务接口")
     @RequestMapping(value = "startTrial", method = RequestMethod.GET)
-    public void startTrial(@RequestParam Long workId, @RequestParam Subject subject) throws Exception {
+    public void startTrial(
+//            @ApiParam(value = "workId", required = true)
+            @RequestParam Long workId,
+//            @ApiParam(value = "科目", required = true)
+            @RequestParam Subject subject) throws Exception {
         trialService.startTrial(workId, subject);
     }
 
@@ -41,8 +47,13 @@ public class TrialController {
      * @param subject
      * @throws Exception
      */
+//    @ApiOperation(value = "结束试评任务接口")
     @RequestMapping(value = "finishTrial", method = RequestMethod.GET)
-    public void finishTrial(@RequestParam Long workId, @RequestParam Subject subject) throws Exception {
+    public void finishTrial(
+//            @ApiParam(value = "workId", required = true)
+            @RequestParam Long workId,
+//            @ApiParam(value = "科目", required = true)
+            @RequestParam Subject subject) throws Exception {
         trialService.finishTrial(workId, subject);
     }
 
@@ -53,8 +64,13 @@ public class TrialController {
      * @param subject
      * @throws Exception
      */
+//    @ApiOperation(value = "检查试评任务接口")
     @RequestMapping(value = "checkMissionStatus", method = RequestMethod.GET)
-    public void checkMissionStatus(@RequestParam Long workId, @RequestParam Subject subject) throws Exception {
+    public void checkMissionStatus(
+//            @ApiParam(value = "workId", required = true)
+            @RequestParam Long workId,
+//            @ApiParam(value = "科目", required = true)
+            @RequestParam Subject subject) throws Exception {
         trialService.checkMissionStatus(workId, subject);
     }
 }

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/config/SwaggerConfig.java

@@ -0,0 +1,50 @@
+package cn.com.qmth.stmms.ms.admin.config;
+
+/**
+ * @Description: swagger配置类
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2019/9/21
+ */
+//@Configuration
+//@EnableSwagger2
+public class SwaggerConfig {
+
+//    @Bean
+//    public Docket createRestApi() {
+////        ParameterBuilder tokenPar1 = new ParameterBuilder();
+//        ParameterBuilder tokenPar2 = new ParameterBuilder();
+//        List<Parameter> pars = new ArrayList<>();
+////        tokenPar1.name("key").description("key").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
+//        tokenPar2.name("token").description("token").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
+////        pars.add(tokenPar1.build());
+//        pars.add(tokenPar2.build());
+//
+//        return new Docket(DocumentationType.SWAGGER_2)
+//                .groupName("美术阅卷")
+//                .select()
+//                .apis(RequestHandlerSelectors.basePackage("cn.com.qmth.stmms.ms.admin"))
+////                .apis(RequestHandlerSelectors.any())
+//                .paths(PathSelectors.any())
+//                // 不显示错误的接口地址
+//                .paths(Predicates.not(PathSelectors.regex("/error.*")))// 错误路径不监控
+//                .build()
+//                .globalOperationParameters(pars)
+//                .apiInfo(apiInfo());
+//    }
+//
+//    private ApiInfo apiInfo() {
+//        ApiInfo apiInfo = new ApiInfo(
+//                "美术阅卷 - api",
+//                "Some custom description of API.",
+//                "API TOS",
+//                "Terms of service",
+//                "myeaddress@company.com",
+//                "License of API",
+//                "API license URL");
+//        return apiInfo;
+//    }
+}
+ 
+

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/importer/StudentImporter.java

@@ -17,6 +17,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+//@Api(tags = "学生导入接口controller")
 @RestController
 @RequestMapping("import/students")
 public class StudentImporter {
@@ -40,8 +41,15 @@ public class StudentImporter {
      * @return
      * @throws Exception
      */
+//    @ApiOperation(value = "试评学生导入接口")
     @RequestMapping(value = "batchAllForTrial", method = RequestMethod.POST)
-    public List<ExcelError> batchAllForTrial(@RequestParam Long workId, @RequestParam Subject subject, @RequestParam MultipartFile file)
+    public List<ExcelError> batchAllForTrial(
+//            @ApiParam(value = "workId", required = true)
+            @RequestParam Long workId,
+//            @ApiParam(value = "科目", required = true)
+            @RequestParam Subject subject,
+//            @ApiParam(value = "excel文件", required = true)
+            @RequestParam MultipartFile file)
             throws Exception {
         return dataUploadService.uploadStudentsForTrial(workId, subject, file.getInputStream());
     }

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/ExamQuestion.java

@@ -36,7 +36,7 @@ public class ExamQuestion implements Serializable{
 
     @Basic
     @Column(name = "is_test")
-    private int test; //是否试评，0:不是，1:数据已导入，2:试评中
+    private int test; //是否试评，1:数据已导入，2:试评中
 
     public int getTest() {
         return test;

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/MarkSubject.java

@@ -39,7 +39,7 @@ public class MarkSubject implements Serializable {
 
     @Basic
     @Column(name = "is_test")
-    private int test; //是否试评，0:不是，1:数据已导入，2:试评中，3:正式任务
+    private int test; //是否试评，1:数据已导入，2:试评中，3:正式任务
 
     public static long getSerialVersionUID() {
         return serialVersionUID;

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/Paper.java

@@ -124,7 +124,7 @@ public class Paper implements Serializable {
 
     @Basic
     @Column(name = "is_test")
-    private int test; //是否试评，0:不是，1:数据已导入，2:试评中
+    private int test; //是否试评，1:数据已导入，2:试评中
 
     @Basic
     @Column(name = "is_active")

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/Student.java

@@ -46,7 +46,7 @@ public class Student implements Serializable {
 
     @Basic
     @Column(name = "is_test")
-    private String test; //是否试评，0:不是，1:数据已导入，2:试评中
+    private String test; //是否试评，1:数据已导入，2:试评中
 
     public static long getSerialVersionUID() {
         return serialVersionUID;

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/enums/TrialEnum.java

@@ -26,7 +26,7 @@ public enum TrialEnum {
     /**
      * 正式任务
      */
-    START_FORMAL(3, "正式任务"),;
+    START_FORMAL(3, "正式任务");
 
     private int id;
 

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/task/MarkTask.java

@@ -78,7 +78,7 @@ public class MarkTask implements Serializable {
 
     @Basic
     @Column(name = "is_test")
-    private int test; //是否试评，0:不是，1:数据已导入，2:试评中
+    private int test; //是否试评，1:数据已导入，2:试评中
 
     @Basic
     @Column(name = "is_active")