shjung 2 vuotta sitten
vanhempi
commit
9d322a3028

+ 2 - 2
src/main/java/com/its/op/entity/its/rse/TbRseObuClctHs.java

@@ -70,8 +70,8 @@ public class TbRseObuClctHs implements Serializable {
             dto.setIstlLctnNm(this.rse.getIstlLctnNm());
             dto.setRseNm(this.rse.getRseNm());
         }
-        dto.setCtypDesc(CmmnCdManager.getCodeEtcDescShort(dto.getCtyp(), CmmnCdManager.VEH_TYPE));
-        dto.setObuKindDesc(CmmnCdManager.getCodeEtcDescShort(dto.getObuKind(), CmmnCdManager.OBU_KIND));
+        dto.setCtypDesc(CmmnCdManager.getCodeEtcDescShort(CmmnCdManager.VEH_TYPE, dto.getCtyp()));
+        dto.setObuKindDesc(CmmnCdManager.getCodeEtcDescShort(CmmnCdManager.OBU_KIND, dto.getObuKind()));
         return dto;
     }
 

+ 0 - 11
src/main/java/com/its/op/global/TbVmsCtlrManager.java

@@ -41,15 +41,4 @@ public class TbVmsCtlrManager extends AbstractTableManager<Long, TbVmsCtlr> {
         return updateMap(tempMap);
     }
 
-//    public List<TbVmsCtlr> findAllIds(List<Long> ids) {
-//        List<TbVmsCtlr> result = new ArrayList<>();
-//        for (Long id : ids) {
-//            TbVmsCtlr obj = get(id);
-//            if (obj != null) {
-//                result.add(obj);
-//            }
-//        }
-//        return result;
-//    }
-
 }

+ 19 - 8
src/main/java/com/its/op/scheduler/ItsOpSigPhaseListener_backup.java

@@ -28,28 +28,38 @@ public class ItsOpSigPhaseListener_backup implements DisposableBean, Runnable {
     @PostConstruct
     public void init() {
         this.mapper = new ObjectMapper();
+        restartThread();
+    }
+    private void restartThread() {
         if (this.thread == null) {
             this.thread = new Thread(this, "Daemon thread for background task");
-//            this.thread.setDaemon(true);
         }
         if (!this.thread.isAlive()) {
+            this.thread.setDaemon(true);
             this.thread.start();
         }
     }
-
     @Override
     public void run() {
         Thread currentThread = Thread.currentThread();
-        while (currentThread == this.thread && !this.isShutdown) {
-            long delayMillis = doJob();
-            try {
-                Thread.sleep(delayMillis);
-            } catch (InterruptedException e) {
-                log.error("{}", e.getMessage());
+        try {
+            while (currentThread == this.thread && !this.isShutdown) {
+                long delayMillis = doJob();
+                try {
+                    Thread.sleep(delayMillis);
+                } catch (InterruptedException e) {
+                    log.error("{}", e.getMessage());
+                }
             }
+        } catch(Throwable t) {
+            handleThreadError(t);
         }
         log.info("== ItsOpSigPhaseListener end. ==");
     }
+    private void handleThreadError(Throwable t) {
+        restartThread();
+    }
+
 
     private long doJob() {
         long delayMilliSeconds = 3000L;
@@ -88,4 +98,5 @@ public class ItsOpSigPhaseListener_backup implements DisposableBean, Runnable {
             log.error("{}", e.getMessage());
         }
     }
+
 }

+ 6 - 0
src/main/resources/static/js/vworld/map-mngr.js

@@ -694,6 +694,12 @@ export class TMapMngr {
         return lyrInfo;
     }
 
+    setTrafficGradDesc( ltc0, ltc1, ltc2, ltc2 ) {
+        TrafficGradeDesc[0] = ltc0;
+        TrafficGradeDesc[1] = ltc1;
+        TrafficGradeDesc[2] = ltc2;
+        TrafficGradeDesc[3] = ltc3;
+    }
     showFcltObjectText(ALyrIdx, AIsShow) {
         const lyrInfo = this.checkFcltEditMode(ALyrIdx);
         if (!lyrInfo) {

BIN
src/main/resources/static/libs/dx-21.2.6/css/icons/dxicons.ttf


BIN
src/main/resources/static/libs/dx-21.2.6/css/icons/dxicons.woff


BIN
src/main/resources/static/libs/dx-21.2.6/css/icons/dxicons.woff2


BIN
src/main/resources/static/libs/dx-21.2.6/css/icons/dxiconsios.eot


BIN
src/main/resources/static/libs/dx-21.2.6/css/icons/dxiconsios.ttf


BIN
src/main/resources/static/libs/dx-21.2.6/css/icons/dxiconsios.woff


BIN
src/main/resources/static/libs/dx-21.2.6/css/icons/dxiconsios.woff2


BIN
src/main/resources/static/libs/dx-21.2.6/css/icons/dxiconsmaterial.ttf


BIN
src/main/resources/static/libs/dx-21.2.6/css/icons/dxiconsmaterial.woff


BIN
src/main/resources/static/libs/dx-21.2.6/css/icons/dxiconsmaterial.woff2