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-25 16:33:12 +08:00
parent e4d09ac7c8
commit 376aab019d
5 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pq.pojo.param.LargeScreenParam;
import com.njcn.device.pq.pojo.po.ResourceData;
import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO;
import com.njcn.device.pq.service.LargeScreenService;
import com.njcn.device.pq.service.ResourceService;
@@ -53,21 +54,21 @@ public class ResourceController extends BaseController {
Boolean flag = iResourceAdministrationService.uploadFile(multipartFile, picture, name, type);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
}
/*
*//**
/**
* 查询数据
*//*
* @return List<ResourceData>
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/queryData")
@ApiOperation("查询数据")
@ApiImplicitParam(name = "resinformation", value = "查询数据", required = true)
public HttpResult<List<Resinformation>> queryData(@RequestBody Resinformation resinformation) {
public HttpResult<List<ResourceData>> queryData() {
String methodDescribe = getMethodDescribe("queryData");
List<Resinformation> result = iResourceAdministrationService.queryData(resinformation);
List<ResourceData> result = iResourceAdministrationService.queryData();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
*//**
/**
* 修改资源
*//*
@OperateInfo(info = LogEnum.BUSINESS_COMMON)

1
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ResourceMapper.java
View File

@@ -12,5 +12,4 @@ import java.util.List;
* @date: 2023/05/25
*/
public interface ResourceMapper extends BaseMapper<ResourceData> {
List<ResinformationParam> listAll();
}

5
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/ResourceMapper.xml
View File

@@ -1,9 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.device.pq.mapper.ResourceMapper">
<select id="listAll" resultType="com.njcn.system.pojo.po.ResinformationParam">
SELECT pr.`NAME` "name", sdd.`Name` "type", pr.DESCRIPTION "description", pr.UPDATETIME "time"
FROM pqs_resinformation pr
left join sys_dict_data sdd on sdd.Id = pr.TYPE
</select>
</mapper>

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

@@ -21,8 +21,8 @@ public interface ResourceService extends IService<ResourceData> {
Boolean uploadFile(MultipartFile multipartFile, MultipartFile picture, String name, Integer type);
/* List<Resinformation> queryData(Resinformation resinformation);
List<ResourceData> queryData();
/*
Boolean updateFile(MultipartFile multipartFile, String id, String name, String type, String description, String systemType);
Boolean deleteFile(String id);

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

@@ -72,36 +72,13 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, ResourceDat
resourceData.setType(type);
return this.save(resourceData);
}
/*
@Override
public List<Resinformation> queryData(Resinformation resinformation) {
if (StringUtils.isNotBlank(resinformation.getType()) && StringUtils.isNotBlank(resinformation.getSystemType())) {
LambdaQueryWrapper<Resinformation> wrapper = new LambdaQueryWrapper<>();
//type
wrapper.eq(Resinformation::getType, resinformation.getType());
//sysType
wrapper.eq(Resinformation::getSystemType, resinformation.getSystemType());
return resourceAdministrationMapper.selectList(wrapper);
} else if (StringUtils.isBlank(resinformation.getType()) && StringUtils.isBlank(resinformation.getSystemType())) {
return this.list();
} else if (StringUtils.isNotBlank(resinformation.getType()) && StringUtils.isBlank(resinformation.getSystemType())) {
LambdaQueryWrapper<Resinformation> wrapper = new LambdaQueryWrapper<>();
//type
wrapper.eq(Resinformation::getType, resinformation.getType());
return resourceAdministrationMapper.selectList(wrapper);
} else {
LambdaQueryWrapper<Resinformation> wrapper = new LambdaQueryWrapper<>();
//sysType
wrapper.eq(Resinformation::getSystemType, resinformation.getSystemType());
return resourceAdministrationMapper.selectList(wrapper);
}
public List<ResourceData> queryData() {
return this.list();
}
/*
@Override
public Boolean updateFile(MultipartFile multipartFile, String id, String name, String type, String description, String systemType) {
Resinformation resinformation = resourceAdministrationMapper.selectById(id);