Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/service/TsfCounselService.java

@@ -1,9 +1,11 @@
 package com.style24.front.biz.service;
 
+import java.io.File;
 import java.util.Collection;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -14,6 +16,8 @@ import com.style24.persistence.domain.Counsel;
 
 import lombok.extern.slf4j.Slf4j;
 
+import com.gagaframework.web.util.GagaDateUtil;
+import com.gagaframework.web.util.GagaFileUtil;
 import com.gagaframework.web.util.GagaStringUtil;
 
 /**
@@ -28,6 +32,9 @@ public class TsfCounselService {
 
 	@Autowired
 	private TsfCounselDao counselDao;
+	
+	@Autowired
+	private Environment env;
 
 	/**
 	 * 1:1문의 생성
@@ -42,20 +49,51 @@ public class TsfCounselService {
 		counsel.setCustNo(TsfSession.getInfo().getCustNo());
 		counsel.setCellPhnno(TsfSession.getInfo().getCellPhnno());
 		counsel.setEmail(TsfSession.getInfo().getEmail());
-
-		if (StringUtils.isNotBlank(counsel.getFile1SysFileNm())) {
-			counsel.setOrgFileNm1(counsel.getFile1OrgFileNm());
-			counsel.setSysFileNm1(counsel.getFile1SysFileNm());
-		}
-
-		if (StringUtils.isNotBlank(counsel.getFile2SysFileNm())) {
-			counsel.setOrgFileNm2(counsel.getFile2OrgFileNm());
-			counsel.setSysFileNm2(counsel.getFile2SysFileNm());
-		}
-
 		counsel.setRegNo(TsfSession.getInfo().getCustNo());
 		counsel.setUpdNo(TsfSession.getInfo().getCustNo());
 		counselDao.createOneToOneQna(counsel);
+		
+		if(counsel.getOrgFileNmArr() != null) {
+			int ind = 1;
+			String[] orgItem = counsel.getOrgFileNmArr();
+			String[] sysItem = counsel.getSysFileNmArr();
+			
+			for (int i = 0; i < orgItem.length; i++) {
+				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, "/counsel");
+				File newFile = new File(GagaFileUtil.getConcatenationPath(planUploadPath, sysItem[i]));
+				planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, yearMonth);
+				String newFilename = "COUNSEL_" + GagaDateUtil.getTodayDateTime() + "_" + imgInd + "." + org.springframework.util.StringUtils.getFilenameExtension(sysItem[i]);
+				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);
+				
+				if (i == 0) {
+					counsel.setOrgFileNm1(orgItem[i]);
+					counsel.setSysFileNm1("/counsel/" + yearMonth + "/" + newFilename);
+				}else {
+					counsel.setOrgFileNm2(orgItem[i]);
+					counsel.setSysFileNm2("/counsel/" + yearMonth + "/" + newFilename);
+				}
+				
+				ind++;
+			}
+			
+			counselDao.updateOneToOneQna(counsel);
+		}
+		
+
+		
+		
 	}
 
 	/**

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

@@ -68,9 +68,9 @@ public class Counsel extends TscBaseDomain {
 	}
 	
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-	private String[] fileOrgFileNm;
+	private String[] orgFileNmArr;
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-	private String[] fileSysFileNm;
+	private String[] sysFileNmArr;
 
 
 	// Pagination

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

@@ -15,7 +15,7 @@
 	</sql>
 	
 	<!-- 1:1문의 생성 -->
-	<insert id="createOneToOneQna" parameterType="Counsel">
+	<insert id="createOneToOneQna" parameterType="Counsel" useGeneratedKeys="true" keyProperty="counselSq">
 		/* TsfCounsel.createOneToOneQna */
 		INSERT INTO TB_COUNSEL (
 		       COUNSEL_SQ

src/main/webapp/WEB-INF/views/mob/callcenter/OneToOneQnaFormMob.html

@@ -150,17 +150,9 @@
 											<div class="input_wrap">
 												<!-- 이미지첨부 -->
 												<div class="form_field">
-													<div class="imgUpload">
-														<label for="fileAdd" class="fileAdd">업로드</label>
-														<input type="file" id="fileAdd" name="file1">
-														<input type="hidden" name="file1OrgFileNm"/>
-														<input type="hidden" name="file1SysFileNm"/>
-													</div>
 													<div class="imgUpload">
 														<label for="fileAdds" class="fileAdd">업로드</label>
 														<input type="file" id="fileAdds" name="file2">
-														<input type="hidden" name="file2OrgFileNm"/>
-														<input type="hidden" name="file2SysFileNm"/>
 													</div>
 												</div>
 												<!-- //이미지첨부 -->
@@ -329,14 +321,14 @@
 					if (!gagajf.isNull(item.sysFileNm1)) {
 						tag += '		<span class="thumb_pic">\n';
 // 						tag += '			<img src="' + _uploadImageUrl + '/counsel/' + item.sysFileNm1 + '" alt="" onerror="this.src=\'/image/bg_profile.png\'">\n';
-						tag += '			<img src="' + _uploadImageUrl + '/counsel/' + item.sysFileNm1 + '" alt="">\n';
+						tag += '			<img src="' + _uploadImageUrl + '/' + item.sysFileNm1 + '" alt="">\n';
 						tag += '		</span>\n';
 					}
 					
 					if (!gagajf.isNull(item.sysFileNm2)) {
 						tag += '		<span class="thumb_pic">\n';
 // 						tag += '			<img src="' + _uploadImageUrl + '/counsel/' + item.sysFileNm2 + '" alt="" onerror="this.src=\'/image/bg_profile.png\'">\n';
-						tag += '			<img src="' + _uploadImageUrl + '/counsel/' + item.sysFileNm2 + '" alt="">\n';
+						tag += '			<img src="' + _uploadImageUrl + '/' + item.sysFileNm2 + '" alt="">\n';
 						tag += '		</span>\n';
 					}
 					
@@ -462,8 +454,8 @@
 				, file
 				, function(result) {
 					// 업로드한 파일명 설정
-					$('input[name=' + obj.name + 'OrgFileNm]').val(result.oldFileName);
-					$('input[name=' + obj.name + 'SysFileNm]').val(result.newFileName);
+					$(".pics").children().last().append("<input type='hidden' name='orgFileNmArr' value='"+result.oldFileName+"'>");
+					$(".pics").children().last().append("<input type='hidden' name='sysFileNmArr' value='"+result.newFileName+"'>");
 				}
 		);
 	}
