From 9f4d497f2e5e3c4a7954f2529d289bcbde525f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E4=BD=99=E9=A1=B9?=
 <xiaxiaoabner@163.com>
Date: Sun, 12 Dec 2021 20:17:36 +0800
Subject: [PATCH] =?UTF-8?q?APP=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/VisitTimeInfoController.java   |  14 +-
 .../log/manager/factory/AsyncLogFactory.java  |   3 -
 .../com/ruoyi/log/redis/RedisToMySQL.java     |  56 ----
 .../com/ruoyi/log/utils/KeysCollector.java    |   2 +-
 ruoyi-ui/src/api/log/applog.js                |   9 +-
 ruoyi-ui/src/views/log/applog/index.vue       | 260 +++---------------
 6 files changed, 63 insertions(+), 281 deletions(-)
 delete mode 100644 mobile-app/src/main/java/com/ruoyi/log/redis/RedisToMySQL.java

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 1db0398..dc8cde4 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<SysVisitLog> 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<SysVisitLog> 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 ffda281..7af40f5 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 e43f830..0000000
--- 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<String, Object> 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 2d84e89..7656487 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<String,Long> 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 20cc8a3..8c4735e 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 52eccb3..9f26348 100644
--- a/ruoyi-ui/src/views/log/applog/index.vue
+++ b/ruoyi-ui/src/views/log/applog/index.vue
@@ -15,54 +15,6 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['log:applog:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['log:applog:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['log:applog:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['log:applog:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="applogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="appId" align="center" prop="appId" />
@@ -74,17 +26,10 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['log:applog:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['log:applog:remove']"
-          >删除</el-button>
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['log:applog:query']"
+          >详细</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -96,84 +41,28 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改 日志对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="用户的token值" prop="appId">
-          <el-input v-model="form.appId" placeholder="请输入用户的token值" />
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable size="small"
-            v-model="form.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="离开时间" prop="leaveTime">
-          <el-date-picker clearable size="small"
-            v-model="form.leaveTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择离开时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="访问时长" prop="timeLong">
-          <el-input v-model="form.timeLong" placeholder="请输入访问时长" />
-        </el-form-item>
-        <el-form-item label="用户的token值" prop="tokenKey">
-          <el-input v-model="form.tokenKey" placeholder="请输入用户的token值" />
-        </el-form-item>
-        <el-divider content-position="center"> 信息</el-divider>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddVisitLogInfo">添加</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteVisitLogInfo">删除</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="visitLogInfoList" :row-class-name="rowVisitLogInfoIndex" @selection-change="handleVisitLogInfoSelectionChange" ref="visitLogInfo">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" width="50"/>
-          <el-table-column label="日志主键" prop="appId">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.appId" placeholder="请输入日志主键" />
-            </template>
-          </el-table-column>
-          <el-table-column label="用户名" prop="visitName">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.visitName" placeholder="请输入用户名" />
-            </template>
-          </el-table-column>
-          <el-table-column label="方法名" prop="method">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.method" placeholder="请输入方法名" />
-            </template>
-          </el-table-column>
-          <el-table-column label="URL" prop="visitUrl">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.visitUrl" placeholder="请输入URL" />
-            </template>
-          </el-table-column>
-          <el-table-column label="调用次数" prop="invokeCount">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.invokeCount" placeholder="请输入调用次数" />
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <!--详细 -->
+    <el-dialog title="APP日志详细" :visible.sync="open"   append-to-body>
+    <el-table :data="appdetails">
+      <el-table-column label="app名称" align="center" prop="visitName" />
+      <el-table-column label="访问地址" align="center" prop="visitUrl" />
+      <el-table-column label="调用次数" align="center" prop="invokeCount" />
+      <el-table-column label="访问时间" align="center" prop="updateTime">
+      </el-table-column>
+    </el-table>
+      <pagination
+        v-show="detailtotal>0"
+        :total="detailtotal"
+        :page.sync="detailParams.pageNum"
+        :limit.sync="detailParams.pageSize"
+        @pagination="handleDetails"
+      />
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listApplog, getApplog, delApplog, addApplog, updateApplog, exportApplog } from "@/api/log/applog";
+import { listApplog, detailsApplog } from "@/api/log/applog";
 
 export default {
   name: "Applog",
@@ -195,10 +84,14 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      detailtotal:0,
       //  日志表格数据
       applogList: [],
+      // 日志详细信息
+      appdetails:[],
       //  表格数据
       visitLogInfoList: [],
+      appId:null,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -213,6 +106,11 @@ export default {
         timeLong: null,
         tokenKey: null
       },
+      detailParams:{
+        pageNum: 1,
+        pageSize: 10,
+        appId: null,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -270,95 +168,25 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
+    /** 详细按钮操作 */
+    handleView(row) {
       this.open = true;
-      this.title = "添加 日志";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const timeId = row.timeId || this.ids
-      getApplog(timeId).then(response => {
-        this.form = response.data;
-        this.visitLogInfoList = response.data.visitLogInfoList;
-        this.open = true;
-        this.title = "修改 日志";
+      this.detailParams.appId =row.appId;
+      this.appId = row.appId;
+      detailsApplog(this.detailParams).then(response => {
+        this.appdetails = response.rows;
+        this.detailtotal = response.total;
       });
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.form.visitLogInfoList = this.visitLogInfoList;
-          if (this.form.timeId != null) {
-            updateApplog(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addApplog(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
+    handleDetails() {
+      this.open = true;
+      this.detailParams.appId =this.appId;
+      detailsApplog(this.detailParams).then(response => {
+        this.appdetails = response.rows;
+        this.detailtotal = response.total;
       });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const timeIds = row.timeId || this.ids;
-      this.$modal.confirm('是否确认删除 日志编号为"' + timeIds + '"的数据项？').then(function() {
-        return delApplog(timeIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-	/**  序号 */
-    rowVisitLogInfoIndex({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
-    /**  添加按钮操作 */
-    handleAddVisitLogInfo() {
-      let obj = {};
-      obj.appId = "";
-      obj.visitName = "";
-      obj.method = "";
-      obj.visitUrl = "";
-      obj.invokeCount = "";
-      this.visitLogInfoList.push(obj);
-    },
-    /**  删除按钮操作 */
-    handleDeleteVisitLogInfo() {
-      if (this.checkedVisitLogInfo.length == 0) {
-        this.$modal.msgError("请先选择要删除的 数据");
-      } else {
-        const visitLogInfoList = this.visitLogInfoList;
-        const checkedVisitLogInfo = this.checkedVisitLogInfo;
-        this.visitLogInfoList = visitLogInfoList.filter(function(item) {
-          return checkedVisitLogInfo.indexOf(item.index) == -1
-        });
-      }
-    },
-    /** 复选框选中数据 */
-    handleVisitLogInfoSelectionChange(selection) {
-      this.checkedVisitLogInfo = selection.map(item => item.index)
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有 日志数据项？').then(() => {
-        this.exportLoading = true;
-        return exportApplog(queryParams);
-      }).then(response => {
-        this.$download.name(response.msg);
-        this.exportLoading = false;
-      }).catch(() => {});
     }
+
   }
 };
 </script>
-- 
Gitee