From b43c85573537da45c6d0b40d6f920b89d7559101 Mon Sep 17 00:00:00 2001 From: tianea Date: Sun, 13 Mar 2022 19:25:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tz/platform/config/RedisConfig.java | 41 ------------------- .../com/tz/platform/entity/ExamAnswer.java | 30 ++++++++++++++ .../com/tz/platform/entity/ExamPaper.java | 20 --------- .../tz/platform/repository/ExamPaperDao.java | 9 ---- .../feign/exam/qo/CacheQuetionQO.java | 12 ++++++ .../tz/platform/api/ExamApiController.java | 4 ++ .../tz/platform/api/dto/ExamQuestionDTO.java | 4 ++ .../platform/api/dto/ListExamQuestionDTO.java | 4 ++ .../com/tz/platform/config/RedisConfig.java | 4 ++ .../tz/platform/config/TzRabbitConfig.java | 4 ++ 10 files changed, 62 insertions(+), 70 deletions(-) delete mode 100644 tz/common/common-service/src/main/java/com/tz/platform/config/RedisConfig.java create mode 100644 tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java delete mode 100644 tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamPaper.java delete mode 100644 tz/competition/competition-service/src/main/java/com/tz/platform/repository/ExamPaperDao.java create mode 100644 tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/qo/CacheQuetionQO.java create mode 100644 tz/exam/exam-service/src/main/java/com/tz/platform/api/ExamApiController.java create mode 100644 tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ExamQuestionDTO.java create mode 100644 tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ListExamQuestionDTO.java create mode 100644 tz/exam/exam-service/src/main/java/com/tz/platform/config/RedisConfig.java create mode 100644 tz/exam/exam-service/src/main/java/com/tz/platform/config/TzRabbitConfig.java diff --git a/tz/common/common-service/src/main/java/com/tz/platform/config/RedisConfig.java b/tz/common/common-service/src/main/java/com/tz/platform/config/RedisConfig.java deleted file mode 100644 index 3613632..0000000 --- a/tz/common/common-service/src/main/java/com/tz/platform/config/RedisConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.tz.platform.config; - -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -@Configuration -public class RedisConfig { - @Bean(name = "template") - public RedisTemplate template(RedisConnectionFactory factory) { - // 创建RedisTemplate对象 - RedisTemplate template = new RedisTemplate<>(); - // 配置连接工厂 - template.setConnectionFactory(factory); - // 定义Jackson2JsonRedisSerializer序列化对象 - Jackson2JsonRedisSerializer jacksonSeial = new Jackson2JsonRedisSerializer<>(Object.class); - ObjectMapper om = new ObjectMapper(); - // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会报异常 - om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); - jacksonSeial.setObjectMapper(om); - StringRedisSerializer stringSerial = new StringRedisSerializer(); - // redis key 序列化方式使用stringSerial - template.setKeySerializer(stringSerial); - // redis value 序列化方式使用jackson - template.setValueSerializer(jacksonSeial); - // redis hash key 序列化方式使用stringSerial - template.setHashKeySerializer(stringSerial); - // redis hash value 序列化方式使用jackson - template.setHashValueSerializer(jacksonSeial); - template.afterPropertiesSet(); - return template; - } -} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java new file mode 100644 index 0000000..700ecfb --- /dev/null +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java @@ -0,0 +1,30 @@ +package com.tz.platform.entity; + +import com.vladmihalcea.hibernate.type.json.JsonStringType; +import lombok.Data; +import org.hibernate.annotations.Type; +import org.hibernate.annotations.TypeDef; + +import javax.persistence.*; +import java.util.Date; +import java.util.List; + +@Data +@Entity +@TypeDef(name = "json", typeClass = JsonStringType.class) +@Table(indexes = {@Index(columnList = "userId,competitionId,stageId")}) +public class ExamAnwser { + /** + * 大赛ID_阶段ID_分组ID_用户ID_问题ID + */ + @Id + private String id; + private Long userId; + private Long competitionId; + private Integer stageId; + @Type(type = "json") + @Column(columnDefinition = "json") + private List anwserId; + private Long score; + private Date updateTime; +} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamPaper.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamPaper.java deleted file mode 100644 index 4fa2135..0000000 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamPaper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.tz.platform.entity; - -import lombok.Data; - -import javax.persistence.*; -import java.util.Date; - -@Entity -@Data -@Table(indexes = {@Index(columnList = "competitionId")}) -public class ExamPaper { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - private Long competitionId; - private Integer stageId; - private Date startTime; - private Date endTime; - -} diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/ExamPaperDao.java b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/ExamPaperDao.java deleted file mode 100644 index 2d0c5a3..0000000 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/ExamPaperDao.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.tz.platform.repository; - -import com.tz.platform.entity.ExamPaper; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface ExamPaperDao extends JpaRepository { -} diff --git a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/qo/CacheQuetionQO.java b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/qo/CacheQuetionQO.java new file mode 100644 index 0000000..bcf72fd --- /dev/null +++ b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/qo/CacheQuetionQO.java @@ -0,0 +1,12 @@ +package com.tz.platform.feign.exam.qo; + +import lombok.Data; + +import java.util.List; + +@Data +public class CacheQuetionQO { + private List ids; + private String key; + private Long ms; +} diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/api/ExamApiController.java b/tz/exam/exam-service/src/main/java/com/tz/platform/api/ExamApiController.java new file mode 100644 index 0000000..082e4e2 --- /dev/null +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/api/ExamApiController.java @@ -0,0 +1,4 @@ +package com.tz.platform.api; + +public class ExamApiController { +} diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ExamQuestionDTO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ExamQuestionDTO.java new file mode 100644 index 0000000..6aa3713 --- /dev/null +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ExamQuestionDTO.java @@ -0,0 +1,4 @@ +package com.tz.platform.api.dto; + +public class ExamQuestionDTO { +} diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ListExamQuestionDTO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ListExamQuestionDTO.java new file mode 100644 index 0000000..3158cc5 --- /dev/null +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ListExamQuestionDTO.java @@ -0,0 +1,4 @@ +package com.tz.platform.api.dto; + +public class ListExamQuestionDTO { +} diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/config/RedisConfig.java b/tz/exam/exam-service/src/main/java/com/tz/platform/config/RedisConfig.java new file mode 100644 index 0000000..668cb1e --- /dev/null +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/config/RedisConfig.java @@ -0,0 +1,4 @@ +package com.tz.platform.config; + +public class RedisConfig { +} diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/config/TzRabbitConfig.java b/tz/exam/exam-service/src/main/java/com/tz/platform/config/TzRabbitConfig.java new file mode 100644 index 0000000..1337df2 --- /dev/null +++ b/tz/exam/exam-service/src/main/java/com/tz/platform/config/TzRabbitConfig.java @@ -0,0 +1,4 @@ +package com.tz.platform.config; + +public class TzRabbitConfig { +}