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

das接口修改

Browse Source
This commit is contained in:
chenhaojie 2024-08-12 14:38:17 +08:00
parent b95332dd9b
commit 170b15c5c2
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,12 +226,12 @@ public class SysIotModelController {
/** 物模型导入 */ /** 物模型导入 */
@PostMapping("/import") @PostMapping("/import")
public R<Void> importSysIotModel(String iotModelId, @RequestParam("file") MultipartFile file) throws IOException { public R<Void> importSysIotModel(String id, @RequestParam("file") MultipartFile file) throws IOException {
if (StringUtils.isEmpty(iotModelId)) { if (StringUtils.isEmpty(id)) {
throw new ServiceException("请选择需要导入的物模型属性信息"); throw new ServiceException("请选择需要导入的物模型属性信息");
} }
sysIotModelService.importSysIotModel(iotModelId, file); sysIotModelService.importSysIotModel(id, file);
return R.success(); return R.success();
} }

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

@ -198,16 +198,6 @@ public class DataServiceImpl implements DataService {
configUpdateVo.setEquipments(equipments); configUpdateVo.setEquipments(equipments);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
JsonNode jsonNode = mapper.valueToTree(configUpdateVo); JsonNode jsonNode = mapper.valueToTree(configUpdateVo);
long time = System.currentTimeMillis();
// TerminalMessage configUpdate = TerminalMessage.builder()
// .cmd("configUpdate")
// .cmdId(String.valueOf(nodeId))
// .time(time)
// .data(jsonNode)
// .build();
// nodeMessageHandler.sendActionMessage(Long.valueOf(nodeId), configUpdate);
return jsonNode; return jsonNode;
} }