shjung 2 tahun lalu
induk
melakukan
54d6dca67a

+ 1 - 0
src/main/java/com/its/dsrc/xnettcp/dsrc/process/response/AcceptResponse.java

@@ -116,6 +116,7 @@ public class AcceptResponse implements DsrcAsn1Response {
         }
 
         this.obj.channelLoginInit();
+        this.obj.getStts().initNormal();
 
         TbRseCtlrCnncHs voLog = new TbRseCtlrCnncHs();
         voLog.setRSE_CTLR_NMBR(this.obj.getID());

+ 2 - 1
src/main/java/com/its/dsrc/xnettcp/dsrc/process/response/PublicationResponse.java

@@ -88,6 +88,7 @@ public class PublicationResponse implements DsrcAsn1Response {
                     eControlDevice e = eControlDevice.getByValue(controlDevice.getVpbdControlID().value[0]);
                     if (e == eControlDevice.Control_StatusRequest) {
                         //TODO: DSRC Device Status
+                        log.info("PublicationResponse.responsePublicationData: {}, OBU Status {}", this.obj.getMcuID(), controlDevice);
                         //ControlDeviceService.getInstance().decoding_ControlDevice_Status_AirPoint(this.obj, controlDevice);
                         ControlDeviceService.getInstance().decoding_ControlDevice_Status_ITTelecom(this.obj, controlDevice);
                     }
@@ -108,7 +109,7 @@ public class PublicationResponse implements DsrcAsn1Response {
             obuInfos.decode(berInputStream);
             List<OBUGatherInfo> list = obuInfos.getOBUGatherInfo();
             //TODO: OBU Gather Info
-            log.info("PublicationResponse.responsePublicationData: {}, DSRC OBU Traffic, OBU: {} EA", this.obj.getMcuID(), list.size());
+            log.info("PublicationResponse.responsePublicationData: {}, OBU Traffic {} EA", this.obj.getMcuID(), list.size());
             OBUGatherInfoService.getInstance().decoding_OBUGatherInfo(this.obj, list);
         }
         else {

+ 5 - 5
src/main/java/com/its/dsrc/xnettcp/dsrc/process/response/SubscriptionResponse.java

@@ -52,7 +52,7 @@ public class SubscriptionResponse implements DsrcAsn1Response {
                     boolean guaranteeBool  = subscriptionData.getDatexSubscribeGuaranteeBool().value;
 
                     objectId = DsrcAsn1Utils.getObjectId(subscriptionData.getDatexSubscribePdu().getEndApplicationMessageId().value);
-                    log.info("SubscriptionResponse.response: objectId: {}", objectId);
+                    //log.info("SubscriptionResponse.response: objectId: {}", objectId);
 
                     if (objectId != eObjectId.OBJ_ProbeVehicleDetectionRoadSide.getValue() &&
                         objectId  > eObjectId.OBJ_DSRCRecentOBUTransactionInfo.getValue()) {
@@ -66,20 +66,20 @@ public class SubscriptionResponse implements DsrcAsn1Response {
                         if (subscriptionMode != null) {
                             // subscriptionMode = single, event-driven, periodic
                             if (subscriptionMode.getSingle() != null) {
-                                log.info("SubscriptionResponse.response: {}, SubscriptionSingleService", ipAddress);
+                                //log.info("SubscriptionResponse.response: {}, SubscriptionSingleService", ipAddress);
                                 subscriptionService = SubscriptionSingleService.getInstance();
                             } else if (subscriptionMode.getEventDriven() != null) {
-                                log.info("SubscriptionResponse.response: {}, SubscriptionRegisterService[EventDriven]", ipAddress);
+                                //log.info("SubscriptionResponse.response: {}, SubscriptionRegisterService[EventDriven]", ipAddress);
                                 subscriptionService = SubscriptionRegisterService.getInstance();
                             } else if (subscriptionMode.getPeriodic() != null) {
-                                log.info("SubscriptionResponse.response: {}, SubscriptionRegisterService[Periodic]", ipAddress);
+                                //log.info("SubscriptionResponse.response: {}, SubscriptionRegisterService[Periodic]", ipAddress);
                                 subscriptionService = SubscriptionRegisterService.getInstance();
                             }
                             if (guaranteeBool) {
                                 resC2c = DsrcAsn1Accept.makeC2CAuthenticatedMessage(this.obj, this.ctx.channel(), this.c2c);
                             }
                         } else {
-                            log.info("SubscriptionResponse.response: {}, SubscriptionMode null", ipAddress);
+                            log.warn("SubscriptionResponse.response: {}, SubscriptionMode null", ipAddress);
                         }
                     }
                 }

+ 1 - 1
src/main/java/com/its/dsrc/xnettcp/dsrc/process/service/ControlDeviceService.java

@@ -94,7 +94,7 @@ public class ControlDeviceService {
             StatusOfDeviceInfo deviceInfo = new StatusOfDeviceInfo();
             ByteArrayInputStream deviceStream = new ByteArrayInputStream(controlDevice.getVpbdControlDeviceData().value);
             deviceInfo.decode(deviceStream);
-            log.info("ControlDeviceService.decoding_ControlDevice_Status: controlDevice{}, deviceInfo: {}", controlDevice.toString(), deviceInfo.toString());
+            log.info("ControlDeviceService.decoding_ControlDevice_Status: controlDevice{}, deviceInfo: {}", controlDevice, deviceInfo);
 
             obj.getStts().initNormal();    // 상태정보 업데이트
             byte devStts[] = deviceInfo.getStatusInfo().value;