Merge branch 'tolag'

src/main/java/kcc/com/cmm/util/MagicDBAPIUtil.java

@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
 import com.dsmdb.japi.MagicDBAPI;
 
 import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastVO;
+import kcc.let.uat.uia.web.SsoAgentInfo;
 
 public final class MagicDBAPIUtil {
 
@@ -34,7 +35,12 @@ public final class MagicDBAPIUtil {
 	}
 	
 	public static String encryptOnlyOneString(String stringVal) {
-		return MagicDBAPI.encrypt(POLICY_NAME, stringVal);
+		
+		SsoAgentInfo ssoagentinfo = new SsoAgentInfo();
+		if(!"local".equals(ssoagentinfo.getIslocal())) {
+			stringVal = MagicDBAPI.encrypt(POLICY_NAME, stringVal);
+		}
+		return stringVal;
 //		return stringVal;
 	}
 	

src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java

@@ -1028,25 +1028,32 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		List<AdjReqMgrPastVO> adjReqMgrPastList = adjReqMgrPastDAO.selectAdjReqMgrPastList(adjReqMgrPastVO); 
 		
 		// 신청인 피신청인 select
-		adjReqMgrPastList.stream()
+//		adjReqMgrPastList.stream()
-						.forEach(t-> t.setAdjReqMgrVoList(adjReqMgrPastDAO.selectRpplList(t)));
+//						.forEach(t-> t.setAdjReqMgrVoList(adjReqMgrPastDAO.selectRpplList(t)));
 		
+		try {
+			// 신청인 피신청인 select
+			adjReqMgrPastList.stream()
+							.forEach(t-> {
+								t.setAdjReqMgrVoList(adjReqMgrPastDAO.selectRpplList(t));
+								/* 
+								 * 조정결과 상태값 select
+								 * code -> text 변환 
+								 * */
+								if(StringUtils.isNotEmpty(t.getStatCd())) {
+									t.setStatTx(HstryStatEnumVO.getStatCdSwitching(t.getStatCd()));
+								}
+								// 리스트에서 피신청인 갯수 count
+								t.setpRpplCnt(t.getAdjReqMgrVoList().stream()
+										  .filter(c ->  "20".equals(c.getRpplTy()))
+										  .count());
 								
 								/* 
 								 * 조정결과 상태값 select
 								 * code -> text 변환 
 								 * */
-		adjReqMgrPastList.stream()
+								if(StringUtils.isNotEmpty(t.getAssPstUsrNm()))
-						.forEach(t-> {
+									t.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(t.getAssPstUsrNm()));
-							if(StringUtils.isNotEmpty(t.getStatCd()))
-								t.setStatTx(HstryStatEnumVO.getStatCdSwitching(t.getStatCd()));
-						});
-
-		// 리스트에서 피신청인 갯수 count
-		adjReqMgrPastList.stream().forEach(t-> {
-			t.setpRpplCnt(t.getAdjReqMgrVoList().stream()
-					  .filter(c ->  "20".equals(c.getRpplTy()))
-					  .count());
 							});
 			
 			// 외 N명 로직
@@ -1063,11 +1070,8 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 						PrpplNm =  adjRppl.getRpplNm();
 						break;
 					}
-			}
 					// 신청인 이름 추출
-			for(AdjReqMgrPastVO adjRppl : adjRpplVO.getAdjReqMgrVoList()) 
+					else if("10".equals(adjRppl.getRpplTy()))
-			{
-				if("10".equals(adjRppl.getRpplTy()))
 					{
 						adjRpplVO.setRpplNm(egovCryptoUtil.decrypt(adjRppl.getRpplNm()));
 						break;
@@ -1082,17 +1086,6 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 				adjRpplVO.setPrpplNm(egovCryptoUtil.decrypt(PrpplNm) + etcStr);
 			}
 			
-
-		/* 
-		 * 조정결과 상태값 select
-		 * code -> text 변환 
-		 * */
-		try {
-			adjReqMgrPastList.stream()
-			.forEach(t-> {
-				if(StringUtils.isNotEmpty(t.getAssPstUsrNm()))
-					t.setAssPstUsrNm(MagicDBAPIUtil.decryptOnlyOneString(t.getAssPstUsrNm()));
-			});
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/kcc/let/uat/uia/web/SsoAgentInfo.java

@@ -16,6 +16,10 @@ public class SsoAgentInfo {
   
     private static String scope;
 
+    private static String islocal;
+    
+    
+    
 	@Value("#{globalSettings['Globals.sso.ssoUri']}")
 	public void setSsoUri(String ssoUri) {
 		SsoAgentInfo.ssoUri = ssoUri;
@@ -32,6 +36,10 @@ public class SsoAgentInfo {
 	public void setScope(String scope) {
 		SsoAgentInfo.scope = scope;
 	}
+	@Value("#{globalSettings['Globals.prod.islocal']}")
+	public void setIslocal(String islocal) {
+		SsoAgentInfo.islocal = islocal;
+	}
 	public String getSsoUri() {
 		return ssoUri;
 	}
@@ -44,5 +52,8 @@ public class SsoAgentInfo {
 	public String getScope() {
 		return scope;
 	}
+	public String getIslocal() {
+		return islocal;
+	}
 
 }