Commit @dd225ab65a17dec13ae27b570dde1975408c74b2

rosewiper 2024-02-08

Merge branch 'master' into kakaoFT

@dd225ab65a17dec13ae27b570dde1975408c74b2

713d22e

dd225ab

src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java

--- src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java

+++ src/main/java/itn/let/mjo/block/service/impl/MjonBlockDAO.java


 	}
 	
 	@SuppressWarnings("unchecked")
+	public List<String> selectBlockPhoneList(MjonBlockVO blockVO) throws Exception{
+		return (List<String>)list("MjonBlockDAO.selectBlockPhoneList", blockVO);
+	}
+	
+	@SuppressWarnings("unchecked")
 	public List<MjonBlockVO> selectAdmBlockList(MjonBlockVO blockVO) throws Exception{
 		return (List<MjonBlockVO>)list("MjonBlockDAO.selectAdmBlockList", blockVO);
 	}

713d22e

dd225ab

src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java

--- src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java

+++ src/main/java/itn/let/mjo/block/service/impl/MjonBlockServiceImpl.java


 package itn.let.mjo.block.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;

 	@Override
 	public void insertBlockList(MjonBlockVO mjonBlockVO) throws Exception {
 		
-		List<MjonBlockVO> blockList = new ArrayList<MjonBlockVO>();
+		/*
+		 * 수신거부 목록 신규 등록시 기존 등록 정보와 중복 체크
+		 * 2024.02.07 우영두 수정
+		 * */
+		MjonBlockVO blockVO = new MjonBlockVO();
+		blockVO.setUserId(mjonBlockVO.getUserId());
+		blockVO.setBlockType(mjonBlockVO.getBlockType());
+		List<String> blockPhoneList = blockDAO.selectBlockPhoneList(blockVO);;
 		
     	for(int i=0; i < mjonBlockVO.getPhoneList().length; i++) {
+    		
+    		if(blockPhoneList.size() > 0) {
+    			if(blockPhoneList.contains(mjonBlockVO.getPhoneList()[i])) {
+    				continue;
+    			}
+    		}
+    		
     		mjonBlockVO.setBlockId(idgenBlockId.getNextStringId());
     		mjonBlockVO.setPhone(mjonBlockVO.getPhoneList()[i].trim().replaceAll("§", ","));
 

713d22e

dd225ab

src/main/java/itn/web/MainController.java

--- src/main/java/itn/web/MainController.java

+++ src/main/java/itn/web/MainController.java


 import itn.let.mjo.kisa.service.KisaVO;
 import itn.let.mjo.mjocommon.MjonForienIpChk;
 import itn.let.mjo.msg.service.MjonMsgVO;
+import itn.let.mjo.msgcampain.service.MjonCandidateService;
+import itn.let.mjo.msgcampain.service.MjonCandidateVO;
 import itn.let.mjo.msgdata.service.MjonMsgDataService;
 import itn.let.mjo.msgdata.service.MjonMsgDataVO;
 import itn.let.mjo.pay.service.MjonPayService;

 	/** mberManageService */
 	@Resource(name = "mberManageService")
 	private EgovMberManageService mberManageService;
+	
+	@Resource(name = "mjonCandidateService")
+    private MjonCandidateService mjonCandidateService;
 	
 	
 	@Value("#{globalSettings['Globals.email.host']}")

 		}
 		model.addAttribute("prePaymentYn", prePaymentYn);
 		
+		
+		/*
+		 * 선거문자 메뉴 선별적 노출을 위하여 후보자 정보조회
+		 * 비회원, 후부자 정보가 없는 회원은 선거문자가 안보이도록 처리
+		 * 2024.02.08 우영두 추가
+		 * 
+		 * */
+		String userCandidateYn = "N";
+		
+		if(loginVO != null) {
+			
+			//선거 후보자 정보 조회
+			MjonCandidateVO mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(userId);
+			
+			if(mjonCandidateVO != null) {
+				
+				userCandidateYn = "Y";
+				
+			}
+			
+		}
+		
+		model.addAttribute("userCandidateYn", userCandidateYn);
+		
 		return "web/com/webCommonHeader";
     }
     

