shjung 2 anni fa
parent
commit
f7baab3126

+ 42 - 41
src/main/java/com/its/op/dao/repository/its/cctv/TbCctvCtlrSttsHsRepository.java

@@ -17,69 +17,70 @@ import java.util.List;
 @Repository
 public interface TbCctvCtlrSttsHsRepository extends JpaRepository<TbCctvCtlrSttsHs, TbCctvCtlrSttsHsKey>, JpaSpecificationExecutor<TbCctvCtlrSttsHs> {
 
-    @Query("select p from TbCctvCtlrSttsHs p inner join fetch p.cctv cctv")
+    @Query("select p from TbCctvCtlrSttsHs p inner join fetch p.cctv m")
     List<TbCctvCtlrSttsHs> findAll();
 
-    @Query("select p from TbCctvCtlrSttsHs p inner join fetch p.cctv cctv where p.crtnDt between :fromDt and :toDt and p.cctvCtlrNmbr in :ids")
+    @Query("select p from TbCctvCtlrSttsHs p inner join fetch p.cctv m where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt and p.cctvCtlrNmbr in :ids")
     List<TbCctvCtlrSttsHs> findAllByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("ids") List<Long> ids);
 
     @Query("select p.cctvCtlrNmbr as nmbr, count(p.cctvCtlrNmbr) as errCnt " +
-           "  from TbCctvCtlrSttsHs p " +
-           " where p.crtnDt     >= :fromDt " +
+           "  from TbCctvCtlrSttsHs p inner join fetch p.cctv m " +
+           " where m.delYn = 'N' and p.crtnDt     >= :fromDt " +
            "   and p.cmncSttsCd <> 'CMS0' " +
            " group by p.cctvCtlrNmbr")
     List<SttsHsErrCntInf> findAllCommErrorCount(@Param("fromDt") String fromDt);
 
-    @Query("select p from TbCctvCtlrSttsHs p inner join fetch p.cctv cctv " +
-           " where p.crtnDt between :fromDt and :toDt " +
+    @Query("select p from TbCctvCtlrSttsHs p inner join fetch p.cctv m " +
+           " where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt " +
            "   and p.cmncSttsCd <> 'CMS0' " +
            "   and p.cctvCtlrNmbr in :ids")
     List<TbCctvCtlrSttsHs> findAllFailByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("ids") List<Long> ids);
 
     @Query(value =
-            "SELECT NVL(SUM(CMS0CNT), 0) AS cms0Cnt, NVL(SUM(CMS1CNT), 0) AS cms1Cnt " +
-                    "  FROM (SELECT DECODE(CMNC_STTS_CD, 'CMS0', 1, 0) AS CMS0CNT, " +
-                    "               DECODE(CMNC_STTS_CD, 'CMS0', 0, 1) AS CMS1CNT  " +
-                    "          FROM TB_CCTV_CTLR_STTS_HS " +
-                    "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt" +
-                    "       )", nativeQuery = true)
+           "SELECT NVL(SUM(CMS0CNT), 0) AS cms0Cnt, NVL(SUM(CMS1CNT), 0) AS cms1Cnt " +
+           "  FROM (SELECT DECODE(A.CMNC_STTS_CD, 'CMS0', 1, 0) AS CMS0CNT, " +
+           "               DECODE(A.CMNC_STTS_CD, 'CMS0', 0, 1) AS CMS1CNT  " +
+           "          FROM TB_CCTV_CTLR_STTS_HS A, TB_CCTV_CTLR B " +
+           "         WHERE B.DEL_YN = 'N' AND A.CCTV_CTLR_NMBR = B.CCTV_CTLR_NMBR AND A.CRTN_DT BETWEEN :fromDt AND :toDt" +
+           "       )"
+           , nativeQuery = true)
     ReportFcltSummaryInf findAllReportSummary(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
-    @Query("select p from TbCctvCtlrSttsHs p inner join fetch p.cctv cctv " +
-            " where p.crtnDt between :fromDt and :toDt " +
-            "   and p.cmncSttsCd = 'CMS1' ")
+    @Query("select p from TbCctvCtlrSttsHs p inner join fetch p.cctv m " +
+           " where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt " +
+           "   and p.cmncSttsCd = 'CMS1' ")
     List<TbCctvCtlrSttsHs> findAllReportError(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
     @Query(value =
-            "SELECT A.CCTV_CTLR_NMBR AS fcltNmbr, A.CCTV_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm, " +
-            "               NVL(B.CNT_CMS1, 0) + NVL(B.CNT_CMS2, 0) AS totCnt, " +
-            "               NVL(B.CNT_CMS1, 0) AS cms1Cnt, NVL(B.CNT_CMS2, 0) AS cms2Cnt " +
-            "        FROM TB_CCTV_CTLR A, " +
-            "             (SELECT CCTV_CTLR_NMBR, " +
-            "                     SUM(DECODE(CMNC_STTS_CD, 'CMS1', 1, 0)) AS CNT_CMS1, " +
-            "                     SUM(DECODE(CMNC_STTS_CD, 'CMS2', 1, 0)) AS CNT_CMS2 " +
-            "              FROM TB_CCTV_CTLR_STTS_HS " +
-            "              WHERE CRTN_DT BETWEEN :fromDt AND :toDt " +
-            "                AND CMNC_STTS_CD IN ('CMS1', 'CMS2') " +
-            "              GROUP BY CCTV_CTLR_NMBR) B " +
-            "        WHERE A.CCTV_CTLR_NMBR = B.CCTV_CTLR_NMBR(+)"
-            , nativeQuery = true)
+           "SELECT A.CCTV_CTLR_NMBR AS fcltNmbr, A.CCTV_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm, " +
+           "               NVL(B.CNT_CMS1, 0) + NVL(B.CNT_CMS2, 0) AS totCnt, " +
+           "               NVL(B.CNT_CMS1, 0) AS cms1Cnt, NVL(B.CNT_CMS2, 0) AS cms2Cnt " +
+           "        FROM TB_CCTV_CTLR A, " +
+           "             (SELECT CCTV_CTLR_NMBR, " +
+           "                     SUM(DECODE(CMNC_STTS_CD, 'CMS1', 1, 0)) AS CNT_CMS1, " +
+           "                     SUM(DECODE(CMNC_STTS_CD, 'CMS2', 1, 0)) AS CNT_CMS2 " +
+           "              FROM TB_CCTV_CTLR_STTS_HS " +
+           "              WHERE CRTN_DT BETWEEN :fromDt AND :toDt " +
+           "                AND CMNC_STTS_CD IN ('CMS1', 'CMS2') " +
+           "              GROUP BY CCTV_CTLR_NMBR) B " +
+           "        WHERE A.DEL_YN = 'N' AND A.CCTV_CTLR_NMBR = B.CCTV_CTLR_NMBR(+)"
+           , nativeQuery = true)
     List<FcltSttsStatErrorInf> findAllStatisticsCommErrByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
     @Query(value =
-            "SELECT 'CCTV' AS fcltType, A.CCTV_CTLR_NMBR AS fcltNmbr, A.CCTV_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm,            " +
-            "       B.CONN_STTS_CD AS commSttsCd, B.DOOR_STTS_CD AS doorSttsCd, NVL(B.CBOX_TMPR, 0) AS cboxTmpr, B.CRTN_DT AS crtnDt " +
-            "  FROM TB_CCTV_CTLR A,                                                                                                  " +
-            "       (SELECT CCTV_CTLR_NMBR, CMNC_STTS_CD AS CONN_STTS_CD,                                                            " +
-            "               CBOX_DOOR_STTS_CD AS DOOR_STTS_CD, CBOX_TMPR, CRTN_DT                                                    " +
-            "          FROM TB_CCTV_CTLR_STTS_HS                                                                                     " +
-            "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                                                        " +
-            "           AND (CMNC_STTS_CD      <> 'CMS0' OR                                                                          " +
-            "                CBOX_DOOR_STTS_CD <> 'CDS0' OR                                                                          " +
-            "                CBOX_TMPR > 40)                                                                                         " +
-            "       ) B                                                                                                              " +
-            " WHERE A.CCTV_CTLR_NMBR = B.CCTV_CTLR_NMBR                                                                              "
-            , nativeQuery = true)
+           "SELECT 'CCTV' AS fcltType, A.CCTV_CTLR_NMBR AS fcltNmbr, A.CCTV_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm,            " +
+           "       B.CONN_STTS_CD AS commSttsCd, B.DOOR_STTS_CD AS doorSttsCd, NVL(B.CBOX_TMPR, 0) AS cboxTmpr, B.CRTN_DT AS crtnDt " +
+           "  FROM TB_CCTV_CTLR A,                                                                                                  " +
+           "       (SELECT CCTV_CTLR_NMBR, CMNC_STTS_CD AS CONN_STTS_CD,                                                            " +
+           "               CBOX_DOOR_STTS_CD AS DOOR_STTS_CD, CBOX_TMPR, CRTN_DT                                                    " +
+           "          FROM TB_CCTV_CTLR_STTS_HS                                                                                     " +
+           "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                                                        " +
+           "           AND (CMNC_STTS_CD      <> 'CMS0' OR                                                                          " +
+           "                CBOX_DOOR_STTS_CD <> 'CDS0' OR                                                                          " +
+           "                CBOX_TMPR > 40)                                                                                         " +
+           "       ) B                                                                                                              " +
+           " WHERE A.DEL_YN = 'N' AND A.CCTV_CTLR_NMBR = B.CCTV_CTLR_NMBR                                                                              "
+           , nativeQuery = true)
     List<FcltSttsErrorInf> findAllSttsErrorByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
 }

