dev

src/main/java/com/sig/comm/server/process/AbstractTsiCvimProcess.java → src/main/java/com/sig/comm/server/process/AbstractSigProcess.java

@@ -5,11 +5,11 @@ import com.sig.app.common.utils.Counter;
 import java.util.ArrayList;
 import java.util.List;
 
-public abstract class AbstractTsiCvimProcess {
+public abstract class AbstractSigProcess {
 
     protected int workers;
     protected List<Thread> threadList = new ArrayList<Thread>();
-    protected List<AbstractTsiCvimWorker> workerList = new ArrayList<AbstractTsiCvimWorker>();
+    protected List<AbstractSigWorker> workerList = new ArrayList<AbstractSigWorker>();
 
     protected long startTm, endTm;
     protected Counter counter = new Counter();

src/main/java/com/sig/comm/server/process/AbstractTsiCvimWorker.java → src/main/java/com/sig/comm/server/process/AbstractSigWorker.java

@@ -1,6 +1,6 @@
 package com.sig.comm.server.process;
 
-public abstract class AbstractTsiCvimWorker {
+public abstract class AbstractSigWorker {
 
     protected long avgTime = 0;
     protected int idx;

src/main/java/com/sig/comm/server/process/logging/SigCommLoggingProcess.java

@@ -2,8 +2,8 @@ package com.sig.comm.server.process.logging;
 
 import com.sig.app.common.app.AppUtils;
 import com.sig.comm.server.config.ApplicationConfig;
-import com.sig.comm.server.process.AbstractTsiCvimProcess;
-import com.sig.comm.server.process.AbstractTsiCvimWorker;
+import com.sig.comm.server.process.AbstractSigProcess;
+import com.sig.comm.server.process.AbstractSigWorker;
 import com.sig.comm.server.protocol.AbstractTsiPacket;
 import com.sig.comm.server.repository.TsiNodeManager;
 import lombok.Getter;
@@ -18,7 +18,7 @@ import java.util.List;
 @Slf4j
 @Getter
 @Service
-public class SigCommLoggingProcess extends AbstractTsiCvimProcess {
+public class SigCommLoggingProcess extends AbstractSigProcess {
 
     private List<SigCommLoggingWorker> workerList = new ArrayList<SigCommLoggingWorker>();
 
@@ -69,7 +69,7 @@ public class SigCommLoggingProcess extends AbstractTsiCvimProcess {
     }
 
     public void report() {
-        for (AbstractTsiCvimWorker worker : this.workerList) {
+        for (AbstractSigWorker worker : this.workerList) {
             worker.report();
         }
     }

src/main/java/com/sig/comm/server/process/logging/SigCommLoggingWorker.java

@@ -1,7 +1,7 @@
 package com.sig.comm.server.process.logging;
 
 import com.sig.app.common.utils.TimeUtils;
-import com.sig.comm.server.process.AbstractTsiCvimWorker;
+import com.sig.comm.server.process.AbstractSigWorker;
 import com.sig.comm.server.protocol.AbstractTsiPacket;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
@@ -11,7 +11,7 @@ import java.util.Date;
 import java.util.concurrent.LinkedBlockingQueue;
 
 @Slf4j
-public class SigCommLoggingWorker extends AbstractTsiCvimWorker implements Runnable {
+public class SigCommLoggingWorker extends AbstractSigWorker implements Runnable {
 
     private final LinkedBlockingQueue<AbstractTsiPacket> DATA_QUEUE;
     public SigCommLoggingWorker(int idx, int qSize) {

src/main/java/com/sig/comm/server/process/packet/TsiCvimPacketProcess.java → src/main/java/com/sig/comm/server/process/packet/SigCommPacketProcess.java

@@ -2,8 +2,8 @@ package com.sig.comm.server.process.packet;
 
 import com.sig.app.common.app.AppUtils;
 import com.sig.comm.server.config.ApplicationConfig;
-import com.sig.comm.server.process.AbstractTsiCvimProcess;
-import com.sig.comm.server.process.AbstractTsiCvimWorker;
+import com.sig.comm.server.process.AbstractSigProcess;
+import com.sig.comm.server.process.AbstractSigWorker;
 import com.sig.comm.server.protocol.AbstractTsiPacket;
 import com.sig.comm.server.repository.TsiNodeManager;
 import lombok.Getter;
@@ -16,7 +16,7 @@ import javax.annotation.PostConstruct;
 @Slf4j
 @Getter
 @Service
-public class TsiCvimPacketProcess extends AbstractTsiCvimProcess {
+public class SigCommPacketProcess extends AbstractSigProcess {
 
     @PostConstruct
     void init() {
@@ -65,7 +65,7 @@ public class TsiCvimPacketProcess extends AbstractTsiCvimProcess {
     }
 
     public void report() {
-        for (AbstractTsiCvimWorker worker : this.workerList) {
+        for (AbstractSigWorker worker : this.workerList) {
             worker.report();
         }
     }

src/main/java/com/sig/comm/server/process/packet/TsiCvimPacketWorker.java → src/main/java/com/sig/comm/server/process/packet/SigCommPacketWorker.java

@@ -3,7 +3,7 @@ package com.sig.comm.server.process.packet;
 import com.sig.app.common.app.AppUtils;
 import com.sig.app.common.cpu.enums.eOpCode;
 import com.sig.app.common.utils.TimeUtils;
-import com.sig.comm.server.process.AbstractTsiCvimWorker;
+import com.sig.comm.server.process.AbstractSigWorker;
 import com.sig.comm.server.process.logging.SigCommLoggingProcess;
 import com.sig.comm.server.protocol.AbstractTsiPacket;
 import com.sig.comm.server.protocol.TsiCpuDisconnected;
@@ -16,12 +16,13 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 @Slf4j
-public class TsiCvimPacketWorker extends AbstractTsiCvimWorker implements Runnable {
+public class SigCommPacketWorker extends AbstractSigWorker implements Runnable {
 
     //private ConcurrentLinkedQueue<AbstractTsiPacket> DATA_QUEUE;
     private final LinkedBlockingQueue<AbstractTsiPacket> DATA_QUEUE;
     private final SigCommLoggingProcess loggingService;
-    public TsiCvimPacketWorker(int idx, int qSize) {
+
+    public SigCommPacketWorker(int idx, int qSize) {
         this.idx = idx;
         this.qSize = qSize;
         this.loggingService = (SigCommLoggingProcess) AppUtils.getBean(SigCommLoggingProcess.class);

src/main/java/com/sig/comm/server/tcp/codec/SigRecvByteBufMessageDecoder.java

@@ -7,7 +7,7 @@ import com.sig.comm.server.dao.vo.AbstractDbmsVo;
 import com.sig.comm.server.dao.vo.AlarmOccrVo;
 import com.sig.comm.server.dao.vo.NodeStatusVo;
 import com.sig.comm.server.process.dbms.DbmsDataProcess;
-import com.sig.comm.server.process.packet.TsiCvimPacketProcess;
+import com.sig.comm.server.process.packet.SigCommPacketProcess;
 import com.sig.comm.server.protocol.TsiCpuPacket;
 import com.sig.comm.server.repository.TsiAlarmManager;
 import com.sig.comm.server.repository.TsiNodeManager;
@@ -29,12 +29,12 @@ import java.util.List;
 @ChannelHandler.Sharable
 public class SigRecvByteBufMessageDecoder extends MessageToMessageDecoder<ByteBuf> {
 
-    private final TsiCvimPacketProcess tsiCvimPacketService;
+    private final SigCommPacketProcess tsiCvimPacketService;
     private final DbmsDataProcess tsiCvimDbmsService;
 
     public SigRecvByteBufMessageDecoder(DbmsDataProcess tsiCvimDbmsService) {
         this.tsiCvimDbmsService = tsiCvimDbmsService;
-        this.tsiCvimPacketService = (TsiCvimPacketProcess) AppUtils.getBean(TsiCvimPacketProcess.class);
+        this.tsiCvimPacketService = (SigCommPacketProcess) AppUtils.getBean(SigCommPacketProcess.class);
     }
     /*@Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {

src/main/java/com/sig/comm/server/tcp/handler/SigServerIdleHandler.java

@@ -7,7 +7,7 @@ import com.sig.comm.server.dao.vo.AbstractDbmsVo;
 import com.sig.comm.server.dao.vo.AlarmOccrVo;
 import com.sig.comm.server.dao.vo.NodeStatusVo;
 import com.sig.comm.server.process.dbms.DbmsDataProcess;
-import com.sig.comm.server.process.packet.TsiCvimPacketProcess;
+import com.sig.comm.server.process.packet.SigCommPacketProcess;
 import com.sig.comm.server.protocol.TsiCpuDisconnected;
 import com.sig.comm.server.repository.TsiAlarmManager;
 import com.sig.comm.server.repository.TsiSessionManager;
@@ -25,14 +25,14 @@ import lombok.extern.slf4j.Slf4j;
 public class SigServerIdleHandler extends IdleStateHandler {
 
     private final ApplicationConfig config;
-    private TsiCvimPacketProcess tsiCvimPacketService;
+    private SigCommPacketProcess tsiCvimPacketService;
     private DbmsDataProcess tsiCvimDbmsService;
 
     public SigServerIdleHandler(ApplicationConfig config) {
         super(5, 0, 0);
         //super(config.getReaderIdleTimeSeconds(), config.getWriterIdleTimeSeconds(), config.getAllIdleTimeSeconds());
         this.config = config;
-        this.tsiCvimPacketService = (TsiCvimPacketProcess) AppUtils.getBean(TsiCvimPacketProcess.class);
+        this.tsiCvimPacketService = (SigCommPacketProcess) AppUtils.getBean(SigCommPacketProcess.class);
         this.tsiCvimDbmsService = (DbmsDataProcess) AppUtils.getBean(DbmsDataProcess.class);
         log.error("Idle Config: {}", this.config.getReaderIdleTimeSeconds());
     }

src/main/java/com/sig/comm/server/tcp/handler/SigServerInboundMessageHandler.java

@@ -6,7 +6,7 @@ import com.sig.comm.server.dao.vo.AbstractDbmsVo;
 import com.sig.comm.server.dao.vo.AlarmOccrVo;
 import com.sig.comm.server.dao.vo.NodeStatusVo;
 import com.sig.comm.server.process.dbms.DbmsDataProcess;
-import com.sig.comm.server.process.packet.TsiCvimPacketProcess;
+import com.sig.comm.server.process.packet.SigCommPacketProcess;
 import com.sig.comm.server.protocol.AbstractTsiPacket;
 import com.sig.comm.server.protocol.TsiCpuDisconnected;
 import com.sig.comm.server.repository.TsiAlarmManager;
@@ -26,12 +26,12 @@ import org.springframework.stereotype.Component;
 @ChannelHandler.Sharable
 public class SigServerInboundMessageHandler extends ChannelInboundHandlerAdapter {
 
-    private TsiCvimPacketProcess tsiCvimPacketProcess;
+    private SigCommPacketProcess sigCommPacketProcess;
     //private SigDatabaseService tsiNodeService;
     private DbmsDataProcess tsiCvimDbmsService;
 
     public SigServerInboundMessageHandler() {
-        this.tsiCvimPacketProcess = (TsiCvimPacketProcess)AppUtils.getBean(TsiCvimPacketProcess.class);
+        this.sigCommPacketProcess = (SigCommPacketProcess)AppUtils.getBean(SigCommPacketProcess.class);
         //this.tsiNodeService = (SigDatabaseService)AppUtils.getBean(SigDatabaseService.class);
         this.tsiCvimDbmsService = (DbmsDataProcess) AppUtils.getBean(DbmsDataProcess.class);
     }
@@ -71,7 +71,7 @@ public class SigServerInboundMessageHandler extends ChannelInboundHandlerAdapter
                 TsiCpuDisconnected packet = new TsiCpuDisconnected(nodeVo.getNodeId(), ctx.channel());
                 packet.setBuf(null);
                 packet.setObj(nodeVo);
-                this.tsiCvimPacketProcess.add(packet, (int)Thread.currentThread().getId());
+                this.sigCommPacketProcess.add(packet, (int)Thread.currentThread().getId());
 
                 //this.tsiCvimDbmsService.add(status, (int)Thread.currentThread().getId());
             }