shjung 2 years ago
parent
commit
52b3872726

+ 1 - 1
src/main/java/com/its/op/dto/its/common/NotifyDto.java

@@ -25,7 +25,7 @@ public class NotifyDto implements Serializable {
     @JsonProperty("notify_tm")
     private String notifyTm;
 
-    @ApiModelProperty("통지시각")
+    @ApiModelProperty("통지건수")
     @JsonProperty("notify_count")
     private Integer notifyCount;
 

+ 1 - 1
src/main/java/com/its/op/xnetudp/codec/CenterCommServerDecoder.java

@@ -27,7 +27,7 @@ public class CenterCommServerDecoder extends MessageToMessageDecoder<DatagramPac
 
 		byte[] buffer = new byte[recvBytes];
 		buf.getBytes(buf.readerIndex(), buffer);
-		//log.error("RECV UDP, DUMP: {}, {}", packet.sender().getAddress().getHostAddress(), SysUtils.byteArrayToHex(buffer));
+//		log.error("RECV UDP, DUMP: {}, {}", packet.sender().getAddress().getHostAddress(), SysUtils.byteArrayToHex(buffer));
 //01 00 01 01 00 01 00 00 00 00
 //27 07 01 01 00 FF 00 00 04 D1   0C 00 29 31 30 30
 //27 07 01 01 00 FF 00 00 00 10   0B 00 32 30 32 32 30 33 32 34 31 35 34 38 31 30

+ 2 - 2
src/main/java/com/its/op/xnetudp/protocol/CENTER_COMM_MESSAGE.java

@@ -27,8 +27,8 @@ public class CENTER_COMM_MESSAGE {
 	public CENTER_COMM_MESSAGE() {
 
 	}
-	public CENTER_COMM_MESSAGE(int recvId, int opCode, int length, byte msgSeq) {
-		this.sendId       = (byte)CENTER_COMM_DEFINE.INT_ID_MAIN_OPER;
+	public CENTER_COMM_MESSAGE(int senderId, int recvId, int opCode, int length, byte msgSeq) {
+		this.sendId       = (byte)senderId;
 		this.recvId       = (byte)recvId;
 		this.totalFrame   = 1;
 		this.currentFrame = 1;

+ 2 - 2
src/main/java/com/its/op/xnetudp/protocol/CENTER_PG_STATE_RES.java

@@ -22,9 +22,9 @@ public class CENTER_PG_STATE_RES extends CENTER_COMM_MESSAGE {
 	private byte comm;
 	private byte action;
 
-	public CENTER_PG_STATE_RES(int senderId, byte db, byte comm, byte action) {
+	public CENTER_PG_STATE_RES(int senderId, int receiverId, byte db, byte comm, byte action) {
 
-		super(senderId, CENTER_COMM_DEFINE.INT_OP_PG_STATE_RES, 0, (byte)0x00);
+		super(senderId, receiverId, CENTER_COMM_DEFINE.INT_OP_PG_STATE_RES, 0, (byte)0x00);
 
 		this.count  = 0x01;
 		this.type   = (byte)senderId;

+ 18 - 3
src/main/java/com/its/op/xnetudp/thread/CenterCommServerReceiver.java

@@ -35,14 +35,29 @@ public class CenterCommServerReceiver {
             return;
         }
 
+//        log.error("CenterCommServerReceiver: {}::{}::{}", data.getSendId(), data.getOpCode(), data.getSenderIp());
         if (CENTER_COMM_DEFINE.INT_ID_TRAFFIC_SERVER == data.getSendId()) {
             if (CENTER_COMM_DEFINE.INT_OP_TRAFFIC_CHANGE == data.getOpCode()) {
-                log.info("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ RECV Traffic server job completed.");
+                String prcsTm = ItsUtils.getCurrFiveMinString();
+                String currTm = ItsUtils.getCurrFiveMinString();
+                if (data.getLength() >= CENTER_COMM_DEFINE.INT_TRAFFIC_TIME_SIZE) {
+                    ByteBuffer byteBuffer = ByteBuffer.wrap(data.getBody());
+                    byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
+                    byte[] recvTm  = new byte[CENTER_COMM_DEFINE.INT_TRAFFIC_TIME_SIZE];
+                    byteBuffer.get(recvTm);
+                    prcsTm = new String(recvTm);
+                    if (data.getLength() >= (CENTER_COMM_DEFINE.INT_TRAFFIC_TIME_SIZE+CENTER_COMM_DEFINE.INT_TRAFFIC_TIME_SIZE)) {
+                        byteBuffer.get(recvTm);
+                        currTm = new String(recvTm);
+                    }
+                }
+
+                log.info("@@@ RECV Traffic server job completed.{}/{}", prcsTm, currTm);
                 NotifyDto notifyDto = NotifyDto.builder()
                         .notify("traffic")
-                        .notifyTm(ItsUtils.getCurrFiveMinString())
+                        .notifyTm(currTm)
                         .notifyCount(0)
-                        .notifyMsg("traffic")
+                        .notifyMsg(prcsTm)
                         .build();
                 ItsWebSocketMessage socketMessage = new ItsWebSocketMessage("traffic", notifyDto);
                 try {