Browse Source

로그 삭제 및 복호화 코드 주석처리

pull/18/head
lkd9125(이경도) 9 months ago
parent
commit
ad71102ecc
  1. 9
      pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java
  2. 21
      pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java
  3. 21
      pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

9
pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java

@ -30,9 +30,6 @@ import java.util.Map;
@Tag(name = "드론 관제 시스템", description = "드론 관제 관련 API")
public class CtrCntrlController {
@Value("${spring.profiles.active}")
private String activeProfile;
private final CtrCntrlService service;
public CtrCntrlController(CtrCntrlService service) {
@ -175,8 +172,6 @@ public class CtrCntrlController {
public ResponseEntity<? extends BasicResponse> findGroupAuthInfo(int cstmrSno) {
List<CtrCntrlGroupArcrftModel> list;
log.info("====================================================================================");
log.info("activeProfile => {}", activeProfile);
try {
list = service.getGroupAuthInfo(); // 그룹의 기체 정보 조회하는 기능
} catch (Exception e) {
@ -190,9 +185,7 @@ public class CtrCntrlController {
log.error("IGNORE : {}", e);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
.body(new ErrorResponse("Server Error", "-1"));
}
log.info("====================================================================================");
}
return ResponseEntity.ok().body(new SuccessResponse<List>(list));
}

21
pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java

@ -113,16 +113,17 @@ public class CtrCntrlService {
List<CtrCntrlHstryArea> areaList = query.detailArea(controlId);
String stAreaNm = "";
if (result.getHpno() != null && !result.getHpno().isEmpty()) {
try {
String decHpno = EncryptUtils.decrypt(result.getHpno()); // 휴대폰번호 복호화.
if (decHpno != null && !decHpno.isEmpty()) {
result.setHpno(decHpno);
}
} catch (Exception e) {
log.error("ERROR: ", e);
}
}
// TODO :: FLT_PLAN_PILOT 테이블에는 휴대폰번호가 암호화 되어있지 않음으로 주석처리
// if (result.getHpno() != null && !result.getHpno().isEmpty()) {
// try {
// String decHpno = EncryptUtils.decrypt(result.getHpno()); // 휴대폰번호 복호화.
// if (decHpno != null && !decHpno.isEmpty()) {
// result.setHpno(decHpno);
// }
// } catch (Exception e) {
// log.error("ERROR: ", e);
// }
// }
for (CtrCntrlHstryArea data : areaList) {
if (data.getActnType().equals("01")) {

21
pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@ -2030,10 +2030,6 @@ public class CtrCntrlQueryRepository{
Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken();
List<JwtGroupModel> groupAuth = jwtTokenUtil.getGroupAuthByToken();
log.info("User CstmrSno => {}", cstmrSno);
log.info("User Auth => {}", authId);
log.info("User GroupAuth => {}", groupAuth);
BooleanBuilder builder = new BooleanBuilder();
builder.and(pgb.useYn.eq("Y"));
if("ADMIN".equals(authId) || "SUPER".equals(authId)) {
@ -2069,13 +2065,7 @@ public class CtrCntrlQueryRepository{
.on(pcg.groupId.eq(pgb.groupId))
.groupBy(pgb.groupId)
.where(builder)
.fetch();
log.info("Control Query Result=> {}", model);
log.info("====================================================================================");
.fetch();
for(CtrCntrlGroupModel list : model) {
if(groupAuth != null) {
@ -2126,11 +2116,7 @@ public class CtrCntrlQueryRepository{
List<JwtGroupModel> groupAuthList = jwtTokenUtil.getGroupAuthByToken();
BooleanBuilder builder = new BooleanBuilder();
builder.and(arcrftBas.groupId.eq(groupId));
log.info("groupId => {}", groupId);
log.info("User CstmrSno => {}", cstmrSno);
log.info("User Auth => {}", appAuth);
builder.and(arcrftBas.groupId.eq(groupId));
if("USER".equals(appAuth) || "ROLE_USER".equals(appAuth)) {
for(JwtGroupModel list : groupAuthList) {
@ -2165,9 +2151,6 @@ public class CtrCntrlQueryRepository{
.where(builder)
.fetch();
log.info("Arcrft Query Result => {}", arcrftList);
return arcrftList;
//-------------------------------------------

Loading…
Cancel
Save