shjung il y a 2 ans
Parent
commit
5ed9665ecc
19 fichiers modifiés avec 117 ajouts et 69 suppressions
  1. 2 2
      src/main/java/com/its/op/controller/its/common/CommonSttsController.java
  2. 9 1
      src/main/java/com/its/op/controller/its/database/TbUnitSystController.java
  3. 2 2
      src/main/java/com/its/op/controller/its/history/TbUnitSystSttsHsHistController.java
  4. 2 2
      src/main/java/com/its/op/controller/its/management/UnitSystController.java
  5. 2 2
      src/main/java/com/its/op/dao/repository/its/code/TbCmmnCdRepository.java
  6. 2 2
      src/main/java/com/its/op/dao/repository/its/facility/TbFcltSttsAlrmStupRepository.java
  7. 2 2
      src/main/java/com/its/op/dao/repository/its/ifsc/TbIfscTrafRepository.java
  8. 2 2
      src/main/java/com/its/op/dao/repository/its/link/TbLinkTrafRepository.java
  9. 2 2
      src/main/java/com/its/op/dao/repository/its/oper/TbUserCnncHsRepository.java
  10. 6 8
      src/main/java/com/its/op/dao/repository/its/oper/TbUserGropMenuAthrRepository.java
  11. 2 2
      src/main/java/com/its/op/dao/repository/its/road/TbRoadTrafRepository.java
  12. 11 4
      src/main/java/com/its/op/dao/repository/its/unit/TbUnitSystRepository.java
  13. 2 2
      src/main/java/com/its/op/dao/repository/its/vds/TbVdsCtlrRepository.java
  14. 2 2
      src/main/java/com/its/op/dao/repository/its/vms/TbVmsIfscRltnIfscRepository.java
  15. 2 2
      src/main/java/com/its/op/global/TbUnitSystManager.java
  16. 6 1
      src/main/java/com/its/op/scheduler/job/UnitSttsJobThread.java
  17. 49 19
      src/main/java/com/its/op/service/its/unit/TbUnitSystService.java
  18. 1 1
      src/main/java/com/its/op/service/its/unit/TbUnitSystSttsHsService.java
  19. 11 11
      src/main/java/com/its/op/xnetudp/thread/CenterCommServerReceiver.java

+ 2 - 2
src/main/java/com/its/op/controller/its/common/CommonSttsController.java

