diff --git a/mobile-app/src/main/java/com/ruoyi/log/controller/VisitTimeInfoController.java b/mobile-app/src/main/java/com/ruoyi/log/controller/VisitTimeInfoController.java index 1db0398b6829ecaee595ffcd56be0c1637a8b3dc..dc8cde403cb86cffc4057ec24866bbc9ff1c8abf 100644 --- a/mobile-app/src/main/java/com/ruoyi/log/controller/VisitTimeInfoController.java +++ b/mobile-app/src/main/java/com/ruoyi/log/controller/VisitTimeInfoController.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.log.domain.SysVisitLog; import com.ruoyi.log.domain.SysVisitTimeLog; import com.ruoyi.log.service.ISysVisitLogService; @@ -68,7 +69,6 @@ public class VisitTimeInfoController extends BaseController timeInfo.setTimeLong(TimeUtils.convertTime(temp.get(id))); visitTimeInfos.add(timeInfo); } - for (VisitTimeInfo timeInfo : visitTimeInfos) { List sysVisitLogs = visitLogService.selectVisitLogInfoByAppId(timeInfo.getAppId()); if (sysVisitLogs.size()>0) { @@ -87,5 +87,17 @@ public class VisitTimeInfoController extends BaseController return getDataTable(visitTimeInfos); } + /** + * 查询 具体用户访问列表 + */ + @PreAuthorize("@ss.hasPermi('log:applog:query')") + @GetMapping("/details") + public TableDataInfo listDetails(String appId) { + startPage(); + List sysVisitLogs = visitLogService.selectVisitLogInfoByAppId(Long.valueOf(appId)); + return getDataTable(sysVisitLogs); + } + + } diff --git a/mobile-app/src/main/java/com/ruoyi/log/manager/factory/AsyncLogFactory.java b/mobile-app/src/main/java/com/ruoyi/log/manager/factory/AsyncLogFactory.java index ffda2814089af546e4a417873e595a5aefbc0432..7af40f5e9230e52b47961ba63b1d51d7931a8231 100644 --- a/mobile-app/src/main/java/com/ruoyi/log/manager/factory/AsyncLogFactory.java +++ b/mobile-app/src/main/java/com/ruoyi/log/manager/factory/AsyncLogFactory.java @@ -7,17 +7,14 @@ package com.ruoyi.log.manager.factory; * @create: 2021-10-19 14:17 */ -import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.log.domain.SysVisitLog; import com.ruoyi.log.domain.SysVisitTimeLog; -import com.ruoyi.log.redis.RedisToMySQL; import com.ruoyi.log.service.ISysVisitLogService; import com.ruoyi.log.service.ISysVisitTimeService; import com.ruoyi.log.utils.KeysCollector; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; import java.util.Map; diff --git a/mobile-app/src/main/java/com/ruoyi/log/redis/RedisToMySQL.java b/mobile-app/src/main/java/com/ruoyi/log/redis/RedisToMySQL.java deleted file mode 100644 index e43f83026641e9e90360ffdf4311473887711527..0000000000000000000000000000000000000000 --- a/mobile-app/src/main/java/com/ruoyi/log/redis/RedisToMySQL.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.ruoyi.log.redis; - -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.log.service.ISysVisitLogService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * @program: ruoyi - * @description: - * @author: Abner - * @create: 2021-10-10 11:08 - */ -@Component -public class RedisToMySQL { - - @Autowired - private RedisCache redisService; - @Autowired - private ISysVisitLogService sysVisitLogService; - private static final Logger log = LoggerFactory.getLogger(RedisToMySQL.class); - - - /** - * 每12个小时将redis的key添加到mysql - * 先读取,将数量统计并落盘 - * 后删除键,等待下一个调用 - */ -// @Scheduled(initialDelay = 5000,fixedDelay = 4*DateUtils.MILLIS_PER_MINUTE) - public static void redisToMySQL( Map keys){ - if (!keys.isEmpty()){ - // 读取key - for (String key : keys.keySet()) { - String[] redisKeys = key.split(":"); - String id = redisKeys[0]; - System.out.println("id:"+id); - Long appId= Long.valueOf(id); - String url = redisKeys[1]; - System.out.println("id:"+url); - String token_key = redisKeys[2]; - Long invokecount = Long.valueOf(String.valueOf(keys.get(key))); - System.out.println(invokecount); - SpringUtils.getBean(ISysVisitLogService.class).updateInvokeCount(appId, url, token_key, invokecount); - } -// redisService.deleteObject("invokecount"); - } - } -} - diff --git a/mobile-app/src/main/java/com/ruoyi/log/utils/KeysCollector.java b/mobile-app/src/main/java/com/ruoyi/log/utils/KeysCollector.java index 2d84e89d91192d36868922180683b3c4e36bf753..7656487e27ab9b690f548b89469a7f95ba24f5e5 100644 --- a/mobile-app/src/main/java/com/ruoyi/log/utils/KeysCollector.java +++ b/mobile-app/src/main/java/com/ruoyi/log/utils/KeysCollector.java @@ -15,7 +15,7 @@ public class KeysCollector { RedisCache redisService = SpringUtils.getBean(RedisCache.class); redisService.setCacheMapValue(appRedisKey, visitKey, count); //设置redis的过期时间 - redisService.expire(appRedisKey, 4, TimeUnit.MINUTES); + redisService.expire(appRedisKey, millisecond, TimeUnit.MINUTES); Map appMap = redisService.getCacheMap(appRedisKey); keysMap.put(appRedisKey, appMap); } diff --git a/ruoyi-ui/src/api/log/applog.js b/ruoyi-ui/src/api/log/applog.js index 20cc8a301ab320ba648fcf21d9be7dd3fd51900a..8c4735ee38356cc4e0267888931af3a756f4605b 100644 --- a/ruoyi-ui/src/api/log/applog.js +++ b/ruoyi-ui/src/api/log/applog.js @@ -35,11 +35,12 @@ export function updateApplog(data) { }) } -// 删除 日志 -export function delApplog(timeId) { +// 详细 日志 +export function detailsApplog(query) { return request({ - url: '/log/applog/' + timeId, - method: 'delete' + url: '/log/applog/details', + method: 'get', + params:query }) } diff --git a/ruoyi-ui/src/views/log/applog/index.vue b/ruoyi-ui/src/views/log/applog/index.vue index 52eccb380ada242cf24510b2f0176391f9c1af57..9f26348f3d8bfe31fc9f0b65389c22c3a8e2e860 100644 --- a/ruoyi-ui/src/views/log/applog/index.vue +++ b/ruoyi-ui/src/views/log/applog/index.vue @@ -15,54 +15,6 @@ 重置 - - - - 新增 - - - 修改 - - - 删除 - - - 导出 - - - - @@ -74,17 +26,10 @@ 修改 - 删除 + icon="el-icon-view" + @click="handleView(scope.row)" + v-hasPermi="['log:applog:query']" + >详细 @@ -96,84 +41,28 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> - - - - - - - - - - - - - - - - - - - - - - 信息 - - - 添加 - - - 删除 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + +