MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

관리자 관리 추가, 수정

Browse Source
This commit is contained in:
teddy
2025-11-27 16:59:09 +09:00
parent bb344fa56f
commit 1fb74a53c7
11 changed files with 204 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
src/main/java/com/kamco/cd/kamcoback/auth/AuthApiController.java
View File

@@ -33,127 +33,119 @@ public class AuthApiController {
@Operation(summary = "관리자 등록", description = "관리자를 등록 합니다.") @Operation(summary = "관리자 등록", description = "관리자를 등록 합니다.")
@ApiResponses( @ApiResponses(
value = { value = {
@ApiResponse( @ApiResponse(
responseCode = "201", responseCode = "201",
description = "관리자 등록 성공", description = "관리자 등록 성공",
content = content =
@Content( @Content(
mediaType = "application/json", mediaType = "application/json",
schema = @Schema(implementation = Long.class))), schema = @Schema(implementation = Long.class))),
@ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content), @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
@ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content), @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
@ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
}) })
@PostMapping("/save") @PostMapping("/save")
public ApiResponseDto<Long> save( public ApiResponseDto<Long> save(
@io.swagger.v3.oas.annotations.parameters.RequestBody( @io.swagger.v3.oas.annotations.parameters.RequestBody(
description = "관리자 정보", description = "관리자 정보",
required = true, required = true,
content = content =
@Content( @Content(
mediaType = "application/json", mediaType = "application/json",
schema = @Schema(implementation = AuthDto.SaveReq.class))) schema = @Schema(implementation = AuthDto.SaveReq.class)))
@RequestBody @RequestBody
@Valid @Valid
AuthDto.SaveReq saveReq) { AuthDto.SaveReq saveReq) {
return ApiResponseDto.createOK(authService.save(saveReq).getId()); return ApiResponseDto.createOK(authService.save(saveReq).getId());
} }
@Operation(summary = "관리자 정보 수정", description = "관리자 정보를 수정 합니다.") @Operation(summary = "관리자 정보 수정", description = "관리자 정보를 수정 합니다.")
@ApiResponses( @ApiResponses(
value = { value = {
@ApiResponse( @ApiResponse(
responseCode = "201", responseCode = "201",
description = "관리자 정보 수정 성공", description = "관리자 정보 수정 성공",
content = content =
@Content( @Content(
mediaType = "application/json", mediaType = "application/json",
schema = @Schema(implementation = Long.class))), schema = @Schema(implementation = Long.class))),
@ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content), @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
@ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content), @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
@ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
}) })
@PutMapping("/update/{id}") @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()); return ApiResponseDto.createOK(authService.update(id, saveReq).getId());
} }
@Operation(summary = "관리자 정보 탈퇴처리", description = "관리자 정보를 탈퇴처리 합니다.") @Operation(summary = "관리자 정보 탈퇴처리", description = "관리자 정보를 탈퇴처리 합니다.")
@ApiResponses( @ApiResponses(
value = { value = {
@ApiResponse( @ApiResponse(
responseCode = "201", responseCode = "201",
description = "관리자 탈퇴처리 성공", description = "관리자 탈퇴처리 성공",
content = content =
@Content( @Content(
mediaType = "application/json", mediaType = "application/json",
schema = @Schema(implementation = Long.class))), schema = @Schema(implementation = Long.class))),
@ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content), @ApiResponse(responseCode = "400", description = "잘못된 요청 데이터", content = @Content),
@ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content), @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
@ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
}) })
@PutMapping("/withdrawal/{id}") @PutMapping("/withdrawal/{id}")
public ApiResponseDto<Long> withdrawal(@PathVariable Long id) { public ApiResponseDto<Long> withdrawal(@PathVariable Long id) {
return ApiResponseDto.deleteOk(authService.withdrawal(id).getId()); return ApiResponseDto.deleteOk(authService.withdrawal(id).getId());
} }
@ApiResponses( @ApiResponses(
value = { value = {
@ApiResponse( @ApiResponse(
responseCode = "200", responseCode = "200",
description = "조회 성공", description = "조회 성공",
content = content =
@Content( @Content(
mediaType = "application/json", mediaType = "application/json",
schema = @Schema(implementation = AuthDto.Basic.class))), schema = @Schema(implementation = AuthDto.Basic.class))),
@ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content), @ApiResponse(responseCode = "404", description = "코드를 찾을 수 없음", content = @Content),
@ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
}) })
@Operation(summary = "관리자 상세조회", description = "관리자 정보를 조회 합니다.") @Operation(summary = "관리자 상세조회", description = "관리자 정보를 조회 합니다.")
@GetMapping("/detail") @GetMapping("/detail")
public ApiResponseDto<AuthDto.Basic> getDetail( public ApiResponseDto<AuthDto.Basic> getDetail(
@io.swagger.v3.oas.annotations.parameters.RequestBody( @io.swagger.v3.oas.annotations.parameters.RequestBody(
description = "관리자 목록 id", description = "관리자 목록 id",
required = true) required = true)
@RequestParam @RequestParam
Long id) { Long id) {
return ApiResponseDto.ok(authService.getFindUserById(id)); return ApiResponseDto.ok(authService.getFindUserById(id));
} }
@Operation(summary = "관리자 목록", description = "관리자 목록 조회") @Operation(summary = "관리자 목록", description = "관리자 목록 조회")
@ApiResponses( @ApiResponses(
value = { value = {
@ApiResponse( @ApiResponse(
responseCode = "200", responseCode = "200",
description = "검색 성공", description = "검색 성공",
content = content =
@Content( @Content(
mediaType = "application/json", mediaType = "application/json",
schema = @Schema(implementation = Page.class))), schema = @Schema(implementation = Page.class))),
@ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content), @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content),
@ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
}) })
@GetMapping("/list") @GetMapping("/list")
public ApiResponseDto<Page<Basic>> getUserList( 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")
@Parameter(description = "정렬 조건 (형식: 필드명,방향)", example = "name,asc") @RequestParam(required = false)
@RequestParam(required = false) String sort String sort) {
) {
AuthDto.SearchReq searchReq = new AuthDto.SearchReq(userNm, page, size, sort); AuthDto.SearchReq searchReq = new AuthDto.SearchReq(userNm, page, size, sort);
Page<AuthDto.Basic> userList = authService.getUserList(searchReq); Page<AuthDto.Basic> userList = authService.getUserList(searchReq);
return ApiResponseDto.ok(userList); return ApiResponseDto.ok(userList);
} }
} }

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

