ThbTech/FileManage
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
lilin 2025-05-09 11:16:48 +08:00
parent 09b3fc959b
commit 416226331a
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/main/java/com/yfd/platform/modules/experimentalData/controller/TsTaskController.java
View File

@ -3,6 +3,7 @@ package com.yfd.platform.modules.experimentalData.controller;
import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.annotation.Log; import com.yfd.platform.annotation.Log;
import com.yfd.platform.config.ResponseResult; import com.yfd.platform.config.ResponseResult;
@ -161,7 +162,9 @@ public class TsTaskController {
@ResponseBody @ResponseBody
//@PreAuthorize("@el.check('select:devicesignal')") //@PreAuthorize("@el.check('select:devicesignal')")
public ResponseResult listTsTask() { public ResponseResult listTsTask() {
List<TsTask> tsTasks = tsTaskService.list(); LambdaQueryWrapper<TsTask> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.orderByDesc(TsTask::getTaskDate);
List<TsTask> tsTasks = tsTaskService.list(queryWrapper);
return ResponseResult.successData(tsTasks); return ResponseResult.successData(tsTasks);
} }
} }

5
java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsFilesServiceImpl.java
View File

@ -208,8 +208,9 @@ public class TsFilesServiceImpl extends ServiceImpl<TsFilesMapper, TsFiles> impl
queryWrapper.isNotNull("work_path"); queryWrapper.isNotNull("work_path");
queryWrapper.ne("work_path", ""); queryWrapper.ne("work_path", "");
//排序 //排序
queryWrapper.orderByDesc("is_file");//时间 queryWrapper.orderByDesc("is_file");
// queryWrapper.orderByDesc("upload_time");//时间 //时间
queryWrapper.orderByDesc("upload_time");
//分页查询 //分页查询
Page<TsFiles> tsFilesPage = tsFilesMapper.selectPage(page, queryWrapper); Page<TsFiles> tsFilesPage = tsFilesMapper.selectPage(page, queryWrapper);
if (tsFilesPage == null) { if (tsFilesPage == null) {

1
java/src/main/java/com/yfd/platform/modules/experimentalData/service/impl/TsTaskServiceImpl.java
View File

@ -94,6 +94,7 @@ public class TsTaskServiceImpl extends ServiceImpl<TsTaskMapper, TsTask> impleme
if (parseStartDate != null && parseEndDate != null) { if (parseStartDate != null && parseEndDate != null) {
queryWrapper.ge(TsTask::getTaskDate, parseStartDate).lt(TsTask::getTaskDate, parseEndDate); queryWrapper.ge(TsTask::getTaskDate, parseStartDate).lt(TsTask::getTaskDate, parseEndDate);
} }
queryWrapper.orderByDesc(TsTask::getTaskDate);
//分页查询 //分页查询
Page<TsTask> tsTaskPage = tsTaskMapper.selectPage(page, queryWrapper); Page<TsTask> tsTaskPage = tsTaskMapper.selectPage(page, queryWrapper);
return tsTaskPage; return tsTaskPage;

2
java/src/main/java/com/yfd/platform/modules/specialDocument/service/impl/ProjectServiceImpl.java
View File

@ -85,7 +85,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
queryWrapper.like(Project::getProjectName, projectName); queryWrapper.like(Project::getProjectName, projectName);
} }
//根据创建时间排序 //根据创建时间排序
queryWrapper.orderByAsc(Project::getCreateTime); queryWrapper.orderByDesc(Project::getCreateTime);
//分页查询 //分页查询
Page<Project> sdProjectPage = projectMapper.selectPage(page, queryWrapper); Page<Project> sdProjectPage = projectMapper.selectPage(page, queryWrapper);
return sdProjectPage; return sdProjectPage;