diff --git a/pom.xml b/pom.xml
index 2451f1b..1835db2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,18 @@
3.14.9
+
+ org.slf4j
+ slf4j-api
+ 1.7.36
+
+
+
+ ch.qos.logback
+ logback-classic
+ 1.2.11
+
+
@@ -106,10 +118,20 @@
-
+
+
+ io.jsonwebtoken
+ jjwt
+ 0.9.1
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
@@ -131,6 +153,12 @@
RELEASE
compile
+
+ junit
+ junit
+
+ test
+
diff --git a/src/main/java/cn/teammodel/config/ies/IESConfig.java b/src/main/java/cn/teammodel/config/ies/IESConfig.java
new file mode 100644
index 0000000..0ce5b64
--- /dev/null
+++ b/src/main/java/cn/teammodel/config/ies/IESConfig.java
@@ -0,0 +1,13 @@
+package cn.teammodel.config.ies;
+
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Getter
+@Configuration
+public class IESConfig {
+ @Value("${ies.server-url}")
+ private String serverUrl;
+
+}
diff --git a/src/main/java/cn/teammodel/config/redis/RedisConfig.java b/src/main/java/cn/teammodel/config/redis/RedisConfig.java
new file mode 100644
index 0000000..1ef6791
--- /dev/null
+++ b/src/main/java/cn/teammodel/config/redis/RedisConfig.java
@@ -0,0 +1,34 @@
+package cn.teammodel.config.redis;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class RedisConfig {
+
+
+
+ @Bean
+ public LettuceConnectionFactory dbConnectionFactory() {
+ RedisStandaloneConfiguration config = new RedisStandaloneConfiguration("52.130.252.100", 6379);
+ config.setDatabase(8); // 设置数据库编号为8
+ config.setPassword("habook");
+ return new LettuceConnectionFactory(config);
+ }
+
+
+ @Bean
+ public StringRedisTemplate db1Template(LettuceConnectionFactory dbConnectionFactory) {
+ StringRedisTemplate template = new StringRedisTemplate();
+ template.setConnectionFactory(dbConnectionFactory);
+ template.setKeySerializer(new StringRedisSerializer());
+ template.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+ return template;
+ }
+}
diff --git a/src/main/java/cn/teammodel/controller/admin/controller/AdminDutyController.java b/src/main/java/cn/teammodel/controller/admin/controller/AdminDutyController.java
index dda8765..7a1ce27 100644
--- a/src/main/java/cn/teammodel/controller/admin/controller/AdminDutyController.java
+++ b/src/main/java/cn/teammodel/controller/admin/controller/AdminDutyController.java
@@ -4,19 +4,25 @@ import cn.teammodel.common.R;
import cn.teammodel.controller.admin.service.AdminIndexDutyService;
import cn.teammodel.model.dto.admin.appraise.TimeRangeDto;
import cn.teammodel.model.dto.admin.weekduty.AdminFindDutyRecordDto;
+import cn.teammodel.model.dto.weekDuty.LessonRecordDto;
import cn.teammodel.model.vo.admin.AppraiseNodeRankVo;
import cn.teammodel.model.vo.admin.DutyIndexData;
import cn.teammodel.model.vo.admin.DutyNodeRankVo;
import cn.teammodel.model.vo.admin.DutyRankPo;
import cn.teammodel.model.vo.weekDuty.DutyRecordVo;
import cn.teammodel.service.DutyService;
+import com.google.gson.JsonElement;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.List;
+import java.util.Map;
/**
* @author winter
@@ -65,4 +71,10 @@ public class AdminDutyController {
List res = adminIndexDutyService.appraiseNodeRank(timeRangeDto);
return R.success(res);
}
+ @PostMapping("getLessonRecord")
+ @ApiOperation("获取课堂记录")
+ public R