+ 44 - 43
src/main/java/com/its/op/dao/repository/its/rse/TbRseCtlrSttsHsRepository.java

@@ -23,66 +23,67 @@ public interface TbRseCtlrSttsHsRepository extends JpaRepository<TbRseCtlrSttsHs
     @Query("select p from TbRseCtlrSttsHs p")
     List<TbRseCtlrSttsHs> findAllList();
 
-    @Query("select p from TbRseCtlrSttsHs p inner join fetch p.rse where p.crtnDt between :fromDt and :toDt and p.rseCtlrNmbr in :ids")
+    @Query("select p from TbRseCtlrSttsHs p inner join fetch p.rse m where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt and p.rseCtlrNmbr in :ids")
     List<TbRseCtlrSttsHs> findAllByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("ids") List<Long> ids);
 
     @Query("select p.rseCtlrNmbr as nmbr, count(p.rseCtlrNmbr) as errCnt " +
-            "  from TbRseCtlrSttsHs p " +
-            " where p.crtnDt     >= :fromDt " +
-            "   and p.cmncSttsCd <> 'CMS0' " +
-            " group by p.rseCtlrNmbr")
+           "  from TbRseCtlrSttsHs p inner join fetch p.rse m " +
+           " where m.delYn = 'N' and p.crtnDt     >= :fromDt " +
+           "   and p.cmncSttsCd <> 'CMS0' " +
+           " group by p.rseCtlrNmbr")
     List<SttsHsErrCntInf> findAllCommErrorCount(@Param("fromDt") String fromDt);
 
