From b6a6a9d9227eaef533ab00b63720c87f77d3e1ca Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Wed, 2 Mar 2022 15:59:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91oss=E6=96=87=E4=BB=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=88=A4=E6=96=AD=202=E3=80=81=E4=BF=AE=E5=A4=8D=E8=8B=B1?= =?UTF-8?q?=E8=AF=AD=E5=8D=95=E8=AF=8D=E9=A1=B5=E9=9D=A2=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=97=A0?= =?UTF-8?q?=E6=95=88BUG=203=E3=80=81=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=B8=85=E7=A9=BABUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/file/service/AliyunOssFileServiceImpl.java | 7 +++++++ ruoyi-ui/src/views/business/english/word/index.vue | 10 +++++++++- ruoyi-ui/src/views/business/log/apilog/index.vue | 10 +++++++++- ruoyi-ui/src/views/business/log/reptilelog/index.vue | 9 ++++++++- ruoyi-ui/src/views/business/log/tasklog/index.vue | 10 +++++++++- .../src/views/business/openapi/copywriting/index.vue | 11 ++++++++++- .../src/views/business/openapi/topsearch/index.vue | 1 + .../business/statistics/weatherstatistics/index.vue | 11 ++++++++++- .../business/webmagic/copywritingnetwork/index.vue | 11 ++++++++++- .../views/business/webmagic/sina/sinaNews/index.vue | 11 ++++++++++- .../views/business/webmagic/weixinsougou/index.vue | 11 ++++++++++- .../xjs/word/service/impl/EnglishWordServiceImpl.java | 4 ++++ 12 files changed, 97 insertions(+), 9 deletions(-) diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssFileServiceImpl.java index a548a69c..7f348648 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssFileServiceImpl.java @@ -66,7 +66,14 @@ public class AliyunOssFileServiceImpl implements ISysFileService { String bucketName = aliyunOssProperties.getBucketName(); String host = HTTPS + bucketName + DOT + endpoint + SLASH; + //如果路径中不包含host + if (!url.contains(host)) { + return; + } + String objectName = url.substring(host.length()); + + OSS ossClient = this.getOssClient(); //执行删除 diff --git a/ruoyi-ui/src/views/business/english/word/index.vue b/ruoyi-ui/src/views/business/english/word/index.vue index 62c7596e..a41b5380 100644 --- a/ruoyi-ui/src/views/business/english/word/index.vue +++ b/ruoyi-ui/src/views/business/english/word/index.vue @@ -23,7 +23,7 @@ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" - @change="handleQuery" + @change="dateQuery" > @@ -387,6 +387,14 @@ export default { }) }, + dateQuery() { + //清空时间参数 + this.queryParams.createTime=null + this.queryParams.endCreateTime=null + + this.handleQuery(); + }, + //根据id查询放入抽屉 findById(id) { this.loadingC = true; diff --git a/ruoyi-ui/src/views/business/log/apilog/index.vue b/ruoyi-ui/src/views/business/log/apilog/index.vue index e321dc1a..d89d8d67 100644 --- a/ruoyi-ui/src/views/business/log/apilog/index.vue +++ b/ruoyi-ui/src/views/business/log/apilog/index.vue @@ -94,7 +94,7 @@ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" - @change="handleQuery" + @change="dateQuery" > @@ -300,6 +300,14 @@ export default { }); }, + dateQuery() { + //清空时间参数 + this.queryParams.createTime=null + this.queryParams.endCreateTime=null + + this.handleQuery(); + }, + /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; diff --git a/ruoyi-ui/src/views/business/log/reptilelog/index.vue b/ruoyi-ui/src/views/business/log/reptilelog/index.vue index 26641372..63fc4fb0 100644 --- a/ruoyi-ui/src/views/business/log/reptilelog/index.vue +++ b/ruoyi-ui/src/views/business/log/reptilelog/index.vue @@ -52,7 +52,7 @@ style="width: 240px" value-format="yyyy-MM-dd" type="daterange" - @change="handleQuery('queryForm')" + @change="dateQuery('queryForm')" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @@ -246,9 +246,16 @@ export default { return false; } }); + }, + dateQuery(formName) { + //清空时间参数 + this.queryParams.createTime=null + this.queryParams.endCreateTime=null + this.handleQuery(formName); }, + /** 重置按钮操作 */ resetQuery() { this.daterangeCreateTime = []; diff --git a/ruoyi-ui/src/views/business/log/tasklog/index.vue b/ruoyi-ui/src/views/business/log/tasklog/index.vue index 5a763eea..08733503 100644 --- a/ruoyi-ui/src/views/business/log/tasklog/index.vue +++ b/ruoyi-ui/src/views/business/log/tasklog/index.vue @@ -22,7 +22,7 @@ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" - @change="handleQuery" + @change="dateQuery" > @@ -184,6 +184,14 @@ export default { this.queryParams.orderByColumn = this.defaultSort.prop }, + dateQuery() { + //清空时间参数 + this.queryParams.createTime=null + this.queryParams.endCreateTime=null + + this.handleQuery(); + }, + /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; diff --git a/ruoyi-ui/src/views/business/openapi/copywriting/index.vue b/ruoyi-ui/src/views/business/openapi/copywriting/index.vue index 8db2e68d..b8b698b4 100644 --- a/ruoyi-ui/src/views/business/openapi/copywriting/index.vue +++ b/ruoyi-ui/src/views/business/openapi/copywriting/index.vue @@ -47,7 +47,7 @@ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" - @change="handleQuery" + @change="dateQuery" > @@ -235,6 +235,15 @@ export default { this.queryParams.pageNum = 1; this.getList(); }, + + dateQuery() { + //清空时间参数 + this.queryParams.createTime=null + this.queryParams.endCreateTime=null + + this.handleQuery(); + }, + /** 重置按钮操作 */ resetQuery() { this.daterangeCreateTime = []; diff --git a/ruoyi-ui/src/views/business/openapi/topsearch/index.vue b/ruoyi-ui/src/views/business/openapi/topsearch/index.vue index 82d2a3f1..7849788c 100644 --- a/ruoyi-ui/src/views/business/openapi/topsearch/index.vue +++ b/ruoyi-ui/src/views/business/openapi/topsearch/index.vue @@ -9,6 +9,7 @@ v-model="dateValue" align="left" type="date" + :clearable=false placeholder="选择日期" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" diff --git a/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue b/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue index c0b7f6ff..d9f01b4c 100644 --- a/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue +++ b/ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue @@ -20,7 +20,7 @@ start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" - @change="handleQuery" + @change="dateQuery" > @@ -178,11 +178,20 @@ export default { }) }, + dateQuery() { + //清空时间参数 + this.historyWeatherParams.startDate=null + this.historyWeatherParams.endDate=null + + this.handleQuery(); + }, /** 搜索按钮操作 */ handleQuery() { this.getHistoryWeather(); }, + + /** 重置按钮操作 */ resetQuery() { this.daterangeCreateTime = []; diff --git a/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue b/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue index f210c0df..f2b42a7d 100644 --- a/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue +++ b/ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue @@ -43,7 +43,7 @@ start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" - @change="handleQuery" + @change="dateQuery" > @@ -194,6 +194,15 @@ export default { this.queryParams.pageNum = 1; this.getList(); }, + + dateQuery() { + //清空时间参数 + this.queryParams.createTime=null + this.queryParams.endCreateTime=null + + this.handleQuery(); + }, + /** 重置按钮操作 */ resetQuery() { this.daterangeCreateTime = []; diff --git a/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue b/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue index b99d4594..c1fc911b 100644 --- a/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue +++ b/ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue @@ -36,7 +36,7 @@ start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" - @change="handleQuery" + @change="dateQuery" > @@ -184,6 +184,15 @@ export default { this.queryParams.pageNum = 1; this.getList(); }, + + dateQuery() { + //清空时间参数 + this.queryParams.createTime=null + this.queryParams.endCreateTime=null + + this.handleQuery(); + }, + /** 重置按钮操作 */ resetQuery() { this.daterangeCreateTime = []; diff --git a/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue b/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue index a28fd4ea..784e9640 100644 --- a/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue +++ b/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue @@ -26,7 +26,7 @@ range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" - @change="handleQuery" + @change="dateQuery" > @@ -220,6 +220,15 @@ export default { this.queryParams.pageNum = 1; this.getList(); }, + + dateQuery() { + //清空时间参数 + this.queryParams.createTime=null + this.queryParams.endCreateTime=null + + this.handleQuery(); + }, + /** 重置按钮操作 */ resetQuery() { this.resetSort() diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java index 1c38390d..193651f0 100644 --- a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java @@ -192,6 +192,10 @@ public class EnglishWordServiceImpl extends ServiceImpl wr = new LambdaQueryWrapper<>(); + + boolean b = Objects.nonNull(englishWord.getCreateTime()) &&Objects.nonNull(englishWord.getEndCreateTime()); + wr.between(b,EnglishWord::getCreateTime,englishWord.getCreateTime(),englishWord.getEndCreateTime()); + wr.and(StringUtils.isNotEmpty(condition), obj -> { obj.like(EnglishWord::getEnglishWord, condition).or().like(EnglishWord::getChineseWord, condition); });