排序

liuhaonan

2022-05-27 8a74d51dafd928a038dfeae9872b513ce8f62ad6

排序

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java

@@ -56,15 +56,26 @@
    }

    @GetMapping("/list")
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
            , @RequestParam(value = "orderBy", required = false) String orderBy) {
        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());

        if (orderBy.isEmpty() || orderBy == null) {
            orderBy = "id desc";
        }
        if ("createTime-1".equals(orderBy)) {
            orderBy = "create_time asc";
        } else if ("createTime-2".equals(orderBy)) {
            orderBy = "create_time desc";
        }
        LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword, orderBy);
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
        return ResponseUtil.success(ipVolumeFileService.list(wrapper));
    }


    @PostMapping("/IpVolumeFileUploading")
    public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file) {
        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_FILE_UPLOADING.getCode())) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java

@@ -98,12 +98,13 @@
    }

    @GetMapping("/list")
    public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
    public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
            , @RequestParam(value = "orderBy", required = false) String orderBy) {
        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }

        return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword));
        return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword,orderBy));
    }

    //获取任务详情

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java

@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.object.BaseConditionVO;
@@ -91,8 +90,15 @@
        return removeById(fileId);
    }

    public LambdaQueryWrapper<IpVolumeFile> listFile(BaseConditionVO baseConditionVO, String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
    public LambdaQueryWrapper<IpVolumeFile> listFile(BaseConditionVO baseConditionVO, String keyword, String orderBy) {
        if (orderBy.isEmpty() || orderBy == null) {
            orderBy = "id desc";
        }
        if ("createTime-1".equals(orderBy)) {
            orderBy = "create_time asc";
        } else if ("createTime-2".equals(orderBy)) {
            orderBy = "create_time desc";
        }
        LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);

        //不是超管

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java

@@ -365,8 +365,17 @@
    }


    public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
    public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, String orderBy) {
        if (orderBy.isEmpty() || orderBy == null) {
            orderBy = "id desc";
        }

        if ("createTime-1".equals(orderBy)) {
            orderBy = "create_time asc";
        } else if ("createTime-2".equals(orderBy)) {
            orderBy = "create_time desc";
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);

        List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
        LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);