-    @Query("select p from TbRseCtlrSttsHs p inner join fetch p.rse " +
-            " where p.crtnDt between :fromDt and :toDt " +
-            "   and (p.cmncSttsCd <> 'CMS0' or p.cboxDoorSttsCd <> 'CDS0' or p.cboxTmpr > 40)" +
-            "   and p.rseCtlrNmbr in :ids")
+    @Query("select p from TbRseCtlrSttsHs p inner join fetch p.rse m " +
+           " where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt " +
+           "   and (p.cmncSttsCd <> 'CMS0' or p.cboxDoorSttsCd <> 'CDS0' or p.cboxTmpr > 40)" +
+           "   and p.rseCtlrNmbr in :ids")
     List<TbRseCtlrSttsHs> findAllFailByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("ids") List<Long> ids);
 
     @Query(value =
-            "SELECT NVL(SUM(CMS0CNT), 0) AS cms0Cnt, NVL(SUM(CMS1CNT), 0) AS cms1Cnt " +
-            "  FROM (SELECT DECODE(CMNC_STTS_CD, 'CMS0', 1, 0) AS CMS0CNT, " +
-            "               DECODE(CMNC_STTS_CD, 'CMS0', 0, 1) AS CMS1CNT  " +
-            "          FROM TB_RSE_CTLR_STTS_HS " +
-            "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt" +
-            "       )", nativeQuery = true)
+           "SELECT NVL(SUM(CMS0CNT), 0) AS cms0Cnt, NVL(SUM(CMS1CNT), 0) AS cms1Cnt " +
+           "  FROM (SELECT DECODE(A.CMNC_STTS_CD, 'CMS0', 1, 0) AS CMS0CNT, " +
+           "               DECODE(A.CMNC_STTS_CD, 'CMS0', 0, 1) AS CMS1CNT  " +
+           "          FROM TB_RSE_CTLR_STTS_HS A, TB_RSE_CTLR B " +
+           "         WHERE B.DEL_YN = 'N' AND A.RSE_CTLR_NMBR = B.RSE_CTLR_NMBR AND A.CRTN_DT BETWEEN :fromDt AND :toDt" +
+           "       )"
+           , nativeQuery = true)
     ReportFcltSummaryInf findAllReportSummary(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
-    @Query("select p from TbRseCtlrSttsHs p inner join fetch p.rse rse " +
-            " where p.crtnDt between :fromDt and :toDt " +
-            "   and p.cmncSttsCd = 'CMS1' ")
+    @Query("select p from TbRseCtlrSttsHs p inner join fetch p.rse m " +
+           " where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt " +
+           "   and p.cmncSttsCd = 'CMS1' ")
     List<TbRseCtlrSttsHs> findAllReportError(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
     @Query(value =
-            "SELECT A.RSE_CTLR_NMBR AS fcltNmbr, A.RSE_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm, " +
-            "               NVL(B.CNT_CMS1, 0) + NVL(B.CNT_CMS2, 0) AS totCnt, " +
-            "               NVL(B.CNT_CMS1, 0) AS cms1Cnt, NVL(B.CNT_CMS2, 0) AS cms2Cnt " +
-            "        FROM TB_RSE_CTLR A, " +
-            "             (SELECT RSE_CTLR_NMBR, " +
-            "                     SUM(DECODE(CMNC_STTS_CD, 'CMS1', 1, 0)) AS CNT_CMS1, " +
-            "                     SUM(DECODE(CMNC_STTS_CD, 'CMS2', 1, 0)) AS CNT_CMS2 " +
-            "              FROM TB_RSE_CTLR_STTS_HS " +
-            "              WHERE CRTN_DT BETWEEN :fromDt AND :toDt " +
-            "                AND CMNC_STTS_CD IN ('CMS1', 'CMS2') " +
-            "              GROUP BY RSE_CTLR_NMBR) B " +
-            "        WHERE A.RSE_CTLR_NMBR = B.RSE_CTLR_NMBR(+)"
+           "SELECT A.RSE_CTLR_NMBR AS fcltNmbr, A.RSE_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm, " +
+           "               NVL(B.CNT_CMS1, 0) + NVL(B.CNT_CMS2, 0) AS totCnt, " +
+           "               NVL(B.CNT_CMS1, 0) AS cms1Cnt, NVL(B.CNT_CMS2, 0) AS cms2Cnt " +
+           "        FROM TB_RSE_CTLR A, " +
+           "             (SELECT RSE_CTLR_NMBR, " +
+           "                     SUM(DECODE(CMNC_STTS_CD, 'CMS1', 1, 0)) AS CNT_CMS1, " +
+           "                     SUM(DECODE(CMNC_STTS_CD, 'CMS2', 1, 0)) AS CNT_CMS2 " +
+           "              FROM TB_RSE_CTLR_STTS_HS " +
+           "              WHERE CRTN_DT BETWEEN :fromDt AND :toDt " +
+           "                AND CMNC_STTS_CD IN ('CMS1', 'CMS2') " +
+           "              GROUP BY RSE_CTLR_NMBR) B " +
+           "        WHERE A.DEL_YN = 'N' AND A.RSE_CTLR_NMBR = B.RSE_CTLR_NMBR(+)"
             , nativeQuery = true)
     List<FcltSttsStatErrorInf> findAllStatisticsCommErrByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
     @Query(value =
-            "SELECT 'DSRC' AS fcltType, A.RSE_CTLR_NMBR AS fcltNmbr, A.RSE_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm,              " +
-            "       B.CONN_STTS_CD AS commSttsCd, B.DOOR_STTS_CD AS doorSttsCd, NVL(B.CBOX_TMPR, 0) AS cboxTmpr, B.CRTN_DT AS crtnDt " +
-            "  FROM TB_RSE_CTLR A,                                                                                                   " +
-            "       (SELECT RSE_CTLR_NMBR, CMNC_STTS_CD AS CONN_STTS_CD,                                                             " +
-            "               CBOX_DOOR_STTS_CD AS DOOR_STTS_CD, CBOX_TMPR, CRTN_DT                                                    " +
-            "          FROM TB_RSE_CTLR_STTS_HS                                                                                      " +
-            "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                                                        " +
-            "           AND (CMNC_STTS_CD      <> 'CMS0' OR                                                                          " +
-            "                CBOX_DOOR_STTS_CD <> 'CDS0' OR                                                                          " +
-            "                CBOX_TMPR > 40)                                                                                         " +
-            "       ) B                                                                                                              " +
-            " WHERE A.RSE_CTLR_NMBR = B.RSE_CTLR_NMBR                                                                                "
-            , nativeQuery = true)
+           "SELECT 'DSRC' AS fcltType, A.RSE_CTLR_NMBR AS fcltNmbr, A.RSE_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm,              " +
+           "       B.CONN_STTS_CD AS commSttsCd, B.DOOR_STTS_CD AS doorSttsCd, NVL(B.CBOX_TMPR, 0) AS cboxTmpr, B.CRTN_DT AS crtnDt " +
+           "  FROM TB_RSE_CTLR A,                                                                                                   " +
+           "       (SELECT RSE_CTLR_NMBR, CMNC_STTS_CD AS CONN_STTS_CD,                                                             " +
+           "               CBOX_DOOR_STTS_CD AS DOOR_STTS_CD, CBOX_TMPR, CRTN_DT                                                    " +
+           "          FROM TB_RSE_CTLR_STTS_HS                                                                                      " +
+           "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                                                        " +
+           "           AND (CMNC_STTS_CD      <> 'CMS0' OR                                                                          " +
+           "                CBOX_DOOR_STTS_CD <> 'CDS0' OR                                                                          " +
+           "                CBOX_TMPR > 40)                                                                                         " +
+           "       ) B                                                                                                              " +
+           " WHERE A.DEL_YN = 'N' AND A.RSE_CTLR_NMBR = B.RSE_CTLR_NMBR                                                                                "
+           , nativeQuery = true)
     List<FcltSttsErrorInf> findAllSttsErrorByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
 }

