dev

src/main/java/com/its/op/dao/repository/its/wcam/TbWcamCtlrSttsHsRepository.java

@@ -28,7 +28,7 @@ public interface TbWcamCtlrSttsHsRepository extends JpaRepository<TbWcamCtlrStts
     List<SttsHsErrCntInf> findAllCommErrorCount(@Param("fromDt") String fromDt);
 
     @Query("select p from TbWcamCtlrSttsHs p inner join fetch p.wcam where p.crtnDt between :fromDt and :toDt and p.wcamCtlrNmbr in :ids")
-    List<TbWcamCtlrSttsHs> findAllByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("fromDt") List<Long> ids);
+    List<TbWcamCtlrSttsHs> findAllByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("ids") List<Long> ids);
 
     @Query("select p from TbWcamCtlrSttsHs p inner join fetch p.wcam " +
             " where p.crtnDt between :fromDt and :toDt " +

src/main/java/com/its/op/dto/its/cctv/TbCctvMonitoringDto.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.persistence.Column;
 import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -74,15 +73,15 @@ public class TbCctvMonitoringDto implements Serializable {
     private String webRtcId;
 
     @ApiModelProperty("RTC 서버 아이피")  // Y VARCHAR2(20)
-    @Column(name = "RTC_SVR_IP", length = 20)
+    @JsonProperty("rtc_svr_ip")
     private String rtcSvrIp;
 
     @ApiModelProperty("RTC 서버 포트")  // Y NUMBER(5)
-    @Column(name = "RTC_SVR_PORT", columnDefinition = "NUMBER", length = 5)
+    @JsonProperty("rtc_svr_port")
     private Integer rtcSvrPort;
 
     @ApiModelProperty("RTC ID")  // Y VARCHAR2(56)
-    @Column(name = "RTC_ID", length = 56)
+    @JsonProperty("rtc_id")
     private String rtcId;
 
     @ApiModel("TbCctvMonitoringUpdReq(웹카메라 모니터링 화면 정보변경)")

src/main/java/com/its/op/dto/its/wcam/TbWcamMonitoringDto.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.persistence.Column;
 import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -43,35 +42,35 @@ public class TbWcamMonitoringDto implements Serializable {
 
 
     @ApiModelProperty("웹카메라 제어기 ID")  // Y VARCHAR2(30)
-    @Column(name = "WCAM_CTLR_ID", length = 30)
+    @JsonProperty("wcam_ctrl_id")
     private String wcamCtlrId;
 
     @ApiModelProperty("웹카메라 명칭")  // Y VARCHAR2(40)
-    @Column(name = "WCAM_NM", length = 40)
+    @JsonProperty("wcam_nm")
     private String wcamNm;
 
     @ApiModelProperty("WEB RTC 서버 아이피")  // Y VARCHAR2(20)
-    @Column(name = "WEB_RTC_SVR_IP", length = 20)
+    @JsonProperty("web_rtc_svr_id")
     private String webRtcSvrIp;
 
     @ApiModelProperty("WEB RTC 서버 포트")  // Y NUMBER(5)
-    @Column(name = "WEB_RTC_SVR_PORT", columnDefinition = "NUMBER", length = 5)
+    @JsonProperty("web_rtc_svr_port")
     private Integer webRtcSvrPort;
 
     @ApiModelProperty("WEB RTC ID")  // Y VARCHAR2(56)
-    @Column(name = "WEB_RTC_ID", length = 56)
+    @JsonProperty("web_rtc_id")
     private String webRtcId;
 
     @ApiModelProperty("RTC 서버 아이피")  // Y VARCHAR2(20)
-    @Column(name = "RTC_SVR_IP", length = 20)
+    @JsonProperty("rtc_svr_ip")
     private String rtcSvrIp;
 
     @ApiModelProperty("RTC 서버 포트")  // Y NUMBER(5)
-    @Column(name = "RTC_SVR_PORT", columnDefinition = "NUMBER", length = 5)
+    @JsonProperty("rtc_svr_port")
     private Integer rtcSvrPort;
 
     @ApiModelProperty("RTC ID")  // Y VARCHAR2(56)
-    @Column(name = "RTC_ID", length = 56)
+    @JsonProperty("rtc_id")
     private String rtcId;
 
     // Code Description Field

src/main/java/com/its/op/service/its/scrs/TbScIxrCmraMngmService.java

@@ -138,8 +138,10 @@ public class TbScIxrCmraMngmService {
                         .fcltId(String.valueOf(obj.getCmraId()))
                         .fcltNm(obj.getIstlLctn())
                         .fcltKind(String.valueOf(obj.getDrctDvsnCd()))
-                        .xCrdn(Double.parseDouble(obj.getCmraYCrdn()))
-                        .yCrdn(Double.parseDouble(obj.getCmraXCrdn()))
+//                        .xCrdn(Double.parseDouble(obj.getCmraYCrdn()))
+//                        .yCrdn(Double.parseDouble(obj.getCmraXCrdn()))
+                        .xCrdn(Double.parseDouble(obj.getCmraXCrdn()))
+                        .yCrdn(Double.parseDouble(obj.getCmraYCrdn()))
                         .sttsCd(dto.getCmncSttsCd())
                         .sttsDesc(dto.getCmncSttsDesc())
                         .build();

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

@@ -9,6 +9,7 @@
                A.CLCT_DT AS clctDt,
                ROUND(AVG(A.STRT), 0) AS strt,
                SUM(A.TFVL) AS tfvl,
+               0 AS lane,
                ROUND(AVG(A.STDG_TRFC_RATE), 0) AS stdgTrfcRate,
                ROUND(AVG(A.OCPY_HH), 0) AS ocpyHh,
                ROUND(AVG(A.NOCP_HH), 0) AS nocpHh

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

@@ -71,8 +71,13 @@
                SUM(A.LRG_RGHT_TFVL) AS lrgRghtTfvl,
                SUM(A.MDDL_RGHT_TFVL) AS mddlRghtTfvl,
                SUM(A.SMAL_RGHT_TFVL) AS smalRghtTfvl,
+               0 AS uturnTfvl,
+               0 AS sped,
                SUM(A.BUS_DVRS_LANE_GO_TFVL) AS busDvrsLaneGoTfvl,
-               SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl
+               SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl,
+               0 AS bikeGoTfvl,
+               0 AS bikeLeftTfvl,
+               0 AS bikeRghtTfvl
           FROM TB_SC_ACRD_STAT_15M 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
@@ -113,8 +118,13 @@
                SUM(A.LRG_RGHT_TFVL) AS lrgRghtTfvl,
                SUM(A.MDDL_RGHT_TFVL) AS mddlRghtTfvl,
                SUM(A.SMAL_RGHT_TFVL) AS smalRghtTfvl,
+               0 AS uturnTfvl,
+               0 AS sped,
                SUM(A.BUS_DVRS_LANE_GO_TFVL) AS busDvrsLaneGoTfvl,
-               SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl
+               SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl,
+               0 AS bikeGoTfvl,
+               0 AS bikeLeftTfvl,
+               0 AS bikeRghtTfvl
         FROM TB_SC_ACRD_STAT_30M 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
@@ -154,8 +164,13 @@
                SUM(A.LRG_RGHT_TFVL) AS lrgRghtTfvl,
                SUM(A.MDDL_RGHT_TFVL) AS mddlRghtTfvl,
                SUM(A.SMAL_RGHT_TFVL) AS smalRghtTfvl,
+               0 AS uturnTfvl,
+               0 AS sped,
                SUM(A.BUS_DVRS_LANE_GO_TFVL) AS busDvrsLaneGoTfvl,
-               SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl
+               SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl,
+               0 AS bikeGoTfvl,
+               0 AS bikeLeftTfvl,
+               0 AS bikeRghtTfvl
         FROM TB_SC_ACRD_STAT_HH 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
@@ -195,8 +210,13 @@
                SUM(A.LRG_RGHT_TFVL) AS lrgRghtTfvl,
                SUM(A.MDDL_RGHT_TFVL) AS mddlRghtTfvl,
                SUM(A.SMAL_RGHT_TFVL) AS smalRghtTfvl,
+               0 AS uturnTfvl,
+               0 AS sped,
                SUM(A.BUS_DVRS_LANE_GO_TFVL) AS busDvrsLaneGoTfvl,
-               SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl
+               SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl,
+               0 AS bikeGoTfvl,
+               0 AS bikeLeftTfvl,
+               0 AS bikeRghtTfvl
         FROM TB_SC_ACRD_STAT_DD 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
@@ -236,8 +256,13 @@
                SUM(A.LRG_RGHT_TFVL) AS lrgRghtTfvl,
                SUM(A.MDDL_RGHT_TFVL) AS mddlRghtTfvl,
                SUM(A.SMAL_RGHT_TFVL) AS smalRghtTfvl,
+               0 AS uturnTfvl,
+               0 AS sped,
                SUM(A.BUS_DVRS_LANE_GO_TFVL) AS busDvrsLaneGoTfvl,
-               SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl
+               SUM(A.BUS_DVRS_LANE_LEFT_TFVL) AS busDvrsLaneLeftTfvl,
+               0 AS bikeGoTfvl,
+               0 AS bikeLeftTfvl,
+               0 AS bikeRghtTfvl
         FROM TB_SC_ACRD_STAT_MN 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
@@ -325,8 +350,13 @@
                A.LRG_RGHT_TFVL AS lrgRghtTfvl,
                A.MDDL_RGHT_TFVL AS mddlRghtTfvl,
                A.SMAL_RGHT_TFVL AS smalRghtTfvl,
+               0 AS uturnTfvl,
+               0 AS sped,
                A.BUS_DVRS_LANE_GO_TFVL AS busDvrsLaneGoTfvl,
-               A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl
+               A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl,
+               0 AS bikeGoTfvl,
+               0 AS bikeLeftTfvl,
+               0 AS bikeRghtTfvl
           FROM TB_SC_LANE_STAT_15M 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
@@ -367,8 +397,13 @@
                A.LRG_RGHT_TFVL AS lrgRghtTfvl,
                A.MDDL_RGHT_TFVL AS mddlRghtTfvl,
                A.SMAL_RGHT_TFVL AS smalRghtTfvl,
+               0 AS uturnTfvl,
+               0 AS sped,
                A.BUS_DVRS_LANE_GO_TFVL AS busDvrsLaneGoTfvl,
-               A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl
+               A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl,
+               0 AS bikeGoTfvl,
+               0 AS bikeLeftTfvl,
+               0 AS bikeRghtTfvl
           FROM TB_SC_LANE_STAT_30M 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
@@ -409,8 +444,13 @@
                A.LRG_RGHT_TFVL AS lrgRghtTfvl,
                A.MDDL_RGHT_TFVL AS mddlRghtTfvl,
                A.SMAL_RGHT_TFVL AS smalRghtTfvl,
+               0 AS uturnTfvl,
+               0 AS sped,
                A.BUS_DVRS_LANE_GO_TFVL AS busDvrsLaneGoTfvl,
-               A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl
+               A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl,
+               0 AS bikeGoTfvl,
+               0 AS bikeLeftTfvl,
+               0 AS bikeRghtTfvl
           FROM TB_SC_LANE_STAT_HH 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
@@ -451,8 +491,13 @@
                A.LRG_RGHT_TFVL AS lrgRghtTfvl,
                A.MDDL_RGHT_TFVL AS mddlRghtTfvl,
                A.SMAL_RGHT_TFVL AS smalRghtTfvl,
+               0 AS uturnTfvl,
+               0 AS sped,
                A.BUS_DVRS_LANE_GO_TFVL AS busDvrsLaneGoTfvl,
-               A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl
+               A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl,
+               0 AS bikeGoTfvl,
+               0 AS bikeLeftTfvl,
+               0 AS bikeRghtTfvl
           FROM TB_SC_LANE_STAT_DD 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
@@ -493,8 +538,13 @@
                A.LRG_RGHT_TFVL AS lrgRghtTfvl,
                A.MDDL_RGHT_TFVL AS mddlRghtTfvl,
                A.SMAL_RGHT_TFVL AS smalRghtTfvl,
+               0 AS uturnTfvl,
+               0 AS sped,
                A.BUS_DVRS_LANE_GO_TFVL AS busDvrsLaneGoTfvl,
-               A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl
+               A.BUS_DVRS_LANE_LEFT_TFVL AS busDvrsLaneLeftTfvl,
+               0 AS bikeGoTfvl,
+               0 AS bikeLeftTfvl,
+               0 AS bikeRghtTfvl
           FROM TB_SC_LANE_STAT_MN 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