From 170b15c5c2b082429e16a5beba50374fb4b1951e Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Mon, 12 Aug 2024 14:38:17 +0800 Subject: [PATCH] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/controller/SysIotModelController.java | 6 +++--- .../das/modules/node/service/impl/DataServiceImpl.java | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java index 51d25f61..fd634dfa 100644 --- a/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java +++ b/das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java @@ -226,12 +226,12 @@ public class SysIotModelController { /** 物模型导入 */ @PostMapping("/import") - public R importSysIotModel(String iotModelId, @RequestParam("file") MultipartFile file) throws IOException { + public R importSysIotModel(String id, @RequestParam("file") MultipartFile file) throws IOException { - if (StringUtils.isEmpty(iotModelId)) { + if (StringUtils.isEmpty(id)) { throw new ServiceException("请选择需要导入的物模型属性信息"); } - sysIotModelService.importSysIotModel(iotModelId, file); + sysIotModelService.importSysIotModel(id, file); return R.success(); } diff --git a/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java index 9d56dcac..03eac37f 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/DataServiceImpl.java @@ -198,16 +198,6 @@ public class DataServiceImpl implements DataService { configUpdateVo.setEquipments(equipments); ObjectMapper mapper = new ObjectMapper(); 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; }