상품이미지 작업중

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

@@ -978,7 +978,7 @@ public interface TsaGoodsDao {
 	 *
 	 * @param goodsSearch
 	 * @return Integer
-	 * @author daehyoung
+	 * @author eskim
 	 * @since 2020. 12. 16
 	 */
 	int getReinboundInformCount(GoodsSearch goodsSearch);
@@ -988,7 +988,7 @@ public interface TsaGoodsDao {
 	 *
 	 * @param goodsSearch
 	 * @return Collection<ReinboundInform>
-	 * @author daehyoung
+	 * @author eskim
 	 * @since 2020. 12. 16
 	 */
 	Collection<ReinboundInform> getReinboundInformList(GoodsSearch goodsSearch);
@@ -1003,4 +1003,15 @@ public interface TsaGoodsDao {
 	 */
 	void updateReinboundInform(ReinboundInform reinboundInform);
 
+	/**
+	 * 상품이미지 목록
+	 *
+	 * @param goodsImg
+	 * @return Collection<GoodsImg>
+	 * @author eskim
+	 * @since 2020. 12. 16
+	 */
+	Collection<GoodsImg> getGoodsImageList(GoodsImg goodsImg);
+
+
 }

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

@@ -2572,4 +2572,17 @@ public class TsaGoodsService {
 		}
 	}
 
+	/**
+	 * 상품이미지 목록
+	 *
+	 * @param goodsImg
+	 * @return Collection<GoodsImg>
+	 * @author eskim
+	 * @since 2020. 12. 18
+	 */
+	public Collection<GoodsImg> getGoodsImgList(GoodsImg goodsImg) {
+		return goodsDao.getGoodsImageList(goodsImg);
+	}
+
+
 }

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

@@ -36,6 +36,7 @@ import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.GoodsCompose;
 import com.style24.persistence.domain.GoodsEpSkip;
 import com.style24.persistence.domain.GoodsHst;
+import com.style24.persistence.domain.GoodsImg;
 import com.style24.persistence.domain.GoodsNaverLowestPrice;
 import com.style24.persistence.domain.GoodsNotiInfo;
 import com.style24.persistence.domain.GoodsPriceRes;
