메인전시 타이틀부분 수정

src/main/java/com/style24/admin/biz/dao/TsaDisplayDao.java

@@ -330,38 +330,6 @@ public interface TsaDisplayDao {
 	 */
 	void saveContents(Contents contents);
 
-	/**
-	 * 메인전시 컨텐츠 타이틀 삭제
-	 * @return
-	 * @author bin2107
-	 * @since 2021. 2. 23
-	 */
-	void deleteContentsTitle(Contents contents);
-
-	/**
-	 * 메인전시 컨텐츠 타이틀 저장
-	 * @return
-	 * @author bin2107
-	 * @since 2021. 2. 23
-	 */
-	void saveContentsTitle(Contents contents);
-
-	/**
-	 * 메인전시 컨텐츠 타이틀 조회
-	 * @return
-	 * @author bin2107
-	 * @since 2021. 2. 23
-	 */
-	String getContentsTitle(String cateNo, String contentsLoc, String brandGroupNo);
-
-	/**
-	 * 메인전시 컨텐츠 타이틀 변경
-	 * @return
-	 * @author bin2107
-	 * @since 2021. 2. 23
-	 */
-	void updateContentsTitle(Contents contents);
-
 	/**
 	 * CATEGORY4SRCH 조회
 	 * @return

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

@@ -573,22 +573,6 @@ public class TsaDisplayService {
 			}
 		}
 
-		for(Contents contents : contentsList){
-			if(contents != null && contents.getContentsTitle() != null){
-				Contents contentsTmp = new Contents();
-				contentsTmp.setCateNo(contents.getCateNo());
-				contentsTmp.setContentsLoc(contents.getContentsLoc());
-				if("1711".equals(contents.getCateNo())){
-					contentsTmp.setBrandGroupNo(contents.getBrandGroupNo());
-				}
-				contentsTmp.setContentsTitle(contents.getContentsTitle());
-				contentsTmp.setRegNo(TsaSession.getInfo().getUserNo());
-				displayDao.deleteContentsTitle(contentsTmp);
-				displayDao.saveContentsTitle(contentsTmp);
-				break;
-			}
-		}
-
 		for (Contents contents : contentsList){
 			log.info("getGoodsCdArr contents:::::{}",contents);
 			if(contents != null && contents.getGoodsCdArr() != null){
@@ -715,7 +699,6 @@ public class TsaDisplayService {
 			contents.setContentsLoc(contentsLoc);
 			displayDao.deleteContents(contents);
 			displayDao.saveContents(contents);
-			displayDao.updateContentsTitle(contents);
 			if("SMM007".equals(contentsLoc) || "SMM009".equals(contentsLoc)){
 				displayDao.deleteContentsGoods(contents);
 				displayDao.saveContentsGoods(contents);
@@ -723,16 +706,6 @@ public class TsaDisplayService {
 		}
 	}
 
-	/**
-	 * 메인전시 컨텐츠 타이틀 조회
-	 * @return
-	 * @author bin2107
-	 * @since 2021. 2. 22
-	 */
-	public String getContentsTitle(String cateNo, String contentsLoc, String brandGroupNo) {
-		return displayDao.getContentsTitle(cateNo,contentsLoc,brandGroupNo);
-	}
-
 	/**
 	 * CATEGORY4SRCH 조회
 	 * @return

src/main/java/com/style24/admin/biz/web/TsaDisplayController.java

@@ -569,7 +569,6 @@ public class TsaDisplayController extends TsaBaseController {
 		mav.addObject("brandGroupNo", brandGroupNo);
 		mav.addObject("contentsDesc", displayService.getContentsDesc(contentsLoc));
 		mav.addObject("contentsLocList", rendererService.getAvailCommonCodeList("G028"));
-		mav.addObject("contentsTitle", displayService.getContentsTitle(cateNo,contentsLoc,brandGroupNo));
 
 		mav.setViewName("display/MainContentsPopupForm");
 		return mav;
@@ -692,7 +691,7 @@ public class TsaDisplayController extends TsaBaseController {
 		mav.addObject("contentsLoc", contentsLoc);
 		mav.addObject("contentsDesc", displayService.getContentsDesc(contentsLoc));
 		mav.addObject("contentsLocList", rendererService.getAvailCommonCodeList("G028"));
-		mav.addObject("contentsTitle", displayService.getContentsTitle(cateNo,contentsLoc,brandGroupNo));
+
 		mav.setViewName("display/MainMultiContentsPopupForm");
 		return mav;
 	}
@@ -933,7 +932,6 @@ public class TsaDisplayController extends TsaBaseController {
 		mav.addObject("brandGroupNo", brandGroupNo);
 		mav.addObject("contentsDesc", displayService.getContentsDesc(contentsLoc));
 		mav.addObject("contentsLocList", rendererService.getAvailCommonCodeList("G028"));
-		mav.addObject("contentsTitle", displayService.getContentsTitle(cateNo,contentsLoc,brandGroupNo));
 		mav.addObject("cate1List", rendererService.getCate1List());
 
 		mav.setViewName("display/MainGnbContentsPopupForm");

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

@@ -1218,6 +1218,7 @@
 				,CONTENTS_YN
 				,COL_CNT
 				,COL_NO
+		        ,IFNULL(CONTENTS_TITLE,'') as CONTENTS_TITLE
 				,ORG_FILE_NM
 				,SYS_FILE_NM
 		FROM	TB_MAIN_LAYOUT
@@ -1277,13 +1278,7 @@
 			,#{contentsYn}
 			,#{colCnt}
 			,#{colNo}
-			,(SELECT CONTENTS_TITLE
-			    FROM TMP_MAIN_LAYOUT_TITLE
-			    WHERE CATE_NO = #{cateNo} AND CONTENTS_LOC = #{contentsLoc}
-		        <if test='brandGroupNo != null and brandGroupNo != ""'>
-			      AND BRAND_GROUP_NO = #{brandGroupNo}
-				</if>
-			)
+			,#{contentsTitle}
 			,#{orgFileNm}
 			,#{sysFileNm}
 			,#{regNo}
@@ -1585,64 +1580,6 @@
 		</if>
 	</insert>
 
-	<!-- 메인전시 컨텐츠 타이틀 임시테이블 삭제 -->
-	<delete id="deleteContentsTitle" parameterType="Contents">
-		/* TsaDisplay.deleteContentsTitle */
-		DELETE FROM TMP_MAIN_LAYOUT_TITLE
-		WHERE 	CATE_NO = #{cateNo}
-		  AND 	CONTENTS_LOC = #{contentsLoc}
-		<if test="brandGroupNo != null and brandGroupNo !=''">
-			AND BRAND_GROUP_NO = #{brandGroupNo}
-		</if>
-	</delete>
-
-	<!-- 메인전시 컨텐츠 타이틀 임시테이블 저장 -->
-	<insert id="saveContentsTitle" parameterType="Contents">
-		/* TsaDisplay.saveContentsTitle */
-		INSERT INTO TMP_MAIN_LAYOUT_TITLE
-		(
-			CATE_NO
-			,CONTENTS_LOC
-			,BRAND_GROUP_NO
-			,CONTENTS_TITLE
-			,REG_NO
-			,REG_DT
-		)
-		VALUES
-		(
-		 	#{cateNo}
-		 	,#{contentsLoc}
-		 	,IFNULL(NULLIF(#{brandGroupNo},''),0)
-			,#{contentsTitle}
-			,#{regNo}
-			,NOW()
-		)
-	</insert>
-
-	<!-- 메인전시 컨텐츠 타이틀 조회 -->
-	<select id="getContentsTitle" parameterType="String" resultType="String">
-		/* TsaDisplay.getContentsTitle */
-		SELECT	CONTENTS_TITLE
-		FROM	TMP_MAIN_LAYOUT_TITLE
-		WHERE	CATE_NO = #{cateNo}
-		AND		CONTENTS_LOC = #{contentsLoc}
-		<if test="brandGroupNo != null and brandGroupNo !=''">
-			AND BRAND_GROUP_NO = #{brandGroupNo}
-		</if>
-	</select>
-
-	<!-- 메인전시 컨텐츠 타이틀 변경 -->
-	<update id="updateContentsTitle" parameterType="Contents">
-		/* TsaDisplay.updateContentsTitle */
-		UPDATE	TB_MAIN_LAYOUT
-		SET CONTENTS_TITLE = (SELECT CONTENTS_TITLE FROM TMP_MAIN_LAYOUT_TITLE WHERE CATE_NO = #{cateNo} AND CONTENTS_LOC = #{contentsLoc} AND BRAND_GROUP_NO = #{brandGroupNo})
-		WHERE CATE_NO = #{cateNo}
-		AND CONTENTS_LOC = #{contentsLoc}
-		<if test="brandGroupNo != null and brandGroupNo !=''">
-			AND BRAND_GROUP_NO = #{brandGroupNo}
-		</if>
-	</update>
-
 	<!-- CATEGORY4SRCH 조회 -->
 	<select id="getCategory4srch" parameterType="Category" resultType="Category">
 		/* TsaDisplay.getCategory4srch */

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -32,20 +32,6 @@
 				</li>
 			</ul>
 		</div>
-		<form name="contentsTitleForm" id="contentsTitleForm" style="width:1170px; overflow:auto; display: none;">
-			<table class="frmStyle">
-				<colgroup>
-					<col style="width:10%;"/>
-					<col style="width:40%;"/>
-					<col style="width:10%;"/>
-					<col style="width:40%;"/>
-				</colgroup>
-				<tr>
-					<th>컨텐츠 타이틀</th>
-					<td colspan="3"><input type="text" style="width:43.5%;" name="contentsTitle" maxlength="40" required="required" data-valid-name="컨텐츠타이틀" th:value="${contentsTitle}"></td>
-				</tr>
-			</table>
-		</form>
 		<form style="height:600px; width:1470px; overflow:auto;" id="popSortable">
 		</form>
 	</div>
@@ -56,7 +42,6 @@
 	var cateNo = [[${cateNo}]];
 	var contentsLoc = [[${contentsLoc}]];
 	var brandGroupNo = [[${brandGroupNo}]];
-	var contentsTitle = [[${contentsTitle}]];
 	var contentsLocArr = gagajf.convertToArray([[${contentsLocList}]]);
 	var tdWidth = $("#sortable").find("td").width();
 	var tdDeleteWidth = parseInt(tdWidth/11, 10);
@@ -75,57 +60,6 @@
 		gagajf.ajaxJsonSubmit('/display/contents/preview/list', jsonData, fnCreatePopLayout);
 	}
 
-	var fnCreateCateMainLayout = function(result){
-		var html = '';
-		for(let i=0; i<result.length; i++){
-			html += '<form name="contentsTitleForm" id="contentsTitleForm" style="width:1170px; overflow:auto;>';
-			html += '	<table className="frmStyle">';
-			html += '		<colgroup>';
-			html += '			<col style="width:10%;"/>';
-			html += '			<col style="width:40%;"/>';
-			html += '			<col style="width:10%;"/>';
-			html += '			<col style="width:40%;"/>';
-			html += '		</colgroup>';
-			html += '		<tr>';
-			html += '			<th>컨텐츠 타이틀</th>';
-			html += '			<td colSpan="3"><input type="text" style="width:43.5%;" name="contentsTitle" maxLength="40" required="required" data-valid-name="컨텐츠타이틀" value"'+result[i].mdTitle+'">';
-			html += '			</td>';
-			html += '		</tr>';
-			html += '		<tr>';
-			html += '			<th>전시 설정</th>';
-			html += '			<td>';
-			if(result[i].useYn=='Y'){
-				html += '				<label class="rdoBtn"><input type="radio" name="dispYn" value="Y" checked="checked"/>노출</label>';
-				html += '				<label class="rdoBtn"><input type="radio" name="dispYn" value="N"/>비노출</label>';
-			}else{
-				html += '				<label class="rdoBtn"><input type="radio" name="dispYn" value="Y"/>노출</label>';
-				html += '				<label class="rdoBtn"><input type="radio" name="dispYn" value="N" checked="checked"/>비노출</label>';
-			}
-			html += '			</td>';
-			if(result[i].contentsLoc=='SCM003'){
-				html += '			<th>상품 노출 개수</th>';
-				html += '			<td>';
-				if(result[i].strVar1=='10'){
-					html += '				<label class="rdoBtn"><input type="radio" name="dispCnt" value="10" checked="checked"/>10개</label>';
-					html += '				<label class="rdoBtn"><input type="radio" name="dispCnt" value="20"/>20개</label>';
-					html += '				<label class="rdoBtn"><input type="radio" name="dispCnt" value="30"/>30개</label>';
-				}else if(result[i].strVar1=='20'){
-					html += '				<label class="rdoBtn"><input type="radio" name="dispCnt" value="10"/>10개</label>';
-					html += '				<label class="rdoBtn"><input type="radio" name="dispCnt" value="20" checked="checked"/>20개</label>';
-					html += '				<label class="rdoBtn"><input type="radio" name="dispCnt" value="30"/>30개</label>';
-				}else{
-					html += '				<label class="rdoBtn"><input type="radio" name="dispCnt" value="10"/>10개</label>';
-					html += '				<label class="rdoBtn"><input type="radio" name="dispCnt" value="20"/>20개</label>';
-					html += '				<label class="rdoBtn"><input type="radio" name="dispCnt" value="30" checked="checked"/>30개</label>';
-				}
-				html += '			</td>';
-			}
-			html += '		</tr>';
-			html += '	</table>';
-			html += '</form>';
-		}
-	}
-
 	var createIdx = 0;
 	var fnCreatePopLayout = function(result) {
 		var html = '';
@@ -584,15 +518,6 @@
 			return;
 		}
 
-		if(contentsLoc=='SMM002'||contentsLoc=='SMM003'||contentsLoc=='SMM004'||contentsLoc=='SMM006'||contentsLoc=='SMM007'
-				||contentsLoc=='SMM009' ||contentsLoc=='SMM010'||contentsLoc=='SMM011'||contentsLoc=='SBM005' || contentsLoc=='SBMM005'
-				|| contentsLoc=='SCM002' || contentsLoc=='SCM003' || contentsLoc=='SBM010' || contentsLoc=='SBM009'|| contentsLoc=='SBM008'
-				|| contentsLoc=='SBM007' || contentsLoc=='SBM013' || contentsLoc=='SBM011'){
-			if(!gagajf.checkRequired("#contentsTitleForm")){
-				return;
-			}
-		}
-
 		if(contentsLoc=='SMM001'){
 			if(!smm001DataValidation()){
 				return false;
@@ -777,19 +702,6 @@
 			dataArr = dataArrSort;
 		}
 
-		if(contentsLoc=='SMM002'||contentsLoc=='SMM003'||contentsLoc=='SMM004'||contentsLoc=='SMM006'||contentsLoc=='SMM007'
-				||contentsLoc=='SMM009' ||contentsLoc=='SMM010'||contentsLoc=='SMM011'||contentsLoc=='SBM005' || contentsLoc=='SBMM005'
-				|| contentsLoc=='SCM002' || contentsLoc=='SCM003' || contentsLoc=='SBM010' || contentsLoc=='SBM009'|| contentsLoc=='SBM008'
-				|| contentsLoc=='SBM007' || contentsLoc=='SBM013' || contentsLoc=='SBM011'){
-			var data = {
-				cateNo : cateNo
-				, contentsLoc : contentsLoc
-				, contentsTitle : $("#contentsTitleForm input[name=contentsTitle]").val()
-				, brandGroupNo : brandGroupNo
-			}
-			dataArr.push(data);
-		}
-
 		var jsonData = JSON.stringify(dataArr);
 		mcxDialog.confirm('컨텐츠를 저장 하시겠습니까?', {
 			cancelBtnText: "취소",
@@ -1009,15 +921,6 @@
 	$(document).ready(function() {
 		$("#popTitle").text("["+contentsLoc+"] "+gagaAgGrid.lookupValue(contentsLocArr, contentsLoc));
 
-		if(contentsLoc=='SMM002'||contentsLoc=='SMM003'||contentsLoc=='SMM004'||contentsLoc=='SMM006'||contentsLoc=='SMM007'
-				||contentsLoc=='SMM009' ||contentsLoc=='SMM010'||contentsLoc=='SMM011'||contentsLoc=='SBM005' || contentsLoc=='SBMM005'
-				|| contentsLoc=='SCM002' || contentsLoc=='SCM003' || contentsLoc=='SBM010' || contentsLoc=='SBM009' || contentsLoc=='SBM008'
-				|| contentsLoc=='SBM007' || contentsLoc=='SBM013' || contentsLoc=='SBM011'){
-			$("#contentsTitleForm").show();
-		}else{
-			$("#contentsTitleForm").hide();
-		}
-
 		$("#popSortable").disableSelection();
 		fnGetContentsPreviewList();
 	});

src/main/webapp/WEB-INF/views/display/MainListForm.html

@@ -272,6 +272,8 @@
 			}
 			html += '" style="text-align:center; max-width:'+maxWidth+'px;">';
 			html += '<div><span style="font-weight:bold">'+result[i].contentsLoc+'</span></div><div><span>[ '+gagaAgGrid.lookupValue(contentsLocArr, result[i].contentsLoc)+' ]</span></div>';
+			html += '<input type="text" class="w200" name="contentsTitle" placeholder="메인타이틀" value="'+result[i].contentsTitle+'"/>';
+			html += '<br/>';
 			if(result[i].contentsYn=='C'){
 				html += '<button type="button" class="btn btn-success btn-lg" onclick="fnChangeContents(this);">수정</button>';
 				html += '<button type="button" class="btn btn-default btn-lg" onclick="fnUpdateContents(\''+result[i].contentsLoc+'\');">적용</button>';
@@ -288,6 +290,7 @@
 			html += '<input type="hidden" name="colNo" value="'+result[i].colNo+'"/>';
 			html += '<input type="hidden" name="contentsYn" value="'+result[i].contentsYn+'"/>';
 			html += '</td>';
+
 			if(colNo=='1'){
 				if(result[i].orgFileNm!=null && result[i].orgFileNm!='null' && result[i].orgFileNm!="" ){
 					orgFileNm = result[i].orgFileNm;
@@ -452,7 +455,9 @@
 			html += '<input type="hidden" name="colCnt" value="'+colCnt+'"/>';
 			html += '<input type="hidden" name="colNo" value="'+colNo+'"/>';
 			html += '<input type="hidden" name="contentsYn" value=""/>';
+			html += '<input type="text" class="w200" name="contentsTitle" placeholder="메인타이틀" value=""/>';
 			html += '</td>';
+
 			var i = $("#mainSortable tbody").length;
 			if(tdSize==10){
 				if(colCnt==1 || colNo==colCnt){
@@ -555,6 +560,7 @@
 		var contentLocCheck = true;
 
 		$("#mainSortable tbody").each(function(ind){
+			var contentsTitle = $(this).find('input:hidden[name="contentsTitle"]').val();
 			var orgFileNm = $(this).find('input:hidden[name="orgFileNm"]').val();
 			var sysFileNm = $(this).find('input:hidden[name="sysFileNm"]').val();
 			var newSysFileNm = $(this).find('input:hidden[name="newSysFileNm"]').val();
@@ -590,6 +596,7 @@
 						, sysFileNm : sysFileNm
 						, newSysFileNm : newSysFileNm
 						, brandGroupNo : brandGroupNo
+						, contentsTitle : contentsTitle
 					};
 					dataArr.push(data);
 				}

src/main/webapp/WEB-INF/views/display/MainMultiContentsPopupForm.html

@@ -35,18 +35,6 @@
 					</li>
 				</ul>
 			</div>
-			<form name="multiContentsTitleForm" id="multiContentsTitleForm" style="width:1170px; overflow:auto; display: none;">
-				<table class="frmStyle">
-					<colgroup>
-						<col style="width:10%;"/>
-						<col style="width:90%;"/>
-					</colgroup>
-					<tr>
-						<th>컨텐츠 타이틀</th>
-						<td><input type="text" name="contentsTitle" style="width:50%;" maxlength="40" required="required" data-valid-name="컨텐츠타이틀" th:value="${contentsTitle}"></td>
-					</tr>
-				</table>
-			</form>
 			<form style="height:600px; width:1470px; overflow:auto;" id="multiPopSortable">
 				<input type="hidden" name="mdTitle">
 			</form>
@@ -57,7 +45,6 @@
 /*<![CDATA[*/
 	var cateNo = [[${cateNo}]];
 	var contentsLoc = [[${contentsLoc}]];
-	var contentsTitle = [[${contentsTitle}]];
 	var contentsLocArr = gagajf.convertToArray([[${contentsLocList}]]);
 	var tdWidth = $("#sortable").find("td").width();
 	var tdDeleteWidth = parseInt(tdWidth/11, 10);
@@ -443,21 +430,7 @@
 		if(!gagajf.checkRequired("#multiPopSortable")){
 			return;
 		}
-		if(!gagajf.checkRequired("#multiContentsTitleForm")){
-			return;
-		}
-		var titleBool = true;
-		$("#multiPopSortable").find('input[name=title]').each(function(idx, title) {
-			if ($(title).val()==''){
-				titleBool = false;
-				$(title).focus();
-				gagajf.alertMessage($(title), 'input');
-				return;
-			}
-		});
-		if(!titleBool){
-			return false;
-		}
+
 		dataArr = [];
 		$("#multiPopSortable .tableTest").each(function(){	//$("#multiPopSortable table").each(function(){
 			var newImgFileArr = [];
@@ -564,7 +537,6 @@
 				, useYn : 'Y'
 				, dispOrd : dispOrd
 				, multiContentsYn : 'Y'
-				, contentsTitle : $("#multiContentsTitleForm input[name=contentsTitle]").val()
 				, goodsCdArr : goodsCdArr
 				, goodsNmArr : goodsNmArr
 				, goodsImgArr : goodsImgArr
@@ -783,11 +755,6 @@
 	$(document).ready(function() {
 		$("#multiPopTitle").text("["+contentsLoc+"] "+gagaAgGrid.lookupValue(contentsLocArr, contentsLoc));
 
-		if(contentsLoc=='SMM007'||contentsLoc=='SMM009'){
-			$("#multiContentsTitleForm").show();
-		}else{
-			$("#multiContentsTitleForm").hide();
-		}
 		$("#multiPopSortable").sortable({
 			stop: function(event, ui) {
 				fnReloadIdx();