713d22e

dd225ab

src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/mjo/block/Block_SQL_Mysql.xml


 		LIMIT #recordCountPerPage# OFFSET #firstIndex#
 	</select>
 	
+	
+	<select id="MjonBlockDAO.selectBlockPhoneList" parameterClass="blockVO" resultClass="String">
+		SELECT
+			PHONE				AS phone
+		FROM
+			MJ_BLOCK
+		WHERE
+			1=1
+			AND USER_ID = #userId#
+			AND BLOCK_TYPE = #blockType#
+	    ORDER BY 1=1
+        AND PHONE DESC
+	</select>
+	
 	<!-- 차단 목록 조회(관리자용) -->
 	<select id="MjonBlockDAO.selectAdmBlockList" parameterClass="blockVO" resultClass="blockVO">
 		SELECT

713d22e

dd225ab

src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

--- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

+++ src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp


 		           		<c:if test="${resultListOne.depth eq '1' }">
 						<c:choose>
 							<c:when test="${fn:contains(resultListOne.url, '/web/mjon/msgcampain/selectMsgDataView.do')}">
-								<li class="new">
+								<c:if test="${userCandidateYn eq 'Y'}">
+									<li class="new">
+								</c:if>
+								<c:if test="${userCandidateYn eq 'N'}">
+									<%-- 후보자 정보가 없는 경우 메뉴를 보여주지 않는다. --%>
+									<li style="display:none;">
+								</c:if>
 							</c:when>																												
 							<c:otherwise>
 								<li>

 						</c:choose>	                   			           		
 							<c:choose>
 								<c:when test="${fn:contains(resultListOne.url, '/web/mjon/msgcampain/selectMsgDataView.do')}">
-									<a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
+									<c:if test="${userCandidateYn eq 'Y'}">
+										<a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
+									</c:if>
 								</c:when>
 								<c:when test="${fn:contains(resultListOne.url, '/web/mjon/alimtalk/kakaoAlimtalkMsgDataView.do')}">
 									<a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>

 								</c:when>
 								<c:when test="${fn:contains(resultListOne.url, '/web/member/pay/PayList.do')}">
 									<a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
-								</c:when>																												
+								</c:when>
 								<c:otherwise>
 									<a href="${empty resultListOne.url ? '#' : resultListOne.url }">${resultListOne.menuNm}</a>
 								</c:otherwise>

 	            					</ul>
 	            				</dd>
 	            			</dl>
-	            			<dl>
-	            				<dt><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>" rel="nosublink">선거문자</a></dt>
-	            				<dd>
-	            					<ul>
-	            						<li><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>">단체문자</a></li>
-	            						<li><a href="<c:out value='/web/mjon/msgcampain/selectMsgTWDataView.do'/>" rel="nosublink">20건 문자</a></li>
-	            					</ul>
-	            				</dd>
-	            			</dl>
+	            			<c:if test="${userCandidateYn eq 'Y' }">
+		            			<dl>
+		            				<dt><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>" rel="nosublink">선거문자</a></dt>
+		            				<dd>
+		            					<ul>
+		            						<li><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>">단체문자</a></li>
+		            						<li><a href="<c:out value='/web/mjon/msgcampain/selectMsgTWDataView.do'/>" rel="nosublink">20건 문자</a></li>
+		            					</ul>
+		            				</dd>
+		            			</dl>
+	            			</c:if>
 	            			<dl>
 	            				<dt><a href="<c:out value='/web/mjon/alimtalk/kakaoAlimtalkMsgDataView.do'/>" rel="nosublink">카톡전송</a></dt>
 	            				<dd>

Add a comment

Open 0
Closed 0

List

...	...	@@ -107,6 +107,8 @@
107	107	import itn.let.mjo.kisa.service.KisaVO;
108	108	import itn.let.mjo.mjocommon.MjonForienIpChk;
109	109	import itn.let.mjo.msg.service.MjonMsgVO;
	110	+import itn.let.mjo.msgcampain.service.MjonCandidateService;
	111	+import itn.let.mjo.msgcampain.service.MjonCandidateVO;
