user menu auth modify....

src/main/java/com/its/op/model/dto/database/IfscDto.java

@@ -1,7 +1,6 @@
 package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.global.NodeManager;
 import com.its.op.model.entity.database.Ifsc;
 import lombok.*;
 
@@ -45,8 +44,17 @@ public class IfscDto implements Serializable {
             this.AREA_CD           = entity.getAREA_CD();
             this.DEL_YN            = entity.getDEL_YN();
 
-            this.FROM_NODE = NodeManager.getNodeName(this.F_NODE_ID);
-            this.TO_NODE = NodeManager.getNodeName(this.T_NODE_ID);
+            //this.FROM_NODE = NodeManager.getNodeName(this.F_NODE_ID);
+            //this.TO_NODE = NodeManager.getNodeName(this.T_NODE_ID);
+            if (entity.getFromNode() != null) {
+                this.FROM_NODE = entity.getFromNode().getNODE_NAME();
+            }
+            else this.FROM_NODE = "?";
+
+            if (entity.getToNode() != null) {
+                this.TO_NODE = entity.getToNode().getNODE_NAME();
+            }
+            else this.TO_NODE = "?";
 
             this.DRCT_CD_DESC = CodeManager.getCodeDesc(CodeManager.DRCT_CD, this.DRCT_CD);
             this.SECT_GRAD_CD_DESC = CodeManager.getCodeDesc(CodeManager.SECT_GRAD_CD, this.SECT_GRAD_CD);

src/main/java/com/its/op/model/dto/database/RoadDto.java

@@ -1,7 +1,6 @@
 package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.global.NodeManager;
 import com.its.op.model.entity.database.Road;
 import lombok.*;
 
@@ -41,8 +40,17 @@ public class RoadDto implements Serializable {
             this.AREA_CD           = entity.getAREA_CD();
             this.DEL_YN            = entity.getDEL_YN();
 
-            this.FROM_NODE = NodeManager.getNodeName(this.F_NODE_ID);
-            this.TO_NODE = NodeManager.getNodeName(this.T_NODE_ID);
+            //this.FROM_NODE = NodeManager.getNodeName(this.F_NODE_ID);
+            //this.TO_NODE = NodeManager.getNodeName(this.T_NODE_ID);
+            if (entity.getFromNode() != null) {
+                this.FROM_NODE = entity.getFromNode().getNODE_NAME();
+            }
+            else this.FROM_NODE = "?";
+
+            if (entity.getToNode() != null) {
+                this.TO_NODE = entity.getToNode().getNODE_NAME();
+            }
+            else this.TO_NODE = "?";
 
             this.DRCT_CD_DESC = CodeManager.getCodeDesc(CodeManager.DRCT_CD, this.DRCT_CD);
             this.SECT_GRAD_CD_DESC = CodeManager.getCodeDesc(CodeManager.SECT_GRAD_CD, this.SECT_GRAD_CD);

src/main/java/com/its/op/model/dto/database/RoadIfscRltnDto.java

@@ -1,7 +1,6 @@
 package com.its.op.model.dto.database;
 
 import com.its.op.global.CodeManager;
-import com.its.op.global.NodeManager;
 import com.its.op.model.entity.database.RoadIfscRltn;
 import lombok.*;
 
@@ -42,8 +41,26 @@ public class RoadIfscRltnDto implements Serializable {
 
             this.IFSC_NM = entity.getIfsc().getIFSC_NM();
 
-            this.FROM_NODE = NodeManager.getNodeName(this.F_NODE_ID);
-            this.TO_NODE = NodeManager.getNodeName(this.T_NODE_ID);
+            if (entity.getIfsc() != null) {
+                if (entity.getIfsc().getFromNode() != null) {
+                    this.FROM_NODE = entity.getIfsc().getFromNode().getNODE_NAME();
+                }
+                else {
+                    this.FROM_NODE = "";
+                }
+                if (entity.getIfsc().getToNode() != null) {
+                    this.TO_NODE = entity.getIfsc().getToNode().getNODE_NAME();
+                }
+                else {
+                    this.TO_NODE = "";
+                }
+            }
+            else {
+                this.FROM_NODE = "";
+                this.TO_NODE = "";
+            }
+            //this.FROM_NODE = NodeManager.getNodeName(this.F_NODE_ID);
+            //this.TO_NODE = NodeManager.getNodeName(this.T_NODE_ID);
 
             this.DRCT_CD_DESC = CodeManager.getCodeDesc(CodeManager.DRCT_CD, this.DRCT_CD);
             this.SECT_GRAD_CD_DESC = CodeManager.getCodeDesc(CodeManager.SECT_GRAD_CD, this.SECT_GRAD_CD);

src/main/java/com/its/op/model/entity/database/Ifsc.java

@@ -4,14 +4,11 @@ import com.its.op.model.dto.database.IfscDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.ColumnDefault;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.*;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.*;
 
 @DynamicInsert
 @DynamicUpdate
@@ -53,6 +50,16 @@ public class Ifsc {
     @ColumnDefault(value = "N")
     private String  DEL_YN;             //	N	CHAR(1)	        Y	'N'		삭제 여부
 
+    @OneToOne
+    @JoinColumn(insertable=false, updatable=false, name="F_NODE", referencedColumnName = "NODE_ID")
+    @NotFound(action = NotFoundAction.IGNORE)
+    private Node fromNode = new Node();
+
+    @OneToOne
+    @JoinColumn(insertable=false, updatable=false, name="T_NODE", referencedColumnName = "NODE_ID")
+    @NotFound(action = NotFoundAction.IGNORE)
+    private Node toNode = new Node();
+
     /*@OneToOne(mappedBy = "ifscInfo")
     @Fetch(FetchMode.JOIN)
     private IfscTraf ifscTraf = new IfscTraf();*/

src/main/java/com/its/op/model/entity/database/Road.java

@@ -5,13 +5,10 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.hibernate.annotations.ColumnDefault;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.*;
 
-import javax.persistence.Column;
+import javax.persistence.*;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.Table;
 
 @DynamicInsert
@@ -50,6 +47,16 @@ public class Road {
     @ColumnDefault(value = "N")
     private String  DEL_YN;         //	N	CHAR(1)	        Y	'N'		삭제 여부
 
+    @OneToOne
+    @JoinColumn(insertable=false, updatable=false, name="F_NODE", referencedColumnName = "NODE_ID")
+    @NotFound(action = NotFoundAction.IGNORE)
+    private Node fromNode = new Node();
+
+    @OneToOne
+    @JoinColumn(insertable=false, updatable=false, name="T_NODE", referencedColumnName = "NODE_ID")
+    @NotFound(action = NotFoundAction.IGNORE)
+    private Node toNode = new Node();
+
     public void updateName(RoadDto.RoadNameUpdateReq req) {
         this.ROAD_NAME = req.getROAD_NAME();
         this.STRT_NM = req.getSTRT_NM();

src/main/java/com/its/op/repository/database/IfscLinkRltnRepository.java

@@ -11,7 +11,8 @@ import java.util.List;
 @Repository
 public interface IfscLinkRltnRepository extends JpaRepository<IfscLinkRltn, IfscLinkRltnKey> {
 
-    @Query(value = "select distinct p from IfscLinkRltn p inner join fetch p.link where p.IFSC_ID = ?1")
+
+    @Query(value = "select distinct p from IfscLinkRltn p inner join fetch p.link m inner join fetch m.fromNode inner join fetch m.toNode where p.IFSC_ID = ?1")
     //@Query(value = "select p from IfscLinkRltn p where p.IFSC_ID = ?1")
     //@Query(value = "SELECT distinct t FROM Ifsc t inner join t.from_node inner join t.to_node left outer join fetch t.traf ")
     List<IfscLinkRltn> findRltnById(Long IFSC_ID);

src/main/java/com/its/op/repository/database/IfscRepository.java

@@ -2,9 +2,15 @@ package com.its.op.repository.database;
 
 import com.its.op.model.entity.database.Ifsc;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface IfscRepository extends JpaRepository<Ifsc, Long> {
 
+    @Query("select p from Ifsc p inner join fetch p.fromNode inner join fetch p.toNode")
+    List<Ifsc> findAll();
+
 }

src/main/java/com/its/op/repository/database/RoadIfscRltnRepository.java

@@ -11,7 +11,7 @@ import java.util.List;
 @Repository
 public interface RoadIfscRltnRepository extends JpaRepository<RoadIfscRltn, RoadIfscRltnKey> {
 
-    @Query(value = "select distinct p from RoadIfscRltn p inner join fetch p.ifsc where p.ROAD_ID = ?1")
+    @Query(value = "select distinct p from RoadIfscRltn p inner join fetch p.ifsc m inner join fetch m.fromNode inner join fetch m.toNode where p.ROAD_ID = ?1")
     List<RoadIfscRltn> findRltnById(Long ROAD_ID);
 
 }

src/main/java/com/its/op/repository/database/RoadRepository.java

@@ -2,8 +2,15 @@ package com.its.op.repository.database;
 
 import com.its.op.model.entity.database.Road;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface RoadRepository extends JpaRepository<Road, Long> {
+
+    @Query("select p from Road p inner join fetch p.fromNode inner join fetch p.toNode")
+    List<Road> findAll();
+
 }