비행 이력 시스템 - 비행이력 현황 조회시 현재 로그인한 유저가 가입된 그룹만 조회되도록 변경

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;

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<AnlsHstryModel> list(AnlsHstryRqModel rq){
+		List<JwtGroupModel> group = jwtTokenUtil.getGroupAuthByToken();
+		int cstmrSno = jwtTokenUtil.getCstmrSnoByToken();
+		List<PtyCstmrGroup> dbGroupList = new ArrayList<>();
+		for(JwtGroupModel list : group) {
+			dbGroupList.addAll(ptyCstmrGroupRepository.findGroupId(list.getGroupId(), cstmrSno));
+		}
+		for(PtyCstmrGroup asd : dbGroupList) {
+			System.out.println(" >>>>>  " + asd.getGroupId());
+		}
+		List<AnlsHstryModel> returnList = query.listCntrlBas(rq);
+		List<AnlsHstryModel> resultList = new ArrayList<>();
 		
-		List<AnlsHstryModel> resultList = query.listCntrlBas(rq);
+		for(AnlsHstryModel model : returnList) {
+			for(PtyCstmrGroup groupIdList : dbGroupList) {
+				if(model.getGroupId().equals(groupIdList.getGroupId())) {
+				resultList.add(model);
+				}
+			}
+		}
 		
 		return resultList;
 	}

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

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<PtyCstmrGroup, Integer>{
 	
+    @Query("select p from PtyCstmrGroup p " +
+    		"where p.joinYn = 'Y' " +
+    		"and p.groupId = :groupId " +
+    		"and p.cstmrSno = :cstmrSno")
+    List<PtyCstmrGroup> findGroupId(@Param("groupId") String groupId, @Param("cstmrSno") int cstmrSno);
 }