Browse Source

dfskajflasj

shjung 3 years ago
parent
commit
4a33714b3a
26 changed files with 110 additions and 1165 deletions
  1. 0 49
      src/main/java/com/its/api/op/controller/AbstractDatabaseController.java
  2. 1 1
      src/main/java/com/its/api/op/controller/history/TrafHistoryController.java
  3. 0 112
      src/main/java/com/its/api/op/controller/traffic/CurrentTrafficController.java
  4. 0 56
      src/main/java/com/its/api/op/model/dto/database/IfscTrafDto.java
  5. 0 80
      src/main/java/com/its/api/op/model/dto/database/LinkTrafDto.java
  6. 0 55
      src/main/java/com/its/api/op/model/dto/database/RoadTrafDto.java
  7. 22 87
      src/main/java/com/its/api/op/model/dto/traffic/TbIfscTrafDto.java
  8. 22 133
      src/main/java/com/its/api/op/model/dto/traffic/TbLinkTrafDto.java
  9. 22 87
      src/main/java/com/its/api/op/model/dto/traffic/TbRoadTrafDto.java
  10. 0 46
      src/main/java/com/its/api/op/model/entity/database/IfscTraf.java
  11. 0 66
      src/main/java/com/its/api/op/model/entity/database/LinkTraf.java
  12. 0 48
      src/main/java/com/its/api/op/model/entity/database/RoadTraf.java
  13. 12 15
      src/main/java/com/its/api/op/model/entity/traffic/TbIfscTraf.java
  14. 18 21
      src/main/java/com/its/api/op/model/entity/traffic/TbLinkTraf.java
  15. 12 15
      src/main/java/com/its/api/op/model/entity/traffic/TbRoadTraf.java
  16. 0 19
      src/main/java/com/its/api/op/repository/BaseRepository.java
  17. 0 15
      src/main/java/com/its/api/op/repository/database/IfscTrafRepository.java
  18. 0 15
      src/main/java/com/its/api/op/repository/database/LinkTrafRepository.java
  19. 0 15
      src/main/java/com/its/api/op/repository/database/RoadTrafRepository.java
  20. 1 1
      src/main/java/com/its/api/op/repository/traffic/TbIfscTrafRepository.java
  21. 0 73
      src/main/java/com/its/api/op/service/AbstractDatabaseService.java
  22. 0 21
      src/main/java/com/its/api/op/service/DatabaseService.java
  23. 0 9
      src/main/java/com/its/api/op/service/HistoryService.java
  24. 0 42
      src/main/java/com/its/api/op/service/traffic/IfscTrafService.java
  25. 0 42
      src/main/java/com/its/api/op/service/traffic/LinkTrafService.java
  26. 0 42
      src/main/java/com/its/api/op/service/traffic/RoadTrafService.java

+ 0 - 49
src/main/java/com/its/api/op/controller/AbstractDatabaseController.java

@@ -1,49 +0,0 @@
-package com.its.api.op.controller;
-
-import com.its.api.op.service.AbstractDatabaseService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-@Slf4j
-public abstract class AbstractDatabaseController<T> {
-
-    private final AbstractDatabaseService<T> service;
-
-    public AbstractDatabaseController(AbstractDatabaseService service) {
-        this.service = service;
-    }
-
-    @GetMapping(value = "/", produces = {"application/json; charset=utf8"})
-    public ResponseEntity<List<T>> findAll(HttpServletRequest request) {
-        List<T> result = this.service.findAll();
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
-    @GetMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public ResponseEntity<T> findById(@PathVariable("id") String id, HttpServletRequest request) {
-        T result = this.service.findById(id);
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
-    @PutMapping(value = "/", produces = {"application/json; charset=utf8"})
-    public int updateById(@RequestBody T obj, HttpServletRequest request) {
-        log.error("{}", obj);
-        return this.service.updateById(obj);
-    }
-
-    @PutMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public int deleteById(@PathVariable("id") String id, HttpServletRequest request) {
-        return this.service.deleteById(id);
-    }
-
-    @DeleteMapping(value = "/{id}", produces = {"application/json; charset=utf8"})
-    public int deleteDataById(@PathVariable("id") String id, HttpServletRequest request) {
-        return this.service.deleteDataById(id);
-    }
-
-}

+ 1 - 1
src/main/java/com/its/api/op/controller/history/TrafHistoryController.java

@@ -59,7 +59,7 @@ public class TrafHistoryController {
     @ApiOperation(value = "링크이력조회(TB_LINK_TRAF_HS)", response = TbLinkTrafHsDto.class, responseContainer = "ArrayList")
     @GetMapping(value = "/link", produces = {"application/json; charset=utf8"})
     public List<TbLinkTrafHsDto> findLinkTrafHsAllByDateRange(
-            @ApiParam(name = "LINK_ID", value = "링크 ID(link_id)", example = "2060046200", required = true)
+            @ApiParam(name = "LINK_ID", value = "링크 ID(link_id)", example = "2280212200", required = true)
             @RequestParam Long LINK_ID,
             @ApiParam(name = "FROM_DT", value = "조회시작시각(YYYYMMDDHH24MI00)", example = "20220112000000", required = true)
             @RequestParam String FROM_DT,

+ 0 - 112
src/main/java/com/its/api/op/controller/traffic/CurrentTrafficController.java

@@ -1,112 +0,0 @@
-package com.its.api.op.controller.traffic;
-
-import com.its.api.op.model.dto.database.LinkTrafDto;
-import com.its.api.op.model.dto.database.RoadTrafDto;
-import com.its.api.op.model.entity.database.LinkTraf;
-import com.its.api.op.model.entity.database.RoadTraf;
-import com.its.api.op.service.traffic.IfscTrafService;
-import com.its.api.op.service.traffic.LinkTrafService;
-import com.its.api.op.service.traffic.RoadTrafService;
-import com.its.api.op.model.dto.database.IfscTrafDto;
-import com.its.api.op.model.entity.database.IfscTraf;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/api-old/traffic/current")
-@Api(tags = "00.교통상황관리-1.현재소통정보조회-OLD")
-public class CurrentTrafficController {
-
-    private final LinkTrafService linkService;
-    private final IfscTrafService ifscService;
-    private final RoadTrafService roadService;
-
-    ////////////////////////////////////////// LINK
-    @ApiOperation(value = "링크소통정보전체조회(TB_LINK_TRAF)", response = LinkTrafDto.LinkTrafInfo.class)
-    @GetMapping(value = "/link", produces = {"application/json; charset=utf8"})
-    public ResponseEntity<List<LinkTrafDto.LinkTrafInfo>> findLinkTrafAll() {
-        List<LinkTraf> data = this.linkService.findAll();
-        List<LinkTrafDto.LinkTrafInfo> result = new ArrayList<>();
-        for (LinkTraf obj: data) {
-            if (obj.getLink().getDelYn().equals("Y")) {
-                continue;
-            }
-            result.add(new LinkTrafDto.LinkTrafInfo(obj));
-        }
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
-    @ApiOperation(value = "링크소통정보개별조회(TB_LINK_TRAF)", response = LinkTrafDto.LinkTrafInfo.class)
-    @GetMapping(value = "/link/{id}", produces = {"application/json; charset=utf8"})
-    public ResponseEntity<LinkTrafDto.LinkTrafInfo> findLinkTrafById(@PathVariable final Long id) {
-        LinkTraf obj = this.linkService.findById(id);
-        if (obj != null) {
-            return new ResponseEntity<>(new LinkTrafDto.LinkTrafInfo(obj), HttpStatus.OK);
-        }
-        return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);//NO_CONTENT);
-    }
-
-    ////////////////////////////////////////// IFSC
-    @ApiOperation(value = "서비스링크소통정보전체조회(TB_IFSC_TRAF)", response = IfscTrafDto.IfscTrafInfo.class)
-    @GetMapping(value = "/ifsc", produces = {"application/json; charset=utf8"})
-    public ResponseEntity<List<IfscTrafDto.IfscTrafInfo>> findIfscTrafAll() {
-        List<IfscTraf> data = this.ifscService.findAll();
-        List<IfscTrafDto.IfscTrafInfo> result = new ArrayList<>();
-        for (IfscTraf obj: data) {
-            if (obj.getIfsc().getDelYn().equals("Y")) {
-                continue;
-            }
-            result.add(new IfscTrafDto.IfscTrafInfo(obj));
-        }
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
-    @ApiOperation(value = "서비스링크소통정보개별조회(TB_IFSC_TRAF)", response = IfscTrafDto.IfscTrafInfo.class)
-    @GetMapping(value = "/ifsc/{id}", produces = {"application/json; charset=utf8"})
-    public ResponseEntity<IfscTrafDto.IfscTrafInfo> findIfscTrafById(@PathVariable final Long id) {
-        IfscTraf obj = this.ifscService.findById(id);
-        if (obj != null) {
-            return new ResponseEntity<>(new IfscTrafDto.IfscTrafInfo(obj), HttpStatus.OK);
-        }
-        return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);//NO_CONTENT);
-    }
-
-    ////////////////////////////////////////// ROAD
-    @ApiOperation(value = "도로소통정보전체조회(TB_ROAD_TRAF)", response = RoadTrafDto.RoadTrafInfo.class)
-    @GetMapping(value = "road", produces = {"application/json; charset=utf8"})
-    public ResponseEntity<List<RoadTrafDto.RoadTrafInfo>> findRoadTrafAll() {
-        List<RoadTraf> data = this.roadService.findAll();
-        List<RoadTrafDto.RoadTrafInfo> result = new ArrayList<>();
-        for (RoadTraf obj: data) {
-            if (obj.getRoad().getDelYn().equals("Y")) {
-                continue;
-            }
-            result.add(new RoadTrafDto.RoadTrafInfo(obj));
-        }
-        return new ResponseEntity<>(result, HttpStatus.OK);
-    }
-
-    @ApiOperation(value = "도로소통정보개별조회(TB_ROAD_TRAF)", response = RoadTrafDto.RoadTrafInfo.class)
-    @GetMapping(value = "/road/{id}", produces = {"application/json; charset=utf8"})
-    public ResponseEntity<RoadTrafDto.RoadTrafInfo> findRoadTrafById(@PathVariable final Long id) {
-        RoadTraf obj = this.roadService.findById(id);
-        if (obj != null) {
-            return new ResponseEntity<>(new RoadTrafDto.RoadTrafInfo(obj), HttpStatus.OK);
-        }
-        return new ResponseEntity<>(null, HttpStatus.NOT_FOUND);//NO_CONTENT);
-    }
-
-}

+ 0 - 56
src/main/java/com/its/api/op/model/dto/database/IfscTrafDto.java

@@ -1,56 +0,0 @@
-package com.its.api.op.model.dto.database;
-
-import com.its.api.op.global.CodeManager;
-import com.its.api.utils.ItsUtils;
-import com.its.api.op.model.entity.database.IfscTraf;
-import lombok.Getter;
-
-import java.io.Serializable;
-
-public class IfscTrafDto implements Serializable {
-
-    @Getter
-    public static class IfscTrafInfo {
-
-        private final Long    IFSC_ID;        //	N	NUMBER(10)	    N			정보제공구간 ID
-        private final String  PRCN_DT;        //	N	VARCHAR2(14)	Y			가공 일시
-        private final Integer TFVL;           //	N	NUMBER(6)	    Y	0		교통량
-        private final Integer SPED;           //	N	NUMBER(3)	    Y	0		속도
-        private final Integer PTRN_SPED;      //	N	NUMBER(3)	    Y	0		패턴 속도
-        private final Double  OCPY_RATE;      //	N	NUMBER(5,2)	    Y	0		점유 율
-        private final Integer TRVL_HH;        //	N	NUMBER(6)	    Y	0		통행 시간
-        private final String  CMTR_GRAD_CD;   //	N	VARCHAR2(7)	    Y			소통 등급 코드
-        private final Integer DATA_NUM;       //	N	NUMBER(3)	    Y	0		데이터 개수
-
-        private final String IFSC_NM;             // 구간 명
-        private final String STRT_NM;             // 시점 명
-        private final String END_NM;              // 종점 명
-        private final String DRCT_CD;             // 방향 코드
-        private final String MISS_YN;
-
-        private final String DRCT_CD_DESC;
-        private final String CMTR_GRAD_DESC;
-
-        public IfscTrafInfo(IfscTraf entity) {
-            this.IFSC_ID      = entity.getIFSC_ID();
-            this.PRCN_DT      = entity.getPRCN_DT();
-            this.TFVL         = entity.getTFVL();
-            this.SPED         = entity.getSPED();
-            this.PTRN_SPED    = entity.getPTRN_SPED();
-            this.OCPY_RATE    = entity.getOCPY_RATE();
-            this.TRVL_HH      = entity.getTRVL_HH();
-            this.CMTR_GRAD_CD = entity.getCMTR_GRAD_CD();
-            this.DATA_NUM     = entity.getDATA_NUM();
-
-            this.IFSC_NM      = entity.getIfsc().getIfscNm();
-            this.STRT_NM      = entity.getIfsc().getStrtNm();
-            this.END_NM       = entity.getIfsc().getEndNm();
-            this.DRCT_CD      = entity.getIfsc().getDrctCd();
-            this.MISS_YN      = ItsUtils.getMissYn(this.PRCN_DT, this.CMTR_GRAD_CD);
-
-            this.DRCT_CD_DESC = CodeManager.getCodeDesc(CodeManager.DRCT_CD, this.DRCT_CD);
-            this.CMTR_GRAD_DESC = CodeManager.getCodeDesc(CodeManager.CMTR_GRAD_CD, this.CMTR_GRAD_CD);
-        }
-    }
-
-}

+ 0 - 80
src/main/java/com/its/api/op/model/dto/database/LinkTrafDto.java

@@ -1,80 +0,0 @@
-package com.its.api.op.model.dto.database;
-
-import com.its.api.utils.ItsUtils;
-import com.its.api.op.global.CodeManager;
-import com.its.api.op.model.entity.database.LinkTraf;
-import lombok.Getter;
-
-import java.io.Serializable;
-
-public class LinkTrafDto implements Serializable {
-
-    @Getter
-    public static class LinkTrafInfo {
-
-        private final Long    LINK_ID;         //	N	NUMBER(10)	    N			링크ID
-        private final String  PRCN_DT;         //	N	VARCHAR2(14)	Y			가공 일시
-        private final Integer TFVL;            //	N	NUMBER(6)	    Y	0		교통량
-        private final Integer SPED;            //	N	NUMBER(3)	    Y	0		속도
-        private final Double  OCPY_RATE;       //	N	NUMBER(5,2)	    Y	0		점유 율
-        private final Integer TRVL_HH;         //	N	NUMBER(6)	    Y	0		통행 시간
-        private final String  CMTR_GRAD_CD;    //	N	VARCHAR2(7)	    Y			소통 등급 코드
-        private final String  MISS_YN;         //	N	CHAR(1)	        Y	'N'		결측 여부
-        private final Integer PRCN_SPED;       //	N	NUMBER(3)	    Y	0		가공 속도
-        private final Integer SMTH_SPED;       //	N	NUMBER(3)	    Y	0		평활화 속도
-        private final Integer ADJS_SPED;       //	N	NUMBER(3)	    Y	0		보정 속도
-        private final Integer PTRN_SPED;       //	N	NUMBER(3)	    Y	0		패턴 속도
-        private final String  PRCN_SORC;       //	N	VARCHAR2(7)	    Y			가공 소스
-        private final String  ADJS_SORC;       //	N	VARCHAR2(7)	    Y			보정 소스
-        private final Integer DATA_NUM;        //	N	NUMBER(3)	    Y	0		데이터 개수
-
-        private final String CMTR_GRAD_DESC;
-
-        private final Long   F_NODE_ID;       // 시작 노드 ID
-        private final String F_NODE_NM;       // 시작 노드 명
-        private final Long   T_NODE_ID;       // 종료 노드 ID
-        private final String T_NODE_NM;       // 종료 노드 명
-
-        //private String MISS_YN_DESC;        // 결측 여부 설명
-        private final String PRCN_SORC_DESC;      // 가공 소스 설명
-        private final String ADJS_SORC_DESC;      // 보정 소스 설명
-
-        public LinkTrafInfo(LinkTraf entity) {
-
-            this.LINK_ID      = entity.getLINK_ID();
-            this.PRCN_DT      = entity.getPRCN_DT();
-            this.TFVL         = entity.getTFVL();
-            this.SPED         = entity.getSPED();
-            this.OCPY_RATE    = entity.getOCPY_RATE();
-            this.TRVL_HH      = entity.getTRVL_HH();
-            this.CMTR_GRAD_CD = entity.getCMTR_GRAD_CD();
-            //this.MISS_YN      = entity.getMISS_YN();
-            this.PRCN_SPED    = entity.getPRCN_SPED();
-            this.SMTH_SPED    = entity.getSMTH_SPED();
-            this.ADJS_SPED    = entity.getADJS_SPED();
-            this.PTRN_SPED    = entity.getPTRN_SPED();
-            this.PRCN_SORC    = entity.getPRCN_SORC();
-            this.ADJS_SORC    = entity.getADJS_SORC();
-            this.DATA_NUM     = entity.getDATA_NUM();
-
-            this.MISS_YN = entity.getMISS_YN().equals("N") ? ItsUtils.getMissYn(this.PRCN_DT, this.CMTR_GRAD_CD) : "Y";
-
-            this.F_NODE_ID      = entity.getLink().getFNodeId();
-            this.T_NODE_ID      = entity.getLink().getTNodeId();
-            if (entity.getLink().getFromNode() != null) {
-                this.F_NODE_NM = entity.getLink().getFromNode().getNodeName();
-            }
-            else this.F_NODE_NM = "?";
-
-            if (entity.getLink().getToNode() != null) {
-                this.T_NODE_NM = entity.getLink().getToNode().getNodeName();
-            }
-            else this.T_NODE_NM = "?";
-
-            this.CMTR_GRAD_DESC = CodeManager.getCodeDesc(CodeManager.CMTR_GRAD_CD, this.CMTR_GRAD_CD);
-            this.PRCN_SORC_DESC = CodeManager.getCodeDesc(CodeManager.PRCN_SORC, this.PRCN_SORC);
-            this.ADJS_SORC_DESC = CodeManager.getCodeDesc(CodeManager.ADJS_SORC, this.ADJS_SORC);
-        }
-    }
-
-}

+ 0 - 55
src/main/java/com/its/api/op/model/dto/database/RoadTrafDto.java

@@ -1,55 +0,0 @@
-package com.its.api.op.model.dto.database;
-
-import com.its.api.op.model.entity.database.RoadTraf;
-import com.its.api.op.global.CodeManager;
-import com.its.api.utils.ItsUtils;
-import lombok.Getter;
-
-import java.io.Serializable;
-
-public class RoadTrafDto implements Serializable {
-
-    @Getter
-    public static class RoadTrafInfo {
-        private final Long    ROAD_ID;        //	N	NUMBER(10)	    N			도로 ID
-        private final String  PRCN_DT;        //	N	VARCHAR2(14)	Y			가공 일시
-        private final Integer TFVL;           //	N	NUMBER(6)	    Y	0		교통량
-        private final Integer SPED;           //	N	NUMBER(3)	    Y	0		속도
-        private final Integer PTRN_SPED;      //	N	NUMBER(3)	    Y	0		패턴 속도
-        private final Double  OCPY_RATE;      //	N	NUMBER(5,2)	    Y	0		점유 율
-        private final Integer TRVL_HH;        //	N	NUMBER(6)	    Y	0		통행 시간
-        private final String  CMTR_GRAD_CD;   //	N	VARCHAR2(7)	    Y			소통 등급 코드
-        private final Integer DATA_NUM;       //	N	NUMBER(3)	    Y	0		데이터 개수
-
-        private final String ROAD_NAME;       // 도로 명
-        private final String STRT_NM;         // 시점 명
-        private final String END_NM;          // 종점 명
-        private final String DRCT_CD;         // 방향 코드
-        private final String MISS_YN;
-
-        private final String DRCT_CD_DESC;
-        private final String CMTR_GRAD_DESC;
-
-        public RoadTrafInfo(RoadTraf entity) {
-            this.ROAD_ID      = entity.getROAD_ID();
-            this.PRCN_DT      = entity.getPRCN_DT();
-            this.TFVL         = entity.getTFVL();
-            this.SPED         = entity.getSPED();
-            this.PTRN_SPED    = entity.getPTRN_SPED();
-            this.OCPY_RATE    = entity.getOCPY_RATE();
-            this.TRVL_HH      = entity.getTRVL_HH();
-            this.CMTR_GRAD_CD = entity.getCMTR_GRAD_CD();
-            this.DATA_NUM     = entity.getDATA_NUM();
-
-            this.ROAD_NAME    = entity.getRoad().getRoadName();
-            this.STRT_NM      = entity.getRoad().getStrtNm();
-            this.END_NM       = entity.getRoad().getEndNm();
-            this.DRCT_CD      = entity.getRoad().getDrctCd();
-            this.MISS_YN      = ItsUtils.getMissYn(this.PRCN_DT, this.CMTR_GRAD_CD);
-
-            this.DRCT_CD_DESC = CodeManager.getCodeDesc(CodeManager.DRCT_CD, this.DRCT_CD);
-            this.CMTR_GRAD_DESC = CodeManager.getCodeDesc(CodeManager.CMTR_GRAD_CD, this.CMTR_GRAD_CD);
-        }
-    }
-
-}

+ 22 - 87
src/main/java/com/its/api/op/model/dto/traffic/TbIfscTrafDto.java

@@ -1,13 +1,11 @@
 package com.its.api.op.model.dto.traffic;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.its.api.op.model.entity.traffic.TbIfscTraf;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
+import lombok.Builder;
+import lombok.Data;
 
-import javax.validation.constraints.Positive;
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -56,90 +54,27 @@ public class TbIfscTrafDto implements Serializable {
     private Integer dataNum;
 
     // Code Description Field
+    @ApiModelProperty("구간 명")
+    @JsonProperty("ifsc_nm")
+    private String ifscNm;
+    @ApiModelProperty("시점 명")
+    @JsonProperty("strt_nm")
+    private String strtNm;
+    @ApiModelProperty("종점 명")
+    @JsonProperty("end_nm")
+    private String endNm;
+    @ApiModelProperty("방향 코드")
+    @JsonProperty("drct_cd")
+    private String drctCd;
+    @ApiModelProperty("결측여부")
+    @JsonProperty("miss_yn")
+    private String missYn;
+
+    @ApiModelProperty("방향 설명")
+    @JsonProperty("drct_cd_desc")
+    private String drctDesc;
     @ApiModelProperty("소통 등급 코드 설명")
-    @JsonProperty("cmtr_grad_desc")    // CMTR_GRAD_CD
+    @JsonProperty("cmtr_grad_desc")
     private String cmtrGradDesc;
 
-    @ApiModel("TbIfscTrafUpdReq(정보제공구간 소통상황 정보변경)")
-    @Getter
-    @Setter
-    @ToString
-    @NoArgsConstructor(access = AccessLevel.PROTECTED)
-    public static class TbIfscTrafUpdReq {
-
-        @ApiModelProperty("정보제공구간 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
-        @JsonProperty("ifsc_id")
-        @Positive
-        private Long ifscId;
-
-        @ApiModelProperty("가공 일시, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
-        @JsonProperty("prcn_dt")
-        @Size(min=1, max=14)
-        private String prcnDt;
-
-        @ApiModelProperty("교통량, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
-        @JsonProperty("tfvl")
-        @Positive
-        private Integer tfvl;
-
-        @ApiModelProperty("속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("sped")
-        @Positive
-        private Integer sped;
-
-        @ApiModelProperty("패턴 속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("ptrn_sped")
-        @Positive
-        private Integer ptrnSped;
-
-        @ApiModelProperty("점유 율, , NUMBER(5,2)")  // Y NUMBER(5,2)
-        @JsonProperty("ocpy_rate")
-        private Double ocpyRate;
-
-        @ApiModelProperty("통행 시간, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
-        @JsonProperty("trvl_hh")
-        @Positive
-        private Integer trvlHh;
-
-        @ApiModelProperty("소통 등급 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
-        @JsonProperty("cmtr_grad_cd")
-        @Size(min=1, max=7)
-        private String cmtrGradCd;
-
-        @ApiModelProperty("데이터 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("data_num")
-        @Positive
-        private Integer dataNum;
-
-        @Builder
-        public TbIfscTrafUpdReq(Long ifsc_id, String prcn_dt, Integer tfvl, Integer sped, Integer ptrn_sped, Double ocpy_rate, Integer trvl_hh, String cmtr_grad_cd, Integer data_num) {
-            this.ifscId = ifsc_id;
-            this.prcnDt = prcn_dt;
-            this.tfvl = tfvl;
-            this.sped = sped;
-            this.ptrnSped = ptrn_sped;
-            this.ocpyRate = ocpy_rate;
-            this.trvlHh = trvl_hh;
-            this.cmtrGradCd = cmtr_grad_cd;
-            this.dataNum = data_num;
-        }
-
-        public TbIfscTraf toEntity() {
-            TbIfscTraf entity = TbIfscTraf.builder()
-                    .ifscId(this.ifscId)
-                    .prcnDt(this.prcnDt)
-                    .tfvl(this.tfvl)
-                    .sped(this.sped)
-                    .ptrnSped(this.ptrnSped)
-                    .ocpyRate(this.ocpyRate)
-                    .trvlHh(this.trvlHh)
-                    .cmtrGradCd(this.cmtrGradCd)
-                    .dataNum(this.dataNum)
-                    .build();
-
-            return entity;
-        }
-
-    }
-
 }

+ 22 - 133
src/main/java/com/its/api/op/model/dto/traffic/TbLinkTrafDto.java

@@ -1,14 +1,11 @@
 package com.its.api.op.model.dto.traffic;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.its.api.op.model.entity.traffic.TbLinkTraf;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
+import lombok.Builder;
+import lombok.Data;
 
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -85,133 +82,25 @@ public class TbLinkTrafDto implements Serializable {
     @JsonProperty("cmtr_grad_desc")    // CMTR_GRAD_CD
     private String cmtrGradDesc;
 
-    @ApiModelProperty("결측 여부 설명")
-    @JsonProperty("miss_desc")    // MISS_YN
-    private String missDesc;
-
-    @ApiModel("TbLinkTrafUpdReq(링크 소통상황 정보변경)")
-    @Getter
-    @Setter
-    @ToString
-    @NoArgsConstructor(access = AccessLevel.PROTECTED)
-    public static class TbLinkTrafUpdReq {
-
-        @ApiModelProperty("링크ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
-        @JsonProperty("link_id")
-        @Positive
-        private Long linkId;
-
-        @ApiModelProperty("가공 일시, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
-        @JsonProperty("prcn_dt")
-        @Size(min=1, max=14)
-        private String prcnDt;
-
-        @ApiModelProperty("교통량, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
-        @JsonProperty("tfvl")
-        @Positive
-        private Integer tfvl;
-
-        @ApiModelProperty("속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("sped")
-        @Positive
-        private Integer sped;
-
-        @ApiModelProperty("점유 율, , NUMBER(5,2)")  // Y NUMBER(5,2)
-        @JsonProperty("ocpy_rate")
-        private Double ocpyRate;
-
-        @ApiModelProperty("통행 시간, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
-        @JsonProperty("trvl_hh")
-        @Positive
-        private Integer trvlHh;
-
-        @ApiModelProperty("소통 등급 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
-        @JsonProperty("cmtr_grad_cd")
-        @Size(min=1, max=7)
-        private String cmtrGradCd;
-
-        @ApiModelProperty("결측 여부, Nullable = Y, CHAR(1)")  // Y CHAR(1)
-        @JsonProperty("miss_yn")
-        @Size(min=1, max=1)
-        @Pattern(regexp = "[YN]")
-        private String missYn;
-
-        @ApiModelProperty("가공 속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("prcn_sped")
-        @Positive
-        private Integer prcnSped;
-
-        @ApiModelProperty("평활화 속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("smth_sped")
-        @Positive
-        private Integer smthSped;
-
-        @ApiModelProperty("보정 속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("adjs_sped")
-        @Positive
-        private Integer adjsSped;
-
-        @ApiModelProperty("패턴 속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("ptrn_sped")
-        @Positive
-        private Integer ptrnSped;
-
-        @ApiModelProperty("가공 소스, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
-        @JsonProperty("prcn_sorc")
-        @Size(min=1, max=7)
-        private String prcnSorc;
-
-        @ApiModelProperty("보정 소스, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
-        @JsonProperty("adjs_sorc")
-        @Size(min=1, max=7)
-        private String adjsSorc;
-
-        @ApiModelProperty("데이터 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("data_num")
-        @Positive
-        private Integer dataNum;
-
-        @Builder
-        public TbLinkTrafUpdReq(Long link_id, String prcn_dt, Integer tfvl, Integer sped, Double ocpy_rate, Integer trvl_hh, String cmtr_grad_cd, String miss_yn, Integer prcn_sped, Integer smth_sped, Integer adjs_sped, Integer ptrn_sped, String prcn_sorc, String adjs_sorc, Integer data_num) {
-            this.linkId = link_id;
-            this.prcnDt = prcn_dt;
-            this.tfvl = tfvl;
-            this.sped = sped;
-            this.ocpyRate = ocpy_rate;
-            this.trvlHh = trvl_hh;
-            this.cmtrGradCd = cmtr_grad_cd;
-            this.missYn = miss_yn;
-            this.prcnSped = prcn_sped;
-            this.smthSped = smth_sped;
-            this.adjsSped = adjs_sped;
-            this.ptrnSped = ptrn_sped;
-            this.prcnSorc = prcn_sorc;
-            this.adjsSorc = adjs_sorc;
-            this.dataNum = data_num;
-        }
-
-        public TbLinkTraf toEntity() {
-            TbLinkTraf entity = TbLinkTraf.builder()
-                    .linkId(this.linkId)
-                    .prcnDt(this.prcnDt)
-                    .tfvl(this.tfvl)
-                    .sped(this.sped)
-                    .ocpyRate(this.ocpyRate)
-                    .trvlHh(this.trvlHh)
-                    .cmtrGradCd(this.cmtrGradCd)
-                    .missYn(this.missYn)
-                    .prcnSped(this.prcnSped)
-                    .smthSped(this.smthSped)
-                    .adjsSped(this.adjsSped)
-                    .ptrnSped(this.ptrnSped)
-                    .prcnSorc(this.prcnSorc)
-                    .adjsSorc(this.adjsSorc)
-                    .dataNum(this.dataNum)
-                    .build();
-
-            return entity;
-        }
-
-    }
+    @ApiModelProperty("시작 노드 ID")
+    @JsonProperty("f_node_id")
+    private Long   fNodeId;
+    @ApiModelProperty("시작 노드 명")
+    @JsonProperty("f_node_nm")
+    private String fNodeNm;
+
+    @ApiModelProperty("종료 노드 ID")
+    @JsonProperty("t_node_id")
+    private Long   tNodeId;
+    @ApiModelProperty("종료 노드 명")
+    @JsonProperty("t_node_nm")
+    private String tNodeNm;
+
+    @ApiModelProperty("가공 소스 설명")
+    @JsonProperty("prcn_sorc_desc")
+    private String prcnSorcDesc;
+    @ApiModelProperty("보정 소스 설명")
+    @JsonProperty("adjs_sorc_desc")
+    private String adjsSorcDesc;
 
 }

+ 22 - 87
src/main/java/com/its/api/op/model/dto/traffic/TbRoadTrafDto.java

@@ -1,13 +1,11 @@
 package com.its.api.op.model.dto.traffic;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.its.api.op.model.entity.traffic.TbRoadTraf;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
+import lombok.Builder;
+import lombok.Data;
 
-import javax.validation.constraints.Positive;
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -56,90 +54,27 @@ public class TbRoadTrafDto implements Serializable {
     private Integer dataNum;
 
     // Code Description Field
+    @ApiModelProperty("도로 명")
+    @JsonProperty("road_name")
+    private String roadName;
+    @ApiModelProperty("시점 명")
+    @JsonProperty("strt_nm")
+    private String strtNm;
+    @ApiModelProperty("종점 명")
+    @JsonProperty("end_nm")
+    private String endNm;
+    @ApiModelProperty("방향 코드")
+    @JsonProperty("drct_cd")
+    private String drctCd;
+    @ApiModelProperty("결측여부")
+    @JsonProperty("miss_yn")
+    private String missYn;
+
+    @ApiModelProperty("방향 설명")
+    @JsonProperty("drct_cd_desc")
+    private String drctDesc;
     @ApiModelProperty("소통 등급 코드 설명")
-    @JsonProperty("cmtr_grad_desc")    // CMTR_GRAD_CD
+    @JsonProperty("cmtr_grad_desc")
     private String cmtrGradDesc;
 
-    @ApiModel("TbRoadTrafUpdReq(도로 소통상황 정보변경)")
-    @Getter
-    @Setter
-    @ToString
-    @NoArgsConstructor(access = AccessLevel.PROTECTED)
-    public static class TbRoadTrafUpdReq {
-
-        @ApiModelProperty("도로 ID, Nullable = N, NUMBER(10)")  // N NUMBER(10)
-        @JsonProperty("road_id")
-        @Positive
-        private Long roadId;
-
-        @ApiModelProperty("가공 일시, Nullable = Y, VARCHAR(14)")  // Y VARCHAR(14)
-        @JsonProperty("prcn_dt")
-        @Size(min=1, max=14)
-        private String prcnDt;
-
-        @ApiModelProperty("교통량, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
-        @JsonProperty("tfvl")
-        @Positive
-        private Integer tfvl;
-
-        @ApiModelProperty("속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("sped")
-        @Positive
-        private Integer sped;
-
-        @ApiModelProperty("패턴 속도, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("ptrn_sped")
-        @Positive
-        private Integer ptrnSped;
-
-        @ApiModelProperty("점유 율, , NUMBER(5,2)")  // Y NUMBER(5,2)
-        @JsonProperty("ocpy_rate")
-        private Double ocpyRate;
-
-        @ApiModelProperty("통행 시간, Nullable = Y, NUMBER(6)")  // Y NUMBER(6)
-        @JsonProperty("trvl_hh")
-        @Positive
-        private Integer trvlHh;
-
-        @ApiModelProperty("소통 등급 코드, Nullable = Y, VARCHAR(7)")  // Y VARCHAR(7)
-        @JsonProperty("cmtr_grad_cd")
-        @Size(min=1, max=7)
-        private String cmtrGradCd;
-
-        @ApiModelProperty("데이터 개수, Nullable = Y, NUMBER(3)")  // Y NUMBER(3)
-        @JsonProperty("data_num")
-        @Positive
-        private Integer dataNum;
-
-        @Builder
-        public TbRoadTrafUpdReq(Long road_id, String prcn_dt, Integer tfvl, Integer sped, Integer ptrn_sped, Double ocpy_rate, Integer trvl_hh, String cmtr_grad_cd, Integer data_num) {
-            this.roadId = road_id;
-            this.prcnDt = prcn_dt;
-            this.tfvl = tfvl;
-            this.sped = sped;
-            this.ptrnSped = ptrn_sped;
-            this.ocpyRate = ocpy_rate;
-            this.trvlHh = trvl_hh;
-            this.cmtrGradCd = cmtr_grad_cd;
-            this.dataNum = data_num;
-        }
-
-        public TbRoadTraf toEntity() {
-            TbRoadTraf entity = TbRoadTraf.builder()
-                    .roadId(this.roadId)
-                    .prcnDt(this.prcnDt)
-                    .tfvl(this.tfvl)
-                    .sped(this.sped)
-                    .ptrnSped(this.ptrnSped)
-                    .ocpyRate(this.ocpyRate)
-                    .trvlHh(this.trvlHh)
-                    .cmtrGradCd(this.cmtrGradCd)
-                    .dataNum(this.dataNum)
-                    .build();
-
-            return entity;
-        }
-
-    }
-
 }

+ 0 - 46
src/main/java/com/its/api/op/model/entity/database/IfscTraf.java

@@ -1,46 +0,0 @@
-package com.its.api.op.model.entity.database;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
-import javax.persistence.*;
-
-@DynamicInsert
-@DynamicUpdate
-@Getter
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-@Table(name = "TB_IFSC_TRAF")
-public class IfscTraf {
-
-    @Id
-    @Column(nullable = false, unique = true, length = 10)
-    private Long    IFSC_ID;        //	N	NUMBER(10)	    N			정보제공구간 ID
-    @Column(nullable = false, length = 14)
-    private String  PRCN_DT;        //	N	VARCHAR2(14)	Y			가공 일시
-    @Column(length = 6)
-    private Integer TFVL;           //	N	NUMBER(6)	    Y	0		교통량
-    @Column(length = 3)
-    private Integer SPED;           //	N	NUMBER(3)	    Y	0		속도
-    @Column(length = 3)
-    private Integer PTRN_SPED;      //	N	NUMBER(3)	    Y	0		패턴 속도
-    @Column(columnDefinition = "NUMBER", length = 5, precision = 2)
-    private Double  OCPY_RATE;      //	N	NUMBER(5,2)	    Y	0		점유 율
-    @Column(length = 6)
-    private Integer TRVL_HH;        //	N	NUMBER(6)	    Y	0		통행 시간
-    @Column(length = 7)
-    private String  CMTR_GRAD_CD;   //	N	VARCHAR2(7)	    Y			소통 등급 코드
-    @Column(length = 3)
-    private Integer DATA_NUM;       //	N	NUMBER(3)	    Y	0		데이터 개수
-
-    @OneToOne
-    @JoinColumn(insertable=false, updatable=false, name="IFSC_ID", referencedColumnName = "IFSC_ID")
-    @NotFound(action = NotFoundAction.IGNORE)
-    private TbIfsc ifsc = new TbIfsc();
-}

+ 0 - 66
src/main/java/com/its/api/op/model/entity/database/LinkTraf.java

@@ -1,66 +0,0 @@
-package com.its.api.op.model.entity.database;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
-import javax.persistence.*;
-
-@DynamicInsert
-@DynamicUpdate
-@Getter
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-@Table(name = "TB_LINK_TRAF")
-public class LinkTraf {
-
-    @Id
-    @Column(nullable = false, unique = true, length = 10)
-    private Long    LINK_ID;         //	N	NUMBER(10)	    N			링크ID
-    @Column(nullable = false, length = 14)
-    private String  PRCN_DT;         //	N	VARCHAR2(14)	Y			가공 일시
-    @Column(length = 6)
-    private Integer TFVL;            //	N	NUMBER(6)	    Y	0		교통량
-    @Column(length = 3)
-    private Integer SPED;            //	N	NUMBER(3)	    Y	0		속도
-    @Column(columnDefinition = "NUMBER", length = 5, precision = 2)
-    private Double  OCPY_RATE;       //	N	NUMBER(5,2)	    Y	0		점유 율
-    @Column(length = 6)
-    private Integer TRVL_HH;         //	N	NUMBER(6)	    Y	0		통행 시간
-    @Column(length = 7)
-    private String  CMTR_GRAD_CD;    //	N	VARCHAR2(7)	    Y			소통 등급 코드
-    @Column(columnDefinition = "CHAR", length = 1)
-    private String  MISS_YN;         //	N	CHAR(1)	        Y	'N'		결측 여부
-    @Column(length = 3)
-    private Integer PRCN_SPED;       //	N	NUMBER(3)	    Y	0		가공 속도
-    @Column(length = 3)
-    private Integer SMTH_SPED;       //	N	NUMBER(3)	    Y	0		평활화 속도
-    @Column(length = 3)
-    private Integer ADJS_SPED;       //	N	NUMBER(3)	    Y	0		보정 속도
-    @Column(length = 3)
-    private Integer PTRN_SPED;       //	N	NUMBER(3)	    Y	0		패턴 속도
-    @Column(length = 7)
-    private String  PRCN_SORC;       //	N	VARCHAR2(7)	    Y			가공 소스
-    @Column(length = 7)
-    private String  ADJS_SORC;       //	N	VARCHAR2(7)	    Y			보정 소스
-    @Column(length = 3)
-    private Integer DATA_NUM;        //	N	NUMBER(3)	    Y	0		데이터 개수
-
-    @OneToOne
-    @JoinColumn(insertable=false, updatable=false, name="LINK_ID", referencedColumnName = "LINK_ID")
-    @NotFound(action = NotFoundAction.IGNORE)
-    private TbLink link = new TbLink();
-/*
-    @OneToOne
-    @JoinColumn(insertable=false, updatable=false, name="LINK_ID", referencedColumnName = "LINK_ID")
-    private Node from_node = new Node();
-
-    @OneToOne
-    @JoinColumn(insertable=false, updatable=false, name="LINK_ID", referencedColumnName = "LINK_ID")
-    private Node to_node = new Node();*/
-}

+ 0 - 48
src/main/java/com/its/api/op/model/entity/database/RoadTraf.java

@@ -1,48 +0,0 @@
-package com.its.api.op.model.entity.database;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
-import javax.persistence.*;
-
-@DynamicInsert
-@DynamicUpdate
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-@Table(name = "TB_ROAD_TRAF")
-public class RoadTraf {
-
-    @Id
-    @Column(nullable = false, unique = true, length = 10)
-    private Long    ROAD_ID;        //	N	NUMBER(10)	    N			도로 ID
-    @Column(length = 14)
-    private String  PRCN_DT;        //	N	VARCHAR2(14)	Y			가공 일시
-    @Column(length = 6)
-    private Integer TFVL;           //	N	NUMBER(6)	    Y	0		교통량
-    @Column(length = 3)
-    private Integer SPED;           //	N	NUMBER(3)	    Y	0		속도
-    @Column(length = 3)
-    private Integer PTRN_SPED;      //	N	NUMBER(3)	    Y	0		패턴 속도
-    @Column(columnDefinition = "NUMBER", length = 5, precision = 2)
-    private Double  OCPY_RATE;      //	N	NUMBER(5,2)	    Y	0		점유 율
-    @Column(length = 6)
-    private Integer TRVL_HH;        //	N	NUMBER(6)	    Y	0		통행 시간
-    @Column(length = 7)
-    private String  CMTR_GRAD_CD;   //	N	VARCHAR2(7)	    Y			소통 등급 코드
-    @Column(length = 3)
-    private Integer DATA_NUM;       //	N	NUMBER(3)	    Y	0		데이터 개수
-
-    @OneToOne
-    @JoinColumn(insertable=false, updatable=false, name="ROAD_ID", referencedColumnName = "ROAD_ID")
-    @NotFound(action = NotFoundAction.IGNORE)
-    private TbRoad road = new TbRoad();
-}

+ 12 - 15
src/main/java/com/its/api/op/model/entity/traffic/TbIfscTraf.java

@@ -1,7 +1,9 @@
 package com.its.api.op.model.entity.traffic;
 
+import com.its.api.op.global.CodeManager;
 import com.its.api.op.model.dto.traffic.TbIfscTrafDto;
 import com.its.api.op.model.entity.database.TbIfsc;
+import com.its.api.utils.ItsUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -79,22 +81,17 @@ public class TbIfscTraf implements Serializable {
                 .dataNum(this.dataNum)
                 .build();
 
-        return dto;
-    }
+        if (this.ifsc != null) {
+            dto.setIfscNm(this.ifsc.getIfscNm());
+            dto.setStrtNm(this.ifsc.getStrtNm());
+            dto.setEndNm(this.ifsc.getEndNm());
+            dto.setDrctCd(this.ifsc.getDrctCd());
+            dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd));
+        }
+        dto.setDrctDesc(CodeManager.getCodeDesc(CodeManager.DRCT_CD, dto.getDrctCd()));
+        dto.setCmtrGradDesc(CodeManager.getCodeDesc(CodeManager.CMTR_GRAD_CD, this.cmtrGradCd));
 
-    public TbIfscTraf(Long ifscId) {
-        this.ifscId = ifscId;
-    }
-
-    public void updateInfo(TbIfscTrafDto.TbIfscTrafUpdReq req) {
-        this.prcnDt = req.getPrcnDt();
-        this.tfvl = req.getTfvl();
-        this.sped = req.getSped();
-        this.ptrnSped = req.getPtrnSped();
-        this.ocpyRate = req.getOcpyRate();
-        this.trvlHh = req.getTrvlHh();
-        this.cmtrGradCd = req.getCmtrGradCd();
-        this.dataNum = req.getDataNum();
+        return dto;
     }
 
 }

+ 18 - 21
src/main/java/com/its/api/op/model/entity/traffic/TbLinkTraf.java

@@ -1,7 +1,9 @@
 package com.its.api.op.model.entity.traffic;
 
+import com.its.api.op.global.CodeManager;
 import com.its.api.op.model.dto.traffic.TbLinkTrafDto;
 import com.its.api.op.model.entity.database.TbLink;
+import com.its.api.utils.ItsUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -109,28 +111,23 @@ public class TbLinkTraf implements Serializable {
                 .dataNum(this.dataNum)
                 .build();
 
-        return dto;
-    }
+        dto.setMissYn(this.missYn.equals("N") ? ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd) : "Y");
+
+        if (this.link != null) {
+            dto.setFNodeId(this.getLink().getFNodeId());
+            if (this.getLink().getFromNode() != null) {
+                dto.setFNodeNm(this.getLink().getFromNode().getNodeName());
+            }
+            dto.setTNodeId(this.getLink().getTNodeId());
+            if (this.getLink().getToNode() != null) {
+                dto.setTNodeNm(this.getLink().getToNode().getNodeName());
+            }
+        }
+        dto.setCmtrGradDesc(CodeManager.getCodeDesc(CodeManager.CMTR_GRAD_CD, this.cmtrGradCd));
+        dto.setPrcnSorcDesc(CodeManager.getCodeDesc(CodeManager.PRCN_SORC, this.prcnSorc));
+        dto.setAdjsSorcDesc(CodeManager.getCodeDesc(CodeManager.ADJS_SORC, this.adjsSorc));
 
-    public TbLinkTraf(Long linkId) {
-        this.linkId = linkId;
-    }
-
-    public void updateInfo(TbLinkTrafDto.TbLinkTrafUpdReq req) {
-        this.prcnDt = req.getPrcnDt();
-        this.tfvl = req.getTfvl();
-        this.sped = req.getSped();
-        this.ocpyRate = req.getOcpyRate();
-        this.trvlHh = req.getTrvlHh();
-        this.cmtrGradCd = req.getCmtrGradCd();
-        this.missYn = req.getMissYn();
-        this.prcnSped = req.getPrcnSped();
-        this.smthSped = req.getSmthSped();
-        this.adjsSped = req.getAdjsSped();
-        this.ptrnSped = req.getPtrnSped();
-        this.prcnSorc = req.getPrcnSorc();
-        this.adjsSorc = req.getAdjsSorc();
-        this.dataNum = req.getDataNum();
+        return dto;
     }
 
 }

+ 12 - 15
src/main/java/com/its/api/op/model/entity/traffic/TbRoadTraf.java

@@ -1,7 +1,9 @@
 package com.its.api.op.model.entity.traffic;
 
+import com.its.api.op.global.CodeManager;
 import com.its.api.op.model.dto.traffic.TbRoadTrafDto;
 import com.its.api.op.model.entity.database.TbRoad;
+import com.its.api.utils.ItsUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -79,22 +81,17 @@ public class TbRoadTraf implements Serializable {
                 .dataNum(this.dataNum)
                 .build();
 
-        return dto;
-    }
+        if (this.road != null) {
+            dto.setRoadName(this.road.getRoadName());
+            dto.setStrtNm(this.road.getStrtNm());
+            dto.setEndNm(this.road.getEndNm());
+            dto.setDrctCd(this.road.getDrctCd());
+            dto.setMissYn(ItsUtils.getMissYn(this.prcnDt, this.cmtrGradCd));
+        }
+        dto.setDrctDesc(CodeManager.getCodeDesc(CodeManager.DRCT_CD, dto.getDrctCd()));
+        dto.setCmtrGradDesc(CodeManager.getCodeDesc(CodeManager.CMTR_GRAD_CD, this.cmtrGradCd));
 
-    public TbRoadTraf(Long roadId) {
-        this.roadId = roadId;
-    }
-
-    public void updateInfo(TbRoadTrafDto.TbRoadTrafUpdReq req) {
-        this.prcnDt = req.getPrcnDt();
-        this.tfvl = req.getTfvl();
-        this.sped = req.getSped();
-        this.ptrnSped = req.getPtrnSped();
-        this.ocpyRate = req.getOcpyRate();
-        this.trvlHh = req.getTrvlHh();
-        this.cmtrGradCd = req.getCmtrGradCd();
-        this.dataNum = req.getDataNum();
+        return dto;
     }
 
 }

+ 0 - 19
src/main/java/com/its/api/op/repository/BaseRepository.java

@@ -1,19 +0,0 @@
-package com.its.api.op.repository;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.NoRepositoryBean;
-
-import java.io.Serializable;
-
-@NoRepositoryBean
-public interface BaseRepository<T, ID extends Serializable> extends JpaRepository<T,ID> {
-
-    Page<T> findAll(Pageable pageable, Integer totalElements);
-    Page<T> findAll(Specification<T> spec, Pageable pageable, Integer totalElements);
-    Page<T> findAll(Specification<T> spec, Pageable pageable, Integer totalElements, Sort sort);
-
-}

+ 0 - 15
src/main/java/com/its/api/op/repository/database/IfscTrafRepository.java

@@ -1,15 +0,0 @@
-package com.its.api.op.repository.database;
-
-import com.its.api.op.model.entity.database.IfscTraf;
-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 IfscTrafRepository extends JpaRepository<IfscTraf, Long> {
-
-    @Query(value = "select distinct p from IfscTraf p inner join fetch p.ifsc")
-    List<IfscTraf> findAll();
-}

+ 0 - 15
src/main/java/com/its/api/op/repository/database/LinkTrafRepository.java

@@ -1,15 +0,0 @@
-package com.its.api.op.repository.database;
-
-import com.its.api.op.model.entity.database.LinkTraf;
-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 LinkTrafRepository extends JpaRepository<LinkTraf, Long> {
-
-    @Query(value = "select distinct p from LinkTraf p inner join fetch p.link m join fetch m.fromNode join fetch m.toNode")
-    List<LinkTraf> findAll();
-}

+ 0 - 15
src/main/java/com/its/api/op/repository/database/RoadTrafRepository.java

@@ -1,15 +0,0 @@
-package com.its.api.op.repository.database;
-
-import com.its.api.op.model.entity.database.RoadTraf;
-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 RoadTrafRepository extends JpaRepository<RoadTraf, Long> {
-
-    @Query(value = "select distinct p from RoadTraf p inner join fetch p.road")
-    List<RoadTraf> findAll();
-}

+ 1 - 1
src/main/java/com/its/api/op/repository/traffic/TbIfscTrafRepository.java

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

+ 0 - 73
src/main/java/com/its/api/op/service/AbstractDatabaseService.java

@@ -1,73 +0,0 @@
-package com.its.api.op.service;
-
-import com.its.api.op.repository.mapper.AbstractDatabaseMapper;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Slf4j
-public abstract class AbstractDatabaseService<T> implements DatabaseService<T> {
-
-    private AbstractDatabaseMapper<T> mapper;
-
-    public AbstractDatabaseService(AbstractDatabaseMapper mapper) {
-        this.mapper = mapper;
-    }
-
-    @Override
-    public List<T> findAll() {
-        try {
-            return this.mapper.findAll();
-        }
-        catch (Exception e) {
-            log.error("{}.findAll: Exception: {}", getClass().getSimpleName(), e.getMessage());
-        }
-        return new ArrayList<T>();
-    }
-
-    @Override
-    public T findById(String id) {
-        try {
-            return this.mapper.findById(id);
-        }
-        catch (Exception e) {
-            log.error("{}.findById: ID: {}, Exception: {}", getClass().getSimpleName(), id, e.getMessage());
-        }
-        return null;
-    }
-
-    @Override
-    public int updateById(T obj) {
-        try {
-            return this.mapper.updateById(obj);
-        }
-        catch (Exception e) {
-            log.error("{}.updateById: Object: {}, Exception: {}", getClass().getSimpleName(), obj, e.getMessage());
-        }
-        return 0;
-    }
-
-    @Override
-    public int deleteById(String id) {
-        try {
-            return this.mapper.deleteById(id);
-        }
-        catch (Exception e) {
-            log.error("{}.deleteById: ID: {}, {}", getClass().getSimpleName(), id, e.getMessage());
-        }
-        return 0;
-    }
-
-    @Override
-    public int deleteDataById(String id) {
-        try {
-            return this.mapper.deleteDataById(id);
-        }
-        catch (Exception e) {
-            log.error("{}.deleteDataById: ID: {}, Exception: {}", getClass().getSimpleName(), id, e.getMessage());
-        }
-        return 0;
-    }
-
-}

+ 0 - 21
src/main/java/com/its/api/op/service/DatabaseService.java

@@ -1,21 +0,0 @@
-package com.its.api.op.service;
-
-import java.util.List;
-
-public abstract interface DatabaseService<T> {
-
-    // 테이블 전체 데이터 Select
-    public abstract List<T> findAll();
-
-    // 테이블 키 컬럼(ID) 을 이용하여 데이터 1건 Select
-    public abstract T findById(String id);
-
-    // 테이블 키 컬럼(ID) 을 이용하여 데이터 1건 Update
-    public abstract int updateById(T obj);
-
-    // 테이블 키 컬럼(ID) 을 이용하여 데이터 update(DEL_YN='Y')
-    public abstract int deleteById(String id);
-
-    // 테이블 키 컬럼(ID) 을 이용하여 데이터 delete
-    public abstract int deleteDataById(String id);
-}

+ 0 - 9
src/main/java/com/its/api/op/service/HistoryService.java

@@ -1,9 +0,0 @@
-package com.its.api.op.service;
-
-import java.util.List;
-
-public interface HistoryService<P, T> {
-
-    List<T> findAllByDateRange(P p);
-
-}

+ 0 - 42
src/main/java/com/its/api/op/service/traffic/IfscTrafService.java

@@ -1,42 +0,0 @@
-package com.its.api.op.service.traffic;
-
-import com.its.api.op.model.entity.database.IfscTraf;
-import com.its.api.op.repository.database.IfscTrafRepository;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@Slf4j
-@RequiredArgsConstructor
-@Service
-public class IfscTrafService {
-
-    private final IfscTrafRepository repo;
-
-    public List<IfscTraf> findAll() {
-        try {
-            return this.repo.findAll();
-        }
-        catch (Exception e) {
-            log.error("{}.findAll: Exception: {}", getClass().getSimpleName(), e.getMessage());
-        }
-        return new ArrayList<>();
-    }
-    public IfscTraf findById(Long id) {
-        try {
-            Optional<IfscTraf> data = this.repo.findById(id);
-            if (data.isPresent()) {
-                return data.get();
-            }
-        }
-        catch (Exception e) {
-            log.error("{}.findById: Object: {}, Exception: {}", getClass().getSimpleName(), id, e.getMessage());
-        }
-        return null;
-    }
-
-}

+ 0 - 42
src/main/java/com/its/api/op/service/traffic/LinkTrafService.java

@@ -1,42 +0,0 @@
-package com.its.api.op.service.traffic;
-
-import com.its.api.op.model.entity.database.LinkTraf;
-import com.its.api.op.repository.database.LinkTrafRepository;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@Slf4j
-@RequiredArgsConstructor
-@Service
-public class LinkTrafService {
-
-    private final LinkTrafRepository repo;
-
-    public List<LinkTraf> findAll() {
-        try {
-            return this.repo.findAll();
-        }
-        catch (Exception e) {
-            log.error("{}.findAll: Exception: {}", getClass().getSimpleName(), e.getMessage());
-        }
-        return new ArrayList<>();
-    }
-    public LinkTraf findById(Long id) {
-        try {
-            Optional<LinkTraf> data = this.repo.findById(id);
-            if (data.isPresent()) {
-                return data.get();
-            }
-        }
-        catch (Exception e) {
-            log.error("{}.findById: Object: {}, Exception: {}", getClass().getSimpleName(), id, e.getMessage());
-        }
-        return null;
-    }
-
-}

+ 0 - 42
src/main/java/com/its/api/op/service/traffic/RoadTrafService.java

@@ -1,42 +0,0 @@
-package com.its.api.op.service.traffic;
-
-import com.its.api.op.model.entity.database.RoadTraf;
-import com.its.api.op.repository.database.RoadTrafRepository;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@Slf4j
-@RequiredArgsConstructor
-@Service
-public class RoadTrafService {
-
-    private final RoadTrafRepository repo;
-
-    public List<RoadTraf> findAll() {
-        try {
-            return this.repo.findAll();
-        }
-        catch (Exception e) {
-            log.error("{}.findAll: Exception: {}", getClass().getSimpleName(), e.getMessage());
-        }
-        return new ArrayList<>();
-    }
-    public RoadTraf findById(Long id) {
-        try {
-            Optional<RoadTraf> data = this.repo.findById(id);
-            if (data.isPresent()) {
-                return data.get();
-            }
-        }
-        catch (Exception e) {
-            log.error("{}.findById: Object: {}, Exception: {}", getClass().getSimpleName(), id, e.getMessage());
-        }
-        return null;
-    }
-
-}