템플릿 이미지링크 추가, 메인이미지 단일화

src/main/java/com/style24/admin/biz/service/TsaPlanService.java

@@ -88,27 +88,28 @@ public class TsaPlanService {
 			}
 			newFile.renameTo(uniqueFile);
 			param.setMainPimg("/planning/" + yearMonth + "/" + newFilename);
-		}
-		if(param.getMainMimg() != null && !"".equals(param.getMainMimg())){
-			String imgInd = String.valueOf(ind);
-			if (ind < 10) {
-				imgInd = "0" + imgInd;
-			}
-			String planUploadPath = env.getProperty("upload.default.target.path");
-			String yearMonth = GagaDateUtil.getToday().substring(0, 6);
-			planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, "/planning");
-			File newFile = new File(GagaFileUtil.getConcatenationPath(planUploadPath, param.getMainMimg()));
-			planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, yearMonth);
-			String newFilename = "PLANNING_" + GagaDateUtil.getTodayDateTime() + "_" + imgInd + "." + StringUtils.getFilenameExtension(param.getMainMimg());
-			File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(planUploadPath, newFilename)));
-			// Rename a file
-			File path = new File(planUploadPath);
-			if (!path.exists()) {
-				path.mkdir();
-			}
-			newFile.renameTo(uniqueFile);
 			param.setMainMimg("/planning/" + yearMonth + "/" + newFilename);
 		}
+//		if(param.getMainMimg() != null && !"".equals(param.getMainMimg())){
+//			String imgInd = String.valueOf(ind);
+//			if (ind < 10) {
+//				imgInd = "0" + imgInd;
+//			}
+//			String planUploadPath = env.getProperty("upload.default.target.path");
+//			String yearMonth = GagaDateUtil.getToday().substring(0, 6);
+//			planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, "/planning");
+//			File newFile = new File(GagaFileUtil.getConcatenationPath(planUploadPath, param.getMainMimg()));
+//			planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, yearMonth);
+//			String newFilename = "PLANNING_" + GagaDateUtil.getTodayDateTime() + "_" + imgInd + "." + StringUtils.getFilenameExtension(param.getMainMimg());
+//			File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(planUploadPath, newFilename)));
+//			// Rename a file
+//			File path = new File(planUploadPath);
+//			if (!path.exists()) {
+//				path.mkdir();
+//			}
+//			newFile.renameTo(uniqueFile);
+//			param.setMainMimg("/planning/" + yearMonth + "/" + newFilename);
+//		}
 		planDao.createPlanInfo(param);
 		
 		String[] brand = param.getMultiBrand();