+ 42 - 42
src/main/java/com/its/op/dao/repository/its/vds/TbVdsCtlrSttsHsRepository.java

@@ -17,34 +17,34 @@ import java.util.List;
 @Repository
 public interface TbVdsCtlrSttsHsRepository extends JpaRepository<TbVdsCtlrSttsHs, TbVdsCtlrSttsHsKey>, JpaSpecificationExecutor<TbVdsCtlrSttsHs> {
 
-    @Query("select p from TbVdsCtlrSttsHs p inner join fetch p.vds where p.crtnDt between :fromDt and :toDt and p.vdsCtlrNmbr in :ids")
+    @Query("select p from TbVdsCtlrSttsHs p inner join fetch p.vds m where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt and p.vdsCtlrNmbr in :ids")
     List<TbVdsCtlrSttsHs> findAllByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("ids") List<Long> ids);
 
     @Query("select p.vdsCtlrNmbr as nmbr, count(p.vdsCtlrNmbr) as errCnt " +
-            "  from TbVdsCtlrSttsHs p " +
-            " where p.crtnDt     >= :fromDt " +
-            "   and p.cmncSttsCd <> 'CMS0' " +
-            " group by p.vdsCtlrNmbr")
+           "  from TbVdsCtlrSttsHs p inner join fetch p.vds m " +
+           " where m.delYn = 'N' and p.crtnDt     >= :fromDt " +
+           "   and p.cmncSttsCd <> 'CMS0' " +
+           " group by p.vdsCtlrNmbr")
     List<SttsHsErrCntInf> findAllCommErrorCount(@Param("fromDt") String fromDt);
 
-    @Query("select p from TbVdsCtlrSttsHs p inner join fetch p.vds " +
-           " where p.crtnDt between :fromDt and :toDt " +
+    @Query("select p from TbVdsCtlrSttsHs p inner join fetch p.vds m " +
+           " where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt " +
            "   and (p.cmncSttsCd <> 'CMS0' or p.cboxDoorSttsCd <> 'CDS0' or p.cboxTmpr > 40)" +
            "   and p.vdsCtlrNmbr in :ids")
     List<TbVdsCtlrSttsHs> findAllFailByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("ids") List<Long> ids);
 
     @Query(value =
-            "SELECT NVL(SUM(CMS0CNT), 0) AS cms0Cnt, NVL(SUM(CMS1CNT), 0) AS cms1Cnt " +
-                    "  FROM (SELECT DECODE(CMNC_STTS_CD, 'CMS0', 1, 0) AS CMS0CNT, " +
-                    "               DECODE(CMNC_STTS_CD, 'CMS0', 0, 1) AS CMS1CNT  " +
-                    "          FROM TB_VDS_CTLR_STTS_HS " +
-                    "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt" +
-                    "       )", nativeQuery = true)
+           "SELECT NVL(SUM(CMS0CNT), 0) AS cms0Cnt, NVL(SUM(CMS1CNT), 0) AS cms1Cnt " +
+           "  FROM (SELECT DECODE(A.CMNC_STTS_CD, 'CMS0', 1, 0) AS CMS0CNT, " +
+           "               DECODE(A.CMNC_STTS_CD, 'CMS0', 0, 1) AS CMS1CNT  " +
+           "          FROM TB_VDS_CTLR_STTS_HS A, TB_VDS_CTLR B" +
+           "         WHERE B.DEL_YN = 'N' AND A.VDS_CTLR_NMBR = B.VDS_CTLR_NMBR AND A.CRTN_DT BETWEEN :fromDt AND :toDt" +
+           "       )", nativeQuery = true)
     ReportFcltSummaryInf findAllReportSummary(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
-    @Query("select p from TbVdsCtlrSttsHs p inner join fetch p.vds " +
-            " where p.crtnDt between :fromDt and :toDt " +
-            "   and p.cmncSttsCd = 'CMS1' ")
+    @Query("select p from TbVdsCtlrSttsHs p inner join fetch p.vds m " +
+           " where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt " +
+           "   and p.cmncSttsCd = 'CMS1' ")
     List<TbVdsCtlrSttsHs> findAllReportError(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
 //    @Query(value =
@@ -62,35 +62,35 @@ public interface TbVdsCtlrSttsHsRepository extends JpaRepository<TbVdsCtlrSttsHs
 //            "        WHERE A.VDS_CTLR_NMBR = B.VDS_CTLR_NMBR(+)"
 //            , nativeQuery = true)
     @Query(value =
-            "SELECT A.VDS_CTLR_NMBR AS fcltNmbr, A.VDS_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm, " +
-            "               NVL(B.CNT_CMS1, 0) + NVL(B.CNT_CMS2, 0) AS totCnt, " +
-            "               NVL(B.CNT_CMS1, 0) AS cms1Cnt, NVL(B.CNT_CMS2, 0) AS cms2Cnt " +
-            "        FROM TB_VDS_CTLR A, " +
-            "             (SELECT VDS_CTLR_NMBR, " +
-            "                     SUM(DECODE(CMNC_STTS_CD, 'CMS1', 1, 0)) AS CNT_CMS1, " +
-            "                     SUM(DECODE(CMNC_STTS_CD, 'CMS2', 1, 0)) AS CNT_CMS2 " +
-            "              FROM TB_VDS_CTLR_STTS_HS " +
-            "              WHERE CRTN_DT BETWEEN :fromDt AND :toDt " +
-            "                AND CMNC_STTS_CD IN ('CMS1', 'CMS2') " +
-            "              GROUP BY VDS_CTLR_NMBR) B " +
-            "        WHERE A.VDS_CTLR_NMBR = B.VDS_CTLR_NMBR(+)"
-            , nativeQuery = true)
+           "SELECT A.VDS_CTLR_NMBR AS fcltNmbr, A.VDS_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm, " +
+           "               NVL(B.CNT_CMS1, 0) + NVL(B.CNT_CMS2, 0) AS totCnt, " +
+           "               NVL(B.CNT_CMS1, 0) AS cms1Cnt, NVL(B.CNT_CMS2, 0) AS cms2Cnt " +
+           "        FROM TB_VDS_CTLR A, " +
+           "             (SELECT VDS_CTLR_NMBR, " +
+           "                     SUM(DECODE(CMNC_STTS_CD, 'CMS1', 1, 0)) AS CNT_CMS1, " +
+           "                     SUM(DECODE(CMNC_STTS_CD, 'CMS2', 1, 0)) AS CNT_CMS2 " +
+           "              FROM TB_VDS_CTLR_STTS_HS " +
+           "              WHERE CRTN_DT BETWEEN :fromDt AND :toDt " +
+           "                AND CMNC_STTS_CD IN ('CMS1', 'CMS2') " +
+           "              GROUP BY VDS_CTLR_NMBR) B " +
+           "        WHERE A.DEL_YN = 'N' AND A.VDS_CTLR_NMBR = B.VDS_CTLR_NMBR(+)"
+           , nativeQuery = true)
     List<FcltSttsStatErrorInf> findAllStatisticsCommErrByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
     @Query(value =
-            "SELECT 'VDS' AS fcltType, A.VDS_CTLR_NMBR AS fcltNmbr, A.VDS_CTLR_ID AS fcltId, A.LCTN AS fcltNm,              " +
-            "       B.CONN_STTS_CD AS commSttsCd, B.DOOR_STTS_CD AS doorSttsCd, NVL(B.CBOX_TMPR, 0) AS cboxTmpr, B.CRTN_DT AS crtnDt " +
-            "  FROM TB_VDS_CTLR A,                                                                                           " +
-            "       (SELECT VDS_CTLR_NMBR, CMNC_STTS_CD AS CONN_STTS_CD,                                                     " +
-            "               CBOX_DOOR_STTS_CD AS DOOR_STTS_CD, CBOX_TMPR, CRTN_DT                                            " +
-            "          FROM TB_VDS_CTLR_STTS_HS                                                                              " +
-            "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                                                " +
-            "           AND (CMNC_STTS_CD      <> 'CMS0' OR                                                                  " +
-            "                CBOX_DOOR_STTS_CD <> 'CDS0' OR                                                                  " +
-            "                CBOX_TMPR > 40)                                                                                 " +
-            "       ) B                                                                                                      " +
-            " WHERE A.VDS_CTLR_NMBR = B.VDS_CTLR_NMBR  "
-            , nativeQuery = true)
+           "SELECT 'VDS' AS fcltType, A.VDS_CTLR_NMBR AS fcltNmbr, A.VDS_CTLR_ID AS fcltId, A.LCTN AS fcltNm,              " +
+           "       B.CONN_STTS_CD AS commSttsCd, B.DOOR_STTS_CD AS doorSttsCd, NVL(B.CBOX_TMPR, 0) AS cboxTmpr, B.CRTN_DT AS crtnDt " +
+           "  FROM TB_VDS_CTLR A,                                                                                           " +
+           "       (SELECT VDS_CTLR_NMBR, CMNC_STTS_CD AS CONN_STTS_CD,                                                     " +
+           "               CBOX_DOOR_STTS_CD AS DOOR_STTS_CD, CBOX_TMPR, CRTN_DT                                            " +
+           "          FROM TB_VDS_CTLR_STTS_HS                                                                              " +
+           "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                                                " +
+           "           AND (CMNC_STTS_CD      <> 'CMS0' OR                                                                  " +
+           "                CBOX_DOOR_STTS_CD <> 'CDS0' OR                                                                  " +
+           "                CBOX_TMPR > 40)                                                                                 " +
+           "       ) B                                                                                                      " +
+           " WHERE A.DEL_YN = 'N' AND A.VDS_CTLR_NMBR = B.VDS_CTLR_NMBR  "
+           , nativeQuery = true)
     List<FcltSttsErrorInf> findAllSttsErrorByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
 }

