diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ResourceAdministrationController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ResourceAdministrationController.java index c98742291..c2d58e637 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ResourceAdministrationController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ResourceAdministrationController.java @@ -5,17 +5,19 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.system.pojo.po.Resinformation; import com.njcn.system.service.IResourceAdministrationService; import com.njcn.web.controller.BaseController; +import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.List; + /** * @version 1.0.0 @@ -46,4 +48,17 @@ public class ResourceAdministrationController extends BaseController { Boolean flag = iResourceAdministrationService.uploadFile(multipartFile, name, type, describe, systemType); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); } + + /** + * 查询数据 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryData") + @ApiOperation("查询数据") + @ApiImplicitParam(name = "baseParam",value = "查询数据",required = true) + public HttpResult> queryData(@RequestBody @Validated BaseParam baseParam) { + String methodDescribe = getMethodDescribe("queryData"); + List result = iResourceAdministrationService.queryData(baseParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/ResourceAdministrationMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/ResourceAdministrationMapper.java index d858a4e97..e4495a0b6 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/ResourceAdministrationMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/ResourceAdministrationMapper.java @@ -12,5 +12,4 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResourceAdministrationMapper extends BaseMapper { - } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ResourceAdministrationMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ResourceAdministrationMapper.xml index 5882096fe..b6301e2f5 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ResourceAdministrationMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ResourceAdministrationMapper.xml @@ -1,4 +1,5 @@ + diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IResourceAdministrationService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IResourceAdministrationService.java index 65bf7d118..bce4ed65b 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IResourceAdministrationService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IResourceAdministrationService.java @@ -3,8 +3,11 @@ package com.njcn.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.system.pojo.po.Resinformation; +import com.njcn.web.pojo.param.BaseParam; import org.springframework.web.multipart.MultipartFile; +import java.util.List; + /** * @version 1.0.0 * @author: zbj @@ -14,4 +17,5 @@ public interface IResourceAdministrationService extends IService Boolean uploadFile(MultipartFile multipartFile, String name, String type, String describe,String systemType); + List queryData(BaseParam baseParam); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/ResourceAdministrationServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/ResourceAdministrationServiceImpl.java index 6bf1def06..fa6e826b9 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/ResourceAdministrationServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/ResourceAdministrationServiceImpl.java @@ -1,18 +1,23 @@ package com.njcn.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.system.mapper.ResourceAdministrationMapper; import com.njcn.system.pojo.po.Resinformation; import com.njcn.system.service.IResourceAdministrationService; +import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import java.time.LocalDateTime; +import java.util.List; import java.util.Objects; /** @@ -50,4 +55,15 @@ public class ResourceAdministrationServiceImpl extends ServiceImpl queryData(BaseParam baseParam) { + if (!StringUtils.isBlank(baseParam.getSearchValue())) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Resinformation::getType, baseParam.getSearchValue()); + return resourceAdministrationMapper.selectPage(new Page<>(baseParam.getPageNum(), baseParam.getPageSize()), wrapper).getRecords(); + } else { + return this.page(new Page<>(baseParam.getPageNum(), baseParam.getPageSize())).getRecords(); + } + } }