Browse Source

comm-local sim data update

shjung 9 tháng trước cách đây
mục cha
commit
9d84cc0021

BIN
evps-comm-local-0.0.1.jar


+ 4 - 4
evps-comm-local/src/main/java/com/evps/comm/local/EvpsCommLocalApplication.java

@@ -54,8 +54,8 @@ public class EvpsCommLocalApplication implements CommandLineRunner, ApplicationL
         ApplicationRepository applicationRepository = SpringUtils.getBean(ApplicationRepository.class);
         applicationRepository.loadDb();
 
-        EvpsLocalClientCommService itsAsnClientCommService = SpringUtils.getBean(EvpsLocalClientCommService.class);
-        itsAsnClientCommService.run();
+        EvpsLocalClientCommService evpsLocalClientCommService = SpringUtils.getBean(EvpsLocalClientCommService.class);
+        evpsLocalClientCommService.run();
     }
 
     @Override
@@ -67,8 +67,8 @@ public class EvpsCommLocalApplication implements CommandLineRunner, ApplicationL
                 sdfDate.format(new Date()), contextClosedEvent.getTimestamp(), contextClosedEvent);
 
         try {
-            EvpsLocalClientCommService itsAsnClientCommService = SpringUtils.getBean(EvpsLocalClientCommService.class);
-            itsAsnClientCommService.shutdown();
+            EvpsLocalClientCommService evpsLocalClientCommService = SpringUtils.getBean(EvpsLocalClientCommService.class);
+            evpsLocalClientCommService.shutdown();
         }
         catch (Exception e) {
             log.error("**    onApplicationEvent Exception: {}", e.getMessage());

+ 4 - 4
evps-comm-local/src/main/java/com/evps/comm/local/xnet/client/EvpsLocalClientCommService.java

@@ -40,7 +40,7 @@ public class EvpsLocalClientCommService {
     }
 
     public void run() {
-        log.info("ItsAsnClientCommService.run: Start.");
+        log.info("EvpsLocalClientCommService.run: Start.");
 
         /**
          * 센터 접속
@@ -52,13 +52,13 @@ public class EvpsLocalClientCommService {
 
         try {
             List<Future<Object>> futures = this.executorService.invokeAll(this.clientTasks);
-            log.info("ItsAsnClientCommService.run: futures, {} EA.", (long)futures.size());
+            log.info("EvpsLocalClientCommService.run: futures, {} EA.", (long)futures.size());
         }
         catch(InterruptedException e) {
-            log.error("ItsAsnClientCommService.run: Exception: InterruptedException");
+            log.error("EvpsLocalClientCommService.run: Exception: InterruptedException");
             Thread.currentThread().interrupt();
         }
-        log.info("ItsAsnClientCommService.run: ..End.");
+        log.info("EvpsLocalClientCommService.run: ..End.");
     }
 
     public void shutdown() {

+ 1 - 0
evps-comm-local/src/main/java/com/evps/comm/local/xnet/client/process/request/EvpsEvent.java

@@ -25,6 +25,7 @@ public class EvpsEvent extends EvpsFrameData {
         this.body.put(evNoArr);
         this.body.putInt((int)(event.getCurLat() * EvpsProtocolConst.EVPS_GEO_CORRECT));
         this.body.putInt((int)(event.getCurLng() * EvpsProtocolConst.EVPS_GEO_CORRECT));
+        this.body.putInt(event.getCurSpd());
         this.body.putInt(event.getRemDist());
     }
 

+ 1 - 1
evps-comm-server/src/main/java/com/evps/comm/server/xnet/server/process/response/EvpsService.java

@@ -188,7 +188,7 @@ public class EvpsService implements EvpsCommResponse {
                 .clctDt(EvpsUtils.getClctDt())
                 .serviceId(service.getServiceId())
                 .evNo(EvpsByteUtils.toString(vehNoArr).trim())
-                .eventCd(KafkaEvpsEventDto.EVPS_EVENT_SERVICE_START)
+                .eventCd(KafkaEvpsEventDto.EVPS_EVENT_VEHICLE_MOVE)
                 .curLat(service.getCurLat())
                 .curLng(service.getCurLng())
                 .curSpd(service.getCurSpd())

+ 1 - 1
evps-comm-server/src/test/java/com/evps/comm/server/EvpsCommServerApplicationTest.java

@@ -692,7 +692,7 @@ public class EvpsCommServerApplicationTest {
                 .clctDt(EvpsUtils.getClctDt())
                 .serviceId(service.getServiceId())
                 .evNo(EvpsByteUtils.toString(vehNoArr))
-                .eventCd(KafkaEvpsEventDto.EVPS_EVENT_SERVICE_START)
+                .eventCd(KafkaEvpsEventDto.EVPS_EVENT_VEHICLE_MOVE)
                 .curLat(service.getCurLat())
                 .curLng(service.getCurLng())
                 .curSpd(service.getCurSpd())