clazz) {
+ return clazz.cast(CacheUtil.get(key));
+ }
+
+ /**
+ * 清除缓存
+ *
+ * @param key
+ * @return
+ */
+ public synchronized static Object remove(String key) {
+ //清除原缓存数据
+ Entity entity = map.remove(key);
+ if (entity == null) {
+ return null;
+ }
+ //清除原键值对定时器
+ Future future = entity.getFuture();
+ if (future != null) {
+ future.cancel(true);
+ }
+ return entity.getValue();
+ }
+
+ /**
+ * 查询当前缓存的键值对数量
+ *
+ * @return
+ */
+ public synchronized static int size() {
+ return map.size();
+ }
+
+ /**
+ * 缓存实体类
+ */
+ private static class Entity {
+ //键值对的value
+ private Object value;
+ //定时器Future
+ private Future future;
+
+ public Entity(Object value, Future future) {
+ this.value = value;
+ this.future = future;
+ }
+
+ /**
+ * 获取值
+ *
+ * @return
+ */
+ public Object getValue() {
+ return value;
+ }
+
+ /**
+ * 获取Future对象
+ *
+ * @return
+ */
+ public Future getFuture() {
+ return future;
+ }
+ }
+}
diff --git a/common/src/main/java/com/huoran/common/utils/CheckCodeUtils.java b/common/src/main/java/com/huoran/common/utils/CheckCodeUtils.java
new file mode 100644
index 0000000..65a252a
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/CheckCodeUtils.java
@@ -0,0 +1,44 @@
+package com.huoran.common.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Random;
+
+/**
+ * @description 验证码工具类
+ * @author: Mr.JK
+ * @create: 2021-06-22 15:56
+ **/
+public class CheckCodeUtils {
+
+ /**
+ * 获取六位随机数验证码
+ * @return
+ */
+ public String sendCode(){
+
+ Random random = new Random();
+ String code="";
+ for (int i=0;i<6;i++)
+ {
+ code+=random.nextInt(10);
+ }
+ return code;
+ }
+
+ /**
+ * 生成时间
+ */
+ public String letTimes(int letTime){
+
+ Calendar instance = Calendar.getInstance();
+ instance.add(Calendar.MINUTE,+letTime);
+ Date time = instance.getTime();
+ SimpleDateFormat myFmt=new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
+ String format1 = myFmt.format(time);
+
+ return format1;
+ }
+
+}
diff --git a/common/src/main/java/com/huoran/common/utils/CheckDateUtil.java b/common/src/main/java/com/huoran/common/utils/CheckDateUtil.java
new file mode 100644
index 0000000..65e3a8f
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/CheckDateUtil.java
@@ -0,0 +1,41 @@
+package com.huoran.common.utils;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @ProjectName: huorantech
+ * @Package: com.huoran.common.utils
+ * @ClassName: CheckDateUtil
+ * @Description: 校验用户输入的时间
+ * @Author: Maureen.Rong
+ * @CreateDate: 2021/8/19 11:12
+ * @UpdateDate: 2021/8/19 11:12
+ * @Version: 1.0
+ */
+public class CheckDateUtil {
+ /**
+ * 如果为true表示
+ * 校验用户输入的时间
+ *
+ * @param startTime
+ * @return
+ */
+ public static boolean checStartkTime(String startTime) {
+ try {
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ //用户输入的时间
+ Date dateTime1 = dateFormat.parse(startTime);
+ //当前时间
+ String DateStr2 = DateUtils.nowTime();
+ Date dateTime2 = dateFormat.parse(DateStr2);
+ int i = dateTime1.compareTo(dateTime2);
+ boolean ret = false;
+ ret = i > 0;
+ return ret;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+}
diff --git a/common/src/main/java/com/huoran/common/utils/ConstantPropertiesUtil.java b/common/src/main/java/com/huoran/common/utils/ConstantPropertiesUtil.java
new file mode 100644
index 0000000..66a3765
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/ConstantPropertiesUtil.java
@@ -0,0 +1,39 @@
+package com.huoran.common.utils;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * 常量类，读取配置文件application.properties中的配置
+ */
+@Component
+@PropertySource("classpath:application.properties")
+public class ConstantPropertiesUtil implements InitializingBean {
+
+ @Value("${aliyun.oss.file.endpoint}")
+ private String endpoint;
+
+ @Value("${aliyun.oss.file.keyid}")
+ private String keyId;
+
+ @Value("${aliyun.oss.file.keysecret}")
+ private String keySecret;
+
+ @Value("${aliyun.oss.file.bucketname}")
+ private String bucketName;
+
+ public static String END_POINT;
+ public static String ACCESS_KEY_ID;
+ public static String ACCESS_KEY_SECRET;
+ public static String BUCKET_NAME;
+
+ @Override
+ public void afterPropertiesSet() throws Exception {
+ END_POINT = endpoint;
+ ACCESS_KEY_ID = keyId;
+ ACCESS_KEY_SECRET = keySecret;
+ BUCKET_NAME = bucketName;
+ }
+}
diff --git a/common/src/main/java/com/huoran/common/utils/DateUtil.java b/common/src/main/java/com/huoran/common/utils/DateUtil.java
new file mode 100644
index 0000000..14660b0
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/DateUtil.java
@@ -0,0 +1,45 @@
+package com.huoran.common.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * @Author chen
+ * @DATE 2020/10/20 10:46
+ * @Version 1.0
+ */
+public class DateUtil {
+
+ public static String lastDate(Integer month){
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Calendar c = Calendar.getInstance();
+
+ if (month==1){
+ c.add(Calendar.MONTH,-1);
+ Date time = c.getTime();
+ return format.format(time);
+ }
+ if (month==3){
+ c.add(Calendar.MONTH,-3);
+ Date time = c.getTime();
+ return format.format(time);
+ }
+ if (month==6){
+ c.add(Calendar.MONTH,-6);
+ Date time = c.getTime();
+ return format.format(time);
+ }
+ return "";
+ }
+
+ public static String currentDate(){
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ return format.format(new Date());
+ }
+
+ public static void main(String[] args) {
+ System.out.println(currentDate());
+ }
+
+}
diff --git a/common/src/main/java/com/huoran/common/utils/DateUtils.java b/common/src/main/java/com/huoran/common/utils/DateUtils.java
new file mode 100644
index 0000000..d65ccd0
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/DateUtils.java
@@ -0,0 +1,193 @@
+package com.huoran.common.utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.Date;
+
+public class DateUtils {
+
+ public static String handleTime(Date date) {
+ Instant instant = date.toInstant();
+ ZoneId zoneId = ZoneId.systemDefault();
+ LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
+ return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); // 当前日期和时间
+ }
+
+ public static String formatTime(LocalDateTime time) {
+ String timeStr1 = time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ return timeStr1;
+ }
+
+ /**
+ * 时间类型转换
+ *
+ * @param time
+ * @return
+ */
+ public static String dateForByStr(String time) {
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date date = sdf.parse(time);
+ //获取String类型的时间
+ String createdate = sdf.format(date);
+ return createdate;
+ } catch (ParseException e) {
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ /**
+ * 获取当前时间
+ *
+ * @return
+ */
+ /*public static String getNowTime(Integer userId) {
+
+ String getDate = template.opsForValue().get("date:userId_" + userId);
+ SimpleDateFormat tempDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String datetime = tempDate.format(new java.utils.Date());
+ //也可以用这个
+ String datetimes = tempDate.format(new Date(System.currentTimeMillis()));
+ return getDate;
+ }*/
+ public static String getNowTime() {
+ SimpleDateFormat tempDate = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String datetime = tempDate.format(new Date());
+ //也可以用这个
+ String datetimes = tempDate.format(new Date(System.currentTimeMillis()));
+ return datetime;
+ }
+
+ public static String nowTime() {
+ SimpleDateFormat tempDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String datetime = tempDate.format(new Date());
+ //也可以用这个
+ String datetimes = tempDate.format(new Date(System.currentTimeMillis()));
+ return datetime;
+ }
+
+ /**
+ * 获取当前时间往后推几个月
+ *
+ * @param startDate
+ * @param number
+ * @return
+ */
+ public static String getAfterDate(Date startDate, int number) {
+ Calendar c = Calendar.getInstance();//获得一个日历的实例
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+ c.setTime(startDate);
+ c.add(Calendar.MONTH, number);
+
+ return sdf.format(c.getTime());
+ }
+
+ //获取两个日期之间的天数
+ public static int getDatePoor(Date endDate, Date nowDate) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(endDate);
+ long time1 = cal.getTimeInMillis();
+ cal.setTime(nowDate);
+ long time2 = cal.getTimeInMillis();
+ long between_days = (time2 - time1) / (1000 * 3600 * 24);
+ int parseInt = Integer.parseInt(String.valueOf(between_days));
+ parseInt = parseInt + 1;
+ return parseInt;
+ }
+
+ public static void main(String[] args) throws ParseException {
+ String d1 = "2022-06-09 00:00";
+ String d2 = "2022-06-10 23:00";
+
+ System.out.println(getTheNumberOfDaysBetweenTwoDates(d2, d1));
+ }
+
+ public static int getTheNumberOfDaysBetweenTwoDates(String endDate, String nowDate) throws ParseException {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Date date1 = simpleDateFormat.parse(nowDate);
+ Date date2 = simpleDateFormat.parse(endDate);
+ int l = (int) (date2.getTime() - date1.getTime()) / (1000 * 24 * 60 * 60);
+ // System.out.println("两个时间相差" + l + "天");
+ return l;
+ }
+
+ /**
+ * Date 转换为 String
+ *
+ * @param date
+ * @return
+ */
+ public static String getDateByString(Date date) {
+ String pattern2 = "yyyy-MM-dd HH:mm:ss";
+ SimpleDateFormat sdf2 = new SimpleDateFormat(pattern2);
+ System.out.println(sdf2.format(date));
+ return sdf2.format(date);
+ }
+
+ public static Date getDateByDay(int day) {
+ Calendar calendar = Calendar.getInstance();
+ // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ calendar.add(Calendar.DAY_OF_YEAR, day);
+ return calendar.getTime();
+ }
+
+ /*public static long dateDiff(String startTime, String endTime) {
+ //按照dao传入的格式生成一个simpledateformate对象
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ long nd = 1000 * 24 * 60 * 60;//一天的毫秒数
+ long nh = 1000 * 60 * 60;//一小时的毫秒数
+ long nm = 1000 * 60;//一分钟的毫秒数
+ long ns = 1000;//一秒钟的毫秒数
+ long diff;
+ try {
+ //获得两个时间的毫秒时间差异
+ diff = sd.parse(endTime).getTime() - sd.parse(startTime).getTime();
+ long day = diff / nd;//计算差多少天
+ long hour = diff % nd / nh;//计算差多少小时
+ long min = diff % nd % nh / nm;//计算差多少分钟
+ long sec = diff % nd % nh % nm / ns;//计算差多少秒//输出结果
+ System.out.println("时间相差：" + day + "天" + hour + "小时" + min + "分钟" + sec + "秒。");
+
+
+ long countHour = 0;//统计分钟
+ countHour = (day * 24 * 60) + (hour * 60) + min;//天数*24小时
+ return countHour;
+
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ return 0;
+ }
+ }*/
+
+ public static long dateDiffByLong(String startTime) throws ParseException {
+
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ long start = sd.parse(startTime).getTime();
+
+ long end = System.currentTimeMillis();
+
+ long min = (end - start) / (1000 * 60);
+
+ System.out.println(min);
+
+ if (min == 0) {
+ return 1;
+ }
+ return min;
+ }
+
+
+ /*public static void main(String[] args) throws ParseException {
+ dateDiffByLong("2021-05-28 09:52:05");
+ }*/
+
+}
diff --git a/common/src/main/java/com/huoran/common/utils/DeleteFilesUtil.java b/common/src/main/java/com/huoran/common/utils/DeleteFilesUtil.java
new file mode 100644
index 0000000..9990bf6
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/DeleteFilesUtil.java
@@ -0,0 +1,31 @@
+package com.huoran.common.utils;
+
+import java.io.File;
+
+/**
+ * @描述：
+ * @作者: Rong
+ * @日期: 2021/12/17 14:54
+ */
+public class DeleteFilesUtil {
+
+ /**
+ * 删除生成的文件
+ *
+ * @param path
+ */
+ public static void deleteFile(String path) {
+ File file = new File(path);
+ // 判断目录或文件是否存在
+ if (file.exists()) { // 不存在返回 false
+ // 判断是否为文件
+ if (file.isFile()) {
+ // 路径为文件且不为空则进行删除
+ if (file.isFile() && file.exists()) {
+ file.delete();
+ }
+ }
+ }
+
+ }
+}
diff --git a/common/src/main/java/com/huoran/common/utils/EmailUtils.java b/common/src/main/java/com/huoran/common/utils/EmailUtils.java
new file mode 100644
index 0000000..df39b5a
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/EmailUtils.java
@@ -0,0 +1,81 @@
+package com.huoran.common.utils;
+
+import org.apache.commons.mail.DefaultAuthenticator;
+import org.apache.commons.mail.HtmlEmail;
+
+import javax.mail.Message;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import java.util.Properties;
+
+/**
+ * @description
+ * @author: Mr.JK
+ * @create: 2021-06-22 16:08
+ **/
+public class EmailUtils {
+
+ //服务器地址
+ private static final String SERVER_ADDRESS = "smtp.mxhichina.com";
+ //邮箱地址
+ private static final String EMAILADDRESS = "postmaster@huorantech.cn";
+ //发生邮箱密码
+ private static final String EMAILPASSWORD = "HR111aaa";
+ //发送人姓名
+ private static final String EMAILUSERNAME = "DataForward";
+ //授权码
+ //private static final String AUTHORIZATION_CODE = "smtp.mxhichina.com";
+ //邮件标题
+ private static final String EMAILHEAD = "数据前瞻平台";
+ //邮件信息（后接验证码）头部信息
+ private static final String EMAILMASSAGEHEAD = "尊敬的用户，欢迎使用数据前瞻平台，您本次的验证码是: ";
+ //邮件信息（后接验证码）尾部信息
+ private static final String EMAILMASSAGETAIL = "，有效时间为5分钟";
+
+
+ //邮箱验证码
+ public static boolean sendEmail(String emailaddress,String code){
+ try {
+ HtmlEmail email = new HtmlEmail();
+ email.setHostName(SERVER_ADDRESS);
+ email.setSSLOnConnect(true); //使用ssl加密true
+ email.setSslSmtpPort("465"); //使用465端口
+ email.setCharset("UTF-8");
+ email.addTo(emailaddress);
+
+ email.setFrom(EMAILADDRESS, EMAILUSERNAME);
+// -- 使用阿里企业邮箱无授权码
+// email.setAuthentication(EMAILADDRESS, AUTHORIZATION_CODE);
+
+ email.setAuthenticator(new DefaultAuthenticator(EMAILADDRESS,EMAILPASSWORD));
+ email.setSubject(EMAILHEAD);
+ email.setMsg( EMAILMASSAGEHEAD + code + EMAILMASSAGETAIL);
+
+ email.send();
+ return true;
+ }
+ catch(Exception e){
+ e.printStackTrace();
+ return false;
+ }
+ }
+
+ /**
+ * 描述：是否是邮箱.
+ *
+ * @param str 指定的字符串
+ * @return 是否是邮箱:是为true，否则false
+ */
+ public static Boolean isEmail(String str) {
+ Boolean isEmail = false;
+ String expr = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})$";
+
+ if (str.matches(expr)) {
+ isEmail = true;
+ }
+ return isEmail;
+ }
+
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/huoran/common/utils/HttpContextUtils.java b/common/src/main/java/com/huoran/common/utils/HttpContextUtils.java
new file mode 100644
index 0000000..335761a
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/HttpContextUtils.java
@@ -0,0 +1,32 @@
+package com.huoran.common.utils;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
+
+/**
+ * HttpContextUtils
+ *
+ * @author cheney
+ * @version V1.0
+ * @date 2022年7月28日
+ */
+public class HttpContextUtils {
+
+ public static HttpServletRequest getHttpServletRequest() {
+ return ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ }
+
+ public static boolean isAjaxRequest(HttpServletRequest request) {
+
+ String accept = request.getHeader("accept");
+ String xRequestedWith = request.getHeader("X-Requested-With");
+
+ // 如果是异步请求或是手机端，则直接返回信息
+ return ((accept != null && accept.contains("application/json")
+ || (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest"))
+ ));
+ }
+}
diff --git a/common/src/main/java/com/huoran/common/utils/IPUtils.java b/common/src/main/java/com/huoran/common/utils/IPUtils.java
new file mode 100644
index 0000000..14c0a2c
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/IPUtils.java
@@ -0,0 +1,73 @@
+package com.huoran.common.utils;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * IPUtils
+ *
+ * @author cheney
+ * @version V1.0
+ * @date 2022年7月28日
+ */
+public class IPUtils {
+
+ private static Logger logger = LoggerFactory.getLogger(IPUtils.class);
+
+ /**
+ * 获取IP地址
+ *
+ * 使用Nginx等反向代理软件， 则不能通过request.getRemoteAddr()获取IP地址
+ * 如果使用了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP地址，X-Forwarded-For中第一个非unknown的有效IP字符串，则为真实IP地址
+ */
+ public static String getIpAddr(HttpServletRequest request) {
+ String ip = null;
+ try {
+ ip = request.getHeader("x-forwarded-for");
+ if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("Proxy-Client-IP");
+ }
+ if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("HTTP_CLIENT_IP");
+ }
+ if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+ }
+ if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getRemoteAddr();
+ }
+ } catch (Exception e) {
+ logger.error("IPUtils ERROR ", e);
+ }
+
+ // 使用代理，则获取第一个IP地址
+ if (!StringUtils.isEmpty(ip) && ip.length() > 15) {
+ if (ip.indexOf(",") > 0) {
+ ip = ip.substring(0, ip.indexOf(","));
+ }
+ }
+
+ return ip;
+ }
+
+ /**
+ * 获取客户端主机名称
+ */
+ public static String getHostName() {
+ try {
+ return InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException e) {
+ logger.error(e.getMessage(), e);
+ }
+ return "未知";
+ }
+
+}
diff --git a/common/src/main/java/com/huoran/common/utils/JwtUtils.java b/common/src/main/java/com/huoran/common/utils/JwtUtils.java
new file mode 100644
index 0000000..7ad49da
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/JwtUtils.java
@@ -0,0 +1,57 @@
+package com.huoran.common.utils;
+
+
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.springframework.util.StringUtils;
+
+import java.util.Date;
+
+/**
+ * @author cheney
+ */
+public class JwtUtils {
+
+ public static final long EXPIRE = 1000 * 60 * 600 * 24;//失效时间
+ public static final String APP_SECRET = "HuoRan2021chenHS25666";//hs256对称加密算法
+
+ public static String getJwtToken(String id){
+
+ String JwtToken = Jwts.builder()
+ .setHeaderParam("typ", "JWT")
+ .setHeaderParam("alg", "HS256")
+ .setSubject("user")
+ .setIssuedAt(new Date())
+ .setExpiration(new Date(System.currentTimeMillis() + EXPIRE))
+ .claim("accountId", id)
+ .signWith(SignatureAlgorithm.HS256, APP_SECRET)
+ .compact();
+
+ return JwtToken;
+ }
+
+ public static void main(String[] args) {
+ String jwtToken = getJwtToken("108");
+ System.out.println(jwtToken);
+
+// boolean jwtToken = checkToken("\n" +
+// "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjk4OTkwNzc3LCJleHAiOjE2OTk4NTQ3NzcsImFjY291bnRJZCI6IjMxIn0.PkzSpCHaRNtFd2k0ik4zfqg0KhoYR1e-r51lbb1S0nc");
+// System.out.println(jwtToken);
+ }
+
+ /**
+ * 判断token是否存在与有效
+ */
+ public static boolean checkToken(String jwtToken) {
+ if(StringUtils.isEmpty(jwtToken)) {
+ return false;
+ }
+ try {
+ Jwts.parser().setSigningKey(APP_SECRET).parseClaimsJws(jwtToken);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/common/src/main/java/com/huoran/common/utils/MD5.java b/common/src/main/java/com/huoran/common/utils/MD5.java
new file mode 100644
index 0000000..f0e0ebb
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/MD5.java
@@ -0,0 +1,34 @@
+package com.huoran.common.utils;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public final class MD5 {
+ public static void main(String[] args) {
+ System.out.println(encrypt("admin"));
+ }
+
+ public static String encrypt(String strSrc) {
+ try {
+ char hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8',
+ '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+ byte[] bytes = strSrc.getBytes();
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ md.update(bytes);
+ bytes = md.digest();
+ int j = bytes.length;
+ char[] chars = new char[j * 2];
+ int k = 0;
+ for (int i = 0; i < bytes.length; i++) {
+ byte b = bytes[i];
+ chars[k++] = hexChars[b >>> 4 & 0xf];
+ chars[k++] = hexChars[b & 0xf];
+ }
+ return new String(chars);
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ throw new RuntimeException("MD5加密出错！！+" + e);
+ }
+ }
+
+}
diff --git a/common/src/main/java/com/huoran/common/utils/PageUtils.java b/common/src/main/java/com/huoran/common/utils/PageUtils.java
new file mode 100644
index 0000000..b300d6a
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/PageUtils.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.huoran.common.utils;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分页工具类
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+public class PageUtils implements Serializable {
+ private static final long serialVersionUID = 1L;
+ /**
+ * 总记录数
+ */
+ private int totalCount;
+ /**
+ * 每页记录数
+ */
+ private int pageSize;
+ /**
+ * 总页数
+ */
+ private int totalPage;
+ /**
+ * 当前页数
+ */
+ private int currPage;
+ /**
+ * 列表数据
+ */
+ private List list;
+
+ /**
+ * 分页
+ * @param list 列表数据
+ * @param totalCount 总记录数
+ * @param pageSize 每页记录数
+ * @param currPage 当前页数
+ */
+ public PageUtils(List list, int totalCount, int pageSize, int currPage) {
+ this.list = list;
+ this.totalCount = totalCount;
+ this.pageSize = pageSize;
+ this.currPage = currPage;
+ this.totalPage = (int) Math.ceil((double) totalCount / pageSize);
+ }
+
+ /**
+ * 分页
+ */
+ public PageUtils(IPage page) {
+ this.list = page.getRecords();
+ this.totalCount = (int) page.getTotal();
+ this.pageSize = (int) page.getSize();
+ this.currPage = (int) page.getCurrent();
+ this.totalPage = (int) page.getPages();
+ }
+
+ public int getTotalCount() {
+ return totalCount;
+ }
+
+ public void setTotalCount(int totalCount) {
+ this.totalCount = totalCount;
+ }
+
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public int getTotalPage() {
+ return totalPage;
+ }
+
+ public void setTotalPage(int totalPage) {
+ this.totalPage = totalPage;
+ }
+
+ public int getCurrPage() {
+ return currPage;
+ }
+
+ public void setCurrPage(int currPage) {
+ this.currPage = currPage;
+ }
+
+ public List getList() {
+ return list;
+ }
+
+ public void setList(List list) {
+ this.list = list;
+ }
+
+}
diff --git a/common/src/main/java/com/huoran/common/utils/RandomUtil.java b/common/src/main/java/com/huoran/common/utils/RandomUtil.java
new file mode 100644
index 0000000..5c34a5e
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/RandomUtil.java
@@ -0,0 +1,64 @@
+package com.huoran.common.utils;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * 获取随机数
+ *
+ * @author cheney
+ *
+ */
+public class RandomUtil {
+
+ private static final Random random = new Random();
+
+ private static final DecimalFormat fourdf = new DecimalFormat("0000");
+
+ private static final DecimalFormat sixdf = new DecimalFormat("000000");
+
+ public static String getFourBitRandom() {
+ return fourdf.format(random.nextInt(10000));
+ }
+
+ public static String getSixBitRandom() {
+ return sixdf.format(random.nextInt(1000000));
+ }
+
+ /**
+ * 给定数组，抽取n个数据
+ * @param list
+ * @param n
+ * @return
+ */
+ public static ArrayList getRandom(List list, int n) {
+
+ Random random = new Random();
+
+ HashMap hashMap = new HashMap();
+
+ // 生成随机数字并存入HashMap
+ for (int i = 0; i < list.size(); i++) {
+
+ int number = random.nextInt(100) + 1;
+
+ hashMap.put(number, i);
+ }
+
+ // 从HashMap导入数组
+ Object[] robjs = hashMap.values().toArray();
+
+ ArrayList r = new ArrayList();
+
+ // 遍历数组并打印数据
+ for (int i = 0; i < n; i++) {
+ r.add(list.get((int) robjs[i]));
+ System.out.print(list.get((int) robjs[i]) + "\t");
+ }
+ System.out.print("\n");
+ return r;
+ }
+}
diff --git a/common/src/main/java/com/huoran/common/utils/SendSMSUtils.java b/common/src/main/java/com/huoran/common/utils/SendSMSUtils.java
new file mode 100644
index 0000000..04bcc55
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/SendSMSUtils.java
@@ -0,0 +1,56 @@
+package com.huoran.common.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.CommonRequest;
+import com.aliyuncs.CommonResponse;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import com.huoran.common.constant.SMSTemplate;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Map;
+
+/**
+ * @description
+ * @author: Mr.JK
+ * @create: 2021-06-22 15:58
+ **/
+@Slf4j
+public class SendSMSUtils {
+
+ public static boolean send(String PhoneNumbers, String templateCode, Map param) {
+
+ if(StringUtils.isEmpty(PhoneNumbers)) {
+ return false;
+ }
+
+ DefaultProfile profile =
+ DefaultProfile.getProfile("default", "LTAI4FzqQHnk4rozqLZ8jCNj", "mveW7B1OyFoKUkHm8WsxmrjHmkJWHq");
+ IAcsClient client = new DefaultAcsClient(profile);
+
+ CommonRequest request = new CommonRequest();
+ request.setMethod(MethodType.GET);
+ request.setDomain("dysmsapi.aliyuncs.com");
+ request.setVersion("2017-05-25");
+ request.setAction("SendSms");
+
+ request.putQueryParameter("PhoneNumbers", PhoneNumbers);
+ request.putQueryParameter("SignName", SMSTemplate.SMS_SIGNATURE);
+ request.putQueryParameter("TemplateCode", templateCode);
+ request.putQueryParameter("TemplateParam", JSONObject.toJSONString(param));
+
+ try {
+ CommonResponse response = client.getCommonResponse(request);
+ System.out.println(response.getData());
+ return response.getHttpResponse().isSuccess();
+ } catch (ClientException e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
+
+}
diff --git a/common/src/main/java/com/huoran/common/utils/TokenUtils.java b/common/src/main/java/com/huoran/common/utils/TokenUtils.java
new file mode 100644
index 0000000..758fe34
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/TokenUtils.java
@@ -0,0 +1,60 @@
+package com.huoran.common.utils;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.Jwts;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+
+import static com.huoran.common.utils.JwtUtils.APP_SECRET;
+
+/**
+ * @Author chen
+ * @DATE 2021/7/8 11:21
+ * @Version 1.0
+ */
+public class TokenUtils {
+
+ /**
+ * 判断token是否存在与有效
+ */
+ public static boolean checkToken(HttpServletRequest request) {
+ try {
+ String jwtToken = request.getHeader("token");
+ if(StringUtils.isEmpty(jwtToken)) {
+ return false;
+ }
+ Jwts.parser().setSigningKey(APP_SECRET).parseClaimsJws(jwtToken);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 根据token获取账号id
+ */
+ public static String getIdByJwtToken(HttpServletRequest request) {
+ String jwtToken = request.getHeader("token");
+ if(StringUtils.isEmpty(jwtToken)) {
+ return "";
+ }
+ Jws claimsJws = Jwts.parser().setSigningKey(APP_SECRET).parseClaimsJws(jwtToken);
+ Claims claims = claimsJws.getBody();
+ return (String)claims.get("accountId");
+ }
+
+ /**
+ * 根据token获取账号id
+ */
+ public static String getIdByJwtToken(String token) {
+ if(StringUtils.isEmpty(token)) {
+ return "";
+ }
+ Jws claimsJws = Jwts.parser().setSigningKey(APP_SECRET).parseClaimsJws(token);
+ Claims claims = claimsJws.getBody();
+ return (String)claims.get("accountId");
+ }
+}
diff --git a/common/src/main/java/com/huoran/common/utils/VideoUtil.java b/common/src/main/java/com/huoran/common/utils/VideoUtil.java
new file mode 100644
index 0000000..a9673ed
--- /dev/null
+++ b/common/src/main/java/com/huoran/common/utils/VideoUtil.java
@@ -0,0 +1,18 @@
+package com.huoran.common.utils;
+
+import java.util.regex.Pattern;
+
+/**
+ * @Author chen
+ * @DATE 2020/10/12 9:47
+ * @Version 1.0
+ * 正则验证是否为视频文件工具类
+ */
+public class VideoUtil {
+
+ public static boolean isVideo(String suffix){
+ String reg = "(mp4|flv|avi|rm|rmvb|wmv|qlv)";
+ Pattern p = Pattern.compile(reg);
+ return p.matcher(suffix).find();
+ }
+}
diff --git a/competition/pom.xml b/competition/pom.xml
new file mode 100644
index 0000000..b7adb28
--- /dev/null
+++ b/competition/pom.xml
@@ -0,0 +1,124 @@
+
+
+
+ huoran
+ com.huoran.parent
+ 1.0-SNAPSHOT
+
+ 4.0.0
+
+ competition
+
+
+ 8
+ 8
+ UTF-8
+
+
+
+
+
+
+
+
+
+
+ com.huoran.common
+ common
+ 0.0.1-SNAPSHOT
+
+
+
+ com.huoran.api
+ api
+ 1.0-SNAPSHOT
+ compile
+
+
+
+ com.alibaba
+ easyexcel
+
+
+
+ org.apache.poi
+ poi-ooxml
+
+
+ org.apache.poi
+ poi
+
+
+
+
+ cn.afterturn
+ easypoi-base
+
+
+ guava
+ com.google.guava
+
+
+ guava
+ com.google.guava
+
+
+ poi-ooxml-schemas
+ org.apache.poi
+
+
+
+
+ cn.afterturn
+ easypoi-web
+
+
+ cn.afterturn
+ easypoi-annotation
+
+
+
+
+
+ competition-1.0.0
+
+
+
+ src/main/java
+
+ **/*.xml
+
+
+
+ src/main/resources
+
+ **/*.properties
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.22.2
+
+ true
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/CompetitionApplication.java b/competition/src/main/java/com/huoran/competition/CompetitionApplication.java
new file mode 100644
index 0000000..5a1e81e
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/CompetitionApplication.java
@@ -0,0 +1,22 @@
+package com.huoran.competition;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableScheduling//定时任务
+@EnableFeignClients(basePackages = "com.huoran.api")
+@MapperScan(basePackages = "com.huoran.competition.mapper")
+@ComponentScan(basePackages = {"com.huoran"})
+public class CompetitionApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(CompetitionApplication.class, args);
+ }
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/config/AsyncTaskPoolConfig.java b/competition/src/main/java/com/huoran/competition/config/AsyncTaskPoolConfig.java
new file mode 100644
index 0000000..539401a
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/config/AsyncTaskPoolConfig.java
@@ -0,0 +1,29 @@
+package com.huoran.competition.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+@Configuration
+@EnableAsync
+public class AsyncTaskPoolConfig implements AsyncConfigurer {
+ @Bean(name = "competitionExecutor")
+ public ThreadPoolTaskExecutor taskExecutor(){
+ ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
+ taskExecutor.setCorePoolSize(300);
+ taskExecutor.setMaxPoolSize(500);
+ taskExecutor.setQueueCapacity(800);
+ taskExecutor.setKeepAliveSeconds(60);
+ taskExecutor.setThreadNamePrefix("competition-async-");
+ taskExecutor.setWaitForTasksToCompleteOnShutdown(true);
+ taskExecutor.setAwaitTerminationSeconds(60);
+ taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+ taskExecutor.initialize();
+ return taskExecutor;
+ }
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/config/DruidConfig.java b/competition/src/main/java/com/huoran/competition/config/DruidConfig.java
new file mode 100644
index 0000000..ef375e0
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/config/DruidConfig.java
@@ -0,0 +1,54 @@
+package com.huoran.competition.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.http.StatViewServlet;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.Map;
+
+
+//@Configuration
+public class DruidConfig {
+
+ /*
+ 将自定义的 Druid数据源添加到容器中，不再让 Spring Boot 自动创建
+ 绑定全局配置文件中的 druid 数据源属性到 com.alibaba.druid.pool.DruidDataSource从而让它们生效
+ @ConfigurationProperties(prefix = "spring.datasource")：作用就是将 全局配置文件中
+ 前缀为 spring.datasource的属性值注入到 com.alibaba.druid.pool.DruidDataSource 的同名参数中
+ */
+ @ConfigurationProperties(prefix = "spring.datasource")
+ @Bean
+ public DataSource druidDataSource() {
+ return new DruidDataSource();
+ }
+
+ //配置 Druid 监控管理后台的Servlet；
+//内置 Servlet 容器时没有web.xml文件，所以使用 Spring Boot 的注册 Servlet 方式
+ @Bean
+ public ServletRegistrationBean statViewServlet() {
+ ServletRegistrationBean bean = new ServletRegistrationBean(new StatViewServlet(), "/druid/*");
+
+ // 这些参数可以在 com.alibaba.druid.support.http.StatViewServlet
+ // 的父类 com.alibaba.druid.support.http.ResourceServlet 中找到
+ Map initParams = new HashMap<>();
+ initParams.put("loginUsername", "admin"); //后台管理界面的登录账号
+ initParams.put("loginPassword", "123456"); //后台管理界面的登录密码
+
+ //后台允许谁可以访问
+ //initParams.put("allow", "localhost")：表示只有本机可以访问
+ //initParams.put("allow", "")：为空或者为null时，表示允许所有访问
+ initParams.put("allow", "");
+ //deny：Druid 后台拒绝谁访问
+ //initParams.put("kuangshen", "192.168.1.20");表示禁止此ip访问
+
+ //设置初始化参数
+ bean.setInitParameters(initParams);
+ return bean;
+ }
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/config/SwaggerConfig.java b/competition/src/main/java/com/huoran/competition/config/SwaggerConfig.java
new file mode 100644
index 0000000..9565063
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/config/SwaggerConfig.java
@@ -0,0 +1,69 @@
+package com.huoran.competition.config;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Parameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger.web.DocExpansion;
+import springfox.documentation.swagger.web.OperationsSorter;
+import springfox.documentation.swagger.web.UiConfiguration;
+import springfox.documentation.swagger.web.UiConfigurationBuilder;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Mr.JK
+ */
+@Configuration
+@EnableSwagger2
+@Profile({"dev","test"})
+public class SwaggerConfig {
+
+ @Bean
+ public Docket createRestApi() {
+ // 构造token给测试的时候填写
+ ParameterBuilder tokenPar = new ParameterBuilder();
+ List pars = new ArrayList();
+ tokenPar.name("token").description("用户令牌(不需用户鉴权的不需要传)").modelRef(new ModelRef("string")).parameterType("header")
+ .required(false).build();
+ pars.add(tokenPar.build());
+
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(apiInfo())
+ .select()
+ .apis(RequestHandlerSelectors.basePackage("com.huoran.competition.controller"))
+ .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+ .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+ .paths(PathSelectors.any())
+ .build().globalOperationParameters(pars);
+ }
+
+
+
+ @Bean
+ UiConfiguration uiConfig() {
+ return UiConfigurationBuilder.builder().docExpansion(DocExpansion.LIST).operationsSorter(OperationsSorter.ALPHA).build();
+ }
+
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder()
+ .title("赛事微服务接口文档")
+ .description("cheney")
+ .contact("developer@mail.com")
+ .version("1.0")
+ .build();
+ }
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionAnnexController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionAnnexController.java
new file mode 100644
index 0000000..3987116
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionAnnexController.java
@@ -0,0 +1,51 @@
+package com.huoran.competition.controller;
+
+
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.response.R;
+import com.huoran.competition.entity.CompetitionAnnex;
+import com.huoran.competition.service.CompetitionAnnexService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 赛事附件表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(tags = "赛事附件管理")
+@RestController
+@RequestMapping("/competition/annex")
+public class CompetitionAnnexController {
+
+ @Autowired
+ private CompetitionAnnexService competitionAnnexService;
+ @NoRepeatSubmit
+ @PostMapping("/update")
+ @ApiOperation(value = "编辑赛事附件",response = CompetitionAnnex.class)
+ public R update(@RequestBody CompetitionAnnex competitionAnnex) {
+ boolean update = competitionAnnexService.updateById(competitionAnnex);
+ return update ? R.ok() : R.error();
+ }
+ @NoRepeatSubmit
+ @PostMapping("/save")
+ @ApiOperation(value = "新增赛事附件",response = CompetitionAnnex.class)
+ public R save(@RequestBody CompetitionAnnex competitionAnnex) {
+ boolean save = competitionAnnexService.save(competitionAnnex);
+ return save ? R.ok() : R.error();
+ }
+ @NoRepeatSubmit
+ @PostMapping("/delete")
+ @ApiOperation(value = "删除赛事附件",response = CompetitionAnnex.class)
+ public R delete(@RequestParam("id") @ApiParam(name = "id", value = "附件id", required = true) Integer id) {
+ boolean del = competitionAnnexService.removeById(id);
+ return del ? R.ok() : R.error();
+ }
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionAnnouncementAnnexController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionAnnouncementAnnexController.java
new file mode 100644
index 0000000..bf0441e
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionAnnouncementAnnexController.java
@@ -0,0 +1,67 @@
+package com.huoran.competition.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.constant.DelConstant;
+import com.huoran.common.response.R;
+import com.huoran.competition.entity.CompetitionAnnouncementAnnex;
+import com.huoran.competition.service.CompetitionAnnouncementAnnexService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 赛事公告附件表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(tags = "赛事公告附件管理")
+@RestController
+@RequestMapping("/competition/announcementAnnex")
+public class CompetitionAnnouncementAnnexController {
+
+ @Autowired
+ public CompetitionAnnouncementAnnexService service;
+
+ @PostMapping("/viewAttachments")
+ @ApiOperation(value = "查看公告下的附件",response = CompetitionAnnouncementAnnex.class)
+ public R findById(@RequestParam("announcementId") @ApiParam(value = "announcementId") Integer announcementId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("announcement_id",announcementId);
+ queryWrapper.eq("is_del", DelConstant.NOT_DEL);
+ List annexList = service.list(queryWrapper);
+ return R.ok().put("list",annexList);
+ }
+ @NoRepeatSubmit
+ @PostMapping("/save")
+ @ApiOperation(value = "新增",response = CompetitionAnnouncementAnnex.class)
+ public R save(@RequestBody CompetitionAnnouncementAnnex competitionAnnouncementAnnex) {
+ boolean save = service.save(competitionAnnouncementAnnex);
+ return save ? R.ok() : R.error();
+ }
+
+ @NoRepeatSubmit
+ @PostMapping("/update")
+ @ApiOperation(value = "修改",response = CompetitionAnnouncementAnnex.class)
+ public R update(@RequestBody CompetitionAnnouncementAnnex competitionAnnouncementAnnex) {
+ boolean update = service.updateById(competitionAnnouncementAnnex);
+ return update ? R.ok() : R.error();
+ }
+
+ @NoRepeatSubmit
+ @PostMapping("/delete")
+ @ApiOperation(value = "根据主键删除",response = CompetitionAnnouncementAnnex.class)
+ public R delete(@RequestParam("id") @ApiParam(value = "id")Integer id) {
+ boolean delete = service.removeById(id);
+ return delete ? R.ok() : R.error();
+ }
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionAnnouncementController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionAnnouncementController.java
new file mode 100644
index 0000000..7d85323
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionAnnouncementController.java
@@ -0,0 +1,114 @@
+package com.huoran.competition.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.constant.DelConstant;
+import com.huoran.common.response.R;
+import com.huoran.common.utils.TokenUtils;
+import com.huoran.competition.entity.CompetitionAnnouncement;
+import com.huoran.competition.entity.CompetitionAnnouncementAnnex;
+import com.huoran.competition.service.CompetitionAnnouncementAnnexService;
+import com.huoran.competition.service.CompetitionAnnouncementService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ *
+ * 赛事公告表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(tags = "赛事公告管理")
+@RestController
+@RequestMapping("/competition/announcement")
+public class CompetitionAnnouncementController {
+
+ @Autowired
+ public CompetitionAnnouncementService service;//公告
+
+ @Autowired
+ public CompetitionAnnouncementAnnexService annexService;//大赛公告附件
+
+
+ @PostMapping("/queryAnnouncementDetails")
+ @ApiOperation(value = "查询公告详情",response = CompetitionAnnouncement.class)
+ public R findById(
+ @RequestParam("id") @ApiParam(value = "公告主键") Integer id) {
+ CompetitionAnnouncement competitionAnnouncement = service.getById(id);
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("announcement_id",id);
+ queryWrapper.eq("is_del", DelConstant.NOT_DEL);
+ List annexList = annexService.list(queryWrapper);
+ if (annexList.size()>0){
+ competitionAnnouncement.setAnnouncementAnnexList(annexList);
+ }
+ return R.ok().put("data", competitionAnnouncement);
+ }
+
+ @NoRepeatSubmit
+ @PostMapping("/addAnnouncement")
+ @ApiOperation(value = "新增公告",response = CompetitionAnnouncement.class)
+ public R save(@RequestBody CompetitionAnnouncement competitionAnnouncement, HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ competitionAnnouncement.setAccountId(Integer.valueOf(accountId));
+ boolean save = service.save(competitionAnnouncement);
+ if (competitionAnnouncement.getAnnouncementAnnexList().size() > 0) {
+ competitionAnnouncement.getAnnouncementAnnexList().forEach(competitionAnnex -> {
+ competitionAnnex.setAnnouncementId(competitionAnnouncement.getId());
+ boolean saveCompetitionAnnex = annexService.save(competitionAnnex);//保存比赛附件
+ });
+ }
+ return save ? R.ok() : R.error();
+ }
+
+ @NoRepeatSubmit
+ @PostMapping("/amendmentAnnouncement")
+ @ApiOperation(value = "修改公告",response = CompetitionAnnouncement.class)
+ public R update(@RequestBody CompetitionAnnouncement competitionAnnouncement) {
+ boolean update = service.updateById(competitionAnnouncement);
+ return update ? R.ok() : R.error();
+ }
+
+ @NoRepeatSubmit
+ @ApiOperation(value = "是否禁用公告")
+ @PutMapping("/disableAnnouncement")
+ public R disableAnnouncement(@ApiParam(name = "id", value = "公告主键", required = true) @RequestParam Integer id,
+ @ApiParam(name = "isDisable", value = "是否开启(0开启 1未开启 默认0)", required = true)@RequestParam Integer isDisable) {
+ if (isDisable==1 || isDisable==0) {
+ CompetitionAnnouncement CompetitionAnnouncement = new CompetitionAnnouncement();
+ CompetitionAnnouncement.setId(id);
+ CompetitionAnnouncement.setIsOpen(isDisable);
+ boolean update = service.updateById(CompetitionAnnouncement);
+ return update ? R.ok() : R.error();
+ } else {
+ return R.error("启用状态错误");
+ }
+ }
+ @NoRepeatSubmit
+ @PostMapping("/deleteAnnouncement")
+ @ApiOperation(value = "删除公告",response = CompetitionAnnouncement.class)
+ public R delete(@RequestParam("id") @ApiParam(value = "公告主键") Integer id) {
+ boolean del = service.removeById(id);
+ return del ? R.ok() : R.error();
+ }
+
+
+ @PostMapping("/queryAnnouncementByCompetitionId")
+ @ApiOperation(value = "根据赛事id查询公告列表(分页)",response = CompetitionAnnouncement.class)
+ public R queryAnnouncementByCompetitionId(
+ @RequestParam("competitionId") @ApiParam(value = "赛事id") String competitionId,
+ @ApiParam(value = "当前页数", required = true) @RequestParam("pageNum") Integer pageNum,
+ @ApiParam(value = "当前页需要显示的数量", required = true) @RequestParam("pageSize") Integer pageSize) {
+ return service.queryAnnouncementByCompetitionId(competitionId, pageNum, pageSize);
+ }
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionContentController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionContentController.java
new file mode 100644
index 0000000..68b8eb5
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionContentController.java
@@ -0,0 +1,58 @@
+package com.huoran.competition.controller;
+
+
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.response.R;
+import com.huoran.competition.entity.CompetitionContent;
+import com.huoran.competition.entity.req.CompetitionContentReq;
+import com.huoran.competition.service.CompetitionContentService;
+import com.huoran.competition.service.CompetitionContentService;
+import com.huoran.competition.service.CompetitionStageContentSettingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(tags = "赛事內容管理")
+@RestController
+@RequestMapping("/competition/content")
+public class CompetitionContentController {
+
+ @Autowired
+ private CompetitionContentService competitionContentService;
+ @NoRepeatSubmit
+ @ApiOperation(value = "添加赛事内容")
+ @PostMapping("/addCompetitionContent")
+ public R addCompetitionContent(
+ @ApiParam(name = "competitionContent", value = "赛事内容对象", required = true)
+ @RequestBody CompetitionContentReq contentReq) {
+ return competitionContentService.addCompetitionContent(contentReq);
+ }
+
+ @ApiOperation(value = "根据赛事id查询赛事内容")
+ @GetMapping("/getCompetitionContent")
+ public R getCompetitionContent(
+ @ApiParam(name = "competitionId" , value = "賽事id")
+ @RequestParam("competitionId") String competitionId) {
+ return competitionContentService.getCompetitionContent(competitionId);
+ }
+ @NoRepeatSubmit
+ @ApiOperation(value = "编辑赛事内容")
+ @PostMapping("/editCompetitionContent")
+ public R editCompetitionContent(
+ @ApiParam(name = "competitionContent", value = "赛事内容对象", required = true)
+ @RequestBody CompetitionContentReq contentReq) {
+ return competitionContentService.editCompetitionContent(contentReq);
+ }
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionController.java
new file mode 100644
index 0000000..50bd7c2
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionController.java
@@ -0,0 +1,428 @@
+package com.huoran.competition.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huoran.api.NakadaiClient;
+import com.huoran.api.UserClient;
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.constant.DelConstant;
+import com.huoran.common.response.R;
+import com.huoran.common.utils.DateUtils;
+import com.huoran.common.utils.TokenUtils;
+import com.huoran.competition.entity.*;
+import com.huoran.competition.entity.req.*;
+import com.huoran.competition.entity.vo.CompetitionDetailsVO;
+import com.huoran.competition.entity.vo.CompetitionVO;
+import com.huoran.competition.service.*;
+import com.huoran.competition.service.impl.CompetitionContentServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.web.bind.annotation.*;
+
+import javax.script.ScriptException;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+/**
+ *
+ * 赛事信息表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(tags = "赛事信息管理")
+@RestController
+@RequestMapping("/competition/management")
+public class CompetitionController {
+ @Autowired
+ private StringRedisTemplate redisTemplate;
+ @Autowired
+ private UserClient userClient;
+
+ @Autowired
+ private CompetitionService competitionService;
+
+ @Autowired
+ private CompetitionRegistrationService competitionRegistrationService;
+
+ @Autowired
+ private CompetitionRangeService competitionRangeService;
+
+ @Autowired
+ private CompetitionAnnexService competitionAnnexService;
+
+ @Autowired
+ private CompetitionTeamService competitionTeamService;
+
+ @Autowired
+ private CompetitionRuleService competitionRuleService;
+
+ @Autowired
+ private CompleteCompetitionSetupService completeCompetitionSetupService;
+
+ @Autowired
+ private CompetitionStageContentSettingService contentSettingService;
+
+ @Autowired
+ private CompetitionReleaseTimeService competitionReleaseTimeService;
+
+ @Autowired
+ CompetitionContentServiceImpl competitionContentService;
+
+
+ @Autowired
+ CompetitionStageFileService stageFileService;
+
+ @Autowired
+ private NakadaiClient nakadaiClient;
+
+ @NoRepeatSubmit
+ @ApiOperation(value = "创建赛事")
+ @PostMapping("/addCompetition")
+ public R addCompetition(@ApiParam(name = "Competition", value = "赛事对象", required = true) @RequestBody Competition competition, HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ Integer schoolId = userClient.getSchoolIdByAccountId(accountId);
+ competition.setSchoolId(schoolId);
+ competition.setFounderId(Integer.valueOf(accountId));
+ return competitionService.addCompetition(competition);
+ }
+
+ @NoRepeatSubmit
+ @ApiOperation(value = "修改赛事")
+ @PostMapping("/editCompetition")
+ public R editCompetition(@ApiParam(name = "competition", value = "赛事对象", required = true) @RequestBody Competition competition) {
+ boolean update = competitionService.updateById(competition);
+
+ //赛事类型为完整赛事，更新其他信息
+ if (competition.getCompleteCompetitionSetup() != null) {
+ completeCompetitionSetupService.updateById(competition.getCompleteCompetitionSetup());
+ }
+
+ if (competition.getCompetitionScope() == 2) {
+ if (competition.getCompetitionRangeList().size() > 0) {
+ //1.首先删除原有的大赛范围选择
+ UpdateWrapper annexUpdateWrapper = new UpdateWrapper<>();
+ annexUpdateWrapper.set("is_del", DelConstant.IS_DEL);
+ annexUpdateWrapper.eq("Competition_id", competition.getId());
+ boolean delCompetitionAnnex = competitionRangeService.update(new CompetitionRange(), annexUpdateWrapper);
+
+ //2.重新保存比赛范围
+ competition.getCompetitionRangeList().forEach(CompetitionRange -> {
+ CompetitionRange.setCompetitionId(competition.getId());
+ boolean saveCompetitionRange = competitionRangeService.save(CompetitionRange);//保存比赛范围
+ });
+ }
+ }
+ return update ? R.ok() : R.error();
+ }
+
+ @NoRepeatSubmit
+ @ApiOperation(value = "根据id删除赛事")
+ @PostMapping("/deleteCompetition")
+ public R deleteCompetition(@ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam Integer competitionId) {
+ //删除赛事下的定时
+ competitionReleaseTimeService.remove(new QueryWrapper().eq("competition_id", competitionId));
+ boolean remove = competitionService.removeCompetition(competitionId);
+ return remove ? R.ok() : R.error();
+ }
+
+ @NoRepeatSubmit
+ @ApiOperation(value = "批量删除赛事")
+ @PostMapping("/batchDeleteCompetition")
+ public R deleteCompetition(@ApiParam(name = "competitionIds", value = "赛事ID", required = true) @RequestParam List competitionIds) {
+ competitionIds.forEach(competitionId -> {
+ //删除赛事下的定时
+ competitionReleaseTimeService.remove(new QueryWrapper().eq("competition_id", competitionId));
+ competitionService.removeCompetition(competitionId);
+ });
+ return R.ok();
+ }
+
+ @ApiOperation(value = "根据id查询赛事", response = Competition.class)
+ @PostMapping("/getCompetition")
+ public R getCompetition(@ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam("competitionId") String competitionId, HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ Competition competition = competitionService.getById(competitionId);
+// 查询赛事报名表
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("competition_id", competitionId);
+ wrapper.eq("account_id", accountId);
+ CompetitionRegistration registration = competitionRegistrationService.getOne(wrapper);
+ if (registration != null) {
+ CompetitionTeam team = competitionTeamService.getById(registration.getTeamId());
+ if (team != null) {
+ if (team.getCaptain() == 0) {
+ registration.setTeamId(team.getTeamId());
+ } else {
+ registration.setTeamId(team.getPid());
+ }
+ }
+ }
+ competition.setCompetitionRegistration(registration);
+ List CompetitionAnnexList = competitionAnnexService.getCompetitionAnnexByCompetitionId(competitionId);
+ List CompetitionRangeList = competitionRangeService.getCompetitionRangeByCompetitionId(competitionId);
+ if (CompetitionRangeList.size() > 0) {
+ competition.setCompetitionRangeList(CompetitionRangeList);
+ }
+ if (CompetitionAnnexList.size() > 0) {
+ competition.setCompetitionAnnexList(CompetitionAnnexList);
+ }
+
+ if (competition.getCompetitionScope() == 1) {
+ competition.setRange("全平台");
+ } else if (competition.getCompetitionScope() == 2) {
+ competition.setRange("指定范围");
+ //依据赛事id查询指定范围的省、市、学校
+ competition.setCompetitionRangeRespList(competitionRangeService.getRangeByCompetitionId(competition.getId()));
+ }
+// if (competition.getReleaseType()==1){
+ QueryWrapper setupQueryWrapper = new QueryWrapper<>();
+ setupQueryWrapper.eq("competition_id", competitionId);
+ CompleteCompetitionSetup competitionSetup = completeCompetitionSetupService.getOne(setupQueryWrapper);
+ competition.setCompleteCompetitionSetup(competitionSetup);
+
+
+ QueryWrapper ruleQueryWrapper = new QueryWrapper<>();
+ ruleQueryWrapper.eq("setup_id", competitionSetup.getSetupId());
+ CompetitionRule one = competitionRuleService.getOne(ruleQueryWrapper);
+ if (one != null) {
+ competition.setRule(one.getRule());
+ }
+// }
+ //查询赛事阶段内容数据
+ List stages = competitionService.queryCompetitionStage(competitionId, accountId);
+
+
+
+ R competitionContent = competitionContentService.getCompetitionContent(competitionId);
+ List contentList = (List) competitionContent.get("contentList");
+ competition.setContentList(contentList);
+ competition.setCompetitionStage(stages);
+ if (contentList.size() > 0) {
+
+ for (CompetitionStage stage: stages) {
+ QueryWrapper queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("competition_id", competitionId);
+ queryWrapper1.eq("stage_id", stage.getStageId());
+ CompetitionStageContentSetting stageContentSetting = contentSettingService.getOne(queryWrapper1);
+ if (!ObjectUtil.isEmpty(stageContentSetting)) {
+ //赋值线下内容设置
+ stage.setCompetitionStageContentSetting(stageContentSetting);
+
+ QueryWrapper queryWrapper2 = new QueryWrapper<>();
+ queryWrapper2.eq("competition_id",competitionId);
+ queryWrapper2.eq("stage_id", stage.getStageId());
+ queryWrapper2.eq("account_id",accountId);
+ CompetitionStageFile myFile = stageFileService.getOne(queryWrapper2);
+ if (!ObjectUtil.isEmpty(myFile)){
+ stage.setCompetitionStageFile(myFile);
+ }
+ }
+
+ }
+
+ }
+ return R.ok().put("competition", competition);
+ }
+
+ @NoRepeatSubmit
+ @ApiOperation(value = "发布赛事")
+ @PostMapping("/publishCompetition")
+ public R publishCompetition(@ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam("competitionId") Integer competitionId, @ApiParam(name = "publishStatus", value = "发布状态", required = true) @RequestParam("publishStatus") Integer publishStatus) {
+ Competition getDetail = competitionService.getById(competitionId);
+ getDetail.setPublishStatus(publishStatus);
+ getDetail.setZtOpen(0);
+ boolean ret = competitionService.updateById(getDetail);
+ return ret ? R.ok() : R.error();
+ }
+
+ @NoRepeatSubmit
+ @ApiOperation(value = "赛事禁启用", response = CompetitionRange.class)
+ @PostMapping("/disabledEvents")
+ public R disabledEvents(@RequestBody DisableEnableCompetitionReq req) {
+
+ Competition getDetail = competitionService.getById(req.getCompetitionId());
+ Competition competition = new Competition();
+ competition.setId(req.getCompetitionId());
+ //禁用平台来源(0中台，1职站)
+ switch (req.getType()) {
+ case 0:
+ competition.setZtOpen(req.getIsOpen());
+ break;
+ case 1:
+ //原型需求:
+ // 客户创建的大赛，禁用时职站首页以及学生登录后的大赛模块看不到对应的比赛，创建的老师在大赛管理还是可以看到该大赛，可以编辑，但是无法启用。
+ // 即中台禁用的大赛，即使是该院校老师创建的，老师端也不能自己启用，需要中台启用。
+ //1.判断当前院校禁启用状态为要启用时候再判断当前赛事中台禁启用的状态
+ if (req.getIsOpen() == 0) {
+ if (getDetail.getZtOpen() == 1) {
+ return R.error("当前赛事已被平台禁用，请联系平台管理员!");
+ }
+ }
+ competition.setIsOpen(req.getIsOpen());
+ break;
+
+ }
+ boolean ret = competitionService.updateById(competition);
+
+ //保存的key名
+ String key = "competitionDisabled";
+ //保存到缓存中
+ redisTemplate.opsForValue().set(key, "true");
+ return ret ? R.ok() : R.error();
+ }
+
+
+ @PostMapping("/getRedisCache")
+ @ApiOperation(value = "获取Redis缓存(返回true 刷新)")
+ public R getRedisCache() {
+ //保存的key名
+ String key = "competitionDisabled";
+ //查看缓存是否有数据
+ String returnValue = redisTemplate.opsForValue().get(key);
+
+ //使用缓存返回数据
+ if (returnValue != null) {
+
+ //设置key过期时间
+ redisTemplate.expire(key, 5000, TimeUnit.MILLISECONDS);//设置过期时间
+ return R.ok().put("data", returnValue);
+ }
+
+
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "赛事样例数据")
+ @PostMapping("/eventSampleData")
+ public boolean eventSampleData(@RequestParam("accountId") @ApiParam(value = "账号id") Integer accountId, @RequestParam("schoolId") @ApiParam(value = "学校id") Integer schoolId) {
+ Competition competition = new Competition();
+ competition.setFounderId(accountId);
+ competition.setName("样例赛事");
+ competition.setCoverUrl("https://huoran.oss-cn-shenzhen.aliyuncs.com/20220509/png/1523606505516457984.png");
+ competition.setCarouselUrl("https://huoran.oss-cn-shenzhen.aliyuncs.com/20220310/png/1501818796133343232.png");
+ competition.setSponsor("主办方");
+ competition.setUndertaker("承办方");
+ competition.setDescription("样例赛事，仅供参考！");
+ competition.setPublishStatus(1);
+ competition.setPlayStartTime(DateUtils.getDateByDay(15));
+ competition.setPlayEndTime(DateUtils.getDateByDay(18));
+ competition.setSignUpStartTime(new Date());
+ competition.setSignUpEndTime(DateUtils.getDateByDay(10));
+ competition.setSchoolId(schoolId);
+ competition.setPlatformSource(1);//平台来源(0:中台，1：职站)
+ competition.setCompetitionScope(0);//大赛范围(0:本校内 1:全平台 2:指定区域、院校)
+ return competitionService.save(competition);
+ }
+
+
+ @ApiOperation(value = "职站——赛事列表(教师端赛事管理)")
+ @PostMapping("/competitionPageConditionQueryByOccupationlab")
+ public R CompetitionPageConditionQueryByOccupationlab(@RequestBody PageCompetitionListReq pageCompetitionListReq, HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ Integer schoolId = userClient.getSchoolIdByAccountId(accountId);
+ pageCompetitionListReq.setSchoolId(schoolId);
+ if (!accountId.equals("")) {
+ pageCompetitionListReq.setAccountId(Integer.valueOf(accountId));
+ }
+ return competitionService.competitionPageConditionQueryByOccupationlab(pageCompetitionListReq);
+
+ }
+
+ @ApiOperation(value = "中台——赛事列表分页条件查询(赛事广场)")
+ @PostMapping("/competitionPageConditionQueryByNakadai")
+ public R competitionPageConditionQueryByNakadai(@RequestBody PageCompetitionListReq pageCompetitionListReq, HttpServletRequest request) {
+ return competitionService.competitionPageConditionQueryByNakadai(pageCompetitionListReq);
+ }
+
+ @ApiOperation(value = "查询赛事状态(返回为false时表示当前赛事在教师端已禁用)")
+ @PostMapping("/checkTheStatusOfTheCompetition")
+ public boolean checkTheStatusOfTheCompetition(@ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam String competitionId) {
+ Competition competition = competitionService.getById(competitionId);
+ //是否开启(0开启 1未开启 默认0)
+ return competition.getIsOpen() != 1;
+ }
+
+ @ApiOperation(value = "职站(学生端)——登录前竞赛", response = CompetitionVO.class)
+ @PostMapping("/notLoggedInBeforeStudentEvents")
+ public R notLoggedInBeforeStudentEvents(@RequestBody PageCompetitionListReq pageCompetitionListReq, HttpServletRequest request) throws ExecutionException, InterruptedException {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ Integer schoolId = userClient.getSchoolIdByAccountId(accountId);
+ if (!accountId.equals("")) {
+ pageCompetitionListReq.setSchoolId(schoolId);
+ pageCompetitionListReq.setAccountId(Integer.valueOf(accountId));
+ } else {
+ pageCompetitionListReq.setAccountId(0);
+ }
+ Future> pageFuture = competitionService.notLoggedInBeforeStudentEvents(pageCompetitionListReq);
+ IPage pageList = pageFuture.get();
+ return R.ok().put("data",pageList);
+
+ }
+
+ @ApiOperation(value = "职站(学生端)——登录后竞赛", response = CompetitionVO.class)
+ @PostMapping("/competitionAfterLogin")
+ public R competitionAfterLogin(@RequestBody AfterLoginPageCompetitionListReq pageCompetitionListReq, HttpServletRequest request) throws ExecutionException, InterruptedException {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ Integer schoolId = userClient.getSchoolIdByAccountId(accountId);
+ if (!accountId.equals("")) {
+ pageCompetitionListReq.setSchoolId(schoolId);
+ pageCompetitionListReq.setAccountId(Integer.valueOf(accountId));
+ }
+ Future> pageFuture = competitionService.competitionAfterLogin(pageCompetitionListReq);
+ IPage pageList = pageFuture.get();
+ return R.ok().put("data",pageList);
+ }
+
+
+ @ApiOperation(value = "大赛阶段详情", response = CompetitionDetailsVO.class)
+ @PostMapping("/detailsOfCompetitionStage")
+ public R detailsOfCompetitionStage(@RequestBody CompetitionDetailReq req, HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ Integer schoolId = userClient.getSchoolIdByAccountId(accountId);
+ return competitionService.detailsOfCompetitionStage(req);
+
+ }
+
+ @ApiOperation(value = "是否允许参加赛事（淘汰赛制）", response = CompetitionDetailsVO.class)
+ @PostMapping("/allowedParticipateCompetition")
+ public R allowedParticipateCompetition(@RequestBody AllowedParticipateCompetitionReq req, HttpServletRequest request) throws ScriptException {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ req.setAccountId(accountId);
+ return competitionService.allowedParticipateCompetition(req);
+
+ }
+
+ @ApiOperation(value = "是否为参赛人员（团队赛）", response = CompetitionDetailsVO.class)
+ @PostMapping("/isParticipant")
+ public R isParticipant(@RequestBody IsParticipantReq req, HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ req.setAccountId(accountId);
+ return competitionService.isParticipant(req);
+ }
+
+ @ApiOperation(value = "获取当前时间")
+ @GetMapping("/getCurrentTime")
+ public R getCurrentTime() {
+ return R.ok().put("currentTime",new Date());
+ }
+
+// @XxlJob("competitionStop")
+// public void competitionStop() {
+// //通知收卷
+// nakadaiClient.refreshPageNotification("系统通知","all","1");
+// }
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionPerformanceController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionPerformanceController.java
new file mode 100644
index 0000000..44530ff
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionPerformanceController.java
@@ -0,0 +1,144 @@
+package com.huoran.competition.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.huoran.api.UserClient;
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.constant.DelConstant;
+import com.huoran.common.entity.UserScore;
+import com.huoran.common.response.R;
+import com.huoran.common.utils.TokenUtils;
+import com.huoran.competition.entity.CompetitionStage;
+import com.huoran.competition.entity.req.PageGradeListReq;
+import com.huoran.competition.entity.resp.ListOfStageResultsResp;
+import com.huoran.competition.entity.vo.GradeExportVO;
+import com.huoran.competition.service.CompetitionStageService;
+import com.huoran.competition.service.UserScoreService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+
+@Api(tags = "赛事成绩管理")
+@RestController
+@RequestMapping("/competition/performance")
+public class CompetitionPerformanceController {
+ @Autowired
+ private UserClient userClient;
+
+ @Autowired
+ private UserScoreService userScoreService;
+ @Autowired
+ CompetitionStageService competitionStageService;
+
+ @NoRepeatSubmit
+ @PostMapping("/batchImportGrades")
+ @ApiOperation("批量导入大赛成绩")
+ public R batchImportGrades(@ApiParam(name = "file", value = "文件", required = true) @RequestParam(name = "file") MultipartFile file, @ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam Integer competitionId, @ApiParam(name = "systemId", value = "系统id", required = true) @RequestParam Integer systemId, @ApiParam(name = "stageId", value = "赛事阶段id", required = true) @RequestParam Integer stageId, HttpServletRequest request) throws IOException {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ Integer schoolId = userClient.getSchoolIdByAccountId(accountId);
+ if (systemId == null) {
+ systemId = 0;
+ }
+ Map map = userScoreService.batchImportGrades(file, competitionId, systemId, stageId, schoolId);
+ return R.ok().put("data", map);
+ }
+
+
+ @ApiOperation(value = "批量导入成绩管理失败数据导出")
+ @GetMapping("/exportFailure")
+ public void exportFailureRecord(HttpServletResponse response, @ApiParam(name = "exportCode", value = "batchImportGrades接口返回的exportCode", required = true) @RequestParam String exportCode) throws Exception {
+ userScoreService.exportFailureRecord(response, exportCode);
+ }
+
+
+ /**
+ * 比赛方式（0实操，1理论，2线下）
+ * 依据赛事比赛方式查询数据：为线下时查询分数表，其余查实验报告表
+ *
+ * 已删除的实验报告不计入统计中！！！
+ *
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "阶段成绩管理", response = ListOfStageResultsResp.class)
+ @PostMapping("/stageGradeManagementList")
+ public R stageGradeManagementList(@RequestBody PageGradeListReq req) {
+ CompetitionStage competitionStage = competitionStageService.getById(req.getStageId());
+ if (competitionStage.getMethod() == 2) {//为线下时查询分数表，其余查实验报告表
+ return userScoreService.stageGradeManagementList(req);
+ }
+ return userScoreService.stageReportOfExperimentList(req);
+
+ }
+
+ @NoRepeatSubmit
+ @ApiOperation(value = "批量赛事导出实验成绩")
+ @PostMapping("/exportExperimentalResultsInBatch")
+ public void exportExperimentalResultsInBatch(@RequestBody List list, HttpServletResponse response) throws IOException {
+ userScoreService.exportExperimentalResultsInBatch(list, response);
+ }
+
+
+ @ApiOperation(value = "赛事导出全部实验成绩")
+ @PostMapping("/allExperimentalResultsAreDerived")
+ public void allExperimentalResultsAreDerived(@RequestBody PageGradeListReq req, HttpServletResponse response) throws IOException {
+ List list = new ArrayList<>();
+ req.setPageSize(100000);
+ Integer serialNumber = 0;
+ List getUnpaginatedEventResult = userScoreService.getUnpaginatedEventResults(req);
+ for (ListOfStageResultsResp resp : getUnpaginatedEventResult) {
+ GradeExportVO exportVO = new GradeExportVO();
+ exportVO.setScore(resp.getScore());
+ exportVO.setTeamName(resp.getTeamName());
+ exportVO.setSchoolName(resp.getSchoolName());
+ exportVO.setTimeSum(resp.getTimeSum());
+ exportVO.setWorkNumber(resp.getWorkNumber());
+ exportVO.setSerialNumber(++serialNumber);
+ exportVO.setSubmitTime(resp.getSubmitTime());
+ exportVO.setUserName(resp.getUserName());
+ list.add(exportVO);
+ }
+ userScoreService.exportExperimentalResultsInBatch(list, response);
+ }
+
+
+ /**
+ * 比赛方式（0实操，1理论，2线下）
+ * 依据赛事比赛方式删除数据：为线下时删除分数表数据，其余删除实验报告表数据
+ *
+ * 已删除的实验报告不计入统计中！！！
+ *
+ * @param
+ * @return
+ */
+ @ApiOperation(value = "删除赛事成绩")
+ @PostMapping("/batchDeleteContestGrade")
+ public R deleteContest(@RequestBody PageGradeListReq req) {
+ CompetitionStage competitionStage = competitionStageService.getById(req.getStageId());
+ boolean ret;
+ if (competitionStage.getMethod() == 2) {//为线下时查询分数表，其余查实验报告表
+
+ UpdateWrapper updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("is_del", DelConstant.IS_DEL);
+ updateWrapper.in("id", req.getIds());
+
+ ret = userScoreService.update(new UserScore(), updateWrapper);
+ } else {
+ ret = userScoreService.batchDeletionOfExperimentalReports(req.getIds());
+ }
+ return ret ? R.ok() : R.error();
+ }
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionProgressController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionProgressController.java
new file mode 100644
index 0000000..707c7a5
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionProgressController.java
@@ -0,0 +1,78 @@
+package com.huoran.competition.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.response.R;
+import com.huoran.competition.entity.CompetitionProgress;
+import com.huoran.competition.service.CompetitionProgressService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 赛事进展表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(tags = "赛事进展管理")
+@RestController
+@RequestMapping("/competition/progress")
+public class CompetitionProgressController {
+
+ @Autowired
+ private CompetitionProgressService competitionProgressService;
+ @NoRepeatSubmit
+ @ApiOperation(value = "添加竞赛进展")
+ @PostMapping("/addCompetitionProgress")
+ public R addCompetitionProgress(
+ @ApiParam(name = "competitionProgress", value = "竞赛进展对象", required = true)
+ @RequestBody CompetitionProgress competitionProgress) {
+ //判重
+ boolean isRepeat = competitionProgressService.repeat(competitionProgress);
+ if (isRepeat) {
+ return R.error("竞赛进展已存在");
+ }
+ boolean save = competitionProgressService.save(competitionProgress);
+ return save ? R.ok() : R.error();
+ }
+
+ @ApiOperation(value = "根据赛事id查询竞赛进展")
+ @GetMapping("/getCompetitionProgress")
+ public R getCompetitionProgress(
+ @ApiParam(name = "competitionId" , value = "賽事id")
+ @RequestParam("competitionId") String competitionId) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("competition_id", competitionId);
+ List competitionProgressList = competitionProgressService.list(wrapper);
+ return R.ok().put("competitionProgressList", competitionProgressList);
+ }
+ @NoRepeatSubmit
+ @ApiOperation(value = "根据id删除竞赛进展")
+ @DeleteMapping("/deleteCompetitionProgress")
+ public R deleteCompetitionProgress(
+ @ApiParam(name = "competitionProgressId", value = "竞赛进展ID", required = true)
+ @RequestParam Integer competitionProgressId) {
+ boolean remove = competitionProgressService.removeById(competitionProgressId);
+ return remove ? R.ok() : R.error();
+ }
+ @NoRepeatSubmit
+ @ApiOperation(value = "修改竞赛进展")
+ @PutMapping("/editCompetitionProgress")
+ public R editCompetitionProgress(
+ @ApiParam(name = "competitionProgress", value = "赛事进展对象", required = true)
+ @RequestBody CompetitionProgress competitionProgress) {
+ boolean update = competitionProgressService.updateById(competitionProgress);
+ return update ? R.ok() : R.error();
+ }
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionRangeController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionRangeController.java
new file mode 100644
index 0000000..508f308
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionRangeController.java
@@ -0,0 +1,66 @@
+package com.huoran.competition.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huoran.common.response.R;
+import com.huoran.competition.entity.CompetitionRange;
+import com.huoran.competition.entity.resp.SchoolResp;
+import com.huoran.competition.service.CompetitionRangeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * 赛事范围表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(value = "赛事范围管理")
+@RestController
+@RequestMapping("/competition/range")
+public class CompetitionRangeController {
+
+ @Autowired
+ private CompetitionRangeService competitionRangeService;
+
+ @ApiOperation(value = "查询赛事指定范围内学校")
+ @GetMapping("/schoolsInCompetitionArea")
+ public R schoolsInCompetitionArea(
+ @ApiParam(name = "competitionId" , value = "賽事id")
+ @RequestParam("competitionId") String competitionId) {
+ //赛事范围(0:本校内 1:全平台 2.指定区域、院校)
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("competition_id",competitionId);
+ List list = competitionRangeService.list(wrapper);
+ List schools = new ArrayList<>();
+ for (CompetitionRange competitionRange : list) {
+ if (competitionRange.getSchoolId()!=null){
+ List school = competitionRangeService.getSchool(competitionRange.getSchoolId());
+ schools.addAll(school);
+ }
+ if (competitionRange.getCityId()!=null&&competitionRange.getSchoolId()==null ){
+ List city = competitionRangeService.getCity(competitionRange.getCityId(), competitionRange.getProvinceId());
+ schools.addAll(city);
+ }
+ //都为空查询省份
+ if (competitionRange.getProvinceId()!=null&&competitionRange.getCityId()==null&&competitionRange.getSchoolId()==null){
+ List province = competitionRangeService.getProvince(competitionRange.getProvinceId());
+ schools.addAll(province);
+ }
+ }
+ return R.ok().put("schools", schools);
+ }
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionRankingController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionRankingController.java
new file mode 100644
index 0000000..d1638c6
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionRankingController.java
@@ -0,0 +1,410 @@
+package com.huoran.competition.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.constant.DelConstant;
+import com.huoran.common.response.R;
+import com.huoran.common.utils.TokenUtils;
+import com.huoran.competition.entity.CompetitionRanking;
+import com.huoran.competition.entity.CompetitionReleaseTime;
+import com.huoran.competition.entity.CompleteCompetitionSetup;
+import com.huoran.competition.entity.req.*;
+import com.huoran.competition.entity.resp.DetailsOfTotalTeamScoresResp;
+import com.huoran.competition.entity.resp.ListOfStageResultsResp;
+import com.huoran.competition.entity.vo.GradeExportVO;
+import com.huoran.competition.entity.vo.PersonageRankingExportVO;
+import com.huoran.competition.entity.vo.RankingExportVO;
+import com.huoran.competition.service.CompetitionRankingService;
+import com.huoran.competition.service.CompetitionReleaseTimeService;
+import com.huoran.competition.service.CompetitionStageService;
+import com.huoran.competition.service.CompleteCompetitionSetupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.script.ScriptException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "赛事排名管理")
+@RestController
+@RequestMapping("/competition/rank")
+public class CompetitionRankingController {
+
+ @Autowired
+ private CompleteCompetitionSetupService completeCompetitionSetupService;
+
+ @Autowired
+ private CompetitionStageService stagService;
+
+ @Autowired
+ private CompetitionRankingService rankingService;
+
+ @Autowired
+ private StringRedisTemplate redisTemplate;
+
+ @Autowired
+ private CompetitionReleaseTimeService timeService;
+
+ /**
+ * 2023-11-30更改需求：阶段用时以及总分排名用时更改:如下
+ * 算法应该跟比赛规则一样，比如阶段取最高分，用时就是最高分的人的时间。此处规则是团队的成绩之和，因此用时也应该按成员的用时之和来算。
+ * 总排名的用时，如果是积分赛有权重的，也要加上权重去算出耗时，如果别的阶段没有录入耗时的，默认对应阶段全体耗时为0。
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "中台积分赛总排名")
+ @PostMapping("/overallStandingsInThePointsRace")
+ public R overallStandingsInThePointsRace(@RequestBody OverallStandingsInThePointsRaceReq req) {
+ //1.总成绩权重为0表示当前阶段成绩不计入总分排名中。
+ //2.总排名依据总成绩计算方式以及占其成绩的权重比计
+ return stagService.overallRanking(req);
+ }
+
+
+
+ @ApiOperation(value = "团队赛导出排名")
+ @PostMapping("/derivedRanking")
+ public void derivedRanking(@RequestBody List rankingExportVOS, HttpServletResponse response) throws IOException, ScriptException {
+ stagService.derivedRanking(rankingExportVOS, response);
+ }
+
+ @ApiOperation(value = "个人导出排名")
+ @PostMapping("/individualDerivedRanking")
+ public void individualDerivedRanking(@RequestBody List rankingExportVOS, HttpServletResponse response) throws IOException, ScriptException {
+ stagService.individualDerivedRanking(rankingExportVOS, response);
+ }
+
+
+
+
+
+ @ApiOperation(value = "阶段赛事排名(基础/单个阶段的排名)")
+ @PostMapping("/stageRaceRanking")
+ public R stageRaceRanking(
+ @ApiParam(name = "competitionId", value = "赛事ID", required = true)
+ @RequestParam Integer competitionId,
+ @ApiParam(name = "stageId", value = "阶段ID", required = true)
+ @RequestParam Integer stageId,
+ @ApiParam(value = "当前页数", required = true)
+ @RequestParam("pageNum") Integer pageNum,
+ @ApiParam(value = "当前页需要显示的数量", required = true)
+ @RequestParam("pageSize") Integer pageSize,
+ @ApiParam(value = " 发布类型(0默认发布 1批量手动导入) ", required = true)
+ @RequestParam("publicationType") Integer publicationType) throws ScriptException {
+ return stagService.stageRaceRanking(competitionId, stageId, pageNum, pageSize, publicationType);
+ }
+
+
+ @ApiOperation(value = "单个阶段团队得分详情")
+ @PostMapping("/stageTeamScoreDetails")
+ public R stageTeamScoreDetails(@RequestBody StageTeamScoreDetailsReq req) {
+ return stagService.stageTeamScoreDetails(req);
+ }
+
+ @ApiOperation(value = "多个阶段团队得分详情")
+ @PostMapping("/multipleStageTeamScoreDetails")
+ public R multipleStageTeamScoreDetails(@RequestBody StageTeamScoreDetailsReq req) {
+ return stagService.multipleStageTeamScoreDetails(req);
+ }
+
+
+ @ApiOperation(value = "发布排名")
+ @PostMapping("/publishRanking")
+ public R publishRanking(@RequestBody List rankingList) {
+ return rankingService.publishRanking(rankingList);
+ }
+
+
+ @ApiOperation(value = "批量发布(批量上传后更改还未发布的状态)")
+ @PostMapping("/batchRelease")
+ public R batchRelease(@RequestBody List ids) {
+ if (ids.size() <= 0) {
+ return R.error("列表没有数据!请上传数据后发布。");
+ }
+
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("id", ids);
+ List rankingList = rankingService.list(queryWrapper);
+
+ //查询本次要发布的排名
+ Integer publicationType = rankingList.get(0).getPublicationType();//publicationType 发布类型(0默认发布 1批量手动导入)
+ Integer getCompetitionId = rankingList.get(0).getCompetitionId();
+ Integer getIsOverallRanking = rankingList.get(0).getIsOverallRanking();//是否为总分排名(1为是 默认0不是)
+ Integer getStageId = rankingList.get(0).getStageId();
+
+ QueryWrapper queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("competition_id", getCompetitionId);
+ queryWrapper1.eq("is_release", DelConstant.POST_STATUS);//已发布
+ //如果为总分排名时,默认删除上一次发布的总分排名
+ if (getIsOverallRanking == 1) {
+ queryWrapper1.eq("is_overall_ranking", getIsOverallRanking);
+ } else {
+ //如果为阶段排名时候，则删除上一次的阶段排名
+ if (publicationType == 0) {
+ queryWrapper1.eq("publication_type", 1);
+ } else {
+ queryWrapper1.eq("publication_type", 0);
+ }
+ queryWrapper1.eq("stage_id", getStageId);
+ }
+ rankingService.remove(queryWrapper1);
+
+
+ for (Integer id : ids) {
+ UpdateWrapper updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("is_release", DelConstant.POST_STATUS);
+ updateWrapper.eq("id", id);
+ rankingService.update(new CompetitionRanking(), updateWrapper);
+ }
+ return R.ok();
+ }
+
+
+ @PostMapping("/batchImportRanking")
+ @ApiOperation("手动发布排名(批量上传Excel)")
+ public R batchImportRanking(@ApiParam(name = "file", value = "文件", required = true) @RequestParam(name = "file") MultipartFile file,
+ @ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam Integer competitionId,
+ @ApiParam(name = "stageId", value = "赛事阶段id", required = true) @RequestParam Integer stageId,
+ @ApiParam(name = "isOverallRanking", value = "是否为总分排名(1为是 默认0不是)", required = true) @RequestParam Integer isOverallRanking,
+ @ApiParam(name = "schoolId", value = "学校id", required = false) @RequestParam Integer schoolId,
+ HttpServletRequest request) throws IOException {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ //查看赛事类型是个人赛还是团队赛事
+ CompleteCompetitionSetup competitionSetup = completeCompetitionSetupService.getRaceSettingsByRaceId(competitionId);
+ Map map = new HashMap<>();
+ switch (competitionSetup.getCompetitionType()) {
+ case 0:
+ //个人
+ map = rankingService.importIndividualRankingsInBulk(file, competitionId, stageId, isOverallRanking, schoolId);
+ break;
+ case 1:
+ map = rankingService.batchImportRanking(file, competitionId, stageId, isOverallRanking, schoolId);
+ break;
+ }
+
+
+ return R.ok().put("data", map);
+ }
+
+ @ApiOperation(value = "批量导入排名管理失败数据导出")
+ @GetMapping("/exportFailure")
+ public void exportFailureRecord(HttpServletResponse response, @ApiParam(name = "exportCode", value = "batchImportRanking接口返回的exportCode", required = true) @RequestParam String exportCode, @ApiParam(name = "exportCode", value = "大赛id", required = true) @RequestParam Integer competitionId) throws Exception {
+ rankingService.exportFailureRecord(response, exportCode, competitionId);
+ }
+
+
+ /**
+ * 成绩是设置规则多少小时候公布，排名是发布就有排名
+ *
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "前台大赛排名")
+ @PostMapping("/frontOfficeCompetitionRanking")
+ public R frontOfficeCompetitionRanking(@RequestBody FrontDeskStageTeamScoreDetailsReq req, HttpServletRequest request) {
+ String id = TokenUtils.getIdByJwtToken(request);
+ if (req.getType() != null && req.getType() == 1) {
+ req.setAccountId(id);
+ }
+
+
+ return rankingService.frontOfficeCompetitionRanking(req);
+ }
+
+
+ @ApiOperation(value = "批量导入后取消导入")
+ @PostMapping("/cancelImport")
+ public R cancelImport(@RequestBody List ids) {
+ return rankingService.removeByIds(ids) ? R.ok() : R.error();
+ }
+
+
+ /*@ApiOperation(value = "前台竞赛阶段")
+ @PostMapping("/frontStageCompetition")
+ public R frontStageCompetition(@RequestBody FrontStageCompetitionReq req) {
+ return R.ok(rankingService.frontStageCompetition(req));
+ }*/
+
+
+ @ApiOperation(value = "前台积分赛总排名(前台展示的是中台发布后的)")
+ @PostMapping("/frontDeskOverallRanking")
+ public R frontDeskOverallRanking(@RequestBody OverallStandingsInThePointsRaceReq req) {
+ //1.总成绩权重为0表示当前阶段成绩不计入总分排名中。
+ //2.总排名依据总成绩计算方式以及占其成绩的权重比计
+ return rankingService.frontDeskOverallRanking(req);
+ }
+
+
+ @ApiOperation(value = "总分团队得分详情(前台发布后才展示只用于前台)", response = DetailsOfTotalTeamScoresResp.class)
+ @PostMapping("/detailsOfTotalTeamScores")
+ public R detailsOfTotalTeamScores(@RequestBody DetailsOfTotalTeamScoresReq req) {
+ return rankingService.detailsOfTotalTeamScores(req);
+ }
+
+ @ApiOperation(value = "取消排名")
+ @PostMapping("/cancelRanking")
+ public R cancelRanking(
+ @ApiParam(name = "competitionId", value = "赛事ID", required = true)
+ @RequestParam Integer competitionId,
+ @ApiParam(name = "stageIds", value = "多个阶段Id", required = true)
+ @RequestParam List stageIds,
+ @ApiParam(name = "isOverallRanking", value = "是否为总分排名(1为是 默认0不是)", required = true)
+ @RequestParam Integer isOverallRanking,
+ @ApiParam(name = "releaseId", value = "定时id", required = true)
+ @RequestParam Integer releaseId) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("competition_id", competitionId);
+
+ if (isOverallRanking == 0) {
+ queryWrapper.in("stage_id", stageIds);
+ }
+
+ queryWrapper.eq("is_overall_ranking", isOverallRanking);
+ boolean ret = rankingService.remove(queryWrapper);
+
+ //删除定时id
+ timeService.removeById(releaseId);
+
+
+ return ret ? R.ok() : R.error();
+ }
+
+
+ @ApiOperation(value = "发布前删除上一次的排名")
+ @PostMapping("/deleteLastPublication")
+ public R deleteLastPublication(@RequestBody DelCompetitionRankingReq req) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("competition_id", req.getCompetitionId());
+ if (req.getIsOverallRanking() == 0) {
+ queryWrapper.in("stage_id", req.getStageIds());
+ }
+ queryWrapper.eq("is_overall_ranking", req.getIsOverallRanking());
+
+ boolean ret = rankingService.remove(queryWrapper);
+ return ret ? R.ok() : R.error();
+ }
+
+ @ApiOperation(value = "判断是否发布过排名没有(返回whetherToPublish：TRUE为已经发布过 FALSE未发布)")
+ @PostMapping("/whetherToPublish")
+ public R whetherToPublish(@ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam Integer competitionId, @ApiParam(name = "stageId", value = "阶段Id", required = true) @RequestParam Integer stageId, @ApiParam(name = "isOverallRanking", value = "是否为总分排名(1为是 默认0不是)", required = true) @RequestParam Integer isOverallRanking, @ApiParam(name = "publicationType", value = "发布类型(0默认发布 1批量手动导入)", required = true) @RequestParam Integer publicationType) {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("competition_id", competitionId);
+ queryWrapper.eq("stage_id", stageId);
+ queryWrapper.eq("is_release", DelConstant.POST_STATUS);
+ queryWrapper.eq("is_overall_ranking", isOverallRanking);
+ queryWrapper.eq("publication_type", publicationType);
+ List ranking = rankingService.list(queryWrapper);
+ if (ranking.size() > 0) {
+ return R.ok().put("whetherToPublish", true);
+ }
+ return R.ok().put("whetherToPublish", false);
+ }
+
+
+ /**
+ * 需求如下:
+ * 发布前要提示：默认排序已发布，是否要取消默认排序的发布内容，替换为手动发布的内容？
+ *
+ * @param competitionId
+ * @param stageId
+ * @param isOverallRanking
+ * @return
+ */
+ @ApiOperation(value = "点击发布时校验(丢redis中判断)")
+ @PostMapping("/releaseVerification")
+ public R releaseVerification(@ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam Integer competitionId, @ApiParam(name = "stageId", value = "阶段Id(字符串类型 可传多个且以逗号隔开)", required = true) @RequestParam String stageId, @ApiParam(name = "isOverallRanking", value = "是否为总分排名(1为是 默认0不是)", required = true) @RequestParam Integer isOverallRanking, @ApiParam(name = "whetherToManuallyPublish", value = "是否手动发布(1为是 0不是)", required = true) @RequestParam Integer whetherToManuallyPublish) {
+
+ ValueOperations opsForString = redisTemplate.opsForValue();
+ //保存的key名
+ String key = "releaseVerification:competitionId:" + competitionId + "stageId:" + stageId + "isOverallRanking:" + isOverallRanking;
+ //将数据存入缓存
+ opsForString.set(key, whetherToManuallyPublish + "");
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "查询发布上一次排名的来源——>默认顺序或者手动发布(返回数据:是否手动发布(1为是,0不是))")
+ @PostMapping("/queryPublicationSource")
+ public R queryPublicationSource(@ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam Integer competitionId, @ApiParam(name = "stageId", value = "阶段Id(字符串类型 可传多个且以逗号隔开)", required = true) @RequestParam String stageId, @ApiParam(name = "isOverallRanking", value = "是否为总分排名(1为是 默认0不是)", required = true) @RequestParam Integer isOverallRanking) {
+ ValueOperations opsForString = redisTemplate.opsForValue();
+ //保存的key名
+ String key = "releaseVerification:competitionId:" + competitionId + "stageId:" + stageId + "isOverallRanking:" + isOverallRanking;
+
+ //查看缓存是否有数据
+ String returnValue = opsForString.get(key);
+ //使用缓存返回数据
+ if (returnValue != null) {
+ return R.ok().put("source", returnValue);
+ }
+ return R.ok().put("source", 0);
+ }
+
+
+ @ApiOperation(value = "总分排名下的得分详情(只用于后台)", response = DetailsOfTotalTeamScoresResp.class)
+ @PostMapping("/totalRankingScoreDetails")
+ public R totalRankingScoreDetails(@RequestBody StageTeamScoreDetailsReq req) {
+ return stagService.totalRankingScoreDetails(req);
+ }
+
+
+ /* @ApiOperation(value = "手动上传的列表")
+ @PostMapping("/manuallyRankTheUploadList")
+ public R whetherToPublish(@RequestBody BatchUploadListCompetitionReq req) {
+ return rankingService.manuallyRankTheUploadList(req);
+ }*/
+
+ @ApiOperation(value = "后台手动上传的排名(不论发布还是没有发布的)", response = ListOfStageResultsResp.class)
+ @PostMapping("/manuallyUploadedRankings")
+ public R manuallyUploadedRankings(@RequestBody BatchUploadListCompetitionReq req) {
+ return rankingService.manuallyRankTheUploadList(req);
+
+ }
+
+
+ @ApiOperation(value = "更换选中排序方式(丢redis中)")
+ @PostMapping("/toggleTheSortingMode")
+ public R toggleTheSortingMode(@ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam Integer competitionId, @ApiParam(name = "stageId", value = "阶段Id(字符串类型 可传多个且以逗号隔开)", required = true) @RequestParam String stageId, @ApiParam(name = "isOverallRanking", value = "是否为总分排名(1为是 默认0不是)", required = true) @RequestParam Integer isOverallRanking, @ApiParam(name = "whetherToManuallyPublish", value = "是否手动发布(1为是 0不是)", required = true) @RequestParam Integer whetherToManuallyPublish) {
+ ValueOperations opsForString = redisTemplate.opsForValue();
+ //保存的key名
+ String key = "toggleTheSortingMode:competitionId:" + competitionId + "stageId:" + stageId + "isOverallRanking:" + isOverallRanking;
+ //将数据存入缓存
+ opsForString.set(key, whetherToManuallyPublish + "");
+
+ String returnValue = opsForString.get(key);
+ //使用缓存返回数据
+ if (returnValue == null) {
+ return R.ok().put("source", returnValue);
+ }
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "返回选中上次排序状态(丢redis中)/返回的数据source为：(0默认 1手动)")
+ @PostMapping("/selectTheLastSortStatus")
+ public R selectTheLastSortStatus(@ApiParam(name = "competitionId", value = "赛事ID", required = true) @RequestParam Integer competitionId, @ApiParam(name = "stageId", value = "阶段Id(字符串类型 可传多个且以逗号隔开)", required = true) @RequestParam String stageId, @ApiParam(name = "isOverallRanking", value = "是否为总分排名(1为是 默认0不是)", required = true) @RequestParam Integer isOverallRanking) {
+ ValueOperations opsForString = redisTemplate.opsForValue();
+ //保存的key名
+ String key = "toggleTheSortingMode:competitionId:" + competitionId + "stageId:" + stageId + "isOverallRanking:" + isOverallRanking;
+ //查看缓存是否有数据
+ String returnValue = opsForString.get(key);
+ //使用缓存返回数据
+ if (returnValue != null) {
+ return R.ok().put("source", returnValue);
+ }
+ return R.ok().put("source", 0);
+ }
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionRegistrationController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionRegistrationController.java
new file mode 100644
index 0000000..119b9ba
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionRegistrationController.java
@@ -0,0 +1,121 @@
+package com.huoran.competition.controller;
+
+
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.response.R;
+import com.huoran.common.utils.TokenUtils;
+import com.huoran.competition.entity.CompetitionRegistration;
+import com.huoran.competition.entity.req.PageRegistrationStaffReq;
+import com.huoran.competition.entity.vo.RegistrationVO;
+import com.huoran.competition.service.CompetitionRegistrationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ *
+ * 赛事报名人员表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(tags = "赛事报名人员管理")
+@RestController
+@RequestMapping("/competition/registration")
+public class CompetitionRegistrationController {
+
+ @Autowired
+ private CompetitionRegistrationService competitionRegistrationService;
+ @NoRepeatSubmit
+ @ApiOperation(value = "是否禁用报名人员")
+ @PutMapping("/disableRegistration")
+ public R disableRegistration(
+ @ApiParam(name = "competitionRegistrationId", value = "报名人员id", required = true)
+ @RequestParam Integer competitionRegistrationId,
+ @ApiParam(name = "isDisable", value = "是否禁用", required = true)
+ @RequestParam Integer isDisable) {
+ CompetitionRegistration competitionRegistration = new CompetitionRegistration();
+ competitionRegistration.setId(competitionRegistrationId);
+ competitionRegistration.setIsDisable(isDisable);
+ boolean update = competitionRegistrationService.updateById(competitionRegistration);
+ return update ? R.ok() : R.error();
+ }
+ @NoRepeatSubmit
+ @ApiOperation(value = "个人赛事报名")
+ @PostMapping("/addCompetitionRegistration")
+ public R addCompetitionRegistration(
+ @ApiParam(name = "competitionRegistration", value = "报名人员对象", required = true)
+ @RequestBody CompetitionRegistration competitionRegistration, HttpServletRequest request) {
+ if (competitionRegistration.getAccountId()==null){
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ competitionRegistration.setAccountId(Integer.valueOf(accountId));
+ }
+ return competitionRegistrationService.apply(competitionRegistration);
+ }
+
+
+ @ApiOperation(value = "报名人员分页条件查询", response = RegistrationVO.class)
+ @PostMapping("/queryRegistrationByCondition")
+ public R registrationPageList(
+ @RequestBody PageRegistrationStaffReq req, HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ return competitionRegistrationService.registrationPageConditionQuery(req);
+ }
+
+
+ @ApiOperation(value = "批量禁用人员参赛")
+ @PutMapping("/disableContests")
+ public R disableContests(
+ @ApiParam(name = "ids", value = "多个id", required = true)
+ @RequestParam("ids") List ids) {
+ if (ids != null && ids.size() != 0) {
+ boolean delete = competitionRegistrationService.disableContests(ids);
+ return delete ? R.ok() : R.error();
+ } else {
+ return R.error();
+ }
+ }
+
+ @ApiOperation(value = "导出全部数据", response = RegistrationVO.class)
+ @GetMapping("/excelExport")
+ public void excelExport(
+ @ApiParam(name = "competitionId", value = "赛事ID", required = true)
+ @RequestParam("competitionId") String competitionId, HttpServletResponse response) {
+ try {
+ PageRegistrationStaffReq req = new PageRegistrationStaffReq();
+ req.setCompetitionId(competitionId);
+ req.setPageNum(1);
+ req.setPageSize(1000);
+ competitionRegistrationService.export(response, req);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @ApiOperation(value = "批量导出数据")
+ @PostMapping(value = "/exportDataInBatches", produces = "application/json;multipart/form-data;charset=utf-8")
+ public void exportSubscribedRecords(
+ @RequestBody List listOfExportSub,
+ HttpServletResponse response, HttpServletRequest request) throws Exception {
+ competitionRegistrationService.exportDataInBatches(listOfExportSub, response);
+ }
+
+ @ApiOperation(value = "取消报名")
+ @PostMapping(value = "/cancelRegistration")
+ public R cancelRegistration(
+ @ApiParam(name = "competitionId", value = "赛事ID", required = true)
+ @RequestParam("competitionId") String competitionId, HttpServletRequest request) throws Exception {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ return competitionRegistrationService.cancelRegistration(competitionId, Integer.valueOf(accountId));
+ }
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionReleaseTimeController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionReleaseTimeController.java
new file mode 100644
index 0000000..5f6b98f
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionReleaseTimeController.java
@@ -0,0 +1,216 @@
+package com.huoran.competition.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.huoran.common.constant.DelConstant;
+import com.huoran.common.response.R;
+import com.huoran.competition.entity.CompetitionRanking;
+import com.huoran.competition.entity.CompetitionReleaseTime;
+import com.huoran.competition.entity.resp.ListOfStageResultsResp;
+import com.huoran.competition.service.CompetitionRankingService;
+import com.huoran.competition.service.CompetitionReleaseTimeService;
+import com.huoran.competition.service.CompetitionStageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.*;
+
+import javax.script.ScriptException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 赛事排名定时发布表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2023-05-30
+ */
+@Api(tags = "赛事排名定时管理")
+@RestController
+@RequestMapping("/competitionReleaseTime")
+public class CompetitionReleaseTimeController {
+
+ @Autowired
+ private CompetitionReleaseTimeService competitionReleaseTimeService;
+
+ @Autowired
+ private CompetitionRankingService rankingService;
+
+ @Autowired
+ private CompetitionStageService stagService;
+
+ @ApiOperation(value = "添加赛事阶段排名定时")
+ @PostMapping("/addCompetitionStageRankingTime")
+ public R addCompetitionStageRankingTime(
+ @ApiParam(name = "competitionReleaseTime", value = "事阶段排名定时", required = true)
+ @RequestBody CompetitionReleaseTime competitionReleaseTime) {
+
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+
+ if (competitionReleaseTime.getIsOverallRanking() == 0) {
+ queryWrapper.eq("stage_id", competitionReleaseTime.getStageId());
+ }
+
+ queryWrapper.eq("competition_id", competitionReleaseTime.getCompetitionId());
+ /* queryWrapper.eq("publication_type", competitionReleaseTime.getPublicationType());*/
+ queryWrapper.eq("is_overall_ranking", competitionReleaseTime.getIsOverallRanking());
+ queryWrapper.eq("is_del", DelConstant.NOT_DEL);
+ CompetitionReleaseTime releaseTime = competitionReleaseTimeService.getOne(queryWrapper);
+
+ if (releaseTime != null) {
+ //如果定时存在则覆盖更新时间
+ releaseTime.setReleaseTime(competitionReleaseTime.getReleaseTime());
+ releaseTime.setPublicationType(competitionReleaseTime.getPublicationType());
+ if (competitionReleaseTime.getIsOverallRanking() == 1) {
+ releaseTime.setStageId(competitionReleaseTime.getStageId());
+ }
+ competitionReleaseTimeService.updateById(releaseTime);
+ return R.ok();
+ }
+
+ boolean save = competitionReleaseTimeService.save(competitionReleaseTime);
+ return save ? R.ok() : R.error();
+ }
+
+ @ApiOperation(value = "获取赛事阶段排名定时")
+ @PostMapping("/getCompetitionStageRankingTime")
+ public R getCompetitionStageRankingTime(
+ @ApiParam(name = "competitionReleaseTime", value = "事阶段排名定时", required = true)
+ @RequestBody CompetitionReleaseTime competitionReleaseTime) {
+ CompetitionReleaseTime one = competitionReleaseTimeService.getOne(
+ new QueryWrapper().
+ eq("competition_id", competitionReleaseTime.getCompetitionId()).
+ eq("stage_id", competitionReleaseTime.getStageId()).
+ eq("publication_type", competitionReleaseTime.getPublicationType()).
+ eq("is_del", DelConstant.NOT_DEL).
+ eq("is_overall_ranking", competitionReleaseTime.getIsOverallRanking()));
+ return R.ok().put("releaseTime", one);
+ }
+
+ @ApiOperation(value = "取消赛事阶段排名定时")
+ @PostMapping("/cancelCompetitionStageRankingTime")
+ public R cancelCompetitionStageRankingTime(
+ @ApiParam(name = "releaseId", value = "定时id", required = true)
+ @RequestParam Integer releaseId,
+ @ApiParam(name = "competitionId", value = "赛事ID", required = true)
+ @RequestParam Integer competitionId,
+ @ApiParam(name = "stageId", value = "阶段Id", required = true)
+ @RequestParam Integer stageId,
+ @ApiParam(name = "isOverallRanking", value = "是否为总分排名(1为是 默认0不是)", required = true)
+ @RequestParam Integer isOverallRanking) {
+ boolean remove = competitionReleaseTimeService.removeById(releaseId);
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("competition_id", competitionId);
+ if (isOverallRanking == 0) {
+ queryWrapper.eq("stage_id", stageId);
+ }
+ queryWrapper.eq("is_overall_ranking", isOverallRanking);
+ List list = rankingService.list(queryWrapper);
+ if (list != null && list.size() > 0) {
+ rankingService.remove(queryWrapper);
+ }
+
+ return remove ? R.ok() : R.error();
+ }
+
+ /* @ApiOperation(value = "定时执行发布排名任务(每分钟自动执行)")
+// @Scheduled(cron = "0 * * * * ?")
+ @Scheduled(fixedRate = 30000)
+ public void publishRankingTasks() throws ScriptException {
+ List list = competitionReleaseTimeService.
+ list(new QueryWrapper().eq("is_del", 0));
+ if (list != null && list.size() > 0) {
+ //获取当前时间
+ Date date = new Date();
+ System.out.println("当前时间为:" + date);
+ for (CompetitionReleaseTime competitionReleaseTime : list) {
+ boolean after = date.after(competitionReleaseTime.getReleaseTime());
+ //查询排名数据，发布排名
+ if (after) {
+ *//*以下处理定时发布总分排名 BEGIN*//*
+ if (competitionReleaseTime.getIsOverallRanking() == 1) {
+ //1.查询当前有待发布的总分排名的数据 判断有没有已经发布过的 有的话删除上一次已经发布的再将本次的发布
+ QueryWrapper queryWrapper1 = new QueryWrapper<>();
+ queryWrapper1.eq("competition_id", competitionReleaseTime.getCompetitionId());
+ queryWrapper1.eq("is_release", DelConstant.POST_STATUS);//已发布
+ //如果为总分排名时,默认删除上一次发布的总分排名
+ queryWrapper1.eq("is_overall_ranking", 1);
+ rankingService.remove(queryWrapper1);
+
+
+ //重新发布排名
+ UpdateWrapper updateWrapper = new UpdateWrapper<>();
+ updateWrapper.set("is_release", DelConstant.POST_STATUS);
+ updateWrapper.eq("competition_id", competitionReleaseTime.getCompetitionId());
+ updateWrapper.eq("is_overall_ranking", 1);//
+ updateWrapper.eq("stage_id",competitionReleaseTime.getStageId());
+ //发布类型(0默认发布 1批量手动导入)
+ updateWrapper.eq("publication_type",competitionReleaseTime.getPublicationType());
+ rankingService.update(new CompetitionRanking(),updateWrapper);
+
+
+ //删除定时的
+ competitionReleaseTimeService.removeById(competitionReleaseTime.getId());
+ *//*以下处理定时发布总分排名 END*//*
+
+
+
+ } else if (competitionReleaseTime.getPublicationType() == 0 && competitionReleaseTime.getIsOverallRanking() == 0) {
+ R r = stagService.stageRaceRanking(
+ competitionReleaseTime.getCompetitionId(),
+ competitionReleaseTime.getStageId(),
+ 1, 100,
+ competitionReleaseTime.getPublicationType());
+ List respList = (List) r.get("page");
+ if (respList != null && respList.size() > 0) {
+ List rankingList = new ArrayList<>();
+ for (ListOfStageResultsResp resultsResp : respList) {
+ CompetitionRanking competitionRanking = new CompetitionRanking();
+ BeanUtils.copyProperties(resultsResp, competitionRanking);
+ BeanUtils.copyProperties(competitionReleaseTime, competitionRanking);
+ rankingList.add(competitionRanking);
+ }
+ R ranking = rankingService.publishRanking(rankingList);
+ //发布成功，删除定时
+ if (ranking != null && ranking.get("message").equals("success")) {
+ competitionReleaseTime.setIsDel(1);
+ competitionReleaseTimeService.updateById(competitionReleaseTime);
+ }
+ }
+ //查询手动导入数据
+ } else if (competitionReleaseTime.getPublicationType() == 1 && competitionReleaseTime.getIsOverallRanking() == 0) {
+
+ }
+ }
+ }
+ }
+ }*/
+
+
+ /*@ApiOperation(value = "定时执行发布排名任务(每1秒执行一次)")
+ @Scheduled(fixedRate = 1000)
+ public void publishRankingTasks() throws ScriptException {
+ List list = competitionReleaseTimeService.
+ list(new QueryWrapper().eq("is_del", 0).last(" and TIMESTAMPDIFF( SECOND, now( ), ( release_time ) ) <= 0"));
+ if (list != null && list.size() > 0) {
+ //获取当前时间
+ Date date = new Date();
+ System.out.println("当前时间为:" + date);
+ for (CompetitionReleaseTime competitionReleaseTime : list) {
+ boolean after = date.after(competitionReleaseTime.getReleaseTime());
+ //删除此条时间
+ competitionReleaseTimeService.removeById(competitionReleaseTime.getId());
+
+ }
+ }
+ }*/
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionRuleController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionRuleController.java
new file mode 100644
index 0000000..8807b14
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionRuleController.java
@@ -0,0 +1,55 @@
+package com.huoran.competition.controller;
+
+
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.response.R;
+import com.huoran.competition.entity.CompetitionRule;
+import com.huoran.competition.service.CompetitionRuleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *
+ * 赛事规则表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(tags = "赛事规则管理")
+@RestController
+@RequestMapping("/competition/rule")
+public class CompetitionRuleController {
+
+ @Autowired
+ private CompetitionRuleService competitionRuleService;
+ @NoRepeatSubmit
+ @ApiOperation(value = "添加赛事规则")
+ @PostMapping("/addCompetitionRule")
+ public R addCompetitionRule(
+ @ApiParam(name = "competitionRule", value = "赛事规则对象", required = true)
+ @RequestBody CompetitionRule competitionRule) {
+ return competitionRuleService.addCompetitionRule(competitionRule);
+ }
+
+ @ApiOperation(value = "根据赛事id查询赛事规则")
+ @GetMapping("/getCompetitionRule")
+ public R getCompetitionRule(
+ @ApiParam(name = "competitionId" , value = "賽事id")
+ @RequestParam("competitionId") String competitionId) {
+ return competitionRuleService.getCompetitionRule(competitionId);
+ }
+ @NoRepeatSubmit
+ @ApiOperation(value = "编辑赛事规则")
+ @PostMapping("/editCompetitionRule")
+ public R editCompetitionRule(
+ @ApiParam(name = "competitionRule", value = "赛事规则对象", required = true)
+ @RequestBody CompetitionRule competitionRule) {
+ return competitionRuleService.editCompetitionRule(competitionRule);
+ }
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionStageController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionStageController.java
new file mode 100644
index 0000000..2ca0d7b
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionStageController.java
@@ -0,0 +1,44 @@
+package com.huoran.competition.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huoran.common.response.R;
+import com.huoran.common.utils.TokenUtils;
+import com.huoran.competition.entity.CompetitionStage;
+import com.huoran.competition.entity.CompetitionTeam;
+import com.huoran.competition.entity.CompleteCompetitionSetup;
+import com.huoran.competition.service.CompetitionStageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+
+/**
+ *
+ * 赛事阶段设置表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(tags = "赛事阶段设置管理")
+@RestController
+@RequestMapping("/competition/stage")
+public class CompetitionStageController {
+
+ @Autowired
+ CompetitionStageService competitionStageService;
+
+ @PostMapping("/queryCompetitionStageBySetupId")
+ @ApiOperation(value = "查询完整赛事阶段数据")
+ public R queryCompetitionStageBySetupId(@RequestParam Integer setupId) {
+ return competitionStageService.queryCompetitionStageBySetupId(setupId);
+ }
+
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionStageFileController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionStageFileController.java
new file mode 100644
index 0000000..23c4901
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionStageFileController.java
@@ -0,0 +1,138 @@
+package com.huoran.competition.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huoran.api.UserClient;
+import com.huoran.common.utils.TokenUtils;
+import com.huoran.competition.entity.CompetitionStage;
+import com.huoran.competition.entity.req.ContestStageFileReq;
+import com.huoran.competition.service.CompetitionStageFileService;
+import com.huoran.competition.service.CompetitionStageService;
+import com.huoran.competition.utils.ZipUtil;
+import io.swagger.annotations.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huoran.common.response.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import com.huoran.competition.service.CompetitionStageFileService;
+import com.huoran.competition.entity.CompetitionStageFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @描述：赛事阶段文件控制类
+ * @作者: Rong
+ * @日期: 2023-11-13
+ */
+@RestController
+@RequestMapping("/cCompetitionStageFile")
+@Api(value = "赛事阶段文件:CCompetitionStageFileController", tags = "赛事线下阶段文件")
+public class CompetitionStageFileController {
+
+ @Autowired
+ public CompetitionStageFileService service;
+
+ @Autowired
+ CompetitionStageService competitionStageService;
+
+ @Autowired
+ private UserClient userClient;
+
+ @PostMapping("/listByEntity")
+ @ApiOperation(value = "分页查询", response = CompetitionStageFile.class)
+ public R listByEntity(@RequestBody ContestStageFileReq req) {
+ return service.stageFile(req);
+ }
+
+
+ @PostMapping("/findById")
+ @ApiOperation(value = "查询详情", response = CompetitionStageFile.class)
+ public R findById(@ApiParam(name = "id", value = "主键", required = true) @RequestParam Integer id) {
+ CompetitionStageFile cCompetitionStageFile = service.getById(id);
+ return R.ok().put("data", cCompetitionStageFile);
+ }
+
+ @PostMapping("/save")
+ @ApiOperation(value = "新增", response = CompetitionStageFile.class)
+ public R save(@RequestBody @ApiParam(name = "赛事阶段文件对象", value = "传入json格式", required = true) CompetitionStageFile file, HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ Integer schoolId = userClient.getSchoolIdByAccountId(accountId);
+ file.setAccountId(Integer.valueOf(accountId));
+ file.setSchoolId(schoolId);
+
+ CompetitionStageFile stageFile = service.checkWhetherTheFileHasBeenUploaded(file);
+ if (!ObjectUtil.isEmpty(stageFile)) {
+ return R.error("当前已上传文件或正在上传文件，请先删除已有文件!");
+ }
+
+ boolean addState = service.save(file);
+ return addState ? R.ok(file.getId()) : R.error("新增失败");
+ }
+
+
+ @PostMapping("/update")
+ @ApiOperation(value = "修改", response = CompetitionStageFile.class)
+ public R update(@RequestBody @ApiParam(name = "赛事阶段文件对象", value = "传入json格式", required = true) CompetitionStageFile file, HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ Integer schoolId = userClient.getSchoolIdByAccountId(accountId);
+ file.setAccountId(Integer.valueOf(accountId));
+ file.setSchoolId(schoolId);
+ boolean updateState = service.updateById(file);
+ return updateState ? R.ok() : R.error("编辑失败");
+ }
+
+
+ @PostMapping("/batchDeletion")
+ @ApiOperation(value = "批量删除", response = CompetitionStageFile.class)
+ public R batchDeletion(@ApiParam(name = "ids", value = "主键", required = true) @RequestBody List ids) {
+ boolean delState = service.removeByIds(ids);
+ return delState ? R.ok() : R.error("删除失败");
+ }
+
+ @PostMapping("/deriveAll")
+ @ApiOperation(value = "导出", response = CompetitionStageFile.class)
+ public void deriveAll(@RequestBody ContestStageFileReq req, HttpServletRequest request, HttpServletResponse response) {
+ try {
+
+ CompetitionStage stage = competitionStageService.getById(req.getStageId());
+ List files = service.stageAllFiles(req);
+
+ ZipUtil zipUtil = new ZipUtil();
+
+ for (CompetitionStageFile url : files) {
+ zipUtil.downloadFile(url.getFilePath());
+ }
+ //把下载的图片文件夹压缩
+ zipUtil.downloadZip(request, response, stage.getStageName() + "下载压缩文件.zip");
+
+
+ for (CompetitionStageFile url : files) {
+ String userName = service.getStudentName(url.getAccountId());
+ String downloadUrl = url.getFilePath();
+// String filePath = ZipUtil.downloadDir + "/" + downloadUrl.substring(downloadUrl.lastIndexOf("/"));
+ String filePath = ZipUtil.downloadDir + "/" + userName + "-" + url.getFileName();
+ File file = new File(filePath);
+ ZipUtil.deleteDirectory(file);
+ }
+
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompetitionTeamController.java b/competition/src/main/java/com/huoran/competition/controller/CompetitionTeamController.java
new file mode 100644
index 0000000..7769639
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompetitionTeamController.java
@@ -0,0 +1,377 @@
+package com.huoran.competition.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.aop.aspect.RedisServiceAop;
+import com.huoran.common.response.R;
+import com.huoran.common.utils.TokenUtils;
+import com.huoran.competition.entity.*;
+import com.huoran.competition.entity.req.TransferTeamReq;
+import com.huoran.competition.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import javax.script.ScriptException;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * 赛事团队表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-12-02
+ */
+@Api(tags = "赛事团队管理")
+@RestController
+@RequestMapping("/competition/team")
+public class CompetitionTeamController {
+
+ @Autowired
+ private CompetitionTeamService competitionTeamService;
+
+ @Autowired
+ private CompetitionService competitionService;
+
+ @Autowired
+ private TeamParticipantService teamParticipantService;
+
+ @Autowired
+ private CompleteCompetitionSetupService completeCompetitionSetupService;
+
+ @Autowired
+ private CompetitionRegistrationService competitionRegistrationService;
+
+ @Autowired
+ private RedisServiceAop redisService;
+
+ @GetMapping("/searchTeam")
+ @ApiOperation(value = "搜索团队")
+ public R searchTeam(@RequestParam String teamName,Integer competitionId) throws ParseException {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("competition_id",competitionId);
+ wrapper.eq("captain",0);
+ if (StringUtils.isNotBlank(teamName)){
+ wrapper.like("team_name",teamName);
+ }
+ wrapper.last("ORDER BY CONVERT( team_name USING gbk ) COLLATE gbk_chinese_ci ASC");
+ List list = competitionTeamService.list(wrapper);
+ return R.ok().put("teamList",list);
+ }
+ @NoRepeatSubmit
+ @PostMapping("/editCompetitionTeam")
+ @ApiOperation(value = "编辑赛事团队")
+ @Transactional
+ public R editCompetitionTeam(@RequestBody CompetitionTeam competitionTeam, HttpServletRequest request) {
+ String accountId = "";
+ if (competitionTeam.getIdentification() !=null && competitionTeam.getIdentification()==1){
+ accountId = competitionTeam.getAccountId().toString();
+ }else {
+ accountId = TokenUtils.getIdByJwtToken(request);
+ }
+
+ competitionTeam.setAccountId(Integer.valueOf(accountId));
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("team_name",competitionTeam.getTeamName());
+ queryWrapper.eq("competition_id",competitionTeam.getCompetitionId());
+ queryWrapper.eq("team_id",competitionTeam.getTeamId());
+ //查询团队成员
+ QueryWrapper teamQueryWrapper = new QueryWrapper<>();
+ teamQueryWrapper.eq("competition_id",competitionTeam.getCompetitionId());
+ teamQueryWrapper.eq("pid",competitionTeam.getTeamId());
+ List list = competitionTeamService.list(teamQueryWrapper);
+
+ if (competitionTeam.getTeamId() != null) {
+ queryWrapper.last(" and team_id != " + competitionTeam.getTeamId());
+ }
+ int count = competitionTeamService.count(queryWrapper);
+ if (count>list.size()){
+ return R.error("团队已存在！");
+ }
+ boolean update = competitionTeamService.updateById(competitionTeam);
+
+ return update ? R.ok() : R.error();
+ }
+ @NoRepeatSubmit
+ @PostMapping("/addCompetitionTeam")
+ @ApiOperation(value = "新增赛事团队并报名")
+ @Transactional
+ public R addCompetitionTeam(@RequestBody CompetitionTeam competitionTeam, HttpServletRequest request) throws ParseException {
+ String accountId = "";
+ if (competitionTeam.getIdentification() !=null && competitionTeam.getIdentification()==1){
+ accountId = competitionTeam.getAccountId().toString();
+ }else {
+ accountId = TokenUtils.getIdByJwtToken(request);
+ boolean signingUp = this.signingUp(competitionTeam.getCompetitionId());
+ if (!signingUp){
+ return R.error("未在报名时间内！");
+ }
+ }
+
+ competitionTeam.setAccountId(Integer.valueOf(accountId));
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("team_name",competitionTeam.getTeamName());
+ queryWrapper.eq("competition_id",competitionTeam.getCompetitionId());
+ queryWrapper.eq("captain",0);
+ int count = competitionTeamService.count(queryWrapper);
+ if (count>0){
+ return R.error("团队已存在！");
+ }
+
+ QueryWrapper teamQueryWrapper = new QueryWrapper<>();
+ teamQueryWrapper.eq("account_id",accountId);
+ teamQueryWrapper.eq("competition_id",competitionTeam.getCompetitionId());
+ CompetitionTeam one = competitionTeamService.getOne(teamQueryWrapper);
+ if (one!=null){
+ if (one.getCaptain()==0){
+ return R.error("您已创建团队无法再次创建！");
+ }
+ return R.error("您已报名加入团队，无法另外创建团队，请退出团队后再创建自己的团队！");
+ }
+
+ boolean save = competitionTeamService.save(competitionTeam);
+
+ if (competitionTeam.getWhetherSignUp()==1){
+ //验证报名邀请码
+/* boolean verifyRegistrationCode = this.verifyRegistrationCode(competitionTeam.getCompetitionId(), competitionTeam.getRegistrationInvitationCode());
+ if (!verifyRegistrationCode && competitionTeam.getIdentification() !=null && competitionTeam.getIdentification()!=1){
+ throw new CustomException(ExceptionEnum.CODE);
+ }*/
+ //创建并加入
+ CompetitionRegistration competitionRegistration = new CompetitionRegistration();
+ if (competitionTeam.getIdentification() !=null && competitionTeam.getIdentification()==1){
+ competitionRegistration.setIdentification(1);
+ }
+ competitionRegistration.setAccountId(Integer.valueOf(accountId));
+ competitionRegistration.setCompetitionId(competitionTeam.getCompetitionId());
+ competitionRegistration.setRegistrationInvitationCode(competitionTeam.getRegistrationInvitationCode());
+ competitionRegistration.setTeamId(competitionTeam.getTeamId());
+ competitionRegistration.setJoin(true);
+ return competitionRegistrationService.apply(competitionRegistration);
+ }
+ return save ? R.ok() : R.error();
+ }
+
+ public boolean signingUp(Integer competitionId) throws ParseException {
+ //查询赛事是否在报名时间，在时间范围内允许加入
+ Competition competition = competitionService.getById(competitionId);
+ Date startTime = competition.getSignUpStartTime();
+ Date endTime = competition.getSignUpEndTime();
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String day = sdf.format(Calendar.getInstance().getTime());
+ Date today = sdf.parse(day);
+ //判断today是否在startTime之后
+ boolean after = today.after(startTime);
+ //判断 today是否在endTime之前
+ boolean before = today.before(endTime);
+ //当true == after 和 true == before 同时成立时就是在此日期区间内
+ return after && before;
+ }
+
+ public boolean verifyRegistrationCode(Integer competitionId,String registrationInvitationCode) {
+ //查询赛事设置，验证报名邀请码
+ QueryWrapper setupQueryWrapper = new QueryWrapper<>();
+ setupQueryWrapper.eq("competition_id",competitionId);
+ CompleteCompetitionSetup setup = completeCompetitionSetupService.getOne(setupQueryWrapper);
+
+ //是否需要报名邀请码
+ Integer code = setup.getIsNeedCode();
+ if (code==1){
+ //验证报名邀请码
+ return setup.getInvitationCode().equals(registrationInvitationCode);
+ }else {
+ return true;
+ }
+ }
+ @NoRepeatSubmit
+ @PostMapping("/joinCompetitionTeam")
+ @ApiOperation(value = "加入赛事团队并报名")
+ @Transactional
+ public R joinCompetitionTeam(@RequestBody CompetitionTeam competitionTeam, HttpServletRequest request) throws ParseException {
+ String accountId = "";
+ if (competitionTeam.getIdentification() !=null && competitionTeam.getIdentification()==1){
+ accountId = competitionTeam.getAccountId().toString();
+ }else {
+ accountId = TokenUtils.getIdByJwtToken(request);
+ }
+ CompetitionTeam team = competitionTeamService.getById(competitionTeam.getTeamId());
+ CompetitionRegistration competitionRegistration = new CompetitionRegistration();
+ QueryWrapper teamQueryWrapper1 = new QueryWrapper<>();
+ teamQueryWrapper1.eq("competition_id",competitionTeam.getCompetitionId());
+ teamQueryWrapper1.eq("account_id",accountId);
+ CompetitionTeam team1 = competitionTeamService.getOne(teamQueryWrapper1);
+ if (team1!=null){
+ if (team1.getCaptain()==0){
+ return R.error("您已创建团队无法再次加入！");
+ }
+ //如果是队员，并且是后台进行修改，可以直接修改团队
+ if (competitionTeam.getIdentification() !=null && competitionTeam.getIdentification()==1){
+ //删除之前所在团队数据
+ competitionTeamService.removeById(team1);
+ //加入新团队，更新报名信息
+ competitionTeam.setCaptain(1);
+ competitionTeam.setPid(team.getTeamId());
+ competitionTeam.setTeamName(team.getTeamName());
+ competitionTeam.setAccountId(Integer.valueOf(accountId));
+ boolean save = competitionTeamService.save(competitionTeam);
+
+ UpdateWrapper wrapper = new UpdateWrapper<>();
+ wrapper.eq("competition_id",competitionTeam.getCompetitionId());
+ wrapper.eq("account_id",accountId);
+ wrapper.set("team_id",team.getTeamId());
+ competitionRegistrationService.update(competitionRegistration,wrapper);
+
+ //参赛人员清空
+ QueryWrapper participantQueryWrapper = new QueryWrapper<>();
+ participantQueryWrapper.eq("competition_id",competitionTeam.getCompetitionId());
+ participantQueryWrapper.eq("account_id",accountId);
+ teamParticipantService.remove(participantQueryWrapper);
+ return R.ok();
+ }
+ return R.error("您已报名加入团队，无法加入其他团队，请退出团队后再加入！");
+ }
+
+ //查询赛事设置
+ QueryWrapper setupQueryWrapper = new QueryWrapper<>();
+ setupQueryWrapper.eq("competition_id",competitionTeam.getCompetitionId());
+ CompleteCompetitionSetup setup = completeCompetitionSetupService.getOne(setupQueryWrapper);
+ if (competitionTeam.getIdentification() ==null || competitionTeam.getIdentification() != 1) {
+ //查询赛事是否在报名时间，在时间范围内允许加入
+ boolean signingUp = this.signingUp(competitionTeam.getCompetitionId());
+ if (!signingUp){
+ return R.error("未在报名时间内！");
+ }
+
+ if (setup.getIsNeedCode()==1){
+ //验证报名邀请码
+ boolean verifyRegistrationCode = this.verifyRegistrationCode(competitionTeam.getCompetitionId(), competitionTeam.getRegistrationInvitationCode());
+ if (!verifyRegistrationCode){
+ return R.error("报名邀请码错误！");
+ }
+ }
+
+ //团队存在，验证邀请码
+ if (!team.getInvitationCode().equals(competitionTeam.getInvitationCode())){
+ return R.error("团队邀请码错误！");
+ }
+ }else {
+ competitionRegistration.setIdentification(1);
+ }
+ //查询是否团队有人数限制
+ if (setup.getMaxTeamSize()!=null){
+ //查询当前团队人数
+ QueryWrapper teamQueryWrapper = new QueryWrapper<>();
+ teamQueryWrapper.eq("pid",competitionTeam.getTeamId());
+ int count = competitionTeamService.count(teamQueryWrapper);
+ int total = count+1;
+ if (total>=setup.getMaxTeamSize()){
+ return R.error("加入失败，团队人数限制"+setup.getMaxTeamSize()+"人！");
+ }
+ }
+
+ //加入团队，录入报名信息
+ competitionTeam.setCaptain(1);
+ competitionTeam.setPid(team.getTeamId());
+ competitionTeam.setTeamName(team.getTeamName());
+ competitionTeam.setAccountId(Integer.valueOf(accountId));
+ boolean save = competitionTeamService.save(competitionTeam);
+
+ competitionRegistration.setAccountId(Integer.valueOf(accountId));
+ competitionRegistration.setCompetitionId(competitionTeam.getCompetitionId());
+ competitionRegistration.setRegistrationInvitationCode(competitionTeam.getRegistrationInvitationCode());
+ competitionRegistration.setTeamId(team.getTeamId());
+ competitionRegistration.setJoin(false);
+ return competitionRegistrationService.apply(competitionRegistration);
+ }
+ @NoRepeatSubmit
+ @PostMapping("/captainOfTransfer")
+ @ApiOperation(value = "转让队长")
+ public R captainOfTransfer(@RequestBody @Valid TransferTeamReq transferTeamReq) {
+ return competitionTeamService.captainOfTransfer(transferTeamReq);
+ }
+ @NoRepeatSubmit
+ @PostMapping("/removeTheLine")
+ @ApiOperation(value = "移除队伍")
+ public R removeTheLine(
+ @ApiParam(name = "teamId", value = "团队ID", required = true)
+ @RequestParam(value = "teamId") Integer teamId,
+ @ApiParam(name = "competitionId", value = "赛事id", required = true)
+ @RequestParam(value = "competitionId") Integer competitionId,
+ @ApiParam(name = "accountId", value = "账号ID", required = true)
+ @RequestParam(value = "accountId") Integer accountId) {
+ Competition byId = competitionService.getById(competitionId);
+ //添加移除标识
+ String key = accountId+"removeTheLine";
+ redisService.setCacheObject(key,byId.getName());
+ //报名删除
+ QueryWrapper registrationQueryWrapper = new QueryWrapper<>();
+ registrationQueryWrapper.eq("competition_id",competitionId);
+ registrationQueryWrapper.eq("account_id",accountId);
+ registrationQueryWrapper.eq("team_id",teamId);
+ competitionRegistrationService.remove(registrationQueryWrapper);
+
+ //参赛人员清空
+ QueryWrapper participantQueryWrapper = new QueryWrapper<>();
+ participantQueryWrapper.eq("competition_id",competitionId);
+ participantQueryWrapper.eq("account_id",accountId);
+ participantQueryWrapper.eq("team_id",teamId);
+ teamParticipantService.remove(participantQueryWrapper);
+
+ QueryWrapper teamQueryWrapper = new QueryWrapper<>();
+ teamQueryWrapper.eq("competition_id",competitionId);
+ teamQueryWrapper.eq("account_id",accountId);
+ teamQueryWrapper.eq("pid",teamId);
+ boolean remove = competitionTeamService.remove(teamQueryWrapper);
+ return remove ? R.ok() : R.error();
+ }
+
+ @PostMapping("/promptRemoval")
+ @ApiOperation(value = "是否提示移除")
+ public R promptRemoval(HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+ String name = redisService.getCacheObject(accountId+"removeTheLine");
+ if (name!=null){
+ //清除缓存
+ redisService.deleteObject(accountId);
+ return R.ok().put("prompt","你报名的"+name+"大赛，已被队长踢出队伍，请重新报名加入别的团队！");
+ }
+ return R.ok();
+ }
+
+ @PostMapping("/entryInformation")
+ @ApiOperation(value = "用户参赛信息")
+ public R entryInformation(
+ @ApiParam(name = "competitionId", value = "赛事ID", required = true)
+ @RequestParam Integer competitionId,
+ @ApiParam(name = "accountId", value = "账号id", required = false)
+ @RequestParam(required = false) String accountId,
+ HttpServletRequest request) throws ScriptException {
+ String account;
+ int background;
+ if (accountId!=null){
+ account = accountId;
+ //后台标识，查询参赛信息只返回队长信息
+ background = 1;
+ }else {
+ account = TokenUtils.getIdByJwtToken(request);
+ background = 0;
+ }
+ return competitionTeamService.entryInformation(competitionId,account,background);
+ }
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/CompleteCompetitionSetupController.java b/competition/src/main/java/com/huoran/competition/controller/CompleteCompetitionSetupController.java
new file mode 100644
index 0000000..90aee98
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/CompleteCompetitionSetupController.java
@@ -0,0 +1,23 @@
+package com.huoran.competition.controller;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * 完整赛事设置 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Api(tags = "完整赛事管理")
+@RestController
+@RequestMapping("/complete/competitionSetup")
+public class CompleteCompetitionSetupController {
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/TeamInstructorController.java b/competition/src/main/java/com/huoran/competition/controller/TeamInstructorController.java
new file mode 100644
index 0000000..87fc3e3
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/TeamInstructorController.java
@@ -0,0 +1,74 @@
+package com.huoran.competition.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.response.R;
+import com.huoran.common.utils.TokenUtils;
+import com.huoran.competition.entity.TeamInstructor;
+import com.huoran.competition.service.TeamInstructorService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+/**
+ *
+ * 赛事指导老师表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-12-02
+ */
+@Api(tags = "赛事指导老师管理")
+@RestController
+@RequestMapping("/competition/teamInstructor")
+public class TeamInstructorController {
+
+ @Autowired
+ private TeamInstructorService teamInstructorService;
+ @NoRepeatSubmit
+ @PostMapping("/addAnAdvisor")
+ @ApiOperation(value = "添加/编辑指导老师")
+ public R addAnAdvisor(@RequestBody @Valid TeamInstructor teamInstructor,HttpServletRequest request) {
+ String accountId = TokenUtils.getIdByJwtToken(request);
+
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ teamInstructor.setAccountId(Integer.valueOf(accountId));
+ if (teamInstructor.getTeamId()!=null){
+ queryWrapper.eq("competition_id",teamInstructor.getCompetitionId());
+ queryWrapper.eq("team_id",teamInstructor.getTeamId());
+ }else {
+ queryWrapper.eq("competition_id",teamInstructor.getCompetitionId());
+ queryWrapper.eq("account_id",accountId);
+ }
+ int count = teamInstructorService.count(queryWrapper);
+ if (count >= 5){
+ return R.error("添加失败，超出限制！");
+ }
+ queryWrapper.eq("name",teamInstructor.getName());
+
+ if (teamInstructor.getId() != null) {
+ queryWrapper.last(" and id != " + teamInstructor.getId());
+ }
+ int count1 = teamInstructorService.count(queryWrapper);
+ if (count1 > 0 ){
+ return R.error("名字已存在！");
+ }
+ boolean save = teamInstructorService.saveOrUpdate(teamInstructor);
+ return save ? R.ok().put("id",teamInstructor.getId()) : R.error();
+ }
+ @NoRepeatSubmit
+ @PostMapping("/deleteAnAdvisor")
+ @ApiOperation(value = "删除指导老师")
+ public R deleteAnAdvisor(@RequestParam Integer id) {
+ boolean remove = teamInstructorService.removeById(id);
+ return remove ? R.ok() : R.error();
+ }
+
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/controller/TeamParticipantController.java b/competition/src/main/java/com/huoran/competition/controller/TeamParticipantController.java
new file mode 100644
index 0000000..f7170d8
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/controller/TeamParticipantController.java
@@ -0,0 +1,90 @@
+package com.huoran.competition.controller;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huoran.common.aop.annotation.NoRepeatSubmit;
+import com.huoran.common.response.R;
+import com.huoran.competition.entity.TeamParticipant;
+import com.huoran.competition.service.TeamParticipantService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.text.ParseException;
+import java.util.List;
+
+/**
+ *
+ * 团队阶段参赛人员表 前端控制器
+ *
+ *
+ * @author cheney
+ * @since 2022-12-05
+ */
+@Api(tags = "团队阶段指定参赛人员表")
+@RestController
+@RequestMapping("/competition/teamParticipant")
+public class TeamParticipantController {
+
+ @Autowired
+ private TeamParticipantService teamParticipantService;
+ @NoRepeatSubmit
+ @PostMapping("/stageSelectParticipants")
+ @ApiOperation(value = "选择阶段参赛人员")
+ public R stageSelectParticipants(
+ @RequestBody @Valid TeamParticipant teamInstructor) throws ParseException {
+ //后台不传值，学生修改判断修改时间
+ if (teamInstructor.getPlatformId()!=null && teamInstructor.getPlatformId()==1){
+// 查询阶段比赛时间
+ boolean ok = teamParticipantService.inTheGame(teamInstructor.getStageId());
+// 阶段在比赛中不允许修改参数人员
+ if (ok){
+ return R.error("比赛开始无法修改参数人员！");
+ }
+ }
+// 清空之前数据
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("stage_id",teamInstructor.getStageId());
+ queryWrapper.eq("competition_id",teamInstructor.getCompetitionId());
+ queryWrapper.eq("team_id",teamInstructor.getTeamId());
+ teamParticipantService.remove(queryWrapper);
+// 添加参数人员数据
+ int insert = 0;
+ List accountIds = teamInstructor.getAccountIds();
+ if (ObjectUtil.isNotNull(accountIds)){
+ for (Integer accountId : accountIds) {
+ TeamParticipant teamParticipant = new TeamParticipant();
+ teamParticipant.setTeamId(teamInstructor.getTeamId());
+ teamParticipant.setStageId(teamInstructor.getStageId());
+ teamParticipant.setCompetitionId(teamInstructor.getCompetitionId());
+ teamParticipant.setAccountId(accountId);
+ teamParticipantService.save(teamParticipant);
+ insert++;
+ }
+ }
+ return R.ok();
+ }
+
+ @NoRepeatSubmit
+ @PostMapping("/cancelParticipant")
+ @ApiOperation(value = "取消参赛人员")
+ public R cancelParticipant(@RequestBody @Valid TeamParticipant teamInstructor) {
+ //参赛人员清空
+ QueryWrapper participantQueryWrapper = new QueryWrapper<>();
+ participantQueryWrapper.eq("competition_id",teamInstructor.getCompetitionId());
+ participantQueryWrapper.eq("account_id",teamInstructor.getAccountId());
+ participantQueryWrapper.eq("team_id",teamInstructor.getTeamId());
+ participantQueryWrapper.eq("stage_id",teamInstructor.getStageId());
+ teamParticipantService.remove(participantQueryWrapper);
+ return R.ok();
+ }
+
+
+}
+
diff --git a/competition/src/main/java/com/huoran/competition/entity/Competition.java b/competition/src/main/java/com/huoran/competition/entity/Competition.java
new file mode 100644
index 0000000..ec29418
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/Competition.java
@@ -0,0 +1,139 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+import java.util.List;
+
+import com.huoran.competition.entity.resp.CompetitionRangeResp;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事信息表
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition")
+@ApiModel(value="Competition对象", description="赛事信息表")
+public class Competition implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "创建人Id", example = "1")
+ private Integer founderId;
+
+ @ApiModelProperty(value = "创建人名称", example = "张三李四王五")
+ private String founderName;
+
+ @ApiModelProperty(value = "竞赛名称", example = "数据库数据库色即是空")
+ private String name;
+
+ @ApiModelProperty(value = "竞赛封面图", example = "http://localhost:9400/occupationlab/doc.html")
+ private String coverUrl;
+
+ @ApiModelProperty(value = "竞赛轮播图", example = "http://localhost:9400/occupationlab/doc.html")
+ private String carouselUrl;
+
+ @ApiModelProperty(value = "主办方", example = "或然科技")
+ private String sponsor;
+
+ @ApiModelProperty(value = "承办方", example = "或然科技")
+ private String undertaker;
+
+ @ApiModelProperty(value = "竞赛描述", example = "或然科技赛事")
+ private String description;
+
+ @ApiModelProperty(value = "发布状态（0未发布，1已发布）", example = "0")
+ private Integer publishStatus;
+
+ @ApiModelProperty(value = "竞赛开始时间", example = "2021-09-09 16:24:24")
+ private Date playStartTime;
+
+ @ApiModelProperty(value = "竞赛结束时间", example = "2021-09-20 16:24:24")
+ private Date playEndTime;
+
+ @ApiModelProperty(value = "报名开始时间", example = "2021-09-10 16:24:24")
+ private Date signUpStartTime;
+
+ @ApiModelProperty(value = "报名结束时间", example = "2021-09-20 16:24:24")
+ private Date signUpEndTime;
+
+ @ApiModelProperty(value = "学校id", example = "0")
+ private Integer schoolId;
+
+ @ApiModelProperty(value = "平台来源(0:中台，1：职站)", example = "0")
+ private Integer platformSource;
+
+ @ApiModelProperty(value = "大赛范围(0:本校内 1:全平台 2:指定区域、院校)", example = "0")
+ private Integer competitionScope;
+
+ @ApiModelProperty(value = "中台是否开启(0开启 1未开启 默认0)", example = "0")
+ private Integer ztOpen;
+
+ @ApiModelProperty(value = "是否开启(0开启 1未开启 默认0)", example = "0")
+ private Integer isOpen;
+
+ @ApiModelProperty(value = "发布类型（0发布信息，1完整比赛）默认为0")
+ private Integer releaseType;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "赛事附件")
+ @TableField(exist = false)
+ private List competitionAnnexList;
+
+ @ApiModelProperty(value = "大赛范围选择")
+ @TableField(exist = false)
+ private List competitionRangeList;
+
+ @ApiModelProperty(value = "比赛内容")
+ @TableField(exist = false)
+ private List contentList;
+
+ @ApiModelProperty(value = "比赛范围")
+ @TableField(exist = false)
+ private String range;
+
+ @ApiModelProperty(value = "赛制")
+ @TableField(exist = false)
+ private Integer rule;
+
+ @ApiModelProperty(value = "比赛范围(省市学校集合)")
+ @TableField(exist = false)
+ private List competitionRangeRespList;
+
+ @ApiModelProperty(value = "比赛报名信息")
+ @TableField(exist = false)
+ private CompetitionRegistration competitionRegistration;
+
+ @ApiModelProperty(value = "完整赛事设置信息")
+ @TableField(exist = false)
+ private CompleteCompetitionSetup completeCompetitionSetup;
+
+ @ApiModelProperty(value = "赛事阶段内容信息")
+ @TableField(exist = false)
+ private List competitionStage;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionAnnex.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionAnnex.java
new file mode 100644
index 0000000..8e54c1f
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionAnnex.java
@@ -0,0 +1,56 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事附件表
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_annex")
+@ApiModel(value="CompetitionAnnex对象", description="赛事附件表")
+public class CompetitionAnnex implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "赛事附件主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "赛事主键(c_competition表主键)")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "文件名称")
+ private String fileName;
+
+ @ApiModelProperty(value = "文件路径")
+ private String filePath;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "是否删除(默认0 1为已删除)")
+ @TableLogic
+ private Integer isDel;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionAnnouncement.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionAnnouncement.java
new file mode 100644
index 0000000..4fc6998
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionAnnouncement.java
@@ -0,0 +1,75 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事公告表
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_announcement")
+@ApiModel(value="CompetitionAnnouncement对象", description="赛事公告表")
+public class CompetitionAnnouncement implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "赛事公告主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "赛事主键(c_competition表主键)")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "公告标题")
+ private String announcementTitle;
+
+ @ApiModelProperty(value = "公告正文")
+ private String announcementText;
+
+ @ApiModelProperty(value = "0草稿 1为已发布")
+ private Integer status;
+
+ @ApiModelProperty(value = "是否开启(0开启 1未开启 默认0)")
+ private Integer isOpen;
+
+ @ApiModelProperty(value = "创建人")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "是否删除(默认0 1为已删除)")
+ @TableLogic
+ private Integer isDel;
+
+ @ApiModelProperty(value = "创建人(列表展示)")
+ @TableField(exist = false)
+ private String founderName;
+
+ @ApiModelProperty(value = "大赛公告附件存储集合")
+ @TableField(exist = false)
+ private List announcementAnnexList;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionAnnouncementAnnex.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionAnnouncementAnnex.java
new file mode 100644
index 0000000..726c117
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionAnnouncementAnnex.java
@@ -0,0 +1,56 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事公告附件表
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_announcement_annex")
+@ApiModel(value="CompetitionAnnouncementAnnex对象", description="赛事公告附件表")
+public class CompetitionAnnouncementAnnex implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "赛事附件主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "赛事公告主键(c_competition_announcement表主键)")
+ private Integer announcementId;
+
+ @ApiModelProperty(value = "文件名称")
+ private String fileName;
+
+ @ApiModelProperty(value = "文件路径")
+ private String filePath;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "是否删除(默认0 1为已删除)")
+ @TableLogic
+ private Integer isDel;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionContent.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionContent.java
new file mode 100644
index 0000000..8004e65
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionContent.java
@@ -0,0 +1,101 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ *
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_content")
+@ApiModel(value="CompetitionContent对象", description="")
+public class CompetitionContent implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键id")
+ @TableId(value = "content_id", type = IdType.AUTO)
+ private Integer contentId;
+
+ @ApiModelProperty(value = "阶段id（取c_competition_stage主键id）")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "赛事开始时间")
+ private Date startTime;
+
+ @ApiModelProperty(value = "赛事结束时间")
+ private Date endTime;
+
+ @ApiModelProperty(value = "课程id")
+ private Integer cid;
+
+ @ApiModelProperty(value = "商品id")
+ private Integer mallId;
+
+ @ApiModelProperty(value = "课程名称")
+ @TableField(exist = false)
+ private String cName;
+
+ @ApiModelProperty(value = "考核配置id")
+ private Integer assessmentId;
+
+ @ApiModelProperty(value = "系统id")
+ private Integer systemId;
+
+ @ApiModelProperty(value = "系统名称")
+ @TableField(exist = false)
+ private String systemName;
+
+ @ApiModelProperty(value = "项目管理表id")
+ private Integer projectId;
+
+ @ApiModelProperty(value = "项目名称")
+ @TableField(exist = false)
+ private String projectName;
+
+ @ApiModelProperty(value = "线上地址")
+ private String onlineAddress;
+
+ @ApiModelProperty(value = "线下地址")
+ private String offlineAddress;
+
+ @ApiModelProperty(value = "线上地址展示（默认为0不展示）")
+ private Integer onlineButton;
+
+ @ApiModelProperty(value = "线下地址展示（默认为0不展示）")
+ private Integer offlineButton;
+
+ @ApiModelProperty(value = "比赛内容描述")
+ private String contentDescription;
+
+ @ApiModelProperty(value = "评分规则")
+ private String scoreRule;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "线下内容设置信息")
+ @TableField(exist = false)
+ private CompetitionStageContentSetting competitionStageContentSetting;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionProgress.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionProgress.java
new file mode 100644
index 0000000..064d0a5
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionProgress.java
@@ -0,0 +1,55 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事进展表
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_progress")
+@ApiModel(value="CompetitionProgress对象", description="赛事进展表")
+public class CompetitionProgress implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "赛事进展标题")
+ private String title;
+
+ @ApiModelProperty(value = "赛事主键Id(c_competition表主键)")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "赛事进展状态（0未完成，1进行中，2已完成）")
+ private Integer status;
+
+ @ApiModelProperty(value = "赛事进展描述")
+ private String description;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionRange.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionRange.java
new file mode 100644
index 0000000..fa140ba
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionRange.java
@@ -0,0 +1,55 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事范围表
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_range")
+@ApiModel(value="CompetitionRange对象", description="赛事范围表")
+public class CompetitionRange implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "赛事主键(c_competition表主键)")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "省")
+ private Integer provinceId;
+
+ @ApiModelProperty(value = "市")
+ private Integer cityId;
+
+ @ApiModelProperty(value = "学校id")
+ private Integer schoolId;
+
+ @ApiModelProperty(value = "范围类型(0为学校 1为地区)")
+ private Integer type;
+
+ @ApiModelProperty(value = "是否删除(默认0 ,1为已删除)")
+ @TableLogic
+ private Integer isDel;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionRanking.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionRanking.java
new file mode 100644
index 0000000..13b03d4
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionRanking.java
@@ -0,0 +1,87 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 赛事排名表
+ *
+ *
+ * @author cheney
+ * @since 2023-01-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_ranking")
+@ApiModel(value = "CompetitionRanking对象", description = "赛事排名表")
+public class CompetitionRanking implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "主键")
+ private Integer id;
+
+ @ApiModelProperty(value = "实验报告id")
+ private Integer reportId;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+ @ApiModelProperty(value = "赛事id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "账号id")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "赛事阶段id(c_competition_stage赛事阶段设置表)")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "是否为总分排名(1为是 默认0不是)")
+ private Integer isOverallRanking;
+
+ @ApiModelProperty(value = "分数")
+ private String score;
+
+ @ApiModelProperty(value = "耗时")
+ private String timeSum;
+
+ @ApiModelProperty(value = "学校id")
+ private Integer schoolId;
+
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "是否发布(默认0未发布 1已发布)")
+ private Integer isRelease;
+
+ @ApiModelProperty(value = "发布类型(0默认发布 1批量手动导入)")
+ private Integer publicationType;
+
+
+ @ApiModelProperty(value = "团队名称")
+ @TableField(exist = false)
+ private String teamName;
+
+
+ @ApiModelProperty(value = "队长")
+ @TableField(exist = false)
+ private String leaderName;
+
+ @ApiModelProperty(value = "学校")
+ @TableField(exist = false)
+ private String schoolName;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionRegistration.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionRegistration.java
new file mode 100644
index 0000000..9871e83
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionRegistration.java
@@ -0,0 +1,82 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事报名人员表
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_registration")
+@ApiModel(value="CompetitionRegistration对象", description="赛事报名人员表")
+public class CompetitionRegistration implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "赛事主键Id(c_competition表主键)")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "用户主键Id")
+ private Integer userId;
+
+ @ApiModelProperty(value = "是否禁用（0未禁用，1禁用）")
+ private Integer isDisable;
+
+ @ApiModelProperty(value = "报名邀请码")
+ @TableField(exist = false)
+ private String registrationInvitationCode;
+
+ @ApiModelProperty("内部标识")
+ private Integer identification;
+
+ @ApiModelProperty(value = "用户名称")
+ private String username;
+
+ @ApiModelProperty(value = "学校名称")
+ private String school;
+
+ @ApiModelProperty(value = "账号")
+ private Integer account;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "账号id")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "学号")
+ private Integer workNumber;
+
+ @ApiModelProperty(value = "团队id，默认为0无团队")
+ private Integer teamId;
+
+ @TableField(exist = false)
+ private boolean join;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionReleaseTime.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionReleaseTime.java
new file mode 100644
index 0000000..60c811e
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionReleaseTime.java
@@ -0,0 +1,56 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 赛事排名定时发布表
+ *
+ *
+ * @author cheney
+ * @since 2023-05-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_release_time")
+@ApiModel(value="CompetitionReleaseTime对象", description="赛事排名定时发布表")
+public class CompetitionReleaseTime implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "赛事id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "发布类型(0默认发布 1批量手动导入)")
+ private Integer publicationType;
+
+ @ApiModelProperty(value = "是否为总分排名(1为是 默认0不是)")
+ private Integer isOverallRanking;
+
+ @ApiModelProperty(value = "发布时间")
+ @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ private Date releaseTime;
+
+ @ApiModelProperty(value = "是否删除(默认0 1为已删除)")
+// @TableLogic
+ private Integer isDel;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionRule.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionRule.java
new file mode 100644
index 0000000..27aab03
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionRule.java
@@ -0,0 +1,63 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事规则表
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_rule")
+@ApiModel(value="CompetitionRule对象", description="赛事规则表")
+public class CompetitionRule implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键id")
+ @TableId(value = "rule_id", type = IdType.AUTO)
+ private Integer ruleId;
+
+ @ApiModelProperty(value = "完整赛事设置id（取c_complete_competition_setup表主键）")
+ private Integer setupId;
+
+ @ApiModelProperty(value = "赛制（0为积分赛，1为淘汰赛，2为单项赛）")
+ private Integer rule;
+
+ @ApiModelProperty(value = "阶段数")
+ private Integer stageNum;
+
+ @ApiModelProperty(value = "团队限制参加赛项（0不限制，1限制）默认为0")
+ private Integer teamLimit;
+
+ @ApiModelProperty(value = "总成绩计算方式（0：各阶段加权求和，1：各阶段成绩求和，2：各阶段成绩平均值）")
+ private Integer resultCalculationMethod;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "各阶段设置")
+ @TableField(exist = false)
+ private List competitionStageList;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionStage.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionStage.java
new file mode 100644
index 0000000..5226aed
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionStage.java
@@ -0,0 +1,214 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 赛事阶段设置表
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_stage")
+@ApiModel(value="CompetitionStage对象", description="赛事阶段设置表")
+public class CompetitionStage implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "stage_id", type = IdType.AUTO)
+ private Integer stageId;
+
+ @ApiModelProperty(value = "规则id（c_competition_rule表主键）")
+ private Integer ruleId;
+
+ @ApiModelProperty(value = "阶段名称")
+ private String stageName;
+
+ @ApiModelProperty(value = "序号（第几阶段）")
+ private Integer number;
+
+ @ApiModelProperty(value = "比赛方式（0实操，1理论，2线下）默认为0")
+ private Integer method;
+
+ @ApiModelProperty(value = "权重（积分赛，所有阶段权和为1）")
+ private Double pointWeight;
+
+ @ApiModelProperty(value = "排名晋级人数限制（淘汰赛）")
+ private String peopleLimit;
+
+ @ApiModelProperty(value = "排名晋级百分比限制（淘汰赛）")
+ private Double percentageLimit;
+
+ @ApiModelProperty(value = "排名晋级分数限制（淘汰赛）")
+ private String scoreLimit;
+
+ @ApiModelProperty(value = "成绩公布时间")
+ @TableField(strategy = FieldStrategy.IGNORED)
+ private Integer resultAnnouncementTime;
+
+ @ApiModelProperty(value = "是否公布成绩详情（0为公布，1不公布）默认为1")
+ private Integer resultsDetails;
+
+ @ApiModelProperty(value = "参数标识，大于0表示参加过比赛")
+ @TableField(exist = false)
+ private Integer count;
+
+ @ApiModelProperty(value = "团队参赛人数限制（0表示不限制）默认为0")
+ private Integer teamNumLimit;
+
+ @ApiModelProperty(value = "团队成绩计算方式（0：最高分，1：平均分，2：总分）")
+ private String teamCalculationMethod;
+
+ @ApiModelProperty(value = "参赛人员名称（用户姓名）")
+ @TableField(exist = false)
+ private String teamParticipantIds;
+
+ @ApiModelProperty(value = "参赛人员ids(账号id)")
+ @TableField(exist = false)
+ private String participantAccountIds;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "主键id")
+ @TableField(exist = false)
+ private Integer contentId;
+
+ @ApiModelProperty(value = "赛事开始时间")
+ @TableField(exist = false)
+ private Date startTime;
+
+ @ApiModelProperty(value = "赛事结束时间")
+ @TableField(exist = false)
+ private Date endTime;
+
+ @ApiModelProperty(value = "课程id")
+ @TableField(exist = false)
+ private Integer cid;
+
+ @ApiModelProperty(value = "商品id")
+ @TableField(exist = false)
+ private Integer mallId;
+
+ @ApiModelProperty(value = "考核配置id")
+ @TableField(exist = false)
+ private Integer assessmentId;
+
+ @ApiModelProperty(value = "系统id")
+ @TableField(exist = false)
+ private Integer systemId;
+
+ @ApiModelProperty(value = "项目管理表id")
+ @TableField(exist = false)
+ private Integer projectId;
+
+ @ApiModelProperty(value = "线上地址")
+ @TableField(exist = false)
+ private String onlineAddress;
+
+ @ApiModelProperty(value = "线下地址")
+ @TableField(exist = false)
+ private String offlineAddress;
+
+ @ApiModelProperty(value = "线上地址展示（默认为0不展示）")
+ @TableField(exist = false)
+ private Integer onlineButton;
+
+ @ApiModelProperty(value = "线下地址展示（默认为0不展示）")
+ @TableField(exist = false)
+ private Integer offlineButton;
+
+ @ApiModelProperty(value = "比赛内容描述")
+ @TableField(exist = false)
+ private String contentDescription;
+
+ @ApiModelProperty(value = "评分规则")
+ @TableField(exist = false)
+ private String scoreRule;
+
+ @ApiModelProperty(value = "分数")
+ @TableField(exist = false)
+ private Double score;
+
+ @ApiModelProperty(value = "分数报告id")
+ @TableField(exist = false)
+ private Integer reportId;
+
+ @ApiModelProperty(value = "课程系统名称")
+ @TableField(exist = false)
+ private String systemName;
+
+ @ApiModelProperty(value = "赛事内容")
+ @TableField(exist = false)
+ private CompetitionContent competitionContent;
+
+ @ApiModelProperty(value = "线下内容设置信息")
+ @TableField(exist = false)
+ private CompetitionStageContentSetting competitionStageContentSetting;
+
+ @ApiModelProperty(value = "学生上传的线下文件")
+ @TableField(exist = false)
+ private CompetitionStageFile competitionStageFile;
+
+ @ApiModelProperty(value = "系统链接")
+ @TableField(exist = false)
+ private String systemLink;
+
+ @ApiModelProperty(value = "说明")
+ @TableField(exist = false)
+ private String stageExplain;
+
+ @ApiModelProperty(value = "是否支持上传文件(默认0:不支持,1:支持)")
+ @TableField(exist = false)
+ private Integer whetherToUploadFiles;
+
+ @ApiModelProperty(value = "文件路径")
+ @TableField(exist = false)
+ private String fileUrl;
+
+ @ApiModelProperty(value = "文件路径")
+ @TableField(exist = false)
+ private String fileName;
+
+ @ApiModelProperty(value = "用户文件名称")
+ @TableField(exist = false)
+ private String userFileName;
+
+ @ApiModelProperty(value = "文件大小")
+ @TableField(exist = false)
+ private String fileSize;
+
+ @ApiModelProperty(value = "文件格式")
+ @TableField(exist = false)
+ private String fileFormat;
+
+ @ApiModelProperty(value = "oss文件名")
+ @TableField(exist = false)
+ private String ossFileName;
+
+ @ApiModelProperty(value = "文件路径")
+ @TableField(exist = false)
+ private String filePath;
+
+ @ApiModelProperty(value = "用户文件id")
+ @TableField(exist = false)
+ private Integer userFileId;
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionStageContentSetting.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionStageContentSetting.java
new file mode 100644
index 0000000..7b8944b
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionStageContentSetting.java
@@ -0,0 +1,54 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事阶段内容设置
+ *
+ *
+ * @author cheney
+ * @since 2023-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_stage_content_setting")
+@ApiModel(value="CompetitionStageContentSetting对象", description="赛事线下阶段内容设置")
+public class CompetitionStageContentSetting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "赛事id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "系统链接")
+ private String systemLink;
+
+ @ApiModelProperty(value = "说明")
+ private String stageExplain;
+
+ @ApiModelProperty(value = "是否支持上传文件(默认0:不支持,1:支持)")
+ private Integer whetherToUploadFiles;
+
+ @ApiModelProperty(value = "文件路径")
+ private String fileUrl;
+
+ @ApiModelProperty(value = "文件路径")
+ private String fileName;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionStageFile.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionStageFile.java
new file mode 100644
index 0000000..8931246
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionStageFile.java
@@ -0,0 +1,71 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事阶段文件
+ *
+ *
+ * @author cheney
+ * @since 2023-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_stage_file")
+@ApiModel(value = "CompetitionStageFile对象", description = "赛事阶段文件")
+public class CompetitionStageFile implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "赛事id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+ @ApiModelProperty(value = "账号id")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "学校id")
+ private Integer schoolId;
+
+ @ApiModelProperty(value = "文件名")
+ private String fileName;
+
+ @ApiModelProperty(value = "文件大小")
+ private String fileSize;
+
+ @ApiModelProperty(value = "文件格式")
+ private String fileFormat;
+
+ @ApiModelProperty(value = "oss文件名")
+ private String ossFileName;
+
+ @ApiModelProperty(value = "文件路径")
+ private String filePath;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompetitionTeam.java b/competition/src/main/java/com/huoran/competition/entity/CompetitionTeam.java
new file mode 100644
index 0000000..268523e
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompetitionTeam.java
@@ -0,0 +1,99 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 赛事团队表
+ *
+ *
+ * @author cheney
+ * @since 2022-12-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_competition_team")
+@ApiModel(value="CompetitionTeam对象", description="赛事团队表")
+public class CompetitionTeam implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "team_id", type = IdType.AUTO)
+ private Integer teamId;
+
+ @ApiModelProperty(value = "赛事id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "团队名称")
+ private String teamName;
+
+ @ApiModelProperty(value = "邀请码")
+ private String invitationCode;
+
+ @ApiModelProperty(value = "报名邀请码")
+ @TableField(exist = false)
+ private String registrationInvitationCode;
+
+ @ApiModelProperty(value = "父id")
+ private Integer pid;
+
+ @ApiModelProperty(value = "账号id")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "队长（0是队长，1为队员）默认为0")
+ private Integer captain;
+
+ @ApiModelProperty(value = "是否报名,0不报名，1报名")
+ @TableField(exist = false)
+ private Integer whetherSignUp;
+
+/* @ApiModelProperty(value = "报名相关信息")
+ @TableField(exist = false)
+ private CompetitionRegistration competitionRegistration;*/
+
+ @ApiModelProperty(value = "用户名称")
+ @TableField(exist = false)
+ private String userName;
+
+ @ApiModelProperty(value = "学号")
+ @TableField(exist = false)
+ private String workNumber;
+
+ @ApiModelProperty(value = "学校id")
+ @TableField(exist = false)
+ private Integer schoolId;
+
+ @ApiModelProperty(value = "学校名称")
+ @TableField(exist = false)
+ private String schoolName;
+
+ @ApiModelProperty("内部标识")
+ @TableField(exist = false)
+ private Integer identification;
+
+ @ApiModelProperty(value = "是否删除(默认0 ,1为已删除)")
+ @TableLogic
+ private Integer isDel;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/CompleteCompetitionSetup.java b/competition/src/main/java/com/huoran/competition/entity/CompleteCompetitionSetup.java
new file mode 100644
index 0000000..5707678
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/CompleteCompetitionSetup.java
@@ -0,0 +1,64 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ * 完整赛事设置
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_complete_competition_setup")
+@ApiModel(value="CompleteCompetitionSetup对象", description="完整赛事设置")
+public class CompleteCompetitionSetup implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "setup_id", type = IdType.AUTO)
+ private Integer setupId;
+
+ @ApiModelProperty(value = "赛事id(c_competition表主键)")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "赛事类型（0为个人赛，1为团队赛）默认为0")
+ private Integer competitionType;
+
+ @ApiModelProperty(value = "数量上限限制")
+ private Integer quantityLimit;
+
+ @ApiModelProperty(value = "团队人数下限")
+ private Integer minTeamSize;
+
+ @ApiModelProperty(value = "团队人数上限")
+ private Integer maxTeamSize;
+
+ @ApiModelProperty(value = "邀请码")
+ private String invitationCode;
+
+ @ApiModelProperty(value = "是否需要邀请码（0不需要，1需要）默认为0")
+ private Integer isNeedCode;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/TeamInstructor.java b/competition/src/main/java/com/huoran/competition/entity/TeamInstructor.java
new file mode 100644
index 0000000..dfb6a5c
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/TeamInstructor.java
@@ -0,0 +1,64 @@
+package com.huoran.competition.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ *
+ * 团队指导老师表
+ *
+ *
+ * @author cheney
+ * @since 2022-12-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_team_instructor")
+@ApiModel(value="TeamInstructor对象", description="团队指导老师表")
+public class TeamInstructor implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "团队id（取c_competition主键）")
+ @NotNull(message = "大赛不能为空")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "账号id")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+ @ApiModelProperty(value = "姓名")
+ private String name;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "职务")
+ private String position;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/TeamParticipant.java b/competition/src/main/java/com/huoran/competition/entity/TeamParticipant.java
new file mode 100644
index 0000000..9ab93f9
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/TeamParticipant.java
@@ -0,0 +1,58 @@
+package com.huoran.competition.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 团队阶段参赛人员表
+ *
+ *
+ * @author cheney
+ * @since 2022-12-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("c_team_participant")
+@ApiModel(value="TeamParticipant对象", description="团队阶段参赛人员表")
+public class TeamParticipant implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "赛事阶段id（c_competition_stage）")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "赛事id（c_competition）")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "允许参赛人员账号")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "选择参赛人员账号")
+ @TableField(exist = false)
+ private List accountIds;
+
+ @ApiModelProperty(value = "平台id")
+ @TableField(exist = false)
+ private Integer platformId;
+
+ @ApiModelProperty(value = "团队id（c_competition_team）")
+ private Integer teamId;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/AfterLoginPageCompetitionListReq.java b/competition/src/main/java/com/huoran/competition/entity/req/AfterLoginPageCompetitionListReq.java
new file mode 100644
index 0000000..be342e8
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/AfterLoginPageCompetitionListReq.java
@@ -0,0 +1,37 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @描述：竞赛管理表
+ * @作者: Rong
+ * @日期: 2022-06-16
+ */
+@Data
+@ApiModel(value = "登录后赛事列表分页")
+public class AfterLoginPageCompetitionListReq extends PageReq{
+
+ @ApiModelProperty(value = "关键词(竞赛名称/创建人)",example = "事")
+ private String keyWord;
+
+ @ApiModelProperty(value = "大赛范围(0:本校内 1:全平台 2.指定区域、院校 3.不限)",example = "3")
+ private String competitionScope;
+
+ @ApiModelProperty(value = "省")
+ private Integer provinceId;
+
+ @ApiModelProperty(value = "市")
+ private Integer cityId;
+
+ @ApiModelProperty(value = "排序(1:近期排名 2.最近更新)")
+ private Integer sequence;
+
+ @ApiModelProperty(value = "账号id")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "赛事类型(1.本校赛事/2.赛事广场/3.已报名赛事)")
+ private Integer eventType;
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/AllowedParticipateCompetitionReq.java b/competition/src/main/java/com/huoran/competition/entity/req/AllowedParticipateCompetitionReq.java
new file mode 100644
index 0000000..cb7e5ea
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/AllowedParticipateCompetitionReq.java
@@ -0,0 +1,24 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AllowedParticipateCompetitionReq {
+
+ @ApiModelProperty(value = "大赛id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "大赛阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "序号（第几阶段）")
+ private Integer number;
+
+ @ApiModelProperty(value = "账号（无需传值）")
+ private String accountId;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/BatchUploadListCompetitionReq.java b/competition/src/main/java/com/huoran/competition/entity/req/BatchUploadListCompetitionReq.java
new file mode 100644
index 0000000..8c7e9df
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/BatchUploadListCompetitionReq.java
@@ -0,0 +1,24 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+@ApiModel(value = "批量上传分页列表")
+public class BatchUploadListCompetitionReq extends PageReq implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "大赛Id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "阶段Id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "是否为总分排名(1为是 默认0不是)")
+ private Integer isOverallRanking;
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/CompetitionContentReq.java b/competition/src/main/java/com/huoran/competition/entity/req/CompetitionContentReq.java
new file mode 100644
index 0000000..bb0e526
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/CompetitionContentReq.java
@@ -0,0 +1,14 @@
+package com.huoran.competition.entity.req;
+
+import com.huoran.competition.entity.CompetitionContent;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CompetitionContentReq {
+
+ @ApiModelProperty(value = "多个赛事内容", required = true)
+ List competitionContents;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/CompetitionDetailReq.java b/competition/src/main/java/com/huoran/competition/entity/req/CompetitionDetailReq.java
new file mode 100644
index 0000000..4f4b83b
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/CompetitionDetailReq.java
@@ -0,0 +1,21 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @描述：竞赛管理表
+ * @作者: Rong
+ * @日期: 2022-06-16
+ */
+@Data
+@ApiModel(value = "大赛详情请求参数")
+public class CompetitionDetailReq extends PageReq{
+
+ @ApiModelProperty(value = "大赛id")
+ private Integer contestId;
+
+
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/ContestStageFileReq.java b/competition/src/main/java/com/huoran/competition/entity/req/ContestStageFileReq.java
new file mode 100644
index 0000000..1d225c3
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/ContestStageFileReq.java
@@ -0,0 +1,28 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@ApiModel(value = "阶段文件管理")
+public class ContestStageFileReq extends PageReq {
+
+
+ @ApiModelProperty(value = "大赛Id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "选择要导出的文件",required = false)
+ private List ids;
+
+ @ApiModelProperty(value = "关键字")
+ private String keyWord;
+
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/DelCompetitionRankingReq.java b/competition/src/main/java/com/huoran/competition/entity/req/DelCompetitionRankingReq.java
new file mode 100644
index 0000000..81f47a8
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/DelCompetitionRankingReq.java
@@ -0,0 +1,27 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DelCompetitionRankingReq {
+
+
+ @ApiModelProperty(value = "赛事id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "阶段id(集合)")
+ private List stageIds;
+
+ @ApiModelProperty(value = "是否为总分排名(1为是 默认0不是)")
+ private Integer isOverallRanking;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/DetailsOfTotalTeamScoresReq.java b/competition/src/main/java/com/huoran/competition/entity/req/DetailsOfTotalTeamScoresReq.java
new file mode 100644
index 0000000..57658f7
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/DetailsOfTotalTeamScoresReq.java
@@ -0,0 +1,31 @@
+package com.huoran.competition.entity.req;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+
+@Data
+@ApiModel(value = "团队得分详情")
+public class DetailsOfTotalTeamScoresReq {
+
+ @ApiModelProperty(value = "大赛Id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "要查询的阶段id(多个)")
+ private List stageIds;
+
+
+ @JsonIgnore
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/DisableEnableCompetitionReq.java b/competition/src/main/java/com/huoran/competition/entity/req/DisableEnableCompetitionReq.java
new file mode 100644
index 0000000..7d7fa0e
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/DisableEnableCompetitionReq.java
@@ -0,0 +1,25 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @描述：竞赛管理表
+ * @作者: Rong
+ * @日期: 2022-06-16
+ */
+@Data
+@ApiModel(value = "禁用启用赛事所需参数")
+public class DisableEnableCompetitionReq {
+
+ @ApiModelProperty(value = "禁用平台来源(0中台，1职站)",example = "1")
+ private Integer type;
+
+ @ApiModelProperty(value = "禁用的赛事id",example = "1")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "是否开启(默认0启用 1禁用)", example = "0")
+ private Integer isOpen;
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/ExcelImpGradeReq.java b/competition/src/main/java/com/huoran/competition/entity/req/ExcelImpGradeReq.java
new file mode 100644
index 0000000..3bebb7c
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/ExcelImpGradeReq.java
@@ -0,0 +1,51 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+
+@Data
+@ApiModel(value = "批量导入大赛成绩所需")
+public class ExcelImpGradeReq {
+
+ @ApiModelProperty(value = "姓名")
+ @NotNull(message = "姓名不能为空！")
+ private String userName;
+
+
+ @ApiModelProperty(value = "学号")
+ @NotNull(message = "学号不能为空！")
+ private String workNumber;
+
+ @ApiModelProperty(value = "分数")
+ @NotNull(message = "分数不能为空！")
+ private String score;
+
+ @ApiModelProperty(value = "耗时")
+ private String timeSum;
+
+ @ApiModelProperty(value = "学校名称")
+ private String schoolName;
+
+ /**
+ * 耗时:不填默认为0
+ * @return
+ */
+ public String getTimeSum() {
+ if ("".equals(timeSum) || timeSum == null) {
+ return "0";
+ }
+ return timeSum;
+ }
+
+ /*@ApiModelProperty(value = "提交时间(用于区分线下赛事的提交时间)")
+ @NotNull(message = "提交时间不能为空！")
+ private Date submitTime;*/
+
+ @ApiModelProperty(value = "团队名称")
+ private String teamName;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/ExcelImpRankReq.java b/competition/src/main/java/com/huoran/competition/entity/req/ExcelImpRankReq.java
new file mode 100644
index 0000000..bdccb8a
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/ExcelImpRankReq.java
@@ -0,0 +1,46 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+
+@Data
+@ApiModel(value = "批量导入大赛排名所需")
+public class ExcelImpRankReq {
+
+ @ApiModelProperty(value = "团队名称")
+ private String teamName;
+
+
+ @ApiModelProperty(value = "姓名")
+ @NotNull(message = "姓名不能为空！")
+ private String userName;
+
+ @ApiModelProperty(value = "学号")
+ private String workNumber;
+
+ @ApiModelProperty(value = "学校不能为空")
+ @NotNull(message = "学校不能为空！")
+ private String schoolName;
+
+
+ @ApiModelProperty(value = "分数")
+ @NotNull(message = "分数不能为空！")
+ private String score;
+
+ @ApiModelProperty(value = "耗时")
+ private String timeSum;
+
+ public String getTimeSum() {
+ if ("".equals(timeSum) || timeSum == null) {
+ return "0";
+ }
+ return timeSum;
+ }
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/FrontDeskStageRankingReq.java b/competition/src/main/java/com/huoran/competition/entity/req/FrontDeskStageRankingReq.java
new file mode 100644
index 0000000..08e7d32
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/FrontDeskStageRankingReq.java
@@ -0,0 +1,30 @@
+package com.huoran.competition.entity.req;
+
+import com.huoran.competition.entity.CompetitionStage;
+import com.huoran.competition.entity.CompleteCompetitionSetup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "前台阶段排名要求")
+public class FrontDeskStageRankingReq extends PageReq {
+
+
+ @ApiModelProperty(value = "大赛Id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "当前的阶段id")
+ private Integer stageId;
+
+
+ @ApiModelProperty(value = "团队id(逗号隔开)")
+ private String teamIds;
+
+ @ApiModelProperty(value = "完整赛事设置")
+ private CompleteCompetitionSetup competitionSetup;
+
+ @ApiModelProperty(value = "赛事阶段设置表")
+ private CompetitionStage competitionStage;
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/FrontDeskStageTeamScoreDetailsReq.java b/competition/src/main/java/com/huoran/competition/entity/req/FrontDeskStageTeamScoreDetailsReq.java
new file mode 100644
index 0000000..f1c7b8d
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/FrontDeskStageTeamScoreDetailsReq.java
@@ -0,0 +1,40 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "积分赛总排名")
+public class FrontDeskStageTeamScoreDetailsReq extends PageReq{
+
+
+ @ApiModelProperty(value = "大赛Id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "当前的阶段id")
+ private Integer stageId;
+
+
+ @ApiModelProperty(value = "多个阶段id(逗号隔开)")
+ private String stageIds;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+ @ApiModelProperty(value = "是否为总分排名(1为是 默认0不是)")
+ private Integer isOverallRanking;
+
+ @ApiModelProperty(value = "查询成绩详情类型标识，查询类型为1")
+ private Integer type;
+
+ @ApiModelProperty(value = "账号id")
+ private String accountId;
+
+ @ApiModelProperty(value = "赛事类型（0为个人赛，1为团队赛）默认为0",hidden = true)
+ private Integer competitionType;
+/*
+ @ApiModelProperty(value = "要查询的阶段id(多个)")
+ private List stageIds;*/
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/FrontStageCompetitionReq.java b/competition/src/main/java/com/huoran/competition/entity/req/FrontStageCompetitionReq.java
new file mode 100644
index 0000000..ec8b267
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/FrontStageCompetitionReq.java
@@ -0,0 +1,20 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "前台竞赛阶段参数")
+public class FrontStageCompetitionReq {
+
+
+ @ApiModelProperty(value = "大赛Id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/IsParticipantReq.java b/competition/src/main/java/com/huoran/competition/entity/req/IsParticipantReq.java
new file mode 100644
index 0000000..ec693f7
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/IsParticipantReq.java
@@ -0,0 +1,20 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class IsParticipantReq {
+
+ @ApiModelProperty(value = "大赛id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "大赛阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "账号（无需传值）")
+ private String accountId;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/ManualPublishingParameterReq.java b/competition/src/main/java/com/huoran/competition/entity/req/ManualPublishingParameterReq.java
new file mode 100644
index 0000000..c7c64cc
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/ManualPublishingParameterReq.java
@@ -0,0 +1,23 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "手动发布的参数")
+public class ManualPublishingParameterReq extends PageReq{
+
+
+ @ApiModelProperty(value = "大赛Id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "当前的阶段id")
+ private Integer stageId;
+
+
+ @ApiModelProperty(value = "是否为总分排名(1为是 默认0不是)")
+ private Integer isOverallRanking;
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/OverallStandingsInThePointsRaceReq.java b/competition/src/main/java/com/huoran/competition/entity/req/OverallStandingsInThePointsRaceReq.java
new file mode 100644
index 0000000..b37833e
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/OverallStandingsInThePointsRaceReq.java
@@ -0,0 +1,29 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@ApiModel(value = "积分赛总排名")
+public class OverallStandingsInThePointsRaceReq extends PageReq {
+
+
+ @ApiModelProperty(value = "大赛Id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "要查询的阶段id(多个)")
+ private List stageIds;
+
+ @ApiModelProperty(value = "发布类型(0默认发布 1批量手动导入)")
+ private Integer publicationType;
+
+ @ApiModelProperty(value = "当前定位阶段Id")
+ private Integer locationStageId;
+
+
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/PageCompetitionListReq.java b/competition/src/main/java/com/huoran/competition/entity/req/PageCompetitionListReq.java
new file mode 100644
index 0000000..52e02d7
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/PageCompetitionListReq.java
@@ -0,0 +1,56 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @描述：竞赛管理表
+ * @作者: Rong
+ * @日期: 2022-06-16
+ */
+@Data
+@ApiModel(value = "赛事列表分页")
+public class PageCompetitionListReq extends PageReq{
+
+
+
+
+ @ApiModelProperty(value = "关键词(竞赛名称/创建人)",example = "事")
+ private String keyWord;
+
+ @ApiModelProperty(value = "发布状态（0未发布，1已发布）")
+ private Integer publishStatus;
+
+
+ @ApiModelProperty(value = "大赛来源(0中台，1职站)",example = "1")
+ private String platformSource;
+
+ @ApiModelProperty(value = "大赛范围(0:本校内 1:全平台 2.指定区域、院校)",example = "0")
+ private String competitionScope;
+
+
+ @ApiModelProperty(value = "开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ private String endTime;
+
+
+ @ApiModelProperty(value = "省")
+ private Integer provinceId;
+
+
+ @ApiModelProperty(value = "市")
+ private Integer cityId;
+
+
+ @ApiModelProperty(value = "排序(1:近期排名 2.最近更新)")
+ private Integer sequence;
+
+ @ApiModelProperty(value = "账号id")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "是否登录:-1未登录/1已登录")
+ private Integer isLogin;
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/PageGradeListReq.java b/competition/src/main/java/com/huoran/competition/entity/req/PageGradeListReq.java
new file mode 100644
index 0000000..9636025
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/PageGradeListReq.java
@@ -0,0 +1,36 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+
+@Data
+@ApiModel(value = "阶段成绩列表所需参数")
+public class PageGradeListReq extends PageReq {
+
+ @ApiModelProperty(value = "关键字")
+ private String keyWord;
+
+
+ @ApiModelProperty(value = "赛事阶段id")
+ private Integer stageId;
+
+
+ @ApiModelProperty(value = "赛事id")
+ private Integer competitionId;
+
+
+ @ApiModelProperty(value = "reportId或者scoreId")
+ private List ids;
+
+ @ApiModelProperty(value = "是否为中台(0为否 1为是)")
+ private Integer isNakadai;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/PageRegistrationStaffReq.java b/competition/src/main/java/com/huoran/competition/entity/req/PageRegistrationStaffReq.java
new file mode 100644
index 0000000..7be3f28
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/PageRegistrationStaffReq.java
@@ -0,0 +1,35 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @描述：竞赛管理表
+ * @作者: Rong
+ * @日期: 2022-06-16
+ */
+@Data
+@ApiModel(value = "报名人员分页参数列表")
+public class PageRegistrationStaffReq extends PageReq{
+
+ @ApiModelProperty(value = "关键词(学生姓名/手机号)",example = "18818574533")
+ private String keyWord;
+
+ @ApiModelProperty(value = "赛事ID",example = "1485860415656255489")
+ private String competitionId;
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+ @ApiModelProperty(value = "禁用启用0未禁用，1禁用",example = "0")
+ private Integer isDisable;
+
+ @ApiModelProperty(value = "学校排序标识",example = "1正序，2倒序")
+ private Integer schoolOrder;
+
+ @ApiModelProperty(value = "团队排序标识",example = "null")
+ private Integer teamOrder;
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/PageReq.java b/competition/src/main/java/com/huoran/competition/entity/req/PageReq.java
new file mode 100644
index 0000000..91dc953
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/PageReq.java
@@ -0,0 +1,27 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ProjectName: huorantech
+ * @Package: com.huoran.occupationlab.entity.req
+ * @ClassName: PageReq
+ * @Description: 分页
+ * @Author: Maureen.Rong
+ * @CreateDate: 2021/8/12 15:10
+ * @UpdateDate: 2021/8/12 15:10
+ * @Version: 1.0
+ */
+@Data
+public class PageReq {
+
+ @ApiModelProperty(value = "当前页数", name = "pageNum", example = "1", required = true)
+ private Integer pageNum;
+ @ApiModelProperty(value = "当前页需要显示的数量", name = "pageSize", example = "10", required = true)
+ private Integer pageSize;
+
+ @ApiModelProperty(hidden = true)
+ private Integer schoolId;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/StageRankingReq.java b/competition/src/main/java/com/huoran/competition/entity/req/StageRankingReq.java
new file mode 100644
index 0000000..407a13c
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/StageRankingReq.java
@@ -0,0 +1,35 @@
+package com.huoran.competition.entity.req;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class StageRankingReq {
+
+
+ @ApiModelProperty(value = "赛事id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "赛事阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+
+ @ApiModelProperty(value = "多团队id(逗号隔开)")
+ private String teamIds;
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/StageTeamScoreDetailsReq.java b/competition/src/main/java/com/huoran/competition/entity/req/StageTeamScoreDetailsReq.java
new file mode 100644
index 0000000..dc24c6d
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/StageTeamScoreDetailsReq.java
@@ -0,0 +1,35 @@
+package com.huoran.competition.entity.req;
+
+import com.huoran.competition.entity.CompetitionStage;
+import com.huoran.competition.entity.CompleteCompetitionSetup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@ApiModel(value = "积分赛总排名")
+public class StageTeamScoreDetailsReq extends PageReq{
+
+
+ @ApiModelProperty(value = "大赛Id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "当前的阶段id")
+ private Integer stageId;
+
+
+ /*@ApiModelProperty(value = "多个阶段id(逗号隔开)")
+ private String stageIds;*/
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+ @ApiModelProperty(value = "是否为总分排名(1为是 默认0不是)")
+ private Integer isOverallRanking;
+
+ @ApiModelProperty(value = "要查询的阶段id(多个)")
+ private List stageIds;
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/TransferTeamReq.java b/competition/src/main/java/com/huoran/competition/entity/req/TransferTeamReq.java
new file mode 100644
index 0000000..cbd3a18
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/TransferTeamReq.java
@@ -0,0 +1,20 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author chen
+ * @DATE 2022/6/14 18:21
+ * @Version 1.0
+ */
+@Data
+public class TransferTeamReq {
+
+ @ApiModelProperty(value = "队长id")
+ private Integer captainId;
+
+ @ApiModelProperty(value = "队员id")
+ private Integer playerId;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/req/WhetherToPublishParameterReq.java b/competition/src/main/java/com/huoran/competition/entity/req/WhetherToPublishParameterReq.java
new file mode 100644
index 0000000..ff7d5e3
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/req/WhetherToPublishParameterReq.java
@@ -0,0 +1,29 @@
+package com.huoran.competition.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "排名是否发布参数")
+public class WhetherToPublishParameterReq {
+
+
+ @ApiModelProperty(value = "大赛Id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "当前的阶段id")
+ private Integer stageId;
+
+
+ @ApiModelProperty(value = "是否为总分排名(1为是 默认0不是)")
+ private Integer isOverallRanking;
+
+ @ApiModelProperty(value = "是否发布(默认0未发布 1已发布)")
+ private Integer isRelease;
+
+ @ApiModelProperty(value = "发布类型(0默认发布 1批量手动导入)")
+ private Integer publicationType;
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionRangeResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionRangeResp.java
new file mode 100644
index 0000000..04b5634
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionRangeResp.java
@@ -0,0 +1,27 @@
+package com.huoran.competition.entity.resp;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "大赛范围选择")
+public class CompetitionRangeResp {
+
+ @ApiModelProperty(value = "竞赛主键")
+ private String contestId;
+
+ @ApiModelProperty(value = "省")
+ private String provinceName;
+
+ @ApiModelProperty(value = "市")
+ private String cityName;
+
+ @ApiModelProperty(value = "学校id")
+ private String schoolName;
+
+ @ApiModelProperty(value = "范围类型(0为学校 1为地区)")
+ private Integer type;
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionRangeTeamCountResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionRangeTeamCountResp.java
new file mode 100644
index 0000000..6f11f46
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionRangeTeamCountResp.java
@@ -0,0 +1,18 @@
+package com.huoran.competition.entity.resp;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class CompetitionRangeTeamCountResp {
+
+ List scoreList;
+
+
+ List timeSum;
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionRuleResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionRuleResp.java
new file mode 100644
index 0000000..a36d0e3
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionRuleResp.java
@@ -0,0 +1,75 @@
+package com.huoran.competition.entity.resp;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.huoran.competition.entity.CompetitionStage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CompetitionRuleResp {
+
+
+ @ApiModelProperty(value = "主键id")
+ @TableId(value = "rule_id", type = IdType.AUTO)
+ private Integer ruleId;
+
+ @ApiModelProperty(value = "完整赛事设置id（取c_complete_competition_setup表主键）")
+ private Integer setupId;
+
+ @ApiModelProperty(value = "赛制（0为积分赛，1为淘汰赛，2为单项赛）")
+ private Integer rule;
+
+ @ApiModelProperty(value = "阶段数")
+ private Integer stageNum;
+
+ @ApiModelProperty(value = "团队限制参加赛项（0不限制，1限制）默认为0")
+ private Integer teamLimit;
+
+ @ApiModelProperty(value = "成绩计算方式（0：各阶段加权求和，1：各阶段成绩求和，2：各阶段成绩平均值）")
+ private Integer resultCalculationMethod;
+
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+
+ @ApiModelProperty(value = "阶段名称")
+ private String stageName;
+
+ @ApiModelProperty(value = "序号（第几阶段）")
+ private Integer number;
+
+ @ApiModelProperty(value = "比赛方式（0实操，1理论，2线下）默认为0")
+ private Integer method;
+
+ @ApiModelProperty(value = "权重（积分赛，所有阶段权和为1）")
+ private Double pointWeight;
+
+ @ApiModelProperty(value = "排名晋级人数限制（淘汰赛）")
+ private String peopleLimit;
+
+ @ApiModelProperty(value = "排名晋级百分比限制（淘汰赛）")
+ private Double percentageLimit;
+
+ @ApiModelProperty(value = "排名晋级分数限制（淘汰赛）")
+ private String scoreLimit;
+
+ @ApiModelProperty(value = "成绩公布时间")
+ private Double resultAnnouncementTime;
+
+ @ApiModelProperty(value = "赛事id(c_competition表主键)")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "团队成绩计算方式（0：最高分，1：平均分，2：总分）")
+ private String teamCalculationMethod;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionStageFileResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionStageFileResp.java
new file mode 100644
index 0000000..2bfcb6f
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/CompetitionStageFileResp.java
@@ -0,0 +1,84 @@
+package com.huoran.competition.entity.resp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 赛事阶段文件
+ *
+ *
+ * @author cheney
+ * @since 2023-11-13
+ */
+@Data
+@ApiModel(value = "CompetitionStageFile对象", description = "赛事阶段文件列标")
+public class CompetitionStageFileResp implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "赛事id")
+ private Integer competitionId;
+
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+ @ApiModelProperty(value = "账号id")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "学校id")
+ private Integer schoolId;
+
+ @ApiModelProperty(value = "文件名")
+ private String fileName;
+
+ @ApiModelProperty(value = "文件大小")
+ private String fileSize;
+
+ @ApiModelProperty(value = "文件格式")
+ private String fileFormat;
+
+ @ApiModelProperty(value = "oss文件名")
+ private String ossFileName;
+
+ @ApiModelProperty(value = "文件路径")
+ private String filePath;
+
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "团队名称")
+ private String teamName;
+
+ @ApiModelProperty(value = "学生名称")
+ private String userName;
+
+ @ApiModelProperty(value = "学号")
+ private String workNumber;
+
+
+
+ @ApiModelProperty(value = "队长")
+ private String captain;
+
+
+ @ApiModelProperty(value = "学校")
+ private String schoolName;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/DetailsOfTotalTeamScoresResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/DetailsOfTotalTeamScoresResp.java
new file mode 100644
index 0000000..70c93bf
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/DetailsOfTotalTeamScoresResp.java
@@ -0,0 +1,51 @@
+package com.huoran.competition.entity.resp;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 赛事排名表
+ *
+ *
+ * @author cheney
+ * @since 2023-01-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DetailsOfTotalTeamScoresResp {
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "阶段名称")
+ private String stageName;
+
+ @ApiModelProperty(value = "权重（积分赛，所有阶段权和为1）")
+ private Double pointWeight;
+
+ @ApiModelProperty(value = "团队成绩计算方式（0：最高分，1：平均分，2：总分）")
+ private String teamCalculationMethod;
+
+ @ApiModelProperty(value = "团队成绩分数")
+ private Double teamScore;
+
+
+ @ApiModelProperty(value = "赛事规则")
+ private CompetitionRuleResp competitionRules;
+
+
+ @ApiModelProperty(value = "本阶段参赛的团队信息")
+ private List stageTeamInformation;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/FractionalSegmentResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/FractionalSegmentResp.java
new file mode 100644
index 0000000..51a8920
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/FractionalSegmentResp.java
@@ -0,0 +1,48 @@
+package com.huoran.competition.entity.resp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+@Data
+public class FractionalSegmentResp {
+
+
+ @ApiModelProperty(value = "0-10")
+ private Integer num1;
+
+ @ApiModelProperty(value = "11-20")
+ private Integer num2;
+
+ @ApiModelProperty(value = "21-30")
+ private Integer num3;
+
+ @ApiModelProperty(value = "31-40")
+ private Integer num4;
+
+ @ApiModelProperty(value = "41-50")
+ private Integer num5;
+
+ @ApiModelProperty(value = "51-60")
+ private Integer num6;
+
+ @ApiModelProperty(value = "61-70")
+ private Integer num7;
+
+ @ApiModelProperty(value = "71-80")
+ private Integer num8;
+
+ @ApiModelProperty(value = "81-90")
+ private Integer num9;
+
+ @ApiModelProperty(value = "91-100")
+ private Integer num10;
+
+ @ApiModelProperty(value = "实验人数")
+ private Integer totalNumber;
+
+ @ApiModelProperty(value = "平均分")
+ private double avgScore;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/FrontStageCompetitionResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/FrontStageCompetitionResp.java
new file mode 100644
index 0000000..c37b455
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/FrontStageCompetitionResp.java
@@ -0,0 +1,51 @@
+package com.huoran.competition.entity.resp;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.huoran.competition.entity.CompetitionContent;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * 赛事阶段设置表
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "前台竞赛阶段", description = "前台竞赛阶段")
+public class FrontStageCompetitionResp {
+
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "stage_id", type = IdType.AUTO)
+ private Integer stageId;
+
+
+ @ApiModelProperty(value = "阶段名称")
+ private String stageName;
+
+ @ApiModelProperty(value = "序号（第几阶段）")
+ private Integer number;
+
+ @ApiModelProperty(value = "比赛方式（0实操，1理论，2线下）默认为0")
+ private Integer method;
+
+ @ApiModelProperty(value = "权重（积分赛，所有阶段权和为1）")
+ private Double pointWeight;
+
+
+ @ApiModelProperty(value = "团队成绩计算方式（0：最高分，1：平均分，2：总分）")
+ private String teamCalculationMethod;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/ListOfStageResultsResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/ListOfStageResultsResp.java
new file mode 100644
index 0000000..7baae2e
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/ListOfStageResultsResp.java
@@ -0,0 +1,101 @@
+package com.huoran.competition.entity.resp;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+@ApiModel(value = "阶段成绩列表返回值")
+public class ListOfStageResultsResp implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "排名表主键id")
+ private Integer id;
+
+ @ApiModelProperty(value = "序号")
+ private Integer serialNumber;
+
+ @ApiModelProperty(value = "分数表id")
+ private Integer scoreId;
+
+ @ApiModelProperty(value = "分数")
+ private String score;
+
+
+ @ApiModelProperty(value = "团队名称")
+ private String teamName;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+
+ @ApiModelProperty(value = "学校id")
+ private Integer schoolId;
+
+
+ @ApiModelProperty("耗时")
+ private String timeSum;
+
+ @ApiModelProperty(value = "帐户Id")
+ private String accountId;
+
+ @ApiModelProperty(value = "学号")
+ private String workNumber;
+
+ @ApiModelProperty(value = "提交时间")
+ private String submitTime;
+
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "阶段名称")
+ private String stageName;
+
+ @ApiModelProperty(value = "用户名")
+ private String userName;
+
+ @ApiModelProperty(value = "学校名称")
+ private String schoolName;
+
+ @ApiModelProperty(value = "队长")
+ private String leaderName;
+
+ @ApiModelProperty(value = "实验报告id(删除传)")
+ private Integer reportId;
+
+ @ApiModelProperty(value = "平均分", hidden = true)
+ @JsonIgnore
+ private String avgScore;
+
+ @ApiModelProperty(value = "总分", hidden = true)
+ @JsonIgnore
+ private String sumScore;
+
+ @ApiModelProperty(value = "最高分", hidden = true)
+ @JsonIgnore
+ private String maxScore;
+
+ @ApiModelProperty(value = "序号（第几阶段）")
+ private Integer number;
+
+ @ApiModelProperty(value = "成绩计算方式（0：各阶段加权求和，1：各阶段成绩求和，2：各阶段成绩平均值）")
+ private Integer resultCalculationMethod;
+
+ @ApiModelProperty(value = "权重（积分赛，所有阶段权和为1）")
+ private Double pointWeight;
+
+ @ApiModelProperty(value = "是否发布(默认0未发布 1已发布)")
+ private Integer isRelease;
+
+ @ApiModelProperty(value = "发布类型(0默认发布 1批量手动导入)")
+ private Integer publicationType;
+
+ @ApiModelProperty(value = "是否考试(0未考 1已考)")
+ private Integer testOrNot;
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/OverallEventRankingResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/OverallEventRankingResp.java
new file mode 100644
index 0000000..5404d1e
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/OverallEventRankingResp.java
@@ -0,0 +1,29 @@
+package com.huoran.competition.entity.resp;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@ApiModel(value = "赛事总分排名")
+public class OverallEventRankingResp {
+
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "阶段名称")
+ private String stageName;
+
+ @ApiModelProperty(value = "权重（积分赛，所有阶段权和为1）")
+ private Double pointWeight;
+
+ /* @ApiModelProperty(value = "赛事类型（0为个人赛，1为团队赛）默认为0")
+ private Integer competitionType;*/
+
+
+ @ApiModelProperty(value = "本阶段参赛的团队信息(已经依据当前阶段成绩计算方式计算后的)")
+ private List stageTeamInformation;
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/OverallRankingResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/OverallRankingResp.java
new file mode 100644
index 0000000..2cae10f
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/OverallRankingResp.java
@@ -0,0 +1,26 @@
+package com.huoran.competition.entity.resp;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@ApiModel(value = "总排名")
+public class OverallRankingResp {
+
+
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+ @ApiModelProperty(value = "分数")
+ private String score;
+
+
+ private List overallRankingRespList;
+
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/SchoolResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/SchoolResp.java
new file mode 100644
index 0000000..ed5e303
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/SchoolResp.java
@@ -0,0 +1,9 @@
+package com.huoran.competition.entity.resp;
+
+import lombok.Data;
+
+@Data
+public class SchoolResp {
+ private String schoolId;
+ private String schoolName;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/ScoreReportResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/ScoreReportResp.java
new file mode 100644
index 0000000..56720a0
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/ScoreReportResp.java
@@ -0,0 +1,9 @@
+package com.huoran.competition.entity.resp;
+
+import lombok.Data;
+
+@Data
+public class ScoreReportResp {
+ private Integer score;
+ private Integer reportId;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/StageRankingResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/StageRankingResp.java
new file mode 100644
index 0000000..4a1827e
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/StageRankingResp.java
@@ -0,0 +1,39 @@
+package com.huoran.competition.entity.resp;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "阶段赛排名")
+public class StageRankingResp {
+
+ @ApiModelProperty(value = "排名")
+ private Integer ranking;
+
+
+ @ApiModelProperty(value = "团队名称")
+ private String teamName;
+
+
+ @ApiModelProperty(value = "队长")
+ private String captain;
+
+
+ @ApiModelProperty(value = "学校")
+ private String schoolName;
+
+
+ @ApiModelProperty(value = "耗时(用于区分线下赛事的耗时)")
+ private String timeSum;
+
+
+ @ApiModelProperty(value = "分数")
+ private String score;
+
+
+ @ApiModelProperty(value = "实验报告Id")
+ private Integer reportId;
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/TeamAndLeaderResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/TeamAndLeaderResp.java
new file mode 100644
index 0000000..66fc8c5
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/TeamAndLeaderResp.java
@@ -0,0 +1,35 @@
+package com.huoran.competition.entity.resp;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class TeamAndLeaderResp {
+
+
+ @ApiModelProperty(value = "团队Id")
+ private Integer teamId;
+
+ @ApiModelProperty(value = "团队名称")
+ private String teamName;
+
+
+ @ApiModelProperty(value = "队长")
+ private String teamLeader;
+
+
+ @ApiModelProperty(value = "赛事主键(c_competition表主键)")
+ private Integer competitionId;
+
+
+ @ApiModelProperty(value = "大赛名称")
+ private String competitionName;
+
+ @ApiModelProperty(value = "学校")
+ private String schoolName;
+
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/TimeConsumingCalculationResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/TimeConsumingCalculationResp.java
new file mode 100644
index 0000000..b1b18e5
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/TimeConsumingCalculationResp.java
@@ -0,0 +1,28 @@
+package com.huoran.competition.entity.resp;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+@ApiModel(value = "耗时计算")
+public class TimeConsumingCalculationResp {
+
+
+ @ApiModelProperty(value = "平均耗时", hidden = true)
+ @JsonIgnore
+ private String averageTimeConsuming;
+
+ @ApiModelProperty(value = "总耗时", hidden = true)
+ @JsonIgnore
+ private String totalTimeSpent;
+
+ @ApiModelProperty(value = "最多耗时", hidden = true)
+ @JsonIgnore
+ private String maximumTimeConsuming;
+
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/TotalRankingScoreDetailsResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/TotalRankingScoreDetailsResp.java
new file mode 100644
index 0000000..0cc698a
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/TotalRankingScoreDetailsResp.java
@@ -0,0 +1,44 @@
+package com.huoran.competition.entity.resp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ *
+ * 赛事排名表
+ *
+ *
+ * @author cheney
+ * @since 2023-01-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TotalRankingScoreDetailsResp {
+
+ @ApiModelProperty(value = "阶段id")
+ private Integer stageId;
+
+ @ApiModelProperty(value = "阶段名称")
+ private String stageName;
+
+ @ApiModelProperty(value = "权重（积分赛，所有阶段权和为1）")
+ private Double pointWeight;
+
+ @ApiModelProperty(value = "团队成绩计算方式（0：最高分，1：平均分，2：总分）")
+ private String teamCalculationMethod;
+
+
+ @ApiModelProperty(value = "赛事规则")
+ private CompetitionRuleResp competitionRules;
+
+
+ @ApiModelProperty(value = "本阶段参赛的团队信息")
+ private List stageTeamInformation;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/resp/UserAccountResp.java b/competition/src/main/java/com/huoran/competition/entity/resp/UserAccountResp.java
new file mode 100644
index 0000000..e69b744
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/resp/UserAccountResp.java
@@ -0,0 +1,81 @@
+package com.huoran.competition.entity.resp;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @描述：各个平台账号表
+ * @作者: Rong
+ * @日期: 2021-08-25
+ */
+@Data
+@ApiModel(value = "各个平台账号表")
+@TableName("hr_user_account")
+public class UserAccountResp implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(type = IdType.AUTO)
+ @ApiModelProperty(value = "主键id(平台用户id）")
+ private Integer id;
+
+ @ApiModelProperty(value = "用户表id")
+ private Integer userId;
+
+ @ApiModelProperty(value = "客户表id")
+ private Integer customerId;
+
+ @ApiModelProperty(value = "账号")
+ private String account;
+
+ @ApiModelProperty("手机号（平台唯一标识）")
+ private String phone;
+
+ @ApiModelProperty(value = "密码")
+ private String password;
+
+ @ApiModelProperty(value = "工号")
+ private String workNumber;
+
+ @ApiModelProperty(value = "绑定的角色id(0为数据平台普通用户)")
+ private String roleId;
+
+ @ApiModelProperty(value = "绑定院校id")
+ private Integer schoolId;
+
+ @ApiModelProperty(value = "所属平台id")
+ private String platformId;
+
+ @ApiModelProperty(value = "平台（系统）绑定时间")
+ private Date platformBindTime;
+
+ @ApiModelProperty(value = "平台端区分：0->教师端 1->学生端 2->无端")
+ private Integer type;
+
+ @ApiModelProperty(value = "是否删除(0、未删除 1、已删除)")
+ private Integer isDel;
+
+ @ApiModelProperty(value = "是否禁用（0->禁用，1->启用）")
+ private Boolean isEnable;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "班级id")
+ @TableField(exist = false)
+ private String classId;
+
+ @ApiModelProperty(value = "班级id")
+ @TableField(exist = false)
+ private String userName;
+}
\ No newline at end of file
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/CompetitionDetailsVO.java b/competition/src/main/java/com/huoran/competition/entity/vo/CompetitionDetailsVO.java
new file mode 100644
index 0000000..4d182e7
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/CompetitionDetailsVO.java
@@ -0,0 +1,54 @@
+package com.huoran.competition.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.huoran.competition.entity.resp.CompetitionRangeResp;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+@Data
+public class CompetitionDetailsVO {
+
+
+ @ApiModelProperty(value = "大赛id")
+ private Integer contestId;
+
+ @ApiModelProperty(value = "大赛名称")
+ private String contestName;
+
+ @ApiModelProperty(value = "比赛形式（0为个人赛，1为团队赛）默认为0")
+ private Integer competitionType;
+
+ @ApiModelProperty(value = "赛制（0为积分赛，1为淘汰赛，2为单项赛）")
+ private Integer rule;
+
+ @ApiModelProperty(value = "阶段数")
+ private Integer stageNum;
+
+ @ApiModelProperty(value = "赛事开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "赛事结束时间")
+ private String endTime;
+
+ @ApiModelProperty(value = "比赛方式（0实操，1理论，2线下）默认为0")
+ private Integer method;
+
+
+ @ApiModelProperty(value = "序号（第几阶段)")
+ private Integer number;
+
+ @ApiModelProperty(value = "阶段名称")
+ private String stageName;
+
+ @ApiModelProperty(value = "阶段Id")
+ private Integer stageId;
+
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/CompetitionVO.java b/competition/src/main/java/com/huoran/competition/entity/vo/CompetitionVO.java
new file mode 100644
index 0000000..5b8001f
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/CompetitionVO.java
@@ -0,0 +1,145 @@
+package com.huoran.competition.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.huoran.competition.entity.CompetitionContent;
+import com.huoran.competition.entity.CompetitionStage;
+import com.huoran.competition.entity.CompleteCompetitionSetup;
+import com.huoran.competition.entity.resp.CompetitionRangeResp;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author chen
+ * @DATE 2020/10/16 17:13
+ * @Version 1.0
+ */
+@Data
+public class CompetitionVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "竞赛名称")
+ private String competitionName;
+
+ @ApiModelProperty(value = "创建人")
+ private String founderName;
+
+ @ApiModelProperty(value = "大赛范围(0:本校内 1:全平台 2:指定区域、院校)", example = "0")
+ private Integer competitionScope;
+
+ @ApiModelProperty(value = "平台来源(0:中台，1：职站)", example = "0")
+ private Integer platformSource;
+
+ @ApiModelProperty(value = "发布状态（0未发布，1已发布）")
+ private Integer publishStatus;
+
+ @ApiModelProperty(value = "中台是否开启(0开启 1未开启 默认0)", example = "0")
+ private Integer ztOpen;
+
+ @ApiModelProperty(value = "是否开启(0开启 1未开启 默认0)", example = "0")
+ private Integer isOpen;
+
+ @ApiModelProperty(value = "报名人数")
+ private String applicantNum;
+
+ @ApiModelProperty(value = "竞赛开始时间")
+ private Date playStartTime;
+
+ @ApiModelProperty(value = "竞赛结束时间")
+ private Date playEndTime;
+
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "比赛范围")
+ private String range;
+
+ @ApiModelProperty(value = "比赛范围(省市学校集合)")
+ private List contestRangeRespList;
+
+ @ApiModelProperty(value = "比赛阶段")
+ private List competitionStageList;
+
+ @ApiModelProperty(value = "比赛内容")
+ private List contentList;
+
+ @ApiModelProperty(value = "赛事设置")
+ private CompleteCompetitionSetup setup;
+
+ @ApiModelProperty(value = "主办方", example = "或然科技")
+ private String sponsor;
+
+ @ApiModelProperty(value = "承办方", example = "或然科技")
+ private String undertaker;
+
+ @ApiModelProperty(value = "竞赛描述", example = "或然科技赛事")
+ private String description;
+
+ @ApiModelProperty(value = "报名开始时间", example = "2021-09-10 16:24:24")
+ private Date signUpStartTime;
+
+ @ApiModelProperty(value = "报名结束时间", example = "2021-09-20 16:24:24")
+ private Date signUpEndTime;
+
+ @ApiModelProperty(value = "创建人Id", example = "1")
+ private String founderId;
+
+ @ApiModelProperty(value = "竞赛名称", example = "数据库数据库色即是空")
+ private String name;
+
+ @ApiModelProperty(value = "竞赛封面图", example = "http://localhost:9400/occupationlab/doc.html")
+ private String coverUrl;
+
+ @ApiModelProperty(value = "竞赛轮播图", example = "http://localhost:9400/occupationlab/doc.html")
+ private String carouselUrl;
+
+ @ApiModelProperty(value = "更新时间")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "学校id", example = "0")
+ private Integer schoolId;
+
+ @ApiModelProperty(value = "是否报名(0为已报名 1为未报名)", example = "0")
+ private Integer whetherToSignUp;
+
+ @ApiModelProperty(value = "是否禁用，0不禁用，1禁止点击")
+ private Integer isDisable;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+ @ApiModelProperty(value = "赛事赛制")
+ private Integer rule;
+
+ @ApiModelProperty(value = "赛事规则id")
+ private Integer ruleId;
+
+ @ApiModelProperty(value = "报名时间")
+ private Date registrationTime;
+
+ @ApiModelProperty(value = "发布类型（0发布信息，1完整比赛）默认为0")
+ private Integer releaseType;
+
+ @ApiModelProperty(value = "赛事类型（0为个人赛，1为团队赛）默认为0")
+ private Integer competitionType;
+
+ @ApiModelProperty(value = "邀请码")
+ private Integer invitationCode;
+
+ @ApiModelProperty(value = "是否需要邀请码（0不需要，1需要）默认为0")
+ private Integer isNeedCode;
+
+ @ApiModelProperty(value = "指定区域名称")
+ private String locations;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/ExcelData.java b/competition/src/main/java/com/huoran/competition/entity/vo/ExcelData.java
new file mode 100644
index 0000000..de568fc
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/ExcelData.java
@@ -0,0 +1,45 @@
+package com.huoran.competition.entity.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author chen
+ * @DATE 2020/10/19 15:34
+ * @Version 1.0
+ */
+@Data
+public class ExcelData {
+
+ @ApiModelProperty(value = "序号")
+ @Excel(name = "序号", orderNum = "1", isImportField = "rownum", width = 30)
+ private Integer rownum;
+
+ @ApiModelProperty(value = "学校")
+ @Excel(name = "学校", orderNum = "2", mergeVertical = true, isImportField = "school", width = 30)
+ private String school;
+
+ @ApiModelProperty(value = "学生姓名")
+ @Excel(name = "学生姓名", orderNum = "3", mergeVertical = true, isImportField = "username", width = 30)
+ private String username;
+
+
+ @ApiModelProperty(value = "手机号")
+ @Excel(name = "手机号", orderNum = "4", mergeVertical = true, isImportField = "phone", width = 30)
+ private String phone;
+
+
+ @ApiModelProperty(value = "学号")
+ @Excel(name = "学号", orderNum = "5", mergeVertical = true, isImportField = "workNumber", width = 30)
+ private String workNumber;
+
+
+ @ApiModelProperty(value = "报名时间")
+ @Excel(name = "报名时间", orderNum = "6", mergeVertical = true, isImportField = "createTime", width = 30)
+ private String createTime;
+
+ @ApiModelProperty(value = "团队名称")
+ @Excel(name = "团队名称", orderNum = "7", mergeVertical = true, isImportField = "teamName", width = 30)
+ private String teamName;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/GradeExportVO.java b/competition/src/main/java/com/huoran/competition/entity/vo/GradeExportVO.java
new file mode 100644
index 0000000..b80f718
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/GradeExportVO.java
@@ -0,0 +1,46 @@
+package com.huoran.competition.entity.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class GradeExportVO {
+
+ @ApiModelProperty(value = "序号")
+ @Excel(name = "序号", orderNum = "1", isImportField = "serialNumber", width = 30)
+ private Integer serialNumber;
+
+
+ @ApiModelProperty(value = "学校名称")
+ @Excel(name = "学校名称", orderNum = "2", mergeVertical = true, isImportField = "schoolName", width = 30)
+ private String schoolName;
+
+ @ApiModelProperty(value = "团队名称")
+ @Excel(name = "团队名称", orderNum = "3", mergeVertical = true, isImportField = "teamName", width = 30, isColumnHidden = false)
+ private String teamName;
+
+
+ @ApiModelProperty(value = "学生姓名")
+ @Excel(name = "学生姓名", orderNum = "4", mergeVertical = true, isImportField = "userName", width = 30)
+ private String userName;
+
+
+ @ApiModelProperty(value = "学号")
+ @Excel(name = "学号", orderNum = "5", mergeVertical = true, isImportField = "workNumber", width = 30)
+ private String workNumber;
+
+ @ApiModelProperty(value = "分数")
+ @Excel(name = "分数", orderNum = "6", mergeVertical = false, isImportField = "score", width = 30)
+ private String score;
+
+ @ApiModelProperty("耗时")
+ @Excel(name = "耗时", orderNum = "7", mergeVertical = false, isImportField = "timeSum", width = 30)
+ private String timeSum;
+
+
+ @ApiModelProperty(value = "提交时间")
+ @Excel(name = "提交时间", orderNum = "8", mergeVertical = false, isImportField = "submitTime", width = 30)
+ private String submitTime;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/ImportCompetitionGradeFailureVO.java b/competition/src/main/java/com/huoran/competition/entity/vo/ImportCompetitionGradeFailureVO.java
new file mode 100644
index 0000000..9f41372
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/ImportCompetitionGradeFailureVO.java
@@ -0,0 +1,54 @@
+package com.huoran.competition.entity.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
+import com.huoran.competition.utils.poi.ExcelAttribute;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@ToString
+@Accessors(chain = true)
+@ExcelTarget("ImportCompetitionGradeFailureVo")
+public class ImportCompetitionGradeFailureVO {
+
+ //第几行
+ private Long index;
+
+ @Excel(name = "团队", orderNum = "1", isImportField = "teamName", width = 30)
+ @ApiModelProperty(value = "团队")
+ private String teamName;
+
+ @ApiModelProperty(value = "学生姓名")
+ @Excel(name = "学生姓名", orderNum = "2", isImportField = "userName", width = 30)
+ private String userName;
+
+
+ @ApiModelProperty(value = "学号")
+ @Excel(name = "学号", orderNum = "3", isImportField = "workNumber", width = 30)
+ private String workNumber;
+
+
+ @ApiModelProperty(value = "分数")
+ @Excel(name = "分数", orderNum = "4", isImportField = "score", width = 30)
+ private String score;
+
+
+ @ApiModelProperty(value = "耗时")
+ @Excel(name = "耗时", orderNum = "5", isImportField = "timeSum", width = 30)
+ private String timeSum;
+
+
+ /*@ApiModelProperty(value = "提交时间")
+ @Excel(name = "提交时间", orderNum = "6", isImportField = "submitTime", width = 30)
+ private String submitTime;*/
+ @ApiModelProperty(value = "耗时")
+ @Excel(name = "学校名", orderNum = "7", isImportField = "schoolName", width = 30)
+ private String schoolName;
+
+ @ExcelAttribute(sort = 8)
+ @Excel(name = "失败原因", orderNum = "8", isImportField = "failureMsg", width = 50)
+ private String failureMsg;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/ImportCompetitionRankingFailureVO.java b/competition/src/main/java/com/huoran/competition/entity/vo/ImportCompetitionRankingFailureVO.java
new file mode 100644
index 0000000..be9af75
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/ImportCompetitionRankingFailureVO.java
@@ -0,0 +1,45 @@
+package com.huoran.competition.entity.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
+import com.huoran.competition.utils.poi.ExcelAttribute;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@ToString
+@Accessors(chain = true)
+@ExcelTarget("ImportCompetitionRankingFailureVO")
+public class ImportCompetitionRankingFailureVO {
+
+ //第几行
+ private Long index;
+
+ @Excel(name = "团队", orderNum = "1", isImportField = "teamName", width = 30)
+ @ApiModelProperty(value = "团队")
+ private String teamName;
+
+ @ApiModelProperty(value = "队长姓名")
+ @Excel(name = "队长姓名", orderNum = "2", isImportField = "teamLeader", width = 30)
+ private String teamLeader;
+
+ @ApiModelProperty(value = "学校名称")
+ @Excel(name = "学校名称", orderNum = "3", isImportField = "schoolName", width = 30)
+ private String schoolName;
+
+
+
+ @ApiModelProperty(value = "耗时")
+ @Excel(name = "耗时", orderNum = "4", isImportField = "timeSum", width = 30)
+ private String timeSum;
+
+ @ApiModelProperty(value = "分数")
+ @Excel(name = "分数", orderNum = "5", isImportField = "score", width = 30)
+ private String score;
+
+ @ExcelAttribute(sort = 8)
+ @Excel(name = "失败原因", orderNum = "6", isImportField = "failureMsg", width = 50)
+ private String failureMsg;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/ImportIndividualRankingFailureVO.java b/competition/src/main/java/com/huoran/competition/entity/vo/ImportIndividualRankingFailureVO.java
new file mode 100644
index 0000000..727dc0c
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/ImportIndividualRankingFailureVO.java
@@ -0,0 +1,46 @@
+package com.huoran.competition.entity.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelTarget;
+import com.huoran.competition.utils.poi.ExcelAttribute;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@ToString
+@Accessors(chain = true)
+@ExcelTarget("ImportIndividualRankingFailureVO")
+public class ImportIndividualRankingFailureVO {
+
+ //第几行
+ private Long index;
+
+
+ @ApiModelProperty(value = "学生姓名")
+ @Excel(name = "学生姓名", orderNum = "1", isImportField = "userName", width = 30)
+ private String userName;
+
+
+
+ @ApiModelProperty(value = "学号")
+ @Excel(name = "学号", orderNum = "2", isImportField = "workNumber", width = 30)
+ private String workNumber;
+
+ @ApiModelProperty(value = "学校名称")
+ @Excel(name = "学校名称", orderNum = "3", isImportField = "schoolName", width = 30)
+ private String schoolName;
+
+ @ApiModelProperty(value = "耗时")
+ @Excel(name = "耗时", orderNum = "4", isImportField = "timeSum", width = 30)
+ private String timeSum;
+
+ @ApiModelProperty(value = "分数")
+ @Excel(name = "分数", orderNum = "5", isImportField = "score", width = 30)
+ private String score;
+
+ @ExcelAttribute(sort = 8)
+ @Excel(name = "失败原因", orderNum = "6", isImportField = "failureMsg", width = 50)
+ private String failureMsg;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/PersonageRankingExportVO.java b/competition/src/main/java/com/huoran/competition/entity/vo/PersonageRankingExportVO.java
new file mode 100644
index 0000000..a269da0
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/PersonageRankingExportVO.java
@@ -0,0 +1,34 @@
+package com.huoran.competition.entity.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PersonageRankingExportVO {
+
+ @ApiModelProperty(value = "序号")
+ @Excel(name = "序号", orderNum = "1", isImportField = "serialNumber", width = 30)
+ private Integer serialNumber;
+
+ @ApiModelProperty(value = "学生姓名")
+ @Excel(name = "学生姓名", orderNum = "2", isImportField = "userName", width = 30)
+ private String userName;
+
+
+
+ @ApiModelProperty(value = "学校名称")
+ @Excel(name = "学校名称", orderNum = "3", isImportField = "schoolName", width = 30)
+ private String schoolName;
+
+
+ @ApiModelProperty("耗时")
+ @Excel(name = "耗时", orderNum = "4", isImportField = "timeSum", width = 30)
+ private String timeSum;
+
+ @ApiModelProperty(value = "分数")
+ @Excel(name = "分数", orderNum = "5", isImportField = "score", width = 30)
+ private String score;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/PersonalDetailVO.java b/competition/src/main/java/com/huoran/competition/entity/vo/PersonalDetailVO.java
new file mode 100644
index 0000000..82ed72a
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/PersonalDetailVO.java
@@ -0,0 +1,20 @@
+package com.huoran.competition.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PersonalDetailVO {
+
+ @ApiModelProperty(value = "用户名称")
+ private String userName;
+
+ @ApiModelProperty(value = "学号")
+ private String workNumber;
+
+ @ApiModelProperty(value = "学校id")
+ private Integer schoolId;
+
+ @ApiModelProperty(value = "学校名称")
+ private String schoolName;
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/PersonalExcelData.java b/competition/src/main/java/com/huoran/competition/entity/vo/PersonalExcelData.java
new file mode 100644
index 0000000..2836cce
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/PersonalExcelData.java
@@ -0,0 +1,37 @@
+package com.huoran.competition.entity.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PersonalExcelData {
+
+ @ApiModelProperty(value = "序号")
+ @Excel(name = "序号", orderNum = "1", isImportField = "rownum", width = 30)
+ private Integer rownum;
+
+ @ApiModelProperty(value = "学校")
+ @Excel(name = "学校", orderNum = "2", mergeVertical = true, isImportField = "school", width = 30)
+ private String school;
+
+ @ApiModelProperty(value = "学生姓名")
+ @Excel(name = "学生姓名", orderNum = "3", mergeVertical = true, isImportField = "username", width = 30)
+ private String username;
+
+
+ @ApiModelProperty(value = "手机号")
+ @Excel(name = "手机号", orderNum = "4", mergeVertical = true, isImportField = "phone", width = 30)
+ private String phone;
+
+
+ @ApiModelProperty(value = "学号")
+ @Excel(name = "学号", orderNum = "5", mergeVertical = true, isImportField = "workNumber", width = 30)
+ private String workNumber;
+
+
+ @ApiModelProperty(value = "报名时间")
+ @Excel(name = "报名时间", orderNum = "6", mergeVertical = true, isImportField = "createTime", width = 30)
+ private String createTime;
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/RankingExportVO.java b/competition/src/main/java/com/huoran/competition/entity/vo/RankingExportVO.java
new file mode 100644
index 0000000..1650038
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/RankingExportVO.java
@@ -0,0 +1,41 @@
+package com.huoran.competition.entity.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RankingExportVO {
+
+ @ApiModelProperty(value = "序号")
+ @Excel(name = "序号", orderNum = "1", isImportField = "serialNumber", width = 30)
+ private Integer serialNumber;
+
+ @ApiModelProperty(value = "学生姓名")
+ @Excel(name = "学生姓名", orderNum = "2", isImportField = "userName", width = 30)
+ private String userName;
+
+ @ApiModelProperty(value = "团队名称")
+ @Excel(name = "团队名称", orderNum = "3", isImportField = "teamName", width = 30, isColumnHidden = false)
+ private String teamName;
+
+
+ @ApiModelProperty(value = "队长")
+ @Excel(name = "队长", orderNum = "4", isImportField = "leaderName", width = 30)
+ private String leaderName;
+
+ @ApiModelProperty(value = "学校名称")
+ @Excel(name = "学校名称", orderNum = "5", isImportField = "schoolName", width = 30)
+ private String schoolName;
+
+
+ @ApiModelProperty("耗时")
+ @Excel(name = "耗时", orderNum = "6", isImportField = "timeSum", width = 30)
+ private String timeSum;
+
+ @ApiModelProperty(value = "分数")
+ @Excel(name = "分数", orderNum = "7", isImportField = "score", width = 30)
+ private String score;
+
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/entity/vo/RegistrationVO.java b/competition/src/main/java/com/huoran/competition/entity/vo/RegistrationVO.java
new file mode 100644
index 0000000..205e08e
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/entity/vo/RegistrationVO.java
@@ -0,0 +1,66 @@
+package com.huoran.competition.entity.vo;
+
+import ch.qos.logback.core.rolling.helper.IntegerTokenConverter;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RegistrationVO {
+
+ @ApiModelProperty(value = "序号")
+ @Excel(name = "序号", orderNum = "1", isImportField = "id", width = 30)
+ private Integer rownum;
+
+
+ @ApiModelProperty(value = "学校")
+ @Excel(name = "学校", orderNum = "2", mergeVertical = true, isImportField = "school", width = 30)
+ private String school;
+
+ @ApiModelProperty(value = "学生姓名")
+ @Excel(name = "学生姓名", orderNum = "3", mergeVertical = true, isImportField = "username", width = 30)
+ private String username;
+
+
+ @ApiModelProperty(value = "手机号")
+ @Excel(name = "手机号", orderNum = "4", mergeVertical = true, isImportField = "phone", width = 30)
+ private String phone;
+
+
+ @ApiModelProperty(value = "学号")
+ @Excel(name = "学号", orderNum = "5", mergeVertical = true, isImportField = "workNumber", width = 30)
+ private String workNumber;
+
+
+ @ApiModelProperty(value = "报名时间")
+ @Excel(name = "报名时间", orderNum = "6", mergeVertical = true, isImportField = "createTime", width = 30)
+ private String createTime;
+
+ @ApiModelProperty(value = "团队名称")
+ @Excel(name = "团队名称", orderNum = "7", mergeVertical = true, isImportField = "teamName", width = 30)
+ private String teamName;
+
+ @ApiModelProperty(value = "团队id")
+ private Integer teamId;
+
+ @ApiModelProperty(value = "账号id")
+ private Integer accountId;
+
+ @ApiModelProperty(value = "用户id")
+ private Integer userId;
+
+ @ApiModelProperty(value = "学校id")
+ private Integer schoolId;
+
+ @ApiModelProperty(value = "报名id")
+ private Integer id;
+
+ @ApiModelProperty(value = "是否禁用")
+ private Integer isDisable;
+
+ @ApiModelProperty(value = "是否队长")
+ private Integer captain;
+
+ @ApiModelProperty(value = "内部标识")
+ private Integer identification;
+}
diff --git a/competition/src/main/java/com/huoran/competition/mapper/CompetitionAnnexMapper.java b/competition/src/main/java/com/huoran/competition/mapper/CompetitionAnnexMapper.java
new file mode 100644
index 0000000..a3e29d7
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/mapper/CompetitionAnnexMapper.java
@@ -0,0 +1,16 @@
+package com.huoran.competition.mapper;
+
+import com.huoran.competition.entity.CompetitionAnnex;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 赛事附件表 Mapper 接口
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+public interface CompetitionAnnexMapper extends BaseMapper {
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/mapper/CompetitionAnnouncementAnnexMapper.java b/competition/src/main/java/com/huoran/competition/mapper/CompetitionAnnouncementAnnexMapper.java
new file mode 100644
index 0000000..a441751
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/mapper/CompetitionAnnouncementAnnexMapper.java
@@ -0,0 +1,16 @@
+package com.huoran.competition.mapper;
+
+import com.huoran.competition.entity.CompetitionAnnouncementAnnex;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 赛事公告附件表 Mapper 接口
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+public interface CompetitionAnnouncementAnnexMapper extends BaseMapper {
+
+}
diff --git a/competition/src/main/java/com/huoran/competition/mapper/CompetitionAnnouncementMapper.java b/competition/src/main/java/com/huoran/competition/mapper/CompetitionAnnouncementMapper.java
new file mode 100644
index 0000000..c2d5fb1
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/mapper/CompetitionAnnouncementMapper.java
@@ -0,0 +1,20 @@
+package com.huoran.competition.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huoran.competition.entity.CompetitionAnnouncement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ *
+ * 赛事公告表 Mapper 接口
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+public interface CompetitionAnnouncementMapper extends BaseMapper {
+
+ IPage queryAnnouncementByCompetitionId(Page page,@Param("competitionId") String competitionId);
+}
diff --git a/competition/src/main/java/com/huoran/competition/mapper/CompetitionContentMapper.java b/competition/src/main/java/com/huoran/competition/mapper/CompetitionContentMapper.java
new file mode 100644
index 0000000..c0f84bb
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/mapper/CompetitionContentMapper.java
@@ -0,0 +1,27 @@
+package com.huoran.competition.mapper;
+
+import com.huoran.common.response.R;
+import com.huoran.competition.entity.CompetitionContent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+public interface CompetitionContentMapper extends BaseMapper {
+
+ List selectCompetitionContent(@Param("competitionId") String competitionId);
+
+ String selectProjectName(@Param("pid")Integer pid);
+
+ String selectCid(@Param("cid")Integer cid);
+
+ String selectSystem(@Param("systemId")Integer systemId);
+}
diff --git a/competition/src/main/java/com/huoran/competition/mapper/CompetitionMapper.java b/competition/src/main/java/com/huoran/competition/mapper/CompetitionMapper.java
new file mode 100644
index 0000000..ba1ef9a
--- /dev/null
+++ b/competition/src/main/java/com/huoran/competition/mapper/CompetitionMapper.java
@@ -0,0 +1,52 @@
+package com.huoran.competition.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huoran.competition.entity.Competition;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huoran.competition.entity.CompetitionStage;
+import com.huoran.competition.entity.req.AfterLoginPageCompetitionListReq;
+import com.huoran.competition.entity.req.CompetitionDetailReq;
+import com.huoran.competition.entity.req.PageCompetitionListReq;
+import com.huoran.competition.entity.vo.CompetitionDetailsVO;
+import com.huoran.competition.entity.vo.CompetitionVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 赛事信息表 Mapper 接口
+ *
+ *
+ * @author cheney
+ * @since 2022-11-16
+ */
+public interface CompetitionMapper extends BaseMapper {
+
+ IPage contestPageConditionQueryByOccupationlab(Page page,@Param("req") PageCompetitionListReq pageCompetitionListReq);
+
+ IPage contestPageConditionQueryByNakadai(Page page, @Param("req") PageCompetitionListReq pageCompetitionListReq);
+
+ IPage allContestsByStu(Page page,@Param("req") PageCompetitionListReq pageCompetitionListReq);
+
+ IPage designatedRangeCompetitionByStu(Page page, @Param("req") PageCompetitionListReq req);
+
+ //本校赛事
+ IPage schoolCompetition(Page page, @Param("req") AfterLoginPageCompetitionListReq req);
+
+ //赛事广场
+ IPage tournamentSquare(Page page, @Param("req") AfterLoginPageCompetitionListReq req);
+
+ IPage registeredBySchoolAndAllPlatforms(Page page,@Param("req") AfterLoginPageCompetitionListReq pageCompetitionListReq);
+
+ IPage registeredBySpecifiedRange(Page page,@Param("req") AfterLoginPageCompetitionListReq pageCompetitionListReq);
+
+ IPage detailsOfCompetitionStage(Page