+ 42 - 42
src/main/java/com/its/op/dao/repository/its/vms/TbVmsCtlrSttsHsRepository.java

@@ -17,68 +17,68 @@ import java.util.List;
 @Repository
 public interface TbVmsCtlrSttsHsRepository extends JpaRepository<TbVmsCtlrSttsHs, TbVmsCtlrSttsHsKey>, JpaSpecificationExecutor<TbVmsCtlrSttsHs> {
 
-    @Query("select p from TbVmsCtlrSttsHs p inner join fetch p.vms where p.crtnDt between :fromDt and :toDt and p.vmsCtlrNmbr in :ids")
+    @Query("select p from TbVmsCtlrSttsHs p inner join fetch p.vms m where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt and p.vmsCtlrNmbr in :ids")
     List<TbVmsCtlrSttsHs> findAllByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("ids") List<Long> ids);
 
     @Query("select p.vmsCtlrNmbr as nmbr, count(p.vmsCtlrNmbr) as errCnt " +
-            "  from TbVmsCtlrSttsHs p " +
-            " where p.crtnDt     >= :fromDt " +
-            "   and p.cmncSttsCd <> 'CMS0' " +
-            " group by p.vmsCtlrNmbr")
+           "  from TbVmsCtlrSttsHs p inner join fetch p.vms m " +
+           " where m.delYn = 'N' and p.crtnDt     >= :fromDt " +
+           "   and p.cmncSttsCd <> 'CMS0' " +
+           " group by p.vmsCtlrNmbr")
     List<SttsHsErrCntInf> findAllCommErrorCount(@Param("fromDt") String fromDt);
 
