clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、文件服务阿里云oss文件删除接口优化逻辑判断 

2、修复英语单词页面根据时间条件查询无效BUG
3、修复前端所有时间组件查询清空BUG
This commit is contained in:
xjs 2022-03-02 15:59:10 +08:00
parent 7a374dee0d
commit b6a6a9d922
12 changed files with 99 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/AliyunOssFileServiceImpl.java
View File

@ -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();
//执行删除

10
ruoyi-ui/src/views/business/english/word/index.vue
View File

@ -23,7 +23,7 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="handleQuery"
@change="dateQuery"
></el-date-picker>
</el-form-item>
<el-form-item>
@ -387,6 +387,14 @@ export default {
})
},
dateQuery() {
//清空时间参数
this.queryParams.createTime=null
this.queryParams.endCreateTime=null
this.handleQuery();
},
//根据id查询放入抽屉
findById(id) {
this.loadingC = true;

10
ruoyi-ui/src/views/business/log/apilog/index.vue
View File

@ -94,7 +94,7 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="handleQuery"
@change="dateQuery"
></el-date-picker>
</el-form-item>
@ -300,6 +300,14 @@ export default {
});
},
dateQuery() {
//清空时间参数
this.queryParams.createTime=null
this.queryParams.endCreateTime=null
this.handleQuery();
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

13
ruoyi-ui/src/views/business/log/reptilelog/index.vue
View File

@ -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 = [];

10
ruoyi-ui/src/views/business/log/tasklog/index.vue
View File

@ -22,7 +22,7 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="handleQuery"
@change="dateQuery"
></el-date-picker>
</el-form-item>
@ -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;

11
ruoyi-ui/src/views/business/openapi/copywriting/index.vue
View File

@ -47,7 +47,7 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="handleQuery"
@change="dateQuery"
></el-date-picker>
</el-form-item>
<el-form-item>
@ -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 = [];

1
ruoyi-ui/src/views/business/openapi/topsearch/index.vue
View File

@ -9,6 +9,7 @@
v-model="dateValue"
align="left"
type="date"
:clearable=false
placeholder="选择日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"

11
ruoyi-ui/src/views/business/statistics/weatherstatistics/index.vue
View File

@ -20,7 +20,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
@change="handleQuery"
@change="dateQuery"
></el-date-picker>
</el-form-item>
@ -178,11 +178,20 @@ export default {
})
},
dateQuery() {
//清空时间参数
this.historyWeatherParams.startDate=null
this.historyWeatherParams.endDate=null
this.handleQuery();
},
/** 搜索按钮操作 */
handleQuery() {
this.getHistoryWeather();
},
/** 重置按钮操作 */
resetQuery() {
this.daterangeCreateTime = [];

11
ruoyi-ui/src/views/business/webmagic/copywritingnetwork/index.vue
View File

@ -43,7 +43,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
@change="handleQuery"
@change="dateQuery"
></el-date-picker>
</el-form-item>
<el-form-item>
@ -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 = [];

11
ruoyi-ui/src/views/business/webmagic/sina/sinaNews/index.vue
View File

@ -36,7 +36,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions"
@change="handleQuery"
@change="dateQuery"
></el-date-picker>
</el-form-item>
<el-form-item>
@ -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 = [];

11
ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue
View File

@ -26,7 +26,7 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="handleQuery"
@change="dateQuery"
></el-date-picker>
</el-form-item>
<el-form-item>
@ -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()

4
xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java
View File

@ -192,6 +192,10 @@ public class EnglishWordServiceImpl extends ServiceImpl<EnglishWordMapper, Engli
String condition = englishWord.getCondition();
LambdaQueryWrapper<EnglishWord> 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);
});