Merge pull request 'feat/infer_dev_260107' (#160) from feat/infer_dev_260107 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/160

src/main/java/com/kamco/cd/kamcoback/code/CommonCodeApiController.java

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "공통코드 관리", description = "공통코드 관리 API")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/code")
+@RequestMapping("/api/common-code")
 public class CommonCodeApiController {
 
   private final CommonCodeService commonCodeService;

src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java

@@ -12,8 +12,6 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -21,14 +19,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-@Tag(name = "추론관리 분석결과", description = "추론관리 분석결과")
+@Tag(name = "추론관리", description = "추론관리 API")
-@RequestMapping({"/api/inf/res"})
+@RequestMapping("/api/inference")
 @RequiredArgsConstructor
 @RestController
 public class InferenceResultApiController {
 
-  private static final Logger logger = LoggerFactory.getLogger(InferenceResultApiController.class);
-
   private final InferenceResultService inferenceResultService;
 
   @Operation(summary = "추론관리 분석결과 목록 조회", description = "분석상태, 제목으로 분석결과를 조회 합니다.")

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

@@ -0,0 +1,72 @@
+package com.kamco.cd.kamcoback.inference.dto;
+
+import com.kamco.cd.kamcoback.common.utils.enums.EnumType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+
+public class InferenceResultMngDto {
+
+  @Schema(name = "SearchListReq", description = "분석결과 목록 검색 조건")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class SearchListReq {
+
+    // 검색 조건
+    private String applyYn;
+    private String strtDttm;
+    private String endDttm;
+
+    // 페이징 파라미터
+    private int page = 0;
+    private int size = 20;
+
+    public Pageable toPageable() {
+      return PageRequest.of(page, size);
+    }
+  }
+
+  @Getter
+  @AllArgsConstructor
+  public enum DetectOption implements EnumType {
+    ALL("전체"),
+    PART("부분"),
+    ;
+    private final String desc;
+
+    @Override
+    public String getId() {
+      return name();
+    }
+
+    @Override
+    public String getText() {
+      return desc;
+    }
+  }
+
+  @Getter
+  @AllArgsConstructor
+  public enum MapSheetScope implements EnumType {
+    EXCL("추론제외"),
+    PREV("이전 년도 도엽 사용"),
+    ;
+    private final String desc;
+
+    @Override
+    public String getId() {
+      return name();
+    }
+
+    @Override
+    public String getText() {
+      return desc;
+    }
+  }
+}

src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultMngService.java

@@ -0,0 +1,10 @@
+package com.kamco.cd.kamcoback.inference.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class InferenceResultMngService {}

src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @Tag(name = "라벨링 작업 관리", description = "라벨링 작업 배정 및 통계 조회 API")
-@RequestMapping({"/api/label"})
+@RequestMapping({"/api/training-data/stage"})
 @RequiredArgsConstructor
 @RestController
 public class LabelAllocateApiController {

src/main/java/com/kamco/cd/kamcoback/label/LabelWorkerApiController.java

@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @Tag(name = "라벨링 작업 관리", description = "라벨링 작업 관리")
-@RequestMapping({"/api/label"})
+@RequestMapping({"/api/training-data/stage"})
 @RequiredArgsConstructor
 @RestController
 public class LabelWorkerApiController {

src/main/java/com/kamco/cd/kamcoback/log/AuditLogApiController.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "감사 로그", description = "감사 로그 관리 API")
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/api/log/audit")
+@RequestMapping("/api/logs/audit")
 public class AuditLogApiController {
 
   private final AuditLogService auditLogService;

src/main/java/com/kamco/cd/kamcoback/log/ErrorLogApiController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "에러 로그", description = "에러 로그 관리 API")
 @RequiredArgsConstructor
 @RestController
-@RequestMapping({"/api/log/error"})
+@RequestMapping({"/api/logs/system"})
 public class ErrorLogApiController {
 
   private final ErrorLogService errorLogService;

src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java

@@ -20,13 +20,20 @@ import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 @Tag(name = "영상 관리", description = "영상 관리 API")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping({"/api/mapsheet"})
+@RequestMapping({"/api/imagery/dataset"})
 public class MapSheetMngApiController {
 
   private final CommonCodeService commonCodeService;

src/main/java/com/kamco/cd/kamcoback/members/AdminApiController.java

@@ -1,112 +0,0 @@
-package com.kamco.cd.kamcoback.members;
-
-import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
-import com.kamco.cd.kamcoback.members.dto.MembersDto;
-import com.kamco.cd.kamcoback.members.service.AdminService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import java.util.UUID;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Tag(name = "관리자 관리", description = "관리자 관리 API")
-@RestController
-@RequestMapping("/api/admin/members")
-@RequiredArgsConstructor
-public class AdminApiController {
-
-  private final AdminService adminService;
-
-  @Operation(summary = "관리자 계정 등록", description = "관리자 계정 등록")
-  @ApiResponses(
-      value = {
-        @ApiResponse(
-            responseCode = "201",
-            description = "등록 성공",
-            content =
-                @Content(
-                    mediaType = "application/json",
-                    schema = @Schema(implementation = Long.class))),
-        @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
-        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
-        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-      })
-  @PostMapping("/join")
-  public ApiResponseDto<Long> saveMember(
-      @io.swagger.v3.oas.annotations.parameters.RequestBody(
-              description = "관리자 계정 등록",
-              required = true,
-              content =
-                  @Content(
-                      mediaType = "application/json",
-                      schema = @Schema(implementation = MembersDto.AddReq.class)))
-          @RequestBody
-          @Valid
-          MembersDto.AddReq addReq) {
-
-    return ApiResponseDto.createOK(adminService.saveMember(addReq));
-  }
-
-  @Operation(summary = "관리자 계정 수정", description = "관리자 계정 수정")
-  @ApiResponses(
-      value = {
-        @ApiResponse(
-            responseCode = "201",
-            description = "수정 성공",
-            content =
-                @Content(
-                    mediaType = "application/json",
-                    schema = @Schema(implementation = Long.class))),
-        @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
-        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
-        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-      })
-  @PutMapping("/{uuid}")
-  public ApiResponseDto<UUID> updateMembers(
-      @io.swagger.v3.oas.annotations.parameters.RequestBody(
-              description = "관리자 계정 수정",
-              required = true,
-              content =
-                  @Content(
-                      mediaType = "application/json",
-                      schema = @Schema(implementation = MembersDto.UpdateReq.class)))
-          @PathVariable
-          UUID uuid,
-      @RequestBody @Valid MembersDto.UpdateReq updateReq) {
-    adminService.updateMembers(uuid, updateReq);
-    return ApiResponseDto.createOK(UUID.randomUUID());
-  }
-
-  @Operation(summary = "사번 중복 체크", description = "사번 중복 체크")
-  @ApiResponses(
-      value = {
-        @ApiResponse(
-            responseCode = "200",
-            description = "조회 성공",
-            content =
-                @Content(
-                    mediaType = "application/json",
-                    schema = @Schema(implementation = Boolean.class))),
-        @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
-        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
-        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
-      })
-  @GetMapping("/{employeeNo}")
-  public ApiResponseDto<Boolean> checkEmployeeNo(
-      @Parameter(description = "중복 체크할 사번", required = true, example = "1234567") @PathVariable
-          String employeeNo) {
-    return ApiResponseDto.ok(adminService.existsByEmployeeNo(employeeNo));
-  }
-}

src/main/java/com/kamco/cd/kamcoback/members/MembersApiController.java

@@ -3,33 +3,37 @@ package com.kamco.cd.kamcoback.members;
 import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import com.kamco.cd.kamcoback.members.dto.MembersDto;
 import com.kamco.cd.kamcoback.members.dto.MembersDto.Basic;
+import com.kamco.cd.kamcoback.members.service.AdminService;
 import com.kamco.cd.kamcoback.members.service.MembersService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.data.domain.Page;
-import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Tag(name = "회원정보 관리", description = "회원정보 관리 API")
+@Tag(name = "관리자 관리", description = "회원정보 관리 및 회원정보 API")
 @RestController
 @RequestMapping("/api/members")
 @RequiredArgsConstructor
 public class MembersApiController {
 
-  private final AuthenticationManager authenticationManager;
   private final MembersService membersService;
+  private final AdminService adminService;
 
   @Operation(summary = "회원정보 목록", description = "회원정보 조회")
   @ApiResponses(
@@ -72,4 +76,85 @@ public class MembersApiController {
     membersService.resetPassword(memberId, initReq);
     return ApiResponseDto.createOK(memberId);
   }
+
+  @Operation(summary = "관리자 계정 등록", description = "관리자 계정 등록")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "201",
+            description = "등록 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Long.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @PostMapping("/join")
+  public ApiResponseDto<Long> saveMember(
+      @io.swagger.v3.oas.annotations.parameters.RequestBody(
+              description = "관리자 계정 등록",
+              required = true,
+              content =
+                  @Content(
+                      mediaType = "application/json",
+                      schema = @Schema(implementation = MembersDto.AddReq.class)))
+          @RequestBody
+          @Valid
+          MembersDto.AddReq addReq) {
+
+    return ApiResponseDto.createOK(adminService.saveMember(addReq));
+  }
+
+  @Operation(summary = "관리자 계정 수정", description = "관리자 계정 수정")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "201",
+            description = "수정 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Long.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @PutMapping("/{uuid}")
+  public ApiResponseDto<UUID> updateMembers(
+      @io.swagger.v3.oas.annotations.parameters.RequestBody(
+              description = "관리자 계정 수정",
+              required = true,
+              content =
+                  @Content(
+                      mediaType = "application/json",
+                      schema = @Schema(implementation = MembersDto.UpdateReq.class)))
+          @PathVariable
+          UUID uuid,
+      @RequestBody @Valid MembersDto.UpdateReq updateReq) {
+    adminService.updateMembers(uuid, updateReq);
+    return ApiResponseDto.createOK(UUID.randomUUID());
+  }
+
+  @Operation(summary = "사번 중복 체크", description = "사번 중복 체크")
+  @ApiResponses(
+      value = {
+        @ApiResponse(
+            responseCode = "200",
+            description = "조회 성공",
+            content =
+                @Content(
+                    mediaType = "application/json",
+                    schema = @Schema(implementation = Boolean.class))),
+        @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
+        @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
+        @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
+      })
+  @GetMapping("/{employeeNo}")
+  public ApiResponseDto<Boolean> checkEmployeeNo(
+      @Parameter(description = "중복 체크할 사번", required = true, example = "1234567") @PathVariable
+          String employeeNo) {
+    return ApiResponseDto.ok(adminService.existsByEmployeeNo(employeeNo));
+  }
 }

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

@@ -0,0 +1,8 @@
+package com.kamco.cd.kamcoback.postgres.core;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class InferenceResultMngCoreService {}

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetLearnEntity.java

@@ -0,0 +1,84 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Size;
+import java.time.ZonedDateTime;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "tb_map_sheet_learn")
+public class MapSheetLearnEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tb_map_sheet_learn_id_gen")
+  @SequenceGenerator(
+      name = "tb_map_sheet_learn_id_gen",
+      sequenceName = "tb_map_sheet_learn_uid",
+      allocationSize = 1)
+  @Column(name = "id", nullable = false)
+  private Long id;
+
+  @ColumnDefault("gen_random_uuid()")
+  @Column(name = "uuid")
+  private UUID uuid = UUID.randomUUID();
+
+  @Column(name = "m1_model_uid")
+  private Long m1ModelUid;
+
+  @Column(name = "m2_model_uid")
+  private Long m2ModelUid;
+
+  @Column(name = "m3_model_uid")
+  private Long m3ModelUid;
+
+  @Column(name = "compare_yyyy")
+  private Integer compareYyyy;
+
+  @Column(name = "target_yyyy")
+  private Integer targetYyyy;
+
+  @Size(max = 20)
+  @Column(name = "detect_option", length = 20)
+  private String detectOption;
+
+  @Size(max = 20)
+  @Column(name = "map_sheet_scope", length = 20)
+  private String mapSheetScope;
+
+  @Column(name = "detecting_cnt")
+  private Long detectingCnt;
+
+  @Column(name = "elapsed_time")
+  private ZonedDateTime elapsedTime;
+
+  @Column(name = "apply_yn")
+  private Boolean applyYn;
+
+  @Column(name = "apply_dttm")
+  private ZonedDateTime applyDttm;
+
+  @ColumnDefault("now()")
+  @Column(name = "created_dttm")
+  private ZonedDateTime createdDttm = ZonedDateTime.now();
+
+  @Column(name = "created_uid")
+  private Long createdUid;
+
+  @ColumnDefault("now()")
+  @Column(name = "updated_dttm")
+  private ZonedDateTime updatedDttm;
+
+  @Column(name = "updated_uid")
+  private Long updatedUid;
+}

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

@@ -0,0 +1,7 @@
+package com.kamco.cd.kamcoback.postgres.repository.Inference;
+
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface InferenceResultMngRepository
+    extends JpaRepository<MapSheetLearnEntity, Long>, InferenceResultMngRepositoryCustom {}

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

@@ -0,0 +1,8 @@
+package com.kamco.cd.kamcoback.postgres.repository.Inference;
+
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity;
+
+public interface InferenceResultMngRepositoryCustom {
+
+  MapSheetLearnEntity getInferenceMgnResultList();
+}

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

@@ -0,0 +1,18 @@
+package com.kamco.cd.kamcoback.postgres.repository.Inference;
+
+import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class InferenceResultMngRepositoryImpl implements InferenceResultMngRepositoryCustom {
+
+  private final JPAQueryFactory queryFactory;
+
+  @Override
+  public MapSheetLearnEntity getInferenceMgnResultList() {
+    return null;
+  }
+}

src/main/java/com/kamco/cd/kamcoback/scene/MapInkxMngApiController.java

@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Tag(name = "도엽 관리", description = "도엽 관리 API")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/scene")
+@RequestMapping("/api/imagery/mapsheet")
 public class MapInkxMngApiController {
 
   private final MapInkxMngService mapInkxMngService;