Merge remote-tracking branch 'origin/feat/demo-20251205' into feat/demo-20251205

# Conflicts: # src/main/java/com/kamco/cd/kamcoback/changedetection/ChangeDetectionApiController.java # src/main/java/com/kamco/cd/kamcoback/changedetection/dto/ChangeDetectionDto.java
2025-11-27 18:01:53 +09:00
parent 675d2f2ed1 e2cf660ea6
commit 8bab44d7e4
46 changed files with 38145 additions and 39201 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/AuthCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/AuthCoreService.java
@@ -1,9 +1,11 @@
 package com.kamco.cd.kamcoback.postgres.core;

 import com.kamco.cd.kamcoback.auth.dto.AuthDto;
+import com.kamco.cd.kamcoback.auth.dto.AuthDto.SaveReq;
 import com.kamco.cd.kamcoback.postgres.entity.UserEntity;
 import com.kamco.cd.kamcoback.postgres.repository.auth.AuthRepository;
 import jakarta.persistence.EntityNotFoundException;
+import java.time.ZonedDateTime;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
@@ -11,33 +13,105 @@ import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
 public class AuthCoreService {
+
  private final AuthRepository authRepository;

  /**
   * 관리자 등록
   *
-   * @param signup
+   * @param saveReq
   * @return
   */
-  public Long signup(AuthDto.Signup signup) {
-    if (authRepository.findByUserId(signup.getUserId()).isPresent()) {
-      new EntityNotFoundException("중복된 아이디가 있습니다. " + signup.getUserId());
+  public UserEntity save(SaveReq saveReq) {
+    if (authRepository.findByUserId(saveReq.getUserId()).isPresent()) {
+      new EntityNotFoundException("중복된 아이디가 있습니다. " + saveReq.getUserId());
    }
-    return authRepository.signup(signup);
+
+    UserEntity userEntity =
+        new UserEntity(
+            null,
+            saveReq.getUserAuth(),
+            saveReq.getUserNm(),
+            saveReq.getUserId(),
+            saveReq.getEmpId(),
+            saveReq.getUserEmail(),
+            saveReq.getUserPw());
+
+    return authRepository.save(userEntity);
+  }
+
+  /**
+   * 관리자 정보 수정
+   *
+   * @param id
+   * @param saveReq
+   * @return
+   */
+  public UserEntity update(Long id, AuthDto.SaveReq saveReq) {
+    UserEntity userEntity =
+        authRepository.findById(id).orElseThrow(() -> new RuntimeException("유저가 존재하지 않습니다."));
+
+    if (saveReq.getUserAuth() != null) {
+      userEntity.setUserAuth(saveReq.getUserAuth());
+    }
+
+    if (saveReq.getUserNm() != null) {
+      userEntity.setUserNm(saveReq.getUserNm());
+    }
+
+    if (saveReq.getUserId() != null) {
+      userEntity.setUserId(saveReq.getUserId());
+    }
+
+    if (saveReq.getEmpId() != null) {
+      userEntity.setEmpId(saveReq.getEmpId());
+    }
+
+    if (saveReq.getUserEmail() != null) {
+      userEntity.setUserEmail(saveReq.getUserEmail());
+    }
+
+    if (saveReq.getUserPw() != null) {
+      userEntity.setUserPw(saveReq.getUserPw());
+    }
+
+    return authRepository.save(userEntity);
+  }
+
+  /**
+   * 관리자 삭제
+   *
+   * @param id
+   * @return
+   */
+  public UserEntity withdrawal(Long id) {
+    UserEntity userEntity =
+        authRepository.findById(id).orElseThrow(() -> new RuntimeException("유저가 존재하지 않습니다."));
+
+    userEntity.setId(id);
+    userEntity.setDateWithdrawal(ZonedDateTime.now());
+    userEntity.setState("WITHDRAWAL");
+
+    return authRepository.save(userEntity);
  }

  /**
   * 시퀀스 id로 관리자 조회
+   *
   * @param id
   * @return
   */
-  public AuthDto.Basic findUserById(Long id){
-    UserEntity entity = authRepository.findUserById(id).orElseThrow(() -> new EntityNotFoundException("관리자를 찾을 수 없습니다. " + id));
+  public AuthDto.Basic findUserById(Long id) {
+    UserEntity entity =
+        authRepository
+            .findUserById(id)
+            .orElseThrow(() -> new EntityNotFoundException("관리자를 찾을 수 없습니다. " + id));
    return entity.toDto();
  }

  /**
   * 관리자 목록 조회
+   *
   * @param searchReq
   * @return
   */
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/ChangeDetectionCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/ChangeDetectionCoreService.java
@@ -29,7 +29,8 @@ public class ChangeDetectionCoreService {
              // 중심 좌표 계산
              Point centroid = polygon.getCentroid();

-              return new ChangeDetectionDto.TestDto(p.getId(), polygon, centroid.getX(), centroid.getY());
+              return new ChangeDetectionDto.TestDto(
+                  p.getId(), polygon, centroid.getX(), centroid.getY());
            })
        .collect(Collectors.toList());
  }
@@ -39,15 +40,15 @@ public class ChangeDetectionCoreService {
    ObjectMapper mapper = new ObjectMapper();

    return list.stream()
-      .map(
-        s -> {
-          try {
-            return mapper.readTree(s);
-          } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-          }
-        })
-      .collect(Collectors.toList());
+        .map(
+            s -> {
+              try {
+                return mapper.readTree(s);
+              } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+              }
+            })
+        .collect(Collectors.toList());
  }

  public List<ChangeDetectionDto.CountDto> getChangeDetectionClassCount(Long id) {
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataEntity.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataEntity.java
@@ -10,12 +10,9 @@ import jakarta.persistence.Table;
 import jakarta.validation.constraints.Size;
 import java.time.OffsetDateTime;
 import java.time.ZonedDateTime;
-import java.util.Map;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;
-import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.type.SqlTypes;

@Getter
@Setter
@@ -149,5 +146,4 @@ public class MapSheetAnalDataEntity {

  @Column(name = "ref_map_sheet_num")
  private Long refMapSheetNum;
-
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/UserEntity.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/UserEntity.java
@@ -12,13 +12,16 @@ import jakarta.persistence.UniqueConstraint;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import java.time.ZonedDateTime;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;

@Getter
@Setter
@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table(
    name = "tb_user",
    uniqueConstraints = {@UniqueConstraint(name = "ux_tb_user_user_id", columnNames = "user_id")})
@@ -52,7 +55,7 @@ public class UserEntity {
  @NotNull
  @ColumnDefault("'ACTIVE'")
  @Column(name = "state", nullable = false)
-  private String state;
+  private String state = "ACTIVE";

  @Column(name = "date_withdrawal")
  private ZonedDateTime dateWithdrawal;
@@ -85,16 +88,31 @@ public class UserEntity {
  @Column(name = "emp_id", nullable = false)
  private String empId;

+  public UserEntity(
+      Long id,
+      String userAuth,
+      String userNm,
+      String userId,
+      String empId,
+      String userEmail,
+      String userPw) {
+    this.id = id;
+    this.userAuth = userAuth;
+    this.userNm = userNm;
+    this.userId = userId;
+    this.empId = empId;
+    this.userEmail = userEmail;
+    this.userPw = userPw;
+  }
+
  public AuthDto.Basic toDto() {
    return new AuthDto.Basic(
-      this.id,
-      this.userAuth,
-      this.userNm,
-      this.userId,
-      this.empId,
-      this.userEmail,
-      this.createdDttm
-    ) ;
-
+        this.id,
+        this.userAuth,
+        this.userNm,
+        this.userId,
+        this.empId,
+        this.userEmail,
+        this.createdDttm);
  }
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/MapSheetLearnDataGeomRepository.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/MapSheetLearnDataGeomRepository.java
@@ -3,7 +3,11 @@ package com.kamco.cd.kamcoback.postgres.repository;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnDataGeomEntity;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;

@Repository
 public interface MapSheetLearnDataGeomRepository
@@ -24,4 +28,40 @@ public interface MapSheetLearnDataGeomRepository

  /** 데이터 UID로 기존 지오메트리 데이터 삭제 (재생성 전에 사용) */
  void deleteByDataUid(Long dataUid);
+
+  /** 
+   * PostGIS 함수를 사용하여 geometry 데이터를 직접 삽입
+   * ST_SetSRID(ST_GeomFromGeoJSON(...), 5186) 형식으로 저장
+   */
+  @Modifying
+  @Transactional
+  @Query(value = """
+      INSERT INTO tb_map_sheet_learn_data_geom (
+          geo_uid, cd_prob, class_before_name, class_before_prob, 
+          class_after_name, class_after_prob, map_sheet_num, 
+          before_yyyy, after_yyyy, area, geom, geo_type, data_uid, 
+          created_dttm, updated_dttm
+      ) VALUES (
+          :geoUid, :cdProb, :classBeforeName, :classBeforeProb,
+          :classAfterName, :classAfterProb, :mapSheetNum,
+          :beforeYyyy, :afterYyyy, :area, 
+          ST_SetSRID(ST_GeomFromGeoJSON(CAST(:geometryJson AS TEXT)), 5186), 
+          :geoType, :dataUid, NOW(), NOW()
+      ) ON CONFLICT (geo_uid) DO NOTHING
+      """, nativeQuery = true)
+  void insertWithPostGISGeometry(
+      @Param("geoUid") Long geoUid,
+      @Param("cdProb") Double cdProb,
+      @Param("classBeforeName") String classBeforeName,
+      @Param("classBeforeProb") Double classBeforeProb,
+      @Param("classAfterName") String classAfterName,
+      @Param("classAfterProb") Double classAfterProb,
+      @Param("mapSheetNum") Long mapSheetNum,
+      @Param("beforeYyyy") Integer beforeYyyy,
+      @Param("afterYyyy") Integer afterYyyy,
+      @Param("area") Double area,
+      @Param("geometryJson") String geometryJson,
+      @Param("geoType") String geoType,
+      @Param("dataUid") Long dataUid
+  );
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryCustom.java
@@ -7,7 +7,6 @@ import java.util.Optional;
 import org.springframework.data.domain.Page;

 public interface AuthRepositoryCustom {
-  Long signup(AuthDto.Signup signup);

  Optional<UserEntity> findByUserId(String userId);

--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java
@@ -19,36 +19,10 @@ import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
 public class AuthRepositoryImpl implements AuthRepositoryCustom {
+
  private final JPAQueryFactory queryFactory;
  private final QUserEntity userEntity = QUserEntity.userEntity;

-  /**
-   * 관리자 등록
-   *
-   * @param signup
-   * @return
-   */
-  @Override
-  public Long signup(AuthDto.Signup signup) {
-    return queryFactory
-        .insert(userEntity)
-        .columns(
-            userEntity.userAuth,
-            userEntity.userId,
-            userEntity.userNm,
-            userEntity.userPw,
-            userEntity.userEmail,
-            userEntity.empId)
-        .values(
-            signup.getUserAuth(),
-            signup.getUserId(),
-            signup.getUserNm(),
-            signup.getUserPw(),
-            signup.getUserEmail(),
-            signup.getEmpId())
-        .execute();
-  }
-
  /**
   * 유저 아이디로 조회
   *
@@ -63,17 +37,19 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom {

  /**
   * 유저 시퀀스 id로 조회
+   *
   * @param id
   * @return
   */
  @Override
  public Optional<UserEntity> findUserById(Long id) {
    return Optional.ofNullable(
-      queryFactory.selectFrom(userEntity).where(userEntity.id.eq(id)).fetchOne());
+        queryFactory.selectFrom(userEntity).where(userEntity.id.eq(id)).fetchOne());
  }

  /**
   * 관리자 목록 조회
+   *
   * @param searchReq
   * @return
   */
@@ -86,25 +62,23 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom {
    }

    List<Basic> content =
-      queryFactory
-        .select(Projections.constructor(AuthDto.Basic.class,
-          userEntity.id,
-          userEntity.userAuth,
-          userEntity.userNm,
-          userEntity.userId,
-          userEntity.empId,
-          userEntity.userEmail,
-          userEntity.createdDttm
-        ))
-        .from(userEntity)
-        .where(
-          builder
-        )
-        .orderBy(userEntity.userId.asc())
-        .fetch();
+        queryFactory
+            .select(
+                Projections.constructor(
+                    AuthDto.Basic.class,
+                    userEntity.id,
+                    userEntity.userAuth,
+                    userEntity.userNm,
+                    userEntity.userId,
+                    userEntity.empId,
+                    userEntity.userEmail,
+                    userEntity.createdDttm))
+            .from(userEntity)
+            .where(builder)
+            .orderBy(userEntity.userId.asc())
+            .fetch();

-    long total =
-      queryFactory.select(userEntity.id).from(userEntity).where(builder).fetchCount();
+    long total = queryFactory.select(userEntity.id).from(userEntity).where(builder).fetchCount();
    return new PageImpl<>(content, pageable, total);
  }

--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java
@@ -40,14 +40,12 @@ public class ChangeDetectionRepositoryImpl extends QuerydslRepositorySupport
  }

  @Override
-  public List<String> findPolygonJson(){
+  public List<String> findPolygonJson() {
    return queryFactory
-      .select(
-        Expressions.stringTemplate("ST_AsGeoJSON({0})", mapSheetAnalDataGeomEntity.geom)
-      )
-      .from(mapSheetAnalDataGeomEntity)
-      .orderBy(mapSheetAnalDataGeomEntity.id.desc())
-      .fetch();
+        .select(Expressions.stringTemplate("ST_AsGeoJSON({0})", mapSheetAnalDataGeomEntity.geom))
+        .from(mapSheetAnalDataGeomEntity)
+        .orderBy(mapSheetAnalDataGeomEntity.id.desc())
+        .fetch();
  }

  @Override