diff --git a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java index ba8bb6b7..72a8cf9c 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.io.IoUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.das.common.config.SessionUtil; +import com.das.common.exceptions.ServiceException; import com.das.common.utils.BeanCopyUtils; import com.das.common.utils.PageDataInfo; import com.das.common.utils.PageQuery; @@ -455,6 +456,7 @@ public class SysNodeServiceImpl implements SysNodeService { terminalMessageEventHandler.sendTerminalMessageWithResult(activeNodeId, configUpdate); } catch (Exception e) { log.error("设备控制失败 ", e); + throw new ServiceException("设备控制失败 "+ e); } } diff --git a/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java b/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java index 30e94bdb..32662435 100644 --- a/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java +++ b/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java @@ -1,5 +1,7 @@ package com.das.modules.page.domian; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.util.Map; @@ -7,6 +9,7 @@ import java.util.Map; @Data public class WindTurbinesPageVo { + @JsonSerialize(using = ToStringSerializer.class) private Long irn; private String name; diff --git a/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java b/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java index c22074cc..c34048ca 100644 --- a/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java +++ b/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java @@ -1,5 +1,6 @@ package com.das.modules.page.service; +import com.das.common.exceptions.ServiceException; import com.das.modules.data.domain.SnapshotValueQueryParam; import com.das.modules.data.service.DataService; import com.das.modules.equipment.mapper.SysEquipmentMapper; @@ -77,7 +78,13 @@ public class WindTurbinesPageService { public void windTurbinesControl(List controlList){ for (DeviceCommandDto item : controlList){ - sysNodeService.deviceCommand(item); + try { + sysNodeService.deviceCommand(item); + }catch (Exception e){ + log.error("下控失败",e); + throw new ServiceException("下控失败"+e); + } + } } }