From d8529a297f9275a0231b236ff8c0a4eafbd2bf35 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Fri, 18 Feb 2022 10:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3Bug=201=E3=80=81=E8=8B=B1?=
=?UTF-8?q?=E8=AF=AD=E5=8D=95=E8=AF=8D=E5=88=97=E8=A1=A8=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?=
=?UTF-8?q?=202=E3=80=81=E7=88=AC=E8=99=AB=E6=97=A5=E5=BF=97=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1=E4=BB=A3=E7=A0=81=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/business/english/word/index.vue | 19 +++++++++++++------
.../views/business/log/reptilelog/index.vue | 12 +++++++++---
.../com/xjs/common/aop/reptileLogAspect.java | 11 +++++------
3 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/ruoyi-ui/src/views/business/english/word/index.vue b/ruoyi-ui/src/views/business/english/word/index.vue
index 87ac0868..c01c52a7 100644
--- a/ruoyi-ui/src/views/business/english/word/index.vue
+++ b/ruoyi-ui/src/views/business/english/word/index.vue
@@ -309,7 +309,8 @@ export default {
},
// 表单参数
form: {
- sort: 0
+ sort: 0,
+ isCollect: '',
},
//英语一言数据
oneEnglishData: {},
@@ -317,11 +318,11 @@ export default {
rulesEdit: {
englishWord: [
{required: true, message: "英语单词不能为空", trigger: "blur"},
- { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }
+ {min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur'}
],
chineseWord: [
{required: true, message: "中文不能为空", trigger: "blur"},
- { min: 1, max: 10, message: '长度在 1 到 10 个字符', trigger: 'blur' }
+ {min: 1, max: 10, message: '长度在 1 到 10 个字符', trigger: 'blur'}
],
isCollect: [
{required: true, message: "收藏不能为空", trigger: "blur"}
@@ -334,7 +335,7 @@ export default {
rulesAdd: {
content: [
{required: true, message: "中英文不能为空", trigger: "blur"},
- { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }
+ {min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur'}
],
isCollect: [
{required: true, message: "收藏不能为空", trigger: "blur"}
@@ -349,6 +350,8 @@ export default {
created() {
this.getList();
},
+
+
methods: {
//获取英语一言api数据
getOneEnglishApi() {
@@ -423,8 +426,8 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.daterangeCreateTime = [];
- this.queryParams.createTime=null
- this.queryParams.endCreateTime=null
+ this.queryParams.createTime = null
+ this.queryParams.endCreateTime = null
this.resetForm("queryForm");
this.handleQuery();
},
@@ -439,6 +442,10 @@ export default {
this.reset();
this.openAdd = true;
this.title = "添加英语单词";
+ //下拉框默认选中
+ this.form.isCollect= parseInt(this.dict.type.english_collect[0].value)
+ this.form.top = parseInt(this.dict.type.english_top[1].value)
+
},
/** 修改按钮操作 */
handleUpdate(row) {
diff --git a/ruoyi-ui/src/views/business/log/reptilelog/index.vue b/ruoyi-ui/src/views/business/log/reptilelog/index.vue
index a71b5d6b..f88ed1b6 100644
--- a/ruoyi-ui/src/views/business/log/reptilelog/index.vue
+++ b/ruoyi-ui/src/views/business/log/reptilelog/index.vue
@@ -91,7 +91,13 @@
- {{ Math.round(scope.row.requestTime / 1000) }}秒
+ {{
+ scope.row.requestTime < 1000
+ ?
+ scope.row.requestTime + '毫秒'
+ :
+ Math.round(scope.row.requestTime / 1000) + '秒'
+ }}
@@ -180,10 +186,10 @@ export default {
// 表单校验
queryRules: {
beginRequestTime: [
- { type: 'number', message: '必须数字！', trigger: 'blur'}
+ {type: 'number', message: '必须数字！', trigger: 'blur'}
],
endRequestTime: [
- { type: 'number', message: '必须数字！', trigger: 'blur'}
+ {type: 'number', message: '必须数字！', trigger: 'blur'}
],
},
diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/common/aop/reptileLogAspect.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/common/aop/reptileLogAspect.java
index 6ab39f59..4ceae502 100644
--- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/common/aop/reptileLogAspect.java
+++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/common/aop/reptileLogAspect.java
@@ -1,6 +1,5 @@
package com.xjs.common.aop;
-import cn.hutool.core.date.DateUtil;
import com.ruoyi.common.core.domain.R;
import com.xjs.annotation.ReptileLog;
import com.xjs.business.log.RemoteLogFeign;
@@ -16,8 +15,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
import static com.xjs.consts.ReqConst.ERROR;
import static com.xjs.consts.ReqConst.SUCCESS;
@@ -51,13 +48,15 @@ public class reptileLogAspect {
Object obj = null;
try {
//切入前-----
- LocalDateTime localDateTime1 = DateUtil.date().toLocalDateTime();
+ // 开始时间
+ long startTime = System.currentTimeMillis();
obj = joinPoint.proceed();
//切入后-----
- LocalDateTime localDateTime2 = DateUtil.date().toLocalDateTime();
- long between = ChronoUnit.MILLIS.between(localDateTime1, localDateTime2);
+ // 结束时间
+ long endTime = System.currentTimeMillis();
+ long between = endTime - startTime;
log.info("调用爬虫接口耗费时间:{}ms", between);
this.handle(joinPoint, between, obj);