shjung il y a 2 ans
Parent
commit
a6a997c8ff

+ 1 - 1
src/main/java/com/its/op/controller/its/vms/VmsCommonController.java

@@ -106,7 +106,7 @@ public class VmsCommonController {
     public List<TbVmsDsplPrstDto> findAllVmsDsplPrstByIds(
             @ApiParam(name = "id", value = "VMS 제어기 관리번호 목록", example = "10005", required = true)
             @RequestParam final List<Long> id) {
-        return this.dsplPrstService.findAllByIds(id, true);
+        return this.dsplPrstService.findAllListByIds(id, true);
     }
 
     @ApiOperation(value = "VMS 표출 현재 폼 조회(PHASE)(TB_VMS_DSPL_PRST)", response = TbVmsDsplPrstDto.class, responseContainer = "ArrayList")

+ 10 - 0
src/main/java/com/its/op/global/AbstractTableManager.java

@@ -86,6 +86,16 @@ public abstract class AbstractTableManager<K, T> {
     public List<T> findAll() {
         return new ArrayList<T>(this.dataMap.values());
     }
+    public List<T> findAllByIds(List<K> ids) {
+        List<T> result = new ArrayList<>();
+        for (K id : ids) {
+            T obj = get(id);
+            if (obj != null) {
+                result.add(obj);
+            }
+        }
+        return result;
+    }
 
     protected List<T> updateMap(ConcurrentHashMap<K, T> dataMap) {
         if (dataMap == null) {

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

@@ -41,4 +41,15 @@ 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;
+//    }
+
 }

+ 3 - 3
src/main/java/com/its/op/service/its/vms/TbVmsDsplPrstService.java

@@ -62,14 +62,14 @@ public class TbVmsDsplPrstService {
      * @return
      */
     @Transactional(readOnly = true)
-    public List<TbVmsDsplPrstDto> findAllByIds(List<Long> ids, boolean isMemory) {
+    public List<TbVmsDsplPrstDto> findAllListByIds(List<Long> ids, boolean isMemory) {
         List<TbVmsDsplPrst> data = this.repo.findAllByIds(ids);
         List<TbVmsCtlr> stts;
         if (isMemory) {
-            List<TbVmsCtlr> temp = this.ctlrManager.findAll();
+            List<TbVmsCtlr> temp = this.ctlrManager.findAllByIds(ids);
             stts = temp.stream().filter(obj -> "N".equals(obj.getDelYn())).collect(Collectors.toList());
         } else {
-            stts = this.ctlrRepo.findAllList();
+            stts = this.ctlrRepo.findAllListByIds(ids);
         }
 
         return makeDsplPrstList(data, stts);