shjung hace 2 años
padre
commit
b32d78ad39

+ 6 - 0
src/main/java/com/its/op/dao/repository/its/link/TbLinkTrafClctHsRepository.java

@@ -43,6 +43,8 @@ PIVOT(
             "      nvl(max(case when p.clctSystCd = 'UTIS01' then p.sped end), 0) AS utis01, " +
             "      nvl(max(case when p.clctSystCd = 'UTIS02' then p.sped end), 0) AS utis02, " +
             "      nvl(max(case when p.clctSystCd = 'VDS01'  then p.sped end), 0) AS vds01,  " +
+            "      nvl(max(case when p.clctSystCd = 'DSRC01' then p.sped end), 0) AS dsrc01, " +
+            "      nvl(max(case when p.clctSystCd = 'GITS01' then p.sped end), 0) AS gits01, " +
             "      nvl(max(case when p.clctSystCd = 'MOCT01' then p.sped end), 0) AS moct01  " +
             "  FROM TbLinkTrafClctHs p " +
             " WHERE p.prcnDt BETWEEN :fromDt AND :toDt " +
@@ -56,6 +58,8 @@ PIVOT(
             "      nvl(max(case when p.clctSystCd = 'UTIS01' then p.sped end), 0) AS utis01, " +
             "      nvl(max(case when p.clctSystCd = 'UTIS02' then p.sped end), 0) AS utis02, " +
             "      nvl(max(case when p.clctSystCd = 'VDS01'  then p.sped end), 0) AS vds01,  " +
+            "      nvl(max(case when p.clctSystCd = 'DSRC01' then p.sped end), 0) AS dsrc01, " +
+            "      nvl(max(case when p.clctSystCd = 'GITS01' then p.sped end), 0) AS gits01, " +
             "      nvl(max(case when p.clctSystCd = 'MOCT01' then p.sped end), 0) AS moct01  " +
             "  FROM TbLinkTrafClctHs p inner join p.link l inner join l.fromNode fn inner join l.toNode tn " +
             " WHERE p.prcnDt BETWEEN :fromDt AND :toDt " +
@@ -69,6 +73,8 @@ PIVOT(
             "      nvl(max(case when p.clctSystCd = 'UTIS01' then p.sped end), 0) AS utis01, " +
             "      nvl(max(case when p.clctSystCd = 'UTIS02' then p.sped end), 0) AS utis02, " +
             "      nvl(max(case when p.clctSystCd = 'VDS01'  then p.sped end), 0) AS vds01,  " +
+            "      nvl(max(case when p.clctSystCd = 'DSRC01' then p.sped end), 0) AS dsrc01, " +
+            "      nvl(max(case when p.clctSystCd = 'GITS01' then p.sped end), 0) AS gits01, " +
             "      nvl(max(case when p.clctSystCd = 'MOCT01' then p.sped end), 0) AS moct01  " +
             "  FROM TbLinkTrafClctHs p inner join p.link l inner join l.fromNode fn inner join l.toNode tn " +
             " WHERE p.prcnDt BETWEEN :fromDt AND :toDt " +

+ 8 - 0
src/main/java/com/its/op/dto/its/link/TbLinkTrafClctHsAnalDto.java

@@ -56,6 +56,14 @@ public class TbLinkTrafClctHsAnalDto implements Serializable {
     @JsonProperty("VDS01")
     private Integer vds01;
 
+    @ApiModelProperty("DSRC 속도")  // Y NUMBER(3)
+    @JsonProperty("DSRC01")
+    private Integer dsrc01;
+
+    @ApiModelProperty("GITS 속도")  // Y NUMBER(3)
+    @JsonProperty("GITS01")
+    private Integer gits01;
+
     @ApiModelProperty("민간정보 속도")  // Y NUMBER(3)
     @JsonProperty("MOCT01")
     private Integer moct01;

+ 2 - 0
src/main/java/com/its/op/dto/its/link/TbLinkTrafClctHsAnalInf.java

@@ -17,6 +17,8 @@ public interface TbLinkTrafClctHsAnalInf {
     BigDecimal getUtis01();
     BigDecimal getUtis02();
     BigDecimal getVds01();
+    BigDecimal getDsrc01();
+    BigDecimal getGits01();
     BigDecimal getMoct01();
 
 }

+ 11 - 1
src/main/java/com/its/op/dto/its/link/TbLinkTrafClctHsHistDto.java

@@ -43,17 +43,27 @@ public class TbLinkTrafClctHsHistDto implements Serializable {
     @JsonProperty("VDS01")
     private Integer vds01;
 
+    @ApiModelProperty("DSRC 속도")  // Y NUMBER(3)
+    @JsonProperty("DSRC01")
+    private Integer dsrc01;
+
+    @ApiModelProperty("GITS 속도")  // Y NUMBER(3)
+    @JsonProperty("GITS01")
+    private Integer gits01;
+
     @ApiModelProperty("민간정보 속도")  // Y NUMBER(3)
     @JsonProperty("MOCT01")
     private Integer moct01;
 
-    public TbLinkTrafClctHsHistDto(BigDecimal linkId, String prcnDt, BigDecimal OPER01, BigDecimal UTIS01, BigDecimal UTIS02, BigDecimal VDS01, BigDecimal MOCT01) {
+    public TbLinkTrafClctHsHistDto(BigDecimal linkId, String prcnDt, BigDecimal OPER01, BigDecimal UTIS01, BigDecimal UTIS02, BigDecimal VDS01, BigDecimal DSRC01, BigDecimal GITS01, BigDecimal MOCT01) {
         this.linkId = linkId.longValue();
         this.prcnDt = prcnDt;
         this.oper01 = OPER01.intValue();
         this.utis01 = UTIS01.intValue();
         this.utis02 = UTIS02.intValue();
         this.vds01 = VDS01.intValue();
+        this.dsrc01 = DSRC01.intValue();
+        this.gits01 = GITS01.intValue();
         this.moct01 = MOCT01.intValue();
     }
 }

+ 2 - 0
src/main/java/com/its/op/dto/its/link/TbLinkTrafClctHsHistInf.java

@@ -13,6 +13,8 @@ public interface TbLinkTrafClctHsHistInf {
     BigDecimal getUtis01();
     BigDecimal getUtis02();
     BigDecimal getVds01();
+    BigDecimal getDsrc01();
+    BigDecimal getGits01();
     BigDecimal getMoct01();
 
 }

+ 6 - 2
src/main/java/com/its/op/service/its/link/TbLinkTrafClctHsService.java

@@ -39,10 +39,12 @@ public class TbLinkTrafClctHsService {
                         .linkId(obj.getLinkId().longValue())
                         .prcnDt(obj.getPrcnDt())
                         .oper01(obj.getOper01().intValue())
-                        .moct01(obj.getMoct01().intValue())
                         .utis01(obj.getUtis01().intValue())
                         .utis02(obj.getUtis02().intValue())
                         .vds01(obj.getVds01().intValue())
+                        .dsrc01(obj.getDsrc01().intValue())
+                        .gits01(obj.getGits01().intValue())
+                        .moct01(obj.getMoct01().intValue())
                         .build());
             });
         }
@@ -82,10 +84,12 @@ public class TbLinkTrafClctHsService {
                         .linkId(obj.getLinkId().longValue())
                         .prcnDt(obj.getPrcnDt())
                         .oper01(obj.getOper01().intValue())
-                        .moct01(obj.getMoct01().intValue())
                         .utis01(obj.getUtis01().intValue())
                         .utis02(obj.getUtis02().intValue())
                         .vds01(obj.getVds01().intValue())
+                        .dsrc01(obj.getDsrc01().intValue())
+                        .gits01(obj.getGits01().intValue())
+                        .moct01(obj.getMoct01().intValue())
                         .build());
             });
         }