shjung 2 jaren geleden
bovenliggende
commit
622fe6e1f2

+ 1 - 1
src/main/java/com/its/op/dao/repository/its/scrs/TbScIxrMngmRepository.java

@@ -17,7 +17,7 @@ public interface TbScIxrMngmRepository extends JpaRepository<TbScIxrMngm, String
     @Query("select p from TbScIxrMngm p where p.useEn = 1")
     List<TbScIxrMngm> findAllList();
 
-    @Query("select p from TbScIxrMngm p order by p.ixrId")
+    @Query("select p from TbScIxrMngm p where p.useEn = 1 order by p.ixrId")
     List<TbScIxrMngm> findAllOrderById();
 
 }

+ 1 - 1
src/main/java/com/its/op/dao/repository/its/scrs/TbScSgnlIxrMngmRepository.java

@@ -14,7 +14,7 @@ public interface TbScSgnlIxrMngmRepository extends JpaRepository<TbScSgnlIxrMngm
     @Query("select p from TbScSgnlIxrMngm p")
     List<TbScSgnlIxrMngm> findAll();
 
-    @Query("select p from TbScSgnlIxrMngm p")
+    @Query("select p from TbScSgnlIxrMngm p where p.rgstEn = 1")
     List<TbScSgnlIxrMngm> findAllList();
 
 }

+ 2 - 2
src/main/java/com/its/op/global/TbScIxrCmraManager.java

@@ -25,7 +25,7 @@ public class TbScIxrCmraManager extends AbstractTableManager<String, TbScIxrCmra
     }
 
     public void load() {
-        List<TbScIxrCmraMngm> objList = this.repo.findAll();
+        List<TbScIxrCmraMngm> objList = this.repo.findAllList();
         objList.forEach(obj -> {
             put(obj.getCmraId(), obj);
         });
@@ -34,7 +34,7 @@ public class TbScIxrCmraManager extends AbstractTableManager<String, TbScIxrCmra
     @Override
     public List<TbScIxrCmraMngm> reload() {
         ConcurrentHashMap<String, TbScIxrCmraMngm> tempMap = new ConcurrentHashMap<>();
-        List<TbScIxrCmraMngm> objList = this.repo.findAll();
+        List<TbScIxrCmraMngm> objList = this.repo.findAllList();
         objList.forEach(obj -> {
             tempMap.put(obj.getCmraId(), obj);
         });

+ 2 - 2
src/main/java/com/its/op/global/TbScIxrManager.java

@@ -25,7 +25,7 @@ public class TbScIxrManager extends AbstractTableManager<String, TbScIxrMngm> {
     }
 
     public void load() {
-        List<TbScIxrMngm> objList = this.repo.findAll();
+        List<TbScIxrMngm> objList = this.repo.findAllList();
         objList.forEach(obj -> {
             put(obj.getIxrId(), obj);
         });
@@ -34,7 +34,7 @@ public class TbScIxrManager extends AbstractTableManager<String, TbScIxrMngm> {
     @Override
     public List<TbScIxrMngm> reload() {
         ConcurrentHashMap<String, TbScIxrMngm> tempMap = new ConcurrentHashMap<>();
-        List<TbScIxrMngm> objList = this.repo.findAll();
+        List<TbScIxrMngm> objList = this.repo.findAllList();
         objList.forEach(obj -> {
             tempMap.put(obj.getIxrId(), obj);
         });

+ 2 - 2
src/main/java/com/its/op/global/TbScSgnlCtlrManager.java

@@ -25,7 +25,7 @@ public class TbScSgnlCtlrManager extends AbstractTableManager<Integer, TbScSgnlC
     }
 
     public void load() {
-        List<TbScSgnlCtlr> objList = this.repo.findAll();
+        List<TbScSgnlCtlr> objList = this.repo.findAllList();
         objList.forEach(obj -> {
             put(obj.getSgnlIxrNmbr(), obj);
         });
@@ -34,7 +34,7 @@ public class TbScSgnlCtlrManager extends AbstractTableManager<Integer, TbScSgnlC
     @Override
     public List<TbScSgnlCtlr> reload() {
         ConcurrentHashMap<Integer, TbScSgnlCtlr> tempMap = new ConcurrentHashMap<>();
-        List<TbScSgnlCtlr> objList = this.repo.findAll();
+        List<TbScSgnlCtlr> objList = this.repo.findAllList();
         objList.forEach(obj -> {
             tempMap.put(obj.getSgnlIxrNmbr(), obj);
         });

+ 2 - 2
src/main/java/com/its/op/global/TbScSgnlIxrManager.java

@@ -25,7 +25,7 @@ public class TbScSgnlIxrManager extends AbstractTableManager<Integer, TbScSgnlIx
     }
 
     public void load() {
-        List<TbScSgnlIxrMngm> objList = this.repo.findAll();
+        List<TbScSgnlIxrMngm> objList = this.repo.findAllList();
         objList.forEach(obj -> {
             put(obj.getSgnlIxrNmbr(), obj);
         });
@@ -34,7 +34,7 @@ public class TbScSgnlIxrManager extends AbstractTableManager<Integer, TbScSgnlIx
     @Override
     public List<TbScSgnlIxrMngm> reload() {
         ConcurrentHashMap<Integer, TbScSgnlIxrMngm> tempMap = new ConcurrentHashMap<>();
-        List<TbScSgnlIxrMngm> objList = this.repo.findAll();
+        List<TbScSgnlIxrMngm> objList = this.repo.findAllList();
         objList.forEach(obj -> {
             tempMap.put(obj.getSgnlIxrNmbr(), obj);
         });

+ 5 - 0
src/main/java/com/its/op/scheduler/job/FcltSttsJobThread.java

@@ -30,6 +30,8 @@ public class FcltSttsJobThread {
     private final TbWcamCtlrManager wcamCtlrManager;
     private final TbScSgnlCtlrManager scSgnlCtlrManager;
     private final TbScIxrCmraManager scIxrCmraManager;
+    private final TbScIxrManager scIxrManager;
+    private final TbScSgnlIxrManager scSgnlIxrManager;
 
     private final CommonSttsService commonSttsService;
     private ObjectMapper objectMapper;
@@ -54,6 +56,9 @@ public class FcltSttsJobThread {
         this.vdsCtlrManager.reload();
         this.rseCtlrManager.reload();
         this.wcamCtlrManager.reload();
+
+        this.scIxrManager.reload();
+        this.scSgnlIxrManager.reload();
         this.scSgnlCtlrManager.reload();
         this.scIxrCmraManager.reload();