shjung il y a 2 ans
Parent
commit
db41fc440b

+ 14 - 0
src/main/java/com/its/op/dao/mapper/CamelCaseKeyMap.java

@@ -0,0 +1,14 @@
+package com.its.op.dao.mapper;
+
+import org.springframework.jdbc.support.JdbcUtils;
+
+import java.util.HashMap;
+
+public class CamelCaseKeyMap extends HashMap<String, Object> {
+
+    @Override
+    public Object put(String key, Object value) {
+        return super.put(JdbcUtils.convertUnderscoreNameToPropertyName(key), value);
+    }
+
+}

+ 4 - 0
src/main/java/com/its/op/dto/its/analysis/PtrnDataDto.java

@@ -16,15 +16,19 @@ public class PtrnDataDto {
     @ApiModelProperty("ID, (LINK_ID, IFSC_ID, ROAD_ID)")
     @JsonProperty("id")
     private String ID;              // ID, (LINK_ID, IFSC_ID, ROAD_ID)
+
     @ApiModelProperty("구간명")
     @JsonProperty("sect_name")
     private String SECT_NAME;       // 구간명
+
     @ApiModelProperty("구간길이")
     @JsonProperty("sect_lngt")
     private String SECT_LNGT;       // 구간길이
+
     @ApiModelProperty("패턴요일")
     @JsonProperty("day_type_cd")
     private String DAY_TYPE_CD;     // 패턴요일
+
     @ApiModelProperty("패턴시각")
     @JsonProperty("ptrn_hm")
     private String PTRN_HM;         // 패턴시각

+ 6 - 0
src/main/java/com/its/op/dto/its/atrd/AtrdStatDailyDto.java

@@ -18,21 +18,27 @@ public class AtrdStatDailyDto {
     @ApiModelProperty("간선도로 ID")
     @JsonProperty("atrd_id")
     private String ATRD_ID;
+
     @ApiModelProperty("간선도로명")
     @JsonProperty("atrd_nm")
     private String ATRD_NM;
+
     @ApiModelProperty("방향코드")
     @JsonProperty("drct_cd")
     private String DRCT_CD;
+
     @ApiModelProperty("방향코드설명")
     @JsonProperty("drct_cd_desc")
     private String DRCT_CD_DESC;
+
     @ApiModelProperty("구간거리")
     @JsonProperty("sect_lngt")
     private String SECT_LNGT;
+
     @ApiModelProperty("유형")
     @JsonProperty("trf_type")
     private String TRF_TYPE;
+
     @ApiModelProperty("평균속도")
     @JsonProperty("avg_sped")
     private String AVG_SPED;

+ 6 - 0
src/main/java/com/its/op/dto/its/atrd/AtrdStatHourlyDto.java

@@ -18,21 +18,27 @@ public class AtrdStatHourlyDto {
     @ApiModelProperty("간선도로 ID")
     @JsonProperty("atrd_id")
     private String ATRD_ID;
+
     @ApiModelProperty("간선도로명")
     @JsonProperty("atrd_nm")
     private String ATRD_NM;
+
     @ApiModelProperty("방향코드")
     @JsonProperty("drct_cd")
     private String DRCT_CD;
+
     @ApiModelProperty("방향코드설명")
     @JsonProperty("drct_cd_desc")
     private String DRCT_CD_DESC;
+
     @ApiModelProperty("구간거리")
     @JsonProperty("sect_lngt")
     private String SECT_LNGT;
+
     @ApiModelProperty("유형")
     @JsonProperty("trf_type")
     private String TRF_TYPE;
+
     @ApiModelProperty("평균속도")
     @JsonProperty("avg_sped")
     private String AVG_SPED;

+ 10 - 0
src/main/java/com/its/op/dto/its/atrd/AtrdTrafficStatDto.java

@@ -18,33 +18,43 @@ public class AtrdTrafficStatDto {
     @ApiModelProperty("아이디")
     @JsonProperty("id")
     private String ID;
+
     @ApiModelProperty("순서")
     @JsonProperty("ord")
     private int    ORD;
+
     @ApiModelProperty("통계시각")
     @JsonProperty("stat_dt")
     private String STAT_DT;
+
     /*@ApiModelProperty("통계시각")
     @JsonProperty("stat_dt_fmt")
     private String STAT_DT_FMT;*/
+
     @ApiModelProperty("시점명")
     @JsonProperty("f_name")
     private String F_NAME;
+
     @ApiModelProperty("종점명")
     @JsonProperty("t_name")
     private String T_NAME;
+
     @ApiModelProperty("구간길이")
     @JsonProperty("sect_lngt")
     private int    SECT_LNGT;
+
     @ApiModelProperty("교통량")
     @JsonProperty("tfvl")
     private int    TFVL;
+
     @ApiModelProperty("속도")
     @JsonProperty("sped")
     private int    SPED;
+
     @ApiModelProperty("점유율")
     @JsonProperty("ocpy_rate")
     private double OCPY_RATE;
+
     @ApiModelProperty("통행시간")
     @JsonProperty("trvl_hh")
     private int    TRVL_HH;

+ 9 - 0
src/main/java/com/its/op/dto/its/statistics/IncidentSectStatDto.java

@@ -18,30 +18,39 @@ public class IncidentSectStatDto {
     @ApiModelProperty("통계일")
     @JsonProperty("stat_dt")
     private String STAT_DT;         // 통계일
+
     @ApiModelProperty("데이터 건수")
     @JsonProperty("data_cnt")
     private String DATA_CNT;        // 데이터 건수(화면표출안함)
+
     @ApiModelProperty("표출통계일")
     @JsonProperty("stat_dt_fmt")
     private String STAT_DT_FMT;
+
     @ApiModelProperty("구간 ID")
     @JsonProperty("link_id")
     private String LINK_ID;         // 구간 ID
+
     @ApiModelProperty("시점명")
     @JsonProperty("f_name")
     private String F_NAME;          // 시점명
+
     @ApiModelProperty("종점명")
     @JsonProperty("t_name")
     private String T_NAME;          // 종점명
+
     @ApiModelProperty("발생건수")
     @JsonProperty("incd_ocrr_num")
     private String INCD_OCRR_NUM;   // 발생건수
+
     @ApiModelProperty("사망자수")
     @JsonProperty("ftlt_pnum")
     private String FTLT_PNUM;       // 사망자수
+
     @ApiModelProperty("부상자수")
     @JsonProperty("injr_pnum")
     private String INJR_PNUM;       // 부상자수
+
     @ApiModelProperty("피해금액")
     @JsonProperty("prpr_dmge_amt")
     private String PRPR_DMGE_AMT;   // 피해금액

+ 7 - 0
src/main/java/com/its/op/dto/its/statistics/IncidentTypeStatDto.java

@@ -18,24 +18,31 @@ public class IncidentTypeStatDto {
     @ApiModelProperty("통계일")
     @JsonProperty("stat_dt")
     private String STAT_DT;         // 통계일
+
     @ApiModelProperty("데이터 건수")
     @JsonProperty("data_cnt")
     private String DATA_CNT;        // 데이터 건수(화면표출안함)
+
     @ApiModelProperty("표출통계일")
     @JsonProperty("stat_dt_fmt")
     private String STAT_DT_FMT;
+
     @ApiModelProperty("돌발유형코드(1: 사고, 2: 공사, 3: 행사, 4: 기상)")
     @JsonProperty("incd_type_cd")
     private String INCD_TYPE_CD;    // 돌발유형코드(1: 사고, 2: 공사, 3: 행사, 4: 기상)
+
     @ApiModelProperty("발생건수")
     @JsonProperty("incd_ocrr_num")
     private String INCD_OCRR_NUM;   // 발생건수
+
     @ApiModelProperty("사망자수")
     @JsonProperty("ftlt_pnum")
     private String FTLT_PNUM;       // 사망자수
+
     @ApiModelProperty("부상자수")
     @JsonProperty("injr_pnum")
     private String INJR_PNUM;       // 부상자수
+
     @ApiModelProperty("피해금액")
     @JsonProperty("prpr_dmge_amt")
     private String PRPR_DMGE_AMT;   // 피해금액

+ 9 - 0
src/main/java/com/its/op/dto/its/statistics/TrafficStatDto.java

@@ -18,30 +18,39 @@ public class TrafficStatDto {
     @ApiModelProperty("아이디")
     @JsonProperty("id")
     private String ID;
+
     @ApiModelProperty("통계시각")
     @JsonProperty("stat_dt")
     private String STAT_DT;
+
     /*@ApiModelProperty("통계시각")
     @JsonProperty("stat_dt_fmt")
     private String STAT_DT_FMT;*/
+
     @ApiModelProperty("시점명")
     @JsonProperty("f_name")
     private String F_NAME;
+
     @ApiModelProperty("종점명")
     @JsonProperty("t_name")
     private String T_NAME;
+
     @ApiModelProperty("구간길이")
     @JsonProperty("sect_lngt")
     private int    SECT_LNGT;
+
     @ApiModelProperty("교통량")
     @JsonProperty("tfvl")
     private int    TFVL;
+
     @ApiModelProperty("속도")
     @JsonProperty("sped")
     private int    SPED;
+
     @ApiModelProperty("점유율")
     @JsonProperty("ocpy_rate")
     private double OCPY_RATE;
+
     @ApiModelProperty("통행시간")
     @JsonProperty("trvl_hh")
     private int    TRVL_HH;

+ 8 - 0
src/main/java/com/its/op/dto/its/vds/VdsDtctTfvlDayDto.java

@@ -14,27 +14,35 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @ApiModel("VdsDtctTfvlDayDto(VDS 검지기 교통량통계 일별 정보)")
 public class VdsDtctTfvlDayDto {
+
     @ApiModelProperty("VDS 관리번호")
     @JsonProperty("vds_ctlr_nmbr")
     private String VDS_CTLR_NMBR;
+
     @ApiModelProperty("VDS 제어기 ID")
     @JsonProperty("vds_ctlr_id")
     private String VDS_CTLR_ID;
+
     @ApiModelProperty("설치위치")
     @JsonProperty("lctn")
     private String LCTN;
+
     @ApiModelProperty("검지기번호")
     @JsonProperty("dtct_nmbr")
     private String DTCT_NMBR;
+
     @ApiModelProperty("설치차로")
     @JsonProperty("istl_lane")
     private String ISTL_LANE;
+
     @ApiModelProperty("VDS 검지기 명")
     @JsonProperty("vds_dtct_nm")
     private String VDS_DTCT_NM;
+
     @ApiModelProperty("VDS 검지기 유형")
     @JsonProperty("dtct_type")
     private String DTCT_TYPE;
+
     @ApiModelProperty("VDS 검지기 유형명")
     @JsonProperty("dtct_type_nm")
     private String DTCT_TYPE_NM;

+ 7 - 0
src/main/java/com/its/op/dto/its/vds/VdsDtctTfvlHourDto.java

@@ -18,24 +18,31 @@ public class VdsDtctTfvlHourDto {
     @ApiModelProperty("VDS 관리번호")
     @JsonProperty("vds_ctlr_nmbr")
     private String VDS_CTLR_NMBR;
+
     @ApiModelProperty("VDS 제어기 ID")
     @JsonProperty("vds_ctlr_id")
     private String VDS_CTLR_ID;
+
     @ApiModelProperty("설치위치")
     @JsonProperty("lctn")
     private String LCTN;
+
     @ApiModelProperty("검지기번호")
     @JsonProperty("dtct_nmbr")
     private String DTCT_NMBR;
+
     @ApiModelProperty("설치차로")
     @JsonProperty("istl_lane")
     private String ISTL_LANE;
+
     @ApiModelProperty("VDS 검지기 명")
     @JsonProperty("vds_dtct_nm")
     private String VDS_DTCT_NM;
+
     @ApiModelProperty("VDS 검지기 유형")
     @JsonProperty("dtct_type")
     private String DTCT_TYPE;
+
     @ApiModelProperty("VDS 검지기 유형명")
     @JsonProperty("dtct_type_nm")
     private String DTCT_TYPE_NM;

+ 7 - 0
src/main/java/com/its/op/dto/its/vds/VdsDtctTfvlMonthDto.java

@@ -17,24 +17,31 @@ public class VdsDtctTfvlMonthDto {
     @ApiModelProperty("VDS 관리번호")
     @JsonProperty("vds_ctlr_nmbr")
     private String VDS_CTLR_NMBR;
+
     @ApiModelProperty("VDS 제어기 ID")
     @JsonProperty("vds_ctlr_id")
     private String VDS_CTLR_ID;
+
     @ApiModelProperty("설치위치")
     @JsonProperty("lctn")
     private String LCTN;
+
     @ApiModelProperty("검지기번호")
     @JsonProperty("dtct_nmbr")
     private String DTCT_NMBR;
+
     @ApiModelProperty("설치차로")
     @JsonProperty("istl_lane")
     private String ISTL_LANE;
+
     @ApiModelProperty("VDS 검지기 명")
     @JsonProperty("vds_dtct_nm")
     private String VDS_DTCT_NM;
+
     @ApiModelProperty("VDS 검지기 유형")
     @JsonProperty("dtct_type")
     private String DTCT_TYPE;
+
     @ApiModelProperty("VDS 검지기 유형명")
     @JsonProperty("dtct_type_nm")
     private String DTCT_TYPE_NM;

+ 19 - 5
src/main/resources/mybatis/mapper/its/dashboard/DashboardMapper.xml

@@ -18,7 +18,10 @@
 --              )
 --         group by prcn_dt
 --         order by prcn_dt
-        select prcn_dt, LINK_LIGT_NUM as ltc1, LINK_DELY_NUM as ltc2, LINK_CNGS_NUM as ltc3,
+        select prcn_dt as prcn_dt,
+               LINK_LIGT_NUM as ltc1,
+               LINK_DELY_NUM as ltc2,
+               LINK_CNGS_NUM as ltc3,
                (select count(1) from tb_link where del_yn = 'N') - (LINK_LIGT_NUM + LINK_DELY_NUM + LINK_CNGS_NUM) as ltc0,
                0 as total, 0 as rate_ltc1, 0 as rate_ltc2, 0 as rate_ltc3, 0 as rate_ltc0
         from TB_TRAF_PRCN_STAT
@@ -42,7 +45,10 @@
 --              )
 --         group by prcn_dt
 --         order by prcn_dt
-        select prcn_dt, IFSC_LIGT_NUM as ltc1, IFSC_DELY_NUM as ltc2, IFSC_CNGS_NUM as ltc3,
+        select prcn_dt as prcn_dt,
+               IFSC_LIGT_NUM as ltc1,
+               IFSC_DELY_NUM as ltc2,
+               IFSC_CNGS_NUM as ltc3,
                (select count(1) from tb_ifsc where del_yn = 'N') - (IFSC_LIGT_NUM + IFSC_DELY_NUM + IFSC_CNGS_NUM) as ltc0,
                0 as total, 0 as rate_ltc1, 0 as rate_ltc2, 0 as rate_ltc3, 0 as rate_ltc0
         from TB_TRAF_PRCN_STAT
@@ -66,7 +72,10 @@
 --              )
 --         group by prcn_dt
 --         order by prcn_dt
-        select prcn_dt, ROAD_LIGT_NUM as ltc1, ROAD_DELY_NUM as ltc2, ROAD_CNGS_NUM as ltc3,
+        select prcn_dt as prcn_dt,
+               ROAD_LIGT_NUM as ltc1,
+               ROAD_DELY_NUM as ltc2,
+               ROAD_CNGS_NUM as ltc3,
                (select count(1) from tb_road where del_yn = 'N') - (ROAD_LIGT_NUM + ROAD_DELY_NUM + ROAD_CNGS_NUM) as ltc0,
                0 as total, 0 as rate_ltc1, 0 as rate_ltc2, 0 as rate_ltc3, 0 as rate_ltc0
         from TB_TRAF_PRCN_STAT
@@ -77,7 +86,12 @@
 
     <select id="findAllTrafPrcnStatAll" resultType="com.its.op.dto.its.dashboard.TrafPrcnStatDto$TrafPrcnStatVo">
         <![CDATA[
-        SELECT 0 AS PRCN_TYPE, A.PRCN_TM, NVL(B.IFSC_LIGT_NUM, 0) AS LTC1, NVL(B.IFSC_DELY_NUM, 0) AS LTC2, NVL(B.IFSC_CNGS_NUM, 0) AS LTC3, 0 AS LTC0
+        SELECT 0 AS PRCN_TYPE,
+               A.PRCN_TM AS PRCN_TM,
+               NVL(B.IFSC_LIGT_NUM, 0) AS LTC1,
+               NVL(B.IFSC_DELY_NUM, 0) AS LTC2,
+               NVL(B.IFSC_CNGS_NUM, 0) AS LTC3,
+               0 AS LTC0
         FROM (SELECT PRCN_TM FROM TB_PRCN_TM WHERE TM_TYPE = '5M') A
                  LEFT OUTER JOIN
              (SELECT SUBSTR(PRCN_DT, 9, 4) AS PRCN_TM, IFSC_LIGT_NUM, IFSC_DELY_NUM, IFSC_CNGS_NUM
@@ -105,7 +119,7 @@
 
     <select id="findAllTrafClctStatAll" resultType="com.its.op.dto.its.dashboard.TrafPrcnStatDto$TrafClctStatVo">
         <![CDATA[
-        SELECT A.PRCN_TM,
+        SELECT A.PRCN_TM AS PRCN_TM,
                NVL(B.oper01, 0) AS oper01,
                NVL(B.utis01, 0) AS utis01,
                NVL(B.utis02, 0) AS utis02,

+ 13 - 3
src/main/resources/mybatis/mapper/its/dbms/DbmsSttsMapper.xml

@@ -5,7 +5,12 @@
 
     <select id="findAll" resultType="com.its.op.dto.its.dbms.TbDbmsSttsDto">
         <![CDATA[
-        SELECT DBMS_ID AS dbSvrId, DBMS_NM AS dbSvrNm, TBLS_NM AS tblsNm, TBLS_RMND_CPCT AS tblsRmndCpct, USE_SESN AS useSesn, UPDT_DT AS updtDt
+        SELECT DBMS_ID AS dbSvrId,
+               DBMS_NM AS dbSvrNm,
+               TBLS_NM AS tblsNm,
+               TBLS_RMND_CPCT AS tblsRmndCpct,
+               USE_SESN AS useSesn,
+               UPDT_DT AS updtDt
           FROM TB_DBMS_STTS
          ORDER BY DBMS_ID
         ]]>
@@ -15,13 +20,18 @@
 
     <select id="findSessionUsage" resultType="com.its.op.dto.its.dbms.SessionSttsDto">
         <![CDATA[
-        SELECT INST_ID AS INST_ID, ROUND(COUNT(1) / 2432 * 100, 1) AS USE_SESN FROM GV$SESSION GROUP BY INST_ID
+        SELECT INST_ID AS INST_ID,
+               ROUND(COUNT(1) / 2432 * 100, 1) AS USE_SESN
+        FROM GV$SESSION
+        GROUP BY INST_ID
         ]]>
     </select>
 
     <select id="findTblsUsage" resultType="com.its.op.dto.its.dbms.TblSpaceSttsDto">
         <![CDATA[
-        SELECT A.TABLESPACE_NAME AS TBLS_NM, A.TOTAL AS TOTAL, B.FREE AS FREE,
+        SELECT A.TABLESPACE_NAME AS TBLS_NM,
+               A.TOTAL AS TOTAL,
+               B.FREE AS FREE,
                100 - ROUND((A.TOTAL - NVL(B.FREE,0))*100/TOTAL,2) AS TBLS_REMAIN_STTS
         FROM (SELECT X.TABLESPACE_NAME, ROUND((SUM(X.BYTES)/1024/1024),0) AS TOTAL
               FROM DBA_DATA_FILES X

+ 1 - 1
src/main/resources/mybatis/mapper/its/link/LinkPrcsParaMapper.xml

@@ -35,7 +35,7 @@
 
     <insert id="insertLinkParaClctSyst" parameterType="java.util.Map">
         INSERT INTO TB_LINK_PARA_CLCT_SYST (LINK_ID, CLCT_SYST_CD, FUSN_PRRT, FUSN_WGHT)
-                                    VALUES (#{LINK_ID}, #{CLCT_SYST_CD}, #{FUSN_PRRT}, #{FUSN_WGHT})
+        VALUES (#{LINK_ID}, #{CLCT_SYST_CD}, #{FUSN_PRRT}, #{FUSN_WGHT})
     </insert>
 
 </mapper>

+ 7 - 2
src/main/resources/mybatis/mapper/its/rse/RseOdStatHhMapper.xml

@@ -5,7 +5,10 @@
 
     <select id="findAllOdListByDateRange" parameterType="java.util.HashMap" resultType="com.its.op.dto.its.rse.RseOdStatDto">
         <![CDATA[
-        SELECT X.RSE_CTLR_NMBR, X.RSE_NM, NVL(Y.DEPART_TFVL, 0) AS DEPART_TFVL, NVL(ARRIVAL_TFVL, 0) AS ARRIVAL_TFVL
+        SELECT X.RSE_CTLR_NMBR,
+               X.RSE_NM,
+               NVL(Y.DEPART_TFVL, 0) AS DEPART_TFVL,
+               NVL(ARRIVAL_TFVL, 0) AS ARRIVAL_TFVL
         FROM TB_RSE_CTLR X LEFT OUTER JOIN
              (SELECT RSE_CTLR_NMBR, SUM(DEPART_TFVL) AS DEPART_TFVL, SUM(ARRIVAL_TFVL) AS ARRIVAL_TFVL
               FROM (SELECT A.F_RSE_CTLR_NMBR AS RSE_CTLR_NMBR, SUM(TFVL) AS DEPART_TFVL, 0 AS ARRIVAL_TFVL
@@ -26,7 +29,9 @@
 
     <select id="findAllListByDateRange" parameterType="java.util.HashMap" resultType="com.its.op.dto.its.rse.RseOdStatListDto">
         <![CDATA[
-        SELECT A.F_RSE_CTLR_NMBR, A.T_RSE_CTLR_NMBR, SUM(TFVL) AS TFVL
+        SELECT A.F_RSE_CTLR_NMBR,
+               A.T_RSE_CTLR_NMBR,
+               SUM(TFVL) AS TFVL
         FROM TB_RSE_OD_STAT_HH A
         WHERE A.STAT_DT BETWEEN #{FROM_DT} AND #{TO_DT}
         GROUP BY A.F_RSE_CTLR_NMBR, A.T_RSE_CTLR_NMBR

+ 29 - 23
src/main/resources/mybatis/mapper/its/scrs/ScSrvcStatisticsMapper.xml

@@ -5,11 +5,11 @@
 
     <select id="findSrvc15M" parameterType="com.its.op.dto.its.scrs.ScSrvcParam" resultType="com.its.op.dto.its.scrs.ScSrvcDto">
         SELECT B.IXR_ID AS ixrId,
-        B.IXR_NM AS ixrNm,
-        A.CLCT_DT AS statDt,
-        A.SRVC_LVL AS srvcLvl,
-        A.DELY_HH AS delyHh,
-        A.TFVL AS tfvl
+               B.IXR_NM AS ixrNm,
+               A.CLCT_DT AS statDt,
+               A.SRVC_LVL AS srvcLvl,
+               A.DELY_HH AS delyHh,
+               A.TFVL AS tfvl
         FROM TB_SC_IXR_STAT_15M A
         INNER JOIN TB_SC_IXR_MNGM B
         ON A.CLCT_DT BETWEEN #{cond.fromDt} AND #{cond.toDt}
@@ -24,11 +24,11 @@
 
     <select id="findSrvcHH" parameterType="com.its.op.dto.its.scrs.ScSrvcParam" resultType="com.its.op.dto.its.scrs.ScSrvcDto">
         SELECT B.IXR_ID AS ixrId,
-        B.IXR_NM AS ixrNm,
-        A.CLCT_DT AS statDt,
-        A.SRVC_LVL AS srvcLvl,
-        A.DELY_HH AS delyHh,
-        A.TFVL AS tfvl
+               B.IXR_NM AS ixrNm,
+               A.CLCT_DT AS statDt,
+               A.SRVC_LVL AS srvcLvl,
+               A.DELY_HH AS delyHh,
+               A.TFVL AS tfvl
         FROM TB_SC_IXR_STAT_HH A
         INNER JOIN TB_SC_IXR_MNGM B
         ON A.CLCT_DT BETWEEN #{cond.fromDt} AND #{cond.toDt}
@@ -43,11 +43,11 @@
 
     <select id="findSrvcDD" parameterType="com.its.op.dto.its.scrs.ScSrvcParam" resultType="com.its.op.dto.its.scrs.ScSrvcDto">
         SELECT B.IXR_ID AS ixrId,
-        B.IXR_NM AS ixrNm,
-        A.CLCT_DT AS statDt,
-        A.SRVC_LVL AS srvcLvl,
-        A.DELY_HH AS delyHh,
-        A.TFVL AS tfvl
+               B.IXR_NM AS ixrNm,
+               A.CLCT_DT AS statDt,
+               A.SRVC_LVL AS srvcLvl,
+               A.DELY_HH AS delyHh,
+               A.TFVL AS tfvl
         FROM TB_SC_IXR_STAT_DD A
         INNER JOIN TB_SC_IXR_MNGM B
         ON A.CLCT_DT BETWEEN #{cond.fromDt} AND #{cond.toDt}
@@ -62,11 +62,11 @@
 
     <select id="findSrvcMN" parameterType="com.its.op.dto.its.scrs.ScSrvcParam" resultType="com.its.op.dto.its.scrs.ScSrvcDto">
         SELECT B.IXR_ID AS ixrId,
-        B.IXR_NM AS ixrNm,
-        A.CLCT_DT AS statDt,
-        A.SRVC_LVL AS srvcLvl,
-        A.DELY_HH AS delyHh,
-        A.TFVL AS tfvl
+               B.IXR_NM AS ixrNm,
+               A.CLCT_DT AS statDt,
+               A.SRVC_LVL AS srvcLvl,
+               A.DELY_HH AS delyHh,
+               A.TFVL AS tfvl
         FROM TB_SC_IXR_STAT_MN A
         INNER JOIN TB_SC_IXR_MNGM B
         ON A.CLCT_DT BETWEEN #{cond.fromDt} AND #{cond.toDt}
@@ -81,9 +81,15 @@
 
     <select id="findSrvcPtrnCompare" parameterType="com.its.op.dto.its.scrs.ScSrvcPtrnParam" resultType="com.its.op.dto.its.scrs.ScSrvcPtrnDto">
         <![CDATA[
-        SELECT IXR_ID AS ixrId, IXR_NM as ixrNm, STATHH AS statHh,
-               SUM(SRVC_LVL) AS srvcLvl, SUM(DELY_HH) AS delyHh, SUM(TFVL) AS tfvl,
-               SUM(COMP_SRVC_LVL) AS compSrvcLvl, SUM(COMP_DELY_HH) AS compDelyHh, SUM(COMP_TFVL) AS compTfvl
+        SELECT IXR_ID AS ixrId,
+               IXR_NM as ixrNm,
+               STATHH AS statHh,
+               SUM(SRVC_LVL) AS srvcLvl,
+               SUM(DELY_HH) AS delyHh,
+               SUM(TFVL) AS tfvl,
+               SUM(COMP_SRVC_LVL) AS compSrvcLvl,
+               SUM(COMP_DELY_HH) AS compDelyHh,
+               SUM(COMP_TFVL) AS compTfvl
         FROM (
                  SELECT Y.IXR_ID, Y.IXR_NM, Y.STATHH, X.SRVC_LVL, X.DELY_HH, X.TFVL, 0 AS COMP_SRVC_LVL, 0 AS COMP_DELY_HH, 0 AS COMP_TFVL
                  FROM

+ 2 - 1
src/main/resources/mybatis/mapper/its/scrs/ScTfvlStatisticsMapper.xml

@@ -577,7 +577,8 @@
 
 
     <select id="findIxtTfvlToday" resultType="com.its.op.dto.its.scrs.ScIxrCmraTfvlDto">
-        SELECT T.IXR_ID AS ixrId, T.CMRA_ID AS cmraId,
+        SELECT T.IXR_ID AS ixrId,
+               T.CMRA_ID AS cmraId,
                SUM(NVL(LRG_GO_TFVL, 0) +
                    NVL(MDDL_GO_TFVL, 0) +
                    NVL(SMAL_GO_TFVL, 0) +

+ 18 - 3
src/main/resources/mybatis/mapper/its/statistics/AtrdTrafficStatisticsMapper.xml

@@ -718,7 +718,12 @@
     </select>
 
     <select id="findAtrdRltnLinkAll" parameterType="java.lang.String" resultType="com.its.op.dto.its.atrd.AtrdRltnIdDto">
-        SELECT RANK() OVER(PARTITION BY A.ATRD_ID ORDER BY B.ORD, D.ORD, F.ORD) AS ord, G.LINK_ID as id, G.ROAD_NAME as name, H.NODE_NAME as strtNm, I.NODE_NAME as endNm, G.LINK_LENG as sectLngt
+        SELECT RANK() OVER(PARTITION BY A.ATRD_ID ORDER BY B.ORD, D.ORD, F.ORD) AS ord,
+               G.LINK_ID as id,
+               G.ROAD_NAME as name,
+               H.NODE_NAME as strtNm,
+               I.NODE_NAME as endNm,
+               G.LINK_LENG as sectLngt
         FROM TB_ATRD A, TB_ATRD_RLTN_ROAD B, TB_ROAD C, TB_ROAD_RLTN_IFSC D, TB_IFSC E, TB_IFSC_RLTN_LINK F, TB_LINK G, TB_NODE H, TB_NODE I
         WHERE 1=1
           AND A.ATRD_ID = #{ATRD_ID}
@@ -736,7 +741,12 @@
     </select>
 
     <select id="findAtrdRltnIfscAll" parameterType="java.lang.String" resultType="com.its.op.dto.its.atrd.AtrdRltnIdDto">
-        SELECT RANK() OVER(PARTITION BY A.ATRD_ID ORDER BY B.ORD, D.ORD) AS ord, E.IFSC_ID as id, E.IFSC_NM as name, E.STRT_NM as strtNm, E.END_NM as endNm, E.SECT_LNGT as sectLngt
+        SELECT RANK() OVER(PARTITION BY A.ATRD_ID ORDER BY B.ORD, D.ORD) AS ord,
+               E.IFSC_ID as id,
+               E.IFSC_NM as name,
+               E.STRT_NM as strtNm,
+               E.END_NM as endNm,
+               E.SECT_LNGT as sectLngt
         FROM TB_ATRD A, TB_ATRD_RLTN_ROAD B, TB_ROAD C, TB_ROAD_RLTN_IFSC D, TB_IFSC E
         WHERE 1=1
           AND A.ATRD_ID = #{ATRD_ID}
@@ -749,7 +759,12 @@
     </select>
 
     <select id="findAtrdRltnRoadAll" parameterType="java.lang.String" resultType="com.its.op.dto.its.atrd.AtrdRltnIdDto">
-        SELECT B.ORD AS ord, C.ROAD_ID AS id, C.ROAD_NM AS name, C.STRT_NM as strtNm, C.END_NM as endNm, C.SECT_LNGT as sectLngt
+        SELECT B.ORD AS ord,
+               C.ROAD_ID AS id,
+               C.ROAD_NM AS name,
+               C.STRT_NM as strtNm,
+               C.END_NM as endNm,
+               C.SECT_LNGT as sectLngt
         FROM TB_ATRD A, TB_ATRD_RLTN_ROAD B, TB_ROAD C
         WHERE 1=1
           AND A.ATRD_ID = #{ATRD_ID}