110	112	import itn.let.mjo.msgdata.service.MjonMsgDataService;
111	113	import itn.let.mjo.msgdata.service.MjonMsgDataVO;
112	114	import itn.let.mjo.pay.service.MjonPayService;
...	...	@@ -257,6 +259,9 @@
257	259	/** mberManageService */
258	260	@Resource(name = "mberManageService")
259	261	private EgovMberManageService mberManageService;
	262	+
	263	+ @Resource(name = "mjonCandidateService")
	264	+ private MjonCandidateService mjonCandidateService;
260	265
261	266
262	267	@Value("#{globalSettings['Globals.email.host']}")
...	...	@@ -1194,6 +1199,30 @@
1194	1199	}
1195	1200	model.addAttribute("prePaymentYn", prePaymentYn);
1196	1201
	1202	+
	1203	+ /*
	1204	+ * 선거문자 메뉴 선별적 노출을 위하여 후보자 정보조회
	1205	+ * 비회원, 후부자 정보가 없는 회원은 선거문자가 안보이도록 처리
	1206	+ * 2024.02.08 우영두 추가
	1207	+ *
	1208	+ * */
	1209	+ String userCandidateYn = "N";
	1210	+
	1211	+ if(loginVO != null) {
	1212	+
	1213	+ //선거 후보자 정보 조회
	1214	+ MjonCandidateVO mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(userId);
	1215	+
	1216	+ if(mjonCandidateVO != null) {
	1217	+
	1218	+ userCandidateYn = "Y";
	1219	+
	1220	+ }
	1221	+
	1222	+ }
	1223	+
	1224	+ model.addAttribute("userCandidateYn", userCandidateYn);
	1225	+
1197	1226	return "web/com/webCommonHeader";
1198	1227	}
1199	1228

...	...	@@ -1305,7 +1305,13 @@
1305	1305	<c:if test="${resultListOne.depth eq '1' }">
1306	1306	<c:choose>
1307	1307	<c:when test="${fn:contains(resultListOne.url, '/web/mjon/msgcampain/selectMsgDataView.do')}">
1308		- <li class="new">
	1308	+ <c:if test="${userCandidateYn eq 'Y'}">
	1309	+ <li class="new">
	1310	+ </c:if>
	1311	+ <c:if test="${userCandidateYn eq 'N'}">
	1312	+ <%-- 후보자 정보가 없는 경우 메뉴를 보여주지 않는다. --%>
	1313	+ <li style="display:none;">
	1314	+ </c:if>
1309	1315	</c:when>
1310	1316	<c:otherwise>
1311	1317	<li>
...	...	@@ -1313,7 +1319,9 @@
1313	1319	</c:choose>
1314	1320	<c:choose>
1315	1321	<c:when test="${fn:contains(resultListOne.url, '/web/mjon/msgcampain/selectMsgDataView.do')}">
1316		- <a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
	1322	+ <c:if test="${userCandidateYn eq 'Y'}">
	1323	+ <a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
	1324	+ </c:if>
1317	1325	</c:when>
1318	1326	<c:when test="${fn:contains(resultListOne.url, '/web/mjon/alimtalk/kakaoAlimtalkMsgDataView.do')}">
1319	1327	<a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
...	...	@@ -1332,7 +1340,7 @@
1332	1340	</c:when>
1333	1341	<c:when test="${fn:contains(resultListOne.url, '/web/member/pay/PayList.do')}">
1334	1342	<a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
1335		- </c:when>
	1343	+ </c:when>