@@ -38,8 +38,8 @@ public class CommonSttsController {
 
     @ApiOperation(value = "ITS 프로세스 상태", response = TbUnitSystSttsDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/process/its", produces = {"application/json; charset=utf8"})
-    public List<TbUnitSystSttsDto> findAllItsProcessStts() {
-        return this.unitSystService.findAllStts();
+    public List<TbUnitSystSttsDto> findAllProcessUnitStts() {
+        return this.unitSystService.findAllProcessUnitStts(true);
     }
 
     @ApiOperation(value = "시설물 상태현황(종합)", response = FcltSttsListDto.class)

+ 9 - 1
src/main/java/com/its/op/controller/its/database/TbUnitSystController.java

@@ -24,7 +24,15 @@ public class TbUnitSystController {
     @ApiOperation(value = "단위 시스템 전체조회(TB_UNIT_SYST)", response = TbUnitSystDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "", produces = {"application/json; charset=utf8"})
     public List<TbUnitSystDto> findAll() {
-        return service.findAllUnitSystList();
+        //TODO
+        return service.findAllList(true);
+        //return service.findAll(true);
+    }
+
+    @ApiOperation(value = "단위 시스템 전체조회-삭제되지 않은 정보(TB_UNIT_SYST)", response = TbUnitSystDto.class, responseContainer = "ArrayList")
+    @GetMapping(value = "/list", produces = {"application/json; charset=utf8"})
+    public List<TbUnitSystDto> findAllList() {
+        return service.findAllList(true);
     }
 
     @ApiOperation(value = "단위 시스템 개별조회(TB_UNIT_SYST)", response = TbUnitSystDto.class)

+ 2 - 2
src/main/java/com/its/op/controller/its/history/TbUnitSystSttsHsHistController.java

@@ -28,8 +28,8 @@ public class TbUnitSystSttsHsHistController {
 
     @ApiOperation(value = "프로세스목록조회(TB_UNIT_SYST)", response = TbUnitSystDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/type", produces = {"application/json; charset=utf8"})
-    public List<TbUnitSystDto> findAllProcess() {
-        return this.unitService.findAllList();
+    public List<TbUnitSystDto> findAllProcessUnitList() {
+        return this.unitService.findAllProcessUnitList(true);
     }
 
     @ApiOperation(value = "이력조회(TB_UNIT_SYST_STTS_HS, TB_UNIT_SYST)", response = TbUnitSystSttsHsHistDto.class, responseContainer = "ArrayList")

+ 2 - 2
src/main/java/com/its/op/controller/its/management/UnitSystController.java

@@ -23,8 +23,8 @@ public class UnitSystController {
 
     @ApiOperation(value = "프로세스 상태(TB_UNIT_SYST_STTS)", response = TbUnitSystSttsDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/stts", produces = {"application/json; charset=utf8"})
-    public List<TbUnitSystSttsDto> findAllProcessStts() {
-        return this.service.findAllStts();
+    public List<TbUnitSystSttsDto> findAllProcessUnitStts() {
+        return this.service.findAllProcessUnitStts(true);
     }
 
 }

+ 2 - 2
src/main/java/com/its/op/dao/repository/its/code/TbCmmnCdRepository.java

@@ -21,8 +21,8 @@ public interface TbCmmnCdRepository extends JpaRepository<TbCmmnCd, TbCmmnCdKey>
     @Query("select p from TbCmmnCd p where p.cmmnClsfCd = :cmmnClsfCd")
     List<TbCmmnCd> findAllByCmmnClsfCd(@Param("cmmnClsfCd") String cmmnClsfCd);
 
-    @Query("select p from TbCmmnCd p where p.cmmnClsfCd = :cmmnClsfCd and  p.cmmnCd = :cmmnCd")
-    TbCmmnCd findAllByCmmnClsfCdCmmnCd(@Param("cmmnClsfCd") String cmmnClsfCd, @Param("cmmnCd") String cmmnCd);
+//    @Query("select p from TbCmmnCd p where p.cmmnClsfCd = :cmmnClsfCd and  p.cmmnCd = :cmmnCd")
+//    TbCmmnCd findAllByCmmnClsfCdCmmnCd(@Param("cmmnClsfCd") String cmmnClsfCd, @Param("cmmnCd") String cmmnCd);
 
     @Transactional
     @Modifying // select 문이 아님을 나타낸다

+ 2 - 2
src/main/java/com/its/op/dao/repository/its/facility/TbFcltSttsAlrmStupRepository.java

@@ -22,7 +22,7 @@ public interface TbFcltSttsAlrmStupRepository extends JpaRepository<TbFcltSttsAl
     @Query("select p from TbFcltSttsAlrmStup p where p.fcltType = :fcltType")
     List<TbFcltSttsAlrmStup> findListById(@Param("fcltType") String fcltType);
 
-    @Query("select p from TbFcltSttsAlrmStup p where p.useYn = 'Y'")
-    List<TbFcltSttsAlrmStup> findAllListUsed();
+//    @Query("select p from TbFcltSttsAlrmStup p where p.useYn = 'Y'")
+//    List<TbFcltSttsAlrmStup> findAllListUsed();
 
 }

+ 2 - 2
src/main/java/com/its/op/dao/repository/its/ifsc/TbIfscTrafRepository.java

@@ -16,8 +16,8 @@ public interface TbIfscTrafRepository extends JpaRepository<TbIfscTraf, Long>, J
     @Query("select p from TbIfscTraf p inner join fetch p.ifsc ifsc inner join fetch ifsc.fromNode fnode inner join fetch ifsc.toNode tnode")
     List<TbIfscTraf> findAll();
 
-    @Query("select p from TbIfscTraf p")
-    List<TbIfscTraf> findAllTraf();
+//    @Query("select p from TbIfscTraf p")
+//    List<TbIfscTraf> findAllTraf();
 
     @Query("select p from TbIfscTraf p inner join fetch p.ifsc ifsc inner join fetch ifsc.fromNode fnode inner join fetch ifsc.toNode tnode where p.ifscId = :ifscId")
     Optional<TbIfscTraf> findById(@Param("ifscId") Long ifscId);

+ 2 - 2
src/main/java/com/its/op/dao/repository/its/link/TbLinkTrafRepository.java

@@ -16,8 +16,8 @@ public interface TbLinkTrafRepository extends JpaRepository<TbLinkTraf, Long>, J
     @Query("select p from TbLinkTraf p inner join fetch p.link m join fetch m.fromNode fnode join fetch m.toNode tnode")
     List<TbLinkTraf> findAll();
 
-    @Query("select p from TbLinkTraf p")
-    List<TbLinkTraf> findAllTraf();
+//    @Query("select p from TbLinkTraf p")
+//    List<TbLinkTraf> findAllTraf();
 
     @Query("select p from TbLinkTraf p inner join fetch p.link m join fetch m.fromNode fnode  join fetch m.toNode tnode " +
            " where m.delYn = 'N' " +

+ 2 - 2
src/main/java/com/its/op/dao/repository/its/oper/TbUserCnncHsRepository.java

@@ -25,8 +25,8 @@ public interface TbUserCnncHsRepository extends JpaRepository<TbUserCnncHs, TbUs
     @Query("select p from TbUserCnncHs p where p.loginHms between :fromDt and :toDt")
     List<TbUserCnncHs> findAllByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
-    @Query("select p from TbUserCnncHs p where p.loginHms between :fromDt and :toDt")
-    List<TbUserCnncHs> findAllByDateRangeEntity(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
+//    @Query("select p from TbUserCnncHs p where p.loginHms between :fromDt and :toDt")
+//    List<TbUserCnncHs> findAllByDateRangeEntity(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
     @Transactional
     @Modifying

+ 6 - 8
src/main/java/com/its/op/dao/repository/its/oper/TbUserGropMenuAthrRepository.java

@@ -4,9 +4,7 @@ import com.its.op.entity.its.oper.TbUserGropMenuAthr;
 import com.its.op.entity.its.oper.TbUserGropMenuAthrKey;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -17,12 +15,12 @@ public interface TbUserGropMenuAthrRepository extends JpaRepository<TbUserGropMe
     @Query(value = "select p from TbUserGropMenuAthr p inner join fetch p.operMenu inner join fetch p.userGrop")
     List<TbUserGropMenuAthr> findAll();
 
-    @Modifying
-    @Query("delete from TbUserGropMenuAthr p where p.gropId = :gropId and p.menuId = :menuId")
-    void deleteByOperSystMenuId(@Param("gropId") String gropId, @Param("menuId") String menuId);
+//    @Modifying
+//    @Query("delete from TbUserGropMenuAthr p where p.gropId = :gropId and p.menuId = :menuId")
+//    void deleteByOperSystMenuId(@Param("gropId") String gropId, @Param("menuId") String menuId);
 
-    @Modifying
-    @Query(value = "insert into TB_USER_GROP_MENU_ATHR(GROP_ID, MENU_ID, ATHR_YN) values(:gropId, :menuId, :authrYn)", nativeQuery = true)
-    void insertData(@Param("gropId") String gropId, @Param("menuId") String menuId, @Param("authrYn") String authrYn);
+//    @Modifying
+//    @Query(value = "insert into TB_USER_GROP_MENU_ATHR(GROP_ID, MENU_ID, ATHR_YN) values(:gropId, :menuId, :authrYn)", nativeQuery = true)
+//    void insertData(@Param("gropId") String gropId, @Param("menuId") String menuId, @Param("authrYn") String authrYn);
 
 }

+ 2 - 2
src/main/java/com/its/op/dao/repository/its/road/TbRoadTrafRepository.java

@@ -16,8 +16,8 @@ public interface TbRoadTrafRepository extends JpaRepository<TbRoadTraf, Long>, J
     @Query("select p from TbRoadTraf p inner join fetch p.road road inner join fetch road.fromNode fnode inner join fetch road.toNode tnode")
     List<TbRoadTraf> findAll();
 
-    @Query("select p from TbRoadTraf p")
-    List<TbRoadTraf> findAllTraf();
+//    @Query("select p from TbRoadTraf p")
+//    List<TbRoadTraf> findAllTraf();
 
     @Query("select p from TbRoadTraf p inner join fetch p.road road inner join fetch road.fromNode fnode inner join fetch road.toNode tnode where p.roadId = :roadId")
     Optional<TbRoadTraf> findById(@Param("roadId") Long roadId);

+ 11 - 4
src/main/java/com/its/op/dao/repository/its/unit/TbUnitSystRepository.java

@@ -11,12 +11,19 @@ import java.util.List;
 @Repository
 public interface TbUnitSystRepository extends JpaRepository<TbUnitSyst, String>, JpaSpecificationExecutor<TbUnitSyst> {
 
-    @Query("select p from TbUnitSyst p left outer join fetch p.state where p.sttsDsplYn = 'Y'")
+    @Query("select p from TbUnitSyst p left outer join fetch p.state")
     List<TbUnitSyst> findAll();
 
-    @Query("select p from TbUnitSyst p left outer join fetch p.state where p.delYn = 'N' and p.sttsDsplYn = 'Y'")
-    List<TbUnitSyst> findAllList();
+//    @Query("select p from TbUnitSyst p left outer join fetch p.state where p.sttsDsplYn = 'Y'")
+//    List<TbUnitSyst> findAll();
 
     @Query("select p from TbUnitSyst p left outer join fetch p.state where p.delYn = 'N'")
-    List<TbUnitSyst> findAllUnitSystList();
+    List<TbUnitSyst> findAllList();
+
+    @Query("select p from TbUnitSyst p left outer join fetch p.state where p.delYn = 'N' and p.sttsDsplYn = 'Y'")
+    List<TbUnitSyst> findAllSttsList();
+
+//    @Query("select p from TbUnitSyst p left outer join fetch p.state where p.delYn = 'N'")
+//    List<TbUnitSyst> findAllUnitSystList();
+
 }

+ 2 - 2
src/main/java/com/its/op/dao/repository/its/vds/TbVdsCtlrRepository.java

@@ -20,8 +20,8 @@ public interface TbVdsCtlrRepository extends JpaRepository<TbVdsCtlr, Long>, Jpa
     @Query("select p from TbVdsCtlr p left outer join fetch p.state state where p.delYn = 'N'")
     List<TbVdsCtlr> findAllList();
 
-    @Query("select count(p.vdsCtlrNmbr) as total from TbVdsCtlr p where p.delYn = 'N'")
-    Integer findAllListCount();
+//    @Query("select count(p.vdsCtlrNmbr) as total from TbVdsCtlr p where p.delYn = 'N'")
+//    Integer findAllListCount();
 
     @Query(value = "SELECT NVL(MAX(VDS_CTLR_NMBR), 1000) + 1 AS NEWID  FROM TB_VDS_CTLR", nativeQuery = true)
     Long getNewNmbr();

+ 2 - 2
src/main/java/com/its/op/dao/repository/its/vms/TbVmsIfscRltnIfscRepository.java

@@ -17,8 +17,8 @@ public interface TbVmsIfscRltnIfscRepository extends JpaRepository<TbVmsIfscRltn
     @Query("select p from TbVmsIfscRltnIfsc p inner join fetch p.ifsc ifsc")
     List<TbVmsIfscRltnIfsc> findAll();
 
-    @Query("select p from TbVmsIfscRltnIfsc p inner join fetch p.ifsc ifsc")
-    List<TbVmsIfscRltnIfsc> findDataAll();
+//    @Query("select p from TbVmsIfscRltnIfsc p inner join fetch p.ifsc ifsc")
+//    List<TbVmsIfscRltnIfsc> findDataAll();
 
     @Query("select p from TbVmsIfscRltnIfsc p inner join fetch p.ifsc where p.vmsIfscId = :vmsIfscId")
     List<TbVmsIfscRltnIfsc> findDataById(@Param("vmsIfscId") Long vmsIfscId);

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

@@ -25,7 +25,7 @@ public class TbUnitSystManager extends TbTableManager<String, TbUnitSyst> {
     }
 
     public void load() {
-        List<TbUnitSyst> objList = this.repo.findAllUnitSystList();
+        List<TbUnitSyst> objList = this.repo.findAll();
         objList.forEach(obj -> {
             put(obj.getSystId(), obj);
         });
@@ -33,7 +33,7 @@ public class TbUnitSystManager extends TbTableManager<String, TbUnitSyst> {
 
     @Override
     public List<TbUnitSyst> reload() {
-        List<TbUnitSyst> objList = this.repo.findAllUnitSystList();
+        List<TbUnitSyst> objList = this.repo.findAll();
         ConcurrentHashMap<String, TbUnitSyst> tempMap = new ConcurrentHashMap<>();
         objList.forEach(obj -> {
             tempMap.put(obj.getSystId(), obj);

+ 6 - 1
src/main/java/com/its/op/scheduler/job/UnitSttsJobThread.java

@@ -3,6 +3,7 @@ package com.its.op.scheduler.job;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.its.op.dto.its.unit.TbUnitSystSttsDto;
+import com.its.op.global.TbUnitSystManager;
 import com.its.op.service.its.unit.TbUnitSystService;
 import com.its.op.websocket.ItsWebSocketMessage;
 import com.its.op.websocket.ItsWebSocketSessionManager;
@@ -24,6 +25,7 @@ public class UnitSttsJobThread {
 
     private final Environment environment;
     private final TbUnitSystService unitSystService;
+    private final TbUnitSystManager unitSystManager;
     private ObjectMapper mapper;
 
     @PostConstruct
@@ -40,8 +42,11 @@ public class UnitSttsJobThread {
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
 
+        // TbSystUnit 정보 재로딩
+        this.unitSystManager.reload();
+
         // ITS Unit Stts
-        List<TbUnitSystSttsDto> itsUnitStts = this.unitSystService.findAllStts();
+        List<TbUnitSystSttsDto> itsUnitStts = this.unitSystService.findAllProcessUnitStts(true);
         ItsWebSocketMessage itsMessage = new ItsWebSocketMessage("itsUnitStts", itsUnitStts);
         try {
             String itsSttsJsonData = this.mapper.writeValueAsString(itsMessage);

+ 49 - 19
src/main/java/com/its/op/service/its/unit/TbUnitSystService.java

@@ -4,6 +4,7 @@ import com.its.op.dao.repository.its.unit.TbUnitSystRepository;
 import com.its.op.dto.its.unit.TbUnitSystDto;
 import com.its.op.dto.its.unit.TbUnitSystSttsDto;
 import com.its.op.entity.its.unit.TbUnitSyst;
+import com.its.op.global.TbUnitSystManager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -13,6 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -20,6 +22,7 @@ import java.util.Optional;
 public class TbUnitSystService {
 
     private final TbUnitSystRepository repo;
+    private final TbUnitSystManager manager;
 
     // 데이터 1건 조회, 없으면 exception
     private TbUnitSyst requireOne(String id) throws NoSuchElementException {
@@ -36,12 +39,18 @@ public class TbUnitSystService {
 
     // 전체 데이터 조회
     @Transactional(readOnly = true)
-    public List<TbUnitSystDto> findAll() {
+    public List<TbUnitSystDto> findAll(boolean isMemory) {
         List<TbUnitSystDto> result = new ArrayList<>();
-        List<TbUnitSyst> data = this.repo.findAll();
-        for (TbUnitSyst entity : data) {
-            result.add(entity.toDto());
+        List<TbUnitSyst> data;
+        if (isMemory) {
+            data = this.manager.findAll();
+        } else {
+            data = this.repo.findAll();
         }
+
+        data.forEach(obj -> {
+            result.add(obj.toDto());
+        });
         return result;
     }
 
@@ -58,6 +67,7 @@ public class TbUnitSystService {
         TbUnitSyst entity = requireOne(id);
         entity.updateInfo(req);
         this.repo.save(entity);
+        this.manager.put(entity.getSystId(), entity);
         return entity.toDto();
     }
 
@@ -68,6 +78,7 @@ public class TbUnitSystService {
         for (TbUnitSystDto.TbUnitSystUpdReq req : reqList) {
             TbUnitSyst obj = req.toEntity();
             this.repo.save(obj);
+            this.manager.put(obj.getSystId(), obj);
             result.add(obj.toDto());
         }
         return result;
@@ -78,6 +89,7 @@ public class TbUnitSystService {
     public TbUnitSystDto mergeInfo(TbUnitSystDto.TbUnitSystUpdReq req) {
         TbUnitSyst obj = req.toEntity();
         this.repo.save(obj);
+        this.manager.put(obj.getSystId(), obj);
         return obj.toDto();
     }
 
@@ -86,6 +98,7 @@ public class TbUnitSystService {
     public TbUnitSystDto deleteById(String id) {
         TbUnitSyst entity = requireOne(id);
         this.repo.deleteById(id);
+        this.manager.remove(id);
         return entity.toDto();
     }
 
@@ -97,6 +110,7 @@ public class TbUnitSystService {
             Optional<TbUnitSyst> obj = this.repo.findById(id);
             if (obj.isPresent()) {
                 this.repo.deleteById(id);
+                this.manager.remove(id);
                 result.add(obj.get().toDto());
             }
         }
@@ -104,14 +118,19 @@ public class TbUnitSystService {
     }
 
     @Transactional(readOnly = true)
-    public List<TbUnitSystDto> findAllUnitSystList() {
+    public List<TbUnitSystDto> findAllProcessUnitList(boolean isMemory) {
         List<TbUnitSystDto> result = new ArrayList<>();
-        List<TbUnitSyst> data = this.repo.findAllUnitSystList();
-        if (data != null) {
-            data.forEach(obj -> {
-                result.add(obj.toDto());
-            });
+        List<TbUnitSyst> data;
+        if (isMemory) {
+            List<TbUnitSyst> temp = this.manager.findAll();
+            data = temp.stream().filter(obj -> "N".equals(obj.getDelYn()) && "Y".equals(obj.getSttsDsplYn())).collect(Collectors.toList());
+        } else {
+            data = this.repo.findAllList();
         }
+
+        data.forEach(obj -> {
+            result.add(obj.toDto());
+        });
         return result;
     }
 
@@ -120,14 +139,19 @@ public class TbUnitSystService {
      * @return
      */
     @Transactional(readOnly = true)
-    public List<TbUnitSystDto> findAllList() {
+    public List<TbUnitSystDto> findAllList(boolean isMemory) {
         List<TbUnitSystDto> result = new ArrayList<>();
-        List<TbUnitSyst> data = this.repo.findAllList();
-        if (data != null) {
-            data.forEach(obj -> {
-                result.add(obj.toDto());
-            });
+        List<TbUnitSyst> data;
+        if (isMemory) {
+            List<TbUnitSyst> temp = this.manager.findAll();
+            data = temp.stream().filter(obj -> "N".equals(obj.getDelYn())).collect(Collectors.toList());
+        } else {
+            data = this.repo.findAllList();
         }
+
+        data.forEach(obj -> {
+            result.add(obj.toDto());
+        });
         return result;
     }
 
@@ -136,14 +160,20 @@ public class TbUnitSystService {
      * @return
      */
     @Transactional(readOnly = true)
-    public List<TbUnitSystSttsDto> findAllStts() {
+    public List<TbUnitSystSttsDto> findAllProcessUnitStts(boolean isMemory) {
 
         List<TbUnitSystSttsDto> result = new ArrayList<>();
-        List<TbUnitSyst> unit = this.repo.findAllList();
+        List<TbUnitSyst> unit;
+        if (isMemory) {
+            List<TbUnitSyst> temp = this.manager.findAll();
+            unit = temp.stream().filter(obj -> "N".equals(obj.getDelYn()) && "Y".equals(obj.getSttsDsplYn())).collect(Collectors.toList());
+        } else {
+            unit = this.repo.findAllSttsList();
+        }
+
         unit.forEach(obj -> {
             result.add(obj.toSttsDto());
         });
-
         return result;
 /*
         if (unit != null) {

+ 1 - 1
src/main/java/com/its/op/service/its/unit/TbUnitSystSttsHsService.java

@@ -67,7 +67,7 @@ public class TbUnitSystSttsHsService {
         int stsTot = (gapMin+1)/5;
 
         Map<String, TbUnitSystSttsHsStatDto> unitMap = new HashMap<>();
-        List<TbUnitSystDto> unit = this.unitService.findAllList();
+        List<TbUnitSystDto> unit = this.unitService.findAllList(true);
         if (unit != null) {
             unit.forEach(obj -> {
                 unitMap.put(obj.getSystId(),

+ 11 - 11
src/main/java/com/its/op/xnetudp/thread/CenterCommServerReceiver.java

@@ -40,11 +40,11 @@ public class CenterCommServerReceiver {
     @Async("centerCommExecutor")
     public void run(CENTER_COMM_MESSAGE data) {
         if (data == null) {
-            log.error("CenterCommServerReceiver: RECV Data Packet NULL");
+            log.error("UDP Data Receive: CenterCommServerReceiver: RECV Data Packet NULL");
             return;
         }
 
-        log.info("CenterCommServerReceiver: {}::{}::{}", data.getSendId(), data.getOpCode(), data.getSenderIp());
+        log.info("UDP Data Receive: CenterCommServerReceiver: {}::{}::{}", data.getSendId(), data.getOpCode(), data.getSenderIp());
         if (CENTER_COMM_DEFINE.INT_ID_TRAFFIC_SERVER == data.getSendId()) {
             if (CENTER_COMM_DEFINE.INT_OP_TRAFFIC_CHANGE == data.getOpCode()) {
                 String prcsTm = ItsUtils.getCurrFiveMinString();
@@ -61,7 +61,7 @@ public class CenterCommServerReceiver {
                     }
                 }
 
-                log.info("@@@ RECV Traffic server job completed.{}/{}", prcsTm, currTm);
+                log.info("@@@ RECV Traffic server job completed: {}/{}", prcsTm, currTm);
                 // 소통정보 메모리 로딩
                 this.linkManager.loadTraf(true);
                 this.ifscManager.loadTraf(true);
@@ -79,7 +79,7 @@ public class CenterCommServerReceiver {
                     ItsWebSocketSessionManager.getInstance().sendBroadcastMessage(socketMessage.getCommand(), new TextMessage(jsonData));
                 }
                 catch(JsonProcessingException e){
-                    log.error("CenterCommServerReceiver: NotifyDto Json parsing Exception: {}", notifyDto);
+                    log.error("@@@ RECV Traffic server job completed: CenterCommServerReceiver: NotifyDto Json parsing Exception: {}", notifyDto);
                 }
             }
             return;
@@ -101,13 +101,13 @@ public class CenterCommServerReceiver {
                 //log.info("OP CODE: {}, MsgSeq: {}", opCode, msgSeq);
                 switch(opCode) {
                     case CENTER_COMM_DEFINE.INT_OP_PG_STATE_RES:
-                        log.info("INT_OP_PG_STATE_RES");
+                        log.info("RECV VMS Server Message: INT_OP_PG_STATE_RES");
                         break;
                     case CENTER_COMM_DEFINE.INT_OP_VMS_FORM_SAVE:
                         byte[] saveDt  = new byte[CENTER_COMM_DEFINE.INT_VMS_MAX_DATETIME];
                         byteBuffer.get(saveDt);
                         // VMS 폼을 데이터베이스에 저장(다운로드 결과는 알수 없음)
-                        log.info("INT_OP_VMS_FORM_SAVE: SaveTime: {}", new String(saveDt));
+                        log.info("RECV VMS Server Message: INT_OP_VMS_FORM_SAVE: SaveTime: {}", new String(saveDt));
                         NotifyDto notifyDto1 = NotifyDto.builder()
                                 .notify("form-save")
                                 .notifyTm(new String(saveDt))
@@ -120,13 +120,13 @@ public class CenterCommServerReceiver {
                             ItsWebSocketSessionManager.getInstance().sendBroadcastMessage(socketMessage1.getCommand(), new TextMessage(jsonData));
                         }
                         catch(JsonProcessingException e){
-                            log.error("CenterCommServerReceiver: NotifyDto Json parsing Exception: {}", notifyDto1);
+                            log.error("RECV VMS Server Message: CenterCommServerReceiver: INT_OP_VMS_FORM_SAVE, NotifyDto Json parsing Exception: {}", notifyDto1);
                         }
                         break;
                     case CENTER_COMM_DEFINE.INT_OP_VMS_FORM_DOWNLOAD:
                         count = byteBuffer.get();
                         // VMS 폼 다운로드 결과 데이터베이스 저장
-                        log.info("INT_OP_VMS_FORM_DOWNLOAD: Count: {} EA", count);
+                        log.info("RECV VMS Server Message: INT_OP_VMS_FORM_DOWNLOAD: Count: {} EA", count);
                         NotifyDto notifyDto2 = NotifyDto.builder()
                                 .notify("form-download")
                                 .notifyTm(ItsUtils.getSysTime())
@@ -139,7 +139,7 @@ public class CenterCommServerReceiver {
                             ItsWebSocketSessionManager.getInstance().sendBroadcastMessage(socketMessage2.getCommand(), new TextMessage(jsonData));
                         }
                         catch(JsonProcessingException e){
-                            log.error("CenterCommServerReceiver: NotifyDto Json parsing Exception: {}", notifyDto2);
+                            log.error("RECV VMS Server Message: CenterCommServerReceiver: INT_OP_VMS_FORM_DOWNLOAD, NotifyDto Json parsing Exception: {}", notifyDto2);
                         }
 /*                        for (int ii = 0; ii < count; ii++) {
                             vmsId = new byte[CENTER_COMM_DEFINE.INT_VMS_MAX_ID];
@@ -162,7 +162,7 @@ public class CenterCommServerReceiver {
                         short normal = byteBuffer.getShort();
                         short module = byteBuffer.getShort();
                         count = byteBuffer.get();
-                        log.info("INT_OP_VMS_STATE_RES: total({}), error({}), normal({}), module({}), count: {} EA.", total, error, normal, module, count);
+                        log.info("RECV VMS Server Message: INT_OP_VMS_STATE_RES: total({}), error({}), normal({}), module({}), count: {} EA.", total, error, normal, module, count);
 //                        for (int ii = 0; ii < count; ii++) {
 //                            vmsId = new byte[CENTER_COMM_DEFINE.INT_VMS_MAX_ID];
 //                            byteBuffer.get(vmsId);
@@ -213,7 +213,7 @@ public class CenterCommServerReceiver {
 //                        }
                         break;
                     default:
-                        log.info("INT_ID_VMS_SERVER: Other opCode: {}", opCode);
+                        log.info("RECV VMS Server Message: Other opCode: {}", opCode);
                         break;
                 }
             }