changes

liuhaonan

2022-10-25 d495f9b8cdc83663e4189bc3cc72ac9543ff5555

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

@@ -1,8 +1,10 @@
package com.sandu.ximon.admin.service;

import com.alibaba.fastjson.JSON;
import com.alipay.service.schema.util.StringUtil;
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;
@@ -15,6 +17,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.IpVolumeFileMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -38,15 +41,10 @@

    public boolean addFile(IpVolumeFileParam fileParam) {
        IpVolumeFile file = new IpVolumeFile();
//        if(SecurityUtils.getClientId()!=null){
//            file.setUserName(SecurityUtils.getUsername());
//        }
//
        if (SecurityUtils.getClientId() != null) {
            file.setUserName(SecurityUtils.getUsername());
            file.setUserId(SecurityUtils.getClientId());
            file.setClientId(clientService.getClientId());
        }

        file.setUserName(SecurityUtils.getUsername());
        file.setUserId(SecurityUtils.getClientId());
        file.setClientId(clientService.getClientId());

        file.setFileName(fileParam.getFileName());
        file.setFileUrl(fileParam.getFileUrl());
@@ -90,17 +88,8 @@
        return removeById(fileId);
    }

    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";
        }
    public List<IpVolumeFile> ipVolumeFileList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
        LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);

        //不是超管
        if (SecurityUtils.getClientId() != null) {
            wrapper = wrapper.eq(IpVolumeFile::getClientId, SecurityUtils.getUserId())
@@ -112,10 +101,43 @@
        if (keyword != null && !keyword.isEmpty()) {
            wrapper.like(IpVolumeFile::getFileName, keyword);
        }
        return wrapper;

        //排序字段
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = OrderByEnums.IP_VOLUME_FILE_CREATE_TIME.getCode();
                    break;
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = OrderByEnums.ASC.getCode();
                    break;
                case 2:
                    orderBySeq = OrderByEnums.DESC.getCode();
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;

        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
        }
        List<IpVolumeFile> list = list(wrapper);

        return list;
    }

    public List<IpVolumeFile> listFiles() {
    public List<IpVolumeFile> listFiles(String keyword) {
        LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class);

        //不是超管
@@ -125,6 +147,9 @@
                        file.eq(IpVolumeFile::getUserId, SecurityUtils.getUserId());
                    });
        }
        if (keyword != null && !StringUtil.isEmpty(keyword)) {
            wrapper.like(IpVolumeFile::getFileName, keyword);
        }
        return list(wrapper);
    }