LogisticsRuntimeService.INSTANCE

servo/src/main/java/com/galaxis/rcs/RCS.java

@@ -31,11 +31,12 @@ public class RCS {
 
     @SneakyThrows
     public static void init() {
+        if (LogisticsRuntimeService.INSTANCE.findByEnvCode(1L) == null) {
             String fs = Joiner.on("\n").join(FileUtils.readLines(new File("./yvan-rcs-web/src/example/example1.json"), StandardCharsets.UTF_8));
             JsonWrapper jw = new JsonWrapper(fs);
-        if (LogisticsRuntimeService.INSTANCE.findByEnvCode(1L) == null) {
-            LogisticsRuntimeService.INSTANCE.createEnv(1);
-            LogisticsRuntime runtime = LogisticsRuntimeService.INSTANCE.findByEnvCode(1);
+
+            LogisticsRuntimeService.INSTANCE.createEnv(1L);
+            LogisticsRuntime runtime = LogisticsRuntimeService.INSTANCE.findByEnvCode(1L);
             runtime.loadMap(jw);
 
             runtime.start();
@@ -43,8 +44,7 @@ public class RCS {
 
     }
 
-    public static void ok()
-    {
+    public static void ok() {
     }
 
     /**

servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntimeService.java

@@ -18,20 +18,18 @@ public class LogisticsRuntimeService {
      */
     public LogisticsRuntime findByEnvCode(long envId) {
         synchronized (LOCK) {
-            LogisticsRuntime runtime = runtimeMap.get(envId);
-            if (runtime != null) {
-                return runtime;
-            }
-            return null;
-//            throw new RuntimeException("LogisticsRuntime not found for envCode: " + envId);
+            return runtimeMap.get(envId);
         }
     }
 
-    public void createEnv(int envId) {
+    public void createEnv(long envId) {
         synchronized (LOCK) {
+            if (runtimeMap.containsKey(envId)) {
+                return;
+            }
             LogisticsEnv env = new LogisticsEnv();
             env.setEnvId(envId);
-            env.setVirtual(envId != 1);
+            env.setVirtual(envId != 1L);
 
             LogisticsRuntime runtime = new LogisticsRuntime(env);
             runtimeMap.put(env.getEnvId(), runtime);