20230616: 교차로 미분류 교통량 추가'

src/main/java/com/its/op/dto/its/scrs/ScTfvlDto.java

@@ -126,5 +126,16 @@ public class ScTfvlDto implements Serializable {
     @JsonProperty("bike_rght_tfvl")
     private Integer bikeRghtTfvl;
 
+    @ApiModelProperty("미분류 직진 교통량")  // Y NUMBER(8)
+    @JsonProperty("uncn_go_tfvl")
+    private Integer uncnGoTfvl;
+
+    @ApiModelProperty("미분류 좌회전 교통량")  // Y NUMBER(8)
+    @JsonProperty("uncn_left_tfvl")
+    private Integer uncnLeftTfvl;
+
+    @ApiModelProperty("미분류 우회전 교통량")  // Y NUMBER(8)
+    @JsonProperty("uncn_rght_tfvl")
+    private Integer uncnRghtTfvl;
 
 }

src/main/java/com/its/op/dto/its/scrs/TbScImgnDtctRawClctDto.java

@@ -113,6 +113,18 @@ public class TbScImgnDtctRawClctDto implements Serializable {
     @JsonProperty("bike_rght_tfvl")
     private Integer bikeRghtTfvl;
 
+    @ApiModelProperty("미분류 직진 교통량")  // Y NUMBER(8)
+    @JsonProperty("uncn_go_tfvl")
+    private Integer uncnGoTfvl;
+
+    @ApiModelProperty("미분류 좌회전 교통량")  // Y NUMBER(8)
+    @JsonProperty("uncn_left_tfvl")
+    private Integer uncnLeftTfvl;
+
+    @ApiModelProperty("미분류 우회전 교통량")  // Y NUMBER(8)
+    @JsonProperty("uncn_rght_tfvl")
+    private Integer uncnRghtTfvl;
+
     // Code Description Field
     @ApiModelProperty("방향 구분 코드 설명")
     @JsonProperty("drct_dvsn_desc")    // DRCT_DVSN_CD

src/main/java/com/its/op/entity/its/scrs/TbScImgnDtctRawClct.java

@@ -126,6 +126,18 @@ public class TbScImgnDtctRawClct implements Serializable {
     @Column(name = "BIKE_RGHT_TFVL", columnDefinition = "NUMBER", length = 8)
     private Integer bikeRghtTfvl;
 
+    @ApiModelProperty("미분류 직진 교통량")  // Y NUMBER(8)
+    @Column(name = "UNCN_GO_TFVL", columnDefinition = "NUMBER", length = 8)
+    private Integer uncnGoTfvl;
+
+    @ApiModelProperty("미분류 좌회전 교통량")  // Y NUMBER(8)
+    @Column(name = "UNCN_LEFT_TFVL", columnDefinition = "NUMBER", length = 8)
+    private Integer uncnLeftTfvl;
+
+    @ApiModelProperty("미분류 우회전 교통량")  // Y NUMBER(8)
+    @Column(name = "UNCN_RGHT_TFVL", columnDefinition = "NUMBER", length = 8)
+    private Integer uncnRghtTfvl;
+
     public TbScImgnDtctRawClctDto toDto() {
         return TbScImgnDtctRawClctDto.builder()
                 .clctDt(this.clctDt)
@@ -152,6 +164,9 @@ public class TbScImgnDtctRawClct implements Serializable {
                 .bikeGoTfvl(this.bikeGoTfvl)
                 .bikeLeftTfvl(this.bikeLeftTfvl)
                 .bikeRghtTfvl(this.bikeRghtTfvl)
+                .uncnGoTfvl(this.uncnGoTfvl)
+                .uncnLeftTfvl(this.uncnLeftTfvl)
+                .uncnRghtTfvl(this.uncnRghtTfvl)
                 .build();
     }
 

src/main/resources/mybatis/mapper/its/scrs/ScTfvlStatisticsMapper.xml

@@ -30,7 +30,10 @@
                SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl,
                SUM(A.BIKE_GO_TFVL) AS bikeGoTfvl,
                SUM(A.BIKE_LEFT_TFVL) AS bikeLeftTfvl,
-               SUM(A.BIKE_RGHT_TFVL) AS bikeRghtTfvl
+               SUM(A.BIKE_RGHT_TFVL) AS bikeRghtTfvl,
+               SUM(A.UNCN_GO_TFVL) AS uncnGoTfvl,
+               SUM(A.UNCN_LEFT_TFVL) AS uncnLeftTfvl,
+               SUM(A.UNCN_RGHT_TFVL) AS uncnRghtTfvl
         FROM TB_SC_IMGN_DTCT_RAW_CLCT A,
              (SELECT A.IXR_ID, A.IXR_NM, B.CMRA_ID, B.ISTL_LCTN,
                      B.DRCT_DVSN_CD, fn_codeName('DRCT', B.DRCT_DVSN_CD) AS DRCT_DVSN_NM
@@ -318,7 +321,10 @@
                A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl,
                A.BIKE_GO_TFVL AS bikeGoTfvl,
                A.BIKE_LEFT_TFVL AS bikeLeftTfvl,
-               A.BIKE_RGHT_TFVL AS bikeRghtTfvl
+               A.BIKE_RGHT_TFVL AS bikeRghtTfvl,
+               A.UNCN_GO_TFVL AS uncnGoTfvl,
+               A.UNCN_LEFT_TFVL AS uncnLeftTfvl,
+               A.UNCN_RGHT_TFVL AS uncnRghtTfvl
           FROM TB_SC_IMGN_DTCT_RAW_CLCT A,
                 (SELECT A.IXR_ID, A.IXR_NM, B.CMRA_ID, B.ISTL_LCTN,
                 B.DRCT_DVSN_CD, fn_codeName('DRCT', B.DRCT_DVSN_CD) AS DRCT_DVSN_NM