-    @Query("select p from TbVmsCtlrSttsHs p inner join fetch p.vms " +
-           " where p.crtnDt between :fromDt and :toDt " +
+    @Query("select p from TbVmsCtlrSttsHs p inner join fetch p.vms m " +
+           " where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt " +
            "   and (p.cmncSttsCd <> 'CMS0' or p.cboxDoorSttsCd <> 'CDS0' or p.cboxTmpr > 40)" +
            "   and p.vmsCtlrNmbr in :ids")
     List<TbVmsCtlrSttsHs> findAllFailByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("ids") List<Long> ids);
 
     @Query(value =
-            "SELECT NVL(SUM(CMS0CNT), 0) AS cms0Cnt, NVL(SUM(CMS1CNT), 0) AS cms1Cnt " +
-            "  FROM (SELECT DECODE(CMNC_STTS_CD, 'CMS0', 1, 0) AS CMS0CNT, " +
-            "               DECODE(CMNC_STTS_CD, 'CMS0', 0, 1) AS CMS1CNT  " +
-            "          FROM TB_VMS_CTLR_STTS_HS " +
-            "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt" +
-            "       )", nativeQuery = true)
+           "SELECT NVL(SUM(CMS0CNT), 0) AS cms0Cnt, NVL(SUM(CMS1CNT), 0) AS cms1Cnt " +
+           "  FROM (SELECT DECODE(A.CMNC_STTS_CD, 'CMS0', 1, 0) AS CMS0CNT, " +
+           "               DECODE(A.CMNC_STTS_CD, 'CMS0', 0, 1) AS CMS1CNT  " +
+           "          FROM TB_VMS_CTLR_STTS_HS A, TB_VMS_CTLR B " +
+           "         WHERE B.DEL_YN = 'N' AND A.VMS_CTLR_NMBR = B.VMS_CTLR_NMBR AND A.CRTN_DT BETWEEN :fromDt AND :toDt" +
+           "       )", nativeQuery = true)
     ReportFcltSummaryInf findAllReportSummary(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
 
-    @Query("select p from TbVmsCtlrSttsHs p inner join fetch p.vms " +
-            " where p.crtnDt between :fromDt and :toDt " +
-            "   and p.cmncSttsCd = 'CMS1' ")
+    @Query("select p from TbVmsCtlrSttsHs p inner join fetch p.vms m " +
+           " where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt " +
+           "   and p.cmncSttsCd = 'CMS1' ")
     List<TbVmsCtlrSttsHs> findAllReportError(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
     @Query(value =
-            "SELECT A.VMS_CTLR_NMBR AS fcltNmbr, A.VMS_CTLR_ID AS fcltId, A.VMS_NM AS fcltNm, " +
-            "               NVL(B.CNT_CMS1, 0) + NVL(B.CNT_CMS2, 0) AS totCnt, " +
-            "               NVL(B.CNT_CMS1, 0) AS cms1Cnt, NVL(B.CNT_CMS2, 0) AS cms2Cnt " +
-            "        FROM TB_VMS_CTLR A, " +
-            "             (SELECT VMS_CTLR_NMBR, " +
-            "                     SUM(DECODE(CMNC_STTS_CD, 'CMS1', 1, 0)) AS CNT_CMS1, " +
-            "                     SUM(DECODE(CMNC_STTS_CD, 'CMS2', 1, 0)) AS CNT_CMS2 " +
-            "              FROM TB_VMS_CTLR_STTS_HS " +
-            "              WHERE CRTN_DT BETWEEN :fromDt AND :toDt " +
-            "                AND CMNC_STTS_CD IN ('CMS1', 'CMS2') " +
-            "              GROUP BY VMS_CTLR_NMBR) B " +
-            "        WHERE A.VMS_CTLR_NMBR = B.VMS_CTLR_NMBR(+)"
-            , nativeQuery = true)
+           "SELECT A.VMS_CTLR_NMBR AS fcltNmbr, A.VMS_CTLR_ID AS fcltId, A.VMS_NM AS fcltNm, " +
+           "               NVL(B.CNT_CMS1, 0) + NVL(B.CNT_CMS2, 0) AS totCnt, " +
+           "               NVL(B.CNT_CMS1, 0) AS cms1Cnt, NVL(B.CNT_CMS2, 0) AS cms2Cnt " +
+           "        FROM TB_VMS_CTLR A, " +
+           "             (SELECT VMS_CTLR_NMBR, " +
+           "                     SUM(DECODE(CMNC_STTS_CD, 'CMS1', 1, 0)) AS CNT_CMS1, " +
+           "                     SUM(DECODE(CMNC_STTS_CD, 'CMS2', 1, 0)) AS CNT_CMS2 " +
+           "              FROM TB_VMS_CTLR_STTS_HS " +
+           "              WHERE CRTN_DT BETWEEN :fromDt AND :toDt " +
+           "                AND CMNC_STTS_CD IN ('CMS1', 'CMS2') " +
+           "              GROUP BY VMS_CTLR_NMBR) B " +
+           "        WHERE A.DEL_YN = 'N' AND A.VMS_CTLR_NMBR = B.VMS_CTLR_NMBR(+)"
+           , nativeQuery = true)
     List<FcltSttsStatErrorInf> findAllStatisticsCommErrByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
 
     @Query(value =
-            "SELECT 'VMS' AS fcltType, A.VMS_CTLR_NMBR AS fcltNmbr, A.VMS_CTLR_ID AS fcltId, A.VMS_NM AS fcltNm,                  " +
-            "       B.CMNC_STTS_CD AS commSttsCd, B.DOOR_STTS_CD AS doorSttsCd, NVL(B.CBOX_TMPR, 0) AS cboxTmpr, B.CRTN_DT AS crtnDt " +
-            "  FROM TB_VMS_CTLR A,                                                                                           " +
-            "       (SELECT VMS_CTLR_NMBR, CMNC_STTS_CD AS CMNC_STTS_CD,                                                     " +
-            "               CBOX_DOOR_STTS_CD AS DOOR_STTS_CD, CBOX_TMPR, CRTN_DT                                        " +
-            "          FROM TB_VMS_CTLR_STTS_HS                                                                                   " +
-            "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                                                " +
-            "           AND (CMNC_STTS_CD          <> 'CMS0' OR                                                              " +
-            "                CBOX_DOOR_STTS_CD <> 'CDS0' OR                                                              " +
-            "                CBOX_TMPR > 40)                                                                                 " +
-            "       ) B                                                                                                      " +
-            " WHERE A.VMS_CTLR_NMBR = B.VMS_CTLR_NMBR "
-            , nativeQuery = true)
+           "SELECT 'VMS' AS fcltType, A.VMS_CTLR_NMBR AS fcltNmbr, A.VMS_CTLR_ID AS fcltId, A.VMS_NM AS fcltNm,                  " +
+           "       B.CMNC_STTS_CD AS commSttsCd, B.DOOR_STTS_CD AS doorSttsCd, NVL(B.CBOX_TMPR, 0) AS cboxTmpr, B.CRTN_DT AS crtnDt " +
+           "  FROM TB_VMS_CTLR A,                                                                                           " +
+           "       (SELECT VMS_CTLR_NMBR, CMNC_STTS_CD AS CMNC_STTS_CD,                                                     " +
+           "               CBOX_DOOR_STTS_CD AS DOOR_STTS_CD, CBOX_TMPR, CRTN_DT                                        " +
+           "          FROM TB_VMS_CTLR_STTS_HS                                                                                   " +
+           "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                                                " +
+           "           AND (CMNC_STTS_CD          <> 'CMS0' OR                                                              " +
+           "                CBOX_DOOR_STTS_CD <> 'CDS0' OR                                                              " +
+           "                CBOX_TMPR > 40)                                                                                 " +
+           "       ) B                                                                                                      " +
+           " WHERE A.DEL_YN = 'N' AND A.VMS_CTLR_NMBR = B.VMS_CTLR_NMBR "
+           , nativeQuery = true)
     List<FcltSttsErrorInf> findAllSttsErrorByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
 }