@@ -483,7 +475,7 @@
 						, function() {
 							cfnGoToPage(_PAGE_ONETOONE_QNA);
 						}
-				);
+				); 
 			}
 		});
 	});

src/main/webapp/WEB-INF/views/web/callcenter/OneToOneQnaFormWeb.html

@@ -199,13 +199,13 @@
 					
 					if (!gagajf.isNull(item.sysFileNm1)) {
 						tag += '					<span class="thumb_pic">\n';
-						tag += '						<img src="' + _uploadImageUrl + '/counsel/' + item.sysFileNm1 + '" alt="" onerror="this.src=\'/images/pc/thumb/bg_item_none.png\'">\n';
+						tag += '						<img src="' + _uploadImageUrl + '/' + item.sysFileNm1 + '" alt="" onerror="this.src=\'/images/pc/thumb/bg_item_none.png\'">\n';
 						tag += '					</span>\n';
 					}
 					
 					if (!gagajf.isNull(item.sysFileNm2)) {
 						tag += '					<span class="thumb_pic">\n';
-						tag += '						<img src="' + _uploadImageUrl + '/counsel/' + item.sysFileNm2 + '" alt="" onerror="this.src=\'/images/pc/thumb/bg_item_none.png\'">\n';
+						tag += '						<img src="' + _uploadImageUrl + '/' + item.sysFileNm2 + '" alt="" onerror="this.src=\'/images/pc/thumb/bg_item_none.png\'">\n';
 						tag += '					</span>\n';
 					}
 					

src/main/webapp/WEB-INF/views/web/callcenter/OneToOneQnaRegisterFormWeb.html

@@ -84,14 +84,14 @@
 													<div class="imgUpload">
 														<label for="fileAdd" class="fileAdd">첫번째업로드</label>
 														<input type="file" id="fileAdd" name="file1"/>
-														<input type="hidden" name="file1OrgFileNm"/>
-														<input type="hidden" name="file1SysFileNm"/>
+														<input type="hidden" name="orgFileNmArr" id="file1OrgFileNm"/>
+														<input type="hidden" name="sysFileNmArr" id="file1SysFileNm"/>
 													</div>
 													<div class="imgUpload">
 														<label for="fileAdds" class="fileAdd">두번째업로드</label>
 														<input type="file" id="fileAdds" name="file2"/>
-														<input type="hidden" name="file2OrgFileNm"/>
-														<input type="hidden" name="file2SysFileNm"/>
+														<input type="hidden" name="orgFileNmArr" id="file2OrgFileNm"/>
+														<input type="hidden" name="sysFileNmArr" id="file2SysFileNm"/>
 													</div>
 												</div>
 												<!-- //이미지첨부 -->
@@ -185,8 +185,8 @@
 				, file
 				, function(result) {
 					// 업로드한 파일명 설정
-					$('input[name=' + obj.name + 'OrgFileNm]').val(result.oldFileName);
-					$('input[name=' + obj.name + 'SysFileNm]').val(result.newFileName);
+					$('input[id=' + obj.name + 'OrgFileNm]').val(result.oldFileName);
+					$('input[id=' + obj.name + 'SysFileNm]').val(result.newFileName);
 				}
 		);
 	}