dev

src/main/java/com/its/op/dto/its/link/LinkPrcsParaDto.java

@@ -29,8 +29,10 @@ public class LinkPrcsParaDto implements Serializable {
             if (detl != null) {
                 this.detl = new LinkParaDetlDto.LinkParaDetlInfo(detl);
             }
-            for (TbLinkParaClctSyst syst : systList) {
-                this.systList.add(new LinkParaClctSystDto.LinkParaClctSystInfo(syst));
+            if (systList != null) {
+                for (TbLinkParaClctSyst syst : systList) {
+                    this.systList.add(new LinkParaClctSystDto.LinkParaClctSystInfo(syst));
+                }
             }
         }
     }

src/main/java/com/its/op/dto/its/vms/TbVmsSymbLibDto.java

@@ -208,6 +208,10 @@ public class TbVmsSymbLibDto implements Serializable {
         }
 
         public TbVmsSymbLib toEntity() {
+            Long playTm = 0L;
+            if (this.playTm != null) {
+                playTm = this.playTm;
+            }
             return TbVmsSymbLib.builder()
                     .symbLibNmbr(this.symbLibNmbr)
                     .rgstDt(this.rgstDt)
@@ -219,9 +223,9 @@ public class TbVmsSymbLibDto implements Serializable {
                     .symbType(this.symbType)
                     .aviData(this.aviData)
                     .imagSize(this.imagSize)
-                    .playTm(this.playTm == null ? 0 : this.playTm)
-                    .delYn(this.delYn == null ? "N" : this.delYn)
-                    .updtDt(this.updtDt == null ? ItsUtils.getSysTime() : this.updtDt)
+                    .playTm(playTm)
+                    .delYn((this.delYn == null) ? "N" : this.delYn)
+                    .updtDt((this.updtDt == null) ? ItsUtils.getSysTime() : this.updtDt)
                     .build();
         }
 

src/main/java/com/its/op/entity/its/incident/TbIncdEstmSect.java

@@ -2,6 +2,7 @@ package com.its.op.entity.its.incident;
 
 import com.its.op.dto.its.incident.TbIncdEstmSectDto;
 import com.its.op.entity.its.link.TbLink;
+import com.its.op.entity.its.node.TbNode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -63,10 +64,26 @@ public class TbIncdEstmSect implements Serializable {
 
         if (this.link != null) {
             dto.setRoadName(this.link.getRoadName());
-            dto.setFromNodeInfo(this.link.getFromNode() == null ? "" : this.link.getFromNode().getNodeName());
-            dto.setToNodeInfo(this.link.getToNode() == null ? "" : this.link.getToNode().getNodeName());
-            dto.setXCrdn(this.link.getFromNode() == null ? 0. : this.link.getFromNode().getXCrdn());
-            dto.setYCrdn(this.link.getFromNode() == null ? 0. : this.link.getFromNode().getYCrdn());
+            TbNode fromNode = this.link.getFromNode();
+            TbNode toNode = this.link.getToNode();
+            if (fromNode == null) {
+                dto.setFromNodeInfo("");
+                dto.setXCrdn(0.);
+                dto.setYCrdn(0.);
+            } else {
+                dto.setFromNodeInfo(fromNode.getNodeName());
+                dto.setXCrdn(fromNode.getXCrdn());
+                dto.setYCrdn(fromNode.getYCrdn());
+            }
+            if (toNode == null) {
+                dto.setToNodeInfo("");
+            } else {
+                dto.setToNodeInfo(toNode.getNodeName());
+            }
+//            dto.setFromNodeInfo(this.link.getFromNode() == null ? "" : this.link.getFromNode().getNodeName());
+//            dto.setXCrdn(this.link.getFromNode() == null ? 0. : this.link.getFromNode().getXCrdn());
+//            dto.setYCrdn(this.link.getFromNode() == null ? 0. : this.link.getFromNode().getYCrdn());
+//            dto.setToNodeInfo(this.link.getToNode() == null ? "" : this.link.getToNode().getNodeName());
         }
 
         return dto;

src/main/java/com/its/op/global/CmmnCdManager.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Slf4j
@@ -278,11 +279,16 @@ public class CmmnCdManager {
         if (codeMap != null) {
             for (String key : codeMap.keySet()) {
                 HashMap<String, Code> subCodeMap = codes.get(key);
-                for (String subKey : subCodeMap.keySet()) {
-                    if (subKey.equals(FCLT_TYPE)) {
-                        return subCodeMap.get(subKey).getDesc();
+                for (Map.Entry<String, Code> e: subCodeMap.entrySet()) {
+                    if (e.getKey().equals(FCLT_TYPE)) {
+                        return e.getValue().getDesc();
                     }
                 }
+//                for (String subKey : subCodeMap.keySet()) {
+//                    if (subKey.equals(FCLT_TYPE)) {
+//                        return subCodeMap.get(subKey).getDesc();
+//                    }
+//                }
             }
         }
         return defUnknownDesc;
@@ -291,12 +297,18 @@ public class CmmnCdManager {
     public static String getWeatherCode(String CMMN_CD_KOR_NM) {
         HashMap<String, Code> codeMap = codes.get(CmmnCdManager.INCD_CODE_DFW);
         if (codeMap != null) {
-            for (String key : codeMap.keySet()) {
-                Code code = codeMap.get(key);
+            for (Map.Entry<String, Code> e: codeMap.entrySet()) {
+                Code code = e.getValue();
                 if (StringUtils.equals(code.getDesc(), CMMN_CD_KOR_NM)) {
                     return code.getCode();
                 }
             }
+//            for (String key : codeMap.keySet()) {
+//                Code code = codeMap.get(key);
+//                if (StringUtils.equals(code.getDesc(), CMMN_CD_KOR_NM)) {
+//                    return code.getCode();
+//                }
+//            }
         }
         return "NB0";
     }

src/main/java/com/its/op/service/its/link/LinkPrcsParaService.java

@@ -38,7 +38,7 @@ public class LinkPrcsParaService {
         TbLinkParaDetl detl = null;
         Optional<TbLinkParaStup> stupOpt = this.stupRepo.findById(id);
         Optional<TbLinkParaDetl> detlOpt = this.detlRepo.findById(id);
-        List<TbLinkParaClctSyst> systOpt = null;//this.systRepo.findListById(id);
+        List<TbLinkParaClctSyst> systOpt = this.systRepo.findClctsById(id);
         if (stupOpt.isPresent()) {
             stup = stupOpt.get();
         }

src/main/java/com/its/op/service/its/rse/TbRseOdStatHhService.java

@@ -57,7 +57,7 @@ public class TbRseOdStatHhService {
      */
     @Transactional(readOnly = true)
     public List<RseOdStatListDataDto> findAllListDataByDateRange(String fromDt, String toDt) {
-        List<RseOdStatListDataDto> result = new ArrayList<>();
+        List<RseOdStatListDataDto> result;
         Map<Long, RseOdStatListDataDto> resultMap = new HashMap<>();
         List<TbRseCtlr> lists = this.repo.findAllListOrder();
         log.info("{}", lists);
@@ -81,10 +81,13 @@ public class TbRseOdStatHhService {
             }
         });
 
-        for (Long key : resultMap.keySet()) {
-            // 맵을 리스트로 변환
-            resultMap.get(key).mapToList();
+        for (Map.Entry<Long, RseOdStatListDataDto> e : resultMap.entrySet()) {
+            e.getValue().mapToList();
         }
+//        for (Long key : resultMap.keySet()) {
+//            // 맵을 리스트로 변환
+//            resultMap.get(key).mapToList();
+//        }
 
         // 키로 정렬
 //        Object[] keys = resultMap.keySet().toArray();

src/main/java/com/its/utils/FloodFill.java

@@ -26,7 +26,7 @@ public final class FloodFill {
    * @author king
    * @since April 27, 2005
    */
-  class LineInfo {
+  static class LineInfo {
     
     /** The left position. */
     int left;