cac
/
backend
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 改用常量

Browse Source
dev
huangfeng 8 months ago
parent 6749856f57
commit 3819d6e524
8 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/xydl/cac/controller/IcdConfigController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.xydl.cac.controller;
import com.xydl.cac.entity.IcdConfigType; import com.xydl.cac.entity.IcdConfigType;
import com.xydl.cac.entity.IcdFile; import com.xydl.cac.entity.IcdFile;
import com.xydl.cac.entity.IcdIed; import com.xydl.cac.entity.IcdIed;
import com.xydl.cac.entity.constants.Constants;
import com.xydl.cac.exception.BusinessException; import com.xydl.cac.exception.BusinessException;
import com.xydl.cac.iec.RealTimeDataService; import com.xydl.cac.iec.RealTimeDataService;
import com.xydl.cac.model.ColumnModel; import com.xydl.cac.model.ColumnModel;
@ -52,7 +53,7 @@ public class IcdConfigController extends BasicController {
@GetMapping("listFile") @GetMapping("listFile")
@ApiOperation("查询客户端icd文件列表") @ApiOperation("查询客户端icd文件列表")
public Response<List<IcdFile>> listFile() throws Exception { public Response<List<IcdFile>> listFile() throws Exception {
List<IcdFile> result = configService.listFile(0); List<IcdFile> result = configService.listFile(Constants.Client);
for (IcdFile file : result) { for (IcdFile file : result) {
file.setXml(null); file.setXml(null);
} }

3
src/main/java/com/xydl/cac/controller/IecServerController.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.xydl.cac.controller; package com.xydl.cac.controller;
import com.xydl.cac.entity.IcdFile; import com.xydl.cac.entity.IcdFile;
import com.xydl.cac.entity.constants.Constants;
import com.xydl.cac.iec.IecServerService; import com.xydl.cac.iec.IecServerService;
import com.xydl.cac.model.Response; import com.xydl.cac.model.Response;
import com.xydl.cac.service.IcdFileConfigService; import com.xydl.cac.service.IcdFileConfigService;
@ -45,7 +46,7 @@ public class IecServerController extends BasicController {
@GetMapping("listFile") @GetMapping("listFile")
@ApiOperation("查询服务端icd文件列表") @ApiOperation("查询服务端icd文件列表")
public Response<List<IcdFile>> listFile() throws Exception { public Response<List<IcdFile>> listFile() throws Exception {
List<IcdFile> result = configService.listFile(1); List<IcdFile> result = configService.listFile(Constants.Server);
for (IcdFile file : result) { for (IcdFile file : result) {
file.setXml(null); file.setXml(null);
} }

2
src/main/java/com/xydl/cac/entity/WarnRule.java
Unescape Escape View File

@ -121,7 +121,7 @@ public class WarnRule {
} }
public boolean canDo() { public boolean canDo() {
if (active != null && active.intValue() == 1 && if (active != null && active.intValue() == Constants.TRUE &&
actualComp != null && nSensor != null && typePoint != null) { actualComp != null && nSensor != null && typePoint != null) {
return true; return true;
} }

3
src/main/java/com/xydl/cac/entity/constants/Constants.java
Unescape Escape View File

@ -10,6 +10,9 @@ public class Constants {
public static final Integer TRUE = 1; public static final Integer TRUE = 1;
public static final Integer FALSE = 0; 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 FloatCompare = "float";
public static String IntCompare = "int"; public static String IntCompare = "int";
public static String MissCompare = "miss"; public static String MissCompare = "miss";

9
src/main/java/com/xydl/cac/iec/IecServerService.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.xydl.cac.iec; package com.xydl.cac.iec;
import com.xydl.cac.entity.IcdFile; import com.xydl.cac.entity.IcdFile;
import com.xydl.cac.entity.constants.Constants;
import com.xydl.cac.exception.BusinessException; import com.xydl.cac.exception.BusinessException;
import com.xydl.cac.repository.IcdFileRepository; import com.xydl.cac.repository.IcdFileRepository;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -25,7 +26,7 @@ public class IecServerService {
@PostConstruct @PostConstruct
private void init() { private void init() {
List<IcdFile> list = fileRepository.findBySrvAndStart(1, 1); List<IcdFile> list = fileRepository.findBySrvAndStart(Constants.Server, Constants.TRUE);
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
IcdFile icdFile = list.get(0); IcdFile icdFile = list.get(0);
try { try {
@ -41,7 +42,7 @@ public class IecServerService {
throw new BusinessException("未找到该文件"); throw new BusinessException("未找到该文件");
} }
IcdFile icdFile = optional.get(); IcdFile icdFile = optional.get();
if (icdFile.getSrv() != 1) { if (icdFile.getSrv() != Constants.Server) {
throw new BusinessException("该文件不是服务端文件"); throw new BusinessException("该文件不是服务端文件");
} }
try { try {
@ -49,7 +50,7 @@ public class IecServerService {
iecServer.filename = icdFile.getFilename(); iecServer.filename = icdFile.getFilename();
iecServer.fileId = icdFile.getId(); iecServer.fileId = icdFile.getId();
RealTimeDataService.iecServer = iecServer; RealTimeDataService.iecServer = iecServer;
icdFile.setStart(1); icdFile.setStart(Constants.TRUE);
fileRepository.save(icdFile); fileRepository.save(icdFile);
} catch (Exception e) { } catch (Exception e) {
log.error("启动IEC61850服务端异常.", e); log.error("启动IEC61850服务端异常.", e);
@ -62,7 +63,7 @@ public class IecServerService {
Optional<IcdFile> optional = fileRepository.findById(iecServer.fileId); Optional<IcdFile> optional = fileRepository.findById(iecServer.fileId);
if (optional.isPresent()) { if (optional.isPresent()) {
IcdFile icdFile = optional.get(); IcdFile icdFile = optional.get();
icdFile.setStart(0); icdFile.setStart(Constants.FALSE);
fileRepository.save(icdFile); fileRepository.save(icdFile);
} }
} }

7
src/main/java/com/xydl/cac/iec/RealTimeDataService.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.xydl.cac.iec;
import com.beanit.iec61850bean.*; import com.beanit.iec61850bean.*;
import com.xydl.cac.entity.IcdFile; import com.xydl.cac.entity.IcdFile;
import com.xydl.cac.entity.IcdIed; import com.xydl.cac.entity.IcdIed;
import com.xydl.cac.entity.constants.Constants;
import com.xydl.cac.exception.BusinessException; import com.xydl.cac.exception.BusinessException;
import com.xydl.cac.repository.IcdFileRepository; import com.xydl.cac.repository.IcdFileRepository;
import com.xydl.cac.repository.IcdIedRepository; import com.xydl.cac.repository.IcdIedRepository;
@ -33,7 +34,7 @@ public class RealTimeDataService {
@PostConstruct @PostConstruct
private void init() { private void init() {
List<IcdIed> list = iedRepository.findByStart(1); List<IcdIed> list = iedRepository.findByStart(Constants.TRUE);
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
for (IcdIed ied : list) { for (IcdIed ied : list) {
try { try {
@ -61,7 +62,7 @@ public class RealTimeDataService {
iecClient.connect(ied.getIp(), 102, ied.getApTitle(), icdFile.getXml()); iecClient.connect(ied.getIp(), 102, ied.getApTitle(), icdFile.getXml());
iecClient.enableReporting(); iecClient.enableReporting();
log.info("61850订阅成功, ied=" + ied.getName() + ", ip=" + ied.getIp()); log.info("61850订阅成功, ied=" + ied.getName() + ", ip=" + ied.getIp());
ied.setStart(1); ied.setStart(Constants.TRUE);
iedRepository.save(ied); iedRepository.save(ied);
clientMap.put(ied.getId(), iecClient); clientMap.put(ied.getId(), iecClient);
} catch (Exception ex) { } catch (Exception ex) {
@ -80,7 +81,7 @@ public class RealTimeDataService {
Optional<IcdIed> optional = iedRepository.findById(iedId); Optional<IcdIed> optional = iedRepository.findById(iedId);
if (optional.isPresent()) { if (optional.isPresent()) {
IcdIed ied = optional.get(); IcdIed ied = optional.get();
ied.setStart(0); ied.setStart(Constants.FALSE);
iedRepository.save(ied); iedRepository.save(ied);
} }
} }

9
src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.xydl.cac.service.impl; package com.xydl.cac.service.impl;
import com.xydl.cac.entity.*; import com.xydl.cac.entity.*;
import com.xydl.cac.entity.constants.Constants;
import com.xydl.cac.exception.BusinessException; import com.xydl.cac.exception.BusinessException;
import com.xydl.cac.model.IcdAttUpdateModel; import com.xydl.cac.model.IcdAttUpdateModel;
import com.xydl.cac.repository.*; import com.xydl.cac.repository.*;
@ -52,14 +53,14 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService {
icdFile.setMd5(md5); icdFile.setMd5(md5);
icdFile.setFilename(filename); icdFile.setFilename(filename);
icdFile.setSrv(srv); icdFile.setSrv(srv);
icdFile.setStart(0); icdFile.setStart(Constants.FALSE);
fileRepository.save(icdFile); fileRepository.save(icdFile);
if (srv == 1) { if (srv == Constants.Server) {
return; return;
} }
for (IcdIed ied : icdFile.getIedList()) { for (IcdIed ied : icdFile.getIedList()) {
ied.setIcdFileId(icdFile.getId()); ied.setIcdFileId(icdFile.getId());
ied.setStart(0); ied.setStart(Constants.FALSE);
iedRepository.save(ied); iedRepository.save(ied);
} }
for (IcdConfigType config : icdFile.getConfigList()) { for (IcdConfigType config : icdFile.getConfigList()) {
@ -99,7 +100,7 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService {
@Override @Override
public List<IcdIed> listIed() { public List<IcdIed> listIed() {
List<IcdIed> result = new ArrayList<>(); List<IcdIed> result = new ArrayList<>();
List<IcdFile> icdFileList = fileRepository.findBySrv(0); List<IcdFile> icdFileList = fileRepository.findBySrv(Constants.Client);
if (CollectionUtils.isEmpty(icdFileList)) { if (CollectionUtils.isEmpty(icdFileList)) {
return result; return result;
} }

9
src/main/java/com/xydl/cac/task/AmpliDownloadTask.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.xydl.cac.task;
import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.ChannelSftp;
import com.xydl.cac.config.BizConfig; import com.xydl.cac.config.BizConfig;
import com.xydl.cac.entity.*; import com.xydl.cac.entity.*;
import com.xydl.cac.entity.constants.Constants;
import com.xydl.cac.service.RemoteConfigService; import com.xydl.cac.service.RemoteConfigService;
import com.xydl.cac.service.RemoteDownloadService; import com.xydl.cac.service.RemoteDownloadService;
import com.xydl.cac.socket.WebSocketServer; import com.xydl.cac.socket.WebSocketServer;
@ -51,7 +52,7 @@ public class AmpliDownloadTask {
} catch (Exception e) { } catch (Exception e) {
log.error("AmpliDownloadTask.downloadAll error.", e); log.error("AmpliDownloadTask.downloadAll error.", e);
String str = "SFTP下载文件异常: " + e.getMessage(); String str = "SFTP下载文件异常: " + e.getMessage();
webSocketServer.sendMessage(str , null); webSocketServer.sendMessage(str, null);
dingTalkPushUtil.pushText(str); dingTalkPushUtil.pushText(str);
} }
} }
@ -59,7 +60,7 @@ public class AmpliDownloadTask {
// 下载一个远端服务器 // 下载一个远端服务器
private void downloadServer(RemoteConfig config) throws Exception { 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; return;
} }
config.toList(); config.toList();
@ -77,7 +78,7 @@ public class AmpliDownloadTask {
log.error("AmpliDownloadTask.downloadServer error.", e); log.error("AmpliDownloadTask.downloadServer error.", e);
String str = "SFTP下载文件异常: " + config.getName() + " " + String str = "SFTP下载文件异常: " + config.getName() + " " +
config.getIp() + " " + e.getMessage(); config.getIp() + " " + e.getMessage();
webSocketServer.sendMessage(str , null); webSocketServer.sendMessage(str, null);
dingTalkPushUtil.pushText(str); dingTalkPushUtil.pushText(str);
} finally { } finally {
sftpTool.disconnect(); sftpTool.disconnect();
@ -109,7 +110,7 @@ public class AmpliDownloadTask {
if (!exist) { if (!exist) {
String localFilePath = localPath + "/" + filename; String localFilePath = localPath + "/" + filename;
sftpTool.download(filename, bizConfig.getDatapath() + localFilePath); 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); sftpTool.delete(filename);
} }
item.setPath(nginxPath + localFilePath); item.setPath(nginxPath + localFilePath);

Write Preview
Loading…
Cancel
Save