pav
/
pav-server
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

auth 명칭 수정

feature/auth
junh_eee(이준희) 2 years ago
parent
ae50d78e7d
commit
8b7976dec0
7 changed files with 25 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java
  2. 6
      src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
  3. 2
      src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java
  4. 3
      src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java
  5. 6
      src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
  6. 6
      src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
  7. 12
      src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java

3
src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java
Unescape View File

@ -277,7 +277,8 @@ public class AcntCstmrService {
List<JwtGroupModel> groupInfo = jwtTokenUtil.getGroupAuthByToken();
for(JwtGroupModel group : groupInfo) {
if(group.getGroupAuthCd().equals("CREATER")) {
// if(group.getGroupAuthCd().equals("CREATER")) {
if(group.getGroupAuthCd().equals("MASTER")) {
PtyGroupBas groupEntity = ptyGroupBasRepository.findByGroupId(group.getGroupId());
if(!(groupEntity == null)) {
groupEntity.setUseYn("N");

6
src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
Unescape View File

@ -93,10 +93,12 @@ public class BasFlightService {
for(BasGroupJoinModel list : groupList) {
if(list.getGroupId().equals(rq.getGroupId())) {
userAccount = list.getGroupAuthCd();
if(userAccount.equals("CREATER")||userAccount.equals("ADMIN")) {
// if(userAccount.equals("CREATER")||userAccount.equals("ADMIN")) {
if(userAccount.equals("MASTER")||userAccount.equals("LEADER")) {
masterAccount = userAccount;
}else {
masterAccount = "USER";
// masterAccount = "USER";
masterAccount = "NORMAL";
}
}
}

2
src/main/java/com/palnet/biz/api/bas/group/service/BasGroupJoinService.java
Unescape View File

@ -65,7 +65,7 @@ public class BasGroupJoinService {
//참여 정보 입력 하기
PtyCstmrGroup entity2 = new PtyCstmrGroup();
entity2.setGroupId(rq.getGroupId());
entity2.setGroupAuthCd(rq.getGroupAuthCd()); //생성한 사람은 최고 권한 부여 (CREATER , ADMIN , USER) 로 구분 하여 사용
entity2.setGroupAuthCd(rq.getGroupAuthCd()); //생성한 사람은 최고 권한 부여 (MASTER , LEADER, NORMAL) 로 구분 하여 사용
entity2.setCstmrSno(rq.getCstmrSno());
entity2.setJoinYn("Y");
entity2.setJoinDt(DateUtils.nowDate());

3
src/main/java/com/palnet/biz/api/bas/group/service/BasGroupService.java
Unescape View File

@ -149,7 +149,8 @@ public class BasGroupService {
//참여 정보 입력 하기
PtyCstmrGroup entity2 = new PtyCstmrGroup();
entity2.setGroupId(rq.getGroupId());
entity2.setGroupAuthCd("CREATER"); //생성한 사람은 최고 권한 부여 (CREATER , ADMIN , USER) 로 구분 하여 사용
// entity2.setGroupAuthCd("CREATER"); //생성한 사람은 최고 권한 부여 (CREATER , ADMIN , USER) 로 구분 하여 사용
entity2.setGroupAuthCd("MASTER"); //생성한 사람은 최고 권한 부여 (MASTER , LEADER, NORMAL) 로 구분 하여 사용
entity2.setAprvlYn("Y"); //자동 승인 처리 함
entity2.setAprvlDt(DateUtils.nowDate());
entity2.setCstmrSno(rq.getCstmrSno());

6
src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
Unescape View File

@ -155,7 +155,8 @@ public class CtrCntrlQueryRepository{
builder.and(qCntrlBasEntity.statusCd.eq("99"));
log.debug("Params ===> " +rq.toString());
if(userAccount.equals("USER")) {
// if(userAccount.equals("USER")) {
if(userAccount.equals("NORMAL")) {
builder.and(qFltPlanBasEntity.cstmrSno.eq(cstmrSno));
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId()));
} else {
@ -205,7 +206,8 @@ public class CtrCntrlQueryRepository{
builder.and(qCntrlBasEntity.statusCd.eq("99"));
log.debug("Params ===> " +rq.toString());
if(userAccount.equals("USER")) {
// if(userAccount.equals("USER")) {
if(userAccount.equals("NORMAL")) {
builder.and(qFltPlanBasEntity.cstmrSno.eq(cstmrSno));
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId()));
} else {

6
src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
Unescape View File

@ -38,7 +38,8 @@ public class FltPlanQueryRepository {
}
if (rq.getCstmrSno() != null) {
if(masterAccount.equals("USER")) {
// if(masterAccount.equals("USER")) {
if(masterAccount.equals("NORMAL")) {
builder.and(bas.cstmrSno.eq(rq.getCstmrSno()));
}
}
@ -292,7 +293,8 @@ public class FltPlanQueryRepository {
QFltPlanArea area = QFltPlanArea.fltPlanArea;
BooleanBuilder builder = new BooleanBuilder();
if (userAccount.equals("CREATER") || userAccount.equals("ADMIN")) {
// if (userAccount.equals("CREATER") || userAccount.equals("ADMIN")) {
if (userAccount.equals("MASTER") || userAccount.equals("LEADER")) {
builder.and(bas.groupId.in(rq.getGroupId()));
} else {
builder.and(bas.groupId.in(rq.getGroupId()));

12
src/main/java/com/palnet/biz/jpa/repository/pty/PtyGroupQueryRepository.java
Unescape View File

@ -74,7 +74,8 @@ public class PtyGroupQueryRepository{
BooleanBuilder builder = new BooleanBuilder();
builder.and(bas.useYn.eq("Y"));
builder.and(dtl.cstmrSno.eq(cstmrSno));
builder.and(dtl.groupAuthCd.eq("CREATER"));
// builder.and(dtl.groupAuthCd.eq("CREATER"));
builder.and(dtl.groupAuthCd.eq("MASTER"));
List<BasGroupModel> result =
@ -244,11 +245,13 @@ public class PtyGroupQueryRepository{
.on(bas.groupId.eq(dtl.groupId))
.where(bas.useYn.eq("Y"))
.where(dtl.cstmrSno.eq(rq.getCstmrSno()))
.where(dtl.groupAuthCd.eq("CREATER").or(dtl.groupAuthCd.eq("ADMIN")))
// .where(dtl.groupAuthCd.eq("CREATER").or(dtl.groupAuthCd.eq("ADMIN")))
.where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER")))
))
.where(dtl.cstmrSno.ne(rq.getCstmrSno()))
.where(dtl.groupAuthCd.ne("CREATER"))
// .where(dtl.groupAuthCd.ne("CREATER"))
.where(dtl.groupAuthCd.ne("MASTER"))
.orderBy(bas.createDt.desc())
.fetch();
@ -359,7 +362,8 @@ public class PtyGroupQueryRepository{
.on(bas.groupId.eq(dtl.groupId))
.where(bas.useYn.eq("Y"))
.where(dtl.cstmrSno.eq(rq.getCstmrSno()))
.where(dtl.groupAuthCd.eq("CREATER").or(dtl.groupAuthCd.eq("ADMIN")))
// .where(dtl.groupAuthCd.eq("CREATER").or(dtl.groupAuthCd.eq("ADMIN")))
.where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER")))
))
.where(dtl.cstmrSno.ne(rq.getCstmrSno()))

Write Preview
Loading…
Cancel
Save