@@ -953,6 +954,8 @@ public class TsaPlanService {
 			
 			//파일아이템 등록
 			String[] fileItemVal = param.getMultiPlanFile();
+			String[] fileItemVal2 = param.getMultiPlanFile2();
+			String[] fileItemVal3 = param.getMultiPlanFile3();
 			int ind = 1;
 			for (int j = 0; j < fileItemVal.length; j++) {
 				String imgInd = String.valueOf(ind);
@@ -973,6 +976,8 @@ public class TsaPlanService {
 				}
 				newFile.renameTo(uniqueFile);
 				filePlan.setItemVal("/planning/" + yearMonth + "/" + newFilename);
+				filePlan.setLinkUrl(fileItemVal2[j]);
+				filePlan.setLinkOpenGb((fileItemVal3[j]));
 				planDao.createPlanContentsItem(filePlan);
 				ind++;
 			}

src/main/java/com/style24/persistence/domain/Plan.java

@@ -195,6 +195,10 @@ public class Plan extends TscBaseDomain{
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 		private String[] multiPlanFile;			//이미지목록
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+		private String[] multiPlanFile2;			//이미지새장본창
+		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+		private String[] multiPlanFile3;			//이미지연결url
+		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 		private String[] multiChannel;			//제휴채널목록
 		
 		private Collection<Plan> attendData; // 출석체크 혜택 데이터

src/main/java/com/style24/persistence/mybatis/shop/TsaPlan.xml

@@ -1095,6 +1095,8 @@
 			TB_PLAN_CONTENTS_ITEM(
 						PLAN_CONT_SQ
 					  , ITEM_VAL
+					  , LINK_URL
+					  , LINK_OPEN_GB
 					  , REVIEW_DISP_STDT
 					  , REVIEW_DISP_EDDT
 					  , REG_NO
@@ -1103,6 +1105,8 @@
 			VALUES(
 					#{planContSq}
 				  , #{itemVal}
+				  , #{linkUrl}
+				  , #{linkOpenGb}
 				  , #{reviewDispStdt}
 				  , #{reviewDispEddt}
 				  , #{regNo}
@@ -1112,6 +1116,8 @@
 			     DUPLICATE KEY 
 			 UPDATE 
 			 	 ITEM_VAL= #{itemVal}
+			   , LINK_URL = #{linkUrl}
+			   , LINK_OPEN_GB = #{linkOpenGb}
 			   , REVIEW_DISP_STDT= #{reviewDispStdt}
 			   , REVIEW_DISP_EDDT= #{reviewDispEddt}
 			   , REG_NO= #{regNo}
@@ -1356,8 +1362,3 @@
 
 
 
-
-
-
-
-

src/main/webapp/WEB-INF/views/marketing/PlanDetailPopupForm.html

@@ -176,7 +176,7 @@
   						</td>
 					</tr>
 					<tr>
-						<th>PC 메인 이미지<i id="pMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainPimgDelYn" value="Y"/></label>]</th>
+						<th>메인 이미지<i id="pMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainPimgDelYn" value="Y"/></label>]</th>
 						<td>
 							<div th:if=*{mainPimg} id="mainPimgView" style="float:left;">
 								<img id="PreMainPimgUrl" th:src="${@environment.getProperty('upload.image.view')} + *{mainPimg}" style="max-width:470px;"/>
@@ -191,7 +191,7 @@
 							</div>
 						</td>
 					</tr>
-					<tr>
+				<!-- 	<tr>
 						<th>모바일 메인 이미지<i id="mMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainMimgDelYn" value="Y"/></label>]</th>
 						<td>
 							<div th:if=*{mainMimg} id="imgFileView" style="float:left;">
@@ -206,7 +206,7 @@
 								<input type="hidden" name="mainMimg" id="mainMimg"/>
 							</div>
 						</td>
-					</tr>
+					</tr> -->
 					<tr>
 						<th>투표일련번호</th>
 						<td>
@@ -571,7 +571,7 @@
   						</td>
 					</tr>
 					<tr>
-						<th>PC 메인 이미지<i id="pMimgStar"></i></th>
+						<th>메인 이미지<i id="pMimgStar"></i></th>
 						<td colspan="5">
 							<div class="uFile w400">
 								<input id="registerMainPimg" name="registerMainPimg" type="file" accept="image/*" class="uFileInput w400"/>
@@ -580,7 +580,7 @@
 							</div>
 						</td>
 					</tr>
-					<tr>
+					<!-- <tr>
 						<th>모바일 메인 이미지<i id="mMimgStar"></i></th>
 						<td colspan="5">
 							<div class="uFile w400">
@@ -589,7 +589,7 @@
 								<input type="hidden" name="mainMimg" id="mainMimg" value=""/>
 							</div>
 						</td>
-					</tr>
+					</tr> -->
 					<tr>
 									
 						<th>투표일련번호</th>

src/main/webapp/WEB-INF/views/marketing/PlanTemplatePopupForm.html

@@ -181,8 +181,23 @@
 														<label th:for="${'file' + num}" class="uFileLabel">파일선택</label>
 														<input type="hidden" name="fileItemVal"	th:id="${'fileItemVal' + num}" /> 
 														<input type="hidden" name="sysFileNms" th:id="${'sysFileNm' + num}" />
+														<input type="text" th:name="${'linkUrl' + num}" class="w300 aR">
 													</div>
 													<br />
+													<table>
+														<tr>                                                                                                     
+															<th>클릭시 페이지창</th>                                                                                                     
+															<td>                                                                                                         
+															<label class="rdoBtn"><input type="radio" th:name="${'fileLinkOpenGb' + num}" value="M" checked/>현재창</label>   
+														     <label class="rdoBtn"><input type="radio" th:name="${'fileLinkOpenGb' + num}" value="N" />새창</label>                    
+															</td>                                                                                                                    
+														</tr>        
+														<tr>
+															<th>상품 링크</th>
+															<td><input type="text" th:name="${'fileLinkUrl' + num}" class="w300 aR">
+															</td>
+														</tr>
+														</table>
 												</div>
 											</th:block>
 										</td>
@@ -1620,12 +1635,17 @@
 		
 		//파일관련 데이터 담기
 		var multiPlanFile = [];
+		var multiPlanFile2 = [];
+		var multiPlanFile3 = [];
+		
 		var count = $("#planTemplateForm select[name=fileCnt]").val();
 		for (var i = 0; i < count; i++) {
 			if($('#fileItemVal'+(i+1)).val() == '' || typeof $('#fileItemVal'+(i+1)).val() == 'undeifined'){
 				false;
 			}else{
-				multiPlanFile.push($('#fileItemVal'+(i+1)).val());	
+				multiPlanFile.push($('#fileItemVal'+(i+1)).val());
+				multiPlanFile2.push($('#planTemplateForm input[name=fileLinkUrl'+(i+1)+']').val());
+				multiPlanFile3.push($('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:checked').val());
 			}
 		}
 		
@@ -2042,6 +2062,8 @@
 						   ,cuDispYn :  $('#planTemplateForm input:checkbox[name=cuDispYn]').val()  
 						   ,note :  $('#planTemplateForm textarea[name=note]').val()  
 						   ,multiPlanFile : multiPlanFile
+						   ,multiPlanFile2 : multiPlanFile2
+						   ,multiPlanFile3 : multiPlanFile3
 						   ,fileDispYn : $('#planTemplateForm input:checkbox[name=fileDispYn]').val() 
 						   ,fileDispOrd : $('#planTemplateForm input[name=fileDispOrd]').val()  
 						   ,filePlanContSq : $('#planTemplateForm input[name=filePlanContSq]').val()