+ 46 - 20
src/main/java/com/its/op/dao/repository/its/wcam/TbWcamCtlrSttsHsRepository.java

@@ -2,6 +2,8 @@ package com.its.op.dao.repository.its.wcam;
 
 import com.its.op.dto.its.common.SttsHsErrCntInf;
 import com.its.op.dto.its.facility.FcltSttsErrorInf;
+import com.its.op.dto.its.report.ReportFcltSummaryInf;
+import com.its.op.dto.its.statistics.FcltSttsStatErrorInf;
 import com.its.op.entity.its.wcam.TbWcamCtlrSttsHs;
 import com.its.op.entity.its.wcam.TbWcamCtrlSttsHsKey;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -22,34 +24,58 @@ public interface TbWcamCtlrSttsHsRepository extends JpaRepository<TbWcamCtlrStts
     List<TbWcamCtlrSttsHs> findAllList();
 
     @Query("select p.wcamCtlrNmbr as nmbr, count(p.wcamCtlrNmbr) as errCnt " +
-            "  from TbWcamCtlrSttsHs p " +
-            " where p.crtnDt     >= :fromDt " +
-            "   and p.cmncSttsCd <> 'CMS0' " +
-            " group by p.wcamCtlrNmbr")
+           "  from TbWcamCtlrSttsHs p inner join fetch p.wcam m " +
+           " where m.delYn = 'N' and p.crtnDt     >= :fromDt " +
+           "   and p.cmncSttsCd <> 'CMS0' " +
+           " group by p.wcamCtlrNmbr")
     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")
+    @Query("select p from TbWcamCtlrSttsHs p inner join fetch p.wcam m where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt and p.wcamCtlrNmbr in :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 " +
-            "   and (p.cmncSttsCd <> 'CMS0')" +
-            "   and p.wcamCtlrNmbr in :ids")
+    @Query("select p from TbWcamCtlrSttsHs p inner join fetch p.wcam m " +
+           " where m.delYn = 'N' and p.crtnDt between :fromDt and :toDt " +
+           "   and (p.cmncSttsCd <> 'CMS0')" +
+           "   and p.wcamCtlrNmbr in :ids")
     List<TbWcamCtlrSttsHs> findAllFailByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("ids") List<Long> ids);
 
+    @Query(value =
+           "SELECT NVL(SUM(CMS0CNT), 0) AS cms0Cnt, NVL(SUM(CMS1CNT), 0) AS cms1Cnt " +
+           "  FROM (SELECT DECODE(A.CMNC_STTS_CD, 'CMS0', 1, 0) AS CMS0CNT, " +
+           "               DECODE(A.CMNC_STTS_CD, 'CMS0', 0, 1) AS CMS1CNT  " +
+           "          FROM TB_WCAM_CTLR_STTS_HS A, TB_WCAM_CTLR B " +
+           "         WHERE B.DEL_YN = 'N' AND A.WCAM_CTLR_NMBR = B.WCAM_CTLR_NMBR AND A.CRTN_DT BETWEEN :fromDt AND :toDt" +
+           "       )"
+           , nativeQuery = true)
+    ReportFcltSummaryInf findAllReportSummary(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
     @Query(value =
-            "SELECT 'WCAM' AS fcltType, A.WCAM_CTLR_NMBR AS fcltNmbr, A.WCAM_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm,            " +
-            "       B.CONN_STTS_CD AS commSttsCd, B.DOOR_STTS_CD AS doorSttsCd, NVL(B.CBOX_TMPR, 0) AS cboxTmpr, B.CRTN_DT AS crtnDt " +
-            "  FROM TB_WCAM_CTLR A,                                                                                                  " +
-            "       (SELECT WCAM_CTLR_NMBR, CMNC_STTS_CD AS CONN_STTS_CD,                                                            " +
-            "               'CDS0' AS DOOR_STTS_CD, 0 AS CBOX_TMPR, CRTN_DT                                                          " +
-            "          FROM TB_WCAM_CTLR_STTS_HS                                                                                     " +
-            "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                                                        " +
-            "           AND (CMNC_STTS_CD <> 'CMS0')                                                                                 " +
-            "       ) B                                                                                                              " +
-            " WHERE A.WCAM_CTLR_NMBR = B.WCAM_CTLR_NMBR                                                                              "
-            , nativeQuery = true)
+           "SELECT 'WCAM' AS fcltType, A.WCAM_CTLR_NMBR AS fcltNmbr, A.WCAM_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm,            " +
+           "       B.CONN_STTS_CD AS commSttsCd, B.DOOR_STTS_CD AS doorSttsCd, NVL(B.CBOX_TMPR, 0) AS cboxTmpr, B.CRTN_DT AS crtnDt " +
+           "  FROM TB_WCAM_CTLR A,                                                                                                  " +
+           "       (SELECT WCAM_CTLR_NMBR, CMNC_STTS_CD AS CONN_STTS_CD,                                                            " +
+           "               'CDS0' AS DOOR_STTS_CD, 0 AS CBOX_TMPR, CRTN_DT                                                          " +
+           "          FROM TB_WCAM_CTLR_STTS_HS                                                                                     " +
+           "         WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                                                        " +
+           "           AND (CMNC_STTS_CD <> 'CMS0')                                                                                 " +
+           "       ) B                                                                                                              " +
+           " WHERE A.DEL_YN = 'N' AND A.WCAM_CTLR_NMBR = B.WCAM_CTLR_NMBR                                                           "
+           , nativeQuery = true)
     List<FcltSttsErrorInf> findAllSttsErrorByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
