diff --git a/src/main/java/com/xydl/cac/controller/IecServerController.java b/src/main/java/com/xydl/cac/controller/IecServerController.java index d45de55..7ca6914 100644 --- a/src/main/java/com/xydl/cac/controller/IecServerController.java +++ b/src/main/java/com/xydl/cac/controller/IecServerController.java @@ -1,8 +1,8 @@ package com.xydl.cac.controller; import com.xydl.cac.iec.IecServerService; +import com.xydl.cac.iec.RealTimeDataService; import com.xydl.cac.model.Response; -import com.xydl.cac.service.RealTimeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -22,20 +22,20 @@ public class IecServerController extends BasicController { @Resource IecServerService iecServerService; @Resource - RealTimeService realTimeService; + RealTimeDataService realTimeDataService; @GetMapping("start") @ApiOperation("启动IEC服务端") public Response start() throws Exception { iecServerService.startServer(); - realTimeService.start(); + realTimeDataService.start(); return Response.success("OK"); } @GetMapping("stop") @ApiOperation("停止IEC服务端") public Response stop() throws Exception { - realTimeService.stop(); + realTimeDataService.stop(); iecServerService.stop(); return Response.success("OK"); } diff --git a/src/main/java/com/xydl/cac/iec/IecClient.java b/src/main/java/com/xydl/cac/iec/IecClient.java index 874fdfe..def79a9 100644 --- a/src/main/java/com/xydl/cac/iec/IecClient.java +++ b/src/main/java/com/xydl/cac/iec/IecClient.java @@ -1,7 +1,6 @@ package com.xydl.cac.iec; import com.beanit.iec61850bean.*; -import com.xydl.cac.service.impl.RealTimeServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -84,7 +83,7 @@ public class IecClient implements ClientEventListener { @Override public void newReport(Report report) { if (report != null) { - RealTimeServiceImpl.processReport(report); + RealTimeDataService.processReport(report); } } diff --git a/src/main/java/com/xydl/cac/iec/IecServerService.java b/src/main/java/com/xydl/cac/iec/IecServerService.java index 39b822e..6627f4b 100644 --- a/src/main/java/com/xydl/cac/iec/IecServerService.java +++ b/src/main/java/com/xydl/cac/iec/IecServerService.java @@ -2,7 +2,6 @@ package com.xydl.cac.iec; import com.xydl.cac.entity.IcdFile; import com.xydl.cac.repository.IcdFileRepository; -import com.xydl.cac.service.impl.RealTimeServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -27,7 +26,7 @@ public class IecServerService { IcdFile icdFile = icdFileList.get(0); try { iecServer.start(icdFile.getXml(), 102); - RealTimeServiceImpl.iecServer = iecServer; + RealTimeDataService.iecServer = iecServer; } catch (Exception e) { log.error("启动IEC61850服务端异常.", e); } @@ -36,7 +35,7 @@ public class IecServerService { @PreDestroy public void stop() { - RealTimeServiceImpl.iecServer = null; + RealTimeDataService.iecServer = null; if (iecServer != null) { iecServer.close(); } diff --git a/src/main/java/com/xydl/cac/service/impl/RealTimeServiceImpl.java b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java similarity index 93% rename from src/main/java/com/xydl/cac/service/impl/RealTimeServiceImpl.java rename to src/main/java/com/xydl/cac/iec/RealTimeDataService.java index 074a1b1..2fbf75a 100644 --- a/src/main/java/com/xydl/cac/service/impl/RealTimeServiceImpl.java +++ b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java @@ -1,12 +1,10 @@ -package com.xydl.cac.service.impl; +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.iec.IecClient; -import com.xydl.cac.iec.IecServer; -import com.xydl.cac.repository.*; -import com.xydl.cac.service.RealTimeService; +import com.xydl.cac.repository.IcdFileRepository; +import com.xydl.cac.repository.IcdIedRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -17,11 +15,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; - @Service @Slf4j -public class RealTimeServiceImpl implements RealTimeService { - +public class RealTimeDataService { @Resource IcdFileRepository fileRepository; @Resource @@ -31,7 +27,6 @@ public class RealTimeServiceImpl implements RealTimeService { public static IecServer iecServer = null; HashMap clientMap = new HashMap<>(); - @Override public void start() { List icdFileList = fileRepository.findAll(); if (CollectionUtils.isEmpty(icdFileList)) { @@ -56,7 +51,6 @@ public class RealTimeServiceImpl implements RealTimeService { } @PreDestroy - @Override public void stop() { Iterator it = clientMap.keySet().iterator(); while (it.hasNext()) { diff --git a/src/main/java/com/xydl/cac/service/RealTimeService.java b/src/main/java/com/xydl/cac/service/RealTimeService.java deleted file mode 100644 index a5abe24..0000000 --- a/src/main/java/com/xydl/cac/service/RealTimeService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.xydl.cac.service; - -public interface RealTimeService { - - void start(); - - void stop(); -}