Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

zbj//1.代码调整

Browse Source
This commit is contained in:
zhangbaojian
2023-05-29 16:33:52 +08:00
parent c11f60bb06
commit d0f30d5eec
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java
View File

@@ -72,9 +72,10 @@ public class ResourceController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryData") @PostMapping("/queryData")
@ApiOperation("查询数据") @ApiOperation("查询数据")
public HttpResult<List<ResourceData>> queryData() { public HttpResult<List<ResourceData>> queryData(@RequestParam(value = "type", required = false) Integer type,
@RequestParam(value = "state", required = false) Integer state) {
String methodDescribe = getMethodDescribe("queryData"); String methodDescribe = getMethodDescribe("queryData");
List<ResourceData> result = iResourceAdministrationService.queryData(); List<ResourceData> result = iResourceAdministrationService.queryData(type,state);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} }

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ResourceService.java
View File

@@ -19,7 +19,7 @@ public interface ResourceService extends IService<ResourceData> {
Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name, Integer type); Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name, Integer type);
List<ResourceData> queryData(); List<ResourceData> queryData(Integer type,Integer state);
void previewFile(String id, HttpServletRequest request, HttpServletResponse response) throws IOException; void previewFile(String id, HttpServletRequest request, HttpServletResponse response) throws IOException;

16
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java
View File

@@ -1,11 +1,13 @@
package com.njcn.device.pq.service.impl; package com.njcn.device.pq.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.device.pq.mapper.ResourceMapper; import com.njcn.device.pq.mapper.ResourceMapper;
import com.njcn.device.pq.pojo.po.ResourceData; import com.njcn.device.pq.pojo.po.ResourceData;
import com.njcn.device.pq.service.ResourceService; import com.njcn.device.pq.service.ResourceService;
import com.njcn.oss.constant.OssPath; import com.njcn.oss.constant.OssPath;
import com.njcn.oss.utils.FileStorageUtil; import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.system.pojo.po.Resinformation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@@ -57,8 +59,18 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, ResourceDat
} }
@Override @Override
public List<ResourceData> queryData() { public List<ResourceData> queryData(Integer type,Integer state) {
List<ResourceData> list = this.list(); List<ResourceData> list = null;
if (null != type && null != state) {
LambdaQueryWrapper<ResourceData> wrapper = new LambdaQueryWrapper<>();
//type
wrapper.eq(ResourceData::getType, type);
//state
wrapper.eq(ResourceData::getState, state);
list = resourceMapper.selectList(wrapper);
} else {
list = this.list();
}
for (ResourceData resourceData : list) { for (ResourceData resourceData : list) {
if (StringUtils.isNotBlank(resourceData.getPicUrl())) { if (StringUtils.isNotBlank(resourceData.getPicUrl())) {
resourceData.setPicUrl(fileStorageUtil.getFileUrl(resourceData.getPicUrl())); resourceData.setPicUrl(fileStorageUtil.getFileUrl(resourceData.getPicUrl()));