美术阅卷10月新增需求-除去document

stmms-ms-commons/pom.xml

@@ -46,25 +46,25 @@
             <artifactId>fastjson</artifactId>
             <version>1.1.30</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>
+        <!--<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-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/MarkLog.java

@@ -2,7 +2,7 @@ package cn.com.qmth.stmms.ms.core.domain;
 
 import cn.com.qmth.stmms.ms.core.domain.user.Role;
 import cn.com.qmth.stmms.ms.core.vo.Subject;
-import io.swagger.annotations.ApiModelProperty;
+//import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -28,42 +28,42 @@ public class MarkLog implements Serializable {
 
     private Long id;
     @NotNull
-    @ApiModelProperty(value = "操作人id", example = "1")
+//    @ApiModelProperty(value = "操作人id", example = "1")
     private Long createUserId;
     @NotNull
-    @ApiModelProperty(value = "操作人")
+//    @ApiModelProperty(value = "操作人")
     private String createUserName;
     @NotNull
-    @ApiModelProperty(value = "角色")
+//    @ApiModelProperty(value = "角色")
     private String createRole;
-    @ApiModelProperty(value = "科目")
+//    @ApiModelProperty(value = "科目")
     private String subject;
     @NotNull
-    @ApiModelProperty(value = "准考证号")
+//    @ApiModelProperty(value = "准考证号")
     private String examNumber;
     @NotNull
-    @ApiModelProperty(value = "学生姓名")
+//    @ApiModelProperty(value = "学生姓名")
     private String studentName;
     @NotNull
-    @ApiModelProperty(value = "操作类型，1：分档，2：打分，3：回评档位，4：回评分数，5：档位打回，6：档位打回回评，7：一键定档，8：标准卷设置", example = "2")
+//    @ApiModelProperty(value = "操作类型，1：分档，2：打分，3：回评档位，4：回评分数，5：档位打回，6：档位打回回评，7：一键定档，8：标准卷设置", example = "2")
     private Integer operType;
-    @ApiModelProperty(value = "操作前数据")
+//    @ApiModelProperty(value = "操作前数据")
     private String operDataBefore;
-    @ApiModelProperty(value = "操作后数据")
+//    @ApiModelProperty(value = "操作后数据")
     private String operDataAfter;
     @Temporal(value = TemporalType.DATE)
     @NotNull
-    @ApiModelProperty(value = "操作时间")
+//    @ApiModelProperty(value = "操作时间")
     private Date createTime;
     @NotNull
     private Long workId;
     @NotNull
     private Long paperId;
-    @ApiModelProperty(value = "备注")
+//    @ApiModelProperty(value = "备注")
     private String remark;
     @NotNull
     @Enumerated(value = EnumType.ORDINAL)
-    @ApiModelProperty(value = "阶段", example = "3")
+//    @ApiModelProperty(value = "阶段", example = "3")
     private MarkStage stage;
 
     public MarkLog() {

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

@@ -1,17 +1,17 @@
 package cn.com.qmth.stmms.ms.log.config;
 
-import com.google.common.base.Predicates;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ParameterBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.schema.ModelRef;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Parameter;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+//import com.google.common.base.Predicates;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import springfox.documentation.builders.ParameterBuilder;
+//import springfox.documentation.builders.PathSelectors;
+//import springfox.documentation.builders.RequestHandlerSelectors;
+//import springfox.documentation.schema.ModelRef;
+//import springfox.documentation.service.ApiInfo;
+//import springfox.documentation.service.Parameter;
+//import springfox.documentation.spi.DocumentationType;
+//import springfox.documentation.spring.web.plugins.Docket;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,44 +23,44 @@ import java.util.List;
  * @Author: wangliang
  * @Date: 2019/9/21
  */
-@Configuration
-@EnableSwagger2
+//@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.log"))
-//                .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;
-    }
+//    @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.log"))
+////                .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-log/src/main/java/cn/com/qmth/stmms/ms/log/controller/MarkLogController.java

@@ -3,9 +3,9 @@ package cn.com.qmth.stmms.ms.log.controller;
 import cn.com.qmth.stmms.ms.commons.utils.specification.PagingAndSortingDTO;
 import cn.com.qmth.stmms.ms.core.domain.MarkLog;
 import cn.com.qmth.stmms.ms.core.repository.MarkLogRepo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-@Api(tags = "纪检审计接口controller")
+//@Api(tags = "纪检审计接口controller")
 @RestController
 @RequestMapping("api/marklog")
 public class MarkLogController {
@@ -30,14 +30,21 @@ public class MarkLogController {
     @Autowired
     MarkLogRepo markLogRepo;
 
-    @ApiOperation(value = "纪检审计查询接口")
+//    @ApiOperation(value = "纪检审计查询接口")
     @GetMapping("/selectMarkLog")
-    public PagingAndSortingDTO selectMarkLog(@ApiParam(value = "科目", required = false) @RequestParam(required = false) String subject,
-                                             @ApiParam(value = "准考证号", required = false) @RequestParam(required = false) Long examNumber,
-                                             @ApiParam(value = "学生姓名", required = false) @RequestParam(required = false) String studentName,
-                                             @ApiParam(value = "操作类型(1：分档，2：打分，3：回评档位，4：回评分数，5：档位打回，6：档位打回回评，7：一键定档，8：标准卷设置)", required = false) @RequestParam(required = false) Integer operType,
-                                             @ApiParam(value = "开始时间", required = false) @RequestParam(required = false) String startTime,
-                                             @ApiParam(value = "结束时间", required = false) @RequestParam(required = false) String endTime,
+    public PagingAndSortingDTO selectMarkLog(
+//            @ApiParam(value = "科目", required = false)
+                                                 @RequestParam(required = false) String subject,
+//                                             @ApiParam(value = "准考证号", required = false)
+                                             @RequestParam(required = false) Long examNumber,
+//                                             @ApiParam(value = "学生姓名", required = false)
+            @RequestParam(required = false) String studentName,
+//                                             @ApiParam(value = "操作类型(1：分档，2：打分，3：回评档位，4：回评分数，5：档位打回，6：档位打回回评，7：一键定档，8：标准卷设置)", required = false)
+            @RequestParam(required = false) Integer operType,
+//                                             @ApiParam(value = "开始时间", required = false)
+            @RequestParam(required = false) String startTime,
+//                                             @ApiParam(value = "结束时间", required = false)
+            @RequestParam(required = false) String endTime,
                                              @RequestParam Integer curPage,
                                              @RequestParam Integer pageSize) {
         Pageable pageable = new PageRequest(curPage, pageSize, Sort.Direction.DESC, "createTime");