From ad02c4ad5046a56be15eb6980435ab1ac96aded4 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 21 Aug 2020 14:00:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=B1=95=E7=A4=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 ++ .../tms/api/EvaluationRulesControllerApi.java | 6 - .../msdw/tms/api/QuestionsControllerApi.java | 10 +- .../msdw/tms/common/utils/FilesResult.java | 36 +--- .../msdw/tms/config/MybatisPlusConfig.java | 18 ++ .../controller/EvaluationRulesController.java | 9 +- .../tms/controller/QuestionsController.java | 20 +- .../tms/entity/EvaluationRulesEntity.java | 5 +- .../com/msdw/tms/entity/QuestionsEntity.java | 4 +- .../msdw/tms/entity/XlsxTemplateEntity.java | 5 +- .../entity/request/QuestionsAddRequest.java | 18 +- .../request/QuestionsImportRequest.java | 2 - .../entity/request/QuestionsQueryRequest.java | 4 +- .../request/QuestionsUpdateRequest.java | 18 +- .../msdw/tms/entity/response/CommonCode.java | 10 +- .../msdw/tms/entity/response/Response.java | 4 +- .../tms/entity/response/ResponseResult.java | 6 - .../msdw/tms/entity/vo/EvaluationRulesVO.java | 4 - .../com/msdw/tms/entity/vo/EvaluationVO.java | 2 - .../msdw/tms/entity/vo/QuestionsDetailVO.java | 3 - .../com/msdw/tms/entity/vo/QuestionsVO.java | 2 - .../msdw/tms/service/AliyunOssService.java | 3 - .../tms/service/EvaluationRulesService.java | 2 - .../msdw/tms/service/XlsxTemplateService.java | 2 - .../service/impl/AliyunOssServiceImpl.java | 12 +- .../impl/EvaluationRulesServiceImpl.java | 24 +-- .../service/impl/QuestionsServiceImpl.java | 177 ++++++++---------- .../com/msdw/tms/TmsApplicationTests.java | 56 ++++-- .../tms/service/AliyunOssServiceTest.java | 62 ++++++ .../service/EvaluationRulesServiceTest.java | 33 ++++ .../tms/service/QuestionsServiceTest.java | 122 ++++++++++++ 31 files changed, 426 insertions(+), 265 deletions(-) create mode 100644 src/main/java/com/msdw/tms/config/MybatisPlusConfig.java create mode 100644 src/test/java/com/msdw/tms/service/AliyunOssServiceTest.java create mode 100644 src/test/java/com/msdw/tms/service/EvaluationRulesServiceTest.java create mode 100644 src/test/java/com/msdw/tms/service/QuestionsServiceTest.java diff --git a/pom.xml b/pom.xml index 26abadc..a3e1a73 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,18 @@ + + commons-io + commons-io + 2.6 + test + + + commons-fileupload + commons-fileupload + 1.4 + test + diff --git a/src/main/java/com/msdw/tms/api/EvaluationRulesControllerApi.java b/src/main/java/com/msdw/tms/api/EvaluationRulesControllerApi.java index ebafe18..dda9144 100644 --- a/src/main/java/com/msdw/tms/api/EvaluationRulesControllerApi.java +++ b/src/main/java/com/msdw/tms/api/EvaluationRulesControllerApi.java @@ -4,18 +4,12 @@ import com.msdw.tms.common.utils.R; import com.msdw.tms.entity.EvaluationRulesEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.Map; /** * 测评规则信息记录，只记录一条信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @Api(value = "测评规则管理", tags = "测评规则的查询和修改") public interface EvaluationRulesControllerApi { diff --git a/src/main/java/com/msdw/tms/api/QuestionsControllerApi.java b/src/main/java/com/msdw/tms/api/QuestionsControllerApi.java index ce25d72..bf4d9e7 100644 --- a/src/main/java/com/msdw/tms/api/QuestionsControllerApi.java +++ b/src/main/java/com/msdw/tms/api/QuestionsControllerApi.java @@ -7,7 +7,6 @@ import com.msdw.tms.entity.request.QuestionsUpdateRequest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -18,8 +17,6 @@ import java.io.IOException; * 记录试题信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @Api(value = "试题信息管理", tags = "提供试题信息的增删改查及导入等功能") public interface QuestionsControllerApi { @@ -54,7 +51,7 @@ public interface QuestionsControllerApi { * 是否禁用试题 */ @ApiOperation(value = "是否禁用试题", notes = "是否禁用试题") - R isnable(@ApiParam(name = "id", value = "试题主键", required = true) Integer id); + R isNable(@ApiParam(name = "id", value = "试题主键", required = true) Integer id); /** * 删除 @@ -70,17 +67,12 @@ public interface QuestionsControllerApi { /** * excel模板文件上传 - * - * @param file - * @return */ @ApiOperation(value = "excel模板文件上传", notes = "excel模板文件上传") R uploadFiles(@ApiParam(name = "file", value = "excel文件", required = true) MultipartFile file) throws IOException; /** * excel模板文件下载 - * - * @return */ @ApiOperation(value = "excel模板文件下载", notes = "excel模板文件下载") R downloadFiles(HttpServletResponse response) throws IOException; diff --git a/src/main/java/com/msdw/tms/common/utils/FilesResult.java b/src/main/java/com/msdw/tms/common/utils/FilesResult.java index 103ac4b..aa36a77 100644 --- a/src/main/java/com/msdw/tms/common/utils/FilesResult.java +++ b/src/main/java/com/msdw/tms/common/utils/FilesResult.java @@ -1,41 +1,15 @@ package com.msdw.tms.common.utils; -public class FilesResult { +import lombok.Data; +import lombok.ToString; +@Data +@ToString +public class FilesResult { // 文件名 private String fileName; // 文件在储存空间的路径 private String fileUrl; // 上传状态 private String status; - - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } - - public String getFileUrl() { - return fileUrl; - } - - public void setFileUrl(String fileUrl) { - this.fileUrl = fileUrl; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - @Override - public String toString() { - return "UploadFilesResult [fileName=" + fileName + ", fileUrl=" + fileUrl + ", status=" + status + "]"; - } - } diff --git a/src/main/java/com/msdw/tms/config/MybatisPlusConfig.java b/src/main/java/com/msdw/tms/config/MybatisPlusConfig.java new file mode 100644 index 0000000..e206ea3 --- /dev/null +++ b/src/main/java/com/msdw/tms/config/MybatisPlusConfig.java @@ -0,0 +1,18 @@ +package com.msdw.tms.config; + +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MybatisPlusConfig { + /** + * mybatis-plus分页插件 + */ + @Bean + public PaginationInterceptor paginationInterceptor() { + PaginationInterceptor page = new PaginationInterceptor(); + page.setDialectType("mysql"); + return page; + } +} \ No newline at end of file diff --git a/src/main/java/com/msdw/tms/controller/EvaluationRulesController.java b/src/main/java/com/msdw/tms/controller/EvaluationRulesController.java index 0efa731..99f70bd 100644 --- a/src/main/java/com/msdw/tms/controller/EvaluationRulesController.java +++ b/src/main/java/com/msdw/tms/controller/EvaluationRulesController.java @@ -5,22 +5,21 @@ import com.msdw.tms.common.utils.R; import com.msdw.tms.entity.EvaluationRulesEntity; import com.msdw.tms.entity.vo.EvaluationRulesVO; import com.msdw.tms.service.EvaluationRulesService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; + /** * 测评规则信息记录，只记录一条信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @RestController @RequestMapping("tms/evaluationrules") public class EvaluationRulesController implements EvaluationRulesControllerApi { - @Autowired - private EvaluationRulesService evaluationRulesService; + @Resource + EvaluationRulesService evaluationRulesService; /** * 测评规则信息的展示 diff --git a/src/main/java/com/msdw/tms/controller/QuestionsController.java b/src/main/java/com/msdw/tms/controller/QuestionsController.java index bce1ca3..036b0de 100644 --- a/src/main/java/com/msdw/tms/controller/QuestionsController.java +++ b/src/main/java/com/msdw/tms/controller/QuestionsController.java @@ -9,12 +9,12 @@ import com.msdw.tms.entity.request.QuestionsQueryRequest; import com.msdw.tms.entity.request.QuestionsUpdateRequest; import com.msdw.tms.entity.vo.EvaluationVO; import com.msdw.tms.entity.vo.QuestionsDetailVO; -import com.msdw.tms.service.AliyunOssService; import com.msdw.tms.service.QuestionsService; -import org.springframework.beans.factory.annotation.Autowired; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; @@ -24,17 +24,13 @@ import java.util.Arrays; * 记录试题信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @RestController @RequestMapping("tms/questions") public class QuestionsController implements QuestionsControllerApi { - @Autowired - private QuestionsService questionsService; - @Autowired - private AliyunOssService ossService; + @Resource + QuestionsService questionsService; /** * 列表 @@ -66,6 +62,7 @@ public class QuestionsController implements QuestionsControllerApi { /** * 保存 */ + @ApiOperation(value = "新增一道试题", notes = "传入新增试题所需相关参数") @Override @PostMapping("/save") //@RequiresPermissions("qms:questions:save") @@ -93,7 +90,7 @@ public class QuestionsController implements QuestionsControllerApi { @Override @PutMapping("/isnable") //@RequiresPermissions("qms:questions:isnable") - public R isnable(Integer id) { + public R isNable(Integer id) { boolean b = questionsService.isnable(id); return b ? R.ok() : R.error(); @@ -125,9 +122,6 @@ public class QuestionsController implements QuestionsControllerApi { /** * excel模板文件上传 - * - * @param file - * @return */ @Override @PostMapping("/upload") @@ -139,8 +133,6 @@ public class QuestionsController implements QuestionsControllerApi { /** * excel模板文件下载 - * - * @return */ @Override @GetMapping("/download") diff --git a/src/main/java/com/msdw/tms/entity/EvaluationRulesEntity.java b/src/main/java/com/msdw/tms/entity/EvaluationRulesEntity.java index 88f776e..9f25968 100644 --- a/src/main/java/com/msdw/tms/entity/EvaluationRulesEntity.java +++ b/src/main/java/com/msdw/tms/entity/EvaluationRulesEntity.java @@ -2,17 +2,14 @@ package com.msdw.tms.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; -import java.util.Date; -import lombok.Data; /** * 测评规则信息记录，只记录一条信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @Data @TableName("tms_evaluation_rules") diff --git a/src/main/java/com/msdw/tms/entity/QuestionsEntity.java b/src/main/java/com/msdw/tms/entity/QuestionsEntity.java index f6ea702..fd56112 100644 --- a/src/main/java/com/msdw/tms/entity/QuestionsEntity.java +++ b/src/main/java/com/msdw/tms/entity/QuestionsEntity.java @@ -2,17 +2,15 @@ package com.msdw.tms.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; /** * 记录试题信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @Data @TableName("tms_questions") diff --git a/src/main/java/com/msdw/tms/entity/XlsxTemplateEntity.java b/src/main/java/com/msdw/tms/entity/XlsxTemplateEntity.java index cb3757a..163a0de 100644 --- a/src/main/java/com/msdw/tms/entity/XlsxTemplateEntity.java +++ b/src/main/java/com/msdw/tms/entity/XlsxTemplateEntity.java @@ -2,17 +2,14 @@ package com.msdw.tms.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; -import java.util.Date; -import lombok.Data; /** * 模板文件信息记录 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @Data @TableName("tms_xlsx_template") diff --git a/src/main/java/com/msdw/tms/entity/request/QuestionsAddRequest.java b/src/main/java/com/msdw/tms/entity/request/QuestionsAddRequest.java index 5d3da9e..8c52299 100644 --- a/src/main/java/com/msdw/tms/entity/request/QuestionsAddRequest.java +++ b/src/main/java/com/msdw/tms/entity/request/QuestionsAddRequest.java @@ -8,8 +8,6 @@ import lombok.Data; * 试题的基本信息表 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-14 16:05:06 */ @Data @ApiModel(value = "QuestionsAddRequest", description = "添加试题请求体对象") @@ -27,32 +25,32 @@ public class QuestionsAddRequest { /** * A选项内容 */ - @ApiModelProperty(value = "A选项内容", name = "optionA", example = "鲸鱼", required = false) + @ApiModelProperty(value = "A选项内容", name = "optionA", example = "鲸鱼") private String optionA; /** * B选项内容 */ - @ApiModelProperty(value = "B选项内容", name = "optionB", example = "鲨鱼", required = false) + @ApiModelProperty(value = "B选项内容", name = "optionB", example = "鲨鱼") private String optionB; /** * C选项内容 */ - @ApiModelProperty(value = "C选项内容", name = "optionC", example = "河马", required = false) + @ApiModelProperty(value = "C选项内容", name = "optionC", example = "河马") private String optionC; /** * D选项内容 */ - @ApiModelProperty(value = "D选项内容", name = "optionD", example = "豹子", required = false) + @ApiModelProperty(value = "D选项内容", name = "optionD", example = "豹子") private String optionD; /** * E选项内容 */ - @ApiModelProperty(value = "E选项内容", name = "optionE", example = "大象", required = false) + @ApiModelProperty(value = "E选项内容", name = "optionE", example = "大象") private String optionE; /** * F选项内容 */ - @ApiModelProperty(value = "F选项内容", name = "optionF", example = "老虎", required = false) + @ApiModelProperty(value = "F选项内容", name = "optionF", example = "老虎") private String optionF; /** * 正确答案 @@ -62,11 +60,11 @@ public class QuestionsAddRequest { /** * 答案解析 */ - @ApiModelProperty(value = "答案解析", name = "answerAnalysis", example = "鲸鱼是最大的哺乳动物", required = false) + @ApiModelProperty(value = "答案解析", name = "answerAnalysis", example = "鲸鱼是最大的哺乳动物") private String answerAnalysis; /** * 试题科目 */ - @ApiModelProperty(value = "试题科目", name = "subjects", example = "基础通识", required = false) + @ApiModelProperty(value = "试题科目", name = "subjects", example = "基础通识") private String subjects; } diff --git a/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java b/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java index 6ae49e1..77c6cf4 100644 --- a/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java +++ b/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java @@ -7,8 +7,6 @@ import lombok.Data; * 试题的基本信息表 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-14 16:05:06 */ @Data public class QuestionsImportRequest { diff --git a/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java b/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java index 635285d..62f98bd 100644 --- a/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java +++ b/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java @@ -8,8 +8,6 @@ import lombok.Data; * 试题的基本信息表 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-14 16:05:06 */ @Data @ApiModel(value = "QuestionsQueryRequest", description = "条件查询请求对象") @@ -18,7 +16,7 @@ public class QuestionsQueryRequest { /** * 题干，问题描述 */ - @ApiModelProperty(value = "题干，问题描述", name = "questionStem", example = "世界上最大的哺乳动物是什么？", required = false) + @ApiModelProperty(value = "题干，问题描述", name = "questionStem", example = "世界上最大的哺乳动物是什么？") private String questionStem; // /** diff --git a/src/main/java/com/msdw/tms/entity/request/QuestionsUpdateRequest.java b/src/main/java/com/msdw/tms/entity/request/QuestionsUpdateRequest.java index defadbb..494a20c 100644 --- a/src/main/java/com/msdw/tms/entity/request/QuestionsUpdateRequest.java +++ b/src/main/java/com/msdw/tms/entity/request/QuestionsUpdateRequest.java @@ -8,8 +8,6 @@ import lombok.Data; * 试题的基本信息表 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-14 16:05:06 */ @Data @ApiModel(value = "QuestionsUpdateRequest", description = "修改试题请求体对象") @@ -32,32 +30,32 @@ public class QuestionsUpdateRequest { /** * A选项内容 */ - @ApiModelProperty(value = "A选项内容", name = "optionA", example = "鲸鱼", required = false) + @ApiModelProperty(value = "A选项内容", name = "optionA", example = "鲸鱼") private String optionA; /** * B选项内容 */ - @ApiModelProperty(value = "B选项内容", name = "optionB", example = "鲨鱼", required = false) + @ApiModelProperty(value = "B选项内容", name = "optionB", example = "鲨鱼") private String optionB; /** * C选项内容 */ - @ApiModelProperty(value = "C选项内容", name = "optionC", example = "河马", required = false) + @ApiModelProperty(value = "C选项内容", name = "optionC", example = "河马") private String optionC; /** * D选项内容 */ - @ApiModelProperty(value = "D选项内容", name = "optionD", example = "豹子", required = false) + @ApiModelProperty(value = "D选项内容", name = "optionD", example = "豹子") private String optionD; /** * E选项内容 */ - @ApiModelProperty(value = "E选项内容", name = "optionE", example = "大象", required = false) + @ApiModelProperty(value = "E选项内容", name = "optionE", example = "大象") private String optionE; /** * F选项内容 */ - @ApiModelProperty(value = "F选项内容", name = "optionF", example = "老虎", required = false) + @ApiModelProperty(value = "F选项内容", name = "optionF", example = "老虎") private String optionF; /** * 正确答案 @@ -67,11 +65,11 @@ public class QuestionsUpdateRequest { /** * 答案解析 */ - @ApiModelProperty(value = "答案解析", name = "answerAnalysis", example = "鲸鱼是最大的哺乳动物", required = false) + @ApiModelProperty(value = "答案解析", name = "answerAnalysis", example = "鲸鱼是最大的哺乳动物") private String answerAnalysis; /** * 试题科目 */ - @ApiModelProperty(value = "试题科目", name = "subjects", example = "基础通识", required = false) + @ApiModelProperty(value = "试题科目", name = "subjects", example = "基础通识") private String subjects; } diff --git a/src/main/java/com/msdw/tms/entity/response/CommonCode.java b/src/main/java/com/msdw/tms/entity/response/CommonCode.java index 5f33b78..19b0501 100644 --- a/src/main/java/com/msdw/tms/entity/response/CommonCode.java +++ b/src/main/java/com/msdw/tms/entity/response/CommonCode.java @@ -2,13 +2,6 @@ package com.msdw.tms.entity.response; import lombok.ToString; -/** - * @Author: mrt. - * @Description: - * @Date:Created in 2018/1/24 18:33. - * @Modified By: - */ - @ToString public enum CommonCode implements ResultCode { @@ -21,7 +14,6 @@ public enum CommonCode implements ResultCode { QUESTIONTYPE_INVALID(false, 10005, "题型错误！"), FAIL(false, 11111, "操作失败！"), SERVER_ERROR(false, 99999, "抱歉，系统繁忙，请稍后重试！"); - // private static ImmutableMap codes ; //操作是否成功 boolean success; //操作代码 @@ -29,7 +21,7 @@ public enum CommonCode implements ResultCode { //提示信息 String message; - private CommonCode(boolean success, int code, String message) { + CommonCode(boolean success, int code, String message) { this.success = success; this.code = code; this.message = message; diff --git a/src/main/java/com/msdw/tms/entity/response/Response.java b/src/main/java/com/msdw/tms/entity/response/Response.java index 9c159ea..35b841e 100644 --- a/src/main/java/com/msdw/tms/entity/response/Response.java +++ b/src/main/java/com/msdw/tms/entity/response/Response.java @@ -4,6 +4,6 @@ package com.msdw.tms.entity.response; * Created by admin on 2018/3/5. */ public interface Response { - public static final boolean SUCCESS = true; - public static final int SUCCESS_CODE = 10000; + boolean SUCCESS = true; + int SUCCESS_CODE = 10000; } diff --git a/src/main/java/com/msdw/tms/entity/response/ResponseResult.java b/src/main/java/com/msdw/tms/entity/response/ResponseResult.java index 0897404..c05f8ed 100644 --- a/src/main/java/com/msdw/tms/entity/response/ResponseResult.java +++ b/src/main/java/com/msdw/tms/entity/response/ResponseResult.java @@ -4,12 +4,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; -/** - * @Author: mrt. - * @Description: - * @Date:Created in 2018/1/24 18:33. - * @Modified By: - */ @Data @ToString @NoArgsConstructor diff --git a/src/main/java/com/msdw/tms/entity/vo/EvaluationRulesVO.java b/src/main/java/com/msdw/tms/entity/vo/EvaluationRulesVO.java index d8e375e..c331a09 100644 --- a/src/main/java/com/msdw/tms/entity/vo/EvaluationRulesVO.java +++ b/src/main/java/com/msdw/tms/entity/vo/EvaluationRulesVO.java @@ -1,7 +1,5 @@ package com.msdw.tms.entity.vo; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; @@ -10,8 +8,6 @@ import java.io.Serializable; * 测评规则信息记录，只记录一条信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @Data public class EvaluationRulesVO implements Serializable { diff --git a/src/main/java/com/msdw/tms/entity/vo/EvaluationVO.java b/src/main/java/com/msdw/tms/entity/vo/EvaluationVO.java index c4ce69e..68a8172 100644 --- a/src/main/java/com/msdw/tms/entity/vo/EvaluationVO.java +++ b/src/main/java/com/msdw/tms/entity/vo/EvaluationVO.java @@ -10,8 +10,6 @@ import java.util.Set; * 测评规则信息记录，只记录一条信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @Data @TableName("tms_evaluation_rules") diff --git a/src/main/java/com/msdw/tms/entity/vo/QuestionsDetailVO.java b/src/main/java/com/msdw/tms/entity/vo/QuestionsDetailVO.java index 43dbb70..9d32676 100644 --- a/src/main/java/com/msdw/tms/entity/vo/QuestionsDetailVO.java +++ b/src/main/java/com/msdw/tms/entity/vo/QuestionsDetailVO.java @@ -3,14 +3,11 @@ package com.msdw.tms.entity.vo; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * 记录试题信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @Data public class QuestionsDetailVO implements Serializable { diff --git a/src/main/java/com/msdw/tms/entity/vo/QuestionsVO.java b/src/main/java/com/msdw/tms/entity/vo/QuestionsVO.java index f1342ce..64a5c14 100644 --- a/src/main/java/com/msdw/tms/entity/vo/QuestionsVO.java +++ b/src/main/java/com/msdw/tms/entity/vo/QuestionsVO.java @@ -9,8 +9,6 @@ import java.io.Serializable; * 试题列表展示信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ @Data @ToString diff --git a/src/main/java/com/msdw/tms/service/AliyunOssService.java b/src/main/java/com/msdw/tms/service/AliyunOssService.java index 5c12e80..9833ba4 100644 --- a/src/main/java/com/msdw/tms/service/AliyunOssService.java +++ b/src/main/java/com/msdw/tms/service/AliyunOssService.java @@ -18,15 +18,12 @@ public interface AliyunOssService { /** * 下载文件 * - * @param response * @param objectName 本地路径 */ void downloadFiles(HttpServletResponse response, String objectName) throws IOException; /** * 根据文件路径+文件名称，删除该文件 - * - * @param filename */ void deleteFile(String filename); } diff --git a/src/main/java/com/msdw/tms/service/EvaluationRulesService.java b/src/main/java/com/msdw/tms/service/EvaluationRulesService.java index a9578a3..48f31b9 100644 --- a/src/main/java/com/msdw/tms/service/EvaluationRulesService.java +++ b/src/main/java/com/msdw/tms/service/EvaluationRulesService.java @@ -8,8 +8,6 @@ import com.msdw.tms.entity.vo.EvaluationRulesVO; * 测评规则信息记录，只记录一条信息 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ public interface EvaluationRulesService extends IService { EvaluationRulesVO getEvaluationRules(); diff --git a/src/main/java/com/msdw/tms/service/XlsxTemplateService.java b/src/main/java/com/msdw/tms/service/XlsxTemplateService.java index 9f36b79..d478256 100644 --- a/src/main/java/com/msdw/tms/service/XlsxTemplateService.java +++ b/src/main/java/com/msdw/tms/service/XlsxTemplateService.java @@ -7,8 +7,6 @@ import com.msdw.tms.entity.XlsxTemplateEntity; * 模板文件信息记录 * * @author gongsj - * @email gongsj@gmail.com - * @date 2020-08-19 09:28:06 */ public interface XlsxTemplateService extends IService { } diff --git a/src/main/java/com/msdw/tms/service/impl/AliyunOssServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/AliyunOssServiceImpl.java index e5acfc7..5a687f4 100644 --- a/src/main/java/com/msdw/tms/service/impl/AliyunOssServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/AliyunOssServiceImpl.java @@ -6,10 +6,10 @@ import com.msdw.tms.common.utils.FilesResult; import com.msdw.tms.config.AliyunOssConfig; import com.msdw.tms.service.AliyunOssService; import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -19,11 +19,11 @@ import java.io.IOException; @Service public class AliyunOssServiceImpl implements AliyunOssService { - @Autowired - private AliyunOssConfig config; + @Resource + AliyunOssConfig config; - @Autowired - private BeanFactory beanFactory; + @Resource + BeanFactory beanFactory; /** * 上传文件 @@ -38,7 +38,6 @@ public class AliyunOssServiceImpl implements AliyunOssService { /** * 下载文件 * - * @param response * @param objectName 本地路径 */ public void downloadFiles(HttpServletResponse response, String objectName) throws IOException { @@ -49,7 +48,6 @@ public class AliyunOssServiceImpl implements AliyunOssService { /** * 根据文件路径+文件名称，删除该文件 * - * @param filename */ public void deleteFile(String filename) { OSSClient client = beanFactory.getBean(OSSClient.class); diff --git a/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java index 66afb7d..3977fd4 100644 --- a/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/EvaluationRulesServiceImpl.java @@ -12,32 +12,34 @@ import com.msdw.tms.entity.vo.EvaluationRulesVO; import com.msdw.tms.service.EvaluationRulesService; import com.msdw.tms.service.QuestionsService; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + @Service("evaluationRulesService") public class EvaluationRulesServiceImpl extends ServiceImpl implements EvaluationRulesService { - @Autowired + @Resource QuestionsService questionsService; + //TODO 此表数据可存在redis中，提高系统性能 @Override public EvaluationRulesVO getEvaluationRules() { EvaluationRulesVO evaluationRulesVO = new EvaluationRulesVO(); EvaluationRulesEntity evaluationRules = this.getById(Constant.EVALUATION_RULES_ID); - if (evaluationRules.getEvaluationType() == Constant.RulesType.CUSTOMIZE.getType()) {//自定义 + if (evaluationRules.getEvaluationType().equals(Constant.RulesType.CUSTOMIZE.getType())) {//自定义 int totalNum = 0; - if (evaluationRules.getIsSingleEnable() == Constant.IsEnable.ENABLE.getType()) {//启用 + if (evaluationRules.getIsSingleEnable().equals(Constant.IsEnable.ENABLE.getType())) {//启用 totalNum += evaluationRules.getSingleNum(); } - if (evaluationRules.getIsMultipleEnable() == Constant.IsEnable.ENABLE.getType()) {//启用 + if (evaluationRules.getIsMultipleEnable().equals(Constant.IsEnable.ENABLE.getType())) {//启用 totalNum += evaluationRules.getMultipleNum(); } - if (evaluationRules.getIsJudgmentEnable() == Constant.IsEnable.ENABLE.getType()) {//启用 + if (evaluationRules.getIsJudgmentEnable().equals(Constant.IsEnable.ENABLE.getType())) {//启用 totalNum += evaluationRules.getJudgmentNum(); } @@ -76,27 +78,27 @@ public class EvaluationRulesServiceImpl extends ServiceImpl implements QuestionsService { - @Autowired - private AliyunOssService ossService; + @Resource + AliyunOssService ossService; - @Autowired + @Resource XlsxTemplateService xlsxTemplateService; - @Autowired + @Resource EvaluationRulesService evaluationRulesService; /** * 条件加分页查询，题干模糊查询，未删除，修改时间降序 - * - * @param page - * @param size - * @param request - * @return */ @Override public PageUtils queryQuestionsPage(Integer page, Integer size, QuestionsQueryRequest request) { - //请求包装类 + // 请求包装类 QueryWrapper queryWrapper = new QueryWrapper<>(); - //只查询未被删除的试题 + // 只查询未被删除的试题 queryWrapper.eq("is_del", Constant.IsDel.NOT_DEL.getType()); - //判断请求体是否为空 + // 判断请求体是否为空 if (request != null) { // 题干：判断题干是否为空，不为空则加入搜索条件 if (request.getQuestionStem() != null) { queryWrapper.like("question_stem", request.getQuestionStem()); } -// 题型：判断题型是否为空，不为空则加入搜索条件 -// if (questionsRequest.getQuestionType() != null) { -// queryWrapper.eq("question_type", questionsRequest.getQuestionType()); -// } -// 修改时间：判断修改时间是否为空，不为空则加入搜索条件 -// if (questionsRequest.getModifyTime() != null) { -// queryWrapper.eq("modify_time", questionsRequest.getModifyTime()); -// } + //TODO 扩展搜索条件 + // 题型：判断题型是否为空，不为空则加入搜索条件 + // if (questionsRequest.getQuestionType() != null) { + // queryWrapper.eq("question_type", questionsRequest.getQuestionType()); + // } + // 修改时间：判断修改时间是否为空，不为空则加入搜索条件 + // if (questionsRequest.getModifyTime() != null) { + // queryWrapper.eq("modify_time", questionsRequest.getModifyTime()); + // } } - //修改时间降序 + // 修改时间降序 queryWrapper.orderByDesc("modify_time"); - IPage questionsEntityIPage = this.page( + IPage questionsIPage = this.page( new Query().getPage(page, size), queryWrapper ); - PageUtils questionsPage = new PageUtils(questionsEntityIPage); - List list = (List) questionsPage.getList(); + List records = questionsIPage.getRecords(); - List collect = list.stream().map(item -> { + List questions = records.stream().map(question -> { QuestionsVO questionsVO = new QuestionsVO(); - BeanUtils.copyProperties(item, questionsVO); + BeanUtils.copyProperties(question, questionsVO); //处理时间格式 - questionsVO.setCreateTime(handleTime(item.getCreateTime())); - questionsVO.setModifyTime(handleTime(item.getModifyTime())); + questionsVO.setCreateTime(handleTime(question.getCreateTime())); + questionsVO.setModifyTime(handleTime(question.getModifyTime())); return questionsVO; }).collect(Collectors.toList()); - questionsPage.setList(collect); + PageUtils questionsPage = new PageUtils(questionsIPage); + + new PageUtils(questionsIPage).setList(questions); return questionsPage; } @@ -161,9 +157,6 @@ public class QuestionsServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_del", Constant.IsDel.NOT_DEL.getType()) + .eq("question_stem", questions.getQuestionStem()); + int count = this.count(queryWrapper); + if (count > 0) {//说明已存在 + //抛出题目已存在异常 + ExceptionCast.cast(CommonCode.QUESTION_EXISTS); } + // 将传入的对象内容拷贝到QuestionsEntity并返回 + QuestionsEntity questionsEntity = getQuestionsEntity(questions); + questionsEntity.setCreateTime(new Date()); questionsEntity.setModifyTime(new Date()); //TODO 创建者和修改者。。。 @@ -208,18 +192,38 @@ public class QuestionsServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id", questions.getId()) + .eq("question_stem", questions.getQuestionStem()) + .eq("is_del", Constant.IsDel.NOT_DEL.getType()); + int count = this.count(queryWrapper); + if (count > 0) {//说明除了本题之外题干已存在 + //抛出题目已存在异常 + ExceptionCast.cast(CommonCode.QUESTION_EXISTS); + } // 判断id是否存在 if (this.getById(questions.getId()) == null) { ExceptionCast.cast(CommonCode.INVALID_PARAM); } + // 将传入的对象内容拷贝到QuestionsEntity并返回 + QuestionsEntity questionsEntity = getQuestionsEntity(questions); + + questionsEntity.setModifyTime(new Date()); + //TODO 设置修改者。。。 + + return this.updateById(questionsEntity); + } + + // 将传入的对象内容拷贝到QuestionsEntity并返回 + private QuestionsEntity getQuestionsEntity(T questions) { QuestionsEntity questionsEntity = new QuestionsEntity(); + BeanUtils.copyProperties(questions, questionsEntity); - String questionType = questions.getQuestionType(); + String questionType = questionsEntity.getQuestionType(); //根据题型名称得到题型号 if (questionType.equals(Constant.QuestionType.SINGLE_CHOICE.getDesc())) { //单选题 @@ -230,23 +234,11 @@ public class QuestionsServiceImpl extends ServiceImpl().eq("question_stem", stem)); - if (count > 0) {//说明已存在 - //抛出题目已存在异常 - ExceptionCast.cast(CommonCode.QUESTION_EXISTS); - } + return questionsEntity; } @Override @@ -255,11 +247,11 @@ public class QuestionsServiceImpl extends ServiceImpl list = new ExcelImportUtil(QuestionsImportRequest.class) - .readExcel(file.getInputStream(), Constant.STARTING_ROW, Constant.STARTING_CELL); + // 使用excel导入工具类获取试题数据列表 + List list = new ExcelImportUtil(QuestionsImportRequest.class).readExcel(file.getInputStream(), Constant.STARTING_ROW, Constant.STARTING_CELL); if (list == null || list.size() == 0) { ExceptionCast.cast(CommonCode.INVALID_PARAM); } - //List unique = persons.stream().collect( - // Collectors.collectingAndThen( - // Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Person::getName))), ArrayList::new) - //); List collect = list.stream().map(item -> { - int count = this.count(new QueryWrapper().eq("question_stem", item.getQuestionStem())); if (count > 0) {//说明已存在 return null; @@ -327,19 +310,18 @@ public class QuestionsServiceImpl extends ServiceImpl question != null).collect(Collectors.collectingAndThen( + }).filter(Objects::nonNull)// 过滤掉为null的对象 + .collect(Collectors.collectingAndThen(// 去重收集 Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QuestionsEntity::getQuestionStem))), ArrayList::new )); + // 批量新增 return this.saveBatch(collect); } /** * 上传模板文件，修改模板信息表数据 - * - * @param file - * @return */ @Override @Transactional @@ -360,7 +342,6 @@ public class QuestionsServiceImpl extends ServiceImpl singleChoice = this.list(queryWrapper.eq("question_type_no", Constant.QuestionType.SINGLE_CHOICE.getType())); set.addAll(getRandomList(singleNum, singleChoice)); } - if (evaluationRules.getIsMultipleEnable() == Constant.IsEnable.ENABLE.getType()) { + if (evaluationRules.getIsMultipleEnable().equals(Constant.IsEnable.ENABLE.getType())) { multipleNum = evaluationRules.getMultipleNum(); List multipleChoice = this.list(queryWrapper.eq("question_type_no", Constant.QuestionType.MULTIPLE_CHOICE.getType())); - set.addAll(getRandomList(multipleNum, multipleChoice)); } - if (evaluationRules.getIsJudgmentEnable() == Constant.IsEnable.ENABLE.getType()) { + if (evaluationRules.getIsJudgmentEnable().equals(Constant.IsEnable.ENABLE.getType())) { judgmentNum = evaluationRules.getJudgmentNum(); + List judgments = this.list(queryWrapper.eq("question_type_no", Constant.QuestionType.TRUE_OR_FALSE.getType())); set.addAll(getRandomList(judgmentNum, judgments)); } + // 总题数等于各类题目数量之和 evaluation.setQuestionNum(singleNum + multipleNum + judgmentNum); } Set collect = set.stream().map(item -> { @@ -431,7 +416,7 @@ public class QuestionsServiceImpl extends ServiceImpl getRandomList(int len, List list) { Set set = new HashSet<>(); Random random = new Random(); - int i = 0; + int i; while (true) { i = random.nextInt(list.size()); set.add(list.get(i)); diff --git a/src/test/java/com/msdw/tms/TmsApplicationTests.java b/src/test/java/com/msdw/tms/TmsApplicationTests.java index 641de60..648253d 100644 --- a/src/test/java/com/msdw/tms/TmsApplicationTests.java +++ b/src/test/java/com/msdw/tms/TmsApplicationTests.java @@ -3,18 +3,15 @@ package com.msdw.tms; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.Date; - @SpringBootTest class TmsApplicationTests { @Test void contextLoads() { + printMsg(1, 2, 3, "哈哈哈"); +// ------------------------------------------------------------------------------------------ + // QuestionsVO questionsVO = new QuestionsVO(); // // QuestionsEntity questionsEntity = new QuestionsEntity(); @@ -43,16 +40,45 @@ class TmsApplicationTests { // // System.out.println(questionsVO.toString()); - Date date = new Date(); - Instant instant = date.toInstant(); - ZoneId zoneId = ZoneId.systemDefault(); +// ------------------------------------------------------------------------------------------ + +// Date date = new Date(); +// Instant instant = date.toInstant(); +// ZoneId zoneId = ZoneId.systemDefault(); +// +// LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime(); +// System.out.println("Date = " + date); +// System.out.println("LocalDateTime = " + localDateTime); +// String DateNow = localDateTime.format(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss")); // 当前日期和时间 +// // String DateNow = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss")); // 当前日期和时间 +// System.out.println(DateNow); + } + + void printMsg(T... args) { + for (T t : args) { + System.out.println("t is " + t); + } + } + + /** + * 泛型方法的基本介绍 + * + * @param tClass 传入的泛型实参 + * @return T 返回值为T类型 + * 说明： + * 1）public 与 返回值中间非常重要，可以理解为声明此方法为泛型方法。 + * 2）只有声明了的方法才是泛型方法，泛型类中的使用了泛型的成员方法并不是泛型方法。 + * 3）表明该方法将使用泛型类型T，此时才可以在方法中使用泛型类型T。 + * 4）与泛型类的定义一样，此处T可以随便写为任意标识，常见的如T、E、K、V等形式的参数常用于表示泛型。 + */ + public T genericMethod(Class tClass) throws InstantiationException, + IllegalAccessException { + T instance = tClass.newInstance(); + return instance; + } - LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime(); - System.out.println("Date = " + date); - System.out.println("LocalDateTime = " + localDateTime); - String DateNow = localDateTime.format(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss")); // 当前日期和时间 - // String DateNow = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss")); // 当前日期和时间 - System.out.println(DateNow); + public T TestG(T t){ + return t; } } diff --git a/src/test/java/com/msdw/tms/service/AliyunOssServiceTest.java b/src/test/java/com/msdw/tms/service/AliyunOssServiceTest.java new file mode 100644 index 0000000..c9583fd --- /dev/null +++ b/src/test/java/com/msdw/tms/service/AliyunOssServiceTest.java @@ -0,0 +1,62 @@ +package com.msdw.tms.service; + +import com.msdw.tms.common.utils.FilesResult; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItem; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.commons.CommonsMultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.file.Files; + +@SpringBootTest +class AliyunOssServiceTest { + + @Autowired + AliyunOssService aliyunOssService; + + /** + * 测试上传文件 + */ + @Test + void testUploadFiles() throws IOException { + File file = new File("D:\\pic\\1.jpg"); + FileItem fileItem = new DiskFileItem("file", + Files.probeContentType(file.toPath()), + false, + file.getName(), + (int) file.length(), + file.getParentFile()); + IOUtils.copy(new FileInputStream(file), fileItem.getOutputStream()); + MultipartFile multipartFile = new CommonsMultipartFile(fileItem); + FilesResult filesResult = aliyunOssService.uploadFiles(multipartFile); + System.out.println(filesResult.toString()); + } + + /** + * 测试下载文件 + */ + @Test + void testDownloadFiles() throws IOException { + HttpServletResponse response = new MockHttpServletResponse(); + AliyunOssService aliyunOssService = this.aliyunOssService; + aliyunOssService.downloadFiles(response, + "http://liuwanr.oss-cn-shenzhen.aliyuncs.com/jpg/20200807/1596787474773.jpg"); + } + + /** + * 测试根据文件路径+文件名称，删除该文件 + */ + @Test + void testDeleteFile() { + aliyunOssService.deleteFile("http://liuwanr.oss-cn-shenzhen.aliyuncs.com/jpg/20200807/1596787474773.jpg"); + } +} diff --git a/src/test/java/com/msdw/tms/service/EvaluationRulesServiceTest.java b/src/test/java/com/msdw/tms/service/EvaluationRulesServiceTest.java new file mode 100644 index 0000000..7f79ad0 --- /dev/null +++ b/src/test/java/com/msdw/tms/service/EvaluationRulesServiceTest.java @@ -0,0 +1,33 @@ +package com.msdw.tms.service; + +import com.msdw.tms.entity.EvaluationRulesEntity; +import com.msdw.tms.entity.vo.EvaluationRulesVO; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +/** + * 测评规则信息记录，只记录一条信息 + * + * @author gongsj + */ +@SpringBootTest +class EvaluationRulesServiceTest { + + @Autowired + EvaluationRulesService evaluationRulesService; + + @Test + void getEvaluationRules() { + EvaluationRulesVO evaluationRules = evaluationRulesService.getEvaluationRules(); + System.out.println(evaluationRules.toString()); + } + + @Test + void updateEvaluationRulesById() { + EvaluationRulesEntity evaluationRules = new EvaluationRulesEntity(); + boolean b = evaluationRulesService.updateEvaluationRulesById(evaluationRules); + System.out.println(b); + } +} + diff --git a/src/test/java/com/msdw/tms/service/QuestionsServiceTest.java b/src/test/java/com/msdw/tms/service/QuestionsServiceTest.java new file mode 100644 index 0000000..1ba4f4f --- /dev/null +++ b/src/test/java/com/msdw/tms/service/QuestionsServiceTest.java @@ -0,0 +1,122 @@ +package com.msdw.tms.service; + +import com.msdw.tms.common.utils.FilesResult; +import com.msdw.tms.common.utils.PageUtils; +import com.msdw.tms.entity.request.QuestionsAddRequest; +import com.msdw.tms.entity.request.QuestionsQueryRequest; +import com.msdw.tms.entity.request.QuestionsUpdateRequest; +import com.msdw.tms.entity.vo.EvaluationVO; +import com.msdw.tms.entity.vo.QuestionsDetailVO; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItem; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.commons.CommonsMultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.List; + +/** + * 记录试题信息 + * + * @author gongsj + */ +@SpringBootTest +class QuestionsServiceTest { + + @Autowired + QuestionsService questionsService; + + @Test + void queryQuestionsPage() { + Integer page = 1; + Integer size = 10; + QuestionsQueryRequest request = new QuestionsQueryRequest(); + PageUtils pageUtils = questionsService.queryQuestionsPage(page, size, request); + System.out.println(pageUtils.toString()); + } + + @Test + void getQuestionDetailById() { + Integer id = 1; + QuestionsDetailVO detail = questionsService.getQuestionDetailById(id); + System.out.println(detail.toString()); + } + + @Test + void saveQuestion() { + QuestionsAddRequest questions = new QuestionsAddRequest(); + System.out.println(questionsService.saveQuestion(questions)); + } + + @Test + void updateQuestionById() { + QuestionsUpdateRequest questions = new QuestionsUpdateRequest(); + System.out.println(questionsService.updateQuestionById(questions)); + } + + @Test + void isnable() { + Integer id = 1; + System.out.println(questionsService.isnable(id)); + } + + @Test + void deleteByIds() { + List asList = new ArrayList<>(); + System.out.println(questionsService.deleteByIds(asList)); + } + + @Test + void importQuestion() throws IOException { + File file = new File("D:\\pic\\1.jpg"); + FileItem fileItem = new DiskFileItem("file", + Files.probeContentType(file.toPath()), + false, + file.getName(), + (int) file.length(), + file.getParentFile()); + IOUtils.copy(new FileInputStream(file), fileItem.getOutputStream()); + MultipartFile multipartFile = new CommonsMultipartFile(fileItem); + + boolean b = questionsService.importQuestion(multipartFile); + + System.out.println(b); + } + + @Test + void uploadFiles() throws IOException { + File file = new File("D:\\pic\\1.jpg"); + FileItem fileItem = new DiskFileItem("file", + Files.probeContentType(file.toPath()), + false, + file.getName(), + (int) file.length(), + file.getParentFile()); + IOUtils.copy(new FileInputStream(file), fileItem.getOutputStream()); + MultipartFile multipartFile = new CommonsMultipartFile(fileItem); + FilesResult filesResult = questionsService.uploadFiles(multipartFile); + System.out.println(filesResult.toString()); + } + + @Test + void downloadFiles() throws IOException { + HttpServletResponse response = null; + questionsService.downloadFiles(response); + } + + @Test + void evaluation() { + EvaluationVO evaluation = questionsService.evaluation(); + System.out.println(evaluation.toString()); + } +} + From e929a380c061b41821285db61ca16faa90b28783 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Fri, 21 Aug 2020 14:16:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=B1=95=E7=A4=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++++++ .../com/msdw/tms/service/impl/QuestionsServiceImpl.java | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a3e1a73..ce557e1 100644 --- a/pom.xml +++ b/pom.xml @@ -118,6 +118,14 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-surefire-plugin + 2.20.1 + + true + + diff --git a/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java index 97fc05c..a2d7274 100644 --- a/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java @@ -104,7 +104,7 @@ public class QuestionsServiceImpl extends ServiceImpl Date: Fri, 21 Aug 2020 15:58:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=89=93war=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++++++ src/main/java/com/msdw/tms/TmsApplication.java | 8 +++++++- .../java/com/msdw/tms/entity/QuestionsEntity.java | 2 +- .../tms/entity/request/QuestionsQueryRequest.java | 9 +++++---- .../msdw/tms/service/impl/QuestionsServiceImpl.java | 12 ++++++------ 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index ce557e1..5d3a89c 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ tms 测评管理系统 + war 1.8 @@ -39,6 +40,13 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-tomcat + + provided + com.baomidou diff --git a/src/main/java/com/msdw/tms/TmsApplication.java b/src/main/java/com/msdw/tms/TmsApplication.java index 33869c2..4bf070b 100644 --- a/src/main/java/com/msdw/tms/TmsApplication.java +++ b/src/main/java/com/msdw/tms/TmsApplication.java @@ -2,12 +2,18 @@ package com.msdw.tms; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @SpringBootApplication -public class TmsApplication { +public class TmsApplication extends SpringBootServletInitializer { public static void main(String[] args) { SpringApplication.run(TmsApplication.class, args); } + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return builder.sources(TmsApplication.class); + } } diff --git a/src/main/java/com/msdw/tms/entity/QuestionsEntity.java b/src/main/java/com/msdw/tms/entity/QuestionsEntity.java index fd56112..03600ef 100644 --- a/src/main/java/com/msdw/tms/entity/QuestionsEntity.java +++ b/src/main/java/com/msdw/tms/entity/QuestionsEntity.java @@ -23,7 +23,7 @@ public class QuestionsEntity implements Serializable { @TableId private Integer id; /** - * 题型号：用于区分是什么题型 + * 题型号：1、单选题，2、多选题，3、判断题 */ private Integer questionTypeNo; /** diff --git a/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java b/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java index 62f98bd..f73f4a3 100644 --- a/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java +++ b/src/main/java/com/msdw/tms/entity/request/QuestionsQueryRequest.java @@ -19,10 +19,11 @@ public class QuestionsQueryRequest { @ApiModelProperty(value = "题干，问题描述", name = "questionStem", example = "世界上最大的哺乳动物是什么？") private String questionStem; - // /** - // * 题型id - // */ - // private Integer questionType; + /** + * 题型id + */ + @ApiModelProperty(value = "题型号：1、单选题，2、多选题，3、判断题", name = "questionTypeNo", example = "1") + private Integer questionTypeNo; // /** // * 参考答案 // */ diff --git a/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java index a2d7274..6ece057 100644 --- a/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/QuestionsServiceImpl.java @@ -70,14 +70,14 @@ public class QuestionsServiceImpl extends ServiceImpl Date: Mon, 24 Aug 2020 09:29:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/QuestionsImportRequest.java | 26 ++++++++---------- .../excel-template/试题导入模板.xlsx | Bin 10390 -> 11155 bytes .../service/EvaluationRulesServiceTest.java | 2 ++ .../tms/service/QuestionsServiceTest.java | 6 ++++ 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java b/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java index 77c6cf4..e671e12 100644 --- a/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java +++ b/src/main/java/com/msdw/tms/entity/request/QuestionsImportRequest.java @@ -10,59 +10,55 @@ import lombok.Data; */ @Data public class QuestionsImportRequest { - /** - * 试题科目 - */ - @ExcelAttribute(sort = 0) - private String subjects; + /** * 题干，问题描述 */ - @ExcelAttribute(sort = 1) + @ExcelAttribute(sort = 0) private String questionStem; /** * 题型 */ - @ExcelAttribute(sort = 2) + @ExcelAttribute(sort = 1) private String questionType; /** * 选项A */ - @ExcelAttribute(sort = 3) + @ExcelAttribute(sort = 2) private String optionA; /** * 选项B */ - @ExcelAttribute(sort = 4) + @ExcelAttribute(sort = 3) private String optionB; /** * 选项C */ - @ExcelAttribute(sort = 5) + @ExcelAttribute(sort = 4) private String optionC; /** * 选项D */ - @ExcelAttribute(sort = 6) + @ExcelAttribute(sort = 5) private String optionD; /** * 选项E */ - @ExcelAttribute(sort = 7) + @ExcelAttribute(sort = 6) private String optionE; /** * 选项F */ - @ExcelAttribute(sort = 8) + @ExcelAttribute(sort = 7) private String optionF; /** * 正确答案 */ - @ExcelAttribute(sort = 9) + @ExcelAttribute(sort = 8) private String answer; /** * 答案解析 */ - @ExcelAttribute(sort = 10) + @ExcelAttribute(sort = 9) private String answerAnalysis; } diff --git a/src/main/resources/excel-template/试题导入模板.xlsx b/src/main/resources/excel-template/试题导入模板.xlsx index 4c064f05758899d5bb7b598d5b5e06d99a469fb2..30c5e1403a0831064c7070de3ab74e5b19a87302 100644 GIT binary patch delta 8517 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 delta 7552 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 Z asList = new ArrayList<>(); System.out.println(questionsService.deleteByIds(asList)); } @Test + @Transactional void importQuestion() throws IOException { File file = new File("D:\\pic\\1.jpg"); FileItem fileItem = new DiskFileItem("file",