Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

web/src/main/java/com/ibeetl/jlw/service/ResourcesApplicationService.java

@@ -134,7 +134,7 @@ public class ResourcesApplicationService extends CoreBaseService<ResourcesApplic
      */
     public void makeApplicationLinkRealUrl(ResourcesApplicationQuery condition, CoreUser coreUser, ResourcesApplication application) {
         // 这样  这个接口 也可以用于其他普通的查询
-        if (coreUser.isTeacher() || coreUser.isTeacher()) {
+        if (coreUser.isTeacher() || coreUser.isStudent()) {
             // 查询当前登录用户所有的应用ID
             ResourcesApplicationQuery query = BeanUtil.copyProperties(condition, ResourcesApplicationQuery.class);
             PageQuery pageQuery = query.getPageQuery();

web/src/main/java/com/ibeetl/jlw/service/SysLogService.java

@@ -3,6 +3,7 @@ package com.ibeetl.jlw.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.net.url.UrlQuery;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.Header;
 import cn.hutool.json.JSONObject;
@@ -23,7 +24,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
+import java.nio.charset.Charset;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -134,6 +137,25 @@ public class SysLogService extends CoreBaseService<SysLog> {
         return sysLogDao.visitGoodsNum(startTime, endTime);
     }
 
+    /**
+     * 从跳转的路径中，取参数。并构建成一个SysLog导入到日志表中
+     * @param realUrl
+     */
+    public void applicationLogPoint(String realUrl) {
+        Map params = new HashMap(8);
+
+        // 记录下，realUrl中的参数列表
+        if (null != realUrl && realUrl.contains("?")) {
+            UrlQuery urlQuery = UrlQuery.of(realUrl.split("\\?")[1], Charset.defaultCharset());
+            Map<String, Object> tempMap = new HashMap<>();
+            for (Map.Entry<CharSequence, CharSequence> entry : urlQuery.getQueryMap().entrySet()) {
+                tempMap.put(entry.getKey().toString(), entry.getValue());
+            }
+            params.putAll(tempMap);
+        }
+        mockLog(realUrl, params, null);
+    }
+
     /**
      * 模拟日志，用于操作日志埋点
      */

web/src/main/java/com/ibeetl/jlw/web/ResourcesApplicationController.java

@@ -13,6 +13,7 @@ import com.ibeetl.jlw.entity.Student;
 import com.ibeetl.jlw.entity.Teacher;
 import com.ibeetl.jlw.service.LoginTodoService;
 import com.ibeetl.jlw.service.ResourcesApplicationService;
+import com.ibeetl.jlw.service.SysLogService;
 import com.ibeetl.jlw.web.query.ResourcesApplicationQuery;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -46,6 +47,8 @@ public class ResourcesApplicationController{
 
     @Autowired
     FileService fileService;
+    @Autowired
+    private SysLogService sysLogService;
 
     /* 前端接口 */
 
@@ -66,6 +69,7 @@ public class ResourcesApplicationController{
         ResourcesApplication info = resourcesApplicationService.getInfo(condition);
         resourcesApplicationService.makeApplicationLinkRealUrl(condition, coreUser, info);
         resourcesApplicationService.hiddenKey(condition, info);
+        sysLogService.applicationLogPoint(info.getRealUrl());
         return JsonResult.success(info);
     }
 

web/src/main/java/com/ibeetl/jlw/web/StudentController.java

@@ -2,9 +2,7 @@ package com.ibeetl.jlw.web;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.net.url.UrlQuery;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import cn.jlw.Interceptor.*;
 import cn.jlw.token.TokenService;
 import cn.jlw.util.JupyterNotebookUtils;
@@ -48,14 +46,12 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.Charset;
 import java.util.*;
 import java.util.stream.Collectors;
 
 import static cn.jlw.token.TokenService.getMap;
 import static cn.jlw.token.TokenService.updateByIds;
 import static com.ibeetl.admin.core.util.ExcelUtil.write;
-import static com.ibeetl.admin.core.util.servlet.ServletUtils.getRequest;
 import static com.ibeetl.jlw.web.IpAddressController.ipAddressMap;
 
 
@@ -2187,18 +2183,7 @@ public class StudentController extends BaseController{
     @PostMapping(API + "/applicationLogPoint.do")
     @ResponseBody
     public JsonResult applicationLogPoint(String realUrl, @SCoreUser CoreUser coreUser) {
-        cn.hutool.json.JSONObject params = JSONUtil.parseObj(getRequest().getParameterMap());
-
-        // 记录下，realUrl中的参数列表
-        if (realUrl.contains("?")) {
-            UrlQuery urlQuery = UrlQuery.of(realUrl.split("\\?")[1], Charset.defaultCharset());
-            Map<String, Object> tempMap = new HashMap<>();
-            for (Map.Entry<CharSequence, CharSequence> entry : urlQuery.getQueryMap().entrySet()) {
-                tempMap.put(entry.getKey().toString(), entry.getValue());
-            }
-            params.putAll(tempMap);
-        }
-        sysLogService.mockLog(realUrl, params, null);
+        sysLogService.applicationLogPoint(realUrl);
         return JsonResult.success();
     }
 
@@ -2379,7 +2364,6 @@ public class StudentController extends BaseController{
 
     //下载模板信息
     @GetMapping(MODEL + "/downloadTemplate.json")
-    @ResponseBody
     public void download(HttpServletResponse response, @SCoreUser CoreUser coreUser) {
         XSSFWorkbook workbook = null;
         InputStream is = null;

web/src/main/java/com/ibeetl/jlw/web/TeacherController.java

@@ -1272,7 +1272,6 @@ public class TeacherController{
 
     //下载模板信息
     @GetMapping(MODEL + "/downloadTemplate.json")
-    @ResponseBody
     public void download(HttpServletResponse response,@SCoreUser CoreUser coreUser) {
         XSSFWorkbook workbook = null;
         InputStream is = null;

web/src/main/resources/application-test.properties

@@ -24,7 +24,7 @@ spring.datasource.dynamic.hikari.connection-test-query=SELECT 1
 spring.datasource.dynamic.datasource.master.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.dynamic.datasource.master.url=jdbc:mysql://124.223.219.235:3306/tzcj?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
 spring.datasource.dynamic.datasource.master.username=root
-spring.datasource.dynamic.datasource.master.password=yaL3FQ6SbdmWksBV
+spring.datasource.dynamic.datasource.master.password=shuchuang123@.
 spring.datasource.dynamic.datasource.master.hikari.max-lifetime=60000
 
 # ds2

web/src/main/resources/sql/jlw/student.md

@@ -1588,7 +1588,7 @@ queryStudentUseLogByCondition
     @//指定时间内的，系统登入时间
     min( ta.create_time ) AS login_time,
     @//系统登出时间
-    ( CASE WHEN count( 1 ) <= 1 THEN '-' ELSE max( ta.create_time ) END ) AS logout_time,
+    ( CASE WHEN count( 1 ) <= 1 THEN '-' ELSE adddate(min( ta.create_time ), interval (TIME_TO_SEC(max( ta.create_time )) - TIME_TO_SEC(min( ta.create_time ))) second) END ) AS logout_time,
     @//指定时间内的，在线时长
     (
     CASE