+    @Query(value =
+           "SELECT A.WCAM_CTLR_NMBR AS fcltNmbr, A.WCAM_CTLR_ID AS fcltId, A.ISTL_LCTN_NM AS fcltNm, " +
+           "               NVL(B.CNT_CMS1, 0) + NVL(B.CNT_CMS2, 0) AS totCnt,                        " +
+           "               NVL(B.CNT_CMS1, 0) AS cms1Cnt, NVL(B.CNT_CMS2, 0) AS cms2Cnt              " +
+           "        FROM TB_WCAM_CTLR A,                                                             " +
+           "             (SELECT WCAM_CTLR_NMBR,                                                     " +
+           "                     SUM(DECODE(CMNC_STTS_CD, 'CMS1', 1, 0)) AS CNT_CMS1,                " +
+           "                     SUM(DECODE(CMNC_STTS_CD, 'CMS2', 1, 0)) AS CNT_CMS2                 " +
+           "              FROM TB_WCAM_CTLR_STTS_HS                                                  " +
+           "              WHERE CRTN_DT BETWEEN :fromDt AND :toDt                                    " +
+           "                AND CMNC_STTS_CD IN ('CMS1', 'CMS2')                                     " +
+           "              GROUP BY WCAM_CTLR_NMBR) B                                                 " +
+           "        WHERE A.DEL_YN = 'N' AND A.WCAM_CTLR_NMBR = B.WCAM_CTLR_NMBR(+)                  "
+           , nativeQuery = true)
+    List<FcltSttsStatErrorInf> findAllStatisticsCommErrByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
 }

+ 10 - 0
src/main/java/com/its/op/service/its/report/ReportService.java

@@ -6,6 +6,7 @@ import com.its.op.dao.repository.its.link.TbLinkTrafHsRepository;
 import com.its.op.dao.repository.its.rse.TbRseCtlrSttsHsRepository;
 import com.its.op.dao.repository.its.vds.TbVdsCtlrSttsHsRepository;
 import com.its.op.dao.repository.its.vms.TbVmsCtlrSttsHsRepository;
+import com.its.op.dao.repository.its.wcam.TbWcamCtlrSttsHsRepository;
 import com.its.op.dto.its.report.*;
 import com.its.op.entity.its.cctv.TbCctvCtlrSttsHs;
 import com.its.op.entity.its.incident.TbIncdOcrr;
@@ -31,6 +32,7 @@ public class ReportService {
     private final TbVmsCtlrSttsHsRepository vmsSttsHsRepo;
     private final TbVdsCtlrSttsHsRepository vdsSttsHsRepo;
     private final TbRseCtlrSttsHsRepository rseSttsHsRepo;
+    private final TbWcamCtlrSttsHsRepository wcamSttsHsRepo;
     private final TbIncdOcrrRepository incdOcrrRepo;
     private final TbLinkTrafHsRepository linkTrafHsRepo;
 
@@ -77,6 +79,14 @@ public class ReportService {
                 .cms1Cnt(rseSummary.getCms1Cnt().intValue())
                 .build());
 
+        ReportFcltSummaryInf wcamSummary = this.wcamSttsHsRepo.findAllReportSummary(fromDt, toDt);
+        result.add(ReportFacilitySummaryDto.builder()
+                .fcltSeq(5)
+                .fcltType("WCAM")
+                .cms0Cnt(wcamSummary.getCms0Cnt().intValue())
+                .cms1Cnt(wcamSummary.getCms1Cnt().intValue())
+                .build());
+
         return result;
     }
 

+ 8 - 0
src/main/java/com/its/op/service/its/statistics/FcltSttsStatisticsService.java

@@ -4,6 +4,7 @@ import com.its.op.dao.repository.its.cctv.TbCctvCtlrSttsHsRepository;
 import com.its.op.dao.repository.its.rse.TbRseCtlrSttsHsRepository;
 import com.its.op.dao.repository.its.vds.TbVdsCtlrSttsHsRepository;
 import com.its.op.dao.repository.its.vms.TbVmsCtlrSttsHsRepository;
+import com.its.op.dao.repository.its.wcam.TbWcamCtlrSttsHsRepository;
 import com.its.op.dto.its.statistics.FcltSttsStatErrorDto;
 import com.its.op.dto.its.statistics.FcltSttsStatErrorInf;
 import com.its.op.dto.its.statistics.FcltSttsStatTypeDto;
@@ -25,6 +26,7 @@ public class FcltSttsStatisticsService {
     private final TbVmsCtlrSttsHsRepository vmsSttsHsRepo;
     private final TbVdsCtlrSttsHsRepository vdsSttsHsRepo;
     private final TbRseCtlrSttsHsRepository rseSttsHsRepo;
+    private final TbWcamCtlrSttsHsRepository wcamSttsHsRepo;
 
     /**
      * 통계 - 시설물 통신단절 통계 - 시설물 구분 목록
@@ -41,6 +43,8 @@ public class FcltSttsStatisticsService {
         result.add(FcltSttsStatTypeDto.builder().fcltSeq(2).fcltCd("VMS").fcltNm("VMS").build());
         result.add(FcltSttsStatTypeDto.builder().fcltSeq(3).fcltCd("VDS").fcltNm("VDS").build());
         result.add(FcltSttsStatTypeDto.builder().fcltSeq(4).fcltCd("DSRC").fcltNm("DSRC").build());
+        result.add(FcltSttsStatTypeDto.builder().fcltSeq(5).fcltCd("WCAM").fcltNm("웹카메라").build());
+        //TODO, 교차로카메라(CCAM)
 
         return result;
     }
@@ -79,6 +83,10 @@ public class FcltSttsStatisticsService {
         if (("DSRC").equalsIgnoreCase(fcltTypeCd)) {
             return findAllStatisticsCommErrByDateRangeResult(this.rseSttsHsRepo.findAllStatisticsCommErrByDateRange(fromDt, toDt));
         }
+        else
+        if (("WCAM").equalsIgnoreCase(fcltTypeCd)) {
+            return findAllStatisticsCommErrByDateRangeResult(this.wcamSttsHsRepo.findAllStatisticsCommErrByDateRange(fromDt, toDt));
+        }
         else {
             throw new NoSuchElementException("요청 파라미터가 잘못 됐습니다: " + fcltTypeCd);
         }