dev

src/main/java/com/its/op/controller/its/scrs/ScFileDownloadController.java

@@ -39,25 +39,29 @@ public class ScFileDownloadController {
     }
 
     @ApiOperation(value = "원시이력정보수집 이력 파일 다운로드")
-    @GetMapping(value = "/download/raw-clct/{fromDt}/{toDt}", produces = {"application/json; charset=utf8"})
+    @GetMapping(value = "/download/raw-clct/{ixrId}/{fromDt}/{toDt}", produces = {"application/json; charset=utf8"})
     public ResponseEntity<Object> downloadImgnDtctRawClct(
+            @ApiParam(name = "ixrId", value = "스마트교차로 ID", example = "1", required = true)
+            @PathVariable final String ixrId,
             @ApiParam(name = "fromDt", value = "조회시작시각", example = "20230218000000", required = true)
             @PathVariable final String fromDt,
             @ApiParam(name = "toDt", value = "조회종료시각", example = "20230218235959", required = true)
             @PathVariable final String toDt,
             HttpServletRequest req, HttpServletResponse res) {
-        return this.service.downloadImgnDtctRawClct(req, res, fromDt, toDt);
+        return this.service.downloadImgnDtctRawClct(req, res, ixrId, fromDt, toDt);
     }
 
     @ApiOperation(value = "접근로 시간별 통계 파일 다운로드")
-    @GetMapping(value = "/download/acrd-hh-stat/{fromDt}/{toDt}", produces = {"application/json; charset=utf8"})
+    @GetMapping(value = "/download/acrd-hh-stat/{ixrId}/{fromDt}/{toDt}", produces = {"application/json; charset=utf8"})
     public ResponseEntity<Object> downloadAcrdHhStat(
+            @ApiParam(name = "ixrId", value = "스마트교차로 ID", example = "1", required = true)
+            @PathVariable final String ixrId,
             @ApiParam(name = "fromDt", value = "조회시작시각", example = "20230218000000", required = true)
             @PathVariable final String fromDt,
             @ApiParam(name = "toDt", value = "조회종료시각", example = "20230218235959", required = true)
             @PathVariable final String toDt,
             HttpServletRequest req, HttpServletResponse res) {
-        return this.service.downloadAcrdHhStat(req, res, fromDt, toDt);
+        return this.service.downloadAcrdHhStat(req, res, ixrId, fromDt, toDt);
     }
 
 //    @ApiOperation(value = "최적 교통량 파일 목록", response = FileInfoDto.class, responseContainer = "ArrayList")

src/main/java/com/its/op/dao/repository/its/scrs/TbScAcrdStatHhRepository.java

@@ -19,7 +19,7 @@ public interface TbScAcrdStatHhRepository extends JpaRepository<TbScAcrdStatHh,
     @Query("select p from TbScAcrdStatHh p")
     List<TbScAcrdStatHh> findAllList();
 
-    @Query("select p from TbScAcrdStatHh p where p.clctDt between :fromDt and :toDt")
-    List<TbScAcrdStatHh> findAllByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
+    @Query("select p from TbScAcrdStatHh p where p.ixrId = :ixrId and p.clctDt between :fromDt and :toDt")
+    List<TbScAcrdStatHh> findAllByDateRange(@Param("ixrId") String ixrId, @Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
 }

src/main/java/com/its/op/dao/repository/its/scrs/TbScImgnDtctRawClctRepository.java

@@ -19,7 +19,7 @@ public interface TbScImgnDtctRawClctRepository extends JpaRepository<TbScImgnDtc
     @Query("select p from TbScImgnDtctRawClct p")
     List<TbScImgnDtctRawClct> findAllList();
 
-    @Query("select p from TbScImgnDtctRawClct p where p.clctDt between :fromDt and :toDt")
-    List<TbScImgnDtctRawClct> findAllByDateRange(@Param("fromDt") String fromDt, @Param("toDt") String toDt);
+    @Query("select p from TbScImgnDtctRawClct p where p.ixrId = :ixrId and p.clctDt between :fromDt and :toDt")
+    List<TbScImgnDtctRawClct> findAllByDateRange(@Param("ixrId") String ixrId, @Param("fromDt") String fromDt, @Param("toDt") String toDt);
 
 }

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

@@ -372,7 +372,7 @@ public class ScFileDownloadService {
      * @param fromDt
      * @param toDt
      */
-    public ResponseEntity<Object> downloadImgnDtctRawClct(HttpServletRequest request, HttpServletResponse response, String fromDt, String toDt) {
+    public ResponseEntity<Object> downloadImgnDtctRawClct(HttpServletRequest request, HttpServletResponse response, String ixrId, String fromDt, String toDt) {
 
         //StringUtils.subString(fromDt, 10);
         init();
@@ -428,7 +428,7 @@ public class ScFileDownloadService {
                 "bikeGoTfvl",
                 "bikeLeftTfvl",
                 "bikeRghtTfvl"};
-        List<TbScImgnDtctRawClct> dataList = this.dtctRawClctRepo.findAllByDateRange(fromDt, toDt);
+        List<TbScImgnDtctRawClct> dataList = this.dtctRawClctRepo.findAllByDateRange(ixrId, fromDt, toDt);
         try (OutputStreamWriter outputWriter = new OutputStreamWriter(Files.newOutputStream(fullFilePath), "MS949");
              ICsvBeanWriter csvWriter = new CsvBeanWriter(outputWriter, CsvPreference.STANDARD_PREFERENCE);//EXCEL_PREFERENCE);//STANDARD_PREFERENCE);
         ) {
@@ -450,7 +450,7 @@ public class ScFileDownloadService {
      * @param fromDt
      * @param toDt
      */
-    public ResponseEntity<Object> downloadAcrdHhStat(HttpServletRequest request, HttpServletResponse response, String fromDt, String toDt) {
+    public ResponseEntity<Object> downloadAcrdHhStat(HttpServletRequest request, HttpServletResponse response, String ixrId, String fromDt, String toDt) {
 
         init();
         String fileName = "ACRD_HH_STAT_" + StringUtils.subString(fromDt, 12) + "_" + StringUtils.subString(toDt, 12) + this.csvFileExtension;
@@ -495,7 +495,7 @@ public class ScFileDownloadService {
                 "ocpyRate",
                 "busDvrsLaneGoTfvl",
                 "busDvrsLaneLeftTfvl"};
-        List<TbScAcrdStatHh> dataList = this.statHhRepo.findAllByDateRange(fromDt, toDt);
+        List<TbScAcrdStatHh> dataList = this.statHhRepo.findAllByDateRange(ixrId, fromDt, toDt);
         try (OutputStreamWriter outputWriter = new OutputStreamWriter(Files.newOutputStream(fullFilePath), "MS949");
              ICsvBeanWriter csvWriter = new CsvBeanWriter(outputWriter, CsvPreference.STANDARD_PREFERENCE);//EXCEL_PREFERENCE);//STANDARD_PREFERENCE);
         ) {