Merge pull request '관리자 관리 추가, 수정' (#17) from feat/demo-20251205 into develop

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

src/main/java/com/kamco/cd/kamcoback/auth/AuthApiController.java

@@ -75,12 +75,7 @@ public class AuthApiController {
         @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
       })
   @PutMapping("/update/{id}")
-  public ApiResponseDto<Long> update(
+  public ApiResponseDto<Long> update(@PathVariable Long id, @RequestBody AuthDto.SaveReq saveReq) {
-    @PathVariable
-    Long id,
-    @RequestBody
-    AuthDto.SaveReq saveReq
-  ) {
     return ApiResponseDto.createOK(authService.update(id, saveReq).getId());
   }
 
@@ -103,7 +98,6 @@ public class AuthApiController {
     return ApiResponseDto.deleteOk(authService.withdrawal(id).getId());
   }
 
-
   @ApiResponses(
       value = {
         @ApiResponse(
@@ -142,18 +136,16 @@ public class AuthApiController {
       })
   @GetMapping("/list")
   public ApiResponseDto<Page<Basic>> getUserList(
-    @Parameter(description = "관리자 이름")
+      @Parameter(description = "관리자 이름") @RequestParam(required = false) String userNm,
-    @RequestParam(required = false) String userNm,
+      @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0")
-    @Parameter(description = "페이지 번호 (0부터 시작)", example = "0")
+          int page,
-    @RequestParam(defaultValue = "0") int page,
+      @Parameter(description = "페이지 크기", example = "20") @RequestParam(defaultValue = "20")
-    @Parameter(description = "페이지 크기", example = "20")
+          int size,
-    @RequestParam(defaultValue = "20") int size,
       @Parameter(description = "정렬 조건 (형식: 필드명,방향)", example = "name,asc")
-    @RequestParam(required = false) String sort
+          @RequestParam(required = false)
-  ) {
+          String sort) {
     AuthDto.SearchReq searchReq = new AuthDto.SearchReq(userNm, page, size, sort);
     Page<AuthDto.Basic> userList = authService.getUserList(searchReq);
     return ApiResponseDto.ok(userList);
   }
-
 }

src/main/java/com/kamco/cd/kamcoback/auth/dto/AuthDto.java

@@ -26,10 +26,16 @@ public class AuthDto {
     private String userId;
     private String empId;
     private String userEmail;
-    @JsonFormatDttm
+    @JsonFormatDttm private ZonedDateTime createdDttm;
-    private ZonedDateTime createdDttm;
 
-    public Basic(Long id, String userAuth, String userNm, String userId, String empId, String userEmail, ZonedDateTime createdDttm) {
+    public Basic(
+        Long id,
+        String userAuth,
+        String userNm,
+        String userId,
+        String empId,
+        String userEmail,
+        ZonedDateTime createdDttm) {
       this.id = id;
       this.userAuth = userAuth;
       this.userNm = userNm;

src/main/java/com/kamco/cd/kamcoback/changedetection/ChangeDetectionApiController.java

@@ -7,13 +7,12 @@ import com.kamco.cd.kamcoback.config.api.ApiResponseDto;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.transaction.Transactional;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @Tag(name = "변화탐지", description = "변화탐지 API")
 @RequiredArgsConstructor
 @RestController
@@ -32,6 +31,7 @@ public class ChangeDetectionApiController {
 
   /**
    * PolygonData -> JsonNode 변환 예제
+   *
    * @return
    */
   @GetMapping("/json-data")

src/main/java/com/kamco/cd/kamcoback/changedetection/dto/ChangeDetectionDto.java

@@ -17,7 +17,8 @@ public class ChangeDetectionDto{
   public static class TestDto {
     private Long id;
     private Geometry polygon;
-    private Double centroidX;;
+    private Double centroidX;
+    ;
     private Double centroidY;
   }
 

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

@@ -27,15 +27,15 @@ public class AuthCoreService {
       new EntityNotFoundException("중복된 아이디가 있습니다. " + saveReq.getUserId());
     }
 
-    UserEntity userEntity = new UserEntity(
+    UserEntity userEntity =
+        new UserEntity(
             null,
             saveReq.getUserAuth(),
             saveReq.getUserNm(),
             saveReq.getUserId(),
             saveReq.getEmpId(),
             saveReq.getUserEmail(),
-      saveReq.getUserPw()
+            saveReq.getUserPw());
-    );
 
     return authRepository.save(userEntity);
   }
@@ -48,8 +48,8 @@ public class AuthCoreService {
    * @return
    */
   public UserEntity update(Long id, AuthDto.SaveReq saveReq) {
-    UserEntity userEntity = authRepository.findById(id)
+    UserEntity userEntity =
-      .orElseThrow(() -> new RuntimeException("유저가 존재하지 않습니다."));
+        authRepository.findById(id).orElseThrow(() -> new RuntimeException("유저가 존재하지 않습니다."));
 
     if (saveReq.getUserAuth() != null) {
       userEntity.setUserAuth(saveReq.getUserAuth());
@@ -85,8 +85,8 @@ public class AuthCoreService {
    * @return
    */
   public UserEntity withdrawal(Long id) {
-    UserEntity userEntity = authRepository.findById(id)
+    UserEntity userEntity =
-      .orElseThrow(() -> new RuntimeException("유저가 존재하지 않습니다."));
+        authRepository.findById(id).orElseThrow(() -> new RuntimeException("유저가 존재하지 않습니다."));
 
     userEntity.setId(id);
     userEntity.setDateWithdrawal(ZonedDateTime.now());
@@ -102,7 +102,10 @@ public class AuthCoreService {
    * @return
    */
   public AuthDto.Basic findUserById(Long id) {
-    UserEntity entity = authRepository.findUserById(id).orElseThrow(() -> new EntityNotFoundException("관리자를 찾을 수 없습니다. " + id));
+    UserEntity entity =
+        authRepository
+            .findUserById(id)
+            .orElseThrow(() -> new EntityNotFoundException("관리자를 찾을 수 없습니다. " + id));
     return entity.toDto();
   }
 

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());
   }

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;
-
 }

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

@@ -88,7 +88,14 @@ 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) {
+  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;
@@ -106,8 +113,6 @@ public class UserEntity {
         this.userId,
         this.empId,
         this.userEmail,
-      this.createdDttm
+        this.createdDttm);
-    );
-
   }
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/auth/AuthRepositoryImpl.java

@@ -23,7 +23,6 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom {
   private final JPAQueryFactory queryFactory;
   private final QUserEntity userEntity = QUserEntity.userEntity;
 
-
   /**
    * 유저 아이디로 조회
    *
@@ -64,24 +63,22 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom {
 
     List<Basic> content =
         queryFactory
-        .select(Projections.constructor(AuthDto.Basic.class,
+            .select(
+                Projections.constructor(
+                    AuthDto.Basic.class,
                     userEntity.id,
                     userEntity.userAuth,
                     userEntity.userNm,
                     userEntity.userId,
                     userEntity.empId,
                     userEntity.userEmail,
-          userEntity.createdDttm
+                    userEntity.createdDttm))
-        ))
             .from(userEntity)
-        .where(
+            .where(builder)
-          builder
-        )
             .orderBy(userEntity.userId.asc())
             .fetch();
 
-    long total =
+    long total = queryFactory.select(userEntity.id).from(userEntity).where(builder).fetchCount();
-      queryFactory.select(userEntity.id).from(userEntity).where(builder).fetchCount();
     return new PageImpl<>(content, pageable, total);
   }
 

src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java

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