diff --git a/src/main/java/com/xydl/cac/controller/IcdConfigController.java b/src/main/java/com/xydl/cac/controller/IcdConfigController.java index 81e8e5c..c1fff63 100644 --- a/src/main/java/com/xydl/cac/controller/IcdConfigController.java +++ b/src/main/java/com/xydl/cac/controller/IcdConfigController.java @@ -3,6 +3,7 @@ package com.xydl.cac.controller; import com.xydl.cac.entity.IcdConfigType; import com.xydl.cac.entity.IcdFile; import com.xydl.cac.entity.IcdIed; +import com.xydl.cac.entity.constants.Constants; import com.xydl.cac.exception.BusinessException; import com.xydl.cac.iec.RealTimeDataService; import com.xydl.cac.model.ColumnModel; @@ -52,7 +53,7 @@ public class IcdConfigController extends BasicController { @GetMapping("listFile") @ApiOperation("查询客户端icd文件列表") public Response> listFile() throws Exception { - List result = configService.listFile(0); + List result = configService.listFile(Constants.Client); for (IcdFile file : result) { file.setXml(null); } diff --git a/src/main/java/com/xydl/cac/controller/IecServerController.java b/src/main/java/com/xydl/cac/controller/IecServerController.java index 98dcf8f..149c4a7 100644 --- a/src/main/java/com/xydl/cac/controller/IecServerController.java +++ b/src/main/java/com/xydl/cac/controller/IecServerController.java @@ -1,6 +1,7 @@ package com.xydl.cac.controller; import com.xydl.cac.entity.IcdFile; +import com.xydl.cac.entity.constants.Constants; import com.xydl.cac.iec.IecServerService; import com.xydl.cac.model.Response; import com.xydl.cac.service.IcdFileConfigService; @@ -45,7 +46,7 @@ public class IecServerController extends BasicController { @GetMapping("listFile") @ApiOperation("查询服务端icd文件列表") public Response> listFile() throws Exception { - List result = configService.listFile(1); + List result = configService.listFile(Constants.Server); for (IcdFile file : result) { file.setXml(null); } diff --git a/src/main/java/com/xydl/cac/entity/WarnRule.java b/src/main/java/com/xydl/cac/entity/WarnRule.java index 34c5bf5..9464296 100644 --- a/src/main/java/com/xydl/cac/entity/WarnRule.java +++ b/src/main/java/com/xydl/cac/entity/WarnRule.java @@ -121,7 +121,7 @@ public class WarnRule { } public boolean canDo() { - if (active != null && active.intValue() == 1 && + if (active != null && active.intValue() == Constants.TRUE && actualComp != null && nSensor != null && typePoint != null) { return true; } diff --git a/src/main/java/com/xydl/cac/entity/constants/Constants.java b/src/main/java/com/xydl/cac/entity/constants/Constants.java index 4bd3c7c..8e32afc 100644 --- a/src/main/java/com/xydl/cac/entity/constants/Constants.java +++ b/src/main/java/com/xydl/cac/entity/constants/Constants.java @@ -10,6 +10,9 @@ public class Constants { public static final Integer TRUE = 1; public static final Integer FALSE = 0; + public static final Integer Server = 1; + public static final Integer Client = 0; + public static String FloatCompare = "float"; public static String IntCompare = "int"; public static String MissCompare = "miss"; diff --git a/src/main/java/com/xydl/cac/iec/IecServerService.java b/src/main/java/com/xydl/cac/iec/IecServerService.java index c557b15..68bdf2c 100644 --- a/src/main/java/com/xydl/cac/iec/IecServerService.java +++ b/src/main/java/com/xydl/cac/iec/IecServerService.java @@ -1,6 +1,7 @@ package com.xydl.cac.iec; import com.xydl.cac.entity.IcdFile; +import com.xydl.cac.entity.constants.Constants; import com.xydl.cac.exception.BusinessException; import com.xydl.cac.repository.IcdFileRepository; import lombok.extern.slf4j.Slf4j; @@ -25,7 +26,7 @@ public class IecServerService { @PostConstruct private void init() { - List list = fileRepository.findBySrvAndStart(1, 1); + List list = fileRepository.findBySrvAndStart(Constants.Server, Constants.TRUE); if (!CollectionUtils.isEmpty(list)) { IcdFile icdFile = list.get(0); try { @@ -41,7 +42,7 @@ public class IecServerService { throw new BusinessException("未找到该文件"); } IcdFile icdFile = optional.get(); - if (icdFile.getSrv() != 1) { + if (icdFile.getSrv() != Constants.Server) { throw new BusinessException("该文件不是服务端文件"); } try { @@ -49,7 +50,7 @@ public class IecServerService { iecServer.filename = icdFile.getFilename(); iecServer.fileId = icdFile.getId(); RealTimeDataService.iecServer = iecServer; - icdFile.setStart(1); + icdFile.setStart(Constants.TRUE); fileRepository.save(icdFile); } catch (Exception e) { log.error("启动IEC61850服务端异常.", e); @@ -62,7 +63,7 @@ public class IecServerService { Optional optional = fileRepository.findById(iecServer.fileId); if (optional.isPresent()) { IcdFile icdFile = optional.get(); - icdFile.setStart(0); + icdFile.setStart(Constants.FALSE); fileRepository.save(icdFile); } } diff --git a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java index f8f116b..61c157f 100644 --- a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java +++ b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java @@ -3,6 +3,7 @@ package com.xydl.cac.iec; import com.beanit.iec61850bean.*; import com.xydl.cac.entity.IcdFile; import com.xydl.cac.entity.IcdIed; +import com.xydl.cac.entity.constants.Constants; import com.xydl.cac.exception.BusinessException; import com.xydl.cac.repository.IcdFileRepository; import com.xydl.cac.repository.IcdIedRepository; @@ -33,7 +34,7 @@ public class RealTimeDataService { @PostConstruct private void init() { - List list = iedRepository.findByStart(1); + List list = iedRepository.findByStart(Constants.TRUE); if (!CollectionUtils.isEmpty(list)) { for (IcdIed ied : list) { try { @@ -61,7 +62,7 @@ public class RealTimeDataService { iecClient.connect(ied.getIp(), 102, ied.getApTitle(), icdFile.getXml()); iecClient.enableReporting(); log.info("61850订阅成功, ied=" + ied.getName() + ", ip=" + ied.getIp()); - ied.setStart(1); + ied.setStart(Constants.TRUE); iedRepository.save(ied); clientMap.put(ied.getId(), iecClient); } catch (Exception ex) { @@ -80,7 +81,7 @@ public class RealTimeDataService { Optional optional = iedRepository.findById(iedId); if (optional.isPresent()) { IcdIed ied = optional.get(); - ied.setStart(0); + ied.setStart(Constants.FALSE); iedRepository.save(ied); } } diff --git a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java index 9146fcf..65cff09 100644 --- a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java @@ -1,6 +1,7 @@ package com.xydl.cac.service.impl; import com.xydl.cac.entity.*; +import com.xydl.cac.entity.constants.Constants; import com.xydl.cac.exception.BusinessException; import com.xydl.cac.model.IcdAttUpdateModel; import com.xydl.cac.repository.*; @@ -52,14 +53,14 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService { icdFile.setMd5(md5); icdFile.setFilename(filename); icdFile.setSrv(srv); - icdFile.setStart(0); + icdFile.setStart(Constants.FALSE); fileRepository.save(icdFile); - if (srv == 1) { + if (srv == Constants.Server) { return; } for (IcdIed ied : icdFile.getIedList()) { ied.setIcdFileId(icdFile.getId()); - ied.setStart(0); + ied.setStart(Constants.FALSE); iedRepository.save(ied); } for (IcdConfigType config : icdFile.getConfigList()) { @@ -99,7 +100,7 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService { @Override public List listIed() { List result = new ArrayList<>(); - List icdFileList = fileRepository.findBySrv(0); + List icdFileList = fileRepository.findBySrv(Constants.Client); if (CollectionUtils.isEmpty(icdFileList)) { return result; } diff --git a/src/main/java/com/xydl/cac/task/AmpliDownloadTask.java b/src/main/java/com/xydl/cac/task/AmpliDownloadTask.java index d6ead69..6be6785 100644 --- a/src/main/java/com/xydl/cac/task/AmpliDownloadTask.java +++ b/src/main/java/com/xydl/cac/task/AmpliDownloadTask.java @@ -3,6 +3,7 @@ package com.xydl.cac.task; import com.jcraft.jsch.ChannelSftp; import com.xydl.cac.config.BizConfig; import com.xydl.cac.entity.*; +import com.xydl.cac.entity.constants.Constants; import com.xydl.cac.service.RemoteConfigService; import com.xydl.cac.service.RemoteDownloadService; import com.xydl.cac.socket.WebSocketServer; @@ -51,7 +52,7 @@ public class AmpliDownloadTask { } catch (Exception e) { log.error("AmpliDownloadTask.downloadAll error.", e); String str = "SFTP下载文件异常: " + e.getMessage(); - webSocketServer.sendMessage(str , null); + webSocketServer.sendMessage(str, null); dingTalkPushUtil.pushText(str); } } @@ -59,7 +60,7 @@ public class AmpliDownloadTask { // 下载一个远端服务器 private void downloadServer(RemoteConfig config) throws Exception { - if (config.getActive() == null || config.getActive().intValue() == 0) { + if (config.getActive() == null || config.getActive().intValue() == Constants.FALSE) { return; } config.toList(); @@ -77,7 +78,7 @@ public class AmpliDownloadTask { log.error("AmpliDownloadTask.downloadServer error.", e); String str = "SFTP下载文件异常: " + config.getName() + " " + config.getIp() + " " + e.getMessage(); - webSocketServer.sendMessage(str , null); + webSocketServer.sendMessage(str, null); dingTalkPushUtil.pushText(str); } finally { sftpTool.disconnect(); @@ -109,7 +110,7 @@ public class AmpliDownloadTask { if (!exist) { String localFilePath = localPath + "/" + filename; sftpTool.download(filename, bizConfig.getDatapath() + localFilePath); - if (config.getTodel() != null && config.getTodel().intValue() == 1) { + if (config.getTodel() != null && config.getTodel().intValue() == Constants.TRUE) { sftpTool.delete(filename); } item.setPath(nginxPath + localFilePath);