功能完善

liuhaonan

2022-01-18 763f45ff228ee99ec5b826f38b02aa436f1468aa

功能完善

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

@@ -1,10 +1,15 @@
package com.sandu.ximon.admin.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.IpVolumeFileParam;
import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.service.IpVolumeFileService;
import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.domain.LedSFile;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -31,8 +36,13 @@
        return ResponseUtil.success(ipVolumeFileService.deleteFile(fileId));
    }

    @PostMapping("/list")
    public ResponseVO<Object> list(){
        return ResponseUtil.success(ipVolumeFileService.list());
    @GetMapping("/list")
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword){
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(keyword);
        if (null != keyword) {
            wrapper.like(IpVolumeFile::getFileName, keyword);
        }
        return ResponseUtil.success(ipVolumeFileService.list(wrapper));
    }
}

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

@@ -48,12 +48,12 @@
        return removeById(fileId);
    }

    public LambdaQueryWrapper<IpVolumeFile> listFile(ReceiveParam receiveParam) {
    public LambdaQueryWrapper<IpVolumeFile> listFile(String keyword) {
        LambdaQueryWrapper<IpVolumeFile> wrapper = Wrappers.lambdaQuery(IpVolumeFile.class).eq(IpVolumeFile::getClientId, clientService.getClientId());
        if (receiveParam.getKeyWord() == null) {
        if (keyword.isEmpty()) {
            return wrapper;
        } else {
          return   wrapper.like(IpVolumeFile::getFileName,receiveParam.getKeyWord());
          return   wrapper.like(IpVolumeFile::getFileName,keyword);
        }
    }