@@ -26,10 +26,16 @@ public class AuthDto {
private String userId; private String userId;
private String empId; private String empId;
private String userEmail; 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.id = id;
this.userAuth = userAuth; this.userAuth = userAuth;
this.userNm = userNm; this.userNm = userNm;
@@ -70,12 +76,12 @@ public class AuthDto {
private String userEmail; private String userEmail;
public SaveReq( public SaveReq(
String userAuth, String userAuth,
String userNm, String userNm,
String userId, String userId,
String userPw, String userPw,
String empId, String empId,
String userEmail) { String userEmail) {
this.userAuth = userAuth; this.userAuth = userAuth;
this.userNm = userNm; this.userNm = userNm;
this.userId = userId; this.userId = userId;
@@ -119,13 +125,13 @@ public class AuthDto {
private String userEmail; private String userEmail;
public UpdateReq( public UpdateReq(
Long id, Long id,
String userAuth, String userAuth,
String userNm, String userNm,
String userId, String userId,
String userPw, String userPw,
String empId, String empId,
String userEmail) { String userEmail) {
this.id = id; this.id = id;
this.userAuth = userAuth; this.userAuth = userAuth;
this.userNm = userNm; this.userNm = userNm;
@@ -163,7 +169,7 @@ public class AuthDto {
String[] sortParams = sort.split(","); String[] sortParams = sort.split(",");
String property = sortParams[0]; String property = sortParams[0];
Sort.Direction direction = Sort.Direction direction =
sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC; sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
return PageRequest.of(page, size, Sort.by(direction, property)); return PageRequest.of(page, size, Sort.by(direction, property));
} }
return PageRequest.of(page, size); return PageRequest.of(page, size);

6
src/main/java/com/kamco/cd/kamcoback/changedetection/ChangeDetectionApiController.java
View File

@@ -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.Hidden;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Tag(name = "변화탐지", description = "변화탐지 API") @Tag(name = "변화탐지", description = "변화탐지 API")
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@@ -32,10 +31,11 @@ public class ChangeDetectionApiController {
/** /**
* PolygonData -> JsonNode 변환 예제 * PolygonData -> JsonNode 변환 예제
*
* @return * @return
*/ */
@GetMapping("/json-data") @GetMapping("/json-data")
public ApiResponseDto<List<JsonNode>> getPolygonToJson(){ public ApiResponseDto<List<JsonNode>> getPolygonToJson() {
return ApiResponseDto.ok(changeDetectionService.getPolygonToJson()); return ApiResponseDto.ok(changeDetectionService.getPolygonToJson());
} }
} }

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

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.Geometry;
public class ChangeDetectionDto{ public class ChangeDetectionDto {
@Schema(name = "TestDto", description = "테스트용") @Schema(name = "TestDto", description = "테스트용")
@Getter @Getter
@@ -17,7 +17,8 @@ public class ChangeDetectionDto{
public static class TestDto { public static class TestDto {
private Long id; private Long id;
private Geometry polygon; private Geometry polygon;
private Double centroidX;; private Double centroidX;
;
private Double centroidY; private Double centroidY;
} }
@@ -26,12 +27,12 @@ public class ChangeDetectionDto{
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public static class PointGeometry{ public static class PointGeometry {
private Long geoUid; private Long geoUid;
private String type; // "Point" private String type; // "Point"
private Geometry coordinates; //Point 값 private Geometry coordinates; // Point 값
private String before_class; //기준 분류 private String before_class; // 기준 분류
private String after_class; //비교 분류 private String after_class; // 비교 분류
} }
@Schema(name = "PolygonGeometry", description = "폴리곤 리턴 객체") @Schema(name = "PolygonGeometry", description = "폴리곤 리턴 객체")
@@ -39,12 +40,12 @@ public class ChangeDetectionDto{
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public static class PolygonGeometry{ public static class PolygonGeometry {
private Long geoUid; private Long geoUid;
private String type; // "MultiPolygon" private String type; // "MultiPolygon"
private Geometry coordinates; //Polygon 값 private Geometry coordinates; // Polygon 값
private Double center_latitude; //폴리곤 중심 위도 private Double center_latitude; // 폴리곤 중심 위도
private Double center_longitude; //폴리곤 중심 경도 private Double center_longitude; // 폴리곤 중심 경도
} }
@Schema(name = "CogURL", description = "COG URL") @Schema(name = "CogURL", description = "COG URL")
@@ -52,9 +53,9 @@ public class ChangeDetectionDto{
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public static class CogURL{ public static class CogURL {
private String before_cog_url; //기준 COG URL private String before_cog_url; // 기준 COG URL
private String after_cog_url; //비교 COG URL private String after_cog_url; // 비교 COG URL
} }
@Schema(name = "PolygonProperties", description = "폴리곤 정보") @Schema(name = "PolygonProperties", description = "폴리곤 정보")
@@ -62,13 +63,13 @@ public class ChangeDetectionDto{
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public static class PolygonProperties{ public static class PolygonProperties {
private Double area; //면적 private Double area; // 면적
private String before_year; //기준년도 private String before_year; // 기준년도
private Double before_confidence; //기준 신뢰도(확률) private Double before_confidence; // 기준 신뢰도(확률)
private String before_class; //기준 분류 private String before_class; // 기준 분류
private String after_year; //비교년도 private String after_year; // 비교년도
private Double after_confidence; //비교 신뢰도(확률) private Double after_confidence; // 비교 신뢰도(확률)
private String after_class; //비교 분류 private String after_class; // 비교 분류
} }
} }

2
src/main/java/com/kamco/cd/kamcoback/changedetection/service/ChangeDetectionService.java
View File

@@ -17,7 +17,7 @@ public class ChangeDetectionService {
return changeDetectionCoreService.getPolygonToPoint(); return changeDetectionCoreService.getPolygonToPoint();
} }
public List<JsonNode> getPolygonToJson(){ public List<JsonNode> getPolygonToJson() {
return changeDetectionCoreService.getPolygonToJson(); return changeDetectionCoreService.getPolygonToJson();
} }
} }

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

@@ -27,15 +27,15 @@ public class AuthCoreService {
new EntityNotFoundException("중복된 아이디가 있습니다. " + saveReq.getUserId()); new EntityNotFoundException("중복된 아이디가 있습니다. " + saveReq.getUserId());
} }
UserEntity userEntity = new UserEntity( UserEntity userEntity =
null, new UserEntity(
saveReq.getUserAuth(), null,
saveReq.getUserNm(), saveReq.getUserAuth(),
saveReq.getUserId(), saveReq.getUserNm(),
saveReq.getEmpId(), saveReq.getUserId(),
saveReq.getUserEmail(), saveReq.getEmpId(),
saveReq.getUserPw() saveReq.getUserEmail(),
); saveReq.getUserPw());
return authRepository.save(userEntity); return authRepository.save(userEntity);
} }
@@ -48,8 +48,8 @@ public class AuthCoreService {
* @return * @return
*/ */
public UserEntity update(Long id, AuthDto.SaveReq saveReq) { 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) { if (saveReq.getUserAuth() != null) {
userEntity.setUserAuth(saveReq.getUserAuth()); userEntity.setUserAuth(saveReq.getUserAuth());
@@ -85,8 +85,8 @@ public class AuthCoreService {
* @return * @return
*/ */
public UserEntity withdrawal(Long id) { 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.setId(id);
userEntity.setDateWithdrawal(ZonedDateTime.now()); userEntity.setDateWithdrawal(ZonedDateTime.now());
@@ -102,7 +102,10 @@ public class AuthCoreService {
* @return * @return
*/ */
public AuthDto.Basic findUserById(Long id) { 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(); return entity.toDto();
} }

21
src/main/java/com/kamco/cd/kamcoback/postgres/core/ChangeDetectionCoreService.java
View File

@@ -29,7 +29,8 @@ public class ChangeDetectionCoreService {
// 중심 좌표 계산 // 중심 좌표 계산
Point centroid = polygon.getCentroid(); 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()); .collect(Collectors.toList());
} }
@@ -39,14 +40,14 @@ public class ChangeDetectionCoreService {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
return list.stream() return list.stream()
.map( .map(
s -> { s -> {
try { try {
return mapper.readTree(s); return mapper.readTree(s);
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
} }

4
src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataEntity.java
View File

@@ -10,12 +10,9 @@ import jakarta.persistence.Table;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.Map;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.type.SqlTypes;
@Getter @Getter
@Setter @Setter
@@ -149,5 +146,4 @@ public class MapSheetAnalDataEntity {
@Column(name = "ref_map_sheet_num") @Column(name = "ref_map_sheet_num")
private Long refMapSheetNum; private Long refMapSheetNum;
} }

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

@@ -23,16 +23,16 @@ import org.hibernate.annotations.ColumnDefault;
@Entity @Entity
@NoArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table( @Table(
name = "tb_user", name = "tb_user",
uniqueConstraints = {@UniqueConstraint(name = "ux_tb_user_user_id", columnNames = "user_id")}) uniqueConstraints = {@UniqueConstraint(name = "ux_tb_user_user_id", columnNames = "user_id")})
public class UserEntity { public class UserEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tb_user_id_gen") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tb_user_id_gen")
@SequenceGenerator( @SequenceGenerator(
name = "tb_user_id_gen", name = "tb_user_id_gen",
sequenceName = "tb_user_user_uid_seq", sequenceName = "tb_user_user_uid_seq",
allocationSize = 1) allocationSize = 1)
@Column(name = "user_uid", nullable = false) @Column(name = "user_uid", nullable = false)
private Long id; private Long id;
@@ -88,7 +88,14 @@ public class UserEntity {
@Column(name = "emp_id", nullable = false) @Column(name = "emp_id", nullable = false)
private String empId; 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.id = id;
this.userAuth = userAuth; this.userAuth = userAuth;
this.userNm = userNm; this.userNm = userNm;
@@ -100,14 +107,12 @@ public class UserEntity {
public AuthDto.Basic toDto() { public AuthDto.Basic toDto() {
return new AuthDto.Basic( return new AuthDto.Basic(
this.id, this.id,
this.userAuth, this.userAuth,
this.userNm, this.userNm,
this.userId, this.userId,
this.empId, this.empId,
this.userEmail, this.userEmail,
this.createdDttm this.createdDttm);
);
} }
} }

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

@@ -23,7 +23,6 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom {
private final JPAQueryFactory queryFactory; private final JPAQueryFactory queryFactory;
private final QUserEntity userEntity = QUserEntity.userEntity; private final QUserEntity userEntity = QUserEntity.userEntity;
/** /**
* 유저 아이디로 조회 * 유저 아이디로 조회
* *
@@ -33,7 +32,7 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom {
@Override @Override
public Optional<UserEntity> findByUserId(String userId) { public Optional<UserEntity> findByUserId(String userId) {
return Optional.ofNullable( return Optional.ofNullable(
queryFactory.selectFrom(userEntity).where(userEntity.userId.eq(userId)).fetchOne()); queryFactory.selectFrom(userEntity).where(userEntity.userId.eq(userId)).fetchOne());
} }
/** /**
@@ -45,7 +44,7 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom {
@Override @Override
public Optional<UserEntity> findUserById(Long id) { public Optional<UserEntity> findUserById(Long id) {
return Optional.ofNullable( return Optional.ofNullable(
queryFactory.selectFrom(userEntity).where(userEntity.id.eq(id)).fetchOne()); queryFactory.selectFrom(userEntity).where(userEntity.id.eq(id)).fetchOne());
} }
/** /**
@@ -63,25 +62,23 @@ public class AuthRepositoryImpl implements AuthRepositoryCustom {
} }
List<Basic> content = List<Basic> content =
queryFactory queryFactory
.select(Projections.constructor(AuthDto.Basic.class, .select(
userEntity.id, Projections.constructor(
userEntity.userAuth, AuthDto.Basic.class,
userEntity.userNm, userEntity.id,
userEntity.userId, userEntity.userAuth,
userEntity.empId, userEntity.userNm,
userEntity.userEmail, userEntity.userId,
userEntity.createdDttm userEntity.empId,
)) userEntity.userEmail,
.from(userEntity) userEntity.createdDttm))
.where( .from(userEntity)
builder .where(builder)
) .orderBy(userEntity.userId.asc())
.orderBy(userEntity.userId.asc()) .fetch();
.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); return new PageImpl<>(content, pageable, total);
} }

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

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