관제 - 권한별 식별장치 목록

src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java

@@ -160,7 +160,8 @@ public class CtrCntrlService {
 		List<CtrCntrlGroupModel> list = query.findByGroupInfo();
 
 		for (CtrCntrlGroupModel group : list) {
-			List<CtrCntrlGroupArcrftModel> arcrftList = query.findByGroupArcrft(group.getGroupId());
+//			List<CtrCntrlGroupArcrftModel> arcrftList = query.findByGroupArcrft(group.getGroupId());
+			List<CtrCntrlGroupArcrftModel> arcrftList = query.findByGroupArcrft(group.getGroupId(), group.getGroupAuthCd(), cstmrSno);
 
 			group.setArcrftList(arcrftList);
 		}

src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@@ -1486,57 +1486,119 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 		Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken();
 		List<JwtGroupModel> groupAuthByToken = jwtTokenUtil.getGroupAuthByToken();
 
+		//
 		BooleanBuilder builder = new BooleanBuilder();
-		builder.and(pcg.aprvlYn.eq("Y"));
+		  builder.and(pgb.useYn.eq("Y"));
-
 		  if ("USER".equals(authId) || "ROLE_USER".equals(authId)) {
+		    builder.and(pcg.aprvlYn.eq("Y"));
 		    builder.and(pcg.cstmrSno.eq(cstmrSno));
 		  }
 		  
-		List<CtrCntrlGroupModel> models = query.select(Projections.bean(CtrCntrlGroupModel.class,
+		  List<CtrCntrlGroupModel> model = query.select(Projections.bean(CtrCntrlGroupModel.class,
 				  pcg.cstmrSno.as("cstmrSno"),
 		      pgb.groupId.as("groupId"),
 		      pgb.groupNm.as("groupNm"),
 		      pcg.groupAuthCd.as("groupAuthCd")
 		  ))
-				.from(pcg)
+		  .from(pgb)
-				.leftJoin(pgb)
+		  .leftJoin(pcg)
 		  .on(pcg.groupId.eq(pgb.groupId))
+		  .groupBy(pgb.groupId)
 		  .where(builder)
 		  .fetch();
 		  
-		return models;
+		  return model;
-	}
+		  //
 		
-	public List<CtrCntrlGroupArcrftModel> findByGroupArcrft(String groupId) {
+//		BooleanBuilder builder = new BooleanBuilder();
+//		builder.and(pcg.aprvlYn.eq("Y"));
+//
+//		if ("USER".equals(authId) || "ROLE_USER".equals(authId)) {
+//			builder.and(pcg.cstmrSno.eq(cstmrSno));
+//		}
+//
+//		List<CtrCntrlGroupModel> models = query.select(Projections.bean(CtrCntrlGroupModel.class,
+//						pcg.cstmrSno.as("cstmrSno"),
+//						pgb.groupId.as("groupId"),
+//						pgb.groupNm.as("groupNm"),
+//						pcg.groupAuthCd.as("groupAuthCd")
+//				))
+//				.from(pcg)
+//				.leftJoin(pgb)
+//				.on(pcg.groupId.eq(pgb.groupId))
+//				.where(builder)
+//				.fetch();
+//
+//		return models;
+	}
+
+	//	public List<CtrCntrlGroupArcrftModel> findByGroupArcrft(String groupId) {
+	//	public List<CtrCntrlGroupArcrftModel> findByGroupArcrft(String groupId, String groupAuthCd) {
+	public List<CtrCntrlGroupArcrftModel> findByGroupArcrft(String groupId, String groupAuthCd, int cstmrSno) {
 		QComArcrftBas arcrftBas = QComArcrftBas.comArcrftBas;
 		QComIdntfBas idntfBas = QComIdntfBas.comIdntfBas;
 
 		String userIdByToken = jwtTokenUtil.getUserIdByToken();
 
+//-------------------------------------------
+		String authId = jwtTokenUtil.getUserAuthByToken();
+		BooleanBuilder builder = new BooleanBuilder();
+//		if("ROLE_USER".equals(authId) || "USER".equals(authId)) {
+//			if("NORMAL".equals(groupAuthCd)) {
+//				builder.and(idntfBas.cstmrSno.eq(cstmrSno));
+//			}
+//		}
+		
 		  List<CtrCntrlGroupArcrftModel> arcrftList = query.select(Projections.bean(CtrCntrlGroupArcrftModel.class,
 			      arcrftBas.arcrftSno,
 			      arcrftBas.groupId,
 			      idntfBas.idntfNum,
 			      idntfBas.idntfTypeCd,
 			      idntfBas.ownerNm,
-					idntfBas.hpno,
-					arcrftBas.prdctNum,
 			      arcrftBas.arcrftTypeCd,
 			      arcrftBas.arcrftModelNm,
 			      arcrftBas.prdctCmpnNm,
 			      idntfBas.createDt,
 			      idntfBas.updateDt
+//			      idntfBas.cstmrSno
 			      ))
 			      .from(arcrftBas)
 			      .leftJoin(idntfBas)
 			      .on(arcrftBas.arcrftSno.eq(idntfBas.arcrftSno))
-				.where(arcrftBas.useYn.eq("Y")
+			      .where(arcrftBas.useYn.eq("Y"),
-						.and(idntfBas.idntfNum.isNotNull())
+			          idntfBas.idntfNum.isNotNull(),
-						.and(idntfBas.idntfNum.like("PALDRONE%")))
+			          arcrftBas.groupId.eq(groupId),
-				.orderBy(arcrftBas.groupId.asc(), idntfBas.createDt.asc())
+			          idntfBas.idntfNum.like("PALDRONE%"))
+//			      .where(builder)
 			      .fetch();
 			  
 			  return arcrftList;
+//-------------------------------------------
+
+		
+//		List<CtrCntrlGroupArcrftModel> arcrftList = query.select(Projections.bean(CtrCntrlGroupArcrftModel.class,
+//					arcrftBas.arcrftSno,
+//					arcrftBas.groupId,
+//					idntfBas.idntfNum,
+//					idntfBas.idntfTypeCd,
+//					idntfBas.ownerNm,
+//					idntfBas.hpno,
+//					arcrftBas.prdctNum,
+//					arcrftBas.arcrftTypeCd,
+//					arcrftBas.arcrftModelNm,
+//					arcrftBas.prdctCmpnNm,
+//					idntfBas.createDt,
+//					idntfBas.updateDt
+//				))
+//				.from(arcrftBas)
+//				.leftJoin(idntfBas)
+//				.on(arcrftBas.arcrftSno.eq(idntfBas.arcrftSno))
+//				.where(arcrftBas.useYn.eq("Y")
+//						.and(idntfBas.idntfNum.isNotNull())
+//						.and(idntfBas.idntfNum.like("PALDRONE%")))
+//				.orderBy(arcrftBas.groupId.asc(), idntfBas.createDt.asc())
+//				.fetch();
+//
+//		return arcrftList;
 	}
 }