1336	1344	<c:otherwise>
1337	1345	<a href="${empty resultListOne.url ? '#' : resultListOne.url }">${resultListOne.menuNm}</a>
1338	1346	</c:otherwise>
...	...	@@ -1415,15 +1423,17 @@
1415	1423	</ul>
1416	1424	</dd>
1417	1425	</dl>
1418		- <dl>
1419		- <dt><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>" rel="nosublink">선거문자</a></dt>
1420		- <dd>
1421		- <ul>
1422		- <li><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>">단체문자</a></li>
1423		- <li><a href="<c:out value='/web/mjon/msgcampain/selectMsgTWDataView.do'/>" rel="nosublink">20건 문자</a></li>
1424		- </ul>
1425		- </dd>
1426		- </dl>
	1426	+ <c:if test="${userCandidateYn eq 'Y' }">
	1427	+ <dl>
	1428	+ <dt><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>" rel="nosublink">선거문자</a></dt>
	1429	+ <dd>
	1430	+ <ul>
	1431	+ <li><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>">단체문자</a></li>
	1432	+ <li><a href="<c:out value='/web/mjon/msgcampain/selectMsgTWDataView.do'/>" rel="nosublink">20건 문자</a></li>
	1433	+ </ul>
	1434	+ </dd>
	1435	+ </dl>
	1436	+ </c:if>
1427	1437	<dl>
1428	1438	<dt><a href="<c:out value='/web/mjon/alimtalk/kakaoAlimtalkMsgDataView.do'/>" rel="nosublink">카톡전송</a></dt>
1429	1439	<dd>

...	...	@@ -20,6 +20,11 @@
20	20	}
21	21
22	22	@SuppressWarnings("unchecked")
	23	+ public List<String> selectBlockPhoneList(MjonBlockVO blockVO) throws Exception{
	24	+ return (List<String>)list("MjonBlockDAO.selectBlockPhoneList", blockVO);
	25	+ }
	26	+
	27	+ @SuppressWarnings("unchecked")
23	28	public List<MjonBlockVO> selectAdmBlockList(MjonBlockVO blockVO) throws Exception{
24	29	return (List<MjonBlockVO>)list("MjonBlockDAO.selectAdmBlockList", blockVO);
25	30	}

...	...	@@ -1,6 +1,5 @@
1	1	package itn.let.mjo.block.service.impl;
2	2
3		-import java.util.ArrayList;
4	3	import java.util.List;
5	4
6	5	import javax.annotation.Resource;
...	...	@@ -57,9 +56,23 @@
57	56	@Override
58	57	public void insertBlockList(MjonBlockVO mjonBlockVO) throws Exception {
59	58
60		- List<MjonBlockVO> blockList = new ArrayList<MjonBlockVO>();
	59	+ /*
	60	+ * 수신거부 목록 신규 등록시 기존 등록 정보와 중복 체크
	61	+ * 2024.02.07 우영두 수정
	62	+ * */
	63	+ MjonBlockVO blockVO = new MjonBlockVO();
	64	+ blockVO.setUserId(mjonBlockVO.getUserId());
	65	+ blockVO.setBlockType(mjonBlockVO.getBlockType());
	66	+ List<String> blockPhoneList = blockDAO.selectBlockPhoneList(blockVO);;
61	67
62	68	for(int i=0; i < mjonBlockVO.getPhoneList().length; i++) {
	69	+
	70	+ if(blockPhoneList.size() > 0) {
	71	+ if(blockPhoneList.contains(mjonBlockVO.getPhoneList()[i])) {
	72	+ continue;
	73	+ }
	74	+ }
	75	+
63	76	mjonBlockVO.setBlockId(idgenBlockId.getNextStringId());
64	77	mjonBlockVO.setPhone(mjonBlockVO.getPhoneList()[i].trim().replaceAll("§", ","));
65	78

...	...	@@ -52,6 +52,20 @@
52	52	LIMIT #recordCountPerPage# OFFSET #firstIndex#
53	53	</select>
54	54
	55	+
	56	+ <select id="MjonBlockDAO.selectBlockPhoneList" parameterClass="blockVO" resultClass="String">
	57	+ SELECT
	58	+ PHONE AS phone
	59	+ FROM
	60	+ MJ_BLOCK
	61	+ WHERE
	62	+ 1=1
	63	+ AND USER_ID = #userId#
	64	+ AND BLOCK_TYPE = #blockType#
	65	+ ORDER BY 1=1
	66	+ AND PHONE DESC
	67	+ </select>
	68	+
55	69	<!-- 차단 목록 조회(관리자용) -->
56	70	<select id="MjonBlockDAO.selectAdmBlockList" parameterClass="blockVO" resultClass="blockVO">
57	71	SELECT

Delete comment