Merge pull request '국유인 API 수정 추가' (#49) from feat/infer_dev_260107 into develop

Reviewed-on: #49

src/main/java/com/kamco/cd/kamcoback/gukyuin/dto/ChngDetectContDto.java

@@ -114,4 +114,27 @@ public class ChngDetectContDto {
     private List<DtoPnuDetectMpng> result;
     private Boolean success;
   }
+
+  @Schema(name = "ResultLabelDto", description = "ResultLabelDto list 리턴 형태")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class ResultLabelDto {
+
+    private Integer code;
+    private String message;
+    private List<Boolean> result;
+    private Boolean success;
+  }
+
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class ReqInfo {
+
+    private String reqIp;
+    private String reqEpno;
+  }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinJobCoreService.java

@@ -5,6 +5,7 @@ import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
 import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinRepository;
 import java.util.List;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class GukYuinJobCoreService {
@@ -15,6 +16,7 @@ public class GukYuinJobCoreService {
     this.gukYuinRepository = gukYuinRepository;
   }
 
+  @Transactional
   public void updateGukYuinApplyStateComplete(Long id, GukYuinStatus status) {
     gukYuinRepository.updateGukYuinApplyStateComplete(id, status);
   }

src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinLabelJobCoreService.java

@@ -4,6 +4,7 @@ import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GeomUidDto;
 import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinLabelJobRepository;
 import java.util.List;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class GukYuinLabelJobCoreService {
@@ -18,6 +19,7 @@ public class GukYuinLabelJobCoreService {
     return gukYuinLabelRepository.findYesterdayLabelingCompleteList();
   }
 
+  @Transactional
   public void updateAnalDataInferenceGeomSendDttm(Long geoUid) {
     gukYuinLabelRepository.updateAnalDataInferenceGeomSendDttm(geoUid);
   }

src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinPnuJobCoreService.java

@@ -5,6 +5,7 @@ import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinStatus;
 import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinPnuJobRepository;
 import java.util.List;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class GukYuinPnuJobCoreService {
@@ -27,6 +28,7 @@ public class GukYuinPnuJobCoreService {
     return gukYuinPnuRepository.upsertMapSheetDataAnalGeomPnu(chnDtctObjtId, pnuList);
   }
 
+  @Transactional
   public void updateInferenceGeomDataPnuCnt(String chnDtctObjtId, long pnuCnt) {
     gukYuinPnuRepository.updateInferenceGeomDataPnuCnt(chnDtctObjtId, pnuCnt);
   }
@@ -35,6 +37,7 @@ public class GukYuinPnuJobCoreService {
     return gukYuinPnuRepository.findMapSheetAnalDataInferenceGeomUid(chnDtctObjtId);
   }
 
+  @Transactional
   public void insertGeoUidPnuData(Long geoUid, String[] pnuList, String chnDtctObjtId) {
     gukYuinPnuRepository.insertGeoUidPnuData(geoUid, pnuList, chnDtctObjtId);
   }

src/main/java/com/kamco/cd/kamcoback/postgres/core/GukYuinStbltJobCoreService.java

@@ -7,6 +7,7 @@ import com.kamco.cd.kamcoback.postgres.repository.gukyuin.GukYuinStbltJobReposit
 import java.time.ZonedDateTime;
 import java.util.List;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 public class GukYuinStbltJobCoreService {
@@ -21,10 +22,13 @@ public class GukYuinStbltJobCoreService {
     return gukYuinStbltRepository.findGukYuinEligibleForSurveyList(status);
   }
 
+  @Transactional
   public void updateGukYuinEligibleForSurvey(String resultUid, RlbDtctMastDto stbltDto) {
     PnuEntity entity =
         gukYuinStbltRepository.findPnuEntityByResultUid(resultUid, stbltDto.getPnu());
 
+    if (entity != null) {
+
       entity.setPnuDtctId(stbltDto.getPnuDtctId());
       entity.setPnu(stbltDto.getPnu());
       entity.setLrmSyncYmd(stbltDto.getLrmSyncYmd());
@@ -57,11 +61,11 @@ public class GukYuinStbltJobCoreService {
       entity.setCrtEpno(stbltDto.getCrtEpno());
       entity.setCrtIp(stbltDto.getCrtIp());
       entity.setChgDt(stbltDto.getChgDt());
-    entity.setChgEpno(stbltDto.getChgEpno());
       entity.setChgIp(stbltDto.getChgIp());
       entity.setDelYn(stbltDto.getDelYn().equals("Y"));
 
       entity.setCreatedDttm(ZonedDateTime.now());
       gukYuinStbltRepository.save(entity);
     }
+  }
 }