shp파일 생성 jar 경로 변경, 추론진행중 상태 추가

src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java

@@ -309,6 +309,15 @@ public class InferenceResultDto {
     @Schema(description = "모델3 분석 대기")
     private Integer m3PendingJobs;
 
+    @Schema(description = "모델1 분석 진행중")
+    private Integer m1RunningJobs;
+
+    @Schema(description = "모델2 분석 진행중")
+    private Integer m2RunningJobs;
+
+    @Schema(description = "모델3 분석 진행중")
+    private Integer m3RunningJobs;
+
     @Schema(description = "모델1 분석 완료")
     private Integer m1CompletedJobs;
 
@@ -391,6 +400,9 @@ public class InferenceResultDto {
         Integer m1PendingJobs,
         Integer m2PendingJobs,
         Integer m3PendingJobs,
+        Integer m1RunningJobs,
+        Integer m2RunningJobs,
+        Integer m3RunningJobs,
         Integer m1CompletedJobs,
         Integer m2CompletedJobs,
         Integer m3CompletedJobs,
@@ -418,6 +430,9 @@ public class InferenceResultDto {
       this.m1PendingJobs = m1PendingJobs;
       this.m2PendingJobs = m2PendingJobs;
       this.m3PendingJobs = m3PendingJobs;
+      this.m1RunningJobs = m1RunningJobs;
+      this.m2RunningJobs = m2RunningJobs;
+      this.m3RunningJobs = m3RunningJobs;
       this.m1CompletedJobs = m1CompletedJobs;
       this.m2CompletedJobs = m2CompletedJobs;
       this.m3CompletedJobs = m3CompletedJobs;

src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java

@@ -205,6 +205,9 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                     mapSheetLearnEntity.m1PendingJobs,
                     mapSheetLearnEntity.m2PendingJobs,
                     mapSheetLearnEntity.m3PendingJobs,
+                    mapSheetLearnEntity.m1RunningJobs,
+                    mapSheetLearnEntity.m2RunningJobs,
+                    mapSheetLearnEntity.m3RunningJobs,
                     mapSheetLearnEntity.m1CompletedJobs,
                     mapSheetLearnEntity.m2CompletedJobs,
                     mapSheetLearnEntity.m3CompletedJobs,

src/main/resources/application-dev.yml

@@ -108,7 +108,7 @@ inference:
   url: http://10.100.0.11:8000/jobs
   batch-url: http://10.100.0.11:8000/batches
   geojson-dir: /kamco-nfs/requests/
-  jar-path: /kamco-nfs/dataset/shp-exporter-1.0.0.jar
+  jar-path: /kamco-nfs/dataset/shp/shp-exporter-1.0.0.jar
   inference-server-name: server1,server2,server3,server4
 
 gukyuin:

src/main/resources/application-prod.yml

@@ -63,7 +63,7 @@ inference:
   url: http://10.100.0.11:8000/jobs
   batch-url: http://10.100.0.11:8000/batches
   geojson-dir: /kamco-nfs/requests/
-  jar-path: /kamco-nfs/dataset/shp-exporter-1.0.0.jar
+  jar-path: /kamco-nfs/dataset/shp/shp-exporter-1.0.0.jar
   inference-server-name: server1,server2,server3,server4
 
 gukyuin: