sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改标注说明

Browse Source
This commit is contained in:
houwei 2024-10-24 09:54:41 +08:00
parent 64c21c5432
commit d4af88c55f
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
das/src/main/java/com/das/modules/data/controller/DataController.java
View File

@ -29,7 +29,7 @@ public class DataController {
/**
* 实时数据查询
* @param param 查询数据请求体
* @param param 查询条件
* @return redis数据
*/
@PostMapping("/snapshot")
@ -43,8 +43,8 @@ public class DataController {
/**
* 历史区间数据查询
* @param param
* @return
* @param param 查询条件
* @return TD数据库数据
*/
@PostMapping("/history")
public R<Map<String, Map<String, Map<String, Object>>>> queryTimeSeriesValues(@RequestBody @Valid TSValueQueryParam param) {

12
das/src/main/java/com/das/modules/data/service/DataService.java
View File

@ -35,7 +35,11 @@ public class DataService {
@Autowired
private DataServiceImpl dataService;
// 读取实时数据快照
/**
* 读取实时数据快照
* @param paramList 设备id及设备属性列表
* @return
*/
public Map<String, Map<String, Object>> querySnapshotValues(List<SnapshotValueQueryParam> paramList) {
long start = System.currentTimeMillis();
Map<String, Map<String, Object>> result = new HashMap<>(paramList.size());
@ -80,7 +84,11 @@ public class DataService {
return finalResult;
}
/**
* 历史区间数据查询
* @param param 查询条件
* @return TD数据库数据
*/
public Map<String, Map<String, Map<String, Object>>> queryTimeSeriesValues(TSValueQueryParam param) {
if (CollectionUtil.isEmpty(param.getDevices()) || (param.getStartTime() == null && param.getEndTime() == null)) {
throw new ServiceException("必要参数缺失");