From 18628b6b61bcc525bbddba1b360f3d4c2cf2acc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?qkr7828=28=EB=B0=95=EC=9E=AC=EC=9A=B0=29?= Date: Fri, 16 Sep 2022 18:10:31 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=9D=B4=EB=A0=A5=20?= =?UTF-8?q?=EC=8B=9C=EC=8A=A4=ED=85=9C=20-=20=EB=B9=84=ED=96=89=EC=9D=B4?= =?UTF-8?q?=EB=A0=A5=20=ED=98=84=ED=99=A9=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20?= =?UTF-8?q?=ED=98=84=EC=9E=AC=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=95=9C=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=EA=B0=80=20=EA=B0=80=EC=9E=85=EB=90=9C=20?= =?UTF-8?q?=EA=B7=B8=EB=A3=B9=EB=A7=8C=20=EC=A1=B0=ED=9A=8C=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/anls/hstry/model/AnlsHstryModel.java | 2 ++ .../anls/hstry/service/AnlsHstryService.java | 30 +++++++++++++++++-- .../ctr/CtrCntrlQueryRepository.java | 9 +++++- .../pty/PtyCstmrGroupRepository.java | 11 +++++-- 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java b/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java index 2c2bc80..59df079 100644 --- a/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java +++ b/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java @@ -72,6 +72,8 @@ public class AnlsHstryModel{ private String endArea = ""; + private String groupId = ""; + private Date createDt; private Date updateDt; diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java index d70aa83..64e44e9 100644 --- a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java +++ b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java @@ -1,5 +1,6 @@ package com.palnet.biz.api.anls.hstry.service; +import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -9,12 +10,16 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel; +import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; import com.palnet.biz.jpa.entity.CtrCntrlBas; +import com.palnet.biz.jpa.entity.PtyCstmrGroup; import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository; import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyCstmrGroupRepository; import com.palnet.comn.code.ErrorCode; import com.palnet.comn.exception.CustomException; @@ -27,13 +32,34 @@ public class AnlsHstryService { private CtrCntrlBasRepository ctrCntrlBasRepository; @Autowired - private CtrCntrlQueryRepository query; + private PtyCstmrGroupRepository ptyCstmrGroupRepository; + @Autowired + private CtrCntrlQueryRepository query; + @Autowired + private JwtTokenUtil jwtTokenUtil; public List list(AnlsHstryRqModel rq){ + List group = jwtTokenUtil.getGroupAuthByToken(); + int cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); + List dbGroupList = new ArrayList<>(); + for(JwtGroupModel list : group) { + dbGroupList.addAll(ptyCstmrGroupRepository.findGroupId(list.getGroupId(), cstmrSno)); + } + for(PtyCstmrGroup asd : dbGroupList) { + System.out.println(" >>>>> " + asd.getGroupId()); + } + List returnList = query.listCntrlBas(rq); + List resultList = new ArrayList<>(); - List resultList = query.listCntrlBas(rq); + for(AnlsHstryModel model : returnList) { + for(PtyCstmrGroup groupIdList : dbGroupList) { + if(model.getGroupId().equals(groupIdList.getGroupId())) { + resultList.add(model); + } + } + } return resultList; } diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index d933d8b..f7f82c4 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -48,6 +48,8 @@ public class CtrCntrlQueryRepository{ QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; + QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas; + QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas; BooleanBuilder builder = new BooleanBuilder(); @@ -91,12 +93,17 @@ public class CtrCntrlQueryRepository{ qCntrlHstryAreaEntity.areaType, qCntrlHstryAreaEntity.landNm, qCntrlHstryAreaEntity.landNum, - qCntrlHstryAreaEntity.zipCd + qCntrlHstryAreaEntity.zipCd, + qComArcrftBasEntity.groupId )) .from(qCntrlBasEntity) .leftJoin(qCntrlHstryAreaEntity) .on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) .on(qCntrlHstryAreaEntity.actnType.eq("01")) + .leftJoin(qComIdntfBasEntity) + .on(qCntrlBasEntity.idntfNum.eq(qComIdntfBasEntity.idntfNum)) + .leftJoin(qComArcrftBasEntity) + .on(qComIdntfBasEntity.arcrftSno.eq(qComArcrftBasEntity.arcrftSno)) .where(builder) .orderBy(qCntrlBasEntity.cntrlStDt.desc()) .fetch(); diff --git a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java index 2a54188..9fd2f20 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/pty/PtyCstmrGroupRepository.java @@ -1,13 +1,20 @@ package com.palnet.biz.jpa.repository.pty; +import java.util.List; + import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import com.palnet.biz.jpa.entity.CtrCntrlBas; import com.palnet.biz.jpa.entity.PtyCstmrGroup; -import com.palnet.biz.jpa.entity.PtyTermsBas; @Repository public interface PtyCstmrGroupRepository extends JpaRepository{ + @Query("select p from PtyCstmrGroup p " + + "where p.joinYn = 'Y' " + + "and p.groupId = :groupId " + + "and p.cstmrSno = :cstmrSno") + List findGroupId(@Param("groupId") String groupId, @Param("cstmrSno") int cstmrSno); }