diff --git a/src/main/java/com/xydl/cac/controller/IcdConfigController.java b/src/main/java/com/xydl/cac/controller/IcdConfigController.java index cda1b63..bebfeb4 100644 --- a/src/main/java/com/xydl/cac/controller/IcdConfigController.java +++ b/src/main/java/com/xydl/cac/controller/IcdConfigController.java @@ -174,7 +174,7 @@ public class IcdConfigController extends BasicController { } Optional optional = iedRepository.findById(iedId); if (!optional.isPresent()) { - throw new BusinessException("未找到该IED"); + throw new BusinessException("未找到该IED id=" + iedId); } IcdIed ied = optional.get(); try { @@ -201,7 +201,7 @@ public class IcdConfigController extends BasicController { } Optional optional = iedRepository.findById(iedId); if (!optional.isPresent()) { - throw new BusinessException("未找到该IED"); + throw new BusinessException("未找到该IED id=" + iedId); } IcdIed ied = optional.get(); ied.setStart(Constants.FALSE); diff --git a/src/main/java/com/xydl/cac/controller/NSensorController.java b/src/main/java/com/xydl/cac/controller/NSensorController.java index ca75bb4..9a712d4 100644 --- a/src/main/java/com/xydl/cac/controller/NSensorController.java +++ b/src/main/java/com/xydl/cac/controller/NSensorController.java @@ -157,7 +157,7 @@ public class NSensorController extends BasicController { String typename = ""; List list = sensorRepository.findByTypeId(model.getTypeId()); if (CollectionUtils.isEmpty(list)) { - throw new BusinessException("未找到该类型的装置"); + throw new BusinessException("未找到该类型的装置typeId=" + model.getTypeId()); } List>> detailList = new ArrayList<>(); for (NSensor sensor : list) { diff --git a/src/main/java/com/xydl/cac/controller/WarnRuleController.java b/src/main/java/com/xydl/cac/controller/WarnRuleController.java index b012ab5..a8c8d8b 100644 --- a/src/main/java/com/xydl/cac/controller/WarnRuleController.java +++ b/src/main/java/com/xydl/cac/controller/WarnRuleController.java @@ -67,7 +67,7 @@ public class WarnRuleController extends BasicController { } else if (Constants.Miss.equalsIgnoreCase(name)) { return missCompare; } else { - throw new BusinessException("未找到该比较器"); + throw new BusinessException("未找到该比较器" + name); } } diff --git a/src/main/java/com/xydl/cac/iec/IecServerService.java b/src/main/java/com/xydl/cac/iec/IecServerService.java index f02518d..e19ee98 100644 --- a/src/main/java/com/xydl/cac/iec/IecServerService.java +++ b/src/main/java/com/xydl/cac/iec/IecServerService.java @@ -41,7 +41,7 @@ public class IecServerService { public void startServer(Integer fileId, int port) throws BusinessException { Optional optional = fileRepository.findById(fileId); if (!optional.isPresent()) { - throw new BusinessException("未找到该文件"); + throw new BusinessException("未找到该文件fileId=" + fileId); } IcdFile icdFile = optional.get(); if (icdFile.getSrv() != Constants.Server) { @@ -94,7 +94,7 @@ public class IecServerService { public List listParamindex(Integer fileId) throws Exception { Optional optional = fileRepository.findById(fileId); if (!optional.isPresent()) { - throw new BusinessException("未找到该文件"); + throw new BusinessException("未找到该文件fileId=" + fileId); } IcdFile icdFile = optional.get(); if (icdFile.getSrv() != Constants.Server) { diff --git a/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java index c435b7b..3f2d0e4 100644 --- a/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java @@ -105,7 +105,7 @@ public class JgServiceImpl implements JgService { item.setId(null); Optional optionalBdz = bdzRepository.findById(item.getBdzid()); if (!optionalBdz.isPresent()) { - throw new BusinessException("未找到该变电站"); + throw new BusinessException("未找到该变电站id=" + item.getBdzid()); } List list = repository.findByBdzidAndMc(item.getBdzid(), item.getMc()); if (!CollectionUtils.isEmpty(list)) { @@ -119,7 +119,7 @@ public class JgServiceImpl implements JgService { public void update(Jg item) throws Exception { Optional optionalBdz = bdzRepository.findById(item.getBdzid()); if (!optionalBdz.isPresent()) { - throw new BusinessException("未找到该变电站"); + throw new BusinessException("未找到该变电站id=" + item.getBdzid()); } List list = repository.findByBdzidAndMcAndIdIsNot(item.getBdzid(), item.getMc(), item.getId()); if (!CollectionUtils.isEmpty(list)) { @@ -144,7 +144,7 @@ public class JgServiceImpl implements JgService { public Jg detail(Integer id) throws Exception { Optional optional = repository.findById(id); if (!optional.isPresent()) { - throw new BusinessException("未找到该区域"); + throw new BusinessException("未找到该区域id=" + id); } Jg jg = optional.get(); Optional optionalBdz = bdzRepository.findById(jg.getBdzid()); diff --git a/src/main/java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java index acdeec2..c419725 100644 --- a/src/main/java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java @@ -78,7 +78,7 @@ public class WarnRuleServiceImpl implements WarnRuleService { public void update(WarnRule item) throws Exception { Optional optional = repository.findById(item.getId()); if (!optional.isPresent()) { - throw new BusinessException("未找到该告警规则"); + throw new BusinessException("未找到该告警规则id=" + item.getId()); } WarnRule rule = optional.get(); rule.setComparator(item.getComparator()); diff --git a/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java index 922da6f..429b38d 100644 --- a/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java @@ -97,7 +97,7 @@ public class WarningServiceImpl implements WarningService { public void updateState(Warning warning) throws Exception { Optional byId = repository.findById(warning.getId()); if (!byId.isPresent()) { - throw new BusinessException("未找到该告警" + warning.getId()); + throw new BusinessException("未找到该告警id=" + warning.getId()); } Warning war = byId.get(); war.setState(warning.getState()); @@ -107,7 +107,7 @@ public class WarningServiceImpl implements WarningService { @Override public void oneKeyUpdateState() { - repository.updateWarningState("0" , "1"); + repository.updateWarningState("0", "1"); } diff --git a/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java index c87b1ad..5cb0fc3 100644 --- a/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java @@ -93,7 +93,7 @@ public class ZsbServiceImpl implements ZsbService { item.setBdzid(jg.getBdzid()); Optional optionalLx = lxRepository.findById(item.getLxid()); if (!optionalLx.isPresent()) { - throw new BusinessException("未找到该设备类型"); + throw new BusinessException("未找到该设备类型id=" + item.getLxid()); } List list = repository.findByJgidAndMc(item.getJgid(), item.getMc()); if (!CollectionUtils.isEmpty(list)) { @@ -109,7 +109,7 @@ public class ZsbServiceImpl implements ZsbService { item.setBdzid(jg.getBdzid()); Optional optionalLx = lxRepository.findById(item.getLxid()); if (!optionalLx.isPresent()) { - throw new BusinessException("未找到该设备类型"); + throw new BusinessException("未找到该设备类型id=" + item.getLxid()); } List list = repository.findByJgidAndMcAndIdIsNot(item.getJgid(), item.getMc(), item.getId()); if (!CollectionUtils.isEmpty(list)) { diff --git a/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java b/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java index 6c6557d..e6254ad 100644 --- a/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java +++ b/src/main/java/com/xydl/cac/thermal/ThermalCollectService.java @@ -26,8 +26,13 @@ public class ThermalCollectService { try { LoginModule.init(null, null); NSensor sensor = list.get(0); - LoginModule.login(sensor.getIp(), sensor.getPort(), sensor.getUsername(), sensor.getPasswd()); - log.info("登入到" + sensor.getIp() + ":" + sensor.getPort() + ", 用户名:" + sensor.getUsername()); + boolean r = LoginModule.login(sensor.getIp(), sensor.getPort(), sensor.getUsername(), sensor.getPasswd()); + if (r) { + log.info("登入成功" + sensor.getIp() + ":" + sensor.getPort() + ", 用户名:" + sensor.getUsername()); + } else { + log.error("登入失败" + sensor.getIp() + ":" + sensor.getPort() + ", 用户名:" + sensor.getUsername()); + return; + } String time = DateUtil.format(new Date()); for (NSensor item : list) { NetSDKLib.NET_RADIOMETRYINFO data = ThermalCameraModule.queryItemTemper(0, 0, sensor.getTmId(), sensor.getTmType());