Pārlūkot izejas kodu

for version only

shjung 1 gadu atpakaļ
vecāks
revīzija
d9b60b3c92

+ 2 - 1
src/main/java/com/its/vds/xnettcp/vds/VdsTcpClient.java

@@ -86,7 +86,8 @@ public class VdsTcpClient implements Callable<Object> {
 
         // 연결 리스너 추가
         this.channelFuture.addListener(new ChannelFutureListener() {
-            @Override public void operationComplete(ChannelFuture future) {
+            @Override
+            public void operationComplete(ChannelFuture future) {
                 if (future.isSuccess()) {
                     //log.info("[{}]. VDS Controller Channel open");
                     channelOpen(future.channel());

+ 1 - 1
src/main/java/com/its/vds/xnettcp/vds/process/Job_ACK.java

@@ -19,7 +19,7 @@ public class Job_ACK implements JobProtocol {
 		}
 
 		TbVdsCtlr obj = this.packet.getVdsObj();
-		log.error("[{}]. Job_ACK: Received.", obj.getVDS_CTLR_ID());
+		log.info("[{}]. Job_ACK: Received.", obj.getVDS_CTLR_ID());
 		return 1;
 	}
 

+ 1 - 1
src/main/java/com/its/vds/xnettcp/vds/protocol/VdsReqSpeed.java

@@ -8,7 +8,7 @@ public class VdsReqSpeed extends VdsReqFramePacket {
     private byte laneNo;
 
     public VdsReqSpeed(short groupNo, short controllerNo) {
-        super(groupNo, controllerNo, VdsProtocol.vds_Length);
+        super(groupNo, controllerNo, VdsProtocol.vds_Speed);
         this.body = new byte[1];
         setLaneNo(1);
     }

+ 1 - 1
src/main/resources/logback-spring.xml

@@ -23,7 +23,7 @@
     <property name="MAX_FILESIZE" value="10MB"/>
     <property name="MAX_HISTORY"  value="30"/>
     <property name="LOG_PATTERN_FILE"        value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
-    <property name="LOG_PATTERN_ERROR"       value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%30t] [%5level] %42logger{35}.%-20M ${PID:-} %n%msg%n"/>
+    <property name="LOG_PATTERN_ERROR"       value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%30t] [%5level] %42logger{35}.%-20M %msg%n"/>
     <property name="LOG_PATTERN_PACKET"      value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_SESSION"     value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>
     <property name="LOG_PATTERN_CENTER_COMM" value="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%-5level] %msg%n"/>

+ 22 - 23
src/main/resources/mybatis/mapper/VdsStatMapper.xml

@@ -5,29 +5,28 @@
 
     <insert id="CRT_TB_VDS_DTCT_HS" parameterType="com.its.vds.vo.voStatisticsTime">
     <![CDATA[
-		INSERT INTO TB_VDS_DTCT_HS (PRCN_DT,
-		                            VDS_DTCT_NMBR,
-		                            TFVL,
-		                            SPED,
-		                            AVRG_OCPY_RATE,
-		                            AVRG_LNGT,
-		                            HDWY,
-		                            SPCE_OCPY_RATE,
-		                            SPCE_AVRG_SPED
-
-		SELECT  #{prcs.STAT_DT}               AS PRCN_DT,
-		        VDS_DTCT_NMBR                 AS VDS_DTCT_NMBR,
-		        SUM(TFVL)                     AS TFVL,
-		        ROUND(AVG(SPED), 0)           AS SPED,
-		        AVG(AVRG_OCPY_RATE)           AS AVRG_OCPY_RATE,
-		        AVG(AVRG_LNGT)                AS AVRG_LNGT,
-		        ROUND(AVG(HDWY), 0)           AS HDWY,
-		        AVG(SPCE_OCPY_RATE)           AS SPCE_OCPY_RATE,
-		        ROUND(AVG(SPCE_AVRG_SPED), 0) AS SPCE_AVRG_SPED
-		  FROM TB_VDS_DTCT_CLCT
-		 WHERE CLCT_DT BETWEEN #{prcs.FROM_DT} AND #{prcs.TO_DT}
-		 GROUP BY VDS_DTCT_NMBR
-    ]]>
+        INSERT INTO TB_VDS_DTCT_HS (PRCN_DT,
+                                    VDS_DTCT_NMBR,
+                                    TFVL,
+                                    SPED,
+                                    AVRG_OCPY_RATE,
+                                    AVRG_LNGT,
+                                    HDWY,
+                                    SPCE_OCPY_RATE,
+                                    SPCE_AVRG_SPED)
+        SELECT #{prcs.STAT_DT}               AS PRCN_DT,
+               VDS_DTCT_NMBR                 AS VDS_DTCT_NMBR,
+               SUM(TFVL)                     AS TFVL,
+               ROUND(AVG(SPED), 0)           AS SPED,
+               AVG(AVRG_OCPY_RATE)           AS AVRG_OCPY_RATE,
+               AVG(AVRG_LNGT)                AS AVRG_LNGT,
+               ROUND(AVG(HDWY), 0)           AS HDWY,
+               AVG(SPCE_OCPY_RATE)           AS SPCE_OCPY_RATE,
+               ROUND(AVG(SPCE_AVRG_SPED), 0) AS SPCE_AVRG_SPED
+        FROM TB_VDS_DTCT_CLCT
+        WHERE CLCT_DT BETWEEN #{prcs.FROM_DT} AND #{prcs.TO_DT}
+        GROUP BY VDS_DTCT_NMBR
+        ]]>
     </insert>
 
     <insert id="CRT_TB_VDS_DTCT_STAT_15M" parameterType="com.its.vds.vo.voStatisticsTime">