@@ -961,14 +962,26 @@ public class TsaGoodsController extends TsaBaseController {
 	 */
 	@GetMapping("/image/mass/form")
 	@ResponseBody
-	public ModelAndView imageMassForm(Goods goods) {
+	public ModelAndView imageMassForm(GoodsImg goodsImg) {
 		ModelAndView mav = new ModelAndView();
 
-//		goods = goodsService.getGoods(goods);
-//		// mav.addObject("goodsImgList", goodsService.getGoodsImgList(goods)); //이미지 - 행
-//		mav.addObject("goodsImgInfo", goodsService.getGoodsImg(goods)); // 이미지 - 열
-//
-		mav.addObject("params", goods);
+		Collection<GoodsImg> goodsImgList = goodsService.getGoodsImgList(goodsImg);
+
+		if (goodsImgList != null && !goodsImgList.isEmpty()) {
+
+			mav.addObject("goodsImgList", goodsImgList);
+
+			for (GoodsImg goodsImgInfo : goodsImgList) {
+				if (goodsImgInfo.getDefaultImgYn().equals("Y")) {
+					mav.addObject("defaultImgOrd", goodsImgInfo.getDispOrd());
+				}
+			}
+		} else { // 대표이미지와 마우스오버이미지가 없으면
+			mav.addObject("goodsImgList", new ArrayList<GoodsImg>());
+			mav.addObject("defaultImgOrd", "1");
+		}
+
+		mav.addObject("goodsImg", goodsImg);
 		mav.setViewName("goods/GoodsImageMassForm");
 		return mav;
 	}

style24.admin/src/main/java/com/style24/persistence/domain/GoodsImg.java

@@ -44,4 +44,15 @@ public class GoodsImg extends TscBaseDomain {
 	private String colorEnm;
 	private String optCd1;
 
+
+	//dext 5 용도
+	private int dispOrd;
+	private String orgImgNm;
+	private String sysImgNm;
+	private String defaultImgYn;
+	private String colorNm;
+	private String mode;
+	private int defaultImgOrd;
+
+
 }

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaGoods.xml

@@ -3523,5 +3523,20 @@
 		  , UPD_DT = NOW()
 		WHERE RINBD_INFO_SQ = #{rinbdInfoSq}
 	</update>
+	
+	<!-- 상품이미지 목록 -->
+	<select id="getGoodsImageList" parameterType="GoodsImg" resultType="GoodsImg">
+		/* TsaGoods.getGoodsImageList */
+		SELECT GOODS_CD
+		     , COLOR_CD
+		     , DISP_ORD
+		     , ORG_IMG_NM
+		     , SYS_IMG_NM
+		     , DEFAULT_IMG_YN
+		FROM   TB_GOODS_IMG_DX5
+		WHERE  GOODS_CD = #{goodsCd}
+		AND    COLOR_CD = #{colorCd}
+		ORDER  BY DISP_ORD
+	</select>
 	
 </mapper>

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsDetailSizeStockForm.html

@@ -45,10 +45,13 @@
 					<img width="60" th:if="${goodsColor.imgPath6}" th:src="${uploadGoodsUrl+goodsColor.imgPath6}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/image/no.gif'}+'\';'" alt="">
 					<img width="60" th:unless="${goodsColor.imgPath6}" th:src="${uploadGoodsUrl+goodsColor.imgPath1}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/image/no.gif'}+'\';'" alt="">
 				</th:block>
+				<input type="hidden" name="sysImgNmOrg" id="sysImgNmOrg" th:value="${goodsColor.sysImgNm}"/>
 			</td>	
-			<td class="aC" th:text="${goodsColor.optCd1}">BK</td>
+			<td class="aC" th:text="${goodsColor.optCd1}">BK
+				<input type="hidden" name="colorCd" id="colorCd" th:value="${goodsColor.optCd1}"/>
+			</td>
 			<td class="aC" th:text="${goodsColor.colorEnm}">BLACK</td>
-			<td><button type="button" class="btn btn-base btn-lg" th:onclick="fnGoodsDetailImg([[${goodsColor.optCd1}]])" th:text="${#strings.isEmpty(goodsColor.imgPath1) ?'등록':'수정'}">등록</button></td>
+			<td><button type="button" class="btn btn-base btn-lg" onclick="fnGoodsDetailImg(this)" th:text="${#strings.isEmpty(goodsColor.imgPath1) ?'등록':'수정'}">등록</button></td>
 		</tr>
 		</th:block>
 		</tbody>
@@ -137,9 +140,17 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
-	var fnGoodsDetailImg = function(colorCd){
+	var fnGoodsDetailImg = function(obj){
+		var mode= 'U';
+		var goodsCd = $('#goodsDetailForm input[name=goodsCd]').val();
+		var colorCd = $(obj).parent().parent().find("input[name=colorCd]").val();
+		
+		if (gagajf.isNull($(obj).parent().parent().find("input[name=sysImgNmOrg]").val())){
+			mode = "C";
+		}
+		
 		if ("Y" == $('#goodsDetailForm input[name=selfGoodsYn]').val()){
-			cfnOpenGoodsImageMassPopup($('#goodsDetailForm input[name=goodsCd]').val(), colorCd);
+			cfnOpenGoodsImageMassPopup(goodsCd, colorCd, colorNm, mode);
 		}else{
 			cfnOpenGoodsImagePopup($('#goodsDetailForm input[name=goodsCd]').val());	
 		}

style24.admin/src/main/webapp/WEB-INF/views/goods/GoodsImageMassForm.html

@@ -19,19 +19,23 @@
 			<div class="panelStyle">
 				<!-- TITLE -->
 				<div class="panelTitle">
-					<h2>상품 이미지 수정</h2>
+					<h2>상품 이미지 <th:block th:text="${goodsImg.mode =='U'}? '상세':'등록'"></th:block></h2>
 					<button type="button" class="close" onclick="fnGoodsImgFormClose()"><i class="fa fa-times"></i></button>
 				</div>
 				<!-- //TITLE -->
 				<!-- CONTENT -->
 				<div class="panelContent">
-
+				<form id="goodsImgForm" name="goodsImgForm" action="#" th:method="post">
+				<input type="hidden" name="goodsCd" th:value="${goodsImg.goodsCd}"/>
+				<input type="hidden" name="colorCd" th:value="${goodsImg.colorCd}"/>
+<!-- 				<input type="hidden" name="goodsCd" th:value="14373767"/>
+				<input type="hidden" name="colorCd" th:value="IV"/>
+ -->				
 					<ul class="notice">
 						<li>[업로드/수정] 버튼 클릭 하면 프론트에 바로 적용되므로 최종 확인 후 전송을 권장합니다.</li>
 						<li>이미지 미리보기 리스트는 <em>업로드 후</em> 확인 할 수 있습니다.</li>
 						<li>이미지보기 버튼은 이미지 파일 <em>등록 후</em> 확인 할 수 있습니다. 이미 <em>업로드 된</em> 파일은 확인 할 수 없습니다.(파일 크기 옆 화살표로 구분 가능합니다.)</li>
 					</ul>
-
 					<table class="frmStyle">
 						<colgroup>
 							<col width="100px"/>
@@ -40,13 +44,18 @@
 							<col/>
 							<col width="100px"/>
 							<col/>
+							<col width="100px"/>
+							<col/>
 						</colgroup>
 						<tr>
+							<th>상품코드</th>
+							<td th:text="${goodsImg.goodsCd}">14373767</td>
 							<th>컬러명</th>
-							<td>PINK</td>
-							<td colspan="4"></td>
-							<!-- <th>대표 이미지순번</th>
-							<td><input type="text" value="1"/></td>
+							<td th:text="${goodsImg.goodsNm}">PINK</td>
+							<th>대표 이미지순번</th>
+							<td><input type="text" class="text-right" name="defaultImgOrd" maxlength="3" th:value="${defaultImgOrd}" required="required" data-valid-type="number" data-valid-name="대표이미지순번"/></td>
+							<td colspan="2"></td>
+							<!-- 
 							<th>마우스오버 이미지순번</th>
 							<td><input type="text" value="2"/></td> -->
 						</tr>
@@ -429,165 +438,28 @@
 							</td>
 						</tr>
 					</table>
+				</form>	
 				</div>
 				<!-- 버튼 배치 영역 -->
 				<ul class="panelBar marT10">
 					<li class="center">
-						<button type="button" class="btn btn-base btn-lg">파일 추가</button>
-						<button type="button" class="btn btn-default btn-lg">선택 삭제</button>
-						<button type="button" class="btn btn-default btn-lg">전체 삭제</button>
-						<button type="button" class="btn btn-info btn-lg">뒤로 이동</button>
-						<button type="button" class="btn btn-info btn-lg">아래로 이동</button>
-						<button type="button" class="btn btn-base btn-lg">이미지 보기</button>
-						<button type="button" class="btn btn-base btn-lg">업로드/수정</button>
-						<button type="button" class="btn btn-base btn-lg">저장하기</button>
+						<button type="button" class="btn btn-base btn-sm" id="btnAddFiles">파일 추가</button>
+						<button type="button" class="btn btn-default btn-sm" onclick="gagaDx5.deleteChooseFile();">선택 삭제</button>
+						<button type="button" class="btn btn-default btn-sm" onclick="gagaDx5.deleteAllFiles();">전체 삭제</button>
+						<button type="button" class="btn btn-info btn-sm" onclick="gagaDx5.moveFile(true);">위로 이동</button>
+						<button type="button" class="btn btn-info btn-sm" onclick="gagaDx5.moveFile(false);">아래로 이동</button>
+						<!-- <button type="button" class="btn btn-base btn-sm" onclick="gagaDx5.previewImage();">이미지 보기</button> -->
+						<button type="button" class="btn btn-base btn-sm" onclick="gagaDx5.uploadFiles();">업로드/수정</button>
 					</li>
 				</ul>
 				<!-- //버튼 배치 영역 -->
 			</div>
-
-		<!-- <div class="panelStyle">
-			<div class="panelTitle">
-				<strong>상품 이미지 보기&nbsp;<button type="button" class="btn icn" onclick="fnOpenCommentPopup('comment')" ><i class="fa fa-cog" aria-hidden="true"></i></button></strong>
-				<button type="button" class="close" onclick="fnGoodsImgFormClose()"><i class="fa fa-times"></i></button>
-			</div>
-			<div class="panelContent">
-			<form id="goodsImgForm" name="goodsImgForm" th:method="post">
-			<input type="hidden" id="goodsCd" name="goodsCd" th:value="${params.goodsCd}"/>
-				<table class="frmStyle" th:with="uploadGoodsUrl=${@environment.getProperty('upload.goods.view')},uxImgUrl=${@environment.getProperty('domain.uximage')}">
-					<colgroup>
-						<col width="75%"/>
-						<col width="25%"/>
-					</colgroup>
-					<tbody id="goodsImgList">
-						<tr>
-							<th class="aL vaT">imgPath1 : <th:block th:utext="${'필수: 상품코드_01.jpg<i class=star></i>'}"></th:block>
-								<hr/>
-								<input type="text" class="w100p" id="imgPath1" name="imgPath1" />
-							</th>
-							<td>
-								<img  src="http://image.istyle24.com/Upload/ProductImage/0000004766/20200826/14505664_L.jpg?RS=560" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/image/no.gif'}+'\';'" width="200px"/>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</form>
-			</div>
-			<ul class="panelBar">
-				<th:block th:if="${sessionInfo.roleCd == 'G001_0000' OR sessionInfo.roleCd == 'G001_A000' OR sessionInfo.roleCd == 'G001_A101' OR sessionInfo.roleCd == 'G001_A100' OR sessionInfo.roleCd == 'G001_A001'}">
-				<button type="button" class="btn btnRight btn-success btn-lg" id="btnGoodsDetailImgSave">저장</button>
-				</th:block>
-			</ul>
-		</div> -->
 	</div>
+<script type="text/javascript" src="/dx5/dextuploadx5-configuration.js?v=2020121801"></script>
+<script type="text/javascript" src="/dx5/dextuploadx5.js?v=2020121801"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.dx5.js?2020121801"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
-	var fileExtension = [[${@environment.getProperty('upload.goods.allow.extension')}]];
-
-	//상품이미지 저정버튼 클릭 시
-	$('#btnGoodsDetailImgSave').click(function(e) {
-		if ($("#goodsImgForm").find("#goodsImgList tr").length == 0){
-			/* mcxDialog.alert('', function(){
-
-			});
-			return false; */
-		}
-		var optCheck = false;
-		var imgType = $('#goodsImgForm input[name=imgType]').val();
-		
-		$("#goodsImgForm").find("#goodsImgList tr").each(function() {
-			var size = 30;
-
-			for(i=0;i<size;i++){
-				var imgVal = $("#goodsImgForm").find("#goodsImgList tr").find("input[name=imgPath"+ (i+1) +"]").val();
-				
-				if(!gagajf.isNull(imgVal)){
-					var reg = "\.("+fileExtension+")$";
-					if(!(new RegExp(reg, "i")).test(imgVal)) {
-						optCheck = true;
-						mcxDialog.alertC('이미지는 ['+ fileExtension + '] 파일만 가능합니다.', {
-							sureBtnText: "확인",
-							sureBtnClick: function() {
-								$("#goodsImgForm").find("#goodsImgList tr").find("input[name=imgPath"+ (i+1)+"]").focus();
-							}
-						});
-						return false;
-					}
-
-					if (imgVal.indexOf('\\"') > -1){
-							optCheck = true;
-							mcxDialog.alertC('["]는 입력할 수 없습니다.', {
-								sureBtnText: "확인",
-								sureBtnClick: function() {
-									$("#goodsImgForm").find("#goodsImgList tr").find("input[name=imgPath"+ (i+1)+"]").focus();
-								}
-							});
-							return false;
-					}
-					if (imgVal.indexOf("\\'") > -1){
-							optCheck = true;
-							mcxDialog.alertC("[\\']는 입력할 수 없습니다.", {
-								sureBtnText: "확인",
-								sureBtnClick: function() {
-									$("#goodsImgForm").find("#goodsImgList tr").find("input[name=imgPath"+ (i+1)+"]").focus();
-								}
-
-							});
-							return false;
-					}
-					if (imgType == "A"){
-						if (imgVal.indexOf("http") > -1){
-							optCheck = true;
-							mcxDialog.alertC("이미지 도메인은 입력할 수 없습니다.", {
-								sureBtnText: "확인",
-								sureBtnClick: function() {
-									$("#goodsImgForm").find("#goodsImgList tr").find("input[name=imgPath"+ (i+1)+"]").focus();
-								}
-
-							});
-							return false;
-						}
-					}else{
-						if (imgVal.indexOf("https") <= -1){
-							optCheck = true;
-							mcxDialog.alertC("이미지 도메인을 입력해 주세요.", {
-								sureBtnText: "확인",
-								sureBtnClick: function() {
-									$("#goodsImgForm").find("#goodsImgList tr").find("input[name=imgPath"+ (i+1)+"]").focus();
-								}
-
-							});
-							return false;
-						}
-					}
-				}else{
-					if(i == 0){
-						optCheck = true;
-						mcxDialog.alertC("필수 상품이미지 입니다.", {
-							sureBtnText: "확인",
-							sureBtnClick: function() {
-								$("#goodsImgForm").find("#goodsImgList tr").find("input[name=imgPath"+ (i+1)+"]").focus();
-							}
-
-						});
-						return false;
-					}
-				}
-			}
-		});
-
-		if(optCheck) {
-			return false;
-		}
-
-		mcxDialog.confirm('저장하시겠습니까?', {
-			cancelBtnText: "취소",
-			sureBtnText: "확인",
-			sureBtnClick: function(){
-				gagajf.ajaxFormSubmit("/goods/img/save", "#goodsImgForm", fnGoodsImgFormClose);
-			}
-		});
-	});
 
 	//창종료
 	var fnGoodsImgFormClose = function(){

style24.admin/src/main/webapp/ux/js/admin.popup.js

@@ -242,8 +242,8 @@ var cfnOpenGoodsImagePopup = function(goodsCd) {
  * @since  : 2020/11/27
  * @author : eskim
  */
-var cfnOpenGoodsImageMassPopup = function(goodsCd, colorCd) {
-	var actionUrl = "/goods/image/mass/form?goodsCd=" + goodsCd +"&colorCd=" + colorCd;
+var cfnOpenGoodsImageMassPopup = function(goodsCd, colorCd, colorNm, mode) {
+	var actionUrl = "/goods/image/mass/form?goodsCd=" + goodsCd +"&colorCd=" + colorCd +"&colorNm=" + encodeURIComponent(colorNm)  +"&mode=" + mode;
 
 	uifnPopupClose('popupGoodsImageMass');
 	cfnOpenModalPopup(actionUrl, 'popupGoodsImageMass');