apiRest = message(ex.getCode(), ex.getMsg(), null);
- return apiRest;
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseDTO.java b/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseDTO.java
deleted file mode 100644
index a2f6a3e..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseDTO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.yf.exam.core.api.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 请求和响应的基础类，用于处理序列化
- * @author dav
- * @date 2019/3/16 15:56
- */
-@Data
-public class BaseDTO implements Serializable {
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseIdReqDTO.java b/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseIdReqDTO.java
deleted file mode 100644
index 074fea3..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseIdReqDTO.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.yf.exam.core.api.dto;
-
-import com.yf.exam.core.api.dto.BaseDTO;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- *
- * 主键通用请求类，用于根据ID查询
- *
- *
- * @author 聪明笨狗
- * @since 2019-04-20 12:15
- */
-@Data
-@ApiModel(value="主键通用请求类", description="主键通用请求类")
-public class BaseIdReqDTO extends BaseDTO {
-
-
- @ApiModelProperty(value = "主键ID", required=true)
- private String id;
-
- @JsonIgnore
- private String userId;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseIdRespDTO.java b/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseIdRespDTO.java
deleted file mode 100644
index a9a59e2..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseIdRespDTO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.yf.exam.core.api.dto;
-
-import com.yf.exam.core.api.dto.BaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- *
- * 主键通用响应类，用于添加后返回内容
- *
- *
- * @author 聪明笨狗
- * @since 2019-04-20 12:15
- */
-@Data
-@ApiModel(value="主键通用响应类", description="主键通用响应类")
-@AllArgsConstructor
-@NoArgsConstructor
-public class BaseIdRespDTO extends BaseDTO {
-
- @ApiModelProperty(value = "主键ID", required=true)
- private String id;
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseIdsReqDTO.java b/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseIdsReqDTO.java
deleted file mode 100644
index df80c18..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseIdsReqDTO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.yf.exam.core.api.dto;
-
-import com.yf.exam.core.api.dto.BaseDTO;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 通用ID列表类操作，用于批量删除、修改状态等
- * @author bool
- * @date 2019-08-01 19:07
- */
-@Data
-@ApiModel(value="删除参数", description="删除参数")
-public class BaseIdsReqDTO extends BaseDTO {
-
-
- @JsonIgnore
- private String userId;
-
- @ApiModelProperty(value = "要删除的ID列表", required = true)
- private List ids;
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseStateReqDTO.java b/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseStateReqDTO.java
deleted file mode 100644
index 15f26cb..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/api/dto/BaseStateReqDTO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.yf.exam.core.api.dto;
-
-import com.yf.exam.core.api.dto.BaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- *
- * 通用状态请求类，用于修改状态什么的
- *
- *
- * @author 聪明笨狗
- * @since 2019-04-20 12:15
- */
-@Data
-@ApiModel(value="通用状态请求类", description="通用状态请求类")
-@AllArgsConstructor
-@NoArgsConstructor
-public class BaseStateReqDTO extends BaseDTO {
-
-
- @ApiModelProperty(value = "要修改对象的ID列表", required=true)
- private List ids;
-
- @ApiModelProperty(value = "通用状态，0为正常，1为禁用", required=true)
- private Integer state;
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/api/dto/PagingReqDTO.java b/exam-api/src/main/java/com/yf/exam/core/api/dto/PagingReqDTO.java
deleted file mode 100644
index 276a0e0..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/api/dto/PagingReqDTO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.yf.exam.core.api.dto;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 分页查询类
- * @param
- * @author bool
- */
-@ApiModel(value="分页参数", description="分页参数")
-@Data
-public class PagingReqDTO {
-
-
- @ApiModelProperty(value = "当前页码", required = true, example = "1")
- private Integer current;
-
- @ApiModelProperty(value = "每页数量", required = true, example = "10")
- private Integer size;
-
- @ApiModelProperty(value = "查询参数")
- private T params;
-
- @ApiModelProperty(value = "排序字符")
- private String orderBy;
-
- @JsonIgnore
- @ApiModelProperty(value = "当前用户的ID")
- private String userId;
-
- /**
- * 转换成MyBatis的简单分页对象
- * @return
- */
- public Page toPage(){
- Page page = new Page();
- page.setCurrent(this.current);
- page.setSize(this.size);
- return page;
- }
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/api/dto/PagingRespDTO.java b/exam-api/src/main/java/com/yf/exam/core/api/dto/PagingRespDTO.java
deleted file mode 100644
index 3b2a8f7..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/api/dto/PagingRespDTO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.yf.exam.core.api.dto;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-/**
- * 分页响应类
- * @author bool
- * @date 2019-07-20 15:17
- * @param
- */
-public class PagingRespDTO extends Page {
-
- /**
- * 获取页面总数量
- * @return
- */
- @Override
- public long getPages() {
- if (this.getSize() == 0L) {
- return 0L;
- } else {
- long pages = this.getTotal() / this.getSize();
- if (this.getTotal() % this.getSize() != 0L) {
- ++pages;
- }
- return pages;
- }
- }
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/api/utils/JsonConverter.java b/exam-api/src/main/java/com/yf/exam/core/api/utils/JsonConverter.java
deleted file mode 100644
index f9e4622..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/api/utils/JsonConverter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.yf.exam.core.api.utils;
-
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * JSON数据转换器，用于转换返回消息的格式
- * @author dav
- * @date 2018/9/11 19:30
- */
-public class JsonConverter {
-
- /**
- * FastJson消息转换器
- *
- * @return
- */
- public static HttpMessageConverter fastConverter() {
- // 定义一个convert转换消息的对象
- FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
- // 添加FastJson的配置信息
- FastJsonConfig fastJsonConfig = new FastJsonConfig();
- // 默认转换器
- fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat,
- SerializerFeature.WriteNullNumberAsZero,
- SerializerFeature.MapSortField,
- SerializerFeature.WriteNullStringAsEmpty,
- SerializerFeature.DisableCircularReferenceDetect,
- SerializerFeature.WriteDateUseDateFormat,
- SerializerFeature.WriteNullListAsEmpty);
- fastJsonConfig.setCharset(Charset.forName("UTF-8"));
- // 处理中文乱码问题
- List fastMediaTypes = new ArrayList<>();
- fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
- fastConverter.setSupportedMediaTypes(fastMediaTypes);
- // 在convert中添加配置信息
- fastConverter.setFastJsonConfig(fastJsonConfig);
-
- return fastConverter;
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/enums/CommonState.java b/exam-api/src/main/java/com/yf/exam/core/enums/CommonState.java
deleted file mode 100644
index 21ef637..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/enums/CommonState.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.yf.exam.core.enums;
-
-/**
- * 通用的状态枚举信息
- *
- * @author bool
- * @date 2019-09-17 17:57
- */
-public interface CommonState {
-
- /**
- * 普通状态，正常的
- */
- Integer NORMAL = 0;
- /**
- * 非正常状态，禁用，下架等
- */
- Integer ABNORMAL = 1;
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/enums/OpenType.java b/exam-api/src/main/java/com/yf/exam/core/enums/OpenType.java
deleted file mode 100644
index 0012db5..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/enums/OpenType.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.yf.exam.core.enums;
-
-/**
- * 开放方式
- * @author bool
- */
-public interface OpenType {
-
- /**
- * 完全开放
- */
- Integer OPEN = 1;
-
- /**
- * 部门开放
- */
- Integer DEPT_OPEN = 2;
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/exception/ServiceException.java b/exam-api/src/main/java/com/yf/exam/core/exception/ServiceException.java
deleted file mode 100644
index 2d474c1..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/exception/ServiceException.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.yf.exam.core.exception;
-
-import com.yf.exam.core.api.ApiError;
-import com.yf.exam.core.api.ApiRest;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ServiceException extends RuntimeException{
-
- /**
- * 错误码
- */
- private Integer code;
-
- /**
- * 错误消息
- */
- private String msg;
-
- /**
- * 从结果初始化
- * @param apiRest
- */
- public ServiceException(ApiRest apiRest){
- this.code = apiRest.getCode();
- this.msg = apiRest.getMsg();
- }
-
- /**
- * 从枚举中获取参数
- * @param apiError
- */
- public ServiceException(ApiError apiError){
- this.code = apiError.getCode();
- this.msg = apiError.msg;
- }
-
- /**
- * 异常构造
- * @param msg
- */
- public ServiceException(String msg){
- this.code = 1;
- this.msg = msg;
- }
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/exception/ServiceExceptionHandler.java b/exam-api/src/main/java/com/yf/exam/core/exception/ServiceExceptionHandler.java
deleted file mode 100644
index 1c8de5d..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/exception/ServiceExceptionHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.yf.exam.core.exception;
-
-import com.yf.exam.core.api.ApiRest;
-import org.springframework.http.HttpStatus;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 统一异常处理类
- * @author bool
- * @date 2019-06-21 19:27
- */
-@RestControllerAdvice
-public class ServiceExceptionHandler {
-
- /**
- * 应用到所有@RequestMapping注解方法，在其执行之前初始化数据绑定器
- * @param binder
- */
- @InitBinder
- public void initWebBinder(WebDataBinder binder){
-
- }
-
- /**
- * 把值绑定到Model中，使全局@RequestMapping可以获取到该值
- * @param model
- */
- @ModelAttribute
- public void addAttribute(Model model) {
-
- }
-
- /**
- * 捕获ServiceException
- * @param e
- * @return
- */
- @ExceptionHandler({com.yf.exam.core.exception.ServiceException.class})
- @ResponseStatus(HttpStatus.OK)
- public ApiRest serviceExceptionHandler(ServiceException e) {
- return new ApiRest(e);
- }
-
-}
\ No newline at end of file
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/BeanMapper.java b/exam-api/src/main/java/com/yf/exam/core/utils/BeanMapper.java
deleted file mode 100644
index 8ee5ca4..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/BeanMapper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.yf.exam.core.utils;
-
-import org.dozer.DozerBeanMapper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-
-/**
- * 简单封装Dozer, 实现深度转换Bean<->Bean的Mapper.实现:
- *
- * 1. 持有Mapper的单例.
- * 2. 返回值类型转换.
- * 3. 批量转换Collection中的所有对象.
- * 4. 区分创建新的B对象与将对象A值复制到已存在的B对象两种函数.
- *
- */
-public class BeanMapper {
-
- /**
- * 持有Dozer单例, 避免重复创建DozerMapper消耗资源.
- */
- private static DozerBeanMapper dozerBeanMapper = new DozerBeanMapper();
-
- /**
- * 基于Dozer转换对象的类型.
- */
- public static T map(Object source, Class destinationClass) {
- return dozerBeanMapper.map(source, destinationClass);
- }
-
- /**
- * 基于Dozer转换Collection中对象的类型.
- */
- public static List mapList(Iterable sourceList, Class destinationClass) {
- List destinationList = new ArrayList();
- for (Object sourceObject : sourceList) {
- T destinationObject = dozerBeanMapper.map(sourceObject, destinationClass);
- destinationList.add(destinationObject);
- }
- return destinationList;
- }
-
- /**
- * 基于Dozer将对象A的值拷贝到对象B中.
- */
- public static void copy(Object source, Object destinationObject) {
- if(source!=null) {
- dozerBeanMapper.map(source, destinationObject);
- }
- }
-
- public static List mapList(Collection source, Function mapper) {
- return source.stream().map(mapper).collect(Collectors.toList());
- }
-}
\ No newline at end of file
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/CronUtils.java b/exam-api/src/main/java/com/yf/exam/core/utils/CronUtils.java
deleted file mode 100644
index c019b3e..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/CronUtils.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.yf.exam.core.utils;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 时间转换quartz表达式
- * @author bool
- * @date 2020/11/29 下午3:00
- */
-public class CronUtils {
-
- /**
- * 格式化数据
- */
- private static final String DATE_FORMAT = "ss mm HH dd MM ? yyyy";
-
- /**
- * 准确的时间点到表达式
- * @param date
- * @return
- */
- public static String dateToCron(final Date date){
- SimpleDateFormat fmt = new SimpleDateFormat(DATE_FORMAT);
- String formatTimeStr = "";
- if (date != null) {
- formatTimeStr = fmt.format(date);
- }
- return formatTimeStr;
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/DateUtils.java b/exam-api/src/main/java/com/yf/exam/core/utils/DateUtils.java
deleted file mode 100644
index 4121ef5..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/DateUtils.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.yf.exam.core.utils;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-/**
- * 日期处理工具类
- * ClassName: DateUtils
- * date: 2018年12月13日 下午6:34:02
- *
- * @author Bool
- * @version
- */
-public class DateUtils {
-
- /**
- *
- * calcExpDays:计算某个日期与当前日期相差的天数，如果计算的日期大于现在时间，将返回负数；否则返回正数
- * @author Bool
- * @param userCreateTime
- * @return
- * @since JDK 1.6
- */
- public static int calcExpDays(Date userCreateTime){
-
- Calendar start = Calendar.getInstance();
- start.setTime(userCreateTime);
-
- Calendar now = Calendar.getInstance();
- now.setTime(new Date());
-
- long l = now.getTimeInMillis() - start.getTimeInMillis();
- int days = new Long(l / (1000 * 60 * 60 * 24)).intValue();
- return days;
- }
-
-
- /**
- *
- * dateNow:获取当前时间的字符串格式，根据传入的格式化来展示.
- * @author Bool
- * @param format 日期格式化
- * @return
- */
- public static String dateNow(String format) {
- SimpleDateFormat fmt = new SimpleDateFormat(format);
- Calendar c = new GregorianCalendar();
- return fmt.format(c.getTime());
- }
-
- /**
- * formatDate:格式化日期，返回指定的格式
- * @author Bool
- * @param time
- * @param format
- * @return
- */
- public static String formatDate(Date time, String format) {
- SimpleDateFormat fmt = new SimpleDateFormat(format);
- return fmt.format(time.getTime());
- }
-
-
-
- /**
- * parseDate:将字符串转换成日期，使用：yyyy-MM-dd HH:mm:ss 来格式化
- * @author Bool
- * @param date
- * @return
- */
- public static Date parseDate(String date) {
- return parseDate(date, "yyyy-MM-dd HH:mm:ss");
- }
-
-
- /**
- *
- * parseDate:将字符串转换成日期，使用指定格式化来格式化
- * @author Bool
- * @param date
- * @param pattern
- * @return
- */
- public static Date parseDate(String date, String pattern) {
-
- if (pattern==null) {
- pattern = "yyyy-MM-dd HH:mm:ss";
- }
-
- SimpleDateFormat fmt = new SimpleDateFormat(pattern);
-
- try {
-
- return fmt.parse(date);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- return null;
-
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/IpUtils.java b/exam-api/src/main/java/com/yf/exam/core/utils/IpUtils.java
deleted file mode 100644
index 91277d7..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/IpUtils.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.yf.exam.core.utils;
-
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * IP获取工具类，用户获取网络请求过来的真实IP
- * ClassName: IpUtils
- * date: 2018年2月13日 下午7:27:52
- *
- * @author Bool
- * @version
- */
-public class IpUtils {
-
-
- /**
- *
- * getClientIp:通过请求获取客户端的真实IP地址
- * @author Bool
- * @param request
- * @return
- */
- public static String extractClientIp(HttpServletRequest request) {
-
- String ip = null;
-
- //X-Forwarded-For：Squid 服务代理
- String ipAddresses = request.getHeader("X-Forwarded-For");
-
- if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
- //Proxy-Client-IP：apache 服务代理
- ipAddresses = request.getHeader("Proxy-Client-IP");
- }
-
- if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
- //WL-Proxy-Client-IP：weblogic 服务代理
- ipAddresses = request.getHeader("WL-Proxy-Client-IP");
- }
-
- if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
- //HTTP_CLIENT_IP：有些代理服务器
- ipAddresses = request.getHeader("HTTP_CLIENT_IP");
- }
-
- if (ipAddresses == null || ipAddresses.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
- //X-Real-IP：nginx服务代理
- ipAddresses = request.getHeader("X-Real-IP");
- }
-
- //有些网络通过多层代理，那么获取到的ip就会有多个，一般都是通过逗号（,）分割开来，并且第一个ip为客户端的真实IP
- if (ipAddresses != null && ipAddresses.length() != 0) {
- ip = ipAddresses.split(",")[0];
- }
-
- //还是不能获取到，最后再通过request.getRemoteAddr();获取
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ipAddresses)) {
- ip = request.getRemoteAddr();
- }
-
- return ip;
- }
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/Reflections.java b/exam-api/src/main/java/com/yf/exam/core/utils/Reflections.java
deleted file mode 100644
index 4d50bf2..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/Reflections.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/**
- * Copyright (c) 2005-2012 springside.org.cn
- */
-package com.yf.exam.core.utils;
-
-import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.springframework.util.Assert;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 反射工具类.
- * 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
- * @author calvin
- * @version 2016-01-15
- */
-@Log4j2
-public class Reflections {
-
- private static final String SETTER_PREFIX = "set";
-
- private static final String GETTER_PREFIX = "get";
-
- private static final String CGLIB_CLASS_SEPARATOR = "$$";
-
-
- /**
- * 获取类的所有属性，包括父类
- *
- * @param object
- * @return
- */
- public static Field[] getAllFields(Object object) {
- Class clazz = object.getClass();
- List fieldList = new ArrayList<>();
- while (clazz != null) {
- fieldList.addAll(new ArrayList<>(Arrays.asList(clazz.getDeclaredFields())));
- clazz = clazz.getSuperclass();
- }
- Field[] fields = new Field[fieldList.size()];
- fieldList.toArray(fields);
- return fields;
- }
-
-
- /**
- * 调用Getter方法.
- * 支持多级，如：对象名.对象名.方法
- */
- public static Object invokeGetter(Object obj, String propertyName) {
- Object object = obj;
- for (String name : StringUtils.split(propertyName, ".")){
- String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
- object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
- }
- return object;
- }
-
- /**
- * 调用Setter方法, 仅匹配方法名。
- * 支持多级，如：对象名.对象名.方法
- */
- public static void invokeSetter(Object obj, String propertyName, Object value) {
- Object object = obj;
- String[] names = StringUtils.split(propertyName, ".");
- for (int i=0; i[] parameterTypes,
- final Object[] args) {
- Method method = getAccessibleMethod(obj, methodName, parameterTypes);
- if (method == null) {
- throw new IllegalArgumentException("Could not find method [" + methodName + "] on target [" + obj + "]");
- }
-
- try {
- return method.invoke(obj, args);
- } catch (Exception e) {
- throw convertReflectionExceptionToUnchecked(e);
- }
- }
-
- /**
- * 直接调用对象方法, 无视private/protected修饰符，
- * 用于一次性调用的情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用.
- * 只匹配函数名，如果有多个同名函数调用第一个。
- */
- public static Object invokeMethodByName(final Object obj, final String methodName, final Object[] args) {
- Method method = getAccessibleMethodByName(obj, methodName);
- if (method == null) {
- throw new IllegalArgumentException("Could not find method [" + methodName + "] on target [" + obj + "]");
- }
-
- try {
- return method.invoke(obj, args);
- } catch (Exception e) {
- throw convertReflectionExceptionToUnchecked(e);
- }
- }
-
- /**
- * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问.
- *
- * 如向上转型到Object仍无法找到, 返回null.
- */
- public static Field getAccessibleField(final Object obj, final String fieldName) {
- Validate.notNull(obj, "object can't be null");
- Validate.notBlank(fieldName, "fieldName can't be blank");
- for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) {
- try {
- Field field = superClass.getDeclaredField(fieldName);
- makeAccessible(field);
- return field;
- } catch (NoSuchFieldException e) {//NOSONAR
- // Field不在当前类定义,继续向上转型
- continue;// new add
- }
- }
- return null;
- }
-
- /**
- * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
- * 如向上转型到Object仍无法找到, 返回null.
- * 匹配函数名+参数类型。
- *
- * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
- */
- public static Method getAccessibleMethod(final Object obj, final String methodName,
- final Class... parameterTypes) {
- Validate.notNull(obj, "object can't be null");
- Validate.notBlank(methodName, "methodName can't be blank");
-
- for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) {
- try {
- Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
- makeAccessible(method);
- return method;
- } catch (NoSuchMethodException e) {
- // Method不在当前类定义,继续向上转型
- continue;// new add
- }
- }
- return null;
- }
-
- /**
- * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
- * 如向上转型到Object仍无法找到, 返回null.
- * 只匹配函数名。
- *
- * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
- */
- public static Method getAccessibleMethodByName(final Object obj, final String methodName) {
- Validate.notNull(obj, "object can't be null");
- Validate.notBlank(methodName, "methodName can't be blank");
-
- for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) {
- Method[] methods = searchType.getDeclaredMethods();
- for (Method method : methods) {
- if (method.getName().equals(methodName)) {
- makeAccessible(method);
- return method;
- }
- }
- }
- return null;
- }
-
- /**
- * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
- */
- public static void makeAccessible(Method method) {
- if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
- && !method.isAccessible()) {
- method.setAccessible(true);
- }
- }
-
- /**
- * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
- */
- public static void makeAccessible(Field field) {
- if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) || Modifier
- .isFinal(field.getModifiers())) && !field.isAccessible()) {
- field.setAccessible(true);
- }
- }
-
- /**
- * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处
- * 如无法找到, 返回Object.class.
- * eg.
- * public UserDao extends HibernateDao
- *
- * @param clazz The class to introspect
- * @return the first generic declaration, or Object.class if cannot be determined
- */
- @SuppressWarnings("unchecked")
- public static Class getClassGenricType(final Class clazz) {
- return getClassGenricType(clazz, 0);
- }
-
- /**
- * 通过反射, 获得Class定义中声明的父类的泛型参数的类型.
- * 如无法找到, 返回Object.class.
- *
- * 如public UserDao extends HibernateDao
- *
- * @param clazz clazz The class to introspect
- * @param index the Index of the generic ddeclaration,start from 0.
- * @return the index generic declaration, or Object.class if cannot be determined
- */
- public static Class getClassGenricType(final Class clazz, final int index) {
-
- Type genType = clazz.getGenericSuperclass();
-
- if (!(genType instanceof ParameterizedType)) {
- log.warn(clazz.getSimpleName() + "'s superclass not ParameterizedType");
- return Object.class;
- }
-
- Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
-
- if (index >= params.length || index < 0) {
- log.warn("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
- + params.length);
- return Object.class;
- }
- if (!(params[index] instanceof Class)) {
- log.warn(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
- return Object.class;
- }
-
- return (Class) params[index];
- }
-
- public static Class getUserClass(Object instance) {
- Assert.notNull(instance, "Instance must not be null");
- Class clazz = instance.getClass();
- if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) {
- Class superClass = clazz.getSuperclass();
- if (superClass != null && !Object.class.equals(superClass)) {
- return superClass;
- }
- }
- return clazz;
-
- }
-
- /**
- * 将反射时的checked exception转换为unchecked exception.
- */
- public static RuntimeException convertReflectionExceptionToUnchecked(Exception e) {
- if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException
- || e instanceof NoSuchMethodException) {
- return new IllegalArgumentException(e);
- } else if (e instanceof InvocationTargetException) {
- return new RuntimeException(((InvocationTargetException) e).getTargetException());
- } else if (e instanceof RuntimeException) {
- return (RuntimeException) e;
- }
- return new RuntimeException("Unexpected Checked Exception.", e);
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/SpringUtils.java b/exam-api/src/main/java/com/yf/exam/core/utils/SpringUtils.java
deleted file mode 100644
index 295c827..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/SpringUtils.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.yf.exam.core.utils;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-/**
- * Spring获取工具
- *
- * @author bool
- * @date 2019-12-09 15:55
- */
-@Component
-public class SpringUtils implements ApplicationContextAware {
-
- private static ApplicationContext applicationContext;
-
- @Override
- public void setApplicationContext(ApplicationContext context) throws BeansException {
- applicationContext = context;
- }
-
- public static T getBean(Class tClass) {
- return applicationContext.getBean(tClass);
- }
-
- public static T getBean(String name, Class type) {
- return applicationContext.getBean(name, type);
- }
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/StringUtils.java b/exam-api/src/main/java/com/yf/exam/core/utils/StringUtils.java
deleted file mode 100644
index c0bc43b..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/StringUtils.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.yf.exam.core.utils;
-
-import java.util.Map;
-
-/**
- * 字符串常用工具类
- * @author bool
- * @date 2019-05-15 11:40
- */
-public class StringUtils {
-
- /**
- * 判断是否为空字符
- * @param str
- * @return
- */
- public static boolean isBlank(String str){
- return str==null || "".equals(str);
- }
-
-
- /**
- * 将MAP转换成一个xml格式，格式为value...
- * @param params
- * @return
- */
- public static String mapToXml(Map params){
- StringBuffer sb = new StringBuffer("");
- for(String key:params.keySet()){
- sb.append("<")
- .append(key).append(">")
- .append(params.get(key))
- .append("");
- }
-
- sb.append("");
- return sb.toString();
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/excel/ExportExcel.java b/exam-api/src/main/java/com/yf/exam/core/utils/excel/ExportExcel.java
deleted file mode 100644
index d98b557..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/excel/ExportExcel.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/**
- * Copyright © 2015-2020 JeePlus All rights reserved.
- */
-package com.yf.exam.core.utils.excel;
-
-import com.google.common.collect.Lists;
-import com.yf.exam.core.utils.Reflections;
-import com.yf.exam.core.utils.excel.annotation.ExcelField;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.DataFormat;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.URLEncoder;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 导出Excel文件（导出“XLSX”格式，支持大数据量导出 @see org.apache.poi.ss.SpreadsheetVersion）
- * @author jeeplus
- * @version 2016-04-21
- */
-public class ExportExcel {
-
- private static Logger log = LoggerFactory.getLogger(ExportExcel.class);
-
- /**
- * 工作薄对象
- */
- private SXSSFWorkbook wb;
-
- /**
- * 工作表对象
- */
- private Sheet sheet;
-
- /**
- * 样式列表
- */
- private Map styles;
-
- /**
- * 当前行号
- */
- private int rownum;
-
- /**
- * 注解列表（Object[]{ ExcelField, Field/Method }）
- */
- List annotationList = Lists.newArrayList();
-
- /**
- * 构造函数
- * @param title 表格标题，传“空值”，表示无标题
- * @param cls 实体对象，通过annotation.ExportField获取标题
- */
- public ExportExcel(String title, Class cls){
- this(title, cls, 1);
- }
-
- /**
- * 构造函数
- * @param title 表格标题，传“空值”，表示无标题
- * @param cls 实体对象，通过annotation.ExportField获取标题
- * @param type 导出类型（1:导出数据；2：导出模板）
- * @param groups 导入分组
- */
- public ExportExcel(String title, Class cls, int type, int... groups){
- // Get annotation field
- Field[] fs = cls.getDeclaredFields();
- for (Field f : fs){
- ExcelField ef = f.getAnnotation(ExcelField.class);
- if (ef != null && (ef.type()==0 || ef.type()==type)){
- if (groups!=null && groups.length>0){
- boolean inGroup = false;
- for (int g : groups){
- if (inGroup){
- break;
- }
- for (int efg : ef.groups()){
- if (g == efg){
- inGroup = true;
- annotationList.add(new Object[]{ef, f});
- break;
- }
- }
- }
- }else{
- annotationList.add(new Object[]{ef, f});
- }
- }
- }
- // Get annotation method
- Method[] ms = cls.getDeclaredMethods();
- for (Method m : ms){
- ExcelField ef = m.getAnnotation(ExcelField.class);
- if (ef != null && (ef.type()==0 || ef.type()==type)){
- if (groups!=null && groups.length>0){
- boolean inGroup = false;
- for (int g : groups){
- if (inGroup){
- break;
- }
- for (int efg : ef.groups()){
- if (g == efg){
- inGroup = true;
- annotationList.add(new Object[]{ef, m});
- break;
- }
- }
- }
- }else{
- annotationList.add(new Object[]{ef, m});
- }
- }
- }
- // Field sorting
- Collections.sort(annotationList, new Comparator() {
- @Override
- public int compare(Object[] o1, Object[] o2) {
- return new Integer(((ExcelField)o1[0]).sort()).compareTo(
- new Integer(((ExcelField)o2[0]).sort()));
- }
- });
- // Initialize
- List headerList = Lists.newArrayList();
- for (Object[] os : annotationList){
- String t = ((ExcelField)os[0]).title();
- // 如果是导出，则去掉注释
- if (type==1){
- String[] ss = StringUtils.split(t, "**", 2);
- if (ss.length==2){
- t = ss[0];
- }
- }
- headerList.add(t);
- }
- initialize(title, headerList);
- }
- /**
- * 初始化函数
- * @param title 表格标题，传“空值”，表示无标题
- * @param headerList 表头列表
- */
- private void initialize(String title, List headerList) {
- this.wb = new SXSSFWorkbook(500);
- this.sheet = wb.createSheet("Export");
- this.styles = createStyles(wb);
- // Create title
- if (StringUtils.isNotBlank(title)){
- Row titleRow = sheet.createRow(rownum++);
- titleRow.setHeightInPoints(30);
- Cell titleCell = titleRow.createCell(0);
- titleCell.setCellStyle(styles.get("title"));
- titleCell.setCellValue(title);
- sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(),
- titleRow.getRowNum(), titleRow.getRowNum(), headerList.size()-1));
- }
- // Create header
- if (headerList == null){
- throw new RuntimeException("headerList not null!");
- }
- Row headerRow = sheet.createRow(rownum++);
- headerRow.setHeightInPoints(16);
- for (int i = 0; i < headerList.size(); i++) {
- Cell cell = headerRow.createCell(i);
- cell.setCellStyle(styles.get("header"));
- String[] ss = StringUtils.split(headerList.get(i), "**", 2);
- if (ss.length==2){
- cell.setCellValue(ss[0]);
- Comment comment = this.sheet.createDrawingPatriarch().createCellComment(
- new XSSFClientAnchor(0, 0, 0, 0, (short) 3, 3, (short) 5, 6));
- comment.setString(new XSSFRichTextString(ss[1]));
- cell.setCellComment(comment);
- }else{
- cell.setCellValue(headerList.get(i));
- }
- sheet.autoSizeColumn(i);
- }
- for (int i = 0; i < headerList.size(); i++) {
- int colWidth = sheet.getColumnWidth(i)*2;
- sheet.setColumnWidth(i, colWidth < 3000 ? 3000 : colWidth);
- }
- log.debug("Initialize success.");
- }
-
- /**
- * 创建表格样式
- * @param wb 工作薄对象
- * @return 样式列表
- */
- private Map createStyles(Workbook wb) {
- Map styles = new HashMap<>(16);
-
- CellStyle style = wb.createCellStyle();
- style.setAlignment(CellStyle.ALIGN_CENTER);
- style.setVerticalAlignment(CellStyle.VERTICAL_CENTER);
- Font titleFont = wb.createFont();
- titleFont.setFontName("Arial");
- titleFont.setFontHeightInPoints((short) 16);
- titleFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
- style.setFont(titleFont);
- styles.put("title", style);
-
- style = wb.createCellStyle();
- style.setVerticalAlignment(CellStyle.VERTICAL_CENTER);
- style.setBorderRight(CellStyle.BORDER_THIN);
- style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderLeft(CellStyle.BORDER_THIN);
- style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderTop(CellStyle.BORDER_THIN);
- style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderBottom(CellStyle.BORDER_THIN);
- style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- Font dataFont = wb.createFont();
- dataFont.setFontName("Arial");
- dataFont.setFontHeightInPoints((short) 10);
- style.setFont(dataFont);
- styles.put("data", style);
-
- style = wb.createCellStyle();
- style.cloneStyleFrom(styles.get("data"));
- style.setAlignment(CellStyle.ALIGN_LEFT);
- styles.put("data1", style);
-
- style = wb.createCellStyle();
- style.cloneStyleFrom(styles.get("data"));
- style.setAlignment(CellStyle.ALIGN_CENTER);
- styles.put("data2", style);
-
- style = wb.createCellStyle();
- style.cloneStyleFrom(styles.get("data"));
- style.setAlignment(CellStyle.ALIGN_RIGHT);
- styles.put("data3", style);
-
- style = wb.createCellStyle();
- style.cloneStyleFrom(styles.get("data"));
-// style.setWrapText(true);
- style.setAlignment(CellStyle.ALIGN_CENTER);
- style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setFillPattern(CellStyle.SOLID_FOREGROUND);
- Font headerFont = wb.createFont();
- headerFont.setFontName("Arial");
- headerFont.setFontHeightInPoints((short) 10);
- headerFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
- headerFont.setColor(IndexedColors.WHITE.getIndex());
- style.setFont(headerFont);
- styles.put("header", style);
-
- return styles;
- }
-
- /**
- * 添加一行
- * @return 行对象
- */
- public Row addRow(){
- return sheet.createRow(rownum++);
- }
-
-
- /**
- * 添加一个单元格
- * @param row 添加的行
- * @param column 添加列号
- * @param val 添加值
- * @return 单元格对象
- */
- public Cell addCell(Row row, int column, Object val){
- return this.addCell(row, column, val, 0, Class.class);
- }
-
- /**
- * 添加一个单元格
- * @param row 添加的行
- * @param column 添加列号
- * @param val 添加值
- * @param align 对齐方式（1：靠左；2：居中；3：靠右）
- * @return 单元格对象
- */
- public Cell addCell(Row row, int column, Object val, int align, Class fieldType){
- Cell cell = row.createCell(column);
- CellStyle style = styles.get("data"+(align>=1&&align<=3?align:""));
- try {
- if (val == null){
- cell.setCellValue("");
- } else if (val instanceof String) {
- cell.setCellValue((String) val);
- } else if (val instanceof Integer) {
- cell.setCellValue((Integer) val);
- } else if (val instanceof Long) {
- cell.setCellValue((Long) val);
- } else if (val instanceof Double) {
- cell.setCellValue((Double) val);
- } else if (val instanceof Float) {
- cell.setCellValue((Float) val);
- } else if (val instanceof Date) {
- DataFormat format = wb.createDataFormat();
- style.setDataFormat(format.getFormat("yyyy-MM-dd"));
- cell.setCellValue((Date) val);
- } else {
- if (fieldType != Class.class){
- cell.setCellValue((String)fieldType.getMethod("setValue", Object.class).invoke(null, val));
- }else{
- cell.setCellValue((String)Class.forName(this.getClass().getName().replaceAll(this.getClass().getSimpleName(),
- "fieldtype."+val.getClass().getSimpleName()+"Type")).getMethod("setValue", Object.class).invoke(null, val));
- }
- }
- } catch (Exception ex) {
- log.info("Set cell value ["+row.getRowNum()+","+column+"] error: " + ex.toString());
- cell.setCellValue(val.toString());
- }
- cell.setCellStyle(style);
- return cell;
- }
-
- /**
- * 添加数据（通过annotation.ExportField添加数据）
- * @return list 数据列表
- */
- public ExportExcel setDataList(List list){
- for (E e : list){
- int colunm = 0;
- Row row = this.addRow();
- StringBuilder sb = new StringBuilder();
- for (Object[] os : annotationList){
- ExcelField ef = (ExcelField)os[0];
- Object val = null;
- try{
- if (StringUtils.isNotBlank(ef.value())){
- val = Reflections.invokeGetter(e, ef.value());
- }else{
- if (os[1] instanceof Field){
- val = Reflections.invokeGetter(e, ((Field)os[1]).getName());
- }else if (os[1] instanceof Method){
- val = Reflections.invokeMethod(e, ((Method)os[1]).getName(), new Class[] {}, new Object[] {});
- }
- }
- }catch(Exception ex) {
- log.info(ex.toString());
- val = "";
- }
- this.addCell(row, colunm++, val, ef.align(), ef.fieldType());
- sb.append(val + ", ");
- }
- log.debug("Write success: ["+row.getRowNum()+"] "+sb.toString());
- }
- return this;
- }
-
- /**
- * 输出数据流
- * @param os 输出数据流
- */
- public ExportExcel write(OutputStream os) throws IOException{
- wb.write(os);
- return this;
- }
-
- /**
- * 输出到客户端
- * @param fileName 输出文件名
- */
- public ExportExcel write(HttpServletResponse response, String fileName) throws IOException{
- response.reset();
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setContentType("application/octet-stream; charset=utf-8");
- response.addHeader("Content-Disposition", "attachment; filename="+ URLEncoder.encode(fileName, "utf-8"));
- write(response.getOutputStream());
- return this;
- }
-
- /**
- * 清理临时文件
- */
- public ExportExcel dispose(){
- wb.dispose();
- return this;
- }
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/excel/ImportExcel.java b/exam-api/src/main/java/com/yf/exam/core/utils/excel/ImportExcel.java
deleted file mode 100644
index fca308a..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/excel/ImportExcel.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * Copyright © 2015-2020 JeePlus All rights reserved.
- */
-package com.yf.exam.core.utils.excel;
-
-import com.google.common.collect.Lists;
-import com.yf.exam.core.utils.Reflections;
-import com.yf.exam.core.utils.excel.annotation.ExcelField;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 导入Excel文件（支持“XLS”和“XLSX”格式）
- * @author jeeplus
- * @version 2016-03-10
- */
-public class ImportExcel {
-
- private static Logger log = LoggerFactory.getLogger(ImportExcel.class);
-
- /**
- * 工作薄对象
- */
- private Workbook wb;
-
- /**
- * 工作表对象
- */
- private Sheet sheet;
-
- /**
- * 标题行号
- */
- private int headerNum;
-
-
-
- /**
- * 构造函数
- * @param multipartFile 导入文件对象
- * @param headerNum 标题行号，数据行号=标题行号+1
- * @param sheetIndex 工作表编号
- * @throws InvalidFormatException
- * @throws IOException
- */
- public ImportExcel(MultipartFile multipartFile, int headerNum, int sheetIndex)
- throws InvalidFormatException, IOException {
- this(multipartFile.getOriginalFilename(), multipartFile.getInputStream(), headerNum, sheetIndex);
- }
-
- /**
- * 构造函数
- * @param is 导入文件对象
- * @param headerNum 标题行号，数据行号=标题行号+1
- * @param sheetIndex 工作表编号
- * @throws InvalidFormatException
- * @throws IOException
- */
- public ImportExcel(String fileName, InputStream is, int headerNum, int sheetIndex)
- throws IOException {
- if (StringUtils.isBlank(fileName)){
- throw new RuntimeException("导入文档为空!");
- }else if(fileName.toLowerCase().endsWith("xls")){
- this.wb = new HSSFWorkbook(is);
- }else if(fileName.toLowerCase().endsWith("xlsx")){
- this.wb = new XSSFWorkbook(is);
- }else{
- throw new RuntimeException("文档格式不正确!");
- }
- if (this.wb.getNumberOfSheets() List getDataList(Class cls, int... groups) throws InstantiationException, IllegalAccessException{
- List annotationList = Lists.newArrayList();
- // Get annotation field
- Field[] fs = cls.getDeclaredFields();
- for (Field f : fs){
- ExcelField ef = f.getAnnotation(ExcelField.class);
- if (ef != null && (ef.type()==0 || ef.type()==2)){
- if (groups!=null && groups.length>0){
- boolean inGroup = false;
- for (int g : groups){
- if (inGroup){
- break;
- }
- for (int efg : ef.groups()){
- if (g == efg){
- inGroup = true;
- annotationList.add(new Object[]{ef, f});
- break;
- }
- }
- }
- }else{
- annotationList.add(new Object[]{ef, f});
- }
- }
- }
- // Get annotation method
- Method[] ms = cls.getDeclaredMethods();
- for (Method m : ms){
- ExcelField ef = m.getAnnotation(ExcelField.class);
- if (ef != null && (ef.type()==0 || ef.type()==2)){
- if (groups!=null && groups.length>0){
- boolean inGroup = false;
- for (int g : groups){
- if (inGroup){
- break;
- }
- for (int efg : ef.groups()){
- if (g == efg){
- inGroup = true;
- annotationList.add(new Object[]{ef, m});
- break;
- }
- }
- }
- }else{
- annotationList.add(new Object[]{ef, m});
- }
- }
- }
- // Field sorting
- Collections.sort(annotationList, new Comparator() {
- @Override
- public int compare(Object[] o1, Object[] o2) {
- return new Integer(((ExcelField)o1[0]).sort()).compareTo(
- new Integer(((ExcelField)o2[0]).sort()));
- }
- });
- // Get excel data
- List dataList = Lists.newArrayList();
- for (int i = this.getDataRowNum(); i < this.getLastDataRowNum(); i++) {
- E e = (E)cls.newInstance();
- int column = 0;
- Row row = this.getRow(i);
- StringBuilder sb = new StringBuilder();
- for (Object[] os : annotationList){
- Object val = this.getCellValue(row, column++);
- if (val != null){
- ExcelField ef = (ExcelField)os[0];
- // Get param type and type cast
- Class valType = Class.class;
- if (os[1] instanceof Field){
- valType = ((Field)os[1]).getType();
- }else if (os[1] instanceof Method){
- Method method = ((Method)os[1]);
- if ("get".equals(method.getName().substring(0, 3))){
- valType = method.getReturnType();
- }else if("set".equals(method.getName().substring(0, 3))){
- valType = ((Method)os[1]).getParameterTypes()[0];
- }
- }
- //log.debug("Import value type: ["+i+","+column+"] " + valType);
- try {
- //如果导入的java对象，需要在这里自己进行变换。
- if (valType == String.class){
- String s = String.valueOf(val.toString());
- if(StringUtils.endsWith(s, ".0")){
- val = StringUtils.substringBefore(s, ".0");
- }else{
- val = String.valueOf(val.toString());
- }
- }else if (valType == Integer.class){
- val = Double.valueOf(val.toString()).intValue();
- }else if (valType == Long.class){
- val = Double.valueOf(val.toString()).longValue();
- }else if (valType == Double.class){
- val = Double.valueOf(val.toString());
- }else if (valType == Float.class){
- val = Float.valueOf(val.toString());
- }else if (valType == Date.class){
- SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
- val=sdf.parse(val.toString());
- }else{
- if (ef.fieldType() != Class.class){
- val = ef.fieldType().getMethod("getValue", String.class).invoke(null, val.toString());
- }else{
- val = Class.forName(this.getClass().getName().replaceAll(this.getClass().getSimpleName(),
- "fieldtype."+valType.getSimpleName()+"Type")).getMethod("getValue", String.class).invoke(null, val.toString());
- }
- }
- } catch (Exception ex) {
- log.info("Get cell value ["+i+","+column+"] error: " + ex.toString());
- val = null;
- }
- // set entity value
- if (os[1] instanceof Field){
- Reflections.invokeSetter(e, ((Field)os[1]).getName(), val);
- }else if (os[1] instanceof Method){
- String mthodName = ((Method)os[1]).getName();
- if ("get".equals(mthodName.substring(0, 3))){
- mthodName = "set"+StringUtils.substringAfter(mthodName, "get");
- }
- Reflections.invokeMethod(e, mthodName, new Class[] {valType}, new Object[] {val});
- }
- }
- sb.append(val+", ");
- }
- dataList.add(e);
- log.debug("Read success: ["+i+"] "+sb.toString());
- }
- return dataList;
- }
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/excel/annotation/ExcelField.java b/exam-api/src/main/java/com/yf/exam/core/utils/excel/annotation/ExcelField.java
deleted file mode 100644
index add0d1c..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/excel/annotation/ExcelField.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright © 2015-2020 JeePlus All rights reserved.
- */
-package com.yf.exam.core.utils.excel.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Excel注解定义
- * @author jeeplus
- * @version 2016-03-10
- */
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ExcelField {
-
- /**
- * 导出字段名（默认调用当前字段的“get”方法，如指定导出字段为对象，请填写“对象名.对象属性”，例：“area.name”、“office.name”）
- */
- String value() default "";
-
- /**
- * 导出字段标题（需要添加批注请用“**”分隔，标题**批注，仅对导出模板有效）
- */
- String title();
-
- /**
- * 字段类型（0：导出导入；1：仅导出；2：仅导入）
- */
- int type() default 0;
-
- /**
- * 导出字段对齐方式（0：自动；1：靠左；2：居中；3：靠右）
- */
- int align() default 0;
-
- /**
- * 导出字段字段排序（升序）
- */
- int sort() default 0;
-
- /**
- * 如果是字典类型，请设置字典的type值
- */
- String dictType() default "";
-
- /**
- * 反射类型
- */
- Class fieldType() default Class.class;
-
- /**
- * 字段归属组（根据分组导出导入）
- */
- int[] groups() default {};
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/excel/fieldtype/ListType.java b/exam-api/src/main/java/com/yf/exam/core/utils/excel/fieldtype/ListType.java
deleted file mode 100644
index 9369888..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/excel/fieldtype/ListType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright © 2015-2020 JeePlus All rights reserved.
- */
-package com.yf.exam.core.utils.excel.fieldtype;
-
-import com.google.common.collect.Lists;
-import com.yf.exam.core.utils.StringUtils;
-
-import java.util.List;
-
-/**
- * 字段类型转换
- * @author jeeplus
- * @version 2016-5-29
- */
-public class ListType {
-
- /**
- * 获取对象值（导入）
- */
- public static Object getValue(String val) {
- List list = Lists.newArrayList();
- if(!StringUtils.isBlank(val)) {
- for (String s : val.split(",")) {
- list.add(s);
- }
- }
- return list;
- }
-
- /**
- * 设置对象值（导出）
- */
- public static String setValue(Object val) {
- if (val != null){
- List list = (List)val;
- StringBuffer sb = null;
- for (String item: list){
- if(StringUtils.isBlank(item)){
- continue;
- }
- if(sb == null){
- sb = new StringBuffer(item);
- }else{
- sb.append(",").append(item);
- }
- }
-
- if(sb!=null) {
- return sb.toString().replace("[]", "");
- }
- }
- return "";
- }
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/file/Md5Util.java b/exam-api/src/main/java/com/yf/exam/core/utils/file/Md5Util.java
deleted file mode 100644
index d5d33cf..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/file/Md5Util.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.yf.exam.core.utils.file;
-
-import java.security.MessageDigest;
-
-
-/**
- * MD5工具类
- * ClassName: MD5Util
- * date: 2018年1月13日 下午6:54:53
- *
- * @author Bool
- * @version
- */
-public class Md5Util {
-
-
- /**
- * 简单MD5
- * @param str
- * @return
- */
- public static String md5(String str) {
-
- try {
- MessageDigest md = MessageDigest.getInstance("MD5");
- byte[] array = md.digest(str.getBytes("UTF-8"));
- StringBuilder sb = new StringBuilder();
- for (byte item : array) {
- sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
- }
- return sb.toString();
- }catch(Exception e) {
- return null;
- }
- }
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/passwd/PassHandler.java b/exam-api/src/main/java/com/yf/exam/core/utils/passwd/PassHandler.java
deleted file mode 100644
index 1af239e..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/passwd/PassHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.yf.exam.core.utils.passwd;
-
-
-import com.yf.exam.core.utils.file.Md5Util;
-import org.apache.commons.lang3.RandomStringUtils;
-
-/**
- * 通用的密码处理类，用于生成密码和校验密码
- * ClassName: PassGenerator
- * date: 2017年12月13日 下午7:13:03
- *
- * @author Bool
- * @version
- */
-public class PassHandler {
-
- /**
- * checkPass:校验密码是否一致
- * @author Bool
- * @param inputPass 用户传入的密码
- * @param salt 数据库保存的密码随机码
- * @param pass 数据库保存的密码MD5
- * @return
- */
- public static boolean checkPass(String inputPass , String salt , String pass){
- String pwdMd5 = Md5Util.md5(inputPass);
- return Md5Util.md5(pwdMd5 + salt).equals(pass);
- }
-
-
- /**
- *
- * buildPassword:用于用户注册时产生一个密码
- * @author Bool
- * @param inputPass 输入的密码
- * @return PassInfo 返回一个密码对象，记得保存
- */
- public static PassInfo buildPassword(String inputPass) {
-
- //产生一个6位数的随机码
- String salt = RandomStringUtils.randomAlphabetic(6);
- //加密后的密码
- String encryptPassword = Md5Util.md5(Md5Util.md5(inputPass)+salt);
- //返回对象
- return new PassInfo(salt,encryptPassword);
- }
-
-
- public static void main(String[] args) {
-
- PassInfo info = buildPassword("190601");
-
- System.out.println(info.getPassword());
- System.out.println(info.getSalt());
- }
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/core/utils/passwd/PassInfo.java b/exam-api/src/main/java/com/yf/exam/core/utils/passwd/PassInfo.java
deleted file mode 100644
index 3634fb6..0000000
--- a/exam-api/src/main/java/com/yf/exam/core/utils/passwd/PassInfo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.yf.exam.core.utils.passwd;
-
-/**
- * 密码实体
- * ClassName: PassInfo
- * date: 2018年2月13日 下午7:13:50
- *
- * @author Bool
- * @version
- */
-public class PassInfo {
-
- //密码随机串码
- private String salt;
-
- //MD5后的密码
- private String password;
-
- public PassInfo(String salt, String password) {
- super();
- this.salt = salt;
- this.password = password;
- }
-
- public String getSalt() {
- return salt;
- }
- public void setSalt(String salt) {
- this.salt = salt;
- }
- public String getPassword() {
- return password;
- }
- public void setPassword(String password) {
- this.password = password;
- }
-}
-
diff --git a/exam-api/src/main/java/com/yf/exam/modules/Constant.java b/exam-api/src/main/java/com/yf/exam/modules/Constant.java
deleted file mode 100644
index 20c5726..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/Constant.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.yf.exam.modules;
-
-
-/**
- * 通用常量
- * @author bool
- */
-public class Constant {
-
- /**
- * 会话
- */
- public static final String TOKEN = "token";
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/controller/ExamController.java b/exam-api/src/main/java/com/yf/exam/modules/exam/controller/ExamController.java
deleted file mode 100644
index e5583f2..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/controller/ExamController.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.yf.exam.modules.exam.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yf.exam.core.api.ApiRest;
-import com.yf.exam.core.api.controller.BaseController;
-import com.yf.exam.core.api.dto.BaseIdReqDTO;
-import com.yf.exam.core.api.dto.BaseIdsReqDTO;
-import com.yf.exam.core.api.dto.BaseStateReqDTO;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.modules.exam.dto.ExamDTO;
-import com.yf.exam.modules.exam.dto.request.ExamSaveReqDTO;
-import com.yf.exam.modules.exam.dto.response.ExamOnlineRespDTO;
-import com.yf.exam.modules.exam.dto.response.ExamReviewRespDTO;
-import com.yf.exam.modules.exam.entity.Exam;
-import com.yf.exam.modules.exam.service.ExamService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresRoles;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-
-/**
-*
-* 考试控制器
-*
-*
-* @author 聪明笨狗
-* @since 2020-07-25 16:18
-*/
-@Api(tags={"考试"})
-@RestController
-@RequestMapping("/exam/api/exam/exam")
-public class ExamController extends BaseController {
-
- @Autowired
- private ExamService baseService;
-
- /**
- * 添加或修改
- * @param reqDTO
- * @return
- */
- @RequiresRoles("sa")
- @ApiOperation(value = "添加或修改")
- @RequestMapping(value = "/save", method = { RequestMethod.POST})
- public ApiRest save(@RequestBody ExamSaveReqDTO reqDTO) {
- //复制参数
- baseService.save(reqDTO);
- return super.success();
- }
-
- /**
- * 批量删除
- * @param reqDTO
- * @return
- */
- @RequiresRoles("sa")
- @ApiOperation(value = "批量删除")
- @RequestMapping(value = "/delete", method = { RequestMethod.POST})
- public ApiRest edit(@RequestBody BaseIdsReqDTO reqDTO) {
- //根据ID删除
- baseService.removeByIds(reqDTO.getIds());
- return super.success();
- }
-
- /**
- * 查找详情
- * @param reqDTO
- * @return
- */
- @ApiOperation(value = "查找详情")
- @RequestMapping(value = "/detail", method = { RequestMethod.POST})
- public ApiRest find(@RequestBody BaseIdReqDTO reqDTO) {
- ExamSaveReqDTO dto = baseService.findDetail(reqDTO.getId());
- return super.success(dto);
- }
-
- /**
- * 查找详情
- * @param reqDTO
- * @return
- */
- @RequiresRoles("sa")
- @ApiOperation(value = "查找详情")
- @RequestMapping(value = "/state", method = { RequestMethod.POST})
- public ApiRest state(@RequestBody BaseStateReqDTO reqDTO) {
-
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda().in(Exam::getId, reqDTO.getIds());
- Exam exam = new Exam();
- exam.setState(reqDTO.getState());
- exam.setUpdateTime(new Date());
-
- baseService.update(exam, wrapper);
- return super.success();
- }
-
-
- /**
- * 分页查找
- * @param reqDTO
- * @return
- */
- @ApiOperation(value = "考试视角")
- @RequestMapping(value = "/online-paging", method = { RequestMethod.POST})
- public ApiRest> myPaging(@RequestBody PagingReqDTO reqDTO) {
-
- //分页查询并转换
- IPage page = baseService.onlinePaging(reqDTO);
- return super.success(page);
- }
-
- /**
- * 分页查找
- * @param reqDTO
- * @return
- */
- @RequiresRoles("sa")
- @ApiOperation(value = "分页查找")
- @RequestMapping(value = "/paging", method = { RequestMethod.POST})
- public ApiRest> paging(@RequestBody PagingReqDTO reqDTO) {
-
- //分页查询并转换
- IPage page = baseService.paging(reqDTO);
-
- return super.success(page);
- }
-
-
- /**
- * 分页查找
- * @param reqDTO
- * @return
- */
- @RequiresRoles("sa")
- @ApiOperation(value = "待阅试卷")
- @RequestMapping(value = "/review-paging", method = { RequestMethod.POST})
- public ApiRest> reviewPaging(@RequestBody PagingReqDTO reqDTO) {
- //分页查询并转换
- IPage page = baseService.reviewPaging(reqDTO);
- return super.success(page);
- }
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ExamDTO.java b/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ExamDTO.java
deleted file mode 100644
index 90f86f1..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ExamDTO.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.yf.exam.modules.exam.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yf.exam.modules.paper.enums.ExamState;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-*
-* 考试数据传输类
-*
-*
-* @author 聪明笨狗
-* @since 2020-07-25 16:18
-*/
-@Data
-@ApiModel(value="考试", description="考试")
-public class ExamDTO implements Serializable {
-
-
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty(value = "ID", required=true)
- private String id;
-
- @ApiModelProperty(value = "考试名称", required=true)
- private String title;
-
- @ApiModelProperty(value = "考试描述", required=true)
- private String content;
-
- @ApiModelProperty(value = "1公开2部门3定员", required=true)
- private Integer openType;
-
- @ApiModelProperty(value = "考试状态", required=true)
- private Integer state;
-
- @ApiModelProperty(value = "是否限时", required=true)
- private Boolean timeLimit;
-
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "开始时间", required=true)
- private Date startTime;
-
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "结束时间", required=true)
- private Date endTime;
-
- @ApiModelProperty(value = "创建时间", required=true)
- private Date createTime;
-
- @ApiModelProperty(value = "更新时间", required=true)
- private Date updateTime;
-
- @ApiModelProperty(value = "总分数", required=true)
- private Integer totalScore;
-
- @ApiModelProperty(value = "总时长（分钟）", required=true)
- private Integer totalTime;
-
- @ApiModelProperty(value = "及格分数", required=true)
- private Integer qualifyScore;
-
-
-
-
- /**
- * 是否结束
- * @return
- */
- public Integer getState(){
-
- if(this.timeLimit!=null && this.timeLimit){
-
- if(System.currentTimeMillis() < startTime.getTime() ){
- return ExamState.READY_START;
- }
-
- if(System.currentTimeMillis() > endTime.getTime()){
- return ExamState.OVERDUE;
- }
-
- if(System.currentTimeMillis() > startTime.getTime()
- && System.currentTimeMillis() < endTime.getTime()
- && !ExamState.DISABLED.equals(this.state)){
- return ExamState.ENABLE;
- }
-
- }
-
- return this.state;
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ExamDepartDTO.java b/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ExamDepartDTO.java
deleted file mode 100644
index d0e54b7..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ExamDepartDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.yf.exam.modules.exam.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
-*
-* 考试部门数据传输类
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-03 17:24
-*/
-@Data
-@ApiModel(value="考试部门", description="考试部门")
-public class ExamDepartDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty(value = "ID", required=true)
- private String id;
-
- @ApiModelProperty(value = "考试ID", required=true)
- private String examId;
-
- @ApiModelProperty(value = "部门ID", required=true)
- private String departId;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ExamRepoDTO.java b/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ExamRepoDTO.java
deleted file mode 100644
index 7244e9a..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ExamRepoDTO.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.yf.exam.modules.exam.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
-*
-* 考试题库数据传输类
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-05 11:14
-*/
-@Data
-@ApiModel(value="考试题库", description="考试题库")
-public class ExamRepoDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty(value = "ID", required=true)
- private String id;
-
- @ApiModelProperty(value = "考试ID", required=true)
- private String examId;
-
- @ApiModelProperty(value = "题库ID", required=true)
- private String repoId;
-
- @ApiModelProperty(value = "单选题数量", required=true)
- private Integer radioCount;
-
- @ApiModelProperty(value = "单选题分数", required=true)
- private Integer radioScore;
-
- @ApiModelProperty(value = "多选题数量", required=true)
- private Integer multiCount;
-
- @ApiModelProperty(value = "多选题分数", required=true)
- private Integer multiScore;
-
- @ApiModelProperty(value = "判断题数量", required=true)
- private Integer judgeCount;
-
- @ApiModelProperty(value = "判断题分数", required=true)
- private Integer judgeScore;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ext/ExamRepoExtDTO.java b/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ext/ExamRepoExtDTO.java
deleted file mode 100644
index a566fec..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/ext/ExamRepoExtDTO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.yf.exam.modules.exam.dto.ext;
-
-import com.yf.exam.modules.exam.dto.ExamRepoDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
-*
-* 考试题库数据传输类
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-05 11:14
-*/
-@Data
-@ApiModel(value="考试题库扩展响应类", description="考试题库扩展响应类")
-public class ExamRepoExtDTO extends ExamRepoDTO {
-
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty(value = "单选题总量", required=true)
- private Integer totalRadio;
-
- @ApiModelProperty(value = "多选题总量", required=true)
- private Integer totalMulti;
-
- @ApiModelProperty(value = "判断题总量", required=true)
- private Integer totalJudge;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/request/ExamSaveReqDTO.java b/exam-api/src/main/java/com/yf/exam/modules/exam/dto/request/ExamSaveReqDTO.java
deleted file mode 100644
index 5c1a95b..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/request/ExamSaveReqDTO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.yf.exam.modules.exam.dto.request;
-
-import com.yf.exam.modules.exam.dto.ExamDTO;
-import com.yf.exam.modules.exam.dto.ext.ExamRepoExtDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
-*
-* 考试保存请求类
-*
-*
-* @author 聪明笨狗
-* @since 2020-07-25 16:18
-*/
-@Data
-@ApiModel(value="考试保存请求类", description="考试保存请求类")
-public class ExamSaveReqDTO extends ExamDTO {
-
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty(value = "题库列表", required=true)
- private List repoList;
-
- @ApiModelProperty(value = "考试部门列表", required=true)
- private List departIds;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/response/ExamOnlineRespDTO.java b/exam-api/src/main/java/com/yf/exam/modules/exam/dto/response/ExamOnlineRespDTO.java
deleted file mode 100644
index edbc5ce..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/response/ExamOnlineRespDTO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yf.exam.modules.exam.dto.response;
-
-import com.yf.exam.modules.exam.dto.ExamDTO;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-*
-* 考试分页响应类
-*
-*
-* @author 聪明笨狗
-* @since 2020-07-25 16:18
-*/
-@Data
-@ApiModel(value="在线考试分页响应类", description="在线考试分页响应类")
-public class ExamOnlineRespDTO extends ExamDTO {
-
- private static final long serialVersionUID = 1L;
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/response/ExamReviewRespDTO.java b/exam-api/src/main/java/com/yf/exam/modules/exam/dto/response/ExamReviewRespDTO.java
deleted file mode 100644
index 7d9ad36..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/dto/response/ExamReviewRespDTO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.yf.exam.modules.exam.dto.response;
-
-import com.yf.exam.modules.exam.dto.ExamDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
-*
-* 考试分页响应类
-*
-*
-* @author 聪明笨狗
-* @since 2020-07-25 16:18
-*/
-@Data
-@ApiModel(value="阅卷分页响应类", description="阅卷分页响应类")
-public class ExamReviewRespDTO extends ExamDTO {
-
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty(value = "考试人数", required=true)
- private Integer examUser;
-
- @ApiModelProperty(value = "待阅试卷", required=true)
- private Integer unreadPaper;
-
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/entity/Exam.java b/exam-api/src/main/java/com/yf/exam/modules/exam/entity/Exam.java
deleted file mode 100644
index e198c69..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/entity/Exam.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.yf.exam.modules.exam.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import java.util.Date;
-
-/**
-*
-* 考试实体类
-*
-*
-* @author 聪明笨狗
-* @since 2020-07-25 16:18
-*/
-@Data
-@TableName("el_exam")
-public class Exam extends Model {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 考试名称
- */
- private String title;
-
- /**
- * 考试描述
- */
- private String content;
-
- /**
- * 1公开2部门3定员
- */
- @TableField("open_type")
- private Integer openType;
-
- /**
- * 考试状态
- */
- private Integer state;
-
- /**
- * 是否限时
- */
- @TableField("time_limit")
- private Boolean timeLimit;
-
- /**
- * 开始时间
- */
- @TableField("start_time")
- private Date startTime;
-
- /**
- * 结束时间
- */
- @TableField("end_time")
- private Date endTime;
-
- /**
- * 创建时间
- */
- @TableField("create_time")
- private Date createTime;
-
- /**
- * 更新时间
- */
- @TableField("update_time")
- private Date updateTime;
-
- /**
- * 总分数
- */
- @TableField("total_score")
- private Integer totalScore;
-
- /**
- * 总时长（分钟）
- */
- @TableField("total_time")
- private Integer totalTime;
-
- /**
- * 及格分数
- */
- @TableField("qualify_score")
- private Integer qualifyScore;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/entity/ExamDepart.java b/exam-api/src/main/java/com/yf/exam/modules/exam/entity/ExamDepart.java
deleted file mode 100644
index 19a4238..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/entity/ExamDepart.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.yf.exam.modules.exam.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-/**
-*
-* 考试部门实体类
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-03 17:24
-*/
-@Data
-@TableName("el_exam_depart")
-public class ExamDepart extends Model {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 考试ID
- */
- @TableField("exam_id")
- private String examId;
-
- /**
- * 部门ID
- */
- @TableField("depart_id")
- private String departId;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/entity/ExamRepo.java b/exam-api/src/main/java/com/yf/exam/modules/exam/entity/ExamRepo.java
deleted file mode 100644
index 3884051..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/entity/ExamRepo.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.yf.exam.modules.exam.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-/**
-*
-* 考试题库实体类
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-05 11:14
-*/
-@Data
-@TableName("el_exam_repo")
-public class ExamRepo extends Model {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 考试ID
- */
- @TableField("exam_id")
- private String examId;
-
- /**
- * 题库ID
- */
- @TableField("repo_id")
- private String repoId;
-
- /**
- * 单选题数量
- */
- @TableField("radio_count")
- private Integer radioCount;
-
- /**
- * 单选题分数
- */
- @TableField("radio_score")
- private Integer radioScore;
-
- /**
- * 多选题数量
- */
- @TableField("multi_count")
- private Integer multiCount;
-
- /**
- * 多选题分数
- */
- @TableField("multi_score")
- private Integer multiScore;
-
- /**
- * 判断题数量
- */
- @TableField("judge_count")
- private Integer judgeCount;
-
- /**
- * 判断题分数
- */
- @TableField("judge_score")
- private Integer judgeScore;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/mapper/ExamDepartMapper.java b/exam-api/src/main/java/com/yf/exam/modules/exam/mapper/ExamDepartMapper.java
deleted file mode 100644
index 0c1f39a..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/mapper/ExamDepartMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.yf.exam.modules.exam.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yf.exam.modules.exam.entity.ExamDepart;
-/**
-*
-* 考试部门Mapper
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-03 17:24
-*/
-public interface ExamDepartMapper extends BaseMapper {
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/mapper/ExamMapper.java b/exam-api/src/main/java/com/yf/exam/modules/exam/mapper/ExamMapper.java
deleted file mode 100644
index 1ce4504..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/mapper/ExamMapper.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.yf.exam.modules.exam.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yf.exam.modules.exam.dto.ExamDTO;
-import com.yf.exam.modules.exam.dto.response.ExamReviewRespDTO;
-import com.yf.exam.modules.exam.dto.response.ExamOnlineRespDTO;
-import com.yf.exam.modules.exam.entity.Exam;
-import org.apache.ibatis.annotations.Param;
-
-/**
-*
-* 考试Mapper
-*
-*
-* @author 聪明笨狗
-* @since 2020-07-25 16:18
-*/
-public interface ExamMapper extends BaseMapper {
-
- /**
- * 查找分页内容
- * @param page
- * @param query
- * @return
- */
- IPage paging(Page page, @Param("query") ExamDTO query);
-
- /**
- * 查找分页内容
- * @param page
- * @param query
- * @return
- */
- IPage reviewPaging(Page page, @Param("query") ExamDTO query);
-
- /**
- * 在线考试分页响应类-考生视角
- * @param page
- * @param query
- * @return
- */
- IPage online(Page page, @Param("query") ExamDTO query);
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/mapper/ExamRepoMapper.java b/exam-api/src/main/java/com/yf/exam/modules/exam/mapper/ExamRepoMapper.java
deleted file mode 100644
index 83407df..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/mapper/ExamRepoMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.yf.exam.modules.exam.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yf.exam.modules.exam.dto.ext.ExamRepoExtDTO;
-import com.yf.exam.modules.exam.entity.ExamRepo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
-*
-* 考试题库Mapper
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-05 11:14
-*/
-public interface ExamRepoMapper extends BaseMapper {
-
- /**
- * 查找考试题库列表
- * @param examId
- * @return
- */
- List listByExam(@Param("examId") String examId);
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/service/ExamDepartService.java b/exam-api/src/main/java/com/yf/exam/modules/exam/service/ExamDepartService.java
deleted file mode 100644
index 301c010..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/service/ExamDepartService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.yf.exam.modules.exam.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yf.exam.modules.exam.entity.ExamDepart;
-
-import java.util.List;
-
-/**
-*
-* 考试部门业务类
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-03 17:24
-*/
-public interface ExamDepartService extends IService {
-
- /**
- * 保存全部
- * @param examId
- * @param departs
- */
- void saveAll(String examId, List departs);
-
-
- /**
- * 根据考试查找对应的部门
- * @param examId
- * @return
- */
- List listByExam(String examId);
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/service/ExamRepoService.java b/exam-api/src/main/java/com/yf/exam/modules/exam/service/ExamRepoService.java
deleted file mode 100644
index 78b4ec1..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/service/ExamRepoService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.yf.exam.modules.exam.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yf.exam.modules.exam.dto.ext.ExamRepoExtDTO;
-import com.yf.exam.modules.exam.entity.ExamRepo;
-
-import java.util.List;
-
-/**
-*
-* 考试题库业务类
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-05 11:14
-*/
-public interface ExamRepoService extends IService {
-
-
- /**
- * 保存全部
- * @param examId
- * @param list
- */
- void saveAll(String examId, List list);
-
- /**
- * 查找考试题库列表
- * @param examId
- * @return
- */
- List listByExam(String examId);
-
- /**
- * 清理脏数据
- * @param examId
- */
- void clear(String examId);
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/service/ExamService.java b/exam-api/src/main/java/com/yf/exam/modules/exam/service/ExamService.java
deleted file mode 100644
index 3f75664..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/service/ExamService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.yf.exam.modules.exam.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.modules.exam.dto.ExamDTO;
-import com.yf.exam.modules.exam.dto.request.ExamSaveReqDTO;
-import com.yf.exam.modules.exam.dto.response.ExamOnlineRespDTO;
-import com.yf.exam.modules.exam.dto.response.ExamReviewRespDTO;
-import com.yf.exam.modules.exam.entity.Exam;
-
-/**
-*
-* 考试业务类
-*
-*
-* @author 聪明笨狗
-* @since 2020-07-25 16:18
-*/
-public interface ExamService extends IService {
-
- /**
- * 保存考试信息
- * @param reqDTO
- */
- void save(ExamSaveReqDTO reqDTO);
-
- /**
- * 查找考试详情
- * @param id
- * @return
- */
- ExamSaveReqDTO findDetail(String id);
-
- /**
- * 查找考试详情--简要信息
- * @param id
- * @return
- */
- ExamDTO findById(String id);
-
- /**
- * 分页查询数据
- * @param reqDTO
- * @return
- */
- IPage paging(PagingReqDTO reqDTO);
-
-
- /**
- * 在线考试分页响应类-考生视角
- * @param reqDTO
- * @return
- */
- IPage onlinePaging(PagingReqDTO reqDTO);
-
-
- /**
- * 待阅试卷列表
- * @param reqDTO
- * @return
- */
- IPage reviewPaging(PagingReqDTO reqDTO);
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/service/impl/ExamDepartServiceImpl.java b/exam-api/src/main/java/com/yf/exam/modules/exam/service/impl/ExamDepartServiceImpl.java
deleted file mode 100644
index 37ca2ff..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/service/impl/ExamDepartServiceImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.yf.exam.modules.exam.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yf.exam.core.exception.ServiceException;
-import com.yf.exam.modules.exam.entity.ExamDepart;
-import com.yf.exam.modules.exam.mapper.ExamDepartMapper;
-import com.yf.exam.modules.exam.service.ExamDepartService;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
-*
-* 考试部门业务实现类
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-03 17:24
-*/
-@Service
-public class ExamDepartServiceImpl extends ServiceImpl implements ExamDepartService {
-
- @Override
- public void saveAll(String examId, List departs) {
-
- // 先删除
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(ExamDepart::getExamId, examId);
- this.remove(wrapper);
-
- // 再增加
- if(CollectionUtils.isEmpty(departs)){
- throw new ServiceException(1, "请至少选择选择一个部门！！");
- }
- List list = new ArrayList<>();
-
- for(String id: departs){
- ExamDepart depart = new ExamDepart();
- depart.setDepartId(id);
- depart.setExamId(examId);
- list.add(depart);
- }
-
- this.saveBatch(list);
- }
-
- @Override
- public List listByExam(String examId) {
- // 先删除
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(ExamDepart::getExamId, examId);
- List list = this.list(wrapper);
- List ids = new ArrayList<>();
- if(!CollectionUtils.isEmpty(list)){
- for(ExamDepart item: list){
- ids.add(item.getDepartId());
- }
- }
-
- return ids;
-
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/service/impl/ExamRepoServiceImpl.java b/exam-api/src/main/java/com/yf/exam/modules/exam/service/impl/ExamRepoServiceImpl.java
deleted file mode 100644
index ea630e6..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/service/impl/ExamRepoServiceImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.yf.exam.modules.exam.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yf.exam.core.exception.ServiceException;
-import com.yf.exam.core.utils.BeanMapper;
-import com.yf.exam.modules.exam.dto.ext.ExamRepoExtDTO;
-import com.yf.exam.modules.exam.entity.ExamRepo;
-import com.yf.exam.modules.exam.mapper.ExamRepoMapper;
-import com.yf.exam.modules.exam.service.ExamRepoService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-
-/**
-*
-* 考试题库业务实现类
-*
-*
-* @author 聪明笨狗
-* @since 2020-09-05 11:14
-*/
-@Service
-public class ExamRepoServiceImpl extends ServiceImpl implements ExamRepoService {
-
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void saveAll(String examId, List list) {
-
- // 先删除
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(ExamRepo::getExamId, examId);
- this.remove(wrapper);
-
- // 再增加
- if(CollectionUtils.isEmpty(list)){
- throw new ServiceException(1, "必须选择题库！");
- }
- List repos = BeanMapper.mapList(list, ExamRepo.class);
- for(ExamRepo item: repos){
- item.setExamId(examId);
- item.setId(IdWorker.getIdStr());
- }
-
- this.saveBatch(repos);
- }
-
- @Override
- public List listByExam(String examId) {
- return baseMapper.listByExam(examId);
- }
-
- @Override
- public void clear(String examId) {
-
- // 先删除
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(ExamRepo::getExamId, examId);
- this.remove(wrapper);
- }
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/exam/service/impl/ExamServiceImpl.java b/exam-api/src/main/java/com/yf/exam/modules/exam/service/impl/ExamServiceImpl.java
deleted file mode 100644
index 7451bd9..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/exam/service/impl/ExamServiceImpl.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.yf.exam.modules.exam.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.core.enums.OpenType;
-import com.yf.exam.core.exception.ServiceException;
-import com.yf.exam.core.utils.BeanMapper;
-import com.yf.exam.modules.exam.dto.ExamDTO;
-import com.yf.exam.modules.exam.dto.ExamRepoDTO;
-import com.yf.exam.modules.exam.dto.ext.ExamRepoExtDTO;
-import com.yf.exam.modules.exam.dto.request.ExamSaveReqDTO;
-import com.yf.exam.modules.exam.dto.response.ExamOnlineRespDTO;
-import com.yf.exam.modules.exam.dto.response.ExamReviewRespDTO;
-import com.yf.exam.modules.exam.entity.Exam;
-import com.yf.exam.modules.exam.mapper.ExamMapper;
-import com.yf.exam.modules.exam.service.ExamDepartService;
-import com.yf.exam.modules.exam.service.ExamRepoService;
-import com.yf.exam.modules.exam.service.ExamService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
-*
-* 考试业务实现类
-*
-*
-* @author 聪明笨狗
-* @since 2020-07-25 16:18
-*/
-@Service
-public class ExamServiceImpl extends ServiceImpl implements ExamService {
-
-
- @Autowired
- private ExamRepoService examRepoService;
-
- @Autowired
- private ExamDepartService examDepartService;
-
- @Override
- public void save(ExamSaveReqDTO reqDTO) {
-
- // ID
- String id = reqDTO.getId();
-
- if(StringUtils.isBlank(id)){
- id = IdWorker.getIdStr();
- }
-
- //复制参数
- Exam entity = new Exam();
-
- // 计算分值
- this.calcScore(reqDTO);
-
-
- // 复制基本数据
- BeanMapper.copy(reqDTO, entity);
- entity.setId(id);
-
- // 修复状态
- if (reqDTO.getTimeLimit()!=null
- && !reqDTO.getTimeLimit()
- && reqDTO.getState()!=null
- && reqDTO.getState() == 2) {
- entity.setState(0);
- } else {
- entity.setState(reqDTO.getState());
- }
-
- // 题库组卷
- try {
- examRepoService.saveAll(id, reqDTO.getRepoList());
- }catch (DuplicateKeyException e){
- throw new ServiceException(1, "不能选择重复的题库！");
- }
-
-
- // 开放的部门
- if(OpenType.DEPT_OPEN.equals(reqDTO.getOpenType())){
- examDepartService.saveAll(id, reqDTO.getDepartIds());
- }
-
- this.saveOrUpdate(entity);
-
- }
-
- @Override
- public ExamSaveReqDTO findDetail(String id) {
- ExamSaveReqDTO respDTO = new ExamSaveReqDTO();
- Exam exam = this.getById(id);
- BeanMapper.copy(exam, respDTO);
-
- // 考试部门
- List departIds = examDepartService.listByExam(id);
- respDTO.setDepartIds(departIds);
-
- // 题库
- List repos = examRepoService.listByExam(id);
- respDTO.setRepoList(repos);
-
- return respDTO;
- }
-
- @Override
- public ExamDTO findById(String id) {
- ExamDTO respDTO = new ExamDTO();
- Exam exam = this.getById(id);
- BeanMapper.copy(exam, respDTO);
- return respDTO;
- }
-
- @Override
- public IPage paging(PagingReqDTO reqDTO) {
-
- //创建分页对象
- Page page = new Page(reqDTO.getCurrent(), reqDTO.getSize());
-
- //转换结果
- IPage pageData = baseMapper.paging(page, reqDTO.getParams());
- return pageData;
- }
-
- @Override
- public IPage onlinePaging(PagingReqDTO reqDTO) {
-
-
- // 创建分页对象
- Page page = new Page(reqDTO.getCurrent(), reqDTO.getSize());
-
- // 查找分页
- IPage pageData = baseMapper.online(page, reqDTO.getParams());
-
- return pageData;
- }
-
- @Override
- public IPage reviewPaging(PagingReqDTO reqDTO) {
- // 创建分页对象
- Page page = new Page(reqDTO.getCurrent(), reqDTO.getSize());
-
- // 查找分页
- IPage pageData = baseMapper.reviewPaging(page, reqDTO.getParams());
-
- return pageData;
- }
-
-
- /**
- * 计算分值
- * @param reqDTO
- */
- private void calcScore(ExamSaveReqDTO reqDTO){
-
- // 主观题分数
- int objScore = 0;
-
- // 题库组卷
- List repoList = reqDTO.getRepoList();
-
- for(ExamRepoDTO item: repoList){
- if(item.getRadioCount()!=null
- && item.getRadioCount()>0
- && item.getRadioScore()!=null
- && item.getRadioScore()>0){
- objScore+=item.getRadioCount()*item.getRadioScore();
- }
- if(item.getMultiCount()!=null
- && item.getMultiCount()>0
- && item.getMultiScore()!=null
- && item.getMultiScore()>0){
- objScore+=item.getMultiCount()*item.getMultiScore();
- }
- if(item.getJudgeCount()!=null
- && item.getJudgeCount()>0
- && item.getJudgeScore()!=null
- && item.getJudgeScore()>0){
- objScore+=item.getJudgeCount()*item.getJudgeScore();
- }
- }
-
-
-
- reqDTO.setTotalScore(objScore);
- }
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/controller/PaperController.java b/exam-api/src/main/java/com/yf/exam/modules/paper/controller/PaperController.java
deleted file mode 100644
index 5549670..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/controller/PaperController.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.yf.exam.modules.paper.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yf.exam.core.api.ApiRest;
-import com.yf.exam.core.api.controller.BaseController;
-import com.yf.exam.core.api.dto.BaseIdReqDTO;
-import com.yf.exam.core.api.dto.BaseIdRespDTO;
-import com.yf.exam.core.api.dto.BaseIdsReqDTO;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.core.utils.BeanMapper;
-import com.yf.exam.modules.paper.dto.PaperDTO;
-import com.yf.exam.modules.paper.dto.ext.PaperQuDetailDTO;
-import com.yf.exam.modules.paper.dto.request.PaperAnswerDTO;
-import com.yf.exam.modules.paper.dto.request.PaperCreateReqDTO;
-import com.yf.exam.modules.paper.dto.request.PaperListReqDTO;
-import com.yf.exam.modules.paper.dto.request.PaperQuQueryDTO;
-import com.yf.exam.modules.paper.dto.response.ExamDetailRespDTO;
-import com.yf.exam.modules.paper.dto.response.ExamResultRespDTO;
-import com.yf.exam.modules.paper.dto.response.PaperListRespDTO;
-import com.yf.exam.modules.paper.entity.Paper;
-import com.yf.exam.modules.paper.service.PaperService;
-import com.yf.exam.modules.user.UserUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresRoles;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
-*
-* 试卷控制器
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 16:33
-*/
-@Api(tags={"试卷"})
-@RestController
-@RequestMapping("/exam/api/paper/paper")
-public class PaperController extends BaseController {
-
- @Autowired
- private PaperService baseService;
-
- /**
- * 分页查找
- * @param reqDTO
- * @return
- */
- @ApiOperation(value = "分页查找")
- @RequestMapping(value = "/paging", method = { RequestMethod.POST})
- public ApiRest> paging(@RequestBody PagingReqDTO reqDTO) {
- //分页查询并转换
- IPage page = baseService.paging(reqDTO);
- return super.success(page);
- }
-
-
-
- /**
- * 创建试卷
- * @param reqDTO
- * @return
- */
- @ApiOperation(value = "创建试卷")
- @RequestMapping(value = "/create-paper", method = { RequestMethod.POST})
- public ApiRest save(@RequestBody PaperCreateReqDTO reqDTO) {
- //复制参数
- String paperId = baseService.createPaper(UserUtils.getUserId(), reqDTO.getExamId());
- return super.success(new BaseIdRespDTO(paperId));
- }
-
- /**
- * 批量删除
- * @param reqDTO
- * @return
- */
- @ApiOperation(value = "试卷详情")
- @RequestMapping(value = "/paper-detail", method = { RequestMethod.POST})
- public ApiRest paperDetail(@RequestBody BaseIdReqDTO reqDTO) {
- //根据ID删除
- ExamDetailRespDTO respDTO = baseService.paperDetail(reqDTO.getId());
- return super.success(respDTO);
- }
-
- /**
- * 批量删除
- * @param reqDTO
- * @return
- */
- @ApiOperation(value = "试题详情")
- @RequestMapping(value = "/qu-detail", method = { RequestMethod.POST})
- public ApiRest quDetail(@RequestBody PaperQuQueryDTO reqDTO) {
- //根据ID删除
- PaperQuDetailDTO respDTO = baseService.findQuDetail(reqDTO.getPaperId(), reqDTO.getQuId());
- return super.success(respDTO);
- }
-
- /**
- * 填充答案
- * @param reqDTO
- * @return
- */
- @ApiOperation(value = "填充答案")
- @RequestMapping(value = "/fill-answer", method = { RequestMethod.POST})
- public ApiRest fillAnswer(@RequestBody PaperAnswerDTO reqDTO) {
- //根据ID删除
- baseService.fillAnswer(reqDTO);
- return super.success();
- }
-
-
- /**
- * 交卷操作
- * @param reqDTO
- * @return
- */
- @ApiOperation(value = "交卷操作")
- @RequestMapping(value = "/hand-exam", method = { RequestMethod.POST})
- public ApiRest handleExam(@RequestBody BaseIdReqDTO reqDTO) {
- //根据ID删除
- baseService.handExam(reqDTO.getId());
- return super.success();
- }
-
-
- /**
- * 批量删除
- * @param reqDTO
- * @return
- */
- @ApiOperation(value = "试卷详情")
- @RequestMapping(value = "/paper-result", method = { RequestMethod.POST})
- public ApiRest paperResult(@RequestBody BaseIdReqDTO reqDTO) {
- //根据ID删除
- ExamResultRespDTO respDTO = baseService.paperResult(reqDTO.getId());
- return super.success(respDTO);
- }
-
-
- /**
- * 检测用户有没有中断的考试
- * @return
- */
- @ApiOperation(value = "检测进行中的考试")
- @RequestMapping(value = "/check-process", method = { RequestMethod.POST})
- public ApiRest checkProcess() {
- //复制参数
- PaperDTO dto = baseService.checkProcess(UserUtils.getUserId());
- return super.success(dto);
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/PaperDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/PaperDTO.java
deleted file mode 100644
index dcfb9ef..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/PaperDTO.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.yf.exam.modules.paper.dto;
-
-import com.yf.exam.core.annon.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-*
-* 试卷请求类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 17:31
-*/
-@Data
-@ApiModel(value="试卷", description="试卷")
-public class PaperDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty(value = "试卷ID", required=true)
- private String id;
-
- @Dict(dictTable = "sys_user", dicText = "real_name", dicCode = "id")
- @ApiModelProperty(value = "用户ID", required=true)
- private String userId;
-
- @Dict(dictTable = "sys_depart", dicText = "dept_name", dicCode = "id")
- @ApiModelProperty(value = "部门ID", required=true)
- private String departId;
-
- @ApiModelProperty(value = "规则ID", required=true)
- private String examId;
-
- @ApiModelProperty(value = "考试标题", required=true)
- private String title;
-
- @ApiModelProperty(value = "考试时长", required=true)
- private Integer totalTime;
-
- @ApiModelProperty(value = "用户时长", required=true)
- private Integer userTime;
-
- @ApiModelProperty(value = "试卷总分", required=true)
- private Integer totalScore;
-
- @ApiModelProperty(value = "及格分", required=true)
- private Integer qualifyScore;
-
- @ApiModelProperty(value = "客观分", required=true)
- private Integer objScore;
-
- @ApiModelProperty(value = "主观分", required=true)
- private Integer subjScore;
-
- @ApiModelProperty(value = "用户得分", required=true)
- private Integer userScore;
-
- @ApiModelProperty(value = "是否包含简答题", required=true)
- private Boolean hasSaq;
-
- @ApiModelProperty(value = "试卷状态", required=true)
- private Integer state;
-
- @ApiModelProperty(value = "创建时间", required=true)
- private Date createTime;
-
- @ApiModelProperty(value = "更新时间", required=true)
- private Date updateTime;
-
- @ApiModelProperty(value = "截止时间")
- private Date limitTime;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/PaperQuAnswerDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/PaperQuAnswerDTO.java
deleted file mode 100644
index e449e79..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/PaperQuAnswerDTO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.yf.exam.modules.paper.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
-*
-* 试卷考题备选答案请求类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 17:31
-*/
-@Data
-@ApiModel(value="试卷考题备选答案", description="试卷考题备选答案")
-public class PaperQuAnswerDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty(value = "自增ID", required=true)
- private String id;
-
- @ApiModelProperty(value = "试卷ID", required=true)
- private String paperId;
-
- @ApiModelProperty(value = "回答项ID", required=true)
- private String answerId;
-
- @ApiModelProperty(value = "题目ID", required=true)
- private String quId;
-
- @ApiModelProperty(value = "是否正确项", required=true)
- private Boolean isRight;
-
- @ApiModelProperty(value = "是否选中", required=true)
- private Boolean checked;
-
- @ApiModelProperty(value = "排序", required=true)
- private Integer sort;
-
- @ApiModelProperty(value = "选项标签", required=true)
- private String abc;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/PaperQuDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/PaperQuDTO.java
deleted file mode 100644
index 349868e..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/PaperQuDTO.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.yf.exam.modules.paper.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
-*
-* 试卷考题请求类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 17:31
-*/
-@Data
-@ApiModel(value="试卷考题", description="试卷考题")
-public class PaperQuDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty(value = "ID", required=true)
- private String id;
-
- @ApiModelProperty(value = "试卷ID", required=true)
- private String paperId;
-
- @ApiModelProperty(value = "题目ID", required=true)
- private String quId;
-
- @ApiModelProperty(value = "题目类型", required=true)
- private Integer quType;
-
- @ApiModelProperty(value = "是否已答", required=true)
- private Boolean answered;
-
- @ApiModelProperty(value = "主观答案", required=true)
- private String answer;
-
- @ApiModelProperty(value = "问题排序", required=true)
- private Integer sort;
-
- @ApiModelProperty(value = "单题分分值", required=true)
- private Integer score;
-
- @ApiModelProperty(value = "实际得分(主观题)", required=true)
- private Integer actualScore;
-
- @ApiModelProperty(value = "是否答对", required=true)
- private Boolean isRight;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/ext/PaperQuAnswerExtDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/ext/PaperQuAnswerExtDTO.java
deleted file mode 100644
index 3124d9e..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/ext/PaperQuAnswerExtDTO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.yf.exam.modules.paper.dto.ext;
-
-import com.yf.exam.modules.paper.dto.PaperQuAnswerDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
-*
-* 试卷考题备选答案请求类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 17:31
-*/
-@Data
-@ApiModel(value="试卷考题备选答案", description="试卷考题备选答案")
-public class PaperQuAnswerExtDTO extends PaperQuAnswerDTO {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "试题图片", required=true)
- private String image;
-
- @ApiModelProperty(value = "答案内容", required=true)
- private String content;
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/ext/PaperQuDetailDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/ext/PaperQuDetailDTO.java
deleted file mode 100644
index ee1e998..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/ext/PaperQuDetailDTO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.yf.exam.modules.paper.dto.ext;
-
-import com.yf.exam.modules.paper.dto.PaperQuDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
-*
-* 试卷考题请求类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 17:31
-*/
-@Data
-@ApiModel(value="试卷题目详情类", description="试卷题目详情类")
-public class PaperQuDetailDTO extends PaperQuDTO {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "图片", required=true)
- private String image;
-
- @ApiModelProperty(value = "题目内容", required=true)
- private String content;
-
- @ApiModelProperty(value = "答案内容", required=true)
- List answerList;
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperAnswerDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperAnswerDTO.java
deleted file mode 100644
index ccbe3ce..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperAnswerDTO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yf.exam.modules.paper.dto.request;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author bool
- */
-@Data
-@ApiModel(value="查找试卷题目详情请求类", description="查找试卷题目详情请求类")
-public class PaperAnswerDTO extends PaperQuQueryDTO {
-
- @ApiModelProperty(value = "回答列表", required=true)
- private List answers;
-
- @ApiModelProperty(value = "主观答案", required=true)
- private String answer;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperCreateReqDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperCreateReqDTO.java
deleted file mode 100644
index 6a8f8c5..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperCreateReqDTO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yf.exam.modules.paper.dto.request;
-
-import com.yf.exam.core.api.dto.BaseDTO;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author bool
- */
-@Data
-@ApiModel(value="试卷创建请求类", description="试卷创建请求类")
-public class PaperCreateReqDTO extends BaseDTO {
-
- @JsonIgnore
- private String userId;
-
- @ApiModelProperty(value = "考试ID", required=true)
- private String examId;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperListReqDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperListReqDTO.java
deleted file mode 100644
index c333241..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperListReqDTO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.yf.exam.modules.paper.dto.request;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
-*
-* 试卷请求类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 17:31
-*/
-@Data
-@ApiModel(value="试卷", description="试卷")
-public class PaperListReqDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "用户ID", required=true)
- private String userId;
-
- @ApiModelProperty(value = "部门ID", required=true)
- private String departId;
-
- @ApiModelProperty(value = "规则ID", required=true)
- private String examId;
-
- @ApiModelProperty(value = "用户昵称", required=true)
- private String realName;
-
- @ApiModelProperty(value = "试卷状态", required=true)
- private Integer state;
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperQuQueryDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperQuQueryDTO.java
deleted file mode 100644
index 48184b6..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/request/PaperQuQueryDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.yf.exam.modules.paper.dto.request;
-
-import com.yf.exam.core.api.dto.BaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author bool
- */
-@Data
-@ApiModel(value="查找试卷题目详情请求类", description="查找试卷题目详情请求类")
-public class PaperQuQueryDTO extends BaseDTO {
-
- @ApiModelProperty(value = "试卷ID", required=true)
- private String paperId;
-
- @ApiModelProperty(value = "题目ID", required=true)
- private String quId;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/response/ExamDetailRespDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/response/ExamDetailRespDTO.java
deleted file mode 100644
index c307c84..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/response/ExamDetailRespDTO.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.yf.exam.modules.paper.dto.response;
-
-import com.yf.exam.modules.paper.dto.PaperDTO;
-import com.yf.exam.modules.paper.dto.PaperQuDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Calendar;
-import java.util.List;
-
-@Data
-@ApiModel(value="考试详情", description="考试详情")
-public class ExamDetailRespDTO extends PaperDTO {
-
-
- @ApiModelProperty(value = "单选题列表", required=true)
- private List radioList;
-
- @ApiModelProperty(value = "多选题列表", required=true)
- private List multiList;
-
- @ApiModelProperty(value = "判断题", required=true)
- private List judgeList;
-
-
- @ApiModelProperty(value = "剩余结束秒数", required=true)
- public Long getLeftSeconds(){
-
- // 结束时间
- Calendar cl = Calendar.getInstance();
- cl.setTime(this.getCreateTime());
- cl.add(Calendar.MINUTE, getTotalTime());
-
- return (cl.getTimeInMillis() - System.currentTimeMillis()) / 1000;
- }
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/response/ExamResultRespDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/response/ExamResultRespDTO.java
deleted file mode 100644
index 64af63d..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/response/ExamResultRespDTO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.yf.exam.modules.paper.dto.response;
-
-import com.yf.exam.modules.paper.dto.PaperDTO;
-import com.yf.exam.modules.paper.dto.ext.PaperQuDetailDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel(value="考试结果展示响应类", description="考试结果展示响应类")
-public class ExamResultRespDTO extends PaperDTO {
-
- @ApiModelProperty(value = "问题列表", required=true)
- private List quList;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/response/PaperListRespDTO.java b/exam-api/src/main/java/com/yf/exam/modules/paper/dto/response/PaperListRespDTO.java
deleted file mode 100644
index 9e003e4..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/dto/response/PaperListRespDTO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.yf.exam.modules.paper.dto.response;
-
-import com.yf.exam.modules.paper.dto.PaperDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
-*
-* 试卷请求类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 17:31
-*/
-@Data
-@ApiModel(value="试卷列表响应类", description="试卷列表响应类")
-public class PaperListRespDTO extends PaperDTO {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "人员", required=true)
- private String realName;
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/entity/Paper.java b/exam-api/src/main/java/com/yf/exam/modules/paper/entity/Paper.java
deleted file mode 100644
index e219471..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/entity/Paper.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.yf.exam.modules.paper.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
-*
-* 试卷实体类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 17:31
-*/
-@Data
-@TableName("el_paper")
-public class Paper extends Model {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 试卷ID
- */
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 用户ID
- */
- @TableField("user_id")
- private String userId;
-
- /**
- * 部门ID
- */
- @TableField("depart_id")
- private String departId;
-
- /**
- * 规则ID
- */
- @TableField("exam_id")
- private String examId;
-
- /**
- * 考试标题
- */
- private String title;
-
- /**
- * 考试时长
- */
- @TableField("total_time")
- private Integer totalTime;
-
- /**
- * 用户时长
- */
- @TableField("user_time")
- private Integer userTime;
-
- /**
- * 试卷总分
- */
- @TableField("total_score")
- private Integer totalScore;
-
- /**
- * 及格分
- */
- @TableField("qualify_score")
- private Integer qualifyScore;
-
- /**
- * 客观分
- */
- @TableField("obj_score")
- private Integer objScore;
-
- /**
- * 主观分
- */
- @TableField("subj_score")
- private Integer subjScore;
-
- /**
- * 用户得分
- */
- @TableField("user_score")
- private Integer userScore;
-
- /**
- * 是否包含简答题
- */
- @TableField("has_saq")
- private Boolean hasSaq;
-
- /**
- * 试卷状态
- */
- private Integer state;
-
- /**
- * 创建时间
- */
- @TableField("create_time")
- private Date createTime;
-
- /**
- * 更新时间
- */
- @TableField("update_time")
- private Date updateTime;
-
- /**
- * 截止时间
- */
- @TableField("limit_time")
- private Date limitTime;
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/entity/PaperQu.java b/exam-api/src/main/java/com/yf/exam/modules/paper/entity/PaperQu.java
deleted file mode 100644
index 3723791..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/entity/PaperQu.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.yf.exam.modules.paper.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-/**
-*
-* 试卷考题实体类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 17:31
-*/
-@Data
-@TableName("el_paper_qu")
-public class PaperQu extends Model {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 试卷ID
- */
- @TableField("paper_id")
- private String paperId;
-
- /**
- * 题目ID
- */
- @TableField("qu_id")
- private String quId;
-
- /**
- * 题目类型
- */
- @TableField("qu_type")
- private Integer quType;
-
- /**
- * 是否已答
- */
- private Boolean answered;
-
- /**
- * 主观答案
- */
- private String answer;
-
- /**
- * 问题排序
- */
- private Integer sort;
-
- /**
- * 单题分分值
- */
- private Integer score;
-
- /**
- * 实际得分(主观题)
- */
- @TableField("actual_score")
- private Integer actualScore;
-
- /**
- * 是否答对
- */
- @TableField("is_right")
- private Boolean isRight;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/entity/PaperQuAnswer.java b/exam-api/src/main/java/com/yf/exam/modules/paper/entity/PaperQuAnswer.java
deleted file mode 100644
index b3999da..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/entity/PaperQuAnswer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.yf.exam.modules.paper.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-/**
-*
-* 试卷考题备选答案实体类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 17:31
-*/
-@Data
-@TableName("el_paper_qu_answer")
-public class PaperQuAnswer extends Model {
-
-
- /**
- * 自增ID
- */
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 试卷ID
- */
- @TableField("paper_id")
- private String paperId;
-
- /**
- * 回答项ID
- */
- @TableField("answer_id")
- private String answerId;
-
- /**
- * 题目ID
- */
- @TableField("qu_id")
- private String quId;
-
- /**
- * 是否正确项
- */
- @TableField("is_right")
- private Boolean isRight;
-
- /**
- * 是否选中
- */
- private Boolean checked;
-
- /**
- * 排序
- */
- private Integer sort;
-
- /**
- * 选项标签
- */
- private String abc;
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/enums/ExamState.java b/exam-api/src/main/java/com/yf/exam/modules/paper/enums/ExamState.java
deleted file mode 100644
index a62f404..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/enums/ExamState.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.yf.exam.modules.paper.enums;
-
-
-/**
- * 考试状态
- * @author bool
- * @date 2019-10-30 13:11
- */
-public interface ExamState {
-
-
- /**
- * 考试中
- */
- Integer ENABLE = 0;
-
- /**
- * 待阅卷
- */
- Integer DISABLED = 1;
-
- /**
- * 已完成
- */
- Integer READY_START = 2;
-
- /**
- * 已结束
- */
- Integer OVERDUE = 3;
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/enums/PaperState.java b/exam-api/src/main/java/com/yf/exam/modules/paper/enums/PaperState.java
deleted file mode 100644
index ceed269..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/enums/PaperState.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.yf.exam.modules.paper.enums;
-
-
-/**
- * 试卷状态
- * @author bool
- * @date 2019-10-30 13:11
- */
-public interface PaperState {
-
-
- /**
- * 考试中
- */
- Integer ING = 0;
-
- /**
- * 待阅卷
- */
- Integer WAIT_OPT = 1;
-
- /**
- * 已完成
- */
- Integer FINISHED = 2;
-
- /**
- * 弃考
- */
- Integer BREAK = 3;
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/job/BreakExamJob.java b/exam-api/src/main/java/com/yf/exam/modules/paper/job/BreakExamJob.java
deleted file mode 100644
index fb14f53..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/job/BreakExamJob.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.yf.exam.modules.paper.job;
-
-import com.yf.exam.ability.job.service.JobService;
-import com.yf.exam.modules.paper.service.PaperService;
-import lombok.extern.log4j.Log4j2;
-import org.quartz.Job;
-import org.quartz.JobDetail;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 超时自动交卷任务
- * @author bool
- */
-@Log4j2
-@Component
-public class BreakExamJob implements Job {
-
- @Autowired
- private PaperService paperService;
-
- @Override
- public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-
- JobDetail detail = jobExecutionContext.getJobDetail();
- String name = detail.getKey().getName();
- String group = detail.getKey().getGroup();
- String data = String.valueOf(detail.getJobDataMap().get(JobService.TASK_DATA));
-
- log.info("++++++++++定时任务：处理到期的交卷");
- log.info("++++++++++jobName:{}", name);
- log.info("++++++++++jobGroup:{}", group);
- log.info("++++++++++taskData:{}", data);
-
-
- // 强制交卷
- paperService.handExam(data);
-
- }
-
-
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/mapper/PaperMapper.java b/exam-api/src/main/java/com/yf/exam/modules/paper/mapper/PaperMapper.java
deleted file mode 100644
index 1a52de5..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/mapper/PaperMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.yf.exam.modules.paper.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yf.exam.modules.paper.dto.PaperDTO;
-import com.yf.exam.modules.paper.dto.request.PaperListReqDTO;
-import com.yf.exam.modules.paper.dto.response.PaperListRespDTO;
-import com.yf.exam.modules.paper.entity.Paper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
-*
-* 试卷Mapper
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 16:33
-*/
-public interface PaperMapper extends BaseMapper {
-
- /**
- * 查找试卷分页
- * @param page
- * @param query
- * @return
- */
- IPage paging(Page page, @Param("query") PaperListReqDTO query);
-
-
- /**
- * 试卷列表响应类
- * @param query
- * @return
- */
- List list(@Param("query") PaperDTO query);
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/mapper/PaperQuAnswerMapper.java b/exam-api/src/main/java/com/yf/exam/modules/paper/mapper/PaperQuAnswerMapper.java
deleted file mode 100644
index e795ba9..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/mapper/PaperQuAnswerMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.yf.exam.modules.paper.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yf.exam.modules.paper.dto.ext.PaperQuAnswerExtDTO;
-import com.yf.exam.modules.paper.entity.PaperQuAnswer;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
-*
-* 试卷考题备选答案Mapper
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 16:33
-*/
-public interface PaperQuAnswerMapper extends BaseMapper {
-
- /**
- * 查找试卷试题答案列表
- * @param paperId
- * @param quId
- * @return
- */
- List list(@Param("paperId") String paperId, @Param("quId") String quId);
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/mapper/PaperQuMapper.java b/exam-api/src/main/java/com/yf/exam/modules/paper/mapper/PaperQuMapper.java
deleted file mode 100644
index f833a1b..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/mapper/PaperQuMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.yf.exam.modules.paper.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yf.exam.modules.paper.dto.ext.PaperQuDetailDTO;
-import com.yf.exam.modules.paper.entity.PaperQu;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
-*
-* 试卷考题Mapper
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 16:33
-*/
-public interface PaperQuMapper extends BaseMapper {
-
- /**
- * 统计客观分
- * @param paperId
- * @return
- */
- int sumObjective(@Param("paperId") String paperId);
-
- /**
- * 统计主观分
- * @param paperId
- * @return
- */
- int sumSubjective(@Param("paperId") String paperId);
-
- /**
- * 找出全部试题列表
- * @param paperId
- * @return
- */
- List listByPaper(@Param("paperId") String paperId);
-}
-
-
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/service/PaperQuAnswerService.java b/exam-api/src/main/java/com/yf/exam/modules/paper/service/PaperQuAnswerService.java
deleted file mode 100644
index a1cfffa..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/service/PaperQuAnswerService.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.yf.exam.modules.paper.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.modules.paper.dto.PaperQuAnswerDTO;
-import com.yf.exam.modules.paper.dto.ext.PaperQuAnswerExtDTO;
-import com.yf.exam.modules.paper.entity.PaperQuAnswer;
-
-import java.util.List;
-
-/**
-*
-* 试卷考题备选答案业务类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 16:33
-*/
-public interface PaperQuAnswerService extends IService {
-
- /**
- * 分页查询数据
- * @param reqDTO
- * @return
- */
- IPage paging(PagingReqDTO reqDTO);
-
- /**
- * 查找试卷试题答案列表
- * @param paperId
- * @param quId
- * @return
- */
- List listForExam(String paperId, String quId);
-
- /**
- * 查找答案列表，用来填充
- * @param paperId
- * @param quId
- * @return
- */
- List listForFill(String paperId, String quId);
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/service/PaperQuService.java b/exam-api/src/main/java/com/yf/exam/modules/paper/service/PaperQuService.java
deleted file mode 100644
index d0cc2e3..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/service/PaperQuService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.yf.exam.modules.paper.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.modules.paper.dto.PaperQuDTO;
-import com.yf.exam.modules.paper.dto.ext.PaperQuDetailDTO;
-import com.yf.exam.modules.paper.entity.PaperQu;
-
-import java.util.List;
-
-/**
-*
-* 试卷考题业务类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 16:33
-*/
-public interface PaperQuService extends IService {
-
- /**
- * 分页查询数据
- * @param reqDTO
- * @return
- */
- IPage paging(PagingReqDTO reqDTO);
-
- /**
- * 根据试卷找出题目列表
- * @param paperId
- * @return
- */
- List listByPaper(String paperId);
-
- /**
- * 查找详情
- * @param paperId
- * @param quId
- * @return
- */
- PaperQu findByKey(String paperId, String quId);
-
- /**
- * 根据组合索引更新
- * @param qu
- */
- void updateByKey(PaperQu qu);
-
- /**
- * 统计客观分
- * @param paperId
- * @return
- */
- int sumObjective(String paperId);
-
- /**
- * 统计主观分
- * @param paperId
- * @return
- */
- int sumSubjective(String paperId);
-
- /**
- * 找出全部试题列表
- * @param paperId
- * @return
- */
- List listForPaperResult(String paperId);
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/service/PaperService.java b/exam-api/src/main/java/com/yf/exam/modules/paper/service/PaperService.java
deleted file mode 100644
index 042bb7d..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/service/PaperService.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.yf.exam.modules.paper.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.modules.paper.dto.PaperDTO;
-import com.yf.exam.modules.paper.dto.ext.PaperQuDetailDTO;
-import com.yf.exam.modules.paper.dto.request.PaperAnswerDTO;
-import com.yf.exam.modules.paper.dto.request.PaperListReqDTO;
-import com.yf.exam.modules.paper.dto.response.ExamDetailRespDTO;
-import com.yf.exam.modules.paper.dto.response.ExamResultRespDTO;
-import com.yf.exam.modules.paper.dto.response.PaperListRespDTO;
-import com.yf.exam.modules.paper.entity.Paper;
-
-/**
-*
-* 试卷业务类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 16:33
-*/
-public interface PaperService extends IService {
-
- /**
- * 创建试卷
- * @param userId
- * @param examId
- * @return
- */
- String createPaper(String userId, String examId);
-
-
- /**
- * 查找详情
- * @param paperId
- * @return
- */
- ExamDetailRespDTO paperDetail(String paperId);
-
- /**
- * 考试结果
- * @param paperId
- * @return
- */
- ExamResultRespDTO paperResult(String paperId);
-
- /**
- * 查找题目详情
- * @param paperId
- * @param quId
- * @return
- */
- PaperQuDetailDTO findQuDetail(String paperId, String quId);
-
- /**
- * 填充答案
- * @param reqDTO
- */
- void fillAnswer(PaperAnswerDTO reqDTO);
-
- /**
- * 交卷操作
- * @param paperId
- * @return
- */
- void handExam(String paperId);
-
- /**
- * 试卷列表响应类
- * @param reqDTO
- * @return
- */
- IPage paging(PagingReqDTO reqDTO);
-
- /**
- * 检测是否有进行中的考试
- * @param userId
- * @return
- */
- PaperDTO checkProcess(String userId);
-
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/service/impl/PaperQuAnswerServiceImpl.java b/exam-api/src/main/java/com/yf/exam/modules/paper/service/impl/PaperQuAnswerServiceImpl.java
deleted file mode 100644
index c2dc0b7..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/service/impl/PaperQuAnswerServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.yf.exam.modules.paper.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.modules.paper.dto.PaperQuAnswerDTO;
-import com.yf.exam.modules.paper.dto.ext.PaperQuAnswerExtDTO;
-import com.yf.exam.modules.paper.entity.PaperQuAnswer;
-import com.yf.exam.modules.paper.mapper.PaperQuAnswerMapper;
-import com.yf.exam.modules.paper.service.PaperQuAnswerService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
-*
-* 语言设置 服务实现类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 16:33
-*/
-@Service
-public class PaperQuAnswerServiceImpl extends ServiceImpl implements PaperQuAnswerService {
-
- @Override
- public IPage paging(PagingReqDTO reqDTO) {
-
- //创建分页对象
- IPage query = new Page<>(reqDTO.getCurrent(), reqDTO.getSize());
-
- //查询条件
- QueryWrapper wrapper = new QueryWrapper<>();
-
- //获得数据
- IPage page = this.page(query, wrapper);
- //转换结果
- IPage pageData = JSON.parseObject(JSON.toJSONString(page), new TypeReference>(){});
- return pageData;
- }
-
- @Override
- public List listForExam(String paperId, String quId) {
- return baseMapper.list(paperId, quId);
- }
-
- @Override
- public List listForFill(String paperId, String quId) {
- //查询条件
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(PaperQuAnswer::getPaperId, paperId)
- .eq(PaperQuAnswer::getQuId, quId);
-
- return this.list(wrapper);
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/service/impl/PaperQuServiceImpl.java b/exam-api/src/main/java/com/yf/exam/modules/paper/service/impl/PaperQuServiceImpl.java
deleted file mode 100644
index a0d9a1d..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/service/impl/PaperQuServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.yf.exam.modules.paper.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.core.utils.BeanMapper;
-import com.yf.exam.modules.paper.dto.PaperQuDTO;
-import com.yf.exam.modules.paper.dto.ext.PaperQuDetailDTO;
-import com.yf.exam.modules.paper.entity.PaperQu;
-import com.yf.exam.modules.paper.mapper.PaperQuMapper;
-import com.yf.exam.modules.paper.service.PaperQuService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
-*
-* 语言设置 服务实现类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 16:33
-*/
-@Service
-public class PaperQuServiceImpl extends ServiceImpl implements PaperQuService {
-
- @Override
- public IPage paging(PagingReqDTO reqDTO) {
-
- //创建分页对象
- IPage query = new Page<>(reqDTO.getCurrent(), reqDTO.getSize());
-
- //查询条件
- QueryWrapper wrapper = new QueryWrapper<>();
-
- //获得数据
- IPage page = this.page(query, wrapper);
- //转换结果
- IPage pageData = JSON.parseObject(JSON.toJSONString(page), new TypeReference>(){});
- return pageData;
- }
-
- @Override
- public List listByPaper(String paperId) {
-
- //查询条件
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(PaperQu::getPaperId, paperId)
- .orderByAsc(PaperQu::getSort);
-
- List list = this.list(wrapper);
- return BeanMapper.mapList(list, PaperQuDTO.class);
- }
-
- @Override
- public PaperQu findByKey(String paperId, String quId) {
- //查询条件
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(PaperQu::getPaperId, paperId)
- .eq(PaperQu::getQuId, quId);
-
- return this.getOne(wrapper, false);
- }
-
- @Override
- public void updateByKey(PaperQu qu) {
-
- //查询条件
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(PaperQu::getPaperId, qu.getPaperId())
- .eq(PaperQu::getQuId, qu.getQuId());
-
- this.update(qu, wrapper);
- }
-
- @Override
- public int sumObjective(String paperId) {
- return baseMapper.sumObjective(paperId);
- }
-
- @Override
- public int sumSubjective(String paperId) {
- return baseMapper.sumSubjective(paperId);
- }
-
- @Override
- public List listForPaperResult(String paperId) {
- return baseMapper.listByPaper(paperId);
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/paper/service/impl/PaperServiceImpl.java b/exam-api/src/main/java/com/yf/exam/modules/paper/service/impl/PaperServiceImpl.java
deleted file mode 100644
index 2eefec8..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/paper/service/impl/PaperServiceImpl.java
+++ /dev/null
@@ -1,542 +0,0 @@
-package com.yf.exam.modules.paper.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yf.exam.ability.job.enums.JobGroup;
-import com.yf.exam.ability.job.enums.JobPrefix;
-import com.yf.exam.ability.job.service.JobService;
-import com.yf.exam.core.api.ApiError;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.core.exception.ServiceException;
-import com.yf.exam.core.utils.BeanMapper;
-import com.yf.exam.core.utils.CronUtils;
-import com.yf.exam.modules.exam.dto.ExamDTO;
-import com.yf.exam.modules.exam.dto.ExamRepoDTO;
-import com.yf.exam.modules.exam.dto.ext.ExamRepoExtDTO;
-import com.yf.exam.modules.exam.service.ExamRepoService;
-import com.yf.exam.modules.exam.service.ExamService;
-import com.yf.exam.modules.paper.dto.PaperDTO;
-import com.yf.exam.modules.paper.dto.PaperQuDTO;
-import com.yf.exam.modules.paper.dto.ext.PaperQuAnswerExtDTO;
-import com.yf.exam.modules.paper.dto.ext.PaperQuDetailDTO;
-import com.yf.exam.modules.paper.dto.request.PaperAnswerDTO;
-import com.yf.exam.modules.paper.dto.request.PaperListReqDTO;
-import com.yf.exam.modules.paper.dto.response.ExamDetailRespDTO;
-import com.yf.exam.modules.paper.dto.response.ExamResultRespDTO;
-import com.yf.exam.modules.paper.dto.response.PaperListRespDTO;
-import com.yf.exam.modules.paper.entity.Paper;
-import com.yf.exam.modules.paper.entity.PaperQu;
-import com.yf.exam.modules.paper.entity.PaperQuAnswer;
-import com.yf.exam.modules.paper.enums.ExamState;
-import com.yf.exam.modules.paper.enums.PaperState;
-import com.yf.exam.modules.paper.job.BreakExamJob;
-import com.yf.exam.modules.paper.mapper.PaperMapper;
-import com.yf.exam.modules.paper.service.PaperQuAnswerService;
-import com.yf.exam.modules.paper.service.PaperQuService;
-import com.yf.exam.modules.paper.service.PaperService;
-import com.yf.exam.modules.qu.entity.Qu;
-import com.yf.exam.modules.qu.entity.QuAnswer;
-import com.yf.exam.modules.qu.enums.QuType;
-import com.yf.exam.modules.qu.service.QuAnswerService;
-import com.yf.exam.modules.qu.service.QuService;
-import com.yf.exam.modules.sys.user.entity.SysUser;
-import com.yf.exam.modules.sys.user.service.SysUserService;
-import com.yf.exam.modules.user.book.service.UserBookService;
-import com.yf.exam.modules.user.exam.service.UserExamService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-
-/**
-*
-* 语言设置 服务实现类
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 16:33
-*/
-@Service
-public class PaperServiceImpl extends ServiceImpl implements PaperService {
-
-
- @Autowired
- private SysUserService sysUserService;
-
- @Autowired
- private ExamService examService;
-
- @Autowired
- private QuService quService;
-
- @Autowired
- private QuAnswerService quAnswerService;
-
- @Autowired
- private PaperService paperService;
-
- @Autowired
- private PaperQuService paperQuService;
-
- @Autowired
- private PaperQuAnswerService paperQuAnswerService;
-
- @Autowired
- private UserBookService userBookService;
-
- @Autowired
- private ExamRepoService examRepoService;
-
- @Autowired
- private UserExamService userExamService;
-
- @Autowired
- private JobService jobService;
-
- /**
- * 展示的选项，ABC这样
- */
- private static List ABC = Arrays.asList(new String[]{
- "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K","L","M","N","O","P","Q","R","S","T","U","V","W","X"
- ,"Y","Z"
- });
-
-
-
-
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public String createPaper(String userId, String examId) {
-
- // 校验是否有正在考试的试卷
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(Paper::getUserId, userId)
- .eq(Paper::getState, PaperState.ING);
-
- int exists = this.count(wrapper);
-
-
- if (exists > 0) {
- throw new ServiceException(ApiError.ERROR_20010002);
- }
-
- // 查找考试
- ExamDTO exam = examService.findById(examId);
-
- if(exam == null){
- throw new ServiceException(1, "考试不存在！");
- }
-
- if(!ExamState.ENABLE.equals(exam.getState())){
- throw new ServiceException(1, "考试状态不正确！");
- }
-
- // 考试题目列表
- List quList = this.generateByRepo(examId);
-
- if(CollectionUtils.isEmpty(quList)){
- throw new ServiceException(1, "规则不正确，无对应的考题！");
- }
-
- //保存试卷内容
- Paper paper = this.savePaper(userId, exam, quList);
-
- // 强制交卷任务
- String jobName = JobPrefix.BREAK_EXAM + paper.getId();
- jobService.addCronJob(BreakExamJob.class, jobName, CronUtils.dateToCron(paper.getLimitTime()), paper.getId());
-
- return paper.getId();
- }
-
- @Override
- public ExamDetailRespDTO paperDetail(String paperId) {
-
-
- ExamDetailRespDTO respDTO = new ExamDetailRespDTO();
-
- // 试题基本信息
- Paper paper = paperService.getById(paperId);
- BeanMapper.copy(paper, respDTO);
-
- // 查找题目列表
- List list = paperQuService.listByPaper(paperId);
-
- List radioList = new ArrayList<>();
- List multiList = new ArrayList<>();
- List judgeList = new ArrayList<>();
- for(PaperQuDTO item: list){
- if(QuType.RADIO.equals(item.getQuType())){
- radioList.add(item);
- }
- if(QuType.MULTI.equals(item.getQuType())){
- multiList.add(item);
- }
- if(QuType.JUDGE.equals(item.getQuType())){
- judgeList.add(item);
- }
- }
-
- respDTO.setRadioList(radioList);
- respDTO.setMultiList(multiList);
- respDTO.setJudgeList(judgeList);
- return respDTO;
- }
-
- @Override
- public ExamResultRespDTO paperResult(String paperId) {
-
- ExamResultRespDTO respDTO = new ExamResultRespDTO();
-
- // 试题基本信息
- Paper paper = paperService.getById(paperId);
- BeanMapper.copy(paper, respDTO);
-
- List quList = paperQuService.listForPaperResult(paperId);
- respDTO.setQuList(quList);
-
- return respDTO;
- }
-
- @Override
- public PaperQuDetailDTO findQuDetail(String paperId, String quId) {
-
- PaperQuDetailDTO respDTO = new PaperQuDetailDTO();
- // 问题
- Qu qu = quService.getById(quId);
-
- // 基本信息
- PaperQu paperQu = paperQuService.findByKey(paperId, quId);
- BeanMapper.copy(paperQu, respDTO);
- respDTO.setContent(qu.getContent());
- respDTO.setImage(qu.getImage());
-
- // 答案列表
- List list = paperQuAnswerService.listForExam(paperId, quId);
- respDTO.setAnswerList(list);
-
- return respDTO;
- }
-
-
- /**
- * 题库组题方式产生题目列表
- * @param examId
- * @return
- */
- private List generateByRepo(String examId){
-
- // 查找规则指定的题库
- List list = examRepoService.listByExam(examId);
-
- //最终的题目列表
- List quList = new ArrayList<>();
-
- //排除ID，避免题目重复
- List excludes = new ArrayList<>();
- excludes.add("none");
-
- if (!CollectionUtils.isEmpty(list)) {
- for (ExamRepoExtDTO item : list) {
-
- // 单选题
- if(item.getRadioCount() > 0){
- List radioList = quService.listByRandom(item.getRepoId(), QuType.RADIO, excludes, item.getRadioCount());
- for (Qu qu : radioList) {
- PaperQu paperQu = this.processPaperQu(item, qu);
- quList.add(paperQu);
- excludes.add(qu.getId());
- }
- }
-
- //多选题
- if(item.getMultiCount() > 0) {
- List multiList = quService.listByRandom(item.getRepoId(), QuType.MULTI, excludes,
- item.getMultiCount());
- for (Qu qu : multiList) {
- PaperQu paperQu = this.processPaperQu(item, qu);
- quList.add(paperQu);
- excludes.add(qu.getId());
- }
- }
-
- // 判断题
- if(item.getJudgeCount() > 0) {
- List judgeList = quService.listByRandom(item.getRepoId(), QuType.JUDGE, excludes,
- item.getJudgeCount());
- for (Qu qu : judgeList) {
- PaperQu paperQu = this.processPaperQu(item, qu);
- quList.add(paperQu);
- excludes.add(qu.getId());
- }
- }
- }
- }
- return quList;
- }
-
-
-
- /**
- * 填充试题题目信息
- * @param repo
- * @param qu
- * @return
- */
- private PaperQu processPaperQu(ExamRepoDTO repo, Qu qu) {
-
- //保存试题信息
- PaperQu paperQu = new PaperQu();
- paperQu.setQuId(qu.getId());
- paperQu.setAnswered(false);
- paperQu.setIsRight(false);
- paperQu.setQuType(qu.getQuType());
-
- if (QuType.RADIO.equals(qu.getQuType())) {
- paperQu.setScore(repo.getRadioScore());
- paperQu.setActualScore(repo.getRadioScore());
- }
-
- if (QuType.MULTI.equals(qu.getQuType())) {
- paperQu.setScore(repo.getMultiScore());
- paperQu.setActualScore(repo.getMultiScore());
- }
-
- if (QuType.JUDGE.equals(qu.getQuType())) {
- paperQu.setScore(repo.getJudgeScore());
- paperQu.setActualScore(repo.getJudgeScore());
- }
-
- return paperQu;
- }
-
-
- /**
- * 保存试卷
- * @param userId
- * @param exam
- * @param quList
- * @return
- */
- private Paper savePaper(String userId, ExamDTO exam, List quList) {
-
-
- // 查找用户
- SysUser user = sysUserService.getById(userId);
-
- //保存试卷基本信息
- Paper paper = new Paper();
- paper.setDepartId(user.getDepartId());
- paper.setExamId(exam.getId());
- paper.setTitle(exam.getTitle());
- paper.setTotalScore(exam.getTotalScore());
- paper.setTotalTime(exam.getTotalTime());
- paper.setUserScore(0);
- paper.setUserId(userId);
- paper.setCreateTime(new Date());
- paper.setUpdateTime(new Date());
- paper.setQualifyScore(exam.getQualifyScore());
- paper.setState(PaperState.ING);
- paper.setHasSaq(false);
-
- // 截止时间
- Calendar cl = Calendar.getInstance();
- cl.setTimeInMillis(System.currentTimeMillis());
- cl.add(Calendar.MINUTE, exam.getTotalTime());
- paper.setLimitTime(cl.getTime());
-
- paperService.save(paper);
-
- if (!CollectionUtils.isEmpty(quList)) {
- this.savePaperQu(paper.getId(), quList);
- }
-
- return paper;
- }
-
-
-
- /**
- * 保存试卷试题列表
- * @param paperId
- * @param quList
- */
- private void savePaperQu(String paperId, List quList){
-
- List batchQuList = new ArrayList<>();
- List batchAnswerList = new ArrayList<>();
-
- int sort = 0;
- for (PaperQu item : quList) {
-
- item.setPaperId(paperId);
- item.setSort(sort);
- item.setId(IdWorker.getIdStr());
-
- //回答列表
- List answerList = quAnswerService.listAnswerByRandom(item.getQuId());
-
- if (!CollectionUtils.isEmpty(answerList)) {
-
- int ii = 0;
- for (QuAnswer answer : answerList) {
- PaperQuAnswer paperQuAnswer = new PaperQuAnswer();
- paperQuAnswer.setId(UUID.randomUUID().toString());
- paperQuAnswer.setPaperId(paperId);
- paperQuAnswer.setQuId(answer.getQuId());
- paperQuAnswer.setAnswerId(answer.getId());
- paperQuAnswer.setChecked(false);
- paperQuAnswer.setSort(ii);
- paperQuAnswer.setAbc(ABC.get(ii));
- paperQuAnswer.setIsRight(answer.getIsRight());
- ii++;
- batchAnswerList.add(paperQuAnswer);
- }
- }
-
- batchQuList.add(item);
- sort++;
- }
-
- //添加问题
- paperQuService.saveBatch(batchQuList);
-
- //批量添加问题答案
- paperQuAnswerService.saveBatch(batchAnswerList);
- }
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void fillAnswer(PaperAnswerDTO reqDTO) {
-
-
- // 未作答
- if(CollectionUtils.isEmpty(reqDTO.getAnswers())
- && StringUtils.isBlank(reqDTO.getAnswer())){
- return;
- }
-
- //查找答案列表
- List list = paperQuAnswerService.listForFill(reqDTO.getPaperId(), reqDTO.getQuId());
-
- //是否正确
- boolean right = true;
-
- //更新正确答案
- for (PaperQuAnswer item : list) {
-
- if (reqDTO.getAnswers().contains(item.getId())) {
- item.setChecked(true);
- } else {
- item.setChecked(false);
- }
-
- //有一个对不上就是错的
- if (item.getIsRight()!=null && !item.getIsRight().equals(item.getChecked())) {
- right = false;
- }
- paperQuAnswerService.updateById(item);
- }
-
- //修改为已回答
- PaperQu qu = new PaperQu();
- qu.setQuId(reqDTO.getQuId());
- qu.setPaperId(reqDTO.getPaperId());
- qu.setIsRight(right);
- qu.setAnswer(reqDTO.getAnswer());
- qu.setAnswered(true);
-
- paperQuService.updateByKey(qu);
-
- }
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void handExam(String paperId) {
-
- //获取试卷信息
- Paper paper = paperService.getById(paperId);
-
- //如果不是正常的，抛出异常
- if(!PaperState.ING.equals(paper.getState())){
- throw new ServiceException(1, "试卷状态不正确！");
- }
-
- // 客观分
- int objScore = paperQuService.sumObjective(paperId);
- paper.setObjScore(objScore);
- paper.setUserScore(objScore);
-
- // 主观分，因为要阅卷，所以给0
- paper.setSubjScore(0);
-
- // 待阅卷
- if(paper.getHasSaq()) {
- paper.setState(PaperState.WAIT_OPT);
- }else {
-
- // 同步保存考试成绩
- userExamService.joinResult(paper.getUserId(), paper.getExamId(), objScore, objScore>=paper.getQualifyScore());
-
- paper.setState(PaperState.FINISHED);
- }
- paper.setUpdateTime(new Date());
-
- //计算考试时长
- Calendar cl = Calendar.getInstance();
- cl.setTimeInMillis(System.currentTimeMillis());
- int userTime = (int)((System.currentTimeMillis() - paper.getCreateTime().getTime()) / 1000 / 60);
- if(userTime == 0){
- userTime = 1;
- }
- paper.setUserTime(userTime);
-
- //更新试卷
- paperService.updateById(paper);
-
-
- // 终止定时任务
- String name = JobPrefix.BREAK_EXAM + paperId;
- jobService.deleteJob(name, JobGroup.SYSTEM);
-
- //把打错的问题加入错题本
- List list = paperQuService.listByPaper(paperId);
- for(PaperQuDTO qu: list){
- // 主观题和对的都不加入错题库
- if(qu.getIsRight()){
- continue;
- }
- //加入错题本
- new Thread(() -> userBookService.addBook(paper.getExamId(), qu.getQuId())).run();
- }
- }
-
- @Override
- public IPage paging(PagingReqDTO reqDTO) {
- return baseMapper.paging(reqDTO.toPage(), reqDTO.getParams());
- }
-
-
- @Override
- public PaperDTO checkProcess(String userId) {
-
- QueryWrapper wrapper = new QueryWrapper<>();
- wrapper.lambda()
- .eq(Paper::getUserId, userId)
- .eq(Paper::getState, PaperState.ING);
-
- Paper paper = this.getOne(wrapper, false);
-
- if (paper != null) {
- return BeanMapper.map(paper, PaperDTO.class);
- }
-
- return null;
- }
-}
diff --git a/exam-api/src/main/java/com/yf/exam/modules/qu/controller/QuController.java b/exam-api/src/main/java/com/yf/exam/modules/qu/controller/QuController.java
deleted file mode 100644
index 07e7d76..0000000
--- a/exam-api/src/main/java/com/yf/exam/modules/qu/controller/QuController.java
+++ /dev/null
@@ -1,324 +0,0 @@
-package com.yf.exam.modules.qu.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.google.common.collect.Lists;
-import com.yf.exam.core.api.ApiRest;
-import com.yf.exam.core.api.controller.BaseController;
-import com.yf.exam.core.api.dto.BaseIdReqDTO;
-import com.yf.exam.core.api.dto.BaseIdRespDTO;
-import com.yf.exam.core.api.dto.BaseIdsReqDTO;
-import com.yf.exam.core.api.dto.PagingReqDTO;
-import com.yf.exam.core.exception.ServiceException;
-import com.yf.exam.core.utils.BeanMapper;
-import com.yf.exam.core.utils.excel.ExportExcel;
-import com.yf.exam.core.utils.excel.ImportExcel;
-import com.yf.exam.modules.qu.dto.QuDTO;
-import com.yf.exam.modules.qu.dto.export.QuExportDTO;
-import com.yf.exam.modules.qu.dto.ext.QuDetailDTO;
-import com.yf.exam.modules.qu.dto.request.QuQueryReqDTO;
-import com.yf.exam.modules.qu.entity.Qu;
-import com.yf.exam.modules.qu.service.QuService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.shiro.authz.annotation.RequiresRoles;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-/**
-*
-* 问题题目控制器
-*
-*
-* @author 聪明笨狗
-* @since 2020-05-25 13:25
-*/
-@Api(tags={"问题题目"})
-@RestController
-@RequestMapping("/exam/api/qu/qu")
-public class QuController extends BaseController {
-
- @Autowired
- private QuService baseService;
-
- /**
- * 添加或修改
- *
- * @param reqDTO
- * @return
- */
- @RequiresRoles("sa")
- @ApiOperation(value = "添加或修改")
- @RequestMapping(value = "/save", method = {RequestMethod.POST})
- public ApiRest save(@RequestBody QuDetailDTO reqDTO) {
- baseService.save(reqDTO);
- return super.success();
- }
-
- /**
- * 批量删除
- *
- * @param reqDTO
- * @return
- */
- @RequiresRoles("sa")
- @ApiOperation(value = "批量删除")
- @RequestMapping(value = "/delete", method = {RequestMethod.POST})
- public ApiRest edit(@RequestBody BaseIdsReqDTO reqDTO) {
- //根据ID删除
- baseService.delete(reqDTO.getIds());
- return super.success();
- }
-
- /**
- * 查找详情
- *
- * @param reqDTO
- * @return
- */
- @ApiOperation(value = "查找详情")
- @RequestMapping(value = "/detail", method = {RequestMethod.POST})
- public ApiRest detail(@RequestBody BaseIdReqDTO reqDTO) {
- QuDetailDTO dto = baseService.detail(reqDTO.getId());
- return super.success(dto);
- }
-
- /**
- * 分页查找
- *
- * @param reqDTO
- * @return
- */
- @RequiresRoles("sa")
- @ApiOperation(value = "分页查找")
- @RequestMapping(value = "/paging", method = {RequestMethod.POST})
- public ApiRest> paging(@RequestBody PagingReqDTO reqDTO) {
-
- //分页查询并转换
- IPage page = baseService.paging(reqDTO);
-
- return super.success(page);
- }
-
-
- /**
- * 导出excel文件
- */
- @RequiresRoles("sa")
- @ResponseBody
- @RequestMapping(value = "/export")
- public ApiRest exportFile(HttpServletResponse response, @RequestBody QuQueryReqDTO reqDTO) {
-
-
- // 导出文件名
- String fileName = "导出的试题-" + System.currentTimeMillis() + ".xlsx";
-
- try {
-
- int no = 0;
- String quId = "";
- List list = baseService.listForExport(reqDTO);
- for (QuExportDTO item : list) {
- if (!quId.equals(item.getQId())) {
- quId = item.getQId();
- no += 1;
- } else {
- item.setQuType("0");
- item.setQContent("");
- item.setQAnalysis("");
- item.setRepoList(null);
- item.setQImage("");
- item.setQVideo("");
- }
- item.setNo(String.valueOf(no));
- }
- new ExportExcel("试题", QuExportDTO.class).setDataList(list).write(response, fileName).dispose();
- return super.success();
- } catch (Exception e) {
- return failure(e.getMessage());
- }
- }
-
- /**
- * 导入Excel
- *
- * @param file
- * @return
- */
- @RequiresRoles("sa")
- @ResponseBody
- @RequestMapping(value = "/import")
- public ApiRest importFile(@RequestParam("file") MultipartFile file) {
-
- try {
-
- ImportExcel ei = new ImportExcel(file, 1, 0);
- List list = ei.getDataList(QuExportDTO.class);
-
- // 校验数据
- this.checkExcel(list);
-
- // 导入数据条数
- baseService.importExcel(list);
-
- // 导入成功
- return super.success();
-
- } catch (IOException e) {
-
- } catch (InvalidFormatException e) {
-
- } catch (IllegalAccessException e) {
-
- } catch (InstantiationException e) {
-
- }
-
- return super.failure();
- }
-
- /**
- * 校验Excel
- *
- * @param list
- * @throws Exception
- */
- private void checkExcel(List