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

物模型属性查询列表修改

Browse Source
This commit is contained in:
huguanghan 2024-10-28 11:17:10 +08:00
parent 7fbd133ab8
commit 820f54a55b
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
View File

@ -95,7 +95,7 @@ public class SysIotModelController {
public PageDataInfo<SysIotModelFieldVo> querySysIotModelField(@RequestBody SysIotModelFieldDto sysIotModelFieldDto) { public PageDataInfo<SysIotModelFieldVo> querySysIotModelField(@RequestBody SysIotModelFieldDto sysIotModelFieldDto) {
if (sysIotModelFieldDto.getPageNum() == null && sysIotModelFieldDto.getPageSize() == null){ if (sysIotModelFieldDto.getPageNum() == null && sysIotModelFieldDto.getPageSize() == null){
List<SysIotModelFieldVo> sysIotModelFieldVos = sysIotModelService.queryAllModelField(sysIotModelFieldDto); List<SysIotModelFieldVo> sysIotModelFieldVos = sysIotModelService.queryAllModelField(sysIotModelFieldDto);
return new PageDataInfo<>(sysIotModelFieldVos,sysIotModelFieldVos.size()); return PageDataInfo.build(sysIotModelFieldVos,sysIotModelFieldVos.size());
} }
return sysIotModelService.querySysIotModelField(sysIotModelFieldDto); return sysIotModelService.querySysIotModelField(sysIotModelFieldDto);
} }

20
das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java
View File

@ -235,7 +235,6 @@ public class DataServiceImpl implements DataService {
@Override @Override
public void handleData(TerminalMessage data) { public void handleData(TerminalMessage data) {
// 先从redis里面获取设备的初始化数据
JsonNode jsonNode = data.getData(); JsonNode jsonNode = data.getData();
String deviceId = jsonNode.get("deviceId").asText(); String deviceId = jsonNode.get("deviceId").asText();
JsonNode values = jsonNode.get("values"); JsonNode values = jsonNode.get("values");
@ -249,25 +248,6 @@ public class DataServiceImpl implements DataService {
keyValueMap.put(key,values.get(fieldName)); keyValueMap.put(key,values.get(fieldName));
} }
adminRedisTemplate.mSet(keyValueMap); adminRedisTemplate.mSet(keyValueMap);
// Long dataTime = data.getTime();
//
// // 存入td库
// List<RTData> highList = new ArrayList<>();
// List<RTData> lowList = new ArrayList<>();
// RTData rtHighData = RTData.builder()
// .dataTime(dataTime)
// .deviceId(Long.valueOf(deviceId))
// .values(highFieldMap)
// .build();
// RTData rtLowData = RTData.builder()
// .dataTime(dataTime)
// .deviceId(Long.valueOf(deviceId))
// .values(highFieldMap)
// .build();
// highList.add(rtHighData);
// lowList.add(rtLowData);
// tdEngineService.updateYCHighValues(highList, iotModelCode);
// tdEngineService.updateYCLowValues(lowList, iotModelCode);
} }
@Override @Override