From a93faada9eb9be3323cdc979e872b8a15b2bdeb8 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Sun, 28 Apr 2024 18:15:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=92=8Cmapper=20xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/stu/StuKnowledgeNote.java       | 16 ++++++++++++++++
 .../controller/tea/UserController.java         | 18 +++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuKnowledgeNote.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuKnowledgeNote.java
index 759cc6c..41a7ba7 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuKnowledgeNote.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuKnowledgeNote.java
@@ -87,6 +87,9 @@ public class StuKnowledgeNote {
     }
 
 
+
+
+
     @GetMapping("/getReport")
     @ApiOperation("知识概要--获取单个学生报告接口")
     @AnonymousAccess
@@ -105,6 +108,19 @@ public class StuKnowledgeNote {
         }
     }
 
+
+
+
+    @AnonymousAccess
+    @ApiOperation("知识概要-获取页面")
+    @PostMapping("getSysKnowledgeSummaryByChapterId")
+    public ResultEntity<SysKnowledgeSummary> getSysKnowledgeSummaryByChapterId(@RequestParam String chapterId) {
+        SysKnowledgeSummary sysKnowledgeSummary = sysKnowledgeSummaryMapper.selectByPrimaryKey(chapterId);
+        return new ResultEntity<>(sysKnowledgeSummary);
+    }
+
+
+
     @GetMapping("/returnTrainingId")
     @ApiOperation("返回实训ID接口/进入知识概要页面调用")
     @AnonymousAccess
diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
index 0bdd924..34e1c49 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
@@ -146,17 +146,21 @@ public class UserController {
 
 
     private String getIPAndPlace(HttpServletRequest request, String name, String userId, String studentId) {
-        String ip = request.getRemoteAddr();
-        String ipHomePlace = userService.getIpAddress(ip);
         SysLoginLog sysLoginLog = new SysLoginLog();
+        String ip = request.getRemoteAddr();
+        if (StringUtils.isNotBlank(ip)) {
+            sysLoginLog.setLoginIp(ip);
+            String ipHomePlace = userService.getIpAddress(ip);
+            if (ipHomePlace != null) {
+                sysLoginLog.setIpAddress(ipHomePlace);
+            }
+        }
         String uuid = IdUtil.randomUUID();
         sysLoginLog.setLogId(uuid);
-        sysLoginLog.setLoginIp(ip);
         sysLoginLog.setUserid(userId);
         sysLoginLog.setName(name);
         sysLoginLog.setStudentId(studentId);
         sysLoginLog.setLoginTime(new Date());
-        sysLoginLog.setIpAddress(ipHomePlace);
         sysLoginLogMapper.insert(sysLoginLog);
         return uuid;
     }
@@ -484,17 +488,17 @@ public class UserController {
     @AnonymousAccess
     @GetMapping("/getStudentExamPeopleCountAndStudentExamTime")
     @ApiOperation("考试人数和考试次数")
-    public ResultEntity<Map<Long,Long>> getStudentExamCountAndStudentCount(String schoolId){
+    public ResultEntity<Map<Long, Long>> getStudentExamCountAndStudentCount(String schoolId) {
         StuUserExample stuUserExample = new StuUserExample();
         stuUserExample.createCriteria().andSchoolIdEqualTo(schoolId).andExamStatusEqualTo("true");
         //考试人数
-        long examPeopleCount= stuUserMapper.countByExample(stuUserExample);
+        long examPeopleCount = stuUserMapper.countByExample(stuUserExample);
 
         StuStudentExamExample stuStudentExamExample = new StuStudentExamExample();
         //考试次数
         long examTime = studentExamMapper.countByExample(stuStudentExamExample);
         HashMap<Long, Long> countMap = new HashMap<>();
-        countMap.put(examPeopleCount,examTime);
+        countMap.put(examPeopleCount, examTime);
         return new ResultEntity<>(HttpStatus.OK, "考试人数和考试次数查询成功", countMap);
     }
